diff options
| author | David Lamparter <equinox@diac24.net> | 2017-07-14 17:37:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 17:37:04 +0200 |
| commit | 9eb03e75656a96a4ca78620633c649e00b0f883d (patch) | |
| tree | 6292a54dfa6dfc0f0d24927d8a3e56ad1278bf9b | |
| parent | Merge pull request #803 from opensourcerouting/redhat-doc-fixes-master (diff) | |
| parent | bgpd: "set ipv4 vpn next-hop 1.1.1.1" is saved/displayed as "set ip vpn (diff) | |
| download | frr-9eb03e75656a96a4ca78620633c649e00b0f883d.tar.xz frr-9eb03e75656a96a4ca78620633c649e00b0f883d.zip | |
Merge pull request #806 from dwalton76/bgpd-set-ipv4-vpn-nexthop
bgpd: "set ipv4 vpn next-hop 1.1.1.1" is saved/displayed as "set ip vpn next-hop 1.1.1.1"
| -rw-r--r-- | bgpd/bgp_routemap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index b53c112d9..d08d04db4 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -2652,7 +2652,7 @@ struct route_map_rule_cmd route_set_ipv6_nexthop_peer_cmd = route_set_ipv6_nexthop_peer_free }; -/* `set ip vpn nexthop A.B.C.D' */ +/* `set ipv4 vpn next-hop A.B.C.D' */ static route_map_result_t route_set_vpnv4_nexthop (void *rule, struct prefix *prefix, @@ -2694,7 +2694,7 @@ route_set_vpnv4_nexthop_compile (const char *arg) return address; } -/* `set ipv6 vpn nexthop A.B.C.D' */ +/* `set ipv6 vpn next-hop A.B.C.D' */ static route_map_result_t route_set_vpnv6_nexthop (void *rule, struct prefix *prefix, @@ -2741,16 +2741,16 @@ route_set_vpn_nexthop_free (void *rule) XFREE (MTYPE_ROUTE_MAP_COMPILED, rule); } -/* Route map commands for ip nexthop set. */ +/* Route map commands for ipv4 next-hop set. */ struct route_map_rule_cmd route_set_vpnv4_nexthop_cmd = { - "ip vpn next-hop", + "ipv4 vpn next-hop", route_set_vpnv4_nexthop, route_set_vpnv4_nexthop_compile, route_set_vpn_nexthop_free }; -/* Route map commands for ip nexthop set. */ +/* Route map commands for ipv6 next-hop set. */ struct route_map_rule_cmd route_set_vpnv6_nexthop_cmd = { "ipv6 vpn next-hop", @@ -4402,7 +4402,7 @@ DEFUN (set_vpn_nexthop, { if (afi == AFI_IP) return generic_set_add (vty, VTY_GET_CONTEXT(route_map_index), - "ip vpn next-hop", argv[idx_ip]->arg); + "ipv4 vpn next-hop", argv[idx_ip]->arg); else return generic_set_add (vty, VTY_GET_CONTEXT(route_map_index), "ipv6 vpn next-hop", argv[idx_ip]->arg); @@ -4435,7 +4435,7 @@ DEFUN (no_set_vpn_nexthop, { if (afi == AFI_IP) return generic_set_delete (vty, VTY_GET_CONTEXT(route_map_index), - "ip vpn next-hop", arg); + "ipv4 vpn next-hop", arg); else return generic_set_delete (vty, VTY_GET_CONTEXT(route_map_index), "ipv6 vpn next-hop", argv[idx_ip]->arg); @@ -4463,7 +4463,7 @@ DEFUN (set_ipx_vpn_nexthop, { if (afi == AFI_IP) return generic_set_add (vty, VTY_GET_CONTEXT(route_map_index), - "ip vpn next-hop", argv[idx_ip]->arg); + "ipv4 vpn next-hop", argv[idx_ip]->arg); else return generic_set_add (vty, VTY_GET_CONTEXT(route_map_index), "ipv6 vpn next-hop", argv[idx_ip]->arg); @@ -4496,7 +4496,7 @@ DEFUN (no_set_ipx_vpn_nexthop, { if (afi == AFI_IP) return generic_set_delete (vty, VTY_GET_CONTEXT(route_map_index), - "ip vpn next-hop", arg); + "ipv4 vpn next-hop", arg); else return generic_set_delete (vty, VTY_GET_CONTEXT(route_map_index), "ipv6 vpn next-hop", arg); |