With .devel, use -W flags iff the compiler supports them.

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 21f83c10eb92c2768bf17ac3d52e7a02a692f94d..494eb2958e656ebadb964f35305dab088a6c4e6b 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -87,7 +87,7 @@ ip_printroute(register const u_char *cp, u_int length)
  * This is used for UDP and TCP pseudo-header in the checksum
  * calculation.
  */
-u_int32_t
+static u_int32_t
 ip_finddst(const struct ip *ip)
 {
        int length;
@@ -129,6 +129,39 @@ trunc:
        return retval;
 }
 
+/*
+ * Compute a V4-style checksum by building a pseudoheader.
+ */
+int
+nextproto4_cksum(const struct ip *ip, const u_int8_t *data,
+                u_int len, u_int next_proto)
+{
+       struct phdr {
+               u_int32_t src;
+               u_int32_t dst;
+               u_char mbz;
+               u_char proto;
+               u_int16_t len;
+       } ph;
+       struct cksum_vec vec[2];
+
+       /* pseudo-header.. */
+       ph.len = htons((u_int16_t)len);
+       ph.mbz = 0;
+       ph.proto = next_proto;
+       memcpy(&ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
+       if (IP_HL(ip) == 5)
+               memcpy(&ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       else
+               ph.dst = ip_finddst(ip);
+
+       vec[0].ptr = (const u_int8_t *)(void *)&ph;
+       vec[0].len = sizeof(ph);
+       vec[1].ptr = data;
+       vec[1].len = len;
+       return (in_cksum(vec, 2));
+}
+
 static void
 ip_printts(register const u_char *cp, u_int length)
 {
@@ -317,7 +350,7 @@ again:
                ipds->nh = enh & 0xff;
                goto again;
        }
-       
+
        case IPPROTO_IPCOMP:
        {
                int enh;
@@ -337,25 +370,25 @@ again:
        case IPPROTO_DCCP:
                dccp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len);
                break;
-               
+
        case IPPROTO_TCP:
                /* pass on the MF bit plus the offset to detect fragments */
                tcp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
                          ipds->off & (IP_MF|IP_OFFMASK));
                break;
-               
+
        case IPPROTO_UDP:
                /* pass on the MF bit plus the offset to detect fragments */
                udp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
                          ipds->off & (IP_MF|IP_OFFMASK));
                break;
-               
+
        case IPPROTO_ICMP:
                /* pass on the MF bit plus the offset to detect fragments */
                icmp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
                           ipds->off & (IP_MF|IP_OFFMASK));
                break;
-               
+
        case IPPROTO_PIGP:
                /*
                 * XXX - the current IANA protocol number assignments
@@ -372,11 +405,11 @@ again:
                 */
                igrp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
                break;
-               
+
        case IPPROTO_EIGRP:
                eigrp_print(ipds->cp, ipds->len);
                break;
-               
+
        case IPPROTO_ND:
                ND_PRINT((ndo, " nd %d", ipds->len));
                break;
@@ -401,7 +434,7 @@ again:
                        return;
                }
                break;
-               
+
 #ifdef INET6
        case IPPROTO_IPV6:
                /* ip6-in-ip encapsulation */
@@ -429,7 +462,19 @@ again:
                break;
 
        case IPPROTO_VRRP:
-               vrrp_print(ipds->cp, ipds->len, ipds->ip->ip_ttl);
+               if (packettype == PT_CARP) {
+                       if (vflag)
+                               (void)printf("carp %s > %s: ",
+                                            ipaddr_string(&ipds->ip->ip_src),
+                                            ipaddr_string(&ipds->ip->ip_dst));
+                       carp_print(ipds->cp, ipds->len, ipds->ip->ip_ttl);
+               } else {
+                       if (vflag)
+                               (void)printf("vrrp %s > %s: ",
+                                            ipaddr_string(&ipds->ip->ip_src),
+                                            ipaddr_string(&ipds->ip->ip_dst));
+                       vrrp_print(ipds->cp, ipds->len, ipds->ip->ip_ttl);
+               }
                break;
 
        case IPPROTO_PGM:
@@ -437,7 +482,7 @@ again:
                break;
 
        default:
-               if ((proto = getprotobynumber(ipds->nh)) != NULL)
+               if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
                        ND_PRINT((ndo, " %s", proto->p_name));
                else
                        ND_PRINT((ndo, " ip-proto-%d", ipds->nh));
@@ -445,7 +490,7 @@ again:
                break;
        }
 }
-              
+
 void
 ip_print_inner(netdissect_options *ndo,
               const u_char *bp,
@@ -552,7 +597,7 @@ ip_print(netdissect_options *ndo,
             }
 
             if (ipds->ip->ip_ttl >= 1)
-                (void)printf(", ttl %u", ipds->ip->ip_ttl);    
+                (void)printf(", ttl %u", ipds->ip->ip_ttl);
 
            /*
             * for the firewall guys, print id, offset.
@@ -616,11 +661,11 @@ ip_print(netdissect_options *ndo,
            if (ipds->off & 0x1fff) {
                (void)printf("%s > %s:", ipaddr_string(&ipds->ip->ip_src),
                             ipaddr_string(&ipds->ip->ip_dst));
-               if ((proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
+               if (!ndo->ndo_nflag && (proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
                    (void)printf(" %s", proto->p_name);
                else
                    (void)printf(" ip-proto-%d", ipds->ip->ip_p);
-           } 
+           }
        }
 }