Process VLAN frames and Alteon jumbo frames in the Ethernet printer.

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 8446532682bd4509e45ab39a7ce0542b61e689bd..acf3bd8be9fe0de2a466231ed54087ac960c7e92 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.148 2005-04-06 21:33:02 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.159 2007-09-14 01:29:28 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -50,6 +50,7 @@ struct tok ip_option_values[] = {
     { IPOPT_SSRR, "SSRR" },
     { IPOPT_LSRR, "LSRR" },
     { IPOPT_RA, "RA" },
     { IPOPT_SSRR, "SSRR" },
     { IPOPT_LSRR, "LSRR" },
     { IPOPT_RA, "RA" },

+    { IPOPT_RFC1393, "traceroute" },

     { 0, NULL }
 };
 
     { 0, NULL }
 };
 


@@ -73,9 +74,9 @@ ip_printroute(register const u_char *cp, u_int length)
                printf(" [bad ptr %u]", cp[2]);
 
        for (len = 3; len < length; len += 4) {
                printf(" [bad ptr %u]", cp[2]);
 
        for (len = 3; len < length; len += 4) {

-               printf("%s", ipaddr_string(&cp[len]));
+               printf(" %s", ipaddr_string(&cp[len]));

                 if (ptr > len)
                 if (ptr > len)

-                    printf (", ");
+                        printf(",");

        }
 }
 
        }
 }
 


@@ -137,17 +138,17 @@ ip_printts(register const u_char *cp, u_int length)
        const char *type;
 
        if (length < 4) {
        const char *type;
 
        if (length < 4) {

-               printf("[bad length %d]", length);
+               printf("[bad length %u]", length);

                return;
        }
        printf(" TS{");
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))
                return;
        }
        printf(" TS{");
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))

-               printf("[bad length %d]", length);
+               printf("[bad length %u]", length);

        ptr = cp[2] - 1;
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
        ptr = cp[2] - 1;
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)

-               printf("[bad ptr %d]", cp[2]);
+               printf("[bad ptr %u]", cp[2]);

        switch (cp[3]&0xF) {
        case IPOPT_TS_TSONLY:
                printf("TSONLY");
        switch (cp[3]&0xF) {
        case IPOPT_TS_TSONLY:
                printf("TSONLY");


@@ -197,29 +198,37 @@ static void
 ip_optprint(register const u_char *cp, u_int length)
 {
        register u_int option_len;
 ip_optprint(register const u_char *cp, u_int length)
 {
        register u_int option_len;

+       const char *sep = "";

 
        for (; length > 0; cp += option_len, length -= option_len) {
                u_int option_code;
 
 
        for (; length > 0; cp += option_len, length -= option_len) {
                u_int option_code;
 

+               printf("%s", sep);
+               sep = ",";
+

                TCHECK(*cp);
                option_code = *cp;
 
                TCHECK(*cp);
                option_code = *cp;
 

+                printf("%s",
+                        tok2str(ip_option_values,"unknown %u",option_code));
+

                if (option_code == IPOPT_NOP ||
                     option_code == IPOPT_EOL)
                        option_len = 1;
 
                else {
                        TCHECK(cp[1]);
                if (option_code == IPOPT_NOP ||
                     option_code == IPOPT_EOL)
                        option_len = 1;
 
                else {
                        TCHECK(cp[1]);

-                       option_len = cp[1];                     
+                       option_len = cp[1];
+                       if (option_len < 2) {
+                               printf(" [bad length %u]", option_len);
+                               return;
+                       }

                }
 
                }
 

-                printf("%s (%u) len %u",
-                       tok2str(ip_option_values,"unknown",option_code),
-                       option_code,
-                       option_len);
-
-                if (option_len < 2)
-                        return;
+               if (option_len > length) {
+                       printf(" [bad length %u]", option_len);
+                       return;
+               }

 
                 TCHECK2(*cp, option_len);
 
 
                 TCHECK2(*cp, option_len);
 


@@ -234,13 +243,17 @@ ip_optprint(register const u_char *cp, u_int length)
                case IPOPT_RR:       /* fall through */
                case IPOPT_SSRR:
                case IPOPT_LSRR:
                case IPOPT_RR:       /* fall through */
                case IPOPT_SSRR:
                case IPOPT_LSRR:

-                       ip_printroute( cp, option_len);
+                       ip_printroute(cp, option_len);

                        break;
 
                case IPOPT_RA:
                        break;
 
                case IPOPT_RA:

+                       if (option_len < 4) {
+                               printf(" [bad length %u]", option_len);
+                               break;
+                       }

                         TCHECK(cp[3]);
                         if (EXTRACT_16BITS(&cp[2]) != 0)
                         TCHECK(cp[3]);
                         if (EXTRACT_16BITS(&cp[2]) != 0)

-                            printf("value %u", EXTRACT_16BITS(&cp[2]));
+                            printf(" value %u", EXTRACT_16BITS(&cp[2]));

                        break;
 
                case IPOPT_NOP:       /* nothing to print - fall through */
                        break;
 
                case IPOPT_NOP:       /* nothing to print - fall through */


@@ -341,12 +354,6 @@ in_cksum_shouldbe(u_int16_t sum, u_int16_t computed_sum)
        return shouldbe;
 }
 
        return shouldbe;
 }
 

-#ifndef IP_MF
-#define IP_MF 0x2000
-#endif /* IP_MF */
-#ifndef IP_DF
-#define IP_DF 0x4000
-#endif /* IP_DF */

 #define IP_RES 0x8000
 
 static struct tok ip_frag_values[] = {
 #define IP_RES 0x8000
 
 static struct tok ip_frag_values[] = {


@@ -359,7 +366,7 @@ static struct tok ip_frag_values[] = {
 struct ip_print_demux_state {
        const struct ip *ip;
        const u_char *cp;
 struct ip_print_demux_state {
        const struct ip *ip;
        const u_char *cp;

-       u_int   hlen, len, off;
+       u_int   len, off;

        u_char  nh;
        int     advance;
 };
        u_char  nh;
        int     advance;
 };


@@ -411,21 +418,27 @@ again:
        case IPPROTO_SCTP:
                sctp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len);
                break;
        case IPPROTO_SCTP:
                sctp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len);
                break;

+
+       case IPPROTO_DCCP:
+               dccp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len);
+               break;

                
        case IPPROTO_TCP:
                
        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,
                tcp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,

-                         (ipds->off &~ 0x6000));
+                         ipds->off & (IP_MF|IP_OFFMASK));

                break;
                
        case IPPROTO_UDP:
                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,
                udp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,

-                         (ipds->off &~ 0x6000));
+                         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,
                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 & 0x3fff));
