]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: fix show run of network route-distinguisher
authorLouis Scalbert <louis.scalbert@6wind.com>
Tue, 16 Apr 2024 14:41:51 +0000 (16:41 +0200)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Wed, 24 Apr 2024 11:35:40 +0000 (11:35 +0000)
Route-distinguisher (RD) is not printed properly in show run:

>  address-family ipv6 vpn
>   network ff01::/64 rd (null) label 7
>   network ff01::/64 rd (null) label 8

ad151f66aa ("bgpd: Refactor bgp_static_set/bgp_static_set_safi") merged
bgp_static_set_safi into bgp_static_set but inadvertently omitted the
handling of prd_pretty.

Copy the pretty RD string if available.

> address-family ipv6 vpn
>  network ff01::/64 rd 75:5 label 7
>  network ff01::/64 rd 85:5 label 8

Fixes: ad151f66aa ("bgpd: Refactor bgp_static_set/bgp_static_set_safi")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit 3d3a138f5a177a2ef5996c17c76c4f7778f9c3aa)

bgpd/bgp_route.c

index bcf56d2e6af518de0040cc853f64aa526e694705..a69d6ee9f02eb71376b1e6677db2ce52551d6c67 100644 (file)
@@ -6842,6 +6842,10 @@ int bgp_static_set(struct vty *vty, bool negate, const char *ip_str,
                        bgp_static->label = label;
                        bgp_static->prd = prd;
 
+                       if (rd_str)
+                               bgp_static->prd_pretty = XSTRDUP(MTYPE_BGP,
+                                                                rd_str);
+
                        if (rmap) {
                                XFREE(MTYPE_ROUTE_MAP_NAME,
                                      bgp_static->rmap.name);