[ospfd/zserv] adjust to new format

2006-01-17 Paul Jakma <paul.jakma@sun.com>

	* ospf_packet.c: (ospf_verify_header) print out the types
	  involved if there's a mismatch.
	* ospf_zebra.c: (ospf_zebra_add) Adjust to new zserv format.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index bc7b5e20b67097812b3194c8b50fe8ef795c858f..a13ed6f974e35d49b76c1883bc9af0f3d4e40c4a 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-17 Paul Jakma <paul.jakma@sun.com>
+
+       * ospf_packet.c: (ospf_verify_header) print out the types
+         involved if there's a mismatch.
+       * ospf_zebra.c: (ospf_zebra_add) Adjust to new zserv format.
+
 2006-01-10 Len Sorensen <lennartsorensen@ruggedcom.com>
 
        * (general) Bug #234, see also [quagga-dev 3902].

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 54b30ca750d41db0b61100062424228f7abe3f59..d6aca719862452271b25eabdcb1d1974f7874cc3 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -2253,8 +2253,8 @@ ospf_verify_header (struct stream *ibuf, struct ospf_interface *oi,
   /* Check authentication. */
   if (ospf_auth_type (oi) != ntohs (ospfh->auth_type))
     {
-      zlog_warn ("interface %s: ospf_read authentication type mismatch.",
-                IF_NAME (oi));
+      zlog_warn ("interface %s: auth-type mismatch, local %d, rcvd %d",
+                IF_NAME (oi), ospf_auth_type (oi), ntohs (ospfh->auth_type));
       return -1;
     }
 

diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 544a0d614812762efcb35795e55a1684095900fa..494f63cef9caf8b3a0c5d8d349d9fb6acf7c7cb8 100644 (file)
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -342,11 +342,8 @@ ospf_zebra_add (struct prefix_ipv4 *p, struct ospf_route *or)
       s = zclient->obuf;
       stream_reset (s);
 
-      /* Length place holder. */
-      stream_putw (s, 0);
-
       /* Put command, type, flags, message. */
-      stream_putc (s, ZEBRA_IPV4_ROUTE_ADD);
+      zclient_create_header (s, ZEBRA_IPV4_ROUTE_ADD);
       stream_putc (s, ZEBRA_ROUTE_OSPF);
       stream_putc (s, flags);
       stream_putc (s, message);