]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
3 years agoMerge pull request #8115 from mjstapp/fix_ax_pthread
David Lamparter [Mon, 22 Mar 2021 18:31:05 +0000 (19:31 +0100)]
Merge pull request #8115 from mjstapp/fix_ax_pthread

build: test program needs to be warning-free

3 years agoMerge pull request #8303 from volta-networks/fix_coverity_pceplib
Donald Sharp [Mon, 22 Mar 2021 14:22:25 +0000 (10:22 -0400)]
Merge pull request #8303 from volta-networks/fix_coverity_pceplib

pceplib: Fixing coverity messages.

3 years agoMerge pull request #8280 from kuldeepkash/bgp_convergence_test
Donald Sharp [Mon, 22 Mar 2021 14:15:36 +0000 (10:15 -0400)]
Merge pull request #8280 from kuldeepkash/bgp_convergence_test

tests: Fix bgp convergence issue mentioned in #8279

3 years agobuild: test program needs to be warning-free
Mark Stapp [Fri, 19 Feb 2021 16:09:52 +0000 (11:09 -0500)]
build: test program needs to be warning-free

One of the configure-time test programs produces a warning with
gcc 9 (at least), so it fails if -Werror is enabled. Fix that.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #8301 from donaldsharp/isis_spacing
David Lamparter [Mon, 22 Mar 2021 09:10:33 +0000 (10:10 +0100)]
Merge pull request #8301 from donaldsharp/isis_spacing

isisd: Fix extra space after `router isis FOO`

3 years agoMerge pull request #8287 from mjstapp/more_gdb_in_configure
David Lamparter [Mon, 22 Mar 2021 09:04:47 +0000 (10:04 +0100)]
Merge pull request #8287 from mjstapp/more_gdb_in_configure

build: add -ggdb3 to dev build

3 years agoMerge pull request #8298 from donaldsharp/isis_spelling
David Lamparter [Mon, 22 Mar 2021 09:03:38 +0000 (10:03 +0100)]
Merge pull request #8298 from donaldsharp/isis_spelling

isisd: Fix spelling mistake

3 years agoMerge pull request #8121 from opensourcerouting/macro-cleanup
Donatas Abraitis [Mon, 22 Mar 2021 09:00:34 +0000 (11:00 +0200)]
Merge pull request #8121 from opensourcerouting/macro-cleanup

*: require ISO C11 + semicolons after file-scope macros

3 years agoMerge pull request #8297 from adrianomarto/msdp-dscp-cs6
Donald Sharp [Sun, 21 Mar 2021 23:43:01 +0000 (19:43 -0400)]
Merge pull request #8297 from adrianomarto/msdp-dscp-cs6

pimd: marking MSDP traffic as DSCP CS6

3 years agoMerge pull request #8257 from donaldsharp/fix_bgp_metric
Donatas Abraitis [Sun, 21 Mar 2021 19:29:25 +0000 (21:29 +0200)]
Merge pull request #8257 from donaldsharp/fix_bgp_metric

Fix bgp metric

3 years agoisisd: Fix extra space after `router isis FOO`
Donald Sharp [Sun, 21 Mar 2021 17:12:41 +0000 (13:12 -0400)]
isisd: Fix extra space after `router isis FOO`

Fix places where we are outputing an extra space.  This was
because it was prepping for vrf but we may not have a vrf.

Fixes: #8300
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8278 from ckishimo/ospfv3_iface
Donald Sharp [Sun, 21 Mar 2021 00:11:16 +0000 (20:11 -0400)]
Merge pull request #8278 from ckishimo/ospfv3_iface

ospf6d: fix iface commands lost when removing from area

3 years agoMerge pull request #8282 from volta-networks/fix_isisd_bfd_ipv4
Donald Sharp [Sun, 21 Mar 2021 00:04:38 +0000 (20:04 -0400)]
Merge pull request #8282 from volta-networks/fix_isisd_bfd_ipv4

isisd: fix BFD session when IPv6 not configured

3 years agoisisd: Fix spelling mistake
Donald Sharp [Sat, 20 Mar 2021 23:52:38 +0000 (19:52 -0400)]
isisd: Fix spelling mistake

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8291 from volta-networks/isis_timer_unstable
Donald Sharp [Sat, 20 Mar 2021 23:52:01 +0000 (19:52 -0400)]
Merge pull request #8291 from volta-networks/isis_timer_unstable

