]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
2 years agolib: add one check in "list_sort()"
anlan_cs [Fri, 13 May 2022 02:14:11 +0000 (22:14 -0400)]
lib: add one check in "list_sort()"

Add one check in `list_sort()`:
Immediatly return if no any items in this list.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agoMerge pull request #11138 from opensourcerouting/fix/rpki
Russ White [Mon, 9 May 2022 23:36:02 +0000 (19:36 -0400)]
Merge pull request #11138 from opensourcerouting/fix/rpki

bgpd: RPKI reverts, nits...

2 years agoMerge pull request #11147 from opensourcerouting/feature/gr_n-bit_cli_knob
Russ White [Mon, 9 May 2022 23:35:14 +0000 (19:35 -0400)]
Merge pull request #11147 from opensourcerouting/feature/gr_n-bit_cli_knob

bgpd: Add CLI knob to enable graceful restart for BGP notifications

2 years agoMerge pull request #11148 from anlancs/fix/bfdd-wrong-discriminator-mismatch
Igor Ryzhov [Mon, 9 May 2022 21:32:08 +0000 (00:32 +0300)]
Merge pull request #11148 from anlancs/fix/bfdd-wrong-discriminator-mismatch

bfdd: fix override between sessions

2 years agoMerge pull request #11163 from opensourcerouting/fix/same_type_casting
Igor Ryzhov [Mon, 9 May 2022 21:16:30 +0000 (00:16 +0300)]
Merge pull request #11163 from opensourcerouting/fix/same_type_casting

*: Avoid casting to the same type as on the left

2 years agoMerge pull request #11154 from opensourcerouting/fix/increase_bgp_flags
Russ White [Mon, 9 May 2022 18:50:29 +0000 (14:50 -0400)]
Merge pull request #11154 from opensourcerouting/fix/increase_bgp_flags

bgpd: Use uint64_t for bgp->flags

2 years agoMerge pull request #11161 from opensourcerouting/fix/no_need_to_check_for_xcalloc
Russ White [Mon, 9 May 2022 18:44:36 +0000 (14:44 -0400)]
Merge pull request #11161 from opensourcerouting/fix/no_need_to_check_for_xcalloc

zebra, ospf6d: Do not check if NULL for XCALLOC()

2 years agoMerge pull request #11162 from anlancs/fix/bgpd-cleanup-5
Russ White [Mon, 9 May 2022 18:43:03 +0000 (14:43 -0400)]
Merge pull request #11162 from anlancs/fix/bgpd-cleanup-5

bgpd: remove unnecessary check for evpn

2 years agoMerge pull request #11170 from anlancs/fix/bgpd-cleanup-8
mobash-rasool [Mon, 9 May 2022 17:12:22 +0000 (22:42 +0530)]
Merge pull request #11170 from anlancs/fix/bgpd-cleanup-8

bgpd: remove one unnecessary parameter for evpn-mh

2 years agoMerge pull request #11096 from anlancs/fix/bgpd-unlock
Russ White [Mon, 9 May 2022 14:46:50 +0000 (10:46 -0400)]
Merge pull request #11096 from anlancs/fix/bgpd-unlock

bgpd: clear misleading mismatched check

2 years agobgpd: remove one unnecessary parameter for evpn-mh
anlan_cs [Wed, 13 Apr 2022 11:06:39 +0000 (07:06 -0400)]
bgpd: remove one unnecessary parameter for evpn-mh

The "add" parameter of `bgp_evpn_mh_route_update()` makes no sense.
Just remove it to clarify this function, and remove the relevant check
with "add" as well.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agobgpd: remove unnecessary check for evpn
anlan_cs [Fri, 6 May 2022 09:52:12 +0000 (05:52 -0400)]
bgpd: remove unnecessary check for evpn

When `bgp_evpn_new()` is called, the `bgp` parameter MUST be non-NULL,
remove this unnecessary check and remove the NULL check for returned
`struct bgpevpn *`, which should be non-NULL.

And modify `import_rt_new()` in the same way.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years ago*: Avoid casting to the same type as on the left
Donatas Abraitis [Sun, 8 May 2022 13:07:42 +0000 (16:07 +0300)]
*: Avoid casting to the same type as on the left

Just not necessary.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agozebra, ospf6d: Do not check if NULL for XCALLOC()
Donatas Abraitis [Sun, 8 May 2022 12:43:21 +0000 (15:43 +0300)]
zebra, ospf6d: Do not check if NULL for XCALLOC()

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agobgpd: clear misleading mismatched check
anlan_cs [Tue, 26 Apr 2022 04:14:34 +0000 (00:14 -0400)]
bgpd: clear misleading mismatched check

Two changes for `delete_global_type2_routes()`:

1) Remove check of `bgp_dest_has_bgp_path_info_data(rddest)`.
It is unnecessary(`dest->info` should not be NULL) and misleading.
`if (rddest && bgp_dest_has_bgp_path_info_data(rddest))`
Use (locked) node with this check, but unlock with `if (rddest)`,
The mismatched condition is misleading, there seems to be a
mistake to extra unlock.
Just make it clear, immediately exit with `(!rddest)`.

2) Remove checking returned value for it, and use `void` as return type.
It is unnecessary and wrong. Even the check failed, it should continue
to delete other types of routes.
Just remove the check and go through.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agoMerge pull request #11156 from donaldsharp/spelling_three
Donatas Abraitis [Sat, 7 May 2022 15:44:59 +0000 (18:44 +0300)]
Merge pull request #11156 from donaldsharp/spelling_three

valgrind issues and general cleanup

2 years agoisisd: Prevent direct copy of different size prefix'es
Donald Sharp [Sat, 7 May 2022 01:24:56 +0000 (21:24 -0400)]
isisd: Prevent direct copy of different size prefix'es

Memory is allocated for a `struct prefix_ipv6` but
it was directly copied into a `struct prefix` via
direct pointer copy, which leads to a read past
end of memory.  Fix by using prefix_copy

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoisisd: Remove unneeded pre-declarations
Donald Sharp [Sat, 7 May 2022 01:19:07 +0000 (21:19 -0400)]
isisd: Remove unneeded pre-declarations

I don't know what was going on.  Removing the weird c structures.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoisisd: Fix read past end of string
Donald Sharp [Sat, 7 May 2022 01:05:38 +0000 (21:05 -0400)]
isisd: Fix read past end of string

using a memcpy for a strdup'ed string.  bad mojo

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years ago*: Fix doesnt spelling mistakes
Donald Sharp [Sat, 7 May 2022 00:38:40 +0000 (20:38 -0400)]
*: Fix doesnt spelling mistakes

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agobgpd: Use uint64_t for bgp->flags
Donatas Abraitis [Fri, 6 May 2022 19:10:56 +0000 (22:10 +0300)]
bgpd: Use uint64_t for bgp->flags

We will hit this soon because uint32_t will be not enough.

Two more flags gonna be added for rfc8538.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agobfdd: fix override between sessions
anlan_cs [Tue, 3 May 2022 13:26:15 +0000 (09:26 -0400)]
bfdd: fix override between sessions

After two single-hop sessions (*no local address are configured*) on two
interfaces are UP, remove one address of one interface, both of them
(actually, quite independent sessions) come to be DOWN, not just one.

Consider two boxes: A with `a1` and `a2` adddress on two interfaces,
and B with `b1` and `b2`.
Two sessions are set up and ok: `s1` with <a1,b1> and `s2` with <a2,b2>.
After `a1` of A is removed, there is an unhappy coincidence:
1) On A: `s1` changes local address, and sends <a2,b1> packets with help
of route.
2) On B: wrongly regarded <a2,b1> packets with non-zero remote descriminator
as part of `s2`, and are dropped for mismatched remote remote descriminator.
3) On A: `s1` sends <a2,b1> packets with zero remote descriminator to
initialize this session.
4) On B: wrongly regarded <a2,b1> packets with zero remote descriminator as
part of `s2`. Then `s2` will vibrate.

So the good sessions are overridden.

In this case, the <a2,b1> packets with zero remote descriminator won't take
effect until the current good sessions become bad.

Since single-hop sessions are allowed to be set without bound inteface in
current code, this commit adds one check in `bfd_recv_cb()` to avoid wrong
override.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agoMerge pull request #11145 from donaldsharp/bgp_capability
Donatas Abraitis [Thu, 5 May 2022 19:28:56 +0000 (22:28 +0300)]
Merge pull request #11145 from donaldsharp/bgp_capability

Bgp capability

2 years agobgpd: Add CLI knob to enable graceful restart for BGP notifications
Donatas Abraitis [Wed, 4 May 2022 18:52:01 +0000 (21:52 +0300)]
bgpd: Add CLI knob to enable graceful restart for BGP notifications

