]> git.puffer.fish Git - mirror/frr.git/log
mirror/frr.git
12 months agoMerge pull request #15775 from Shbinging/fix_ospf_vtysh_commands
Donatas Abraitis [Wed, 17 Apr 2024 19:01:20 +0000 (22:01 +0300)]
Merge pull request #15775 from Shbinging/fix_ospf_vtysh_commands

ospfd: fix 'no maximum-paths' 'no write-multiplier'  commands

12 months agoMerge pull request #15771 from idryzhov/fix-keychain-crash
Donald Sharp [Wed, 17 Apr 2024 17:26:36 +0000 (13:26 -0400)]
Merge pull request #15771 from idryzhov/fix-keychain-crash

lib: fix keychain NB crash

12 months agoMerge pull request #15774 from louis-6wind/cleanup-allow-martians
Donatas Abraitis [Wed, 17 Apr 2024 16:17:54 +0000 (19:17 +0300)]
Merge pull request #15774 from louis-6wind/cleanup-allow-martians

bgpd: cleanup references to debug bgp allow-martians

12 months agoMerge pull request #15758 from opensourcerouting/pkg_libyang_versions
Igor Ryzhov [Wed, 17 Apr 2024 15:10:09 +0000 (18:10 +0300)]
Merge pull request #15758 from opensourcerouting/pkg_libyang_versions

debian, redhat, snapcraft: Libyang min version is 2.1.128

12 months agoospfd: fix 'no write-multiplier' command 15775/head
Bing Shui [Wed, 17 Apr 2024 10:41:11 +0000 (10:41 +0000)]
ospfd: fix 'no write-multiplier' command

Signed-off-by: Bing Shui <652023330037@smail.nju.edu.cn>
12 months agoospfd: fix 'no maximum-paths' command
Bing Shui [Wed, 17 Apr 2024 08:41:45 +0000 (08:41 +0000)]
ospfd: fix 'no maximum-paths' command

Signed-off-by: Bing Shui <652023330037@smail.nju.edu.cn>
12 months agobgpd: cleanup references to debug bgp allow-martians 15774/head
Louis Scalbert [Wed, 17 Apr 2024 07:51:07 +0000 (09:51 +0200)]
bgpd: cleanup references to debug bgp allow-martians

