Merge pull request #2005 from qlyoung/remove-masc-node

lib: remove MASC_NODE
FRRouting · Apr 2, 2018 · 5012c1b · 5012c1b
2 parents 6d8b966 + 7d3ffd3
commit 5012c1b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 7 deletions.
diff --git a/lib/command.c b/lib/command.c
@@ -96,7 +96,6 @@ const char *node_names[] = {
 	"ldp l2vpn",		    // LDP_L2VPN_NODE,
 	"ldp",			    // LDP_PSEUDOWIRE_NODE,
 	"isis",			    // ISIS_NODE,
-	"masc",			    // MASC_NODE,
 	"irdp",			    // IRDP_NODE,
 	"static ip",		    // IP_NODE,
 	"ipv4 access list",	 // ACCESS_NODE,
@@ -1313,7 +1312,6 @@ void cmd_exit(struct vty *vty)
 	case LDP_L2VPN_NODE:
 	case ISIS_NODE:
 	case KEYCHAIN_NODE:
-	case MASC_NODE:
 	case RMAP_NODE:
 	case VTY_NODE:
 		vty->node = CONFIG_NODE;
@@ -1424,7 +1422,6 @@ DEFUN (config_end,
 	case ISIS_NODE:
 	case KEYCHAIN_NODE:
 	case KEYCHAIN_KEY_NODE:
-	case MASC_NODE:
 	case VTY_NODE:
 	case LINK_PARAMS_NODE:
 		vty_config_unlock(vty);

diff --git a/lib/command.h b/lib/command.h
@@ -119,7 +119,6 @@ enum node_type {
 	LDP_L2VPN_NODE,		 /* LDP L2VPN node */
 	LDP_PSEUDOWIRE_NODE,     /* LDP Pseudowire node */
 	ISIS_NODE,		 /* ISIS protocol mode */
-	MASC_NODE,		 /* MASC for multicast.  */
 	IRDP_NODE,		 /* ICMP Router Discovery Protocol mode. */
 	IP_NODE,		 /* Static ip route node. */
 	ACCESS_NODE,		 /* Access list node. */

diff --git a/lib/vty.c b/lib/vty.c
@@ -731,7 +731,6 @@ static void vty_end_config(struct vty *vty)
 	case ISIS_NODE:
 	case KEYCHAIN_NODE:
 	case KEYCHAIN_KEY_NODE:
-	case MASC_NODE:
 	case VTY_NODE:
 	case BGP_EVPN_VNI_NODE:
 		vty_config_unlock(vty);
@@ -1128,7 +1127,6 @@ static void vty_stop_input(struct vty *vty)
 	case ISIS_NODE:
 	case KEYCHAIN_NODE:
 	case KEYCHAIN_KEY_NODE:
-	case MASC_NODE:
 	case VTY_NODE:
 		vty_config_unlock(vty);
 		vty->node = ENABLE_NODE;

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
@@ -1551,7 +1551,6 @@ static int vtysh_exit(struct vty *vty)
 	case LDP_NODE:
 	case LDP_L2VPN_NODE:
 	case ISIS_NODE:
-	case MASC_NODE:
 	case RMAP_NODE:
 	case VTY_NODE:
 	case KEYCHAIN_NODE: