diff options
| author | paul <paul> | 2006-01-17 17:49:53 +0000 |
|---|---|---|
| committer | paul <paul> | 2006-01-17 17:49:53 +0000 |
| commit | c6371718f39dedd2a03010a9dc26a18d96abbe7f (patch) | |
| tree | d2b17403d11b3d162275bfa28711f5ee3daa6a94 | |
| parent | d211086aefd45e0b7c113a43ed5eb620626b8681 (diff) | |
[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.
| -rw-r--r-- | ospfd/ChangeLog | 6 | ||||
| -rw-r--r-- | ospfd/ospf_packet.c | 4 | ||||
| -rw-r--r-- | ospfd/ospf_zebra.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index bc7b5e20..a13ed6f9 100644 --- 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 54b30ca7..d6aca719 100644 --- 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 544a0d61..494f63ce 100644 --- 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); |