Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label...

Conflicts:
	bgpd/bgp_route.c

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_mplsvpn.c
Simple merge

diff --cc bgpd/bgp_mplsvpn.h
Simple merge

diff --cc bgpd/bgp_route.c
index 9bd94f3a2319cdaac26a512b57ac7f18051d39fc,404360a3afdf17c033930664c48dc82a955d1158..3e61184e5943acdccee51b8a66b8297f2d4fa8be
--- 1/bgpd/bgp_route.c
--- 2/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -4603,10 -4573,13 +4600,10 @@@ bgp_static_set_safi (afi_t afi, safi_t 
    if (label_str)
      {
        unsigned long label_val;
-       VTY_GET_INTEGER_RANGE("Label", label_val, label_str, 0, 16777215);
+       label_val = strtoul(label_str, NULL, 10);
 -      encode_label (label_val, tag);
 -    }
 -  else
 -    {
 -      memset (tag, 0, sizeof(tag)); /* empty, not even BoS */
 +      encode_label (label_val, &label);
      }
 +
    if (safi == SAFI_EVPN)
      {
        if( esi && str2esi (esi, NULL) == 0)
@@@ -4734,8 -4707,12 +4731,8 @@@ bgp_static_unset_safi(afi_t afi, safi_
    if (label_str)
      {
        unsigned long label_val;
-       VTY_GET_INTEGER_RANGE("Label", label_val, label_str, 0, MPLS_LABEL_MAX);
+       label_val = strtoul(label_str, NULL, 10);
 -      encode_label (label_val, tag);
 -    }
 -  else
 -    {
 -      memset (tag, 0, sizeof(tag)); /* empty, not even BoS */
 +      encode_label (label_val, &label);
      }
  
    prn = bgp_node_get (bgp->route[afi][safi],
@@@ -6757,19 -6733,19 +6753,20 @@@ route_vty_out_tag (struct vty *vty, str
        }
      }
  
 -  label = decode_label (binfo->extra->tag);
 +  label = decode_label (&binfo->extra->label);
  
 -  if (json)
 +  if (bgp_is_valid_label(&label))
      {
 -      if (label)
 -        json_object_int_add(json_out, "notag", label);
 -      json_object_array_add(json, json_out);
 -    }
 -  else
 -    {
 -      vty_out (vty, "notag/%d", label);
 -
 -      vty_out (vty, VTYNL);
 +      if (json)
 +        {
 +          json_object_int_add(json_out, "notag", label);
 +          json_object_array_add(json, json_out);
 +        }
 +      else
 +        {
-           vty_out (vty, "notag/%d%s", label, VTY_NEWLINE);
++          vty_out (vty, "notag/%d", label);
++          vty_out (vty, VTYNL);
 +        }
      }
  }  
  
@@@ -8169,12 -8133,19 +8163,12 @@@ route_vty_out_detail_header (struct vt
               prefix_rd2str (prd, buf1, RD_ADDRSTRLEN) : ""),
               ((safi == SAFI_MPLS_VPN) || (safi == SAFI_EVPN)) ? ":" : "",
               buf2,
-              p->prefixlen, VTY_NEWLINE);
+              p->prefixlen);
  
 -      if (bgp_labeled_safi(safi))
 -        {
 -          vty_out(vty, "Local label: ");
 -          if (!bgp_is_valid_label(rn->local_label))
 -            vty_outln (vty, "not allocated");
 -          else
 -            {
 -              uint32_t label = label_pton(rn->local_label);
 -              vty_outln (vty, "%d", label);
 -            }
 -        }
 +      if (has_valid_label)
-         vty_out(vty, "Local label: %d%s", label, VTY_NEWLINE);
++        vty_outln (vty, "Local label: %d%s", label);
 +      else if (bgp_labeled_safi(safi))
-         vty_out(vty, "Local label: not allocated%s", VTY_NEWLINE);
++        vty_outln (vty, "Local label: not allocated%s");
      }
  
    for (ri = rn->info; ri; ri = ri->next)
@@@ -10723,8 -10705,8 +10716,13 @@@ bgp_config_write_network_evpn (struct v
              prefix2str (p, buf, sizeof (buf)),
            vty_out (vty, " network %s rd %s ethtag %u tag %u esi %s gwip %s routermac %s",
                     buf, rdbuf, p->u.prefix_evpn.eth_tag,
++<<<<<<< HEAD
 +                     decode_label (&bgp_static->label), esi, buf2 , macrouter);
 +          vty_out (vty, "%s", VTY_NEWLINE);
++=======
+                      decode_label (bgp_static->tag), esi, buf2 , macrouter);
+           vty_out (vty, VTYNL);
++>>>>>>> 5fca4e3635c2778e8349bce0eaf944c26913d321
              if (macrouter)
                XFREE (MTYPE_TMP, macrouter);
              if (esi)

diff --cc bgpd/bgp_route.h
Simple merge

diff --cc bgpd/bgp_updgrp_adv.c
Simple merge

diff --cc bgpd/bgp_updgrp_packet.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_vty.h
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/rfapi/rfapi.c
Simple merge

diff --cc bgpd/rfapi/rfapi_rib.c
Simple merge

diff --cc bgpd/rfapi/rfapi_vty.c
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc zebra/zebra_mpls.c
Simple merge

diff --cc zebra/zserv.c
Simple merge