Merge pull request #3032 from donaldsharp/bgp_info

`struct bgp_info` to `struct bgp_path_info`

diff --cc bgpd/bgp_mplsvpn.c
index 63a24fc4c7bb79907679db6c0a7aa2077cc95aef,5d42e4d33603cfd1788eae9c395e6ca4853ccb30..385716970b079e013ca38c887958b39aa1cc00e3
--- 1/bgpd/bgp_mplsvpn.c
--- 2/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@@ -1086,10 -1077,8 +1077,10 @@@ vpn_leak_to_vrf_update_onevrf(struct bg
         * Stash it for later label resolution by vrf ingress path and then
         * overwrite with 0, i.e., "me", for the sake of vrf advertisement.
         */
-       uint8_t nhfamily = NEXTHOP_FAMILY(info_vpn->attr->mp_nexthop_len);
+       uint8_t nhfamily = NEXTHOP_FAMILY(path_vpn->attr->mp_nexthop_len);
  
 +      if (nhfamily != AF_UNSPEC)
 +              static_attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP);
        memset(&nexthop_orig, 0, sizeof(nexthop_orig));
        nexthop_orig.family = nhfamily;
  
@@@ -1105,10 -1094,11 +1096,10 @@@
                                nexthop_orig.u.prefix4.s_addr;
  
                        static_attr.mp_nexthop_global_in =
-                               info_vpn->attr->mp_nexthop_global_in;
+                               path_vpn->attr->mp_nexthop_global_in;
                        static_attr.mp_nexthop_len =
-                               info_vpn->attr->mp_nexthop_len;
+                               path_vpn->attr->mp_nexthop_len;
                }
 -              static_attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP);
                break;
        case AF_INET6:
                /* save */

diff --cc bgpd/bgp_updgrp.c
Simple merge