Merge pull request #1298 from opensourcerouting/iface-rb-tree

Use rb-trees to store interfaces instead of linked-lists

diff --cc babeld/babel_interface.h
Simple merge

diff --cc babeld/message.c
Simple merge

diff --cc bgpd/bgp_zebra.c
index f9794572443dbc0a165661ac31f753de4d9c5733,53c5762ceab153af217a37a61f0f534b5954b970..ddf461f1b183bc93658c0267b2992ca540f501b7
--- 1/bgpd/bgp_zebra.c
--- 2/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@@ -236,9 -232,13 +236,9 @@@ static int bgp_interface_delete(int com
        if (BGP_DEBUG(zebra, ZEBRA))
                zlog_debug("Rx Intf del VRF %u IF %s", vrf_id, ifp->name);
  
 -      bgp = bgp_lookup_by_vrf_id(vrf_id);
 -      if (!bgp)
 -              return 0;
 -
        bgp_update_interface_nbrs(bgp, ifp, NULL);
  
-       ifp->ifindex = IFINDEX_DELETED;
+       if_set_index(ifp, IFINDEX_INTERNAL);
        return 0;
  }
  

diff --cc ospfd/ospf_te.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc ospfd/ospf_zebra.c
Simple merge

diff --cc ospfd/ospfd.c
Simple merge

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc ripngd/ripngd.c
Simple merge

diff --cc zebra/zserv.c
Simple merge