+                          ipds->off & (IP_MF|IP_OFFMASK));

                break;
                
        case IPPROTO_PIGP:
                break;
                
        case IPPROTO_PIGP:


@@ -495,13 +508,18 @@ again:
                break;
 
        case IPPROTO_PIM:
                break;
 
        case IPPROTO_PIM:

-               pim_print(ipds->cp,  ipds->len);
+               pim_print(ipds->cp,  ipds->len,
+                         in_cksum((const u_short*)ipds->cp, ipds->len, 0));

                break;
 
        case IPPROTO_VRRP:
                vrrp_print(ipds->cp, ipds->len, ipds->ip->ip_ttl);
                break;
 
                break;
 
        case IPPROTO_VRRP:
                vrrp_print(ipds->cp, ipds->len, ipds->ip->ip_ttl);
                break;
 

+       case IPPROTO_PGM:
+               pgm_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
+               break;
+

        default:
                if ((proto = getprotobynumber(ipds->nh)) != NULL)
                        ND_PRINT((ndo, " %s", proto->p_name));
        default:
                if ((proto = getprotobynumber(ipds->nh)) != NULL)
                        ND_PRINT((ndo, " %s", proto->p_name));


@@ -512,6 +530,24 @@ again:
        }
 }
               
        }
 }
               

+void
+ip_print_inner(netdissect_options *ndo,
+              const u_char *bp,
+              u_int length, u_int nh,
+              const u_char *bp2)
+{
+       struct ip_print_demux_state  ipd;
+
+       ipd.ip = (const struct ip *)bp2;
+       ipd.cp = bp;
+       ipd.len  = length;
+       ipd.off  = 0;
+       ipd.nh   = nh;
+       ipd.advance = 0;
+
+       ip_print_demux(ndo, &ipd);
+}
+

 
 /*
  * print an IP datagram.
 
 /*
  * print an IP datagram.


@@ -524,6 +560,7 @@ ip_print(netdissect_options *ndo,
        struct ip_print_demux_state  ipd;
        struct ip_print_demux_state *ipds=&ipd;
        const u_char *ipend;
        struct ip_print_demux_state  ipd;
        struct ip_print_demux_state *ipds=&ipd;
        const u_char *ipend;

+       u_int hlen;

        u_int16_t sum, ip_sum;
        struct protoent *proto;
 
        u_int16_t sum, ip_sum;
        struct protoent *proto;
 


@@ -544,9 +581,9 @@ ip_print(netdissect_options *ndo,
                (void)printf("truncated-ip %u", length);
                return;
        }
                (void)printf("truncated-ip %u", length);
                return;
        }

-       ipds->hlen = IP_HL(ipds->ip) * 4;
-       if (ipds->hlen < sizeof (struct ip)) {
-               (void)printf("bad-hlen %u", ipds->hlen);
+       hlen = IP_HL(ipds->ip) * 4;
+       if (hlen < sizeof (struct ip)) {
+               (void)printf("bad-hlen %u", hlen);

                return;
        }
 
                return;
        }
 


@@ -554,7 +591,7 @@ ip_print(netdissect_options *ndo,
        if (length < ipds->len)
                (void)printf("truncated-ip - %u bytes missing! ",
                        ipds->len - length);
        if (length < ipds->len)
                (void)printf("truncated-ip - %u bytes missing! ",
                        ipds->len - length);

-       if (ipds->len < ipds->hlen) {
+       if (ipds->len < hlen) {

 #ifdef GUESS_TSO
             if (ipds->len) {
                 (void)printf("bad-len %u", ipds->len);
 #ifdef GUESS_TSO
             if (ipds->len) {
                 (void)printf("bad-len %u", ipds->len);


@@ -577,7 +614,7 @@ ip_print(netdissect_options *ndo,
        if (ipend < snapend)
                snapend = ipend;
 
        if (ipend < snapend)
                snapend = ipend;
 

-       ipds->len -= ipds->hlen;
+       ipds->len -= hlen;

 
        ipds->off = EXTRACT_16BITS(&ipds->ip->ip_off);
 
 
        ipds->off = EXTRACT_16BITS(&ipds->ip->ip_off);
 


@@ -598,7 +635,7 @@ ip_print(netdissect_options *ndo,
             }
 
             if (ipds->ip->ip_ttl >= 1)
             }
 
             if (ipds->ip->ip_ttl >= 1)

-                (void)printf(", ttl %3u", ipds->ip->ip_ttl);    
+                (void)printf(", ttl %u", ipds->ip->ip_ttl);    

 
            /*
             * for the firewall guys, print id, offset.
 
            /*
             * for the firewall guys, print id, offset.


@@ -606,23 +643,23 @@ ip_print(netdissect_options *ndo,
             * For unfragmented datagrams, note the don't fragment flag.
             */
 
             * For unfragmented datagrams, note the don't fragment flag.
             */
 