N-bit flag should be exchanged in BGP OPEN messages, not only when the
bgpd is restarted/started.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agoMerge pull request #11059 from anlancs/fix/bgpd-evnp-wrong-check-hashget
Donatas Abraitis [Wed, 4 May 2022 18:19:51 +0000 (21:19 +0300)]
Merge pull request #11059 from anlancs/fix/bgpd-evnp-wrong-check-hashget

bgpd: fix memory leak for evpn

2 years agoMerge pull request #11144 from ton31337/fix/bgp_notification_gr
Donald Sharp [Wed, 4 May 2022 16:05:50 +0000 (12:05 -0400)]
Merge pull request #11144 from ton31337/fix/bgp_notification_gr

bgpd: Fix memory leak for bgp_notify_receive()

2 years agobgpd: peer groups should not toggle interface based nht tracking
Donald Sharp [Tue, 3 May 2022 19:24:28 +0000 (15:24 -0400)]
bgpd: peer groups should not toggle interface based nht tracking

Peer groups when various forms of `bgp capability extended-nexthop`
is entered on them are toggling the nexthop tracking status of peers
in their peer group.  This is ok when the peer is not interface based.
But it is not ok when the peer is interface based as that it will turn
off the ability of FRR to properly work with that peer type.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agobgpd: Refuse to let interfaced peering to change capability extended-nexthop
Donald Sharp [Tue, 3 May 2022 19:23:14 +0000 (15:23 -0400)]
bgpd: Refuse to let interfaced peering to change capability extended-nexthop

Do not interface based peers change anything about when a
[no] neighbor <interface> capability extended-nexthop
is entered.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agobgpd: enhanced capability is always turned on for interface based peers
Donald Sharp [Tue, 3 May 2022 16:51:21 +0000 (12:51 -0400)]
bgpd: enhanced capability is always turned on for interface based peers

FRR is displaying that the peer enhanced capability command is not
turned on when the interface is part of a peer group.  Saving the
config and then reloading actually turns it off.

Fix the code so that FRR does not display the enhanced capability
for interface based peers.

Fixes: #11108
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoMerge pull request #11137 from opensourcerouting/if-name-len-fixes
Donald Sharp [Wed, 4 May 2022 11:44:26 +0000 (07:44 -0400)]
Merge pull request #11137 from opensourcerouting/if-name-len-fixes

*: standardize interface name maximum length

2 years agobgpd: Fix memory leak for bgp_notify_receive()
Donatas Abraitis [Wed, 4 May 2022 10:27:47 +0000 (13:27 +0300)]
bgpd: Fix memory leak for bgp_notify_receive()

Initialize outer/inner bgp_notify structs to zero.

Free bgp_notify.raw_data after use.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agoMerge pull request #11142 from patrasar/pim_register_show_fix
Rafael Zalamena [Tue, 3 May 2022 20:01:30 +0000 (17:01 -0300)]
Merge pull request #11142 from patrasar/pim_register_show_fix

pimd: fixing wrong diplay registerTx

2 years agobgpd: Show which RPKI server we are connected to
Donatas Abraitis [Tue, 3 May 2022 14:47:10 +0000 (17:47 +0300)]
bgpd: Show which RPKI server we are connected to

Before we just showed always the first server which is wrong.

Now we have:

