Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 2888a6d74b9b3af931bd1b5e67634c56a3238208..d71e4d3abd11840596b4ba15d3a299f2ac7cf6d7 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.124 2003-11-05 06:03:01 guy 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
@@ -33,9 +33,6 @@ static const char rcsid[] =
 #ifdef SEGSIZE
 #undef SEGSIZE
 #endif
-#include <arpa/tftp.h>
-
-#include <rpc/rpc.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -52,6 +49,8 @@ static const char rcsid[] =
 #include "ip6.h"
 #endif
 #include "ipproto.h"
+#include "rpc_auth.h"
+#include "rpc_msg.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,
-                    register int len)
+                    register u_int len)
 {
        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.. */
-       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));
@@ -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,
-       int len)
+       u_int len)
 {
-       int i, tlen;
+       size_t i;
        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;
 
-       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;
-       phu.ph.ph_len = htonl(tlen);
+       phu.ph.ph_len = htonl(len);
        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;
 
-       for (i = 0; i < (tlen & ~1); i += 2)
+       for (i = 0; i < (len & ~1); i += 2)
                sum += *sp++;
 
-       if (tlen & 1)
+       if (len & 1)
                sum += htons((*(const u_int8_t *)sp) << 8);
 
        while (sum > 0xffff)
@@ -471,8 +467,8 @@ udp_print(register const u_char *bp, u_int length,
                return;
        }
        if (packettype) {
-               register struct rpc_msg *rp;
-               enum msg_type direction;
+               register struct sunrpc_msg *rp;
+               enum sunrpc_msg_type direction;
 
                switch (packettype) {
 
@@ -487,9 +483,9 @@ udp_print(register const u_char *bp, u_int length,
                        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
@@ -529,7 +525,7 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
-                           FALSE);
+                           0);
 #endif
                        break;
                }
@@ -537,24 +533,24 @@ udp_print(register const u_char *bp, u_int length,
        }
 
        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)) {
-                       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;
                        }
-                       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
-                       if (dport == SUNRPC_PORT && direction == CALL) {
+                       if (dport == SUNRPC_PORT && direction == SUNRPC_CALL) {
                                sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
                                return;
                        }
@@ -571,7 +567,7 @@ udp_print(register const u_char *bp, u_int length,
        }
        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] ");
@@ -584,11 +580,11 @@ udp_print(register const u_char *bp, u_int length,
                }
        }
 #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)) {
-                       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
@@ -616,13 +612,15 @@ udp_print(register const u_char *bp, u_int length,
 #ifdef INET6
                            ip6 != NULL);
 #else
-                           FALSE);
+                           0);
 #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 /*???*/
-               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);
@@ -654,8 +652,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)) {
-                       dhcp6_print((const u_char *)(up + 1), length,
-                               sport, dport);
+                       dhcp6_print((const u_char *)(up + 1), length);
                }
 #endif /*INET6*/
                /*
@@ -674,17 +671,49 @@ 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);
-                else if (ISPORT(LDP_PORT))
+               else if (ISPORT(LDP_PORT))
                        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 (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
-                       (void)printf("UDP, length: %u",
+                       (void)printf("UDP, length %u",
                            (u_int32_t)(ulen - sizeof(*up)));
 #undef ISPORT
        } else
-               (void)printf("UDP, length: %u", (u_int32_t)(ulen - sizeof(*up)));
+               (void)printf("UDP, length %u", (u_int32_t)(ulen - sizeof(*up)));
 }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
+