Merge branch 'upstream' into jenner

Conflicts:
	bgpd/bgp_aspath.c
	bgpd/bgpd.c
	lib/smux.c
	lib/workqueue.c
	ospfd/ospf_snmp.c

20 files changed, 50 insertions, 45 deletions

diff --git a/Makefile.am b/Makefile.am
index 96da94fa..8276b242 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,6 @@ EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS INSTALL.quagga.txt \
 	update-autotools \
 	vtysh/Makefile.in vtysh/Makefile.am \
 	tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
-	tools/zebra.el
+	tools/zebra.el tools/multiple-bgpd.sh
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index e703941d..a7c72a9d 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -559,7 +559,7 @@ aspath_make_str_count (struct aspath *as)
       
       if (seg->type != AS_SEQUENCE)
 	{
-	  str_buf = aspath_expand(str_buf, &str_size, len, 1);
+	  str_buf = aspath_expand(str_buf, &str_size, len, 1); /* %c */
 	  len += snprintf (str_buf + len, str_size - len, 
 			   "%c", 
 			   aspath_delimiter_char (seg->type, AS_SEG_START));
@@ -1743,8 +1743,8 @@ aspath_key_make (void *p)
 static int
 aspath_cmp (const void *arg1, const void *arg2)
 {
-  const struct assegment *seg1 = ((struct aspath *)arg1)->segments;
-  const struct assegment *seg2 = ((struct aspath *)arg2)->segments;
+  const struct assegment *seg1 = ((const struct aspath *)arg1)->segments;
+  const struct assegment *seg2 = ((const struct aspath *)arg2)->segments;
   
   while (seg1 || seg2)
     {
diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index d1aa0767..6152a1db 100644
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -97,7 +97,7 @@ ecommunity_add_val (struct ecommunity *ecom, struct ecommunity_val *eval)
 
 /* This function takes pointer to Extended Communites strucutre then
    create a new Extended Communities structure by uniq and sort each
-   Exteneded Communities value.  */
+   Extended Communities value.  */
 static struct ecommunity *
 ecommunity_uniq_sort (struct ecommunity *ecom)
 {
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 1ecf4d0a..30e40a1a 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3316,7 +3316,7 @@ DEFUN (set_ecommunity_rt,
        "set extcommunity rt .ASN:nn_or_IP-address:nn",
        SET_STR
        "BGP extended community attribute\n"
-       "Route Target extened communityt\n"
+       "Route Target extended community\n"
        "VPN extended community\n")
 {
   int ret;
@@ -3335,7 +3335,7 @@ DEFUN (no_set_ecommunity_rt,
        NO_STR
        SET_STR
        "BGP extended community attribute\n"
-       "Route Target extened communityt\n")
+       "Route Target extended community\n")
 {
   return bgp_route_set_delete (vty, vty->index, "extcommunity rt", NULL);
 }
@@ -3346,7 +3346,7 @@ ALIAS (no_set_ecommunity_rt,
        NO_STR
        SET_STR
        "BGP extended community attribute\n"
-       "Route Target extened communityt\n"
+       "Route Target extended community\n"
        "VPN extended community\n")
 
 DEFUN (set_ecommunity_soo,
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 630f0c22..4157a8d6 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -5090,13 +5090,15 @@ bgp_terminate (void)
                            BGP_NOTIFY_CEASE_PEER_UNCONFIG);
   
   bgp_cleanup_routes ();
-  if (bm->process_main_queue) {
-    work_queue_free (bm->process_main_queue);
-    bm->process_main_queue = NULL;
-  }
-  if (bm->process_rsclient_queue) {
-    work_queue_free (bm->process_rsclient_queue);
-    bm->process_rsclient_queue = NULL;
-  }
+  
+  if (bm->process_main_queue)
+    {
+      work_queue_free (bm->process_main_queue);
+      bm->process_main_queue = NULL;
+    }
+  if (bm->process_rsclient_queue)
+    {
+      work_queue_free (bm->process_rsclient_queue);
+      bm->process_rsclient_queue = NULL;
+    }
 }
-
diff --git a/configure.ac b/configure.ac
index b32aa801..dd88b820 100755
--- a/configure.ac
+++ b/configure.ac
@@ -890,7 +890,7 @@ AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], [], QUAGGA_INCLUDES)
 AC_MSG_CHECKING([for BSD struct ip_mreq hack])
 AC_TRY_COMPILE([#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
-#endif],[#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500022 || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000)
+#endif],[#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000)
   return (0);
 #else
   #error No support for BSD struct ip_mreq hack detected
diff --git a/doc/bgpd.8 b/doc/bgpd.8
index 658fe0ae..8daaefa2 100644
--- a/doc/bgpd.8
+++ b/doc/bgpd.8
@@ -116,6 +116,6 @@ eats bugs for breakfast. If you have food for the maintainers try
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ospf6d.8 b/doc/ospf6d.8
index 44c4fe9c..06432263 100644
--- a/doc/ospf6d.8
+++ b/doc/ospf6d.8
@@ -106,6 +106,6 @@ eats bugs for breakfast. If you have food for the maintainers try
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ospfd.8 b/doc/ospfd.8
index 06144083..63f8c69b 100644
--- a/doc/ospfd.8
+++ b/doc/ospfd.8
@@ -111,6 +111,6 @@ eats bugs for breakfast. If you have food for the maintainers try
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ripd.8 b/doc/ripd.8
index 12e01a94..8fa9bf23 100644
--- a/doc/ripd.8
+++ b/doc/ripd.8
@@ -109,5 +109,5 @@ eats bugs for breakfast. If you have food for the maintainers try
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
diff --git a/doc/ripngd.8 b/doc/ripngd.8
index 2ec5563f..d9d82012 100644
--- a/doc/ripngd.8
+++ b/doc/ripngd.8
@@ -112,6 +112,6 @@ eats bugs for breakfast. If you have food for the maintainers try
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/vtysh.1 b/doc/vtysh.1
index eb960cdc..de4913e5 100644
--- a/doc/vtysh.1
+++ b/doc/vtysh.1
@@ -95,6 +95,6 @@ eats bugs for breakfast. If you have food for the maintainers try
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/zebra.8 b/doc/zebra.8
index 8b15b98c..08cf4110 100644
--- a/doc/zebra.8
+++ b/doc/zebra.8
@@ -135,6 +135,6 @@ eats bugs for breakfast. If you have food for the maintainers try
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/lib/smux.c b/lib/smux.c
index d5378897..9f3c3922 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -941,7 +941,7 @@ smux_read (struct thread *t)
   return 0;
 }
 
-int
+static int
 smux_open (int sock)
 {
   u_char buf[BUFSIZ];
@@ -985,7 +985,7 @@ smux_open (int sock)
   ptr = asn_build_string (ptr, &len, 
 			  (u_char)
 			  (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OCTET_STR),
-			  (u_char *) smux_passwd, strlen (smux_passwd));
+			  (u_char *)smux_passwd, strlen (smux_passwd));
 
   /* Fill in real SMUX header.  We exclude ASN header size (2). */
   len = BUFSIZ;
diff --git a/lib/workqueue.c b/lib/workqueue.c
index 0dd36d82..7c811edd 100644
--- a/lib/workqueue.c
+++ b/lib/workqueue.c
@@ -91,9 +91,9 @@ work_queue_new (struct thread_master *m, const char *queue_name)
 void
 work_queue_free (struct work_queue *wq)
 {
-  if (wq->thread)
-      thread_cancel(wq->thread);
-
+  if (wq->thread != NULL)
+    thread_cancel(wq->thread);
+  
   /* list_delete frees items via callback */
   list_delete (wq->items);
   listnode_delete (&work_queues, wq);
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 3cb26d0c..5ac7846d 100644
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -47,6 +47,7 @@
 #include "ospf6_message.h"
 #include "ospf6_neighbor.h"
 #include "ospf6d.h"
+#include "ospf6_snmp.h"
 
 /* OSPFv3-MIB */
 #define OSPFv3MIB 1,3,6,1,3,102
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 9c54860c..cc4974ce 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -1574,19 +1574,19 @@ ospf_snmp_if_lookup_next (struct in_addr *ifaddr, unsigned int *ifindex,
       /* Usual interface */
       if (ifaddr->s_addr) 
 	{
-        /* The interface must have valid AF_INET connected address */
-        /* it must have lager IPv4 address value than the lookup entry */
-        if ((ospf_snmp_is_if_have_addr(osif->ifp)) &&
-            (ntohl (osif->addr.s_addr) > ntohl (ifaddr->s_addr)))
-          {
-            *ifaddr = osif->addr;
-            *ifindex = osif->ifindex;
+	  /* The interface must have valid AF_INET connected address */
+	  /* it must have lager IPv4 address value than the lookup entry */
+	  if ((ospf_snmp_is_if_have_addr(osif->ifp)) &&
+	      (ntohl (osif->addr.s_addr) > ntohl (ifaddr->s_addr)))
+	    {
+	      *ifaddr = osif->addr;
+	      *ifindex = osif->ifindex;
         
-            /* and it must be an OSPF interface */
-            oi = ospf_if_lookup_by_local_addr (ospf, osif->ifp, *ifaddr);
-            if (oi)
-              return oi;
-          }
+	      /* and it must be an OSPF interface */
+	      oi = ospf_if_lookup_by_local_addr (ospf, osif->ifp, *ifaddr);
+	      if (oi)
+		return oi;
+	    }
 	}
       /* Unnumbered interface */
       else  
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index e77d3807..fce22e5c 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2115,8 +2115,10 @@ DEFUN (no_ospf_abr_type,
     abr_type = OSPF_ABR_CISCO;
   else if (strncmp (argv[0], "i", 1) == 0)
     abr_type = OSPF_ABR_IBM;
-  else if (strncmp (argv[0], "s", 1) == 0)
+  else if (strncmp (argv[0], "sh", 2) == 0)
     abr_type = OSPF_ABR_SHORTCUT;
+  else if (strncmp (argv[0], "st", 2) == 0)
+    abr_type = OSPF_ABR_STAND;
   else
     return CMD_WARNING;
 
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 131898c2..c019fc29 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -597,7 +597,7 @@ rip_if_down(struct interface *ifp)
 	      {
 		rip_zebra_ipv4_delete ((struct prefix_ipv4 *) &rp->p,
 				       &rinfo->nexthop,
-				       rinfo->ifindex);
+				       rinfo->metric);
 
 		rip_redistribute_delete (rinfo->type,rinfo->sub_type,
 					 (struct prefix_ipv4 *)&rp->p,
diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c
index b7843b26..0fde4bb8 100644
--- a/zebra/zebra_snmp.c
+++ b/zebra/zebra_snmp.c
@@ -344,7 +344,7 @@ get_fwtable_route_node(struct variable *v, oid objid[], size_t *objid_len,
    * ipForwardDest, ipForwardProto, ipForwardPolicy, ipForwardNextHop
    */
 
-  if (*objid_len > v->namelen)
+  if (*objid_len > (unsigned) v->namelen)
     oid2in_addr (objid + v->namelen, MIN(4, *objid_len - v->namelen), &dest);
 
   if (*objid_len > (unsigned) v->namelen + 4)