2005-05-19 Paul Jakma <paul@dishone.st>

	* bgp_fsm.c: (bgp_stop) use sockunion_free, not XFREE..
	* bgp_network.c: (bgp_getsockname) ditto
	* bgp_routemap.c: (route_match_peer) ditto, als use a ret value and
	  remove one sockunion_free.
	* bgpd.c: (peer_delete) ditto

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 3149f68c2a0ebfd22ccd58c1116b0508908e80f0..02ca213ccdf96cfd4033b8a6fc34042be2d41767 100644 (file)
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-19 Paul Jakma <paul@dishone.st>
+
+       * bgp_fsm.c: (bgp_stop) use sockunion_free, not XFREE..
+       * bgp_network.c: (bgp_getsockname) ditto
+       * bgp_routemap.c: (route_match_peer) ditto, als use a ret value and
+         remove one sockunion_free.
+       * bgpd.c: (peer_delete) ditto
+
 2005-04-11 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * bgp_zebra.c (bgp_redistribute_set, bgp_redistribute_unset):

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index c8ca41733756df4910856ff254179be95f418040..6368ff47ad170ea34b6aa439476efb1e78d8b5fa 100644 (file)
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -491,13 +491,13 @@ bgp_stop (struct peer *peer)
   /* Connection information. */
   if (peer->su_local)
     {
-      XFREE (MTYPE_SOCKUNION, peer->su_local);
+      sockunion_free (peer->su_local);
       peer->su_local = NULL;
     }
 
   if (peer->su_remote)
     {
-      XFREE (MTYPE_SOCKUNION, peer->su_remote);
+      sockunion_free (peer->su_remote);
       peer->su_remote = NULL;
     }
 

diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index e304868736475b0819a7609cc7ba8ba54d0ca61a..b2708e7b50c2f53013249ac2927fa5b0a4ee6593 100644 (file)
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -263,13 +263,13 @@ bgp_getsockname (struct peer *peer)
 {
   if (peer->su_local)
     {
-      XFREE (MTYPE_TMP, peer->su_local);
+      sockunion_free (peer->su_local);
       peer->su_local = NULL;
     }
 
   if (peer->su_remote)
     {
-      XFREE (MTYPE_TMP, peer->su_remote);
+      sockunion_free (peer->su_remote);
       peer->su_remote = NULL;
     }
 

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 060c68c0d590e8b8281fa6e8ecb77b333afb7451..a9de457d25f1c518ee0856e54e4abb26ad902025 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -124,19 +124,19 @@ route_match_peer (void *rule, struct prefix *prefix, route_map_object_t type,
       su2 = sockunion_str2su ("0.0.0.0");
       if ( sockunion_same (su, su2) )
         {
+          int ret;
           if ( CHECK_FLAG (peer->rmap_type, PEER_RMAP_TYPE_NETWORK) ||
                CHECK_FLAG (peer->rmap_type, PEER_RMAP_TYPE_REDISTRIBUTE) ||
                CHECK_FLAG (peer->rmap_type, PEER_RMAP_TYPE_DEFAULT))
-            {
-              XFREE (MTYPE_SOCKUNION, su2);
-
-              return RMAP_MATCH;
-            }
+            ret = RMAP_MATCH;
           else
-            return RMAP_NOMATCH;
+            ret = RMAP_NOMATCH;
+          
+          sockunion_free (su2);
+          return ret;
         }
-      XFREE (MTYPE_SOCKUNION, su2);
-
+      sockunion_free (su2);
+      
       if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP))
         {
           if (sockunion_same (su, &peer->su))

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 0d1689ab3566a8359e439813f0162ab42e691068..87e6b44485a82c4b52958e95df3e449a71ca16e0 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1140,9 +1140,9 @@ peer_delete (struct peer *peer)
 
   /* Local and remote addresses. */
   if (peer->su_local)
-    XFREE (MTYPE_TMP, peer->su_local);
+    sockunion_free (peer->su_local);
   if (peer->su_remote)
-    XFREE (MTYPE_TMP, peer->su_remote);
+    sockunion_free (peer->su_remote);
 
   /* Peer description string.  */
   if (peer->desc)