C compilers can, and some do, optimize away pointer underflow checks.

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 2bf77d4bfc1d995607f878a211dcda372516c5ff..8f07ef7de4665cbe11fddacaf9e22fe2093aaf4a 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.123 2003-10-27 22:44:37 hannes Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.142 2007-08-08 17:20:58 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -33,9 +33,6 @@ static const char rcsid[] =
 #ifdef SEGSIZE
 #undef SEGSIZE
 #endif
 #ifdef SEGSIZE
 #undef SEGSIZE
 #endif

-#include <arpa/tftp.h>
-
-#include <rpc/rpc.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -52,6 +49,8 @@ static const char rcsid[] =
 #include "ip6.h"
 #endif
 #include "ipproto.h"
 #include "ip6.h"
 #endif
 #include "ipproto.h"

+#include "rpc_auth.h"
+#include "rpc_msg.h"

 
 #include "nameser.h"
 #include "nfs.h"
 
 #include "nameser.h"
 #include "nfs.h"


@@ -285,7 +284,7 @@ rtcp_print(const u_char *hdr, const u_char *ep)
 
 static int udp_cksum(register const struct ip *ip,
                     register const struct udphdr *up,
 
 static int udp_cksum(register const struct ip *ip,
                     register const struct udphdr *up,

-                    register int len)
+                    register u_int len)

 {
        union phu {
                struct phdr {
 {
        union phu {
                struct phdr {


@@ -300,7 +299,7 @@ static int udp_cksum(register const struct ip *ip,
        register const u_int16_t *sp;
 
        /* pseudo-header.. */
        register const u_int16_t *sp;
 
        /* pseudo-header.. */

-       phu.ph.len = htons(len);
+       phu.ph.len = htons((u_int16_t)len);

        phu.ph.mbz = 0;
        phu.ph.proto = IPPROTO_UDP;
        memcpy(&phu.ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
        phu.ph.mbz = 0;
        phu.ph.proto = IPPROTO_UDP;
        memcpy(&phu.ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));


@@ -316,9 +315,9 @@ static int udp_cksum(register const struct ip *ip,
 
 #ifdef INET6
 static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
 
 #ifdef INET6
 static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,

-       int len)
+       u_int len)

 {
 {

-       int i, tlen;
+       size_t i;

        register const u_int16_t *sp;
        u_int32_t sum;
        union {
        register const u_int16_t *sp;
        u_int32_t sum;
        union {


@@ -332,14 +331,11 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
                u_int16_t pa[20];
        } phu;
 
                u_int16_t pa[20];
        } phu;
 

-       tlen = EXTRACT_16BITS(&ip6->ip6_plen) + sizeof(struct ip6_hdr) -
-           ((const char *)up - (const char*)ip6);
-

        /* pseudo-header */
        memset(&phu, 0, sizeof(phu));
        phu.ph.ph_src = ip6->ip6_src;
        phu.ph.ph_dst = ip6->ip6_dst;
        /* pseudo-header */
        memset(&phu, 0, sizeof(phu));
        phu.ph.ph_src = ip6->ip6_src;
        phu.ph.ph_dst = ip6->ip6_dst;

-       phu.ph.ph_len = htonl(tlen);
+       phu.ph.ph_len = htonl(len);

        phu.ph.ph_nxt = IPPROTO_UDP;
 
        sum = 0;
        phu.ph.ph_nxt = IPPROTO_UDP;
 
        sum = 0;


@@ -348,10 +344,10 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
 
        sp = (const u_int16_t *)up;
 
 
        sp = (const u_int16_t *)up;
 

-       for (i = 0; i < (tlen & ~1); i += 2)
+       for (i = 0; i < (len & ~1); i += 2)

                sum += *sp++;
 
                sum += *sp++;
 

-       if (tlen & 1)
+       if (len & 1)

                sum += htons((*(const u_int8_t *)sp) << 8);
 
        while (sum > 0xffff)
                sum += htons((*(const u_int8_t *)sp) << 8);
 
        while (sum > 0xffff)


@@ -441,7 +437,6 @@ udp_print(register const u_char *bp, u_int length,
        else
                ip6 = NULL;
 #endif /*INET6*/
        else
                ip6 = NULL;
 #endif /*INET6*/

-       cp = (u_char *)(up + 1);

        if (!TTEST(up->uh_dport)) {
                udpipaddr_print(ip, -1, -1);
                (void)printf("[|udp]");
        if (!TTEST(up->uh_dport)) {
                udpipaddr_print(ip, -1, -1);
                (void)printf("[|udp]");


@@ -456,23 +451,27 @@ udp_print(register const u_char *bp, u_int length,
                (void)printf("truncated-udp %d", length);
                return;
        }
                (void)printf("truncated-udp %d", length);
                return;
        }

-       length -= sizeof(struct udphdr);
-
-       if (cp > snapend) {
+       ulen = EXTRACT_16BITS(&up->uh_ulen);
+       if (ulen < sizeof(struct udphdr)) {

                udpipaddr_print(ip, sport, dport);
                udpipaddr_print(ip, sport, dport);

-               (void)printf("[|udp]");
+               printf("truncated-udplength %d", ulen);

                return;
        }
                return;
        }

+       ulen -= sizeof(struct udphdr);
+       length -= sizeof(struct udphdr);
+       if (ulen < length)
+               length = ulen;

 
 

-       ulen = EXTRACT_16BITS(&up->uh_ulen);
-       if (ulen < 8) {
+       cp = (u_char *)(up + 1);
+       if (cp > snapend) {

                udpipaddr_print(ip, sport, dport);
                udpipaddr_print(ip, sport, dport);

-               (void)printf("truncated-udplength %d", ulen);
+               printf("[|udp]");

                return;
        }
                return;
        }

+

        if (packettype) {
        if (packettype) {

-               register struct rpc_msg *rp;
-               enum msg_type direction;
+               register struct sunrpc_msg *rp;
+               enum sunrpc_msg_type direction;

 
                switch (packettype) {
 
 
                switch (packettype) {
 


@@ -487,9 +486,9 @@ udp_print(register const u_char *bp, u_int length,
                        break;
 
                case PT_RPC:
                        break;
 
                case PT_RPC:

-                       rp = (struct rpc_msg *)(up + 1);
-                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);
-                       if (direction == CALL)
+                       rp = (struct sunrpc_msg *)(up + 1);
+                       direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+                       if (direction == SUNRPC_CALL)

                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);
                        else
                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);
                        else


@@ -529,7 +528,7 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
 #ifdef INET6
                            ip6 != NULL);
 #else

-                           FALSE);
+                           0);

 #endif
                        break;
                }
 #endif
                        break;
                }


@@ -537,24 +536,24 @@ udp_print(register const u_char *bp, u_int length,
        }
 
        if (!qflag) {
        }
 
        if (!qflag) {

-               register struct rpc_msg *rp;
-               enum msg_type direction;
+               register struct sunrpc_msg *rp;
+               enum sunrpc_msg_type direction;

 
 

-               rp = (struct rpc_msg *)(up + 1);
+               rp = (struct sunrpc_msg *)(up + 1);

                if (TTEST(rp->rm_direction)) {
                if (TTEST(rp->rm_direction)) {

-                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);
-                       if (dport == NFS_PORT && direction == CALL) {
+                       direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+                       if (dport == NFS_PORT && direction == SUNRPC_CALL) {

                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }

-                       if (sport == NFS_PORT && direction == REPLY) {
+                       if (sport == NFS_PORT && direction == SUNRPC_REPLY) {

                                nfsreply_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
 #ifdef notdef
                                nfsreply_print((u_char *)rp, length,
                                    (u_char *)ip);
                                return;
                        }
 #ifdef notdef

-                       if (dport == SUNRPC_PORT && direction == CALL) {
+                       if (dport == SUNRPC_PORT && direction == SUNRPC_CALL) {

                                sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
                                return;
                        }
                                sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
                                return;
                        }


@@ -571,7 +570,7 @@ udp_print(register const u_char *bp, u_int length,
        }
        udpipaddr_print(ip, sport, dport);
 
        }
        udpipaddr_print(ip, sport, dport);
 

-       if (IP_V(ip) == 4 && vflag && !fragmented) {
+       if (IP_V(ip) == 4 && (vflag > 1) && !Kflag && !fragmented) {

                int sum = up->uh_sum;
                if (sum == 0) {
                        (void)printf("[no cksum] ");
                int sum = up->uh_sum;
                if (sum == 0) {
                        (void)printf("[no cksum] ");


@@ -584,11 +583,11 @@ udp_print(register const u_char *bp, u_int length,
                }
        }
 #ifdef INET6
                }
        }
 #ifdef INET6

-       if (IP_V(ip) == 6 && ip6->ip6_plen && vflag && !fragmented) {
+       if (IP_V(ip) == 6 && ip6->ip6_plen && vflag && !Kflag && !fragmented) {

                int sum = up->uh_sum;
                /* for IPv6, UDP checksum is mandatory */
                if (TTEST2(cp[0], length)) {
                int sum = up->uh_sum;
                /* for IPv6, UDP checksum is mandatory */
                if (TTEST2(cp[0], length)) {

-                       sum = udp6_cksum(ip6, up, length);
+                       sum = udp6_cksum(ip6, up, length + sizeof(struct udphdr));

                        if (sum != 0)
                                (void)printf("[bad udp cksum %x!] ", sum);
                        else
                        if (sum != 0)
                                (void)printf("[bad udp cksum %x!] ", sum);
                        else


@@ -599,8 +598,10 @@ udp_print(register const u_char *bp, u_int length,
 
        if (!qflag) {
 #define ISPORT(p) (dport == (p) || sport == (p))
 
        if (!qflag) {
 #define ISPORT(p) (dport == (p) || sport == (p))

-               if (ISPORT(NAMESERVER_PORT) || ISPORT(MULTICASTDNS_PORT))
-                       ns_print((const u_char *)(up + 1), length);
+               if (ISPORT(NAMESERVER_PORT))
+                       ns_print((const u_char *)(up + 1), length, 0);
+               else if (ISPORT(MULTICASTDNS_PORT))
+                       ns_print((const u_char *)(up + 1), length, 1);

                else if (ISPORT(TIMED_PORT))
                        timed_print((const u_char *)(up + 1));
                else if (ISPORT(TFTP_PORT))
                else if (ISPORT(TIMED_PORT))
                        timed_print((const u_char *)(up + 1));
                else if (ISPORT(TFTP_PORT))


@@ -614,13 +615,15 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
 #ifdef INET6
                            ip6 != NULL);
 #else

-                           FALSE);
+                           0);

 #endif
 #endif

-               else if (ISPORT(ISAKMP_PORT))
-                       isakmp_print((const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT))
+                        isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT_NATT))
+                        isakmp_rfc3948_print(gndo, (const u_char *)(up + 1), length, bp2);

 #if 1 /*???*/
 #if 1 /*???*/

-               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
-                       isakmp_print((const u_char *)(up + 1), length, bp2);
+               else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
+                       isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);

 #endif
                else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
                        snmp_print((const u_char *)(up + 1), length);
 #endif
                else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
                        snmp_print((const u_char *)(up + 1), length);


@@ -652,8 +655,7 @@ udp_print(register const u_char *bp, u_int length,
                else if (ISPORT(RIPNG_PORT))
                        ripng_print((const u_char *)(up + 1), length);
                else if (ISPORT(DHCP6_SERV_PORT) || ISPORT(DHCP6_CLI_PORT)) {
                else if (ISPORT(RIPNG_PORT))
                        ripng_print((const u_char *)(up + 1), length);
                else if (ISPORT(DHCP6_SERV_PORT) || ISPORT(DHCP6_CLI_PORT)) {

-                       dhcp6_print((const u_char *)(up + 1), length,
-                               sport, dport);
+                       dhcp6_print((const u_char *)(up + 1), length);

                }
 #endif /*INET6*/
                /*
                }
 #endif /*INET6*/
                /*


@@ -672,17 +674,58 @@ udp_print(register const u_char *bp, u_int length,
                        hsrp_print((const u_char *)(up + 1), length);
                else if (ISPORT(LWRES_PORT))
                        lwres_print((const u_char *)(up + 1), length);
                        hsrp_print((const u_char *)(up + 1), length);
                else if (ISPORT(LWRES_PORT))
                        lwres_print((const u_char *)(up + 1), length);

-                else if (ISPORT(LDP_PORT))
+               else if (ISPORT(LDP_PORT))

                        ldp_print((const u_char *)(up + 1), length);
                        ldp_print((const u_char *)(up + 1), length);

-                else if (ISPORT(MPLS_LSP_PING_PORT))
-                       mpls_lsp_ping_print((const u_char *)(up + 1), length);
+               else if (ISPORT(OLSR_PORT))
+                       olsr_print((const u_char *)(up + 1), length,
+#if INET6
+                                       (IP_V(ip) == 6) ? 1 : 0);
+#else
+                                       0);
+#endif
+               else if (ISPORT(MPLS_LSP_PING_PORT))
+                       lspping_print((const u_char *)(up + 1), length);

                else if (dport == BFD_CONTROL_PORT ||
                         dport == BFD_ECHO_PORT )
                        bfd_print((const u_char *)(up+1), length, dport);
                else if (dport == BFD_CONTROL_PORT ||
                         dport == BFD_ECHO_PORT )
                        bfd_print((const u_char *)(up+1), length, dport);

-               else
-                       (void)printf("UDP, length: %u",
-                           (u_int32_t)(ulen - sizeof(*up)));
+                else if (ISPORT(LMP_PORT))
+                       lmp_print((const u_char *)(up + 1), length);
+               else if (ISPORT(VQP_PORT))
+                       vqp_print((const u_char *)(up + 1), length);
+                else if (ISPORT(SFLOW_PORT))
+                        sflow_print((const u_char *)(up + 1), length);
+               else if (dport == LWAPP_CONTROL_PORT)
+                       lwapp_control_print((const u_char *)(up + 1), length, 1);
+                else if (sport == LWAPP_CONTROL_PORT)
+                        lwapp_control_print((const u_char *)(up + 1), length, 0);
+                else if (ISPORT(LWAPP_DATA_PORT))
+                        lwapp_data_print((const u_char *)(up + 1), length);
+                else if (ISPORT(SIP_PORT))
+                       sip_print((const u_char *)(up + 1), length);
+                else if (ISPORT(SYSLOG_PORT))
+                       syslog_print((const u_char *)(up + 1), length);
+               else {
+                       if (ulen > length)
+                               printf("UDP, bad length %u > %u",
+                                   ulen, length);
+                       else
+                               printf("UDP, length %u", ulen);
+               }

 #undef ISPORT
 #undef ISPORT

-       } else
-               (void)printf("UDP, length: %u", (u_int32_t)(ulen - sizeof(*up)));
+       } else {
+               if (ulen > length)
+                       printf("UDP, bad length %u > %u",
+                           ulen, length);
+               else
+                       printf("UDP, length %u", ulen);
+       }

 }
 }

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