pimd: Cleanup igmp debugs a tiny bit

When receiving igmp packets we are spitting out a lot of
debugs.  Attempt to clean this up to allow us to understand
what is going on a bit better by just being able to look
at the log file.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 8737c5fc095e280321d3f8d788dabb2937638010..3602d98a3ea3de930f2c5461553c5d5a0b6631ce 100644 (file)
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -478,21 +478,14 @@ int pim_igmp_packet(struct igmp_sock *igmp, char *buf, size_t len)
 
        ip_hlen = ip_hdr->ip_hl << 2; /* ip_hl gives length in 4-byte words */
 
-       if (PIM_DEBUG_IGMP_PACKETS) {
-               zlog_debug(
-                       "Recv IP packet from %s to %s on %s: size=%zu ip_header_size=%zu ip_proto=%d",
-                       from_str, to_str, igmp->interface->name, len, ip_hlen,
-                       ip_hdr->ip_p);
-       }
-
        igmp_msg = buf + ip_hlen;
        msg_type = *igmp_msg;
        igmp_msg_len = len - ip_hlen;
 
        if (PIM_DEBUG_IGMP_PACKETS) {
                zlog_debug(
-                       "Recv IGMP packet from %s to %s on %s: ttl=%d msg_type=%d msg_size=%d",
-                       from_str, to_str, igmp->interface->name, ip_hdr->ip_ttl,
+                       "Recv IGMP packet from %s to %s on %s: size=%zu ttl=%d msg_type=%d msg_size=%d",
+                       from_str, to_str, igmp->interface->name, len, ip_hdr->ip_ttl,
                        msg_type, igmp_msg_len);
        }
 

diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index d9b940bba7203a10107c5455bb2f15591bdaa358..2d58340c8ceccbfaf5cc4cf37ed04851393201b1 100644 (file)
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -1927,7 +1927,7 @@ int igmp_v3_recv_report(struct igmp_sock *igmp, struct in_addr from,
 
                if (PIM_DEBUG_IGMP_PACKETS) {
                        zlog_debug(
-                               "Recv IGMP report v3 from %s on %s: record=%d type=%d auxdatalen=%d sources=%d group=%s",
+                               "    Recv IGMP report v3 from %s on %s: record=%d type=%d auxdatalen=%d sources=%d group=%s",
                                from_str, ifp->name, i, rec_type,
                                rec_auxdatalen, rec_num_sources,
                                inet_ntoa(rec_group));
@@ -1954,7 +1954,7 @@ int igmp_v3_recv_report(struct igmp_sock *igmp, struct in_addr from,
                                        sprintf(src_str, "<source?>");
 
                                zlog_debug(
-                                       "Recv IGMP report v3 from %s on %s: record=%d group=%s source=%s",
+                                       "        Recv IGMP report v3 from %s on %s: record=%d group=%s source=%s",
                                        from_str, ifp->name, i,
                                        inet_ntoa(rec_group), src_str);
                        }