diff options
| author | David Lamparter <equinox@diac24.net> | 2018-10-27 13:57:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-27 13:57:35 +0200 |
| commit | a755ec5e500dde4a7258145900fcba25e9aff448 (patch) | |
| tree | dde66b73db7b062118d3a2ac0d62b81ffeda8107 | |
| parent | Merge pull request #3199 from donaldsharp/eigrp_key (diff) | |
| parent | lib: change M:A:C to X:X:X:X:X:X (diff) | |
| download | frr-a755ec5e500dde4a7258145900fcba25e9aff448.tar.xz frr-a755ec5e500dde4a7258145900fcba25e9aff448.zip | |
Merge pull request #3206 from qlyoung/mac-token-change
lib: change M:A:C to X:X:X:X:X:X
| -rw-r--r-- | bgpd/bgp_debug.c | 4 | ||||
| -rw-r--r-- | lib/command_lex.l | 4 | ||||
| -rw-r--r-- | lib/filter.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c index f49f80b5d..c7fad29cb 100644 --- a/bgpd/bgp_debug.c +++ b/bgpd/bgp_debug.c @@ -1380,7 +1380,7 @@ DEFUN (no_debug_bgp_update_direct_peer, DEFPY (debug_bgp_update_prefix_afi_safi, debug_bgp_update_prefix_afi_safi_cmd, - "debug bgp updates prefix l2vpn$afi evpn$safi type <macip mac <M:A:C|M:A:C/M> [ip <A.B.C.D|X:X::X:X>]|multicast ip <A.B.C.D|X:X::X:X>|prefix ip <A.B.C.D/M|X:X::X:X/M>>", + "debug bgp updates prefix l2vpn$afi evpn$safi type <macip mac <X:X:X:X:X:X|X:X:X:X:X:X/M> [ip <A.B.C.D|X:X::X:X>]|multicast ip <A.B.C.D|X:X::X:X>|prefix ip <A.B.C.D/M|X:X::X:X/M>>", DEBUG_STR BGP_STR "BGP updates\n" @@ -1443,7 +1443,7 @@ DEFPY (debug_bgp_update_prefix_afi_safi, DEFPY (no_debug_bgp_update_prefix_afi_safi, no_debug_bgp_update_prefix_afi_safi_cmd, - "no debug bgp updates prefix l2vpn$afi evpn$safi type <macip mac <M:A:C|M:A:C/M> [ip <A.B.C.D|X:X::X:X>]|multicast ip <A.B.C.D|X:X::X:X>|prefix ip <A.B.C.D/M|X:X::X:X/M>>", + "no debug bgp updates prefix l2vpn$afi evpn$safi type <macip mac <X:X:X:X:X:X|X:X:X:X:X:X/M> [ip <A.B.C.D|X:X::X:X>]|multicast ip <A.B.C.D|X:X::X:X>|prefix ip <A.B.C.D/M|X:X::X:X/M>>", NO_STR DEBUG_STR BGP_STR diff --git a/lib/command_lex.l b/lib/command_lex.l index 3b18b58a2..f361db78e 100644 --- a/lib/command_lex.l +++ b/lib/command_lex.l @@ -48,8 +48,8 @@ IPV4 A\.B\.C\.D IPV4_PREFIX A\.B\.C\.D\/M IPV6 X:X::X:X IPV6_PREFIX X:X::X:X\/M -MAC M:A:C -MAC_PREFIX M:A:C\/M +MAC X:X:X:X:X:X +MAC_PREFIX X:X:X:X:X:X\/M VARIABLE [A-Z][-_A-Z:0-9]+ WORD (\-|\+)?[a-zA-Z0-9\*][-+_a-zA-Z0-9\*]* NUMBER (\-|\+)?[0-9]{1,20} diff --git a/lib/filter.c b/lib/filter.c index 0528b0f2a..1aae58b61 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -1302,7 +1302,7 @@ static int filter_set_zebra(struct vty *vty, const char *name_str, DEFUN (mac_access_list, mac_access_list_cmd, - "mac access-list WORD <deny|permit> MAC", + "mac access-list WORD <deny|permit> X:X:X:X:X:X", "Add a mac access-list\n" "Add an access list entry\n" "MAC zebra access-list name\n" @@ -1316,7 +1316,7 @@ DEFUN (mac_access_list, DEFUN (no_mac_access_list, no_mac_access_list_cmd, - "no mac access-list WORD <deny|permit> MAC", + "no mac access-list WORD <deny|permit> X:X:X:X:X:X", NO_STR "Remove a mac access-list\n" "Remove an access list entry\n" |