2004-09-22 Paul Jakma <paul.jakma@sun.com>

	* zserv.c: (zsend_route_multipath) fix nasty bad memset of struct
          in_addr to sizeof(struct in6_addr), causing odd and hard to debug
          crash.

diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index b6798077f8ae9dcd3d31aa69307bb4f665bfd690..275537ff472f15aaa5423ca66813e02d9a0fb95d 100644 (file)
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-22 Paul Jakma <paul.jakma@sun.com>
+
+       * zserv.c: (zsend_route_multipath) fix nasty bad memset of struct
+         in_addr to sizeof(struct in6_addr), causing odd and hard to debug
+          crash.
+
 2004-08-31 Hasso Tepper <hasso at quagga.net>
 
        * main.c, rt_netlink.c: Added -s command line switch for tuning

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 4779b64307cce69df8b9dc860799d0c1877a89d8..96d6f533f18be2f99e1b0a5c256729f05fdf1891 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -497,7 +497,7 @@ zsend_route_multipath (int cmd, struct zserv *client, struct prefix *p,
                     || cmd == ZEBRA_IPV4_ROUTE_DELETE)
                   {
                     struct in_addr empty;
-                    memset (&empty, 0, sizeof (struct in6_addr));
+                    memset (&empty, 0, sizeof (struct in_addr));
                     stream_write (s, (u_char *) &empty, IPV4_MAX_BYTELEN);
                   }
                 else