From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 18 Jan 2017 02:01:56 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into pim_lib_work2
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~14
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b58ed1f8a89ea32c2380bf79057e5333109d72d4;p=matthieu%2Ffrr.git

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

b58ed1f8a89ea32c2380bf79057e5333109d72d4
diff --cc bgpd/bgp_attr.c
index 0cdaa545d6,4cf1f0daed..5c26ecc6ad
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@@ -1738,8 -1849,8 +1849,9 @@@ in
  bgp_mp_reach_parse (struct bgp_attr_parser_args *args,
                      struct bgp_nlri *mp_update)
  {
-   afi_t afi;
-   safi_t safi;
 -  afi_t pkt_afi, afi;
++  iana_afi_t pkt_afi;
++  afi_t  afi;
+   safi_t pkt_safi, safi;
    bgp_size_t nlri_len;
    size_t start;
    struct stream *s;
@@@ -1879,8 -2000,8 +2001,9 @@@ bgp_mp_unreach_parse (struct bgp_attr_p
  		      struct bgp_nlri *mp_withdraw)
  {
    struct stream *s;
 -  afi_t pkt_afi, afi;
++  iana_afi_t pkt_afi;
 +  afi_t afi;
-   safi_t safi;
+   safi_t pkt_safi, safi;
    u_int16_t withdraw_len;
    struct peer *const peer = args->peer;  
    struct attr *const attr = args->attr;
@@@ -2507,6 -2648,8 +2650,8 @@@ bgp_packet_mpattr_start (struct stream 
  			 struct attr *attr)
  {
    size_t sizep;
 -  afi_t pkt_afi;
++  iana_afi_t pkt_afi;
+   safi_t pkt_safi;
  
    /* Set extended bit always to encode the attribute length as 2 bytes */
    stream_putc (s, BGP_ATTR_FLAG_OPTIONAL|BGP_ATTR_FLAG_EXTLEN);
@@@ -3134,6 -3279,8 +3281,8 @@@ size_
  bgp_packet_mpunreach_start (struct stream *s, afi_t afi, safi_t safi)
  {
    unsigned long attrlen_pnt;
 -  afi_t pkt_afi;
++  iana_afi_t pkt_afi;
+   safi_t pkt_safi;
  
    /* Set extended bit always to encode the attribute length as 2 bytes */
    stream_putc (s, BGP_ATTR_FLAG_OPTIONAL|BGP_ATTR_FLAG_EXTLEN);
diff --cc bgpd/bgp_open.c
index 02026a004a,4a06881041..7dbb439be1
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@@ -213,7 -188,7 +188,9 @@@ bgp_capability_mp (struct peer *peer, s
  {
    struct capability_mp_data mpc;
    struct stream *s = BGP_INPUT (peer);
--  
++  afi_t afi;
++  safi_t safi;
++
    /* Verify length is 4 */
    if (hdr->length != 4)
      {
@@@ -228,14 -203,15 +205,15 @@@
      zlog_debug ("%s OPEN has MP_EXT CAP for afi/safi: %u/%u",
                 peer->host, mpc.afi, mpc.safi);
    
-   if (!bgp_afi_safi_valid_indices (mpc.afi, &mpc.safi))
+   /* Convert AFI, SAFI to internal values, check. */
 -  if (bgp_map_afi_safi_iana2int (mpc.afi, mpc.safi, &mpc.afi, &mpc.safi))
++  if (bgp_map_afi_safi_iana2int (mpc.afi, mpc.safi, &afi, &safi))
      return -1;
     
    /* Now safi remapped, and afi/safi are valid array indices */
--  peer->afc_recv[mpc.afi][mpc.safi] = 1;
++  peer->afc_recv[afi][safi] = 1;
    
--  if (peer->afc[mpc.afi][mpc.safi])
--    peer->afc_nego[mpc.afi][mpc.safi] = 1;
++  if (peer->afc[afi][safi])
++    peer->afc_nego[afi][safi] = 1;
    else 
      return -1;
  
@@@ -243,7 -219,7 +221,7 @@@
  }
  
  static void
--bgp_capability_orf_not_support (struct peer *peer, afi_t afi, safi_t safi,
++bgp_capability_orf_not_support (struct peer *peer, iana_afi_t afi, safi_t safi,
  				u_char type, u_char mode)
  {
    if (bgp_debug_neighbor_events(peer))
@@@ -271,8 -247,8 +249,9 @@@ bgp_capability_orf_entry (struct peer *
  {
    struct stream *s = BGP_INPUT (peer);
    struct capability_orf_entry entry;
 -  afi_t pkt_afi, afi;
++  iana_afi_t pkt_afi;
 +  afi_t afi;
-   safi_t safi;
+   safi_t pkt_safi, safi;
    u_char type;
    u_char mode;
    u_int16_t sm_cap = 0; /* capability send-mode receive */
@@@ -298,6 -274,9 +277,9 @@@
        return 0;
      }
    
 -  entry.mpc.afi = afi;
++  entry.mpc.afi = pkt_afi;
+   entry.mpc.safi = safi;
+ 
    /* validate number field */
    if (CAPABILITY_CODE_ORF_LEN + (entry.num * 2) > hdr->length)
      {
@@@ -437,11 -416,14 +419,14 @@@ bgp_capability_restart (struct peer *pe
  
    while (stream_get_getp (s) + 4 <= end)
      {
-       afi_t afi = stream_getw (s);
-       safi_t safi = stream_getc (s);
+       afi_t afi;
+       safi_t safi;
 -      afi_t pkt_afi = stream_getw (s);
++      iana_afi_t pkt_afi = stream_getw (s);
+       safi_t pkt_safi = stream_getc (s);
        u_char flag = stream_getc (s);
        
-       if (!bgp_afi_safi_valid_indices (afi, &safi))
+       /* Convert AFI, SAFI to internal values, check. */
+       if (bgp_map_afi_safi_iana2int (pkt_afi, pkt_safi, &afi, &safi))
          {
            if (bgp_debug_neighbor_events(peer))
              zlog_debug ("%s Addr-family %d/%d(afi/safi) not supported."
@@@ -512,8 -494,10 +497,10 @@@ bgp_capability_addpath (struct peer *pe
  
    while (stream_get_getp (s) + 4 <= end)
      {
-       afi_t afi = stream_getw (s);
-       safi_t safi = stream_getc (s);
+       afi_t afi;
+       safi_t safi;
 -      afi_t pkt_afi = stream_getw (s);
++      iana_afi_t pkt_afi = stream_getw (s);
+       safi_t pkt_safi = stream_getc (s);
        u_char send_receive = stream_getc (s);
  
        if (bgp_debug_neighbor_events(peer))
@@@ -565,9 -550,9 +553,11 @@@ bgp_capability_enhe (struct peer *peer
  
    while (stream_get_getp (s) + 6 <= end)
      {
-       afi_t afi = stream_getw (s);
-       safi_t safi = stream_getw (s);
-       afi_t nh_afi = stream_getw (s);
 -      afi_t afi, pkt_afi = stream_getw (s);
++      iana_afi_t pkt_afi = stream_getw (s);
++      afi_t afi;
+       safi_t safi, pkt_safi = stream_getw (s);
 -      afi_t nh_afi, pkt_nh_afi = stream_getw (s);
++      iana_afi_t pkt_nh_afi = stream_getw (s);
++      afi_t nh_afi;
  
        if (bgp_debug_neighbor_events(peer))
          zlog_debug ("%s Received with afi/safi/next-hop afi: %u/%u/%u",
@@@ -1174,9 -1162,11 +1167,11 @@@ bgp_open_capability_orf (struct stream 
    unsigned long orfp;
    unsigned long numberp;
    int number_of_orfs = 0;
 -  afi_t pkt_afi;
++  iana_afi_t pkt_afi;
+   safi_t pkt_safi;
  
-   if (safi == SAFI_MPLS_VPN)
-     safi = SAFI_MPLS_LABELED_VPN;
+   /* Convert AFI, SAFI to values for packet. */
+   bgp_map_afi_safi_int2iana (afi, safi, &pkt_afi, &pkt_safi);
  
    stream_putc (s, BGP_OPEN_OPT_CAP);
    capp = stream_get_endp (s);           /* Set Capability Len Pointer */
@@@ -1235,8 -1225,8 +1230,9 @@@ bgp_open_capability (struct stream *s, 
  {
    u_char len;
    unsigned long cp, capp, rcapp;
 -  afi_t afi, pkt_afi;
++  iana_afi_t pkt_afi;
 +  afi_t afi;
-   safi_t safi;
+   safi_t safi, pkt_safi;
    as_t local_as;
    u_int32_t restart_time;
    u_char afi_safi_count = 0;
diff --cc bgpd/bgp_open.h
index 8ec0a5416b,b0a396ec11..9275b3a101
--- a/bgpd/bgp_open.h
+++ b/bgpd/bgp_open.h
@@@ -31,7 -31,7 +31,7 @@@ struct capability_heade
  /* Generic MP capability data */
  struct capability_mp_data
  {
--  afi_t afi;
++  iana_afi_t afi;
    u_char reserved;
    safi_t safi;
  };
diff --cc bgpd/bgp_packet.c
index 796a57f054,38470a3c7e..529a3e46ca
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@@ -147,6 -147,8 +147,8 @@@ static struct stream 
  bgp_update_packet_eor (struct peer *peer, afi_t afi, safi_t safi)
  {
    struct stream *s;
 -  afi_t pkt_afi;
++  iana_afi_t pkt_afi;
+   safi_t pkt_safi;
  
    if (DISABLE_BGP_ANNOUNCE)
      return NULL;
@@@ -691,6 -695,8 +695,8 @@@ bgp_route_refresh_send (struct peer *pe
    struct stream *s;
    struct bgp_filter *filter;
    int orf_refresh = 0;
 -  afi_t pkt_afi;
++  iana_afi_t pkt_afi;
+   safi_t pkt_safi;
  
    if (DISABLE_BGP_ANNOUNCE)
      return;
@@@ -777,10 -782,11 +782,11 @@@ bgp_capability_send (struct peer *peer
  		     int capability_code, int action)
  {
    struct stream *s;
 -  afi_t pkt_afi;
++  iana_afi_t pkt_afi;
+   safi_t pkt_safi;
  
-   /* Adjust safi code. */
-   if (safi == SAFI_MPLS_VPN)
-     safi = SAFI_MPLS_LABELED_VPN;
+   /* Convert AFI, SAFI to values for packet. */
+   bgp_map_afi_safi_int2iana (afi, safi, &pkt_afi, &pkt_safi);
  
    s = stream_new (BGP_MAX_PACKET_SIZE);
  
@@@ -1728,8 -1711,8 +1711,9 @@@ bgp_keepalive_receive (struct peer *pee
  static void
  bgp_route_refresh_receive (struct peer *peer, bgp_size_t size)
  {
 -  afi_t pkt_afi, afi;
++  iana_afi_t pkt_afi;
 +  afi_t afi;
-   safi_t safi;
+   safi_t pkt_safi, safi;
    struct stream *s;
    struct peer_af *paf;
    struct update_group *updgrp;
@@@ -1955,8 -1932,8 +1933,9 @@@ bgp_capability_msg_parse (struct peer *
    struct capability_mp_data mpc;
    struct capability_header *hdr;
    u_char action;
 -  afi_t pkt_afi, afi;
++  iana_afi_t pkt_afi;
 +  afi_t afi;
-   safi_t safi;
+   safi_t pkt_safi, safi;
  
    end = pnt + length;
  
diff --cc bgpd/bgp_route.c
index cfc4ec3407,d2abb40ca9..75036b5496
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -2115,9 -2110,12 +2110,12 @@@ bgp_maximum_prefix_restart_timer (struc
  }
  
  int
--bgp_maximum_prefix_overflow (struct peer *peer, afi_t afi, 
++bgp_maximum_prefix_overflow (struct peer *peer, afi_t afi,
                               safi_t safi, int always)
  {
 -  afi_t pkt_afi;
++  iana_afi_t pkt_afi;
+   safi_t pkt_safi;
+ 
    if (!CHECK_FLAG (peer->af_flags[afi][safi], PEER_FLAG_MAX_PREFIX))
      return 0;
  
diff --cc bgpd/bgpd.c
index 30f6e0d859,5457822f3b..c08107f0d9
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@@ -651,6 -651,35 +651,35 @@@ bgp_listen_limit_unset (struct bgp *bgp
    return 0;
  }
  
+ int
 -bgp_map_afi_safi_iana2int (afi_t pkt_afi, safi_t pkt_safi,
++bgp_map_afi_safi_iana2int (iana_afi_t pkt_afi, safi_t pkt_safi,
+                            afi_t *afi, safi_t *safi)
+ {
+   /* Map from IANA values to internal values, return error if
+    * values are unrecognized.
+    */
+   *afi = afi_iana2int (pkt_afi);
+   *safi = safi_iana2int (pkt_safi);
+   if (*afi == AFI_MAX || *safi == SAFI_MAX)
+     return -1;
+ 
+   return 0;
+ }
+ 
+ int
+ bgp_map_afi_safi_int2iana (afi_t afi, safi_t safi,
 -                           afi_t *pkt_afi, safi_t *pkt_safi)
++                           iana_afi_t *pkt_afi, safi_t *pkt_safi)
+ {
+   /* Map from internal values to IANA values, return error if
+    * internal values are bad (unexpected).
+    */
+   if (afi == AFI_MAX || safi == SAFI_MAX)
+     return -1;
+   *pkt_afi = afi_int2iana (afi);
+   *pkt_safi = safi_int2iana (safi);
+   return 0;
+ }
+ 
  struct peer_af *
  peer_af_create (struct peer *peer, afi_t afi, safi_t safi)
  {
diff --cc bgpd/bgpd.h
index 86fa207b6b,2718805130..3dd5523dce
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@@ -1359,6 -1354,13 +1354,13 @@@ extern void bgp_route_map_terminate(voi
  
  extern int peer_cmp (struct peer *p1, struct peer *p2);
  
+ extern int
 -bgp_map_afi_safi_iana2int (afi_t pkt_afi, safi_t pkt_safi,
++bgp_map_afi_safi_iana2int (iana_afi_t pkt_afi, safi_t pkt_safi,
+                            afi_t *afi, safi_t *safi);
+ extern int
+ bgp_map_afi_safi_int2iana (afi_t afi, safi_t safi,
 -                           afi_t *pkt_afi, safi_t *pkt_safi);
++                           iana_afi_t *pkt_afi, safi_t *pkt_safi);
+ 
  extern struct peer_af * peer_af_create (struct peer *, afi_t, safi_t);
  extern struct peer_af * peer_af_find (struct peer *, afi_t, safi_t);
  extern int peer_af_delete (struct peer *, afi_t, safi_t);
diff --cc lib/zebra.h
index f344867697,5a58cf8e6e..f89e7f5c3f
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@@ -472,11 -471,12 +472,18 @@@ typedef enum 
  /* Subsequent Address Family Identifier. */
  #define SAFI_UNICAST              1
  #define SAFI_MULTICAST            2
- #define SAFI_RESERVED_3           3
- #define SAFI_MPLS_VPN             4
- #define SAFI_ENCAP		  7 /* per IANA */
- #define SAFI_MAX                  8
+ #define SAFI_MPLS_VPN             3
+ #define SAFI_RESERVED_4           4
+ #define SAFI_ENCAP		  5
+ #define SAFI_RESERVED_5           5
+ #define SAFI_MAX                  6
+ 
++#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
 +
  /*
   * The above AFI and SAFI definitions are for internal use. The protocol
   * definitions (IANA values) as for example used in BGP protocol packets
@@@ -527,4 -528,48 +534,48 @@@ typedef uint32_t route_tag_t
  #define ROUTE_TAG_MAX UINT32_MAX
  #define ROUTE_TAG_PRI PRIu32
  
 -static inline afi_t afi_iana2int (afi_t afi)
++static inline afi_t afi_iana2int (iana_afi_t afi)
+ {
+   if (afi == IANA_AFI_IPV4)
+     return AFI_IP;
+   if (afi == IANA_AFI_IPV6)
+     return AFI_IP6;
+   return AFI_MAX;
+ }
+ 
 -static inline afi_t afi_int2iana (afi_t afi)
++static inline iana_afi_t afi_int2iana (afi_t afi)
+ {
+   if (afi == AFI_IP)
+     return IANA_AFI_IPV4;
+   if (afi == AFI_IP6)
+     return IANA_AFI_IPV6;
+   return IANA_AFI_RESERVED;
+ }
+ 
+ static inline safi_t safi_iana2int (safi_t safi)
+ {
+   if (safi == IANA_SAFI_UNICAST)
+     return SAFI_UNICAST;
+   if (safi == IANA_SAFI_MULTICAST)
+     return SAFI_MULTICAST;
+   if (safi == IANA_SAFI_MPLS_VPN)
+     return SAFI_MPLS_VPN;
+   if (safi == IANA_SAFI_ENCAP)
+     return SAFI_ENCAP;
+   return SAFI_MAX;
+ }
+ 
+ static inline safi_t safi_int2iana (safi_t safi)
+ {
+   if (safi == SAFI_UNICAST)
+     return IANA_SAFI_UNICAST;
+   if (safi == SAFI_MULTICAST)
+     return IANA_SAFI_MULTICAST;
+   if (safi == SAFI_MPLS_VPN)
+     return IANA_SAFI_MPLS_VPN;
+   if (safi == SAFI_ENCAP)
+     return IANA_SAFI_ENCAP;
+   return IANA_SAFI_RESERVED;
+ }
+ 
  #endif /* _ZEBRA_H */
diff --cc pimd/DEBUG
index ea1b14158d,a6ad260e82..b87542a4a2
--- a/pimd/DEBUG
+++ b/pimd/DEBUG
@@@ -1,4 -1,3 +1,7 @@@
++<<<<<<< HEAD
 +
++=======
++>>>>>>> origin/master
  DEBUG HINTS
  
    - Check the source is issuing multicast packets with TTL high enough
diff --cc pimd/pim_assert.c
index f28e2c0e85,f09540ea00..385b897bf9
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_cmd.c
index 3646145309,088713012e..50578bf1e8
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_hello.h
index 3ab83db5eb,3a6d3361ba..f8e722cd04
--- a/pimd/pim_hello.h
+++ b/pimd/pim_hello.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_HELLO_H
diff --cc pimd/pim_iface.c
index 0b5c7cc1eb,bac9692caa..7b2c7e2e93
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@@ -15,7 -15,6 +15,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_iface.h
index 17bbbd9937,e56559ca46..bd4ebd257d
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@@ -16,8 -16,7 +16,7 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
-   
--*/
++s*/
  
  #ifndef PIM_IFACE_H
  #define PIM_IFACE_H
diff --cc pimd/pim_ifchannel.h
index a95f66551b,ce753222ee..c1ce52449a
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_IFCHANNEL_H
diff --cc pimd/pim_igmp.c
index 456b9ad742,ef1b3cbac0..a309de690b
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_igmp_join.h
index 2c72a4bea6,ba80db0696..d9542732b8
--- a/pimd/pim_igmp_join.h
+++ b/pimd/pim_igmp_join.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_IGMP_JOIN_H
diff --cc pimd/pim_igmpv3.c
index 987ab895ae,bdaf2bb270..4de3b65ec5
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_igmpv3.h
index 33a918bad1,db7895f9be..893fba60f2
--- a/pimd/pim_igmpv3.h
+++ b/pimd/pim_igmpv3.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_IGMPV3_H
diff --cc pimd/pim_join.c
index c0535c4844,6a5fb851d6..db17c3faec
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_join.h
index fadb613592,dcdca00359..27333243db
--- a/pimd/pim_join.h
+++ b/pimd/pim_join.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_JOIN_H
diff --cc pimd/pim_main.c
index 7fc9bc524e,ed8f69b517..e7b86a0404
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
@@@ -166,9 -174,14 +169,9 @@@ int main(int argc, char** argv, char** 
        break;
      case 'v':
        printf(PIMD_PROGNAME " version %s\n", PIMD_VERSION);
-       print_version(QUAGGA_PROGNAME);
+       print_version(progname);
        exit (0);
        break;
 -#ifdef PIM_ZCLIENT_DEBUG
 -    case 'Z':
 -      zclient_debug = 1;
 -      break;
 -#endif
      case 'h':
        usage (0);
        break;
diff --cc pimd/pim_mroute.c
index 1489c70f08,3fbed88800..8e97233d4b
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_msg.c
index d511123f98,9d0fc0ad8f..e1f20b1496
--- a/pimd/pim_msg.c
+++ b/pimd/pim_msg.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_neighbor.h
index b5bd5f6244,e023a7f1ef..9e419aec18
--- a/pimd/pim_neighbor.h
+++ b/pimd/pim_neighbor.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_NEIGHBOR_H
diff --cc pimd/pim_oil.c
index aa059797da,ebbc6e19f9..1c0a2f2bea
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_pim.h
index abb3e50c00,5692a37938..1f7e1e5d4f
--- a/pimd/pim_pim.h
+++ b/pimd/pim_pim.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_PIM_H
diff --cc pimd/pim_signals.c
index 8e14627e4d,bd4d9e4857..0a60bba252
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_signals.h
index b05dbb39cb,7b25608c10..8a3f836fa3
--- a/pimd/pim_signals.h
+++ b/pimd/pim_signals.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_SIGNALS_H
diff --cc pimd/pim_ssmpingd.c
index 00abc5f60a,ece644a861..e443a92d61
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_ssmpingd.h
index ab3351cde1,54f787e2a3..29759c9531
--- a/pimd/pim_ssmpingd.h
+++ b/pimd/pim_ssmpingd.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_SSMPINGD_H
diff --cc pimd/pim_str.c
index 5144031794,c817045697..7f814fcda8
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_str.h
index da72573570,d2af0110a4..3536417a95
--- a/pimd/pim_str.h
+++ b/pimd/pim_str.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_STR_H
diff --cc pimd/pim_tlv.c
index dcded95035,546ceb86e1..2b2a06d368
--- a/pimd/pim_tlv.c
+++ b/pimd/pim_tlv.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_tlv.h
index ee7692ab80,16c5aa4b97..d176c26471
--- a/pimd/pim_tlv.h
+++ b/pimd/pim_tlv.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_TLV_H
diff --cc pimd/pim_util.c
index 1b1b5ef8f3,f5b6a8210a..6d7a8c1908
--- a/pimd/pim_util.c
+++ b/pimd/pim_util.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_util.h
index 3a7844b402,d780bfbc27..fbb7b0196b
--- a/pimd/pim_util.h
+++ b/pimd/pim_util.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_UTIL_H
diff --cc pimd/pim_vty.c
index 8815813ce1,f9bc2319e7..ee4fcd3150
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>
diff --cc pimd/pim_vty.h
index 787af60c3b,18a632e016..37ec07b2bf
--- a/pimd/pim_vty.h
+++ b/pimd/pim_vty.h
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #ifndef PIM_VTY_H
diff --cc pimd/test_igmpv3_join.c
index a345945ea4,29143f362e..81da867e03
--- a/pimd/test_igmpv3_join.c
+++ b/pimd/test_igmpv3_join.c
@@@ -16,7 -16,6 +16,10 @@@
    along with this program; see the file COPYING; if not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301 USA
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> origin/master
  */
  
  #include <zebra.h>