isisd: avoid lsp_sched loop when unstable

3 years agopimd: marking MSDP traffic as DSCP CS6
Adriano Marto Reis [Sat, 20 Mar 2021 23:25:13 +0000 (09:25 +1000)]
pimd: marking MSDP traffic as DSCP CS6

Configuring the sockets used to establish MSDP connections so the
packets are marked as CS6

Signed-off-by: Adriano Marto Reis <adrianomarto@gmail.com>
3 years agopceplib: Fixing coverity messages.
Javier Garcia [Sat, 20 Mar 2021 21:21:09 +0000 (22:21 +0100)]
pceplib: Fixing coverity messages.

Signed-off-by: Javier Garcia <javier.garcia@voltanet.io>
3 years agoMerge pull request #8129 from mjstapp/backup_recursives
Stephen Worley [Fri, 19 Mar 2021 16:30:51 +0000 (12:30 -0400)]
Merge pull request #8129 from mjstapp/backup_recursives

zebra: modify backup nexthop handling for recursive routes

3 years agobuild: add -ggdb3 to dev build
Mark Stapp [Thu, 18 Mar 2021 15:27:36 +0000 (11:27 -0400)]
build: add -ggdb3 to dev build

Add a little more gdb-specific debugging info for dev builds.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoisisd: avoid lsp_sched loop when unstable
Emanuele Di Pascale [Wed, 17 Mar 2021 12:24:19 +0000 (13:24 +0100)]
isisd: avoid lsp_sched loop when unstable

no point in scheduling an LSP refresh immediately if we know it is
going to be postponed again due to the network still being in its
instability grace period

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
3 years agoMerge pull request #8286 from donaldsharp/nhrp_xlref
Mark Stapp [Thu, 18 Mar 2021 18:30:33 +0000 (14:30 -0400)]
Merge pull request #8286 from donaldsharp/nhrp_xlref

nhrpd: Remove newline from log message

3 years agoMerge pull request #8263 from opensourcerouting/docker-update
Donald Sharp [Thu, 18 Mar 2021 17:59:30 +0000 (13:59 -0400)]
Merge pull request #8263 from opensourcerouting/docker-update

tests: docker fixes & improvements

3 years agoMerge pull request #8283 from chiragshah6/mdev
Donatas Abraitis [Thu, 18 Mar 2021 15:24:35 +0000 (17:24 +0200)]
Merge pull request #8283 from chiragshah6/mdev

bgpd: add seqno in bgp as-path access-list policy

3 years agonhrpd: Remove newline from log message
Donald Sharp [Thu, 18 Mar 2021 14:32:01 +0000 (10:32 -0400)]
nhrpd: Remove newline from log message

We should not be putting new lines in log messages.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoisisd: add debug logs to troubleshoot BFD issues
Emanuele Di Pascale [Thu, 18 Mar 2021 11:47:13 +0000 (12:47 +0100)]
isisd: add debug logs to troubleshoot BFD issues

when we receive an event from BFDD and we end up throwing it away,
make sure that we log (with debug guards) the reason for this, so
we can troubleshoot issues like the one addressed by the previous
commit.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
3 years agoisisd: fix BFD session when IPv6 not configured
Emanuele Di Pascale [Thu, 18 Mar 2021 11:45:23 +0000 (12:45 +0100)]
isisd: fix BFD session when IPv6 not configured

A wrong check was silently skipping the initialization of the bfd_session
struct in the adjacency if the router was not configured for IPv6. This
would cause BFD events to be ignored regardless of the configuration.

Also add a function to return the "name" of an adjacency and use it in a
couple of places, including the new log, instead of repeating the same
code in a bunch of places.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
3 years agoMerge pull request #8284 from mjstapp/fix_bgp_zero_timers
Donald Sharp [Thu, 18 Mar 2021 11:29:32 +0000 (07:29 -0400)]
Merge pull request #8284 from mjstapp/fix_bgp_zero_timers

bgpd: use add_event instead of add_timer with zero timeout

3 years agodoc: add seqno to bgp as path list section
Chirag Shah [Thu, 18 Mar 2021 05:04:33 +0000 (22:04 -0700)]
doc: add seqno to bgp as path list section

Add sequence no option to bgp as-path list cli syntax.
Add sequence no to example config.
Add auto generated sequence no in running-config if its not
provided in config.

