Merge remote-tracking branch 'frr/master' into pull-624

diff --cc configure.ac
Simple merge

diff --cc lib/command.c
Simple merge

diff --cc lib/route_types.txt
Simple merge

diff --cc lib/zclient.c
Simple merge

diff --cc tools/etc/iproute2/rt_protos.d/frr.conf
index b9824a4f2aa0eb3f4c4f07880b44a8bc90350968,2d3b884e7e7ef2f90bd65b5392a56fe99c280161..6b341f5161137112054cc364b37d8e038e7649dc
--- 1/tools/etc/iproute2/rt_protos.d/frr.conf
--- 2/tools/etc/iproute2/rt_protos.d/frr.conf
+++ b/tools/etc/iproute2/rt_protos.d/frr.conf
@@@ -5,5 -5,6 +5,7 @@@
  188  ospf
  189  rip
  190  ripng
- 191  static
- 194  babel
+ 191  nhrp
+ 192  eigrp
+ 193  ldp
++194  babel

diff --cc vtysh/vtysh.c
Simple merge

diff --cc vtysh/vtysh_config.c
Simple merge

diff --cc zebra/rt_netlink.c
index 4121ed5df8795fe5d02b5a37c752593157d71429,9bad7991a5418187b136dd9d29d59ca170b72722..99bef4ec4d60545db0e31e320750e62e123fdf19
--- 1/zebra/rt_netlink.c
--- 2/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@@ -122,7 -122,8 +122,8 @@@ static inline int is_selfroute(int prot
    if ((proto == RTPROT_BGP) || (proto == RTPROT_OSPF) ||
        (proto == RTPROT_STATIC) || (proto == RTPROT_ZEBRA) ||
        (proto == RTPROT_ISIS) || (proto == RTPROT_RIPNG) ||
-       (proto == RTPROT_BABEL)) {
+       (proto == RTPROT_NHRP) || (proto == RTPROT_EIGRP) ||
 -      (proto == RTPROT_LDP)) {
++      (proto == RTPROT_LDP) || (proto == RTPROT_BABEL)) {
      return 1;
    }
  

diff --cc zebra/rt_netlink.h
index 3b339ec670d972ec4a53f858a322b1206deed7aa,6f9487542ca21ca38e01a9cd1103bde780adef45..9ba86003b8c08f62fd3e3690cc03fe5ecb323e8f
--- 1/zebra/rt_netlink.h
--- 2/zebra/rt_netlink.h
+++ b/zebra/rt_netlink.h
@@@ -33,9 -33,9 +33,12 @@@
  #define RTPROT_OSPF        188
  #define RTPROT_RIP         189
  #define RTPROT_RIPNG       190
 +#if !defined(RTPROT_BABEL)
 +#define RTPROT_BABEL              42
 +#endif
+ #define RTPROT_NHRP        191
+ #define RTPROT_EIGRP       192
+ #define RTPROT_LDP         193
  
  void rt_netlink_init (void);
  

diff --cc zebra/zebra_rib.c
index 92639c524c4fe29857448be8ed01455f262ae5cc,ae514ad94a8976fa1e77e080ee8d0e6021d01af3..a633a871d1ff57ba31040b9d68c6445e8286f457
--- 1/zebra/zebra_rib.c
--- 2/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@@ -1863,20 -1845,29 +1845,30 @@@ meta_queue_process (struct work_queue *
   * Map from rib types to queue type (priority) in meta queue
   */
  static const u_char meta_queue_map[ZEBRA_ROUTE_MAX] = {
-   [ZEBRA_ROUTE_SYSTEM]  = 4,
-   [ZEBRA_ROUTE_KERNEL]  = 0,
-   [ZEBRA_ROUTE_CONNECT] = 0,
-   [ZEBRA_ROUTE_STATIC]  = 1,
-   [ZEBRA_ROUTE_RIP]     = 2,
-   [ZEBRA_ROUTE_RIPNG]   = 2,
-   [ZEBRA_ROUTE_OSPF]    = 2,
-   [ZEBRA_ROUTE_OSPF6]   = 2,
-   [ZEBRA_ROUTE_ISIS]    = 2,
-   [ZEBRA_ROUTE_NHRP]    = 2,
-   [ZEBRA_ROUTE_BGP]     = 3,
-   [ZEBRA_ROUTE_HSLS]    = 4,
-   [ZEBRA_ROUTE_TABLE]   = 1,
-   [ZEBRA_ROUTE_BABEL]   = 2,
+   [ZEBRA_ROUTE_SYSTEM]         = 4,
+   [ZEBRA_ROUTE_KERNEL]         = 0,
+   [ZEBRA_ROUTE_CONNECT]        = 0,
+   [ZEBRA_ROUTE_STATIC]         = 1,
+   [ZEBRA_ROUTE_RIP]            = 2,
+   [ZEBRA_ROUTE_RIPNG]          = 2,
+   [ZEBRA_ROUTE_OSPF]           = 2,
+   [ZEBRA_ROUTE_OSPF6]          = 2,
+   [ZEBRA_ROUTE_ISIS]           = 2,
+   [ZEBRA_ROUTE_BGP]            = 3,
+   [ZEBRA_ROUTE_PIM]            = 4,  // Shouldn't happen but for safety
+   [ZEBRA_ROUTE_EIGRP]          = 2,
+   [ZEBRA_ROUTE_NHRP]           = 2,
+   [ZEBRA_ROUTE_HSLS]           = 4,
+   [ZEBRA_ROUTE_OLSR]           = 4,
+   [ZEBRA_ROUTE_TABLE]          = 1,
+   [ZEBRA_ROUTE_LDP]            = 4,
+   [ZEBRA_ROUTE_VNC]            = 3,
+   [ZEBRA_ROUTE_VNC_DIRECT]     = 3,
+   [ZEBRA_ROUTE_VNC_DIRECT_RH]  = 3,
+   [ZEBRA_ROUTE_BGP_DIRECT]     = 3,
+   [ZEBRA_ROUTE_BGP_DIRECT_EXT] = 3,
++  [ZEBRA_ROUTE_BABEL]          = 2,
+   [ZEBRA_ROUTE_ALL]            = 4,  // Shouldn't happen but for safety
  };
  
  /* Look into the RN and queue it into one or more priority queues,

diff --cc zebra/zebra_vty.c
Simple merge