Merge remote-tracking branch 'origin/master' into pim_lib_work2

Conflicts:
	lib/zebra.h
	zebra/rt_netlink.c

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc lib/zebra.h
index f89e7f5c3f25c90c1431df19f867ae8a7e682955,c9be1892e472308871c328b06b826ef74bd6abbb..bb43d062bc42e4a9a1ec2a811a9f3a6ed301c62a
--- 1/lib/zebra.h
--- 2/lib/zebra.h
+++ b/lib/zebra.h
@@@ -493,15 -486,19 +493,21 @@@ typedef enum 
   * not optimal for use in data-structure sizing.
   * Note: Only useful (i.e., supported) values are defined below.
   */
 -#define IANA_AFI_RESERVED             0
 -#define IANA_AFI_IPV4                 1
 -#define IANA_AFI_IPV6                 2
 -#define IANA_AFI_L2VPN                25
 -#define IANA_AFI_IPMR                 128
 -#define IANA_AFI_IP6MR                129
 +typedef enum {
 +  IANA_AFI_RESERVED = 0,
 +  IANA_AFI_IPV4 = 1,
 +  IANA_AFI_IPV6 = 2,
 +  IANA_AFI_L2VPN = 25,
 +  IANA_AFI_IPMR = 128,
 +  IANA_AFI_IP6MR = 129
 +} iana_afi_t;
  
+ #define IANA_SAFI_RESERVED            0
+ #define IANA_SAFI_UNICAST             1
+ #define IANA_SAFI_MULTICAST           2
+ #define IANA_SAFI_ENCAP               7
+ #define IANA_SAFI_MPLS_VPN            128
+ 
  /* Default Administrative Distance of each protocol. */
  #define ZEBRA_KERNEL_DISTANCE_DEFAULT      0
  #define ZEBRA_CONNECT_DISTANCE_DEFAULT     0