diff options
Diffstat (limited to 'zebra/zebra_mpls_vty.c')
| -rw-r--r-- | zebra/zebra_mpls_vty.c | 534 | 
1 files changed, 282 insertions, 252 deletions
diff --git a/zebra/zebra_mpls_vty.c b/zebra/zebra_mpls_vty.c index dd381723c5..a706c3da19 100644 --- a/zebra/zebra_mpls_vty.c +++ b/zebra/zebra_mpls_vty.c @@ -14,9 +14,9 @@   * General Public License for more details.   *   * You should have received a copy of the GNU General Public License - * along with GNU Zebra; see the file COPYING.  If not, write to the  - * Free Software Foundation, Inc., 59 Temple Place - Suite 330,  - * Boston, MA 02111-1307, USA.   + * along with GNU Zebra; see the file COPYING.  If not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA.   */  #include <zebra.h> @@ -40,121 +40,111 @@  #include "zebra/zebra_routemap.h"  #include "zebra/zebra_static.h" -static int -zebra_mpls_transit_lsp (struct vty *vty, int add_cmd, const char *inlabel_str, -		        const char *gate_str, const char *outlabel_str, -                        const char *flag_str) -{ -  struct zebra_vrf *zvrf; -  int ret; -  enum nexthop_types_t gtype; -  union g_addr gate; -  mpls_label_t label; -  mpls_label_t in_label, out_label; - -  if (!mpls_enabled) -    { -      vty_out (vty, "%% MPLS not turned on in kernel, ignoring command%s", -	       VTY_NEWLINE); -      return CMD_WARNING; -    } - -  zvrf = vrf_info_lookup(VRF_DEFAULT); -  if (!zvrf) -    { -      vty_out (vty, "%% Default VRF does not exist%s", VTY_NEWLINE); -      return CMD_WARNING; -    } - -  if (!inlabel_str) -    { -      vty_out (vty, "%% No Label Information%s", VTY_NEWLINE); -      return CMD_WARNING; -    } - -  out_label = MPLS_IMP_NULL_LABEL; /* as initialization */ -  label = atoi(inlabel_str); -  if (!IS_MPLS_UNRESERVED_LABEL(label)) -    { -      vty_out (vty, "%% Invalid label%s", VTY_NEWLINE); -      return CMD_WARNING; -    } - -  if (add_cmd) -    { -      if (!gate_str) -        { -          vty_out (vty, "%% No Nexthop Information%s", VTY_NEWLINE); -          return CMD_WARNING; -        } -      if (!outlabel_str) -        { -          vty_out (vty, "%% No Outgoing label Information%s", VTY_NEWLINE); -          return CMD_WARNING; -        } -    } - -  in_label = label; -  gtype = NEXTHOP_TYPE_BLACKHOLE; /* as initialization */ - -  if (gate_str) -    { -      /* Gateway is a IPv4 or IPv6 nexthop. */ -      ret = inet_pton (AF_INET6, gate_str, &gate.ipv6); -      if (ret) -        gtype = NEXTHOP_TYPE_IPV6; -      else -        { -          ret = inet_pton (AF_INET, gate_str, &gate.ipv4); -          if (ret) -            gtype = NEXTHOP_TYPE_IPV4; -          else -            { -              vty_out (vty, "%% Invalid nexthop%s", VTY_NEWLINE); -              return CMD_WARNING; -            } -        } -    } - -  if (outlabel_str) -    { -      if (outlabel_str[0] == 'i') -        out_label = MPLS_IMP_NULL_LABEL; -      else if (outlabel_str[0] == 'e' && gtype == NEXTHOP_TYPE_IPV4) -        out_label = MPLS_V4_EXP_NULL_LABEL; -      else if (outlabel_str[0] == 'e' && gtype == NEXTHOP_TYPE_IPV6) -        out_label = MPLS_V6_EXP_NULL_LABEL; -      else -        out_label = atoi(outlabel_str); -    } - -  if (add_cmd) -    { +static int zebra_mpls_transit_lsp(struct vty *vty, int add_cmd, +				  const char *inlabel_str, const char *gate_str, +				  const char *outlabel_str, +				  const char *flag_str) +{ +	struct zebra_vrf *zvrf; +	int ret; +	enum nexthop_types_t gtype; +	union g_addr gate; +	mpls_label_t label; +	mpls_label_t in_label, out_label; + +	if (!mpls_enabled) { +		vty_out(vty, +			"%% MPLS not turned on in kernel, ignoring command%s", +			VTY_NEWLINE); +		return CMD_WARNING; +	} + +	zvrf = vrf_info_lookup(VRF_DEFAULT); +	if (!zvrf) { +		vty_out(vty, "%% Default VRF does not exist%s", VTY_NEWLINE); +		return CMD_WARNING; +	} + +	if (!inlabel_str) { +		vty_out(vty, "%% No Label Information%s", VTY_NEWLINE); +		return CMD_WARNING; +	} + +	out_label = MPLS_IMP_NULL_LABEL; /* as initialization */ +	label = atoi(inlabel_str); +	if (!IS_MPLS_UNRESERVED_LABEL(label)) { +		vty_out(vty, "%% Invalid label%s", VTY_NEWLINE); +		return CMD_WARNING; +	} + +	if (add_cmd) { +		if (!gate_str) { +			vty_out(vty, "%% No Nexthop Information%s", +				VTY_NEWLINE); +			return CMD_WARNING; +		} +		if (!outlabel_str) { +			vty_out(vty, "%% No Outgoing label Information%s", +				VTY_NEWLINE); +			return CMD_WARNING; +		} +	} + +	in_label = label; +	gtype = NEXTHOP_TYPE_BLACKHOLE; /* as initialization */ + +	if (gate_str) { +		/* Gateway is a IPv4 or IPv6 nexthop. */ +		ret = inet_pton(AF_INET6, gate_str, &gate.ipv6); +		if (ret) +			gtype = NEXTHOP_TYPE_IPV6; +		else { +			ret = inet_pton(AF_INET, gate_str, &gate.ipv4); +			if (ret) +				gtype = NEXTHOP_TYPE_IPV4; +			else { +				vty_out(vty, "%% Invalid nexthop%s", +					VTY_NEWLINE); +				return CMD_WARNING; +			} +		} +	} + +	if (outlabel_str) { +		if (outlabel_str[0] == 'i') +			out_label = MPLS_IMP_NULL_LABEL; +		else if (outlabel_str[0] == 'e' && gtype == NEXTHOP_TYPE_IPV4) +			out_label = MPLS_V4_EXP_NULL_LABEL; +		else if (outlabel_str[0] == 'e' && gtype == NEXTHOP_TYPE_IPV6) +			out_label = MPLS_V6_EXP_NULL_LABEL; +		else +			out_label = atoi(outlabel_str); +	} + +	if (add_cmd) {  #if defined(HAVE_CUMULUS) -      /* Check that label value is consistent. */ -      if (!zebra_mpls_lsp_label_consistent (zvrf, in_label, out_label, gtype, -                                            &gate, NULL, 0)) -        { -          vty_out (vty, "%% Label value not consistent%s", -                   VTY_NEWLINE); -          return CMD_WARNING; -        } +		/* Check that label value is consistent. */ +		if (!zebra_mpls_lsp_label_consistent(zvrf, in_label, out_label, +						     gtype, &gate, NULL, 0)) { +			vty_out(vty, "%% Label value not consistent%s", +				VTY_NEWLINE); +			return CMD_WARNING; +		}  #endif /* HAVE_CUMULUS */ -      ret = zebra_mpls_static_lsp_add (zvrf, in_label, out_label, gtype, -                                       &gate, NULL, 0); -    } -  else -    ret = zebra_mpls_static_lsp_del (zvrf, in_label, gtype, &gate, NULL, 0); +		ret = zebra_mpls_static_lsp_add(zvrf, in_label, out_label, +						gtype, &gate, NULL, 0); +	} else +		ret = zebra_mpls_static_lsp_del(zvrf, in_label, gtype, &gate, +						NULL, 0); -  if (ret) -    { -      vty_out (vty, "%% LSP cannot be %s%s", -               add_cmd ? "added" : "deleted", VTY_NEWLINE); -      return CMD_WARNING; -    } +	if (ret) { +		vty_out(vty, "%% LSP cannot be %s%s", +			add_cmd ? "added" : "deleted", VTY_NEWLINE); +		return CMD_WARNING; +	} -  return CMD_SUCCESS; +	return CMD_SUCCESS;  }  DEFUN (mpls_transit_lsp, @@ -169,7 +159,8 @@ DEFUN (mpls_transit_lsp,         "Use Explicit-Null label\n"         "Use Implicit-Null label\n")  { -  return zebra_mpls_transit_lsp (vty, 1, argv[2]->arg, argv[3]->arg, argv[4]->arg, NULL); +	return zebra_mpls_transit_lsp(vty, 1, argv[2]->arg, argv[3]->arg, +				      argv[4]->arg, NULL);  }  DEFUN (no_mpls_transit_lsp, @@ -182,22 +173,21 @@ DEFUN (no_mpls_transit_lsp,         "IPv4 gateway address\n"         "IPv6 gateway address\n")  { -  return zebra_mpls_transit_lsp (vty, 0, argv[3]->arg, argv[4]->arg, NULL, NULL); +	return zebra_mpls_transit_lsp(vty, 0, argv[3]->arg, argv[4]->arg, NULL, +				      NULL);  } -ALIAS (no_mpls_transit_lsp, -       no_mpls_transit_lsp_out_label_cmd, -       "no mpls lsp (16-1048575) <A.B.C.D|X:X::X:X> <(16-1048575)|explicit-null|implicit-null>", -       NO_STR -       MPLS_STR -       "Establish label switched path\n" -       "Incoming MPLS label\n" -       "IPv4 gateway address\n" -       "IPv6 gateway address\n" -       "Outgoing MPLS label\n" -       "Use Explicit-Null label\n" -       "Use Implicit-Null label\n") -  +ALIAS(no_mpls_transit_lsp, no_mpls_transit_lsp_out_label_cmd, +      "no mpls lsp (16-1048575) <A.B.C.D|X:X::X:X> <(16-1048575)|explicit-null|implicit-null>", +      NO_STR MPLS_STR +      "Establish label switched path\n" +      "Incoming MPLS label\n" +      "IPv4 gateway address\n" +      "IPv6 gateway address\n" +      "Outgoing MPLS label\n" +      "Use Explicit-Null label\n" +      "Use Implicit-Null label\n") +  DEFUN (no_mpls_transit_lsp_all,         no_mpls_transit_lsp_all_cmd,         "no mpls lsp (16-1048575)", @@ -206,7 +196,7 @@ DEFUN (no_mpls_transit_lsp_all,         "Establish label switched path\n"         "Incoming MPLS label\n")  { -  return zebra_mpls_transit_lsp (vty, 0, argv[3]->arg, NULL, NULL, NULL); +	return zebra_mpls_transit_lsp(vty, 0, argv[3]->arg, NULL, NULL, NULL);  }  /* Static route configuration.  */ @@ -222,8 +212,9 @@ DEFUN (ip_route_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, NULL, -                            NULL, NULL, argv[5]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, NULL, +				 argv[3]->arg, NULL, NULL, NULL, NULL, +				 argv[5]->arg);  }  DEFUN (ip_route_tag_label, @@ -240,8 +231,9 @@ DEFUN (ip_route_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, argv[5]->arg, -                            NULL, NULL, argv[7]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, NULL, +				 argv[3]->arg, NULL, argv[5]->arg, NULL, NULL, +				 argv[7]->arg);  }  /* Mask as A.B.C.D format.  */ @@ -258,8 +250,9 @@ DEFUN (ip_route_mask_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, argv[3]->arg, argv[4]->arg, NULL, NULL, -                            NULL, NULL, argv[6]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, +				 argv[3]->arg, argv[4]->arg, NULL, NULL, NULL, +				 NULL, argv[6]->arg);  }  DEFUN (ip_route_mask_tag_label, @@ -276,10 +269,10 @@ DEFUN (ip_route_mask_tag_label,         "Tag value\n"         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n") -  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, argv[3]->arg, argv[4]->arg, NULL, argv[6]->arg, -                            NULL, NULL, argv[8]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, +				 argv[3]->arg, argv[4]->arg, NULL, argv[6]->arg, +				 NULL, NULL, argv[8]->arg);  }  /* Distance option value.  */ @@ -296,8 +289,9 @@ DEFUN (ip_route_distance_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, NULL, -                            argv[4]->arg, NULL, argv[6]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, NULL, +				 argv[3]->arg, NULL, NULL, argv[4]->arg, NULL, +				 argv[6]->arg);  }  DEFUN (ip_route_tag_distance_label, @@ -314,10 +308,10 @@ DEFUN (ip_route_tag_distance_label,         "Distance value for this route\n"         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n") -  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, argv[5]->arg, -                            argv[6]->arg, NULL, argv[8]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, NULL, +				 argv[3]->arg, NULL, argv[5]->arg, argv[6]->arg, +				 NULL, argv[8]->arg);  }  DEFUN (ip_route_mask_distance_label, @@ -334,8 +328,9 @@ DEFUN (ip_route_mask_distance_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, argv[3]->arg, argv[4]->arg, NULL, NULL, -                            argv[5]->arg, NULL, argv[7]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, +				 argv[3]->arg, argv[4]->arg, NULL, NULL, +				 argv[5]->arg, NULL, argv[7]->arg);  }  DEFUN (ip_route_mask_tag_distance_label, @@ -354,8 +349,9 @@ DEFUN (ip_route_mask_tag_distance_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, argv[3]->arg, argv[4]->arg, NULL, argv[6]->arg, -                            argv[7]->arg, NULL, argv[9]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 1, argv[2]->arg, +				 argv[3]->arg, argv[4]->arg, NULL, argv[6]->arg, +				 argv[7]->arg, NULL, argv[9]->arg);  }  DEFUN (no_ip_route_label, @@ -371,8 +367,9 @@ DEFUN (no_ip_route_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, NULL, -                            NULL, NULL, argv[6]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, NULL, +				 argv[4]->arg, NULL, NULL, NULL, NULL, +				 argv[6]->arg);  }  DEFUN (no_ip_route_tag_label, @@ -390,8 +387,9 @@ DEFUN (no_ip_route_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, argv[6]->arg, -                            NULL, NULL, argv[8]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, NULL, +				 argv[4]->arg, NULL, argv[6]->arg, NULL, NULL, +				 argv[8]->arg);  }  DEFUN (no_ip_route_mask_label, @@ -408,8 +406,9 @@ DEFUN (no_ip_route_mask_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, argv[4]->arg, argv[5]->arg, NULL, NULL, -                            NULL, NULL, argv[7]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, +				 argv[4]->arg, argv[5]->arg, NULL, NULL, NULL, +				 NULL, argv[7]->arg);  }  DEFUN (no_ip_route_mask_tag_label, @@ -428,8 +427,9 @@ DEFUN (no_ip_route_mask_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, argv[4]->arg, argv[5]->arg, NULL, argv[7]->arg, -                            NULL, NULL, argv[9]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, +				 argv[4]->arg, argv[5]->arg, NULL, argv[7]->arg, +				 NULL, NULL, argv[9]->arg);  }  DEFUN (no_ip_route_distance_label, @@ -446,8 +446,9 @@ DEFUN (no_ip_route_distance_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, NULL, -                            argv[5]->arg, NULL, argv[7]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, NULL, +				 argv[4]->arg, NULL, NULL, argv[5]->arg, NULL, +				 argv[7]->arg);  }  DEFUN (no_ip_route_tag_distance_label, @@ -466,8 +467,9 @@ DEFUN (no_ip_route_tag_distance_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, argv[6]->arg, -                            argv[7]->arg, NULL, argv[9]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, NULL, +				 argv[4]->arg, NULL, argv[6]->arg, argv[7]->arg, +				 NULL, argv[9]->arg);  }  DEFUN (no_ip_route_mask_distance_label, @@ -485,8 +487,9 @@ DEFUN (no_ip_route_mask_distance_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, argv[4]->arg, argv[5]->arg, NULL, NULL, -                            argv[6]->arg, NULL, argv[8]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, +				 argv[4]->arg, argv[5]->arg, NULL, NULL, +				 argv[6]->arg, NULL, argv[8]->arg);  }  DEFUN (no_ip_route_mask_tag_distance_label, @@ -506,8 +509,9 @@ DEFUN (no_ip_route_mask_tag_distance_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return zebra_static_ipv4 (vty, SAFI_UNICAST, 0, argv[3]->arg, argv[4]->arg, argv[5]->arg, NULL, argv[7]->arg, -                            argv[8]->arg, NULL, argv[10]->arg); +	return zebra_static_ipv4(vty, SAFI_UNICAST, 0, argv[3]->arg, +				 argv[4]->arg, argv[5]->arg, NULL, argv[7]->arg, +				 argv[8]->arg, NULL, argv[10]->arg);  }  DEFUN (ipv6_route_label, @@ -521,7 +525,8 @@ DEFUN (ipv6_route_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, NULL, NULL, NULL, NULL, argv[5]->arg); +	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, +				NULL, NULL, NULL, NULL, argv[5]->arg);  }  DEFUN (ipv6_route_tag_label, @@ -537,7 +542,8 @@ DEFUN (ipv6_route_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, NULL, argv[5]->arg, NULL, NULL, argv[7]->arg); +	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, +				NULL, argv[5]->arg, NULL, NULL, argv[7]->arg);  }  DEFUN (ipv6_route_ifname_label, @@ -551,7 +557,9 @@ DEFUN (ipv6_route_ifname_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 1, argv[2]->arg, NULL, argv[3]->arg, argv[4]->arg, NULL, NULL, NULL, NULL, argv[6]->arg); +	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, +				argv[4]->arg, NULL, NULL, NULL, NULL, +				argv[6]->arg);  }  DEFUN (ipv6_route_ifname_tag_label,         ipv6_route_ifname_tag_label_cmd, @@ -566,7 +574,9 @@ DEFUN (ipv6_route_ifname_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 1, argv[2]->arg, NULL, argv[3]->arg, argv[4]->arg, NULL, argv[6]->arg, NULL, NULL, argv[8]->arg); +	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, +				argv[4]->arg, NULL, argv[6]->arg, NULL, NULL, +				argv[8]->arg);  }  DEFUN (ipv6_route_pref_label, @@ -581,7 +591,8 @@ DEFUN (ipv6_route_pref_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, NULL, NULL, argv[4]->arg, NULL, argv[6]->arg); +	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, +				NULL, NULL, argv[4]->arg, NULL, argv[6]->arg);  }  DEFUN (ipv6_route_pref_tag_label, @@ -598,7 +609,9 @@ DEFUN (ipv6_route_pref_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, NULL, argv[5]->arg, argv[6]->arg, NULL, argv[8]->arg); +	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, +				NULL, argv[5]->arg, argv[6]->arg, NULL, +				argv[8]->arg);  }  DEFUN (ipv6_route_ifname_pref_label, @@ -613,7 +626,9 @@ DEFUN (ipv6_route_ifname_pref_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 1, argv[2]->arg, NULL, argv[3]->arg, argv[4]->arg, NULL, NULL, argv[5]->arg, NULL, argv[7]->arg); +	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, +				argv[4]->arg, NULL, NULL, argv[5]->arg, NULL, +				argv[7]->arg);  }  DEFUN (ipv6_route_ifname_pref_tag_label, @@ -630,7 +645,9 @@ DEFUN (ipv6_route_ifname_pref_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 1, argv[2]->arg, NULL, argv[3]->arg, argv[4]->arg, NULL, argv[6]->arg, argv[7]->arg, NULL, argv[9]->arg); +	return static_ipv6_func(vty, 1, argv[2]->arg, NULL, argv[3]->arg, +				argv[4]->arg, NULL, argv[6]->arg, argv[7]->arg, +				NULL, argv[9]->arg);  }  DEFUN (no_ipv6_route_label, @@ -645,7 +662,8 @@ DEFUN (no_ipv6_route_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, NULL, NULL, NULL, NULL, argv[6]->arg); +	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, +				NULL, NULL, NULL, NULL, argv[6]->arg);  }  DEFUN (no_ipv6_route_tag_label, @@ -662,7 +680,8 @@ DEFUN (no_ipv6_route_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, NULL, argv[6]->arg, NULL, NULL, argv[8]->arg); +	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, +				NULL, argv[6]->arg, NULL, NULL, argv[8]->arg);  }  DEFUN (no_ipv6_route_ifname_label, @@ -677,7 +696,9 @@ DEFUN (no_ipv6_route_ifname_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 0, argv[3]->arg, NULL, argv[4]->arg, argv[5]->arg, NULL, NULL, NULL, NULL, argv[7]->arg); +	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, +				argv[5]->arg, NULL, NULL, NULL, NULL, +				argv[7]->arg);  }  DEFUN (no_ipv6_route_ifname_tag_label, @@ -694,7 +715,9 @@ DEFUN (no_ipv6_route_ifname_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 0, argv[3]->arg, NULL, argv[4]->arg, argv[5]->arg, NULL, argv[7]->arg, NULL, NULL, argv[9]->arg); +	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, +				argv[5]->arg, NULL, argv[7]->arg, NULL, NULL, +				argv[9]->arg);  }  DEFUN (no_ipv6_route_pref_label, @@ -710,7 +733,8 @@ DEFUN (no_ipv6_route_pref_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, NULL, NULL, argv[5]->arg, NULL, argv[7]->arg); +	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, +				NULL, NULL, argv[5]->arg, NULL, argv[7]->arg);  }  DEFUN (no_ipv6_route_pref_tag_label, @@ -728,7 +752,9 @@ DEFUN (no_ipv6_route_pref_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, NULL, argv[6]->arg, argv[7]->arg, NULL, argv[9]->arg); +	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, +				NULL, argv[6]->arg, argv[7]->arg, NULL, +				argv[9]->arg);  }  DEFUN (no_ipv6_route_ifname_pref_label, @@ -744,7 +770,9 @@ DEFUN (no_ipv6_route_ifname_pref_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 0, argv[3]->arg, NULL, argv[4]->arg, argv[5]->arg, NULL, NULL, argv[6]->arg, NULL, argv[8]->arg); +	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, +				argv[5]->arg, NULL, NULL, argv[6]->arg, NULL, +				argv[8]->arg);  }  DEFUN (no_ipv6_route_ifname_pref_tag_label, @@ -762,22 +790,23 @@ DEFUN (no_ipv6_route_ifname_pref_tag_label,         "Specify label(s) for this route\n"         "One or more labels separated by '/'\n")  { -  return static_ipv6_func (vty, 0, argv[3]->arg, NULL, argv[4]->arg, argv[5]->arg, NULL, argv[7]->arg, argv[8]->arg, NULL, argv[10]->arg); +	return static_ipv6_func(vty, 0, argv[3]->arg, NULL, argv[4]->arg, +				argv[5]->arg, NULL, argv[7]->arg, argv[8]->arg, +				NULL, argv[10]->arg);  }  /* MPLS LSP configuration write function. */ -static int -zebra_mpls_config (struct vty *vty) +static int zebra_mpls_config(struct vty *vty)  { -  int write = 0; -  struct zebra_vrf *zvrf; +	int write = 0; +	struct zebra_vrf *zvrf; -  zvrf = vrf_info_lookup(VRF_DEFAULT); -  if (!zvrf) -    return 0; +	zvrf = vrf_info_lookup(VRF_DEFAULT); +	if (!zvrf) +		return 0; -  write += zebra_mpls_write_lsp_config(vty, zvrf); -  return write; +	write += zebra_mpls_write_lsp_config(vty, zvrf); +	return write;  }  DEFUN (show_mpls_table, @@ -788,12 +817,12 @@ DEFUN (show_mpls_table,         "MPLS table\n"         JSON_STR)  { -  struct zebra_vrf *zvrf; -  u_char uj = use_json (argc, argv); +	struct zebra_vrf *zvrf; +	u_char uj = use_json(argc, argv); -  zvrf = vrf_info_lookup(VRF_DEFAULT); -  zebra_mpls_print_lsp_table(vty, zvrf, uj); -  return CMD_SUCCESS; +	zvrf = vrf_info_lookup(VRF_DEFAULT); +	zebra_mpls_print_lsp_table(vty, zvrf, uj); +	return CMD_SUCCESS;  }  DEFUN (show_mpls_table_lsp, @@ -805,14 +834,14 @@ DEFUN (show_mpls_table_lsp,         "LSP to display information about\n"         JSON_STR)  { -  u_int32_t label; -  struct zebra_vrf *zvrf; -  u_char uj = use_json (argc, argv); +	u_int32_t label; +	struct zebra_vrf *zvrf; +	u_char uj = use_json(argc, argv); -  zvrf = vrf_info_lookup(VRF_DEFAULT); -  label = atoi(argv[3]->arg); -  zebra_mpls_print_lsp (vty, zvrf, label, uj); -  return CMD_SUCCESS; +	zvrf = vrf_info_lookup(VRF_DEFAULT); +	label = atoi(argv[3]->arg); +	zebra_mpls_print_lsp(vty, zvrf, label, uj); +	return CMD_SUCCESS;  }  DEFUN (show_mpls_status, @@ -822,61 +851,62 @@ DEFUN (show_mpls_status,         "MPLS information\n"         "MPLS status\n")  { -  vty_out (vty, "MPLS support enabled: %s%s", (mpls_enabled) ? "yes" : -	   "no (mpls kernel extensions not detected)", VTY_NEWLINE); -  return CMD_SUCCESS; +	vty_out(vty, "MPLS support enabled: %s%s", +		(mpls_enabled) ? "yes" +			       : "no (mpls kernel extensions not detected)", +		VTY_NEWLINE); +	return CMD_SUCCESS;  }  /* MPLS node for MPLS LSP. */ -static struct cmd_node mpls_node = { MPLS_NODE,  "",  1 }; +static struct cmd_node mpls_node = {MPLS_NODE, "", 1};  /* MPLS VTY.  */ -void -zebra_mpls_vty_init (void) -{ -  install_element (VIEW_NODE, &show_mpls_status_cmd); - -  install_node (&mpls_node, zebra_mpls_config); - -  install_element (CONFIG_NODE, &ip_route_label_cmd); -  install_element (CONFIG_NODE, &ip_route_tag_label_cmd); -  install_element (CONFIG_NODE, &ip_route_mask_label_cmd); -  install_element (CONFIG_NODE, &ip_route_mask_tag_label_cmd); -  install_element (CONFIG_NODE, &no_ip_route_label_cmd); -  install_element (CONFIG_NODE, &no_ip_route_tag_label_cmd); -  install_element (CONFIG_NODE, &no_ip_route_mask_label_cmd); -  install_element (CONFIG_NODE, &no_ip_route_mask_tag_label_cmd); -  install_element (CONFIG_NODE, &ip_route_distance_label_cmd); -  install_element (CONFIG_NODE, &ip_route_tag_distance_label_cmd); -  install_element (CONFIG_NODE, &ip_route_mask_distance_label_cmd); -  install_element (CONFIG_NODE, &ip_route_mask_tag_distance_label_cmd); -  install_element (CONFIG_NODE, &no_ip_route_distance_label_cmd); -  install_element (CONFIG_NODE, &no_ip_route_tag_distance_label_cmd); -  install_element (CONFIG_NODE, &no_ip_route_mask_distance_label_cmd); -  install_element (CONFIG_NODE, &no_ip_route_mask_tag_distance_label_cmd); - -  install_element (CONFIG_NODE, &ipv6_route_label_cmd); -  install_element (CONFIG_NODE, &ipv6_route_ifname_label_cmd); -  install_element (CONFIG_NODE, &no_ipv6_route_label_cmd); -  install_element (CONFIG_NODE, &no_ipv6_route_ifname_label_cmd); -  install_element (CONFIG_NODE, &ipv6_route_pref_label_cmd); -  install_element (CONFIG_NODE, &ipv6_route_ifname_pref_label_cmd); -  install_element (CONFIG_NODE, &no_ipv6_route_pref_label_cmd); -  install_element (CONFIG_NODE, &no_ipv6_route_ifname_pref_label_cmd); -  install_element (CONFIG_NODE, &ipv6_route_tag_label_cmd); -  install_element (CONFIG_NODE, &ipv6_route_ifname_tag_label_cmd); -  install_element (CONFIG_NODE, &ipv6_route_pref_tag_label_cmd); -  install_element (CONFIG_NODE, &ipv6_route_ifname_pref_tag_label_cmd); -  install_element (CONFIG_NODE, &no_ipv6_route_tag_label_cmd); -  install_element (CONFIG_NODE, &no_ipv6_route_ifname_tag_label_cmd); -  install_element (CONFIG_NODE, &no_ipv6_route_pref_tag_label_cmd); -  install_element (CONFIG_NODE, &no_ipv6_route_ifname_pref_tag_label_cmd); - -  install_element (CONFIG_NODE, &mpls_transit_lsp_cmd); -  install_element (CONFIG_NODE, &no_mpls_transit_lsp_cmd); -  install_element (CONFIG_NODE, &no_mpls_transit_lsp_out_label_cmd); -  install_element (CONFIG_NODE, &no_mpls_transit_lsp_all_cmd); - -  install_element (VIEW_NODE, &show_mpls_table_cmd); -  install_element (VIEW_NODE, &show_mpls_table_lsp_cmd); +void zebra_mpls_vty_init(void) +{ +	install_element(VIEW_NODE, &show_mpls_status_cmd); + +	install_node(&mpls_node, zebra_mpls_config); + +	install_element(CONFIG_NODE, &ip_route_label_cmd); +	install_element(CONFIG_NODE, &ip_route_tag_label_cmd); +	install_element(CONFIG_NODE, &ip_route_mask_label_cmd); +	install_element(CONFIG_NODE, &ip_route_mask_tag_label_cmd); +	install_element(CONFIG_NODE, &no_ip_route_label_cmd); +	install_element(CONFIG_NODE, &no_ip_route_tag_label_cmd); +	install_element(CONFIG_NODE, &no_ip_route_mask_label_cmd); +	install_element(CONFIG_NODE, &no_ip_route_mask_tag_label_cmd); +	install_element(CONFIG_NODE, &ip_route_distance_label_cmd); +	install_element(CONFIG_NODE, &ip_route_tag_distance_label_cmd); +	install_element(CONFIG_NODE, &ip_route_mask_distance_label_cmd); +	install_element(CONFIG_NODE, &ip_route_mask_tag_distance_label_cmd); +	install_element(CONFIG_NODE, &no_ip_route_distance_label_cmd); +	install_element(CONFIG_NODE, &no_ip_route_tag_distance_label_cmd); +	install_element(CONFIG_NODE, &no_ip_route_mask_distance_label_cmd); +	install_element(CONFIG_NODE, &no_ip_route_mask_tag_distance_label_cmd); + +	install_element(CONFIG_NODE, &ipv6_route_label_cmd); +	install_element(CONFIG_NODE, &ipv6_route_ifname_label_cmd); +	install_element(CONFIG_NODE, &no_ipv6_route_label_cmd); +	install_element(CONFIG_NODE, &no_ipv6_route_ifname_label_cmd); +	install_element(CONFIG_NODE, &ipv6_route_pref_label_cmd); +	install_element(CONFIG_NODE, &ipv6_route_ifname_pref_label_cmd); +	install_element(CONFIG_NODE, &no_ipv6_route_pref_label_cmd); +	install_element(CONFIG_NODE, &no_ipv6_route_ifname_pref_label_cmd); +	install_element(CONFIG_NODE, &ipv6_route_tag_label_cmd); +	install_element(CONFIG_NODE, &ipv6_route_ifname_tag_label_cmd); +	install_element(CONFIG_NODE, &ipv6_route_pref_tag_label_cmd); +	install_element(CONFIG_NODE, &ipv6_route_ifname_pref_tag_label_cmd); +	install_element(CONFIG_NODE, &no_ipv6_route_tag_label_cmd); +	install_element(CONFIG_NODE, &no_ipv6_route_ifname_tag_label_cmd); +	install_element(CONFIG_NODE, &no_ipv6_route_pref_tag_label_cmd); +	install_element(CONFIG_NODE, &no_ipv6_route_ifname_pref_tag_label_cmd); + +	install_element(CONFIG_NODE, &mpls_transit_lsp_cmd); +	install_element(CONFIG_NODE, &no_mpls_transit_lsp_cmd); +	install_element(CONFIG_NODE, &no_mpls_transit_lsp_out_label_cmd); +	install_element(CONFIG_NODE, &no_mpls_transit_lsp_all_cmd); + +	install_element(VIEW_NODE, &show_mpls_table_cmd); +	install_element(VIEW_NODE, &show_mpls_table_lsp_cmd);  }  | 