Signed-off-by: Chirag Shah <chirag@nvidia.com>
3 years agobgpd: add seqno in bgp as-path access-list policy
Chirag Shah [Sat, 13 Mar 2021 02:33:09 +0000 (18:33 -0800)]
bgpd: add seqno in bgp as-path access-list policy

Add optional parameter seqno to bgp as-patch policy
to inline with other bgp policies commands at same
level.

Testing Done:

config t
bgp as-path access-list foo1 permit _40_
bgp as-path access-list foo1 seq 5 permit _41_
bgp as-path access-list foo1 seq 8 permit _42_
bgp as-path access-list foo2 permit _43_
no bgp as-path access-list foo1 permit _41_
bgp as-path access-list foo1 permit 41$

show run:
bgp as-path access-list foo1 seq 8 permit _42_
bgp as-path access-list foo1 seq 10 permit 41$
bgp as-path access-list foo2 seq 5 permit _43_

Signed-off-by: Chirag Shah <chirag@nvidia.com>
3 years agotests: Fix bgp convergence issue mentioned in #8279
Kuldeep Kashyap [Wed, 17 Mar 2021 08:02:24 +0000 (01:02 -0700)]
tests: Fix bgp convergence issue mentioned in #8279

1. Enhance verify_bgp_convergence() to solve issue mentioned in #8279

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
3 years agobgpd: use add_event instead of add_timer with zero timeout
Mark Stapp [Wed, 17 Mar 2021 20:10:13 +0000 (16:10 -0400)]
bgpd: use add_event instead of add_timer with zero timeout

Just use events in a few places where timers with zero timeout
were being used.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #8052 from ton31337/feature/show_bgp_peer-groups_json
Quentin Young [Wed, 17 Mar 2021 19:08:00 +0000 (15:08 -0400)]
Merge pull request #8052 from ton31337/feature/show_bgp_peer-groups_json

3 years agoMerge pull request #8232 from reubendowle/fixes/nhrp-ipsec-issues
Donald Sharp [Wed, 17 Mar 2021 13:33:44 +0000 (09:33 -0400)]
Merge pull request #8232 from reubendowle/fixes/nhrp-ipsec-issues

nhrp: Fix some ipsec related issues

3 years agoMerge pull request #8255 from pjdruddy/fix-ifindex-test
Donald Sharp [Wed, 17 Mar 2021 13:10:20 +0000 (09:10 -0400)]
Merge pull request #8255 from pjdruddy/fix-ifindex-test

Fix ifindex test

3 years agoMerge pull request #8248 from volta-networks/fix_ospf6_chunk_msgs
Donald Sharp [Wed, 17 Mar 2021 13:09:28 +0000 (09:09 -0400)]
Merge pull request #8248 from volta-networks/fix_ospf6_chunk_msgs

ospfd6: Clear locks when ospf messages need to be chunked

3 years agotests: simplify docker rsync & support worktrees
David Lamparter [Tue, 16 Mar 2021 05:11:15 +0000 (06:11 +0100)]
tests: simplify docker rsync & support worktrees

The previous, more complex mechanism failed to take into account that
git worktrees only have a stub .git file & copying the worktree itself
is not enough.  Just extract a file list beforehand & don't bother with
git inside the container.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agotests: add libelf-dev to Dockerfile
David Lamparter [Tue, 16 Mar 2021 05:10:23 +0000 (06:10 +0100)]
tests: add libelf-dev to Dockerfile

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agoMerge pull request #8276 from opensourcerouting/pathd-fmt-fix
Donald Sharp [Wed, 17 Mar 2021 12:31:01 +0000 (08:31 -0400)]
Merge pull request #8276 from opensourcerouting/pathd-fmt-fix

pathd: fix some format strings

3 years agoMerge pull request #8008 from chiragshah6/yang_nb5
Santosh P K [Wed, 17 Mar 2021 10:55:54 +0000 (16:25 +0530)]
Merge pull request #8008 from chiragshah6/yang_nb5

[lib, yang] : multiple fixes in prefix-list northbound conversion

3 years agoMerge pull request #8225 from idryzhov/bfd-echo-mode
Rafael Zalamena [Wed, 17 Mar 2021 10:45:43 +0000 (10:45 +0000)]
Merge pull request #8225 from idryzhov/bfd-echo-mode

bfdd: fix echo receive timer and disable echo mode

3 years agoMerge pull request #8229 from idryzhov/bfdd-echo-rx-tx
Rafael Zalamena [Wed, 17 Mar 2021 10:41:33 +0000 (10:41 +0000)]
Merge pull request #8229 from idryzhov/bfdd-echo-rx-tx

bfdd: separate echo rx/tx timers

3 years agotests: fix too many arguments for logging
ckishimo [Wed, 17 Mar 2021 08:35:47 +0000 (09:35 +0100)]
tests: fix too many arguments for logging

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoMerge pull request #8273 from volta-networks/fix_ospf6_coverity
David Lamparter [Wed, 17 Mar 2021 07:02:14 +0000 (08:02 +0100)]
Merge pull request #8273 from volta-networks/fix_ospf6_coverity

ospf6d: Fix coverity errors

3 years agoMerge pull request #8275 from donaldsharp/peer_afi_safi_mistake
David Lamparter [Wed, 17 Mar 2021 06:13:09 +0000 (07:13 +0100)]
Merge pull request #8275 from donaldsharp/peer_afi_safi_mistake

3 years agopathd: remove mid-string line breaks
David Lamparter [Wed, 17 Mar 2021 05:39:34 +0000 (06:39 +0100)]
pathd: remove mid-string line breaks

