From: paul <paul>
Date: Wed, 27 Aug 2003 06:45:32 +0000 (+0000)
Subject: 2003-08-27 Jay Fenlason <fenlason@redhat.com>
X-Git-Tag: frr-2.0-rc1~3912
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=537d8ea92bbf96086e03a0da5a7d26ee4b92e0cc;p=mirror%2Ffrr.git

2003-08-27 Jay Fenlason <fenlason@redhat.com>

	* bgpd/bgp_routemap.c: attr->med is type u_in32_t, should be
	  compared with UINT32_MAX
	* ospfd/ospfd.c: remove redundant assert
	* zebra/rtadv.c: add missing include for zebra/rib.h
---

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 9bc4e6d51c..a2923fb1b6 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -879,17 +879,17 @@ route_set_metric (void *rule, struct prefix *prefix,
 
 	  if (strncmp (metric, "+", 1) == 0)
 	    {
-	      if (bgp_info->attr->med/2 + metric_val/2 > ULONG_MAX/2)
-		bgp_info->attr->med = ULONG_MAX-1;
+	      if (bgp_info->attr->med/2 + metric_val/2 > UINT32_MAX/2)
+	        bgp_info->attr->med = UINT32_MAX-1;
 	      else
-		bgp_info->attr->med += metric_val;
+	        bgp_info->attr->med += metric_val;
 	    }
 	  else if (strncmp (metric, "-", 1) == 0)
 	    {
-	      if (bgp_info->attr->med <= metric_val) 
-		bgp_info->attr->med = 0;
+	      if (bgp_info->attr->med <= metric_val)
+	        bgp_info->attr->med = 0;
 	      else
-		bgp_info->attr->med -= metric_val;
+	        bgp_info->attr->med -= metric_val;
 	    }
 	}
     }
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 4418c77778..aeae8e131b 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -765,8 +765,7 @@ ospf_network_run (struct ospf *ospf, struct prefix *p, struct ospf_area *area)
 	      && ! ospf_if_is_configured (ospf, &(addr->u.prefix4))
 	      && ospf_network_match_iface(co,p))
 	    {
-		struct ospf_interface *oi;
-		assert(co);
+      	struct ospf_interface *oi;
 		
 		oi = ospf_if_new (ospf, ifp, co->address);
 		oi->connected = co;
diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index a6e2d92017..f7d336cae3 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -35,6 +35,7 @@
 #include "zebra/rtadv.h"
 #include "zebra/debug.h"
 #include "zebra/zserv.h"
+#include "zebra/rib.h"
 
 extern struct zebra_privs_t zserv_privs;