The debug command was removed in 17e9298e47 ("bgpd: Remove 'debug bgp
allow-martian'")

Cleanup all references to the debug command.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
12 months agolib: fix keychain NB crash 15771/head
Igor Ryzhov [Tue, 16 Apr 2024 20:34:20 +0000 (23:34 +0300)]
lib: fix keychain NB crash

Operational data should not be used on validation stage. Move the usage
to apply stage only.

Fixes #15707.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
12 months agoMerge pull request #15715 from zhou-run/202404092057
Russ White [Tue, 16 Apr 2024 19:51:12 +0000 (15:51 -0400)]
Merge pull request #15715 from zhou-run/202404092057

isisd: The hold time of hello packets on a P2P link does not match the sending interval.

12 months agoMerge pull request #15709 from chiragshah6/fdev2
Mark Stapp [Tue, 16 Apr 2024 15:32:18 +0000 (11:32 -0400)]
Merge pull request #15709 from chiragshah6/fdev2

tools: frr-reload strip interface vrf ctx line

12 months agoMerge pull request #15755 from opensourcerouting/fix/check_for_bgpd_rpki
Russ White [Tue, 16 Apr 2024 14:19:26 +0000 (10:19 -0400)]
Merge pull request #15755 from opensourcerouting/fix/check_for_bgpd_rpki

vtysh: Check if bgpd is enabled before installing vtysh commands for RPKI

12 months agoMerge pull request #15733 from opensourcerouting/fix/json_output_for_show_bgp_ipv4_un...
Russ White [Tue, 16 Apr 2024 14:15:20 +0000 (10:15 -0400)]
Merge pull request #15733 from opensourcerouting/fix/json_output_for_show_bgp_ipv4_unicast_json_detail

bgpd: Drop newline in JSON output for `show bgp afi safi json detail`

12 months agoMerge pull request #15732 from opensourcerouting/fix/drop_bgp_network_import_check_ex...
Russ White [Tue, 16 Apr 2024 14:14:41 +0000 (10:14 -0400)]
Merge pull request #15732 from opensourcerouting/fix/drop_bgp_network_import_check_exact_cmd

bgpd: Drop `bgp_network_import_check_exact_cmd` command

12 months agoMerge pull request #15726 from donaldsharp/med_value
Russ White [Tue, 16 Apr 2024 14:14:12 +0000 (10:14 -0400)]
Merge pull request #15726 from donaldsharp/med_value

bgpd: Fix display when using `missing-as-worst`

12 months agoMerge pull request #15616 from pguibert6WIND/srv6_seg_list_sid_order
Russ White [Tue, 16 Apr 2024 11:55:05 +0000 (07:55 -0400)]
Merge pull request #15616 from pguibert6WIND/srv6_seg_list_sid_order

zebra: fix static srv6 segment-list sid order

12 months agoMerge pull request #15572 from donaldsharp/best_path_stuff_sigh
Russ White [Tue, 16 Apr 2024 11:52:09 +0000 (07:52 -0400)]
Merge pull request #15572 from donaldsharp/best_path_stuff_sigh

bgp_process work

12 months agodebian, redhat, snapcraft: Libyang min version is 2.1.128 15758/head
Martin Winter [Tue, 16 Apr 2024 11:40:52 +0000 (13:40 +0200)]
debian, redhat, snapcraft: Libyang min version is 2.1.128

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
12 months agovtysh: Check if bgpd is enabled before installing vtysh commands for RPKI 15755/head
Donatas Abraitis [Tue, 16 Apr 2024 08:56:39 +0000 (11:56 +0300)]
vtysh: Check if bgpd is enabled before installing vtysh commands for RPKI

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agoMerge pull request #15749 from idryzhov/fix-dnssl
Donatas Abraitis [Tue, 16 Apr 2024 04:19:06 +0000 (07:19 +0300)]
Merge pull request #15749 from idryzhov/fix-dnssl

zebra: fix encoded DNSSL length

12 months agozebra: fix encoded DNSSL length 15749/head
Igor Ryzhov [Mon, 15 Apr 2024 20:31:26 +0000 (23:31 +0300)]
zebra: fix encoded DNSSL length

The encoded DNSSL length is not set so the value is missing from RA
packet.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
12 months agobgpd: Fix display when using `missing-as-worst` 15726/head
Donald Sharp [Thu, 11 Apr 2024 14:46:46 +0000 (10:46 -0400)]
bgpd: Fix display when using `missing-as-worst`

The usage of the `bgp bestpath med missing-as-worst` command
was being accepted and applied during bestpath, but during output
of the routes affected by this it would not give any indication
that this was happening or what med value was being used.

Fixes: #15718
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
12 months agoMerge pull request #15724 from opensourcerouting/fix/ospfd_cleanup_deprecation
Donald Sharp [Mon, 15 Apr 2024 15:29:04 +0000 (11:29 -0400)]
Merge pull request #15724 from opensourcerouting/fix/ospfd_cleanup_deprecation

ospfd, ospf6d: Remove deprecated JSON fields

12 months agoMerge pull request #15728 from raja-rajasekar/rajasekarr/backpressure_fix_coverity
Mark Stapp [Mon, 15 Apr 2024 15:26:54 +0000 (11:26 -0400)]
Merge pull request #15728 from raja-rajasekar/rajasekarr/backpressure_fix_coverity

zebra: backpressure - Fix Null ptr access (Coverity Issue)

12 months agoMerge pull request #15735 from opensourcerouting/feature/maximum-prefix_evpn
Donald Sharp [Mon, 15 Apr 2024 15:24:05 +0000 (11:24 -0400)]
Merge pull request #15735 from opensourcerouting/feature/maximum-prefix_evpn

bgpd: Allow using maximum-prefix for EVPN

12 months agoMerge pull request #15734 from opensourcerouting/fix/compile_truncation
Donald Sharp [Mon, 15 Apr 2024 15:23:15 +0000 (11:23 -0400)]
Merge pull request #15734 from opensourcerouting/fix/compile_truncation

Fix compile warning with -Wformat-truncation

12 months agoMerge pull request #15741 from opensourcerouting/fix/flowspec_redirect_ipv6_community
Donald Sharp [Mon, 15 Apr 2024 15:22:37 +0000 (11:22 -0400)]
Merge pull request #15741 from opensourcerouting/fix/flowspec_redirect_ipv6_community

bgpd: Flow Spec redirect IPv6 Extended Community should be 0x0d

12 months agoMerge pull request #15686 from pguibert6WIND/tcp_non_established_get_port_and_ip
Donatas Abraitis [Mon, 15 Apr 2024 13:40:15 +0000 (16:40 +0300)]
Merge pull request #15686 from pguibert6WIND/tcp_non_established_get_port_and_ip

BGP TCP non established : get port and ip

12 months agoMerge pull request #15743 from anlancs/compile-bgp-vnc
Donatas Abraitis [Mon, 15 Apr 2024 13:33:04 +0000 (16:33 +0300)]
Merge pull request #15743 from anlancs/compile-bgp-vnc

bgpd: fix compile error

12 months agobgpd: fix compile error 15743/head
anlan_cs [Mon, 15 Apr 2024 08:13:20 +0000 (16:13 +0800)]
bgpd: fix compile error

This is happening when configuring with `--disable-bgp-vnc`:
```
./bgpd/bgp_route.c:3342:23: error: unused variable ‘p’ [-Werror=unused-variable]

 3342 |  const struct prefix *p = bgp_dest_get_prefix(dest);
```

Signed-off-by: anlan_cs <anlan_cs@tom.com>
12 months agobgpd: fix addressing information of non established outgoing sessions 15686/head
Philippe Guibert [Fri, 5 Apr 2024 07:55:05 +0000 (09:55 +0200)]
bgpd: fix addressing information of non established outgoing sessions

When trying to connect to a BGP peer that does not respons, the 'show
bgp neighbors' command does not give any indication on the local and
remote addresses used:

> # show bgp neighbors
>  BGP neighbor is 192.0.2.150, remote AS 65500, local AS 65500, internal link
>   Local Role: undefined
>   Remote Role: undefined
>   BGP version 4, remote router ID 0.0.0.0, local router ID 192.0.2.1
>   BGP state = Connect
> [..]
>   Connections established 0; dropped 0
>   Last reset 00:00:04,   Waiting for peer OPEN (n/a)
>   Internal BGP neighbor may be up to 255 hops away.
> BGP Connect Retry Timer in Seconds: 120
> Next connect timer due in 117 seconds
> Read thread: off  Write thread: off  FD used: 27

The addressing information (address and port) are only available
when TCP session is established, whereas this information is present
at the system level:

> root@ubuntu2204:~# netstat -pan | grep 192.0.2.1
> tcp        0      0 192.0.2.1:179           192.0.2.150:38060       SYN_RECV    -
> tcp        0      1 192.0.2.1:46526         192.0.2.150:179         SYN_SENT    488310/bgpd

Add the display for outgoing BGP session, as the information in
the getsockname() API provides information for connected streams.
When getpeername() API does not give any information, use the peer
configuration (destination port is encoded in peer->port).

> # show bgp neighbors
> BGP neighbor is 192.0.2.150, remote AS 65500, local AS 65500, internal link
>   Local Role: undefined
>   Remote Role: undefined
>   BGP version 4, remote router ID 0.0.0.0, local router ID 192.0.2.1
>   BGP state = Connect
> [..]
>   Connections established 0; dropped 0
>   Last reset 00:00:16,   Waiting for peer OPEN (n/a)
> Local host: 192.0.2.1, Local port: 46084
> Foreign host: 192.0.2.150, Foreign port: 179

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
12 months agobgpd: remove useless control checks about TCP connection
Philippe Guibert [Fri, 5 Apr 2024 11:52:27 +0000 (13:52 +0200)]
bgpd: remove useless control checks about TCP connection

When attempting to get the src and destination addresses of a given
connection, the API may return the NULL pointer, but further code
in bgp_zebra_nexthop_set() already does a check about the given
pointer.

Relaxing the error code for all the returned adressing.

Fixes: 1ff9a340588a ("bgpd: bgpd-fsm-fix.patch")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
12 months agobgpd: Flow Spec redirect IPv6 Extended Community should be 0x0d 15741/head
Donatas Abraitis [Mon, 15 Apr 2024 06:27:07 +0000 (09:27 +0300)]
bgpd: Flow Spec redirect IPv6 Extended Community should be 0x0d

RFC 8956 defines this already clearly.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agoMerge pull request #15592 from pguibert6WIND/fix_srte_color
Donatas Abraitis [Sun, 14 Apr 2024 18:09:47 +0000 (21:09 +0300)]
Merge pull request #15592 from pguibert6WIND/fix_srte_color

bgpd: fix register NHT with appropriate colored ext. community

12 months agoMerge pull request #15612 from sri-mohan1/srib-24-zebra-b
Donatas Abraitis [Sun, 14 Apr 2024 18:06:28 +0000 (21:06 +0300)]
Merge pull request #15612 from sri-mohan1/srib-24-zebra-b

zebra: changes for code maintainability

12 months agoMerge pull request #15731 from anlancs/bgpd-add-gr-fsm
Donatas Abraitis [Sat, 13 Apr 2024 20:19:49 +0000 (23:19 +0300)]
Merge pull request #15731 from anlancs/bgpd-add-gr-fsm

bgpd: adjust checking return value for commands

12 months agotests: Check if maximum-prefix works for EVPN stuff also 15735/head
Donatas Abraitis [Sat, 13 Apr 2024 20:09:12 +0000 (23:09 +0300)]
tests: Check if maximum-prefix works for EVPN stuff also

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agobgpd: Allow using `maximum-prefix` for EVPN
Donatas Abraitis [Sat, 13 Apr 2024 19:54:18 +0000 (22:54 +0300)]
bgpd: Allow using `maximum-prefix` for EVPN

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agoospfd: Fix compile warning with `-Wformat-truncation` 15734/head
Donatas Abraitis [Sat, 13 Apr 2024 19:41:43 +0000 (22:41 +0300)]
ospfd: Fix compile warning with `-Wformat-truncation`

ospfd/ospf_sr.c: In function ‘show_sr_node.part.5’:
ospfd/ospf_sr.c:2745:32: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 2 [-Wformat-truncation=]
    snprintf(tmp, sizeof(tmp), "%u", i);
                                ^~
ospfd/ospf_sr.c:2745:31: note: directive argument in the range [0, 2147483646]
    snprintf(tmp, sizeof(tmp), "%u", i);

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agoisisd: Fix compile warning with `-Wformat-truncation`
Donatas Abraitis [Sat, 13 Apr 2024 19:40:46 +0000 (22:40 +0300)]
isisd: Fix compile warning with `-Wformat-truncation`

isisd/isis_spf.c: In function ‘show_isis_route_common’:
isisd/isis_spf.c:3034:39: warning: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 2 [-Wformat-truncation=]
     snprintf(key, sizeof(key), "level-%d", level);
                                       ^~
isisd/isis_spf.c:3034:32: note: directive argument in the range [1, 2147483646]
     snprintf(key, sizeof(key), "level-%d", level);
                                ^~~~~~~~~~

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agoMerge pull request #15727 from donaldsharp/evpn_zebra_interactions
Donatas Abraitis [Sat, 13 Apr 2024 19:19:10 +0000 (22:19 +0300)]
Merge pull request #15727 from donaldsharp/evpn_zebra_interactions

Evpn zebra interactions

12 months agobgpd: Drop newline in JSON output for `show bgp afi safi json detail` 15733/head
Donatas Abraitis [Sat, 13 Apr 2024 19:17:01 +0000 (22:17 +0300)]
bgpd: Drop newline in JSON output for `show bgp afi safi json detail`

Before:

```
{
 "vrfId": 0,
 "vrfName": "default",
 "tableVersion": 2,
 "routerId": "1.1.1.1",
 "defaultLocPrf": 100,
 "localAS": 65001,
 "routes": { "192.168.1.0/24": {
"prefix": "192.168.1.0/24",
"version": "1",

"paths": [{"aspath":{"string":"Local","segments":[],"length":0},"origin":"IGP","metric":0,"weight":32768,"valid":true,"version":1,"sourced":true,"local":true,"bestpath":{"overall":true,"selectionReason":"First path received"},"lastUpdate":{"epoch":1713035588,"string":"Sat Apr 13 22:13:08 2024\n"},"nexthops":[{"ip":"0.0.0.0","hostname":"donatas.net","afi":"ipv4","metric":0,"accessible":true,"used":true}],"peer":{"peerId":"0.0.0.0","routerId":"1.1.1.1"}}]
} ,"192.168.11.0/24": {
"prefix": "192.168.11.0/24",
"version": "2",

"paths": [{"aspath":{"string":"Local","segments":[],"length":0},"origin":"IGP","metric":0,"weight":32768,"valid":true,"version":2,"sourced":true,"local":true,"bestpath":{"overall":true,"selectionReason":"First path received"},"lastUpdate":{"epoch":1713035588,"string":"Sat Apr 13 22:13:08 2024\n"},"nexthops":[{"ip":"0.0.0.0","hostname":"donatas.net","afi":"ipv4","metric":0,"accessible":true,"used":true}],"peer":{"peerId":"0.0.0.0","routerId":"1.1.1.1"}}]
}  }  }
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agobgpd: Drop `bgp_network_import_check_exact_cmd` command 15732/head
Donatas Abraitis [Sat, 13 Apr 2024 19:10:14 +0000 (22:10 +0300)]
bgpd: Drop `bgp_network_import_check_exact_cmd` command

Not documented, and it's just an alias.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agobgpd: prompt should be given only for the real change 15731/head
anlan_cs [Fri, 12 Apr 2024 14:56:41 +0000 (22:56 +0800)]
bgpd: prompt should be given only for the real change

Prompt nothing for an empty (and failed) operation.  Take
`bgp graceful-restart` as an example:

Before:
```
anlan(config-router)# bgp graceful-restart
Graceful restart configuration changed, reset all peers to take effect
anlan(config-router)# bgp graceful-restart
Graceful restart configuration changed, reset all peers to take effect
anlan(config-router)#
```

After:
```
anlan(config-router)# bgp graceful-restart
Graceful restart configuration changed, reset all peers to take effect
anlan(config-router)# bgp graceful-restart
anlan(config-router)#
```

Signed-off-by: anlan_cs <anlan_cs@tom.com>
12 months agobpgd: adjust return value for the same command
anlan_cs [Fri, 12 Apr 2024 13:57:30 +0000 (21:57 +0800)]
bpgd: adjust return value for the same command

The same command should be accepted, it is an empty operation.  Take
`neighbor <X> graceful-restart-helper` as an example:

Before:
```
anlan(config-router)# neighbor 3.3.3.3 graceful-restart-helper
Graceful restart configuration changed, reset this peer to take effect
anlan(config-router)# neighbor 3.3.3.3 graceful-restart-helper
Graceful restart configuration changed, reset this peer to take effect
% The Graceful Restart command used is not valid at this moment.
anlan(config-router)#
```

After:
```
anlan(config-router)# neighbor 3.3.3.3 graceful-restart-helper
Graceful restart configuration changed, reset this peer to take effect
anlan(config-router)# neighbor 3.3.3.3 graceful-restart-helper
Graceful restart configuration changed, reset this peer to take effect
anlan(config-router)#
```

Signed-off-by: anlan_cs <anlan_cs@tom.com>
12 months agozebra: backpressure - Fix Null ptr access (Coverity Issue) 15728/head
Rajasekar Raja [Fri, 12 Apr 2024 05:27:37 +0000 (22:27 -0700)]
zebra: backpressure - Fix Null ptr access (Coverity Issue)

Fix dereferencing NULL ptr making coverity happy.

Ticket :#3390099

Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
12 months agoMerge pull request #15697 from zmw12306/bfd_check_Mflag
Igor Ryzhov [Fri, 12 Apr 2024 13:09:43 +0000 (16:09 +0300)]
Merge pull request #15697 from zmw12306/bfd_check_Mflag

bfdd: Add check for flag Multipoint (M)

12 months agobgpd: Convert int's to bool in a couple of spots 15727/head
Donald Sharp [Thu, 11 Apr 2024 17:47:57 +0000 (13:47 -0400)]
bgpd: Convert int's to bool in a couple of spots

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
12 months agobgpd: Increase install/uninstall speed of evpn vpn vni's
Donald Sharp [Thu, 11 Apr 2024 17:28:30 +0000 (13:28 -0400)]
bgpd: Increase install/uninstall speed of evpn vpn vni's

BGP receives notification from zebra about an vpn that
needs to be installed into the evpn tables.  Unfortunately
this function was walking the entirety of evpn tables
3 times.  Modify the code to walk the tree 1 time and
to just look for the needed route types as you go.

This reduces, in a scaled environment, processing
time of the zclient_read function from 130 seconds
to 95 seconds.  For a up / down / up interface
scenario.

Signed-off-by: Rajasekar Raja <rajasekarr@vndia.com>
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
12 months agoMerge pull request #15688 from mjstapp/dplane_api_version
Jafar Al-Gharaibeh [Fri, 12 Apr 2024 04:54:02 +0000 (23:54 -0500)]
Merge pull request #15688 from mjstapp/dplane_api_version

lib, zebra: Add a version scheme for the dataplane API

12 months agobfdd: add check for flag M 15697/head
zmw12306 [Sun, 7 Apr 2024 20:19:38 +0000 (16:19 -0400)]
bfdd:  add check for flag M

Signed-off-by: zmw12306 <zmw12306@gmail.com>
12 months agoMerge pull request #15710 from acooks-at-bda/bugfix/fix-indent-byte-handling
Donald Sharp [Thu, 11 Apr 2024 12:25:15 +0000 (08:25 -0400)]
Merge pull request #15710 from acooks-at-bda/bugfix/fix-indent-byte-handling

tools/indent.py: fix encoded byte stream handling

12 months agoMerge pull request #15661 from routingrocks/master
Donatas Abraitis [Thu, 11 Apr 2024 10:44:00 +0000 (13:44 +0300)]
Merge pull request #15661 from routingrocks/master

pimd:  pim mlag summary should display the down connection status.

12 months agoMerge pull request #15719 from pguibert6WIND/show_bgp_neighbors_extra_line
Donatas Abraitis [Thu, 11 Apr 2024 10:40:06 +0000 (13:40 +0300)]
Merge pull request #15719 from pguibert6WIND/show_bgp_neighbors_extra_line

bgpd: fix 'show bgp neighbors' output

12 months agoospfd, ospf6d: Remove deprecated JSON fields 15724/head
Donatas Abraitis [Thu, 11 Apr 2024 10:34:17 +0000 (13:34 +0300)]
ospfd, ospf6d: Remove deprecated JSON fields

restartSupoort

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
12 months agotools: frr-reload strip interface vrf ctx line 15709/head
Chirag Shah [Tue, 9 Apr 2024 00:14:48 +0000 (17:14 -0700)]
tools: frr-reload strip interface vrf ctx line

if frr.conf file contains 'interface x vrf <name> config
it causes protocol (like ospf) neighbor session flap,
as it deletes interface base config line ('interface x') from
running config and readds with 'interface x vrf <name>'
line from frr.conf.
This deletion and readdition of lines leads to neighborship
flaps.

This issue is by product of (PR-10411 | https://github.com/FRRouting/frr/pull/10411)
(commit id: 788a036fdb)
where running config for interface config no loger displays associated
vrf line.

Ticket: #3858146
Testing:

frr.conf
interface swp1.2 vrf vrf1012
ip ospf network point-to-point

running-config:
interface swp1.2
 ip ospf network point-to-point
 exit

Before fix:
frr-reload logs:

2024-04-09 00:28:31,096  INFO: Executed "interface swp1.2  no ip ospf
network point-to-point exit"

 'interface swp1.2 vrf vrf1012\n ip ospf network
 point-to-point\nexit\n',

After fix:
frr-reload strips vrf line, thus no config change between
frr.conf and running config.

Signed-off-by: Chirag Shah <chirag@nvidia.com>
12 months agoMerge pull request #15582 from donaldsharp/zebra_rtadv_use_without_init
Donatas Abraitis [Wed, 10 Apr 2024 17:58:35 +0000 (20:58 +0300)]
Merge pull request #15582 from donaldsharp/zebra_rtadv_use_without_init

Zebra rtadv use without init

12 months agotests: Cleanup generate_support_bundle() to not fail 15582/head
Donald Sharp [Tue, 19 Mar 2024 23:30:41 +0000 (19:30 -0400)]
tests: Cleanup generate_support_bundle() to not fail

The Support bundle generation was/is failing in both
our upstream ci and locally.  This cleans up the failures
that I am seeing such that tests now continue to run
instead of aborting the test run.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
12 months agozebra: rtadv uses uninited data to sendmsg
Donald Sharp [Tue, 19 Mar 2024 22:29:31 +0000 (18:29 -0400)]
zebra: rtadv uses uninited data to sendmsg

valgrind is complaining about this problem.
This fixes it.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
12 months agobgpd: fix 'show bgp neighbors' output 15719/head
Philippe Guibert [Wed, 10 Apr 2024 12:13:54 +0000 (14:13 +0200)]
bgpd: fix 'show bgp neighbors' output

The 'show bgp neighbors' output appends additional lines after GR mode
helpers.

> # show bgp neighbors
> [..]
>     End-of-RIB received: IPv4 VPN
>     Local GR Mode: Helper*
>
>     Remote GR Mode: Helper
>
>     R bit: True
>

Fix this by not appending the extra line feed.

> # show bgp neighbors
> [..]
>     End-of-RIB received: IPv4 VPN
>     Local GR Mode: Helper*
>     Remote GR Mode: Helper
>     R bit: True

Fixes: 0e4e879b4084 ("bgpd: fix silly format string SNAFU")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
12 months agoMerge pull request #13627 from anlancs/pimd/pimreg-vrf-add-break
mobash-rasool [Wed, 10 Apr 2024 11:20:07 +0000 (16:50 +0530)]
Merge pull request #13627 from anlancs/pimd/pimreg-vrf-add-break

pimd: Set pimreg interface with one master

12 months agotools/indent.py: fix encoded byte stream handling 15710/head
Andrew Cooks [Tue, 9 Apr 2024 05:39:14 +0000 (15:39 +1000)]
tools/indent.py: fix encoded byte stream handling

Python subprocess communication now operates on bytes, not strings.

Signed-off-by: Andrew Cooks <acooks.at.bda@gmail.com>
12 months agoMerge pull request #15708 from donaldsharp/zebra_fix_io_display
Donatas Abraitis [Wed, 10 Apr 2024 05:26:02 +0000 (08:26 +0300)]
Merge pull request #15708 from donaldsharp/zebra_fix_io_display

Zebra fix io display and shorten evpn zapi packet sizes

12 months agoMerge pull request #15624 from raja-rajasekar/rajasekarr/backpressure_bgp_zebra_clien...
Donatas Abraitis [Wed, 10 Apr 2024 05:22:25 +0000 (08:22 +0300)]
Merge pull request #15624 from raja-rajasekar/rajasekarr/backpressure_bgp_zebra_client_EVPN

bgpd : backpressure - Handle BGP-Zebra(EPVN) Install evt Creation

12 months agoMerge pull request #15711 from louis-6wind/fix_test_table_version
Donald Sharp [Tue, 9 Apr 2024 22:34:13 +0000 (18:34 -0400)]
Merge pull request #15711 from louis-6wind/fix_test_table_version

topotests: do not check table version

12 months agoMerge pull request #15693 from anlancs/fix/zebra-label-bind
Donald Sharp [Tue, 9 Apr 2024 22:33:29 +0000 (18:33 -0400)]
Merge pull request #15693 from anlancs/fix/zebra-label-bind

zebra: fix wrong check for mpls label

12 months agoMerge pull request #15660 from LabNConsulting/acee/ospf-p2mp-non-broadcast
Russ White [Tue, 9 Apr 2024 15:56:34 +0000 (11:56 -0400)]
Merge pull request #15660 from LabNConsulting/acee/ospf-p2mp-non-broadcast

ospfd: Implement non-broadcast support for point-to-multipoint networks

12 months agozebra: Use more appropriately sized stream packets for evpn 15708/head
Donald Sharp [Mon, 8 Apr 2024 20:29:57 +0000 (16:29 -0400)]
zebra: Use more appropriately sized stream packets for evpn

When sending EVPN data, let's use more appropriately sized
packets for the sending of data.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
12 months agozebra: Actually display I/O buffer sizes
Donald Sharp [Mon, 8 Apr 2024 20:24:05 +0000 (16:24 -0400)]
zebra: Actually display I/O buffer sizes

An operator found a situation where zebra was
backing up in a significant way towards BGP
with EVPN changes taking up some serious amounts
of memory.  The key lines that would have clued
us in on it were behind a dev build.  Let's change
this.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
12 months agoisisd: The hold time of hello packets on a P2P link does not match the sending interval. 15715/head
zhou-run [Tue, 9 Apr 2024 12:59:22 +0000 (20:59 +0800)]
isisd: The hold time of hello packets on a P2P link does not match the sending interval.

The hold time filled in the hello packets of a P2P link is calculated based on the level 1 configuration, while the hello timer is based on the level 2 configuration. If the hello interval times in level 1 and level 2 configurations are inconsistent, it may lead to neighbor establishment failure.

Signed-off-by: zhou-run <166502045+zhou-run@users.noreply.github.com>
12 months agodoc: add doc about the zebra dataplane api version 15688/head
Mark Stapp [Mon, 8 Apr 2024 18:23:58 +0000 (14:23 -0400)]
doc: add doc about the zebra dataplane api version

Add a block to the dev doc about the dataplane api version.

Signed-off-by: Mark Stapp <mjs@cisco.com>
12 months agozebra: add dataplane API version value
Mark Stapp [Fri, 5 Apr 2024 17:32:08 +0000 (13:32 -0400)]
zebra: add dataplane API version value

Add a version value and accessor API for the zebra dataplane;
plugins can test this to detect API changes.

Signed-off-by: Mark Stapp <mjs@cisco.com>
12 months agolib: add simple generic version helpers
Mark Stapp [Fri, 5 Apr 2024 17:14:48 +0000 (13:14 -0400)]
lib: add simple generic version helpers

Add some simple helpers for generic major+minor+sub version
values.

Signed-off-by: Mark Stapp <mjs@cisco.com>
12 months agotopotests: do not check table version 15711/head
Louis Scalbert [Tue, 9 Apr 2024 07:45:06 +0000 (09:45 +0200)]
topotests: do not check table version

BGP table version is variable. Don't check it.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
12 months agoMerge pull request #15703 from louis-6wind/add-linkbw-diagram
Mark Stapp [Tue, 9 Apr 2024 12:34:11 +0000 (08:34 -0400)]
Merge pull request #15703 from louis-6wind/add-linkbw-diagram

tests: add ascii diagram to test_bgp_linkbw_ip

12 months agobgpd : backpressure - Handle BGP-Zebra(EPVN) Install evt Creation 15624/head
Rajasekar Raja [Thu, 15 Feb 2024 19:23:51 +0000 (11:23 -0800)]
bgpd : backpressure - Handle BGP-Zebra(EPVN) Install evt Creation

Current changes deals with EVPN routes installation to zebra.

In evpn_route_select_install() we invoke evpn_zebra_install/uninstall
which sends zclient_send_message().

This is a continuation of code changes (similar to
ccfe452763d16c432fa81fd20e805bec819b345e) but to handle evpn part
of the code.

Ticket: #3390099

Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
12 months agoMerge pull request #15645 from opensourcerouting/fix/show_ip_route_vrf_all_summary_json 14610/head
Donald Sharp [Mon, 8 Apr 2024 15:12:40 +0000 (11:12 -0400)]
Merge pull request #15645 from opensourcerouting/fix/show_ip_route_vrf_all_summary_json

zebra: Fix JSON output for `show route summary json`

12 months agotests: add ascii diagram to test_bgp_linkbw_ip 15703/head
Louis Scalbert [Tue, 26 Mar 2024 09:23:37 +0000 (10:23 +0100)]
tests: add ascii diagram to test_bgp_linkbw_ip

Add ASCII diagram to test_bgp_linkbw_ip

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
12 months agozebra: fix static srv6 segment-list sid order 15616/head
Dmytro Shytyi [Wed, 20 Dec 2023 15:18:32 +0000 (16:18 +0100)]
zebra: fix static srv6 segment-list sid order

When configuring a SID list by vtysh, the segment list
obtained in iproute2 is the exact opposite:
>
>vtysh:
>ipv6 route 2005::/64 eth0 segments 2001:db8:aaaa::7/2002::2/2003::3/2004::4
>
>root@r1:/# ip -6 route
>2005::/64 nhid 6  encap seg6 mode encap segs 4 [ 2004::4 2003::3 2002::2 2001:db8:aaaa::7 ] dev dummy0 proto 196 metric 20 pref medium
>

Fix this by keeping the same vtysh config and swap the
segment's order of the list in the rt_netlink.c
>
>root@r1:/# ip -6 route
>2005::/64 nhid 6  encap seg6 mode encap segs 4 [ 2001:db8:aaaa::7 2002::2 2003::3 2004::4 ] dev dummy0 proto 196 metric 20 pref medium
>

Fixes: f20cf14 ("bgpd,lib,sharpd,zebra: srv6 introduce multiple segs/SIDs in nexthop")
Signed-off-by: Dmytro Shytyi <dmytro.shytyi@6wind.com>
12 months agoMerge pull request #15700 from anlancs/fix/doc-bgp-gr
Donatas Abraitis [Mon, 8 Apr 2024 13:35:23 +0000 (16:35 +0300)]
Merge pull request #15700 from anlancs/fix/doc-bgp-gr

doc: fix one bgp command

12 months agodoc: fix one bgp command 15700/head
anlan_cs [Mon, 8 Apr 2024 09:24:40 +0000 (17:24 +0800)]
doc: fix one bgp command

Fixed one bgp comamnd based on code.

Signed-off-by: anlan_cs <anlan_cs@tom.com>
12 months agozebra: fix wrong check for mpls label 15693/head
anlan_cs [Fri, 5 Apr 2024 07:03:15 +0000 (15:03 +0800)]
zebra: fix wrong check for mpls label

Add a parameter for `zebra_mpls_fec_for_label()`, as before if it is `NULL`,
otherwise exclude what this parameter represents.

Before:
```
anlan(config)# mpls label bind 1.1.1.2/32 88
anlan(config)# mpls label bind 1.1.1.2/32 88
% Label already bound to a FEC
anlan(config)# mpls label bind 1.1.1.3/32 88
% Label already bound to a FEC
```

After:
```
anlan(config)# mpls label bind 1.1.1.2/32 88
anlan(config)# mpls label bind 1.1.1.2/32 88
anlan(config)# mpls label bind 1.1.1.3/32 88
% Label already bound to a FEC
```

Signed-off-by: anlan_cs <anlan_cs@tom.com>
12 months agoMerge pull request #15687 from anlancs/fix/doc-isisd-append-vrf
Donald Sharp [Fri, 5 Apr 2024 23:29:04 +0000 (19:29 -0400)]
Merge pull request #15687 from anlancs/fix/doc-isisd-append-vrf

doc: correct a few commands for isis

12 months agopimd: pim mlag summary should display the down connection status. 15661/head
Rajesh Varatharaj [Tue, 2 Apr 2024 22:12:10 +0000 (15:12 -0700)]
pimd:  pim mlag summary should display the down connection status.

command 'show ip pim mlag summary json' should display 'mlagConnUp',
'mlagPeerConnUp', and 'mlagPeerZebraUp' when the connection is down.

Fix:
Added 'json_object_boolean_false_add()' for these objects.

Ticket: #

Signed-off-by: Rajesh Varatharaj <rvaratharaj@nvidia.com>
12 months agoMerge pull request #15675 from pguibert6WIND/srv6_bsid_to_seg6local_2str
Donatas Abraitis [Fri, 5 Apr 2024 17:49:27 +0000 (20:49 +0300)]
Merge pull request #15675 from pguibert6WIND/srv6_bsid_to_seg6local_2str

lib: add srv6 bsid to seg6local_context2str

12 months agoMerge pull request #15640 from opensourcerouting/fix/handling_dynamic_capability_mp_gr
Donald Sharp [Fri, 5 Apr 2024 17:42:03 +0000 (13:42 -0400)]
Merge pull request #15640 from opensourcerouting/fix/handling_dynamic_capability_mp_gr

bgpd: Fix errors handling for MP/GR capabilities as dynamic capability

12 months agodoc: correct a few commands for isis 15687/head
anlan_cs [Fri, 5 Apr 2024 13:37:22 +0000 (21:37 +0800)]
doc: correct a few commands for isis

Correct a few commands for isis based on code, just complete the missing
`[vrf <NAME|all>]`.

Signed-off-by: anlan_cs <anlan_cs@tom.com>
12 months agoMerge pull request #15682 from mjstapp/fix_topo_bfd_convergence
Donatas Abraitis [Fri, 5 Apr 2024 10:37:10 +0000 (13:37 +0300)]
Merge pull request #15682 from mjstapp/fix_topo_bfd_convergence

tests: increase topotest wait time for bfd convergence

12 months agoMerge pull request #15685 from anlancs/fix/ldpd-cmd-dup-label-check
Donatas Abraitis [Fri, 5 Apr 2024 10:36:56 +0000 (13:36 +0300)]
Merge pull request #15685 from anlancs/fix/ldpd-cmd-dup-label-check

zebra: cosmetic change for one flag

12 months agoMerge pull request #15672 from pguibert6WIND/isis_sr_mispelling
Donatas Abraitis [Fri, 5 Apr 2024 10:36:18 +0000 (13:36 +0300)]
Merge pull request #15672 from pguibert6WIND/isis_sr_mispelling

isisd: fix mispelling with ISIS_SR_LAN_BACKUP

12 months agozebra: cosmetic change for one flag 15685/head
anlan_cs [Fri, 5 Apr 2024 04:08:58 +0000 (12:08 +0800)]
zebra: cosmetic change for one flag

Use `CHECK_FLAG()` for readability.

Signed-off-by: anlan_cs <anlan_cs@tom.com>
12 months agobgpd: fix install BGP route with appropriate colored ext. community 15592/head
Philippe Guibert [Thu, 21 Mar 2024 15:48:52 +0000 (16:48 +0100)]
bgpd: fix install BGP route with appropriate colored ext. community

When receiving a BGP update that includes a colored extended community,
the nexthop is tracked in the bgp nexthop tracking context, but the
color is never recorded. Adding to this, the BGP route is not prevented
from being installed without hte color.

Actually, the srte color is set only when the SRTE_COLOR attribute is set.
And that attribute value is only set when an ext. community is locally
created, or an srte value is set, but not when a BGP update with a color
ext. community is received.

Fix this by setting the SRTE_COLOR attribute on this last case.

Fixes: 442e2edcfaef ("bgpd: add functions related to srte_color management")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
12 months agoMerge pull request #15633 from pguibert6WIND/ipv4_ignore_routes_with_linkdown
Russ White [Thu, 4 Apr 2024 18:01:31 +0000 (14:01 -0400)]
Merge pull request #15633 from pguibert6WIND/ipv4_ignore_routes_with_linkdown

topotests: fix ignore routes with linkdown

12 months agotests: increase topotest wait time for bfd convergence 15682/head
Mark Stapp [Thu, 4 Apr 2024 16:57:07 +0000 (12:57 -0400)]
tests: increase topotest wait time for bfd convergence

Increase the wait time in a bfd topotest; failing frequently
in the CI runs.

Signed-off-by: Mark Stapp <mjs@cisco.com>
12 months agoisisd: fix mispelling with ISIS_SR_LAN_BACKUP 15672/head
Philippe Guibert [Wed, 3 Apr 2024 13:58:05 +0000 (15:58 +0200)]
isisd: fix mispelling with ISIS_SR_LAN_BACKUP

The ISIS_SR_LAN_BACKUP should be renamed to ISIS_SR_ADJ_BACKUP.

Fixes: 26f6acafc369 ("isisd: add support for segment routing")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
12 months agolib: add srv6 bsid to seg6local_context2str 15675/head
Philippe Guibert [Wed, 3 Apr 2024 19:03:26 +0000 (21:03 +0200)]
lib: add srv6 bsid to seg6local_context2str

Add SRv6 Binding SID END.B6.Encaps nh6 str to lib.
It is used to display nh6 when one uses 'show ipv6 route'.

Signed-off-by: Dmytro Shytyi <dmytro.shytyi@6wind.com>
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
12 months agoMerge pull request #15618 from opensourcerouting/fix/bgp_optimize_suppress_path
Donald Sharp [Wed, 3 Apr 2024 12:36:31 +0000 (08:36 -0400)]
Merge pull request #15618 from opensourcerouting/fix/bgp_optimize_suppress_path

bgpd: Optimize the path for suppressed announcements

12 months agotopotests: fix ignore routes with linkdown 15633/head
Philippe Guibert [Thu, 28 Mar 2024 14:56:19 +0000 (15:56 +0100)]
topotests: fix ignore routes with linkdown

In topotest, a given interface has only the ignore routes bit turned
on for IPv6 only, whereas topotest is expected to turn it on for all
address families.

> # show interface
> Interface r2-r3-eth2 is up, line protocol is up
> [..]
>  flags: <UP,BROADCAST,RUNNING,MULTICAST>
>  Ignore all v6 routes with linkdown
>  Type: Ethernet
>  [..]

This is because the only the 'default' ipv6 ignore sysctl is set to
1. Set also the /proc/sys/net/conf/<family>/default/ignore_routes_with_linkdown
flag, to have same behaviour for ipv4 and ipv6.

Fixes: 4958158787ce ("tests: micronet: update infra")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
12 months agoMerge pull request #15634 from donaldsharp/suppress_fib_funny_business
Donatas Abraitis [Wed, 3 Apr 2024 06:51:29 +0000 (09:51 +0300)]
Merge pull request #15634 from donaldsharp/suppress_fib_funny_business

Suppress fib funny business

12 months agoospfd: Implement non-broadcast support for point-to-multipoint networks 15660/head
Acee Lindem [Tue, 2 Apr 2024 15:55:49 +0000 (15:55 +0000)]
ospfd: Implement non-broadcast support for point-to-multipoint networks

This extends non-broadcast support to point-to-multipoint networks.
Neighbors will be explicitly configured and polled in lieu of multicast
dicovery. Toptotests and documentation updates are included.

Additionally, the ospf neighbor commands have been greatly simplified taking
advantage of DEFPY() capabilities.

The AllOSPFRouters (224.0.0.5) is still joined for non-broadcast networks
since it is joined for NBMA networks. It seems this could be removed but
it should done be in a separate commit.

Signed-off-by: Acee Lindem <acee@lindem.com>
12 months agoMerge pull request #15628 from opensourcerouting/fix/bgp_prefix_sid_crash
Russ White [Tue, 2 Apr 2024 15:17:52 +0000 (11:17 -0400)]
Merge pull request #15628 from opensourcerouting/fix/bgp_prefix_sid_crash

bgpd: Fix error handling when receiving BGP Prefix SID attribute