cf. workflow.rst ("lines over 80 characters are allowed for text strings
to make it possible to search the code for them"), matching Linux kernel
coding style.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agopathd: use %pIA to print struct ipaddr *
David Lamparter [Wed, 17 Mar 2021 05:31:38 +0000 (06:31 +0100)]
pathd: use %pIA to print struct ipaddr *

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agopathd: fix %pI4 <> %pI6 snafu
David Lamparter [Wed, 17 Mar 2021 05:23:19 +0000 (06:23 +0100)]
pathd: fix %pI4 <> %pI6 snafu

... as noted by the frr-format GCC plugin.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: temporary workaround for LabN CI
David Lamparter [Tue, 2 Mar 2021 18:40:07 +0000 (19:40 +0100)]
lib: temporary workaround for LabN CI

Accept macros without ; for LabN CI *only*.  This is a bit hairy since
we can't generate warnings for this, so it's very limited in both scope
and duration.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agobuild: put macro-semicolon bits into ignore-revs
David Lamparter [Sun, 21 Feb 2021 06:14:53 +0000 (07:14 +0100)]
build: put macro-semicolon bits into ignore-revs

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require semicolon after FRR_CFG_DEFAULT_*
David Lamparter [Sun, 21 Feb 2021 06:09:53 +0000 (07:09 +0100)]
*: require semicolon after FRR_CFG_DEFAULT_*

... again ...

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require semicolon after FRR_DAEMON_INFO & co.
David Lamparter [Sun, 21 Feb 2021 06:07:15 +0000 (07:07 +0100)]
*: require semicolon after FRR_DAEMON_INFO & co.

... again ...

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require semicolon after DEFINE_<typesafe...>
David Lamparter [Sun, 21 Feb 2021 05:54:16 +0000 (06:54 +0100)]
*: require semicolon after DEFINE_<typesafe...>

Again, see previous commits.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require semicolon after DEFINE_QOBJ & co.
David Lamparter [Sun, 21 Feb 2021 05:38:13 +0000 (06:38 +0100)]
*: require semicolon after DEFINE_QOBJ & co.

Again, see previous commits.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require semicolon after DEFINE_HOOK & co.
David Lamparter [Sun, 21 Feb 2021 05:33:45 +0000 (06:33 +0100)]
*: require semicolon after DEFINE_HOOK & co.

See previous commit.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require semicolon after DEFINE_MTYPE & co
David Lamparter [Sun, 21 Feb 2021 05:18:10 +0000 (06:18 +0100)]
*: require semicolon after DEFINE_MTYPE & co

Back when I put this together in 2015, ISO C11 was still reasonably new
and we couldn't require it just yet.  Without ISO C11, there is no
"good" way (only bad hacks) to require a semicolon after a macro that
ends with a function definition.  And if you added one anyway, you'd get
"spurious semicolon" warnings on some compilers...

With C11, `_Static_assert()` at the end of a macro will make it so that
the semicolon is properly required, consumed, and not warned about.

Consistently requiring semicolons after "file-level" macros matches
Linux kernel coding style and helps some editors against mis-syntax'ing
these macros.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require ISO C11 (or C++11)
David Lamparter [Sun, 21 Feb 2021 04:48:48 +0000 (05:48 +0100)]
*: require ISO C11 (or C++11)

It's 2021... time to drop some 10yo compat stuff.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agosnmp: change -std=gnu99 to -std=gnu11
David Lamparter [Sun, 21 Feb 2021 04:55:18 +0000 (05:55 +0100)]
snmp: change -std=gnu99 to -std=gnu11

The point of the `-std=gnu99` was to override a `-std=c99` that may be
coming in from net-snmp.  However, we want C11, not C99.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agonhrpd: When IPsec profile is added or deleted, reset the vc and re-check peer
Gaurav Goyal [Thu, 4 Feb 2021 03:08:08 +0000 (16:08 +1300)]
nhrpd: When IPsec profile is added or deleted, reset the vc and re-check peer

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
3 years agonhrpd: Make comments clearer, fix style issues
Reuben Dowle [Thu, 11 Mar 2021 00:51:58 +0000 (13:51 +1300)]
nhrpd: Make comments clearer, fix style issues

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
3 years agonhrpd: Close IPSec connection when tunnel protection removed
Gaurav Goyal [Thu, 11 Mar 2021 00:49:12 +0000 (13:49 +1300)]
nhrpd: Close IPSec connection when tunnel protection removed

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
3 years agonhrpd: Retry IPSec if NHRP is repeatedly failing
Gaurav Goyal [Thu, 11 Mar 2021 00:46:37 +0000 (13:46 +1300)]
nhrpd: Retry IPSec if NHRP is repeatedly failing

This prevents a failed IPSec connection from preventing DMVPN from working.
A failure situation can be reproduced using a Cisco peer, and and disabling then
re-enabling the tunnel IPSec protection (after the IPSec connection has
already been established).

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
3 years agobgpd: If we have a SAFI conflict do not allow labeled unicast to reset
Donald Sharp [Wed, 17 Mar 2021 02:28:29 +0000 (22:28 -0400)]
bgpd: If we have a SAFI conflict do not allow labeled unicast to reset

If we have a SAFI conflict, ie we are trying to activate safi's
UNICAST and LABELED_UNICAST at the same time, we should not
cause bestpath to be rerun and we should not try to put
labels on everything.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: Attempting to activate unicast and labeled-unicast
Donald Sharp [Wed, 17 Mar 2021 02:21:05 +0000 (22:21 -0400)]
bgpd: Attempting to activate unicast and labeled-unicast

Should return an actual useful error message.
Commit: 055679e915fc826fe13abdd8d60a22a0ca35c8c6 messed this error message
up.

Fixes: #8246
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotests: fix warning when checking ospfv3 convergence
ckishimo [Tue, 16 Mar 2021 23:19:50 +0000 (00:19 +0100)]
tests: fix warning when checking ospfv3 convergence

The following error is shown when running the OSPFv3 tests

2021-03-16 23:37:44,792 INFO: Function returned global name 'data_rid' is not defined
2021-03-16 23:37:44,792 INFO: Retry [#1] after sleeping for 2s
2021-03-16 23:37:46,794 INFO: Verifying OSPF6 neighborship on router r1:
2021-03-16 23:37:46,993 INFO: Output for command [ show ipv6 ospf6 neighbor ] on router r1:
Neighbor ID     Pri    DeadTime    State/IfState         Duration I/F[State]
2.2.2.2           1    00:00:03     Full/PointToPoint    00:00:01 r1-r2-eth0[PointToPoint]

Fix the "data_rid" warning by using the correct variable

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoospf6d: fix warning message when interfae disabled
ckishimo [Tue, 16 Mar 2021 23:14:26 +0000 (00:14 +0100)]
ospf6d: fix warning message when interfae disabled

When removing an interface from an existing area,
the warning message we get is not correct

  interface r1-r2-eth0
   ipv6 address 2013:12::1/64
   ipv6 ospf6 dead-interval 4
   ipv6 ospf6 hello-interval 1
  !
  interface dummy
   ipv6 ospf6 dead-interval 4
   ipv6 ospf6 hello-interval 1
   ipv6 ospf6 network point-to-point
  !
  router ospf6
   ospf6 router-id 1.1.1.1
   interface r1-r2-eth0 area 0.0.0.0
  !

  r1(config-if)# router ospf6
  r1(config-ospf6)# no interface dummy area 0.0.0.0
  No such Area-ID: 0.0.0.0   <--- area 0.0.0.0 exists

This is fixing the error message

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoospf6d: remove interface prefix when area is removed
ckishimo [Tue, 16 Mar 2021 23:01:19 +0000 (00:01 +0100)]
ospf6d: remove interface prefix when area is removed

This bug was first reported in PR#7717. When removing an interface
from the area, the interface prefix is still shown

  r1# sh ipv6 ospf6 interface prefix
  *N IA 2013:12::/64       ::1      r1-r2-eth0 00:00:12

  r1# conf t
  r1(config)# router ospf6
  r1(config-ospf6)# no interface r1-r2-eth0 area 0.0.0.0
  r1(config-ospf6)# exit

  r1# sh ipv6 ospf6 interface prefix
  *N IA 2013:12::/64       ::1      r1-r2-eth0 00:00:22

This fix will check if the interface is disabled so the
prefix is not shown

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoospf6d: fix iface commands lost when removing from area
ckishimo [Tue, 16 Mar 2021 22:47:18 +0000 (23:47 +0100)]
ospf6d: fix iface commands lost when removing from area

In OSPFv3 when removing the interface from an area, all ospf6
interface commands are lost, so when changing the area you need
to reconfigure all ospf6 interface commands again

  r1# sh run
  interface r1-r2-eth0
   ipv6 address 2013:12::1/64
   ipv6 ospf6 dead-interval 4
   ipv6 ospf6 hello-interval 1
   ipv6 ospf6 network point-to-point
  !
  router ospf6
   ospf6 router-id 1.1.1.1
   interface r1-r2-eth0 area 0.0.0.0
  !

  r1# conf t
  r1(config)# router ospf6
  r1(config-ospf6)# no interface r1-r2-eth0 area 0.0.0.0
  r1(config-ospf6)# exit

  r1# sh run
  interface r1-r2-eth0
   ipv6 address 2013:12::1/64
  !                            <----- missing all ipv6 ospf6 commands
  router ospf6
   ospf6 router-id 1.1.1.1
  !

This is because the interface is being deleted instead of disabled
(see PR#7717) I believe the interface should be left as disabled
(not deleted) when removing the interface from the area

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoMerge pull request #8258 from volta-networks/feat_ldp_snmp_with_stats
Donald Sharp [Tue, 16 Mar 2021 22:31:03 +0000 (18:31 -0400)]
Merge pull request #8258 from volta-networks/feat_ldp_snmp_with_stats

ldpd: Add support for the read-only snmp mib objects that are statistics

3 years agoMerge pull request #8268 from mjstapp/doc_dev_topo_notes
Donald Sharp [Tue, 16 Mar 2021 22:22:02 +0000 (18:22 -0400)]
Merge pull request #8268 from mjstapp/doc_dev_topo_notes

doc: add info to topotest dev doc

3 years agoMerge pull request #8270 from volta-networks/fix_isis_snmp_coverity
Donald Sharp [Tue, 16 Mar 2021 22:21:47 +0000 (18:21 -0400)]
Merge pull request #8270 from volta-networks/fix_isis_snmp_coverity

isisd: Fix coverity warnings

3 years agoospf6d: Fix coverity errors
lynne [Tue, 16 Mar 2021 20:08:59 +0000 (16:08 -0400)]
ospf6d: Fix coverity errors

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
3 years agobfdd: separate echo rx/tx timers
Igor Ryzhov [Wed, 10 Mar 2021 14:31:57 +0000 (17:31 +0300)]
bfdd: separate echo rx/tx timers

Currently there is a single interval for both RX and TX echo functions.
This commit introduces separate RX and TX timers for echo packets.

The main advantage is to be able to set the receive interval to zero
when we don't want to receive echo packets from the remote system.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #8266 from idryzhov/eigrp-cli-fixes
Donald Sharp [Tue, 16 Mar 2021 18:47:00 +0000 (14:47 -0400)]
Merge pull request #8266 from idryzhov/eigrp-cli-fixes

eigrp cli fixes

3 years agoMerge pull request #7963 from volta-networks/feat_pceplib_into_frr_github
Donald Sharp [Tue, 16 Mar 2021 18:03:34 +0000 (14:03 -0400)]
Merge pull request #7963 from volta-networks/feat_pceplib_into_frr_github

pceplib: Integrate pcelib into frr

3 years agoMerge pull request #8155 from idryzhov/zebra-support-bundle
Donald Sharp [Tue, 16 Mar 2021 17:00:37 +0000 (13:00 -0400)]
Merge pull request #8155 from idryzhov/zebra-support-bundle

zebra support bundle fixes and improvements

3 years agoisisd: Fix coverity warnings
lynne [Tue, 16 Mar 2021 16:55:28 +0000 (12:55 -0400)]
isisd: Fix coverity warnings

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
3 years agozebra: capture backup nexthop info with recursive resolution
Mark Stapp [Mon, 22 Feb 2021 20:09:07 +0000 (15:09 -0500)]
zebra: capture backup nexthop info with recursive resolution

When resolving a recursive route, capture backup nexthop info
along with the resolving nexthops.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agozebra: add ui control for use of backup nexthops in resolution
Mark Stapp [Mon, 22 Feb 2021 20:06:28 +0000 (15:06 -0500)]
zebra: add ui control for use of backup nexthops in resolution

Add a control and api for the use of backup nexthops in
recursive resolution. With 'no', we won't try to use installed
backup nexthops when resolving a recursive route.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #7993 from mjstapp/reorg_resolve
Stephen Worley [Tue, 16 Mar 2021 15:34:33 +0000 (11:34 -0400)]
Merge pull request #7993 from mjstapp/reorg_resolve

zebra: reorg nexthop resolution code

3 years agoospfd6: Clear locks when ospf messages need to be chunked
lynne [Sun, 14 Mar 2021 17:11:15 +0000 (13:11 -0400)]
ospfd6: Clear locks when ospf messages need to be chunked

When there are too many LSA updates to be sent in a packet the code needs to
correctly clear the locks that are taken while walking the lists and then wait
for the appropriate timer to expire to continue walking the list.   The routine
that was being called would not properly remove all the locks that needed to be
cleared, and would also try to incorrectly delete the lsa/route.   The code now
clears the locks and leaves the lsa on the list.  When the timers fire again
the code continues walking the list to send the rest of the lsas to the
neighbor.

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
3 years agoMerge pull request #8226 from adharkar/frr-evi_rx
Patrick Ruddy [Tue, 16 Mar 2021 15:32:55 +0000 (15:32 +0000)]
Merge pull request #8226 from adharkar/frr-evi_rx

bgpd: Reevaluate es_evi_vtep active state on disable-ead-evi-rx config flap

3 years agotests: re-enable RTE tests after removing fixed ifindices
Pat Ruddy [Mon, 15 Mar 2021 14:46:51 +0000 (14:46 +0000)]
tests: re-enable RTE tests after removing fixed ifindices

Change ifindex test to grab the correct indices using the API
provided.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agotests: fix formatting error to make black clean
Pat Ruddy [Mon, 15 Mar 2021 14:46:18 +0000 (14:46 +0000)]
tests: fix formatting error to make black clean

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agodoc: add more notes about new topotests
Mark Stapp [Tue, 16 Mar 2021 15:28:25 +0000 (11:28 -0400)]
doc: add more notes about new topotests

Add some extra notes to the dev doc section about writing new
topotests: check for OS/kernel support if necessary; avoid
volatile or unstable data like ifindices or link-locals.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agodoc: fix warnings in dev docs
Mark Stapp [Tue, 16 Mar 2021 15:27:59 +0000 (11:27 -0400)]
doc: fix warnings in dev docs

Fix a couple of warnings in dev doc rst files.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoeigrpd: fix dependency on operational state in cli
Igor Ryzhov [Fri, 12 Mar 2021 23:09:34 +0000 (02:09 +0300)]
eigrpd: fix dependency on operational state in cli

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoeigrpd: fix xpaths
Igor Ryzhov [Fri, 12 Mar 2021 22:50:08 +0000 (01:50 +0300)]
eigrpd: fix xpaths

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobgpd: Set metric appropriately for the bnc for a v6 LL address
Donald Sharp [Mon, 15 Mar 2021 17:15:49 +0000 (13:15 -0400)]
bgpd: Set metric appropriately for the bnc for a v6 LL address

The v6 LL commit 8761cd6ddb5437767625f58c8e9cc3ccda7887ab

incorrectly was setting the metric value to 1 for the underlying
connected interface.  Modify the code to use a metric value of 0
instead of 1 that now represents the actual metric value that
was originally passed up.

This was noticed when the `show bgp ipv4 uni` command was
inserting a `(metric 1)` into output where before it was not.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agosharpd: Dump metric received for the reachability
Donald Sharp [Mon, 15 Mar 2021 17:12:15 +0000 (13:12 -0400)]
sharpd: Dump metric received for the reachability

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobfdd: warn users about echo-mode restrictions
Igor Ryzhov [Tue, 9 Mar 2021 22:35:55 +0000 (01:35 +0300)]
bfdd: warn users about echo-mode restrictions

Echo-mode implementation is currently broken. Instead of sending packets
to it's own address, bfdd is sending echo packets to the peer's address.
It may seem to work when testing between two FRR instances, because FRR
loops back such packets, but no other implementation is supposed to do
that.

Let's warn users that the current implementation works only between two
FRR instances.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobfdd: fix starting echo receive timer
Igor Ryzhov [Tue, 9 Mar 2021 22:17:47 +0000 (01:17 +0300)]
bfdd: fix starting echo receive timer

Currently this timer is only started when we receive the first echo
packet. If we never receive the packet, the timer is never started and
the user falsely assumes that echo function is working.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agotests: update LDP SNMP topotest to walk mib objects that are statistics
Karen Schoener [Mon, 15 Mar 2021 17:47:31 +0000 (13:47 -0400)]
tests: update LDP SNMP topotest to walk mib objects that are statistics

Signed-off-by: Karen Schoener <karen@voltanet.io>
3 years agoldpd: Add support for the read-only snmp mib objects that are statistics
Karen Schoener [Mon, 15 Mar 2021 17:44:12 +0000 (13:44 -0400)]
ldpd: Add support for the read-only snmp mib objects that are statistics

Add support for the read-only snmp mib objects as described in RFC 3815
that are statistics.

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
Signed-off-by: Karen Schoener <karen@voltanet.io>
3 years agoMerge pull request #8260 from volta-networks/fix_isis_snmp_test
Igor Ryzhov [Tue, 16 Mar 2021 14:20:35 +0000 (17:20 +0300)]
Merge pull request #8260 from volta-networks/fix_isis_snmp_test

test: fix isis-snmp test

3 years agotest: fix isis-snmp test
lynne [Mon, 15 Mar 2021 18:22:23 +0000 (14:22 -0400)]
test: fix isis-snmp test

Remove ifindex values being tested because it can change
between runs of the test.

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
3 years agoMerge pull request #8214 from chiragshah6/mdev
Donatas Abraitis [Tue, 16 Mar 2021 07:28:03 +0000 (09:28 +0200)]
Merge pull request #8214 from chiragshah6/mdev

tools: frr-reload refine error handling

3 years agoMerge pull request #8254 from donaldsharp/various_fixes
David Lamparter [Tue, 16 Mar 2021 06:41:35 +0000 (07:41 +0100)]
Merge pull request #8254 from donaldsharp/various_fixes

3 years agopimd: Fix clang issue with -Waddress-of-packed-member
Donald Sharp [Mon, 15 Mar 2021 15:12:38 +0000 (11:12 -0400)]
pimd: Fix clang issue with -Waddress-of-packed-member

Recent change in commit: 6b73800ba27e7f69453a191dfb873c2e07194516

Caused this error to pop up in pim_igmp_mtrace.c:

error: taking address of packed member 'rsp_addr' of class or structure 'igmp_mtrace' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]

Follow the pattern used in the code to solve this problem for clang

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: use appropriate printf formatter for some uint32_t
Donald Sharp [Mon, 15 Mar 2021 14:56:08 +0000 (10:56 -0400)]
bgpd: use appropriate printf formatter for some uint32_t

newm and existm are uint32_t so let's use %u instead of %d
to print them out.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8234 from reubendowle/fixes/nhrp-trafic-indication
Donald Sharp [Mon, 15 Mar 2021 13:45:30 +0000 (09:45 -0400)]
Merge pull request #8234 from reubendowle/fixes/nhrp-trafic-indication

nhrpd: Set hop count to 1 in traffic indication