Merge pull request #5549 from donaldsharp/automated

[mirror_frr.git] / ospfd / ospf_dump.c

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index 1c911ebef86479cfdb62fbe1169641bdcb5c4b11..dffcb930e450ea359c02fd46488405030f6eb3aa 100644 (file)
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -199,17 +199,17 @@ const char *ospf_timeval_dump(struct timeval *t, char *buf, size_t size)
        }
 
        if (w > 99)
-               snprintf(buf, size, "%ldw%1ldd", w, d);
+               snprintf(buf, size, "%luw%1lud", w, d);
        else if (w)
-               snprintf(buf, size, "%ldw%1ldd%02ldh", w, d, h);
+               snprintf(buf, size, "%luw%1lud%02luh", w, d, h);
        else if (d)
-               snprintf(buf, size, "%1ldd%02ldh%02ldm", d, h, m);
+               snprintf(buf, size, "%1lud%02luh%02lum", d, h, m);
        else if (h)
-               snprintf(buf, size, "%ldh%02ldm%02lds", h, m, (long)t->tv_sec);
+               snprintf(buf, size, "%luh%02lum%02lds", h, m, (long)t->tv_sec);
        else if (m)
-               snprintf(buf, size, "%ldm%02lds", m, (long)t->tv_sec);
+               snprintf(buf, size, "%lum%02lds", m, (long)t->tv_sec);
        else if (ms)
-               snprintf(buf, size, "%ld.%03lds", (long)t->tv_sec, ms);
+               snprintf(buf, size, "%ld.%03lus", (long)t->tv_sec, ms);
        else
                snprintf(buf, size, "%ld usecs", (long)t->tv_usec);
 
@@ -501,23 +501,6 @@ static void ospf_packet_ls_ack_dump(struct stream *s, uint16_t length)
        stream_set_getp(s, sp);
 }
 
-/* Expects header to be in host order */
-void ospf_ip_header_dump(struct ip *iph)
-{
-       /* IP Header dump. */
-       zlog_debug("ip_v %d", iph->ip_v);
-       zlog_debug("ip_hl %d", iph->ip_hl);
-       zlog_debug("ip_tos %d", iph->ip_tos);
-       zlog_debug("ip_len %d", iph->ip_len);
-       zlog_debug("ip_id %u", (uint32_t)iph->ip_id);
-       zlog_debug("ip_off %u", (uint32_t)iph->ip_off);
-       zlog_debug("ip_ttl %d", iph->ip_ttl);
-       zlog_debug("ip_p %d", iph->ip_p);
-       zlog_debug("ip_sum 0x%x", (uint32_t)iph->ip_sum);
-       zlog_debug("ip_src %s", inet_ntoa(iph->ip_src));
-       zlog_debug("ip_dst %s", inet_ntoa(iph->ip_dst));
-}
-
 static void ospf_header_dump(struct ospf_header *ospfh)
 {
        char buf[9];
@@ -538,8 +521,7 @@ static void ospf_header_dump(struct ospf_header *ospfh)
        case OSPF_AUTH_NULL:
                break;
        case OSPF_AUTH_SIMPLE:
-               memset(buf, 0, 9);
-               strncpy(buf, (char *)ospfh->u.auth_data, 8);
+               strlcpy(buf, (char *)ospfh->u.auth_data, sizeof(buf));
                zlog_debug("  Simple Password %s", buf);
                break;
        case OSPF_AUTH_CRYPTOGRAPHIC:
@@ -1683,7 +1665,7 @@ static int config_write_debug(struct vty *vty)
                return CMD_SUCCESS;
 
        if (ospf->instance)
-               sprintf(str, " %d", ospf->instance);
+               sprintf(str, " %u", ospf->instance);
 
        /* debug ospf ism (status|events|timers). */
        if (IS_CONF_DEBUG_OSPF(ism, ISM) == OSPF_DEBUG_ISM)
@@ -1799,7 +1781,7 @@ static int config_write_debug(struct vty *vty)
 }
 
 /* Initialize debug commands. */
-void debug_init()
+void ospf_debug_init(void)
 {
        install_node(&debug_node, config_write_debug);