proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 11:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib, bgpd: fix set ip next-hop peer-address

Browse Source 
This bgp-specific command had its positive form defined only in bgpd and
its negative form defined only in lib, which broke the whole rule for
other daemons.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-08-10 12:31:47 -04:00
parent 043abefeb2
commit 89602edb31
No known key found for this signature in database
GPG Key ID: DAF48E0F57E0834F
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bgpd/bgp_routemap.c
View File

@ -3499,14 +3499,20 @@ DEFUN (no_match_origin,
DEFUN (set_ip_nexthop_peer, DEFUN (set_ip_nexthop_peer,
set_ip_nexthop_peer_cmd, set_ip_nexthop_peer_cmd,
"set ip next-hop peer-address", "[no] set ip next-hop peer-address",
NO_STR
SET_STR SET_STR
IP_STR IP_STR
"Next hop address\n" "Next hop address\n"
"Use peer address (for BGP only)\n") "Use peer address (for BGP only)\n")
{ {
return generic_set_add(vty, VTY_GET_CONTEXT(route_map_index), int (*func)(struct vty *, struct route_map_index *, const char *,
"ip next-hop", "peer-address"); const char *) = strmatch(argv[0]->text, "no")
? generic_set_delete
: generic_set_add;
return func(vty, VTY_GET_CONTEXT(route_map_index), "ip next-hop",
"peer-address");
} }
DEFUN (set_ip_nexthop_unchanged, DEFUN (set_ip_nexthop_unchanged,

18
lib/routemap.c
View File

@ -2194,24 +2194,24 @@ DEFUN (set_ip_nexthop,
DEFUN (no_set_ip_nexthop, DEFUN (no_set_ip_nexthop,
no_set_ip_nexthop_cmd, no_set_ip_nexthop_cmd,
"no set ip next-hop [<peer-address|A.B.C.D>]", "no set ip next-hop [A.B.C.D]",
NO_STR NO_STR
SET_STR SET_STR
IP_STR IP_STR
"Next hop address\n" "Next hop address\n"
"Use peer address (for BGP only)\n"
"IP address of next hop\n") "IP address of next hop\n")
{ {
int idx_peer = 4; int idx;
VTY_DECLVAR_CONTEXT(route_map_index, index); VTY_DECLVAR_CONTEXT(route_map_index, index);
const char *arg = NULL;
if (rmap_match_set_hook.no_set_ip_nexthop) { if (argv_find(argv, argc, "A.B.C.D", &idx))
if (argc <= idx_peer) arg = argv[idx]->arg;
if (rmap_match_set_hook.no_set_ip_nexthop)
return rmap_match_set_hook.no_set_ip_nexthop( return rmap_match_set_hook.no_set_ip_nexthop(
vty, index, "ip next-hop", NULL); vty, index, "ip next-hop", arg);
return rmap_match_set_hook.no_set_ip_nexthop(
vty, index, "ip next-hop", argv[idx_peer]->arg);
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }