Merge pull request #2875 from opensourcerouting/fabricd

OpenFabric support

diff --cc configure.ac
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc zebra/zebra_rib.c
index 0739db10271209d80f3609d48d5dd0d567dd8a16,1088a97278978fee8c004ec9c4b9d0374555a328..2c8fa77c32d91a84c3753ea4560ed96b990c1b6d
--- 1/zebra/zebra_rib.c
--- 2/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@@ -442,24 -441,14 +445,25 @@@ static int nexthop_active(afi_t afi, st
         */
        if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK)) {
                ifp = if_lookup_by_index(nexthop->ifindex, nexthop->vrf_id);
-               if (ifp && connected_is_unnumbered(ifp)) {
+               if ((ifp && connected_is_unnumbered(ifp))
+                   || CHECK_FLAG(re->flags, ZEBRA_FLAG_ONLINK)) {
                        if (if_is_operative(ifp))
                                return 1;
 -                      else
 +                      else {
 +                              if (IS_ZEBRA_DEBUG_RIB_DETAILED)
 +                                      zlog_debug(
 +                                              "\t%s: Onlink and interface %s is not operative",
 +                                              __PRETTY_FUNCTION__, ifp->name);
                                return 0;
 -              } else
 +                      }
 +              } else {
 +                      if (IS_ZEBRA_DEBUG_RIB_DETAILED)
 +                              zlog_debug(
 +                                      "\t%s: Interface %s is not unnumbered",
 +                                      __PRETTY_FUNCTION__,
 +                                      ifp ? ifp->name : "Unknown");
                        return 0;
 +              }
        }
  
        /* Make lookup prefix. */