2005-03-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_packet.c: (ospf_write_frags) Enhance error message to
show MTU. Also make function static.
(ospf_write) Enhance error message to show interface name and MTU.
Also make function static.
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index a1af72f..fbffe6a 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,8 +1,15 @@
2005-03-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
- * ospf_vty.c (show_ip_ospf_interface_sub): Display interface MTU and
- bandwidth; this is useful for debugging problems. Also, the function
- should be static.
+ * ospf_packet.c: (ospf_write_frags) Enhance error message to
+ show MTU. Also make function static.
+ (ospf_write) Enhance error message to show interface name and MTU.
+ Also make function static.
+
+2005-03-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+ * ospf_vty.c: (show_ip_ospf_interface_sub) Display interface MTU and
+ bandwidth; this is useful for debugging problems. Also, the function
+ should be static.
2005-03-27 Hasso Tepper <hasso at quagga.net>
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 8791336..4f18c04 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -480,7 +480,7 @@
}
#ifdef WANT_OSPF_WRITE_FRAGMENT
-void
+static void
ospf_write_frags (int fd, struct ospf_packet *op, struct ip *iph,
struct msghdr *msg, unsigned int maxdatasize,
unsigned int mtu, int flags, u_char type)
@@ -531,12 +531,13 @@
if (ret < 0)
zlog_warn ("*** ospf_write_frags: sendmsg failed to %s,"
- " id %d, off %d, len %d failed with %s",
- inet_ntoa (iph->ip_dst),
- iph->ip_id,
- iph->ip_off,
- iph->ip_len,
- safe_strerror (errno));
+ " id %d, off %d, len %d, mtu %u failed with %s",
+ inet_ntoa (iph->ip_dst),
+ iph->ip_id,
+ iph->ip_off,
+ iph->ip_len,
+ mtu,
+ safe_strerror (errno));
if (IS_DEBUG_OSPF_PACKET (type - 1, SEND))
{
@@ -563,7 +564,7 @@
}
#endif /* WANT_OSPF_WRITE_FRAGMENT */
-int
+static int
ospf_write (struct thread *thread)
{
struct ospf *ospf = THREAD_ARG (thread);
@@ -687,9 +688,9 @@
if (ret < 0)
zlog_warn ("*** sendmsg in ospf_write failed to %s, "
- "id %d, off %d, len %d: %s",
+ "id %d, off %d, len %d, interface %s, mtu %u: %s",
inet_ntoa (iph.ip_dst), iph.ip_id, iph.ip_off, iph.ip_len,
- safe_strerror (errno));
+ oi->ifp->name, oi->ifp->mtu, safe_strerror (errno));
/* Show debug sending packet. */
if (IS_DEBUG_OSPF_PACKET (type - 1, SEND))