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

Conflicts:
	bgpd/bgp_route.c
	bgpd/bgp_zebra.c

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
index 47723f1dc4870a3d20963b45e3d2a8032bf88ad4,b4a723281a3aaa2856403a0ef10ab2bd9cb2a96d..71a4d4317a91aa0d6dbebbb5111387c3ba5b1e73
--- 1/bgpd/bgp_zebra.c
--- 2/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@@ -1278,20 -1275,8 +1275,9 @@@ bgp_zebra_announce (struct bgp_node *rn
        struct in_addr *nexthop;
        char buf[2][INET_ADDRSTRLEN];
        int valid_nh_count = 0;
 +      int has_valid_label = 0;
  
        /* resize nexthop buffer size if necessary */
-       if ((oldsize = stream_get_size (bgp_nexthop_buf)) <
-           (sizeof (struct in_addr *) * nhcount))
-         {
-           newsize = sizeof (struct in_addr *) * nhcount;
-           newsize = stream_resize (bgp_nexthop_buf, newsize);
-           if (newsize == oldsize)
-             {
-                 zlog_err ("can't resize nexthop buffer");
-                 return;
-             }
-         }
        stream_reset (bgp_nexthop_buf);
        nexthop = NULL;
  
@@@ -1467,54 -1406,10 +1409,11 @@@
        struct zapi_ipv6 api;
        int valid_nh_count = 0;
            char buf[2][INET6_ADDRSTRLEN];
 +      int has_valid_label = 0;
  
-       /* resize nexthop buffer size if necessary */
-       if ((oldsize = stream_get_size (bgp_nexthop_buf)) <
-           (sizeof (struct in6_addr *) * nhcount))
-         {
-           newsize = (sizeof (struct in6_addr *) * nhcount);
-           newsize = stream_resize (bgp_nexthop_buf, newsize);
-           if (newsize == oldsize)
-             {
-               zlog_err ("can't resize nexthop buffer");
-               return;
-             }
-         }
        stream_reset (bgp_nexthop_buf);
- 
-       /* resize ifindices buffer size if necessary */
-       if ((oldsize = stream_get_size (bgp_ifindices_buf)) <
-           (sizeof (unsigned int) * nhcount))
-         {
-           newsize = (sizeof (unsigned int) * nhcount);
-           newsize = stream_resize (bgp_ifindices_buf, newsize);
-           if (newsize == oldsize)
-             {
-               zlog_err ("can't resize nexthop buffer");
-               return;
-             }
-         }
        stream_reset (bgp_ifindices_buf);
- 
-       /* For labeled unicast, each nexthop has a label too. Resize label
-        * buffer, if required.
-        */
-       if (safi == SAFI_UNICAST)
-         {
-           if ((oldsize = stream_get_size (bgp_label_buf)) <
-               (sizeof (unsigned int) * nhcount))
-             {
-               newsize = (sizeof (unsigned int) * nhcount);
-               newsize = stream_resize (bgp_label_buf, newsize);
-               if (newsize == oldsize)
-                 {
-                   zlog_err ("can't resize label buffer");
-                   return;
-                 }
-             }
-           stream_reset (bgp_label_buf);
-         }
+       stream_reset (bgp_label_buf);
  
        ifindex = 0;
        nexthop = NULL;

diff --cc bgpd/bgpd.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/zebra_vty.c
Simple merge