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

Merge pull request #1801 from opensourcerouting/vtysh-isis-fixes

Browse Source 
dev/4.0 merge with IS-IS vtysh fixes
This commit is contained in:
Donald Sharp 2018-02-27 10:42:09 -05:00 committed by GitHub
commit 02fe0f3caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtysh/extract.pl.in
View File

@ -82,7 +82,7 @@ foreach (@ARGV) {
$protocol = "VTYSH_RIPD"; $protocol = "VTYSH_RIPD";
} }
elsif ($file =~ /lib\/routemap\.c$/) { elsif ($file =~ /lib\/routemap\.c$/) {
$protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_SHARPD"; $protocol = "VTYSH_RMAP";
} }
elsif ($file =~ /lib\/vrf\.c$/) { elsif ($file =~ /lib\/vrf\.c$/) {
$protocol = "VTYSH_ALL"; $protocol = "VTYSH_ALL";
@ -101,9 +101,9 @@ foreach (@ARGV) {
} }
elsif ($file =~ /lib\/plist\.c$/) { elsif ($file =~ /lib\/plist\.c$/) {
if ($defun_array[1] =~ m/ipv6/) { if ($defun_array[1] =~ m/ipv6/) {
$protocol = "VTYSH_RIPNGD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_BABELD"; $protocol = "VTYSH_RIPNGD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_BABELD|VTYSH_ISISD";
} else { } else {
$protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_BABELD"; $protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_ISISD";
} }
} }
elsif ($file =~ /lib\/distribute\.c$/) { elsif ($file =~ /lib\/distribute\.c$/) {

2
vtysh/vtysh.c
View File

@ -1446,7 +1446,7 @@ DEFUNSH(VTYSH_LDPD, ldp_member_pseudowire_ifname,
DEFUNSH(VTYSH_ISISD, router_isis, router_isis_cmd, "router isis WORD", DEFUNSH(VTYSH_ISISD, router_isis, router_isis_cmd, "router isis WORD",
ROUTER_STR ROUTER_STR
"ISO IS-IS\n" "ISO IS-IS\n"
"ISO Routing area tag") "ISO Routing area tag\n")
{ {
vty->node = ISIS_NODE; vty->node = ISIS_NODE;
return CMD_SUCCESS; return CMD_SUCCESS;

2
vtysh/vtysh.h
View File

@ -46,7 +46,7 @@ DECLARE_MGROUP(MVTYSH)
* run on it (logging & co. should stay in a fixed/frozen config, and * run on it (logging & co. should stay in a fixed/frozen config, and
* things like prefix lists are not even initialised) */ * things like prefix lists are not even initialised) */
#define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_SHARPD #define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_SHARPD
#define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_PIMD|VTYSH_EIGRPD #define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_SHARPD
#define VTYSH_INTERFACE VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD #define VTYSH_INTERFACE VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD
#define VTYSH_NS VTYSH_ZEBRA #define VTYSH_NS VTYSH_ZEBRA
#define VTYSH_VRF VTYSH_ZEBRA|VTYSH_PIMD #define VTYSH_VRF VTYSH_ZEBRA|VTYSH_PIMD