proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 20:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ospfd] Improve some warning messages.

Browse Source 
2006-09-25 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* ospf_packet.c: (ospf_packet_dup, ospf_make_md5_digest)
	  Fix zlog_warn messages to eliminate compiler warnings.
	  (ospf_hello) Improve warning messages to show why we
	  are complaining.
This commit is contained in:
Andrew J. Schorr 2006-09-25 13:26:14 +00:00
parent 301e4fb0cf
commit 08c8367197
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ospfd/ChangeLog
View File

@ -1,3 +1,10 @@
2006-09-25 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_packet.c: (ospf_packet_dup, ospf_make_md5_digest)
Fix zlog_warn messages to eliminate compiler warnings.
(ospf_hello) Improve warning messages to show why we
are complaining.
2006-08-28 Andy Gay <andy@andynet.net> 2006-08-28 Andy Gay <andy@andynet.net>
* ospf_packet.c: (ospf_make_db_desc) Assert added with More-bit * ospf_packet.c: (ospf_make_db_desc) Assert added with More-bit

21
ospfd/ospf_packet.c
View File

@ -216,8 +216,9 @@ ospf_packet_dup (struct ospf_packet *op)
struct ospf_packet *new; struct ospf_packet *new;
if (stream_get_endp(op->s) != op->length) if (stream_get_endp(op->s) != op->length)
zlog_warn ("ospf_packet_dup stream %ld ospf_packet %d size mismatch", /* XXX size_t */
STREAM_SIZE(op->s), op->length); zlog_warn ("ospf_packet_dup stream %lu ospf_packet %u size mismatch",
(u_long)STREAM_SIZE(op->s), op->length);
/* Reserve space for MD5 authentication that may be added later. */ /* Reserve space for MD5 authentication that may be added later. */
new = ospf_packet_new (stream_get_endp(op->s) + OSPF_AUTH_MD5_SIZE); new = ospf_packet_new (stream_get_endp(op->s) + OSPF_AUTH_MD5_SIZE);
@ -371,7 +372,9 @@ ospf_make_md5_digest (struct ospf_interface *oi, struct ospf_packet *op)
op->length = ntohs (ospfh->length) + OSPF_AUTH_MD5_SIZE; op->length = ntohs (ospfh->length) + OSPF_AUTH_MD5_SIZE;
if (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); /* XXX size_t */
zlog_warn("ospf_make_md5_digest: length mismatch stream %lu ospf_packet %u",
(u_long)stream_get_endp(op->s), op->length);
return OSPF_AUTH_MD5_SIZE; return OSPF_AUTH_MD5_SIZE;
} }
@ -796,8 +799,10 @@ ospf_hello (struct ip *iph, struct ospf_header *ospfh,
/* Compare Router Dead Interval. */ /* Compare Router Dead Interval. */
if (OSPF_IF_PARAM (oi, v_wait) != ntohl (hello->dead_interval)) if (OSPF_IF_PARAM (oi, v_wait) != ntohl (hello->dead_interval))
{ {
zlog_warn ("Packet %s [Hello:RECV]: RouterDeadInterval mismatch.", zlog_warn ("Packet %s [Hello:RECV]: RouterDeadInterval mismatch "
inet_ntoa (ospfh->router_id)); "(expected %u, but received %u).",
inet_ntoa(ospfh->router_id),
OSPF_IF_PARAM(oi, v_wait), ntohl(hello->dead_interval));
return; return;
} }
@ -806,8 +811,10 @@ ospf_hello (struct ip *iph, struct ospf_header *ospfh,
{ {
if (OSPF_IF_PARAM (oi, v_hello) != ntohs (hello->hello_interval)) if (OSPF_IF_PARAM (oi, v_hello) != ntohs (hello->hello_interval))
{ {
zlog_warn ("Packet %s [Hello:RECV]: HelloInterval mismatch.", zlog_warn ("Packet %s [Hello:RECV]: HelloInterval mismatch "
inet_ntoa (ospfh->router_id)); "(expected %u, but received %u).",
inet_ntoa(ospfh->router_id),
OSPF_IF_PARAM(oi, v_hello), ntohs(hello->hello_interval));
return; return;
} }
} }