[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.
This commit is contained in:
paul 2006-01-17 17:49:53 +00:00
parent d211086aef
commit c6371718f3
3 changed files with 9 additions and 6 deletions

View File

@ -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].

View File

@ -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;
}

View File

@ -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);