From 37163d6d0cc49d34a0ea6c0de3184cda93efb419 Mon Sep 17 00:00:00 2001 From: paul Date: Mon, 3 Feb 2003 18:40:56 +0000 Subject: Merge to zebra.org CVS 20030203 16:30GMT --- ospfd/ospf_packet.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'ospfd/ospf_packet.c') diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 4a3b5e11..0b9e60f3 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -226,10 +226,9 @@ ospf_packet_dup (struct ospf_packet *op) { struct ospf_packet *new; - if (stream_get_endp(op->s) != op->length) { - zlog_warn ("ospf_packet_dup stream %d ospf_packet %d size mismatch", + if (stream_get_endp(op->s) != op->length) + zlog_warn ("ospf_packet_dup stream %ld ospf_packet %d size mismatch", STREAM_SIZE(op->s), op->length); - } /* Reserve space for MD5 authentication that may be added later. */ new = ospf_packet_new (stream_get_endp(op->s) + OSPF_AUTH_MD5_SIZE); @@ -367,10 +366,8 @@ ospf_make_md5_digest (struct ospf_interface *oi, struct ospf_packet *op) /* We do *NOT* increment the OSPF header length. */ op->length = ntohs (ospfh->length) + OSPF_AUTH_MD5_SIZE; - if (stream_get_endp(op->s) != op->length) { - zlog_warn("ospf_make_md5_digest: length mismatch stream %d ospf_packet %d", - stream_get_endp(op->s), op->length); - } + if (stream_get_endp(op->s) != op->length) + zlog_warn("ospf_make_md5_digest: length mismatch stream %ld ospf_packet %d", stream_get_endp(op->s), op->length); return OSPF_AUTH_MD5_SIZE; } -- cgit v1.2.1