NDOize AH, BEEP and DTP decoders

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index c0c91888bdc3a6d30b3a81a150c6650b74fb8b40..b069e4de30979817d8c0890659aa8b470b026245 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.159 2007-09-14 01:29:28 guy Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -41,7 +36,9 @@ static const char rcsid[] _U_ =
 #include "ip.h"
 #include "ipproto.h"
 
 #include "ip.h"
 #include "ipproto.h"
 

-struct tok ip_option_values[] = {
+static const char tstr[] = "[|ip]";
+
+static const struct tok ip_option_values[] = {

     { IPOPT_EOL, "EOL" },
     { IPOPT_NOP, "NOP" },
     { IPOPT_TS, "timestamp" },
     { IPOPT_EOL, "EOL" },
     { IPOPT_NOP, "NOP" },
     { IPOPT_TS, "timestamp" },


@@ -120,12 +117,12 @@ ip_finddst(const struct ip *ip)
                case IPOPT_LSRR:
                        if (len < 7)
                                break;
                case IPOPT_LSRR:
                        if (len < 7)
                                break;

-                       memcpy(&retval, cp + len - 4, 4);
+                       UNALIGNED_MEMCPY(&retval, cp + len - 4, 4);

                        return retval;
                }
        }
 trunc:
                        return retval;
                }
        }
 trunc:

-       memcpy(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       UNALIGNED_MEMCPY(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));

        return retval;
 }
 
        return retval;
 }
 


@@ -134,7 +131,7 @@ trunc:
  */
 int
 nextproto4_cksum(const struct ip *ip, const u_int8_t *data,
  */
 int
 nextproto4_cksum(const struct ip *ip, const u_int8_t *data,

-                u_int len, u_int next_proto)
+                u_int len, u_int covlen, u_int next_proto)

 {
        struct phdr {
                u_int32_t src;
 {
        struct phdr {
                u_int32_t src;


@@ -149,16 +146,16 @@ nextproto4_cksum(const struct ip *ip, const u_int8_t *data,
        ph.len = htons((u_int16_t)len);
        ph.mbz = 0;
        ph.proto = next_proto;
        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));
+       UNALIGNED_MEMCPY(&ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));

        if (IP_HL(ip) == 5)
        if (IP_HL(ip) == 5)

-               memcpy(&ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+               UNALIGNED_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;
        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;
+       vec[1].len = covlen;

        return (in_cksum(vec, 2));
 }
 
        return (in_cksum(vec, 2));
 }
 


@@ -298,12 +295,12 @@ ip_optprint(register const u_char *cp, u_int length)
        return;
 
 trunc:
        return;
 
 trunc:

-       printf("[|ip]");
+       printf("%s", tstr);

 }
 
 #define IP_RES 0x8000
 
 }
 
 #define IP_RES 0x8000
 

-static struct tok ip_frag_values[] = {
+static const struct tok ip_frag_values[] = {

         { IP_MF,        "+" },
         { IP_DF,        "DF" },
        { IP_RES,       "rsvd" }, /* The RFC3514 evil ;-) bit */
         { IP_MF,        "+" },
         { IP_DF,        "DF" },
        { IP_RES,       "rsvd" }, /* The RFC3514 evil ;-) bit */


@@ -330,7 +327,7 @@ again:
 
        case IPPROTO_AH:
                ipds->nh = *ipds->cp;
 
        case IPPROTO_AH:
                ipds->nh = *ipds->cp;

-               ipds->advance = ah_print(ipds->cp);
+               ipds->advance = ah_print(gndo, ipds->cp);

                if (ipds->advance <= 0)
                        break;
                ipds->cp += ipds->advance;
                if (ipds->advance <= 0)
                        break;
                ipds->cp += ipds->advance;


@@ -350,7 +347,7 @@ again:
                ipds->nh = enh & 0xff;
                goto again;
        }
                ipds->nh = enh & 0xff;
                goto again;
        }

-       
+

        case IPPROTO_IPCOMP:
        {
                int enh;
        case IPPROTO_IPCOMP:
        {
                int enh;


@@ -370,25 +367,25 @@ again:
        case IPPROTO_DCCP:
                dccp_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:
                /* 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_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_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_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
        case IPPROTO_PIGP:
                /*
                 * XXX - the current IANA protocol number assignments


@@ -405,11 +402,11 @@ again:
                 */
                igrp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
                break;
                 */
                igrp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
                break;

-               
+

        case IPPROTO_EIGRP:
                eigrp_print(ipds->cp, ipds->len);
                break;
        case IPPROTO_EIGRP:
                eigrp_print(ipds->cp, ipds->len);
                break;

-               
+

        case IPPROTO_ND:
                ND_PRINT((ndo, " nd %d", ipds->len));
                break;
        case IPPROTO_ND:
                ND_PRINT((ndo, " nd %d", ipds->len));
                break;


@@ -434,7 +431,7 @@ again:
                        return;
                }
                break;
                        return;
                }
                break;

-               
+

 #ifdef INET6
        case IPPROTO_IPV6:
                /* ip6-in-ip encapsulation */
 #ifdef INET6
        case IPPROTO_IPV6:
                /* ip6-in-ip encapsulation */


@@ -467,7 +464,7 @@ again:
                                (void)printf("carp %s > %s: ",
                                             ipaddr_string(&ipds->ip->ip_src),
                                             ipaddr_string(&ipds->ip->ip_dst));
                                (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);
+                       carp_print(ndo, ipds->cp, ipds->len, ipds->ip->ip_ttl);

                } else {
                        if (vflag)
                                (void)printf("vrrp %s > %s: ",
                } else {
                        if (vflag)
                                (void)printf("vrrp %s > %s: ",


@@ -482,7 +479,7 @@ again:
                break;
 
        default:
                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));
                        ND_PRINT((ndo, " %s", proto->p_name));
                else
                        ND_PRINT((ndo, " ip-proto-%d", ipds->nh));


@@ -490,7 +487,7 @@ again:
                break;
        }
 }
                break;
        }
 }

-              
+

 void
 ip_print_inner(netdissect_options *ndo,
               const u_char *bp,
 void
 ip_print_inner(netdissect_options *ndo,
               const u_char *bp,


@@ -536,7 +533,7 @@ ip_print(netdissect_options *ndo,
            printf("IP ");
 
        if ((u_char *)(ipds->ip + 1) > ndo->ndo_snapend) {
            printf("IP ");
 
        if ((u_char *)(ipds->ip + 1) > ndo->ndo_snapend) {

-               printf("[|ip]");
+               printf("%s", tstr);

                return;
        }
        if (length < sizeof (struct ip)) {
                return;
        }
        if (length < sizeof (struct ip)) {


@@ -597,7 +594,7 @@ ip_print(netdissect_options *ndo,
             }
 
             if (ipds->ip->ip_ttl >= 1)
             }
 
             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.
 
            /*
             * for the firewall guys, print id, offset.


@@ -665,21 +662,20 @@ ip_print(netdissect_options *ndo,
                    (void)printf(" %s", proto->p_name);
                else
                    (void)printf(" ip-proto-%d", ipds->ip->ip_p);
                    (void)printf(" %s", proto->p_name);
                else
                    (void)printf(" ip-proto-%d", ipds->ip->ip_p);

-           } 
+           }

        }
 }
 
 void
 ipN_print(register const u_char *bp, register u_int length)
 {
        }
 }
 
 void
 ipN_print(register const u_char *bp, register u_int length)
 {

-       struct ip *ip, hdr;
+       struct ip hdr;

 
 

-       ip = (struct ip *)bp;

        if (length < 4) {
                (void)printf("truncated-ip %d", length);
                return;
        }
        if (length < 4) {
                (void)printf("truncated-ip %d", length);
                return;
        }

-       memcpy (&hdr, (char *)ip, 4);
+       memcpy (&hdr, bp, 4);

        switch (IP_V(&hdr)) {
        case 4:
                ip_print (gndo, bp, length);
        switch (IP_V(&hdr)) {
        case 4:
                ip_print (gndo, bp, length);