```
spine1-debian-11# show rpki cache-connection
Connected to group 1
rpki tcp cache 192.168.10.17 8283 pref 1
rpki tcp cache 192.168.10.17 8282 pref 2 (connected)
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agopimd: fixing wrong diplay registerTx
sarita patra [Tue, 3 May 2022 15:53:47 +0000 (08:53 -0700)]
pimd: fixing wrong diplay registerTx

Signed-off-by: sarita patra <saritap@vmware.com>
2 years agobgpd: Add `rpki reset` to ENABLE node
Donatas Abraitis [Tue, 3 May 2022 12:44:11 +0000 (15:44 +0300)]
bgpd: Add `rpki reset` to ENABLE node

`rpki stop` and `rpki start` were already, let's add `rpki reset` as well.

Instead of going into configure mode.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agobgpd: Convert some variables from int to bool for RPKI
Donatas Abraitis [Tue, 3 May 2022 12:35:22 +0000 (15:35 +0300)]
bgpd: Convert some variables from int to bool for RPKI

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agodoc: Add missing commands for RPKI
Donatas Abraitis [Tue, 3 May 2022 12:28:53 +0000 (15:28 +0300)]
doc: Add missing commands for RPKI

rpki expire_interval
rpki retry_interval

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agobgpd: Make sure we print stats if we are sync at least with a single group
Donatas Abraitis [Tue, 3 May 2022 12:13:23 +0000 (15:13 +0300)]
bgpd: Make sure we print stats if we are sync at least with a single group

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agoRevert "bgpd: Handle TCP connection errors with connection callbacks for RPKI"
Donatas Abraitis [Tue, 3 May 2022 12:09:52 +0000 (15:09 +0300)]
Revert "bgpd: Handle TCP connection errors with connection callbacks for RPKI"

This reverts commit db3aca462b7d721da85dde12bcc5808f9c32c981.

Connection handling is already fixed in librtr 0.8.0.
https://github.com/rtrlib/rtrlib/releases/tag/v0.8.0

https://github.com/rtrlib/rtrlib/commit/179e7efb59529008eed77b3cf783667435dfba9f

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agoRevert "bgpd: Fix while(read()) for RPKI sync callback"
Donatas Abraitis [Tue, 3 May 2022 12:08:35 +0000 (15:08 +0300)]
Revert "bgpd: Fix while(read()) for RPKI sync callback"

This reverts commit b4fc876a327a89dc212efa48a04b76e53263722f.

2 years agoMerge pull request #11110 from anlancs/fix/bfdd-wrong-local
Sri Mohana Singamsetty [Mon, 2 May 2022 23:53:42 +0000 (16:53 -0700)]
Merge pull request #11110 from anlancs/fix/bfdd-wrong-local

bfdd: fix wrong local address of display command

2 years agoMerge pull request #11136 from donaldsharp/stupidity
Donatas Abraitis [Mon, 2 May 2022 19:48:38 +0000 (22:48 +0300)]
Merge pull request #11136 from donaldsharp/stupidity

tests: Use XCALLOC instead of XMALLOC for threads

2 years agoMerge pull request #11128 from opensourcerouting/feature/rfc8538
Donald Sharp [Mon, 2 May 2022 18:08:04 +0000 (14:08 -0400)]
Merge pull request #11128 from opensourcerouting/feature/rfc8538

bgpd: Implement GR N-Bit and CEASE/Hard Reset notification

2 years agoMerge pull request #11113 from opensourcerouting/pim6-icmp6-replace-bpf
Donald Sharp [Mon, 2 May 2022 17:19:47 +0000 (13:19 -0400)]
Merge pull request #11113 from opensourcerouting/pim6-icmp6-replace-bpf

pim6d: use ICMP6_FILTER instead of BPF on mroute

2 years agoMerge pull request #11132 from anlancs/fix/bgpd-prefix
Donald Sharp [Mon, 2 May 2022 17:17:08 +0000 (13:17 -0400)]
Merge pull request #11132 from anlancs/fix/bgpd-prefix

bgpd: delay "stream_new" in str2prefix_rd()

2 years agotests: Use XCALLOC instead of XMALLOC for threads
Donald Sharp [Mon, 2 May 2022 17:00:47 +0000 (13:00 -0400)]
tests: Use XCALLOC instead of XMALLOC for threads

Someone decided to do malloc testing over make check.

Fixes: #11120
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years ago*: remove the checking returned value for hash_get()
anlan_cs [Thu, 21 Apr 2022 06:37:12 +0000 (02:37 -0400)]
*: remove the checking returned value for hash_get()

Firstly, *keep no change* for `hash_get()` with NULL
`alloc_func`.

Only focus on cases with non-NULL `alloc_func` of
`hash_get()`.

Since `hash_get()` with non-NULL `alloc_func` parameter
shall not fail, just ignore the returned value of it.
The returned value must not be NULL.
So in this case, remove the unnecessary checking NULL
or not for the returned value and add `void` in front
of it.

Importantly, also *keep no change* for the two cases with
non-NULL `alloc_func` -
1) Use `assert(<returned_data> == <searching_data>)` to
   ensure it is a created node, not a found node.
   Refer to `isis_vertex_queue_insert()` of isisd, there
   are many examples of this case in isid.
2) Use `<returned_data> != <searching_data>` to judge it
   is a found node, then free <searching_data>.
   Refer to `aspath_intern()` of bgpd, there are many
   examples of this case in bgpd.

Here, <returned_data> is the returned value from `hash_get()`,
and <searching_data> is the data, which is to be put into
hash table.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agobgpd: fix memory leak for evpn
anlan_cs [Wed, 20 Apr 2022 10:57:53 +0000 (06:57 -0400)]
bgpd: fix memory leak for evpn

If `hash_get()` returns NULL, the list created with
`list_new()` is not be freed.

Since `hash_get()` should not fail, we don't need
`list_delete()` and other boring `XFREE()`s for its
failure case.

Just ignore returning value of `hash_get()` in these
cases.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agolib: change FRR interface name length definition
Rafael Zalamena [Mon, 2 May 2022 16:02:31 +0000 (13:02 -0300)]
lib: change FRR interface name length definition

Use the OS provided maximum name length instead of defining an arbitrary
one.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2 years ago*: use FRR interface name definition everywhere
Rafael Zalamena [Mon, 2 May 2022 16:00:12 +0000 (13:00 -0300)]
*: use FRR interface name definition everywhere

Don't rely on the OS interface name length definition and use the FRR
definition instead.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2 years agobfdd: remove "local_address" of bfd session
ewlumpkin [Thu, 10 Feb 2022 22:07:38 +0000 (17:07 -0500)]
bfdd: remove "local_address" of bfd session

The "local_address" of bfd is only used in `show bfd peers brief`
for single hop sessions which are configured without "local address".
Since it is set by destination address of received packet, not
completely correct, so remove it.

Signed-off-by: ewlumpkin <ewlumpkin@gmail.com>
Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agopbrd: fix interface compare usage
Rafael Zalamena [Fri, 29 Apr 2022 16:50:26 +0000 (13:50 -0300)]
pbrd: fix interface compare usage

Don't use `strncmp` when we expect to match the whole string.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2 years agobgpd: fix interface name compare
Rafael Zalamena [Fri, 29 Apr 2022 16:49:08 +0000 (13:49 -0300)]
bgpd: fix interface name compare

We always want to compare the whole string, lets not use `strncmp` for
this case.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2 years agobgpd: delay "stream_new" in str2prefix_rd()
anlan_cs [Sun, 1 May 2022 12:33:01 +0000 (08:33 -0400)]
bgpd: delay "stream_new" in str2prefix_rd()

`stream_new` in `str2prefix_rd()` can be called after some
checkings are passed, so the last `if (s)` in this fuction will
make sense.

Additionally some changes for `str2prefix_rd()`:
1) Use `RD_BYTES` instead of hard number for `stream_new()`
2) Remove unnecessary `lret` variable

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agoMerge pull request #10742 from plsaranya/pim_register
mobash-rasool [Mon, 2 May 2022 07:46:03 +0000 (13:16 +0530)]
Merge pull request #10742 from plsaranya/pim_register

pim6d: Register message send handling

2 years agobgpd: Implement CEASE/Hard Reset notification
Donatas Abraitis [Sat, 30 Apr 2022 20:04:58 +0000 (23:04 +0300)]
bgpd: Implement CEASE/Hard Reset notification

Also, add N-Bit (Notification) flag for Graceful Restart.

This is a preparation for RFC8538.

More information: https://datatracker.ietf.org/doc/html/rfc8538

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agoMerge pull request #11119 from kuldeepkash/pim_v6
Donatas Abraitis [Sat, 30 Apr 2022 14:04:38 +0000 (17:04 +0300)]
Merge pull request #11119 from kuldeepkash/pim_v6

tests: [PIMv6] Using generic names for PIM verification APIs

2 years agotests: [PIMv6] Using generic names for pim verification APIs
Kuldeep Kashyap [Thu, 28 Apr 2022 13:35:38 +0000 (19:05 +0530)]
tests: [PIMv6] Using generic names for pim verification APIs

1. Modified pim APIs name to generic one, same APIs would be used for PIMv4 and PIMv6
verifications
2. Modified all affacted scripts and ran multiple times locally to avoid CI failures

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
2 years agoMerge pull request #11122 from ak503/bgp_esi_str
Igor Ryzhov [Fri, 29 Apr 2022 15:59:59 +0000 (18:59 +0300)]
Merge pull request #11122 from ak503/bgp_esi_str

bgpd: fix size of esi_buf

2 years agoMerge pull request #11118 from opensourcerouting/time-fmt-nulls
Donald Sharp [Fri, 29 Apr 2022 14:00:05 +0000 (10:00 -0400)]
Merge pull request #11118 from opensourcerouting/time-fmt-nulls

lib: format NULL timevals correctly

2 years agobgpd: fix size of esi_buf
Dmitrii Turlupov [Fri, 29 Apr 2022 11:56:25 +0000 (14:56 +0300)]
bgpd: fix size of esi_buf

Fixes: #11111
Signed-off-by: Dmitrii Turlupov <dturlupov@factor-ts.ru>
2 years agoMerge pull request #10988 from AbhishekNR/ipv6_mroute_cli
David Lamparter [Fri, 29 Apr 2022 08:23:37 +0000 (10:23 +0200)]
Merge pull request #10988 from AbhishekNR/ipv6_mroute_cli

2 years agoMerge pull request #11114 from opensourcerouting/vrf-declvar-macros
mobash-rasool [Fri, 29 Apr 2022 08:23:08 +0000 (13:53 +0530)]
Merge pull request #11114 from opensourcerouting/vrf-declvar-macros

lib, zebra, pimd: clean up/fix VRF DECLVAR macros

2 years agoMerge pull request #10964 from mobash-rasool/pim-zebra
David Lamparter [Fri, 29 Apr 2022 08:22:41 +0000 (10:22 +0200)]
Merge pull request #10964 from mobash-rasool/pim-zebra

zebra, pimd, pim6d: Modify code to get multicast IPv6 stats from kernel

2 years agopim6d: Register message send handling
plsaranya [Mon, 7 Mar 2022 04:38:31 +0000 (10:08 +0530)]
pim6d: Register message send handling

Register and Null register send handling
In IPv6 PIM Null Register message if dummy PIM Header is included as
data, this dummy PIM header checksum needs to be valuated

Signed-off-by: plsaranya <Saranya_Panjarathina@dell.com>
2 years agoMerge pull request #11090 from ton31337/fix/plist_alist_duplicate
Donald Sharp [Thu, 28 Apr 2022 16:42:18 +0000 (12:42 -0400)]
Merge pull request #11090 from ton31337/fix/plist_alist_duplicate

lib: Ignore duplicate alist/plist entries in CLI

2 years agolib: format NULL timevals correctly
David Lamparter [Thu, 28 Apr 2022 10:23:16 +0000 (12:23 +0200)]
lib: format NULL timevals correctly

Passing NULL for a `%pTVMs` would result in `(null)Ms`, i.e. the `Ms`
flags not eaten up.  Change to eat those up, and print `-` instead for
NULL times.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2 years agoMerge pull request #11107 from opensourcerouting/prefix-more-unionizing
Donald Sharp [Thu, 28 Apr 2022 12:25:30 +0000 (08:25 -0400)]
Merge pull request #11107 from opensourcerouting/prefix-more-unionizing

lib: `struct prefix` spring cleaning

2 years agopim6d: Make pim_zlookup_sg_statistics available for v6
Mobashshera Rasool [Tue, 5 Apr 2022 14:55:22 +0000 (07:55 -0700)]
pim6d: Make pim_zlookup_sg_statistics available for v6

Since pim_zlookup.c is available for pimv6,
Call pim_zlookup_sg_statistics api for v6.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
2 years agodoc: Updated the doc for show ipv6 mroute commands
Abhishek N R [Fri, 8 Apr 2022 07:55:31 +0000 (00:55 -0700)]
doc: Updated the doc for show ipv6 mroute commands

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agopim6d: Implementing "show ipv6 mroute summary" CLI
Abhishek N R [Fri, 8 Apr 2022 07:34:02 +0000 (00:34 -0700)]
pim6d: Implementing "show ipv6 mroute summary" CLI

Adding new show CLI to display ipv6 mroute summary information.

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agopim6d: Implementing "show ipv6 mroute count" CLI
Abhishek N R [Fri, 8 Apr 2022 07:20:53 +0000 (00:20 -0700)]
pim6d: Implementing "show ipv6 mroute count" CLI

Adding new show CLI to display ipv6 mroute count information.

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agopim6d: Implementing "show ipv6 mroute" CLI
Abhishek N R [Fri, 8 Apr 2022 06:52:28 +0000 (23:52 -0700)]
pim6d: Implementing "show ipv6 mroute" CLI

Adding new show CLI to display ipv6 mroute information.

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agolib, zebra, pimd: clean up/fix VRF DECLVAR macros
David Lamparter [Thu, 28 Apr 2022 09:06:20 +0000 (11:06 +0200)]
lib, zebra, pimd: clean up/fix VRF DECLVAR macros

There's a common pattern of "get VRF context for CLI node" here, which
first got a helper macro in zebra that then permeated into pimd.

Unfortunately the pimd copy wasn't quite adjusted correctly and thus
caused two coverity warnings (CID 1517453, CID 1517454).

Fix the PIM one, and clean up by providing a common base macro in
`lib/vty.h`.

Also rename the macros (add `_VRF`) to make more clear what they do.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2 years agopim6d: use ICMP6_FILTER instead of BPF on mroute
David Lamparter [Wed, 27 Apr 2022 07:23:27 +0000 (09:23 +0200)]
pim6d: use ICMP6_FILTER instead of BPF on mroute

The ICMP6_FILTER option is always checked by the kernel, so the cost is
taken whether or not anything is set there.  Use it instead of taking on
additional cost with a BPF program.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2 years agozebra: Removed show_ipv6_mroute cli from zebra_vty.c
Abhishek N R [Fri, 8 Apr 2022 06:01:37 +0000 (23:01 -0700)]
zebra: Removed show_ipv6_mroute cli from zebra_vty.c

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agopimd: Moving the common functions from pim_cmd.c
Abhishek N R [Fri, 8 Apr 2022 05:42:03 +0000 (22:42 -0700)]
pimd: Moving the common functions from pim_cmd.c

Moving the functions that are used by both IPV4 and IPV6 to a
common file pim_cmd_common.c file

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agozebra, pimd: Add a field family in the message ZEBRA_IPMR_ROUTE_STATS
Mobashshera Rasool [Mon, 4 Apr 2022 10:17:32 +0000 (03:17 -0700)]
zebra, pimd: Add a field family in the message ZEBRA_IPMR_ROUTE_STATS

1. Adding a field family in the existing ZEBRA_IPMR_ROUTE_STATS
to get the ipv4 as well as ipv6 trafic stats between pim and zebra.
2. Modify the debug to print both v4/v6 prefixes

pimd: pim6d: Modify pim_zlookup_sg_statistics to get ipv6 stats

Modify the pim_zlookup_sg_statistics api to
get ipv4/ipv6 stats from zebra. Making the api
common.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
2 years agozebra: Modify base code to get ipv6 stats from kernel
Mobashshera Rasool [Mon, 4 Apr 2022 11:05:07 +0000 (04:05 -0700)]
zebra: Modify base code to get ipv6 stats from kernel

Modify the structure mcast_route_data to store ipv4/ipv6
addr and lastused multicast information from kernel.
Adjust the related APIs to parse ipv4/ipv6 informations.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
2 years agoMerge pull request #11031 from AbhishekNR/v6_multicast
David Lamparter [Thu, 28 Apr 2022 08:06:00 +0000 (10:06 +0200)]
Merge pull request #11031 from AbhishekNR/v6_multicast

2 years agoMerge pull request #11106 from donaldsharp/werror_error_error
David Lamparter [Thu, 28 Apr 2022 07:49:49 +0000 (09:49 +0200)]
Merge pull request #11106 from donaldsharp/werror_error_error

2 years agobgpd: Rename graceful restart constants for R-bit capabilities
Donatas Abraitis [Wed, 27 Apr 2022 19:30:29 +0000 (22:30 +0300)]
bgpd: Rename graceful restart constants for R-bit capabilities

Just to better understand what they mean.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agobgpd: Rename graceful restart constants for R/F flags
Donatas Abraitis [Wed, 27 Apr 2022 18:50:58 +0000 (21:50 +0300)]
bgpd: Rename graceful restart constants for R/F flags

Just to better understand what they mean.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 years agoMerge pull request #11098 from opensourcerouting/zapi-mrib-v6
Donald Sharp [Wed, 27 Apr 2022 13:27:49 +0000 (09:27 -0400)]
Merge pull request #11098 from opensourcerouting/zapi-mrib-v6

zebra, pimd: add IPv6 support to NEXTHOP_LOOKUP_MRIB

2 years agolib: prefix unionization
David Lamparter [Fri, 8 Apr 2022 16:17:38 +0000 (18:17 +0200)]
lib: prefix unionization

Ahead of May 1st, the workers of the prefix have decided on more
unionization.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2 years agotests: Correctly align variable type in tests
Donald Sharp [Wed, 27 Apr 2022 12:16:50 +0000 (08:16 -0400)]
tests: Correctly align variable type in tests

New compilers are noticing that the tests are compiling with
a pointer for the bgpd_privs variable while the bgp library
that is being linked against is not a pointer.  Since
these tests had the declaration just to make the compiler
happy, let's actually align the variable type to make the
compiler even happier.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agobgpd: Ensure pkt_afi and pkt_safi are not used uninited in some cases
Donald Sharp [Wed, 27 Apr 2022 11:57:41 +0000 (07:57 -0400)]
bgpd: Ensure pkt_afi and pkt_safi are not used uninited in some cases

The compiler is, rightly, pointing out that in some cases it is
possible that the pkt_afi and pkt_safi values are not properly
set and could result in a use before initialized.  I do not
actually belive that this is possible, but let's make the compiler
happy.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agodoc: Updated the doc for show ipv6 multicast commands
Abhishek N R [Wed, 20 Apr 2022 04:40:06 +0000 (21:40 -0700)]
doc: Updated the doc for show ipv6 multicast commands

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agopim6d: Implementing "show ipv6 multicast count" CLI
Abhishek N R [Thu, 14 Apr 2022 07:07:41 +0000 (00:07 -0700)]
pim6d: Implementing "show ipv6 multicast count" CLI

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agopim6d: Implementing "show ipv6 multicast" CLI
Abhishek N R [Thu, 14 Apr 2022 06:30:28 +0000 (23:30 -0700)]
pim6d: Implementing "show ipv6 multicast" CLI

Signed-off-by: Abhishek N R <abnr@vmware.com>
2 years agolib: remove unused `struct prefix_ptr`
David Lamparter [Wed, 27 Apr 2022 11:19:46 +0000 (13:19 +0200)]
lib: remove unused `struct prefix_ptr`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2 years agoMerge pull request #11095 from ecbaldwin/unlock-node-always
Donald Sharp [Tue, 26 Apr 2022 19:26:03 +0000 (15:26 -0400)]
Merge pull request #11095 from ecbaldwin/unlock-node-always

bgpd: ensure that the node gets unlocked in all cases

2 years agobgpd: ensure that the node gets unlocked in all cases
Carl Baldwin [Wed, 29 Dec 2021 21:32:33 +0000 (14:32 -0700)]
bgpd: ensure that the node gets unlocked in all cases

The logic to unlock dest if iteration completed without iterating the
entire node was flawed. Specifically, if iteration terminated due to
`gr_deferred == 0` then the node would not get unlocked.

This change takes into account the fact that dest will be NULL only in
the case when the entire table was iterated and all nodes were already
unlocked. In any other case, it needs to be unlocked.

Signed-off-by: Carl Baldwin <carl@ecbaldwin.net>
2 years agoMerge pull request #11076 from routingrocks/vrrp_master_ad_cli
Russ White [Tue, 26 Apr 2022 15:37:15 +0000 (11:37 -0400)]
Merge pull request #11076 from routingrocks/vrrp_master_ad_cli

vrrpd: Fix display of 'Master Advertisement interval'

2 years agoMerge pull request #11079 from opensourcerouting/staticd-nht-refactor-fix-startrace
Russ White [Tue, 26 Apr 2022 15:36:34 +0000 (11:36 -0400)]
Merge pull request #11079 from opensourcerouting/staticd-nht-refactor-fix-startrace

staticd: reorg, refactor and improve NHT code

2 years agoMerge pull request #11088 from opensourcerouting/pim-debug-snafus
mobash-rasool [Tue, 26 Apr 2022 15:35:50 +0000 (21:05 +0530)]
Merge pull request #11088 from opensourcerouting/pim-debug-snafus

pimd: fix SNAFUs in debug flags

2 years agopimd: clean up zlookup nexthop handling
David Lamparter [Tue, 26 Apr 2022 14:10:15 +0000 (16:10 +0200)]
pimd: clean up zlookup nexthop handling

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2 years agopim6d: implement/un-stub MRIB lookup
David Lamparter [Thu, 10 Mar 2022 14:38:59 +0000 (15:38 +0100)]
pim6d: implement/un-stub MRIB lookup

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2 years agozebra, pimd: add AF param on NEXTHOP_LOOKUP_MRIB
David Lamparter [Tue, 26 Apr 2022 12:52:53 +0000 (14:52 +0200)]
zebra, pimd: add AF param on NEXTHOP_LOOKUP_MRIB

By changing this API call to use a `struct ipaddr`, which encodes the
type of IP address with it.  (And rename/remove the `IPV4` from the
command name.)

Also add a comment explaining that this function call is going to be
obsolete in the long run since pimd needs to move to proper MRIB NHT.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2 years agozebra: add rib_match_ipv6_multicast variant
David Lamparter [Tue, 26 Apr 2022 12:29:38 +0000 (14:29 +0200)]
zebra: add rib_match_ipv6_multicast variant

... for IPv6, analogous to v4.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>