-           (void)printf(", id %u, offset %u, flags [%s], proto: %s (%u)",
+           (void)printf(", id %u, offset %u, flags [%s], proto %s (%u)",

                          EXTRACT_16BITS(&ipds->ip->ip_id),
                          (ipds->off & 0x1fff) * 8,
                          EXTRACT_16BITS(&ipds->ip->ip_id),
                          (ipds->off & 0x1fff) * 8,

-                         bittok2str(ip_frag_values, "none", ipds->off&0xe000 ),
+                         bittok2str(ip_frag_values, "none", ipds->off&0xe000),

                          tok2str(ipproto_values,"unknown",ipds->ip->ip_p),
                          ipds->ip->ip_p);
 
                          tok2str(ipproto_values,"unknown",ipds->ip->ip_p),
                          ipds->ip->ip_p);
 

-            (void)printf(", length: %u", EXTRACT_16BITS(&ipds->ip->ip_len));
+            (void)printf(", length %u", EXTRACT_16BITS(&ipds->ip->ip_len));

 
 

-            if ((ipds->hlen - sizeof(struct ip)) > 0) {
-                printf(", options ( ");
-                ip_optprint((u_char *)(ipds->ip + 1), ipds->hlen - sizeof(struct ip));
-                printf(" )");
+            if ((hlen - sizeof(struct ip)) > 0) {
+                printf(", options (");
+                ip_optprint((u_char *)(ipds->ip + 1), hlen - sizeof(struct ip));
+                printf(")");

             }
 
             }
 

-           if ((u_char *)ipds->ip + ipds->hlen <= snapend) {
-               sum = in_cksum((const u_short *)ipds->ip, ipds->hlen, 0);
+           if (!Kflag && (u_char *)ipds->ip + hlen <= snapend) {
+               sum = in_cksum((const u_short *)ipds->ip, hlen, 0);

                if (sum != 0) {
                    ip_sum = EXTRACT_16BITS(&ipds->ip->ip_sum);
                    (void)printf(", bad cksum %x (->%x)!", ip_sum,
                if (sum != 0) {
                    ip_sum = EXTRACT_16BITS(&ipds->ip->ip_sum);
                    (void)printf(", bad cksum %x (->%x)!", ip_sum,


@@ -630,7 +667,7 @@ ip_print(netdissect_options *ndo,
                }
            }
 
                }
            }
 

-            printf(") ");
+            printf(")\n    ");

        }
 
        /*
        }
 
        /*


@@ -638,11 +675,11 @@ ip_print(netdissect_options *ndo,
         * level protocol.
         */
        if ((ipds->off & 0x1fff) == 0) {
         * level protocol.
         */
        if ((ipds->off & 0x1fff) == 0) {

-               ipds->cp = (const u_char *)ipds->ip + ipds->hlen;
+               ipds->cp = (const u_char *)ipds->ip + hlen;

                ipds->nh = ipds->ip->ip_p;
 
                if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP &&
                ipds->nh = ipds->ip->ip_p;
 
                if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP &&

-                   ipds->nh != IPPROTO_SCTP) {
+                   ipds->nh != IPPROTO_SCTP && ipds->nh != IPPROTO_DCCP) {

                        (void)printf("%s > %s: ",
                                     ipaddr_string(&ipds->ip->ip_src),
                                     ipaddr_string(&ipds->ip->ip_dst));
                        (void)printf("%s > %s: ",
                                     ipaddr_string(&ipds->ip->ip_src),
                                     ipaddr_string(&ipds->ip->ip_dst));


@@ -694,5 +731,11 @@ ipN_print(register const u_char *bp, register u_int length)
        }
 }
 
        }
 }
 

+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */