From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 27 Nov 2015 16:47:38 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1182^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b3d439f347174feff00006709e0cb63361fd98b5;p=matthieu%2Ffrr.git

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
---

b3d439f347174feff00006709e0cb63361fd98b5
diff --cc zebra/zebra_rib.c
index 36bcfc859f,d1f679361a..e2d7119e03
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@@ -2619,12 -2708,23 +2613,23 @@@ static_install_route (afi_t afi, safi_
  	  zebra_register_rnh_static_nh(&nh_p, rn);
  	  break;
  	case STATIC_IPV6_IFNAME:
 -	  nexthop_ifname_add (rib, si->ifname);
 +	  rib_nexthop_ifname_add (rib, si->ifname);
  	  break;
  	case STATIC_IPV6_GATEWAY_IFNAME:
 -	  nexthop_ipv6_ifname_add (rib, &si->addr.ipv6, si->ifname);
 +	  rib_nexthop_ipv6_ifname_add (rib, &si->addr.ipv6, si->ifname);
  	  break;
          }
+ 
+       if (IS_ZEBRA_DEBUG_RIB)
+         {
+           char buf[INET6_ADDRSTRLEN];
+           if (IS_ZEBRA_DEBUG_RIB)
+             {
+               inet_ntop (p->family, &p->u.prefix, buf, INET6_ADDRSTRLEN);
+               zlog_debug ("%u:%s/%d: Modifying route rn %p, rib %p (type %d)",
+                           si->vrf_id, buf, p->prefixlen, rn, rib, rib->type);
+             }
+         }
        rib_queue_add (&zebrad, rn);
      }
    else