[ospfd] Fix two debug messages that used inet_ntoa more than once

2007-03-14 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* ospf_zebra.c: (ospf_zebra_add, ospf_zebra_delete) Fix bug
	  where inet_ntoa was used twice in the same debug message,
	  which doesn't work because there's a single shared buffer
	  for the returned string.  The fix is to use inet_ntop.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 191288e7c692d256008151d3cf75d65290949f27..855ea29d7bf6fe3ec0c80c3759688351aac86207 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-14 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * ospf_zebra.c: (ospf_zebra_add, ospf_zebra_delete) Fix bug
+         where inet_ntoa was used twice in the same debug message,
+         which doesn't work because there's a single shared buffer
+         for the returned string.  The fix is to use inet_ntop.
+
 2007-02-27 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * ospfd.c: (ospf_terminate) Exit immediately if ospf is not

diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index bdd01424cf32faa8bbc8de30f79674bd7ec98efd..f302d28d60827d026f378db046d511278a008b2b 100644 (file)
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -396,9 +396,13 @@ ospf_zebra_add (struct prefix_ipv4 *p, struct ospf_route *or)
 
           if (IS_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE))
             {
-              zlog_debug ("Zebra: Route add %s/%d nexthop %s",
-                         inet_ntoa (p->prefix),
-                         p->prefixlen, inet_ntoa (path->nexthop));
+             char buf[2][INET_ADDRSTRLEN];
+             zlog_debug("Zebra: Route add %s/%d nexthop %s",
+                        inet_ntop(AF_INET, &p->prefix,
+                                  buf[0], sizeof(buf[0])),
+                        p->prefixlen,
+                        inet_ntop(AF_INET, &path->nexthop,
+                                  buf[1], sizeof(buf[1])));
             }
         }
 
@@ -462,9 +466,12 @@ ospf_zebra_delete (struct prefix_ipv4 *p, struct ospf_route *or)
 
           if (IS_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE) && api.nexthop_num)
             {
-              zlog_debug ("Zebra: Route delete %s/%d nexthop %s",
-                         inet_ntoa (p->prefix),
-                         p->prefixlen, inet_ntoa (**api.nexthop));
+             char buf[2][INET_ADDRSTRLEN];
+             zlog_debug("Zebra: Route delete %s/%d nexthop %s",
+                        inet_ntop(AF_INET, &p->prefix, buf[0], sizeof(buf[0])),
+                        p->prefixlen,
+                        inet_ntop(AF_INET, *api.nexthop,
+                                  buf[1], sizeof(buf[1])));
             }
           if (IS_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE) && api.ifindex_num)
             {