From d58e6dbc71db8b548b8f19b24a5279fe1a83fc4a Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Tue, 21 Mar 2023 22:08:16 +0200 Subject: [PATCH] bgpd: Do not allow setting `set distance` via route-maps to zero It's not allowed to install routes with zero distance, let's disallow this for route-maps as well. Signed-off-by: Donatas Abraitis --- bgpd/bgp_routemap.c | 4 ++-- doc/user/routemap.rst | 4 ++-- yang/frr-bgp-route-map.yang | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index b7bef75123..fa9d23874c 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -5512,7 +5512,7 @@ DEFUN_YANG (set_ip_nexthop_unchanged, DEFUN_YANG (set_distance, set_distance_cmd, - "set distance (0-255)", + "set distance (1-255)", SET_STR "BGP Administrative Distance to use\n" "Distance value\n") @@ -5531,7 +5531,7 @@ DEFUN_YANG (set_distance, DEFUN_YANG (no_set_distance, no_set_distance_cmd, - "no set distance [(0-255)]", + "no set distance [(1-255)]", NO_STR SET_STR "BGP Administrative Distance to use\n" "Distance value\n") diff --git a/doc/user/routemap.rst b/doc/user/routemap.rst index c205122b0b..9e4d7a611a 100644 --- a/doc/user/routemap.rst +++ b/doc/user/routemap.rst @@ -294,9 +294,9 @@ Route Map Set Command Subtract the BGP local preference from an existing `local_pref`. -.. clicmd:: set distance DISTANCE +.. clicmd:: set distance (1-255) - Set the Administrative distance to DISTANCE to use for the route. + Set the Administrative distance to use for the route. This is only locally significant and will not be dispersed to peers. .. clicmd:: set weight WEIGHT diff --git a/yang/frr-bgp-route-map.yang b/yang/frr-bgp-route-map.yang index 90163f125e..666f2bb235 100644 --- a/yang/frr-bgp-route-map.yang +++ b/yang/frr-bgp-route-map.yang @@ -760,7 +760,7 @@ module frr-bgp-route-map { when "derived-from-or-self(/frr-route-map:lib/frr-route-map:route-map/frr-route-map:entry/frr-route-map:set-action/frr-route-map:action, 'frr-bgp-route-map:distance')"; leaf distance { type uint8 { - range "0..255"; + range "1..255"; } } } -- 2.39.5