Fix a signed-vs-unsigned comparison warning.

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 58b7a52c23e04b1f22a770f13e916a045614467d..27441c25eae16a69eb87f2d09494e862b0b59905 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -20,18 +20,15 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.91 2001-01-29 09:18:50 itojun Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.129 2003-11-19 00:19:56 guy Exp $ (LBL)";

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

-#include <sys/param.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

 
 #ifdef SEGSIZE
 #undef SEGSIZE
 
 #ifdef SEGSIZE
 #undef SEGSIZE


@@ -45,6 +42,7 @@ static const char rcsid[] =
 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 #include "appletalk.h"
 
 #include "udp.h"
 #include "appletalk.h"
 
 #include "udp.h"


@@ -53,13 +51,8 @@ static const char rcsid[] =
 #ifdef INET6
 #include "ip6.h"
 #endif
 #ifdef INET6
 #include "ip6.h"
 #endif

+#include "ipproto.h"

 
 

-#ifdef NOERROR
-#undef NOERROR                                 /* Solaris sucks */
-#endif
-#ifdef T_UNSPEC
-#undef T_UNSPEC                                        /* SINIX does too */
-#endif

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


@@ -114,21 +107,21 @@ struct rtcp_rr {
 #define RTCP_PT_APP    204
 
 static void
 #define RTCP_PT_APP    204
 
 static void

-vat_print(const void *hdr, u_int len, register const struct udphdr *up)
+vat_print(const void *hdr, register const struct udphdr *up)

 {
        /* vat/vt audio */
        u_int ts = *(u_int16_t *)hdr;
        if ((ts & 0xf060) != 0) {
                /* probably vt */
 {
        /* vat/vt audio */
        u_int ts = *(u_int16_t *)hdr;
        if ((ts & 0xf060) != 0) {
                /* probably vt */

-               (void)printf(" udp/vt %u %d / %d",
-                            (u_int32_t)(ntohs(up->uh_ulen) - sizeof(*up)),
+               (void)printf("udp/vt %u %d / %d",
+                            (u_int32_t)(EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up)),

                             ts & 0x3ff, ts >> 10);
        } else {
                /* probably vat */
                             ts & 0x3ff, ts >> 10);
        } else {
                /* probably vat */

-               u_int32_t i0 = (u_int32_t)ntohl(((u_int *)hdr)[0]);
-               u_int32_t i1 = (u_int32_t)ntohl(((u_int *)hdr)[1]);
-               printf(" udp/vat %u c%d %u%s",
-                       (u_int32_t)(ntohs(up->uh_ulen) - sizeof(*up) - 8),
+               u_int32_t i0 = EXTRACT_32BITS(&((u_int *)hdr)[0]);
+               u_int32_t i1 = EXTRACT_32BITS(&((u_int *)hdr)[1]);
+               printf("udp/vat %u c%d %u%s",
+                       (u_int32_t)(EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up) - 8),

                        i0 & 0xffff,
                        i1, i0 & 0x800000? "*" : "");
                /* audio format */
                        i0 & 0xffff,
                        i1, i0 & 0x800000? "*" : "");
                /* audio format */


@@ -145,9 +138,9 @@ rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
        /* rtp v1 or v2 */
        u_int *ip = (u_int *)hdr;
        u_int hasopt, hasext, contype, hasmarker;
        /* rtp v1 or v2 */
        u_int *ip = (u_int *)hdr;
        u_int hasopt, hasext, contype, hasmarker;

-       u_int32_t i0 = (u_int32_t)ntohl(((u_int *)hdr)[0]);
-       u_int32_t i1 = (u_int32_t)ntohl(((u_int *)hdr)[1]);
-       u_int dlen = ntohs(up->uh_ulen) - sizeof(*up) - 8;
+       u_int32_t i0 = EXTRACT_32BITS(&((u_int *)hdr)[0]);
+       u_int32_t i1 = EXTRACT_32BITS(&((u_int *)hdr)[1]);
+       u_int dlen = EXTRACT_16BITS(&up->uh_ulen) - sizeof(*up) - 8;

        const char * ptype;
 
        ip += 2;
        const char * ptype;
 
        ip += 2;


@@ -171,7 +164,7 @@ rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
                ip += 1;
                len -= 1;
        }
                ip += 1;
                len -= 1;
        }

-       printf(" udp/%s %d c%d %s%s %d %u",
+       printf("udp/%s %d c%d %s%s %d %u",

                ptype,
                dlen,
                contype,
                ptype,
                dlen,
                contype,


@@ -180,7 +173,7 @@ rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
                i0 & 0xffff,
                i1);
        if (vflag) {
                i0 & 0xffff,
                i1);
        if (vflag) {

-               printf(" %u", (u_int32_t)ntohl(((u_int *)hdr)[2]));
+               printf(" %u", EXTRACT_32BITS(&((u_int *)hdr)[2]));

                if (hasopt) {
                        u_int i2, optlen;
                        do {
                if (hasopt) {
                        u_int i2, optlen;
                        do {


@@ -224,8 +217,8 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                printf(" [|rtcp]");
                return (ep);
        }
                printf(" [|rtcp]");
                return (ep);
        }

-       len = (ntohs(rh->rh_len) + 1) * 4;
-       flags = ntohs(rh->rh_flags);
+       len = (EXTRACT_16BITS(&rh->rh_len) + 1) * 4;
+       flags = EXTRACT_16BITS(&rh->rh_flags);

        cnt = (flags >> 8) & 0x1f;
        switch (flags & 0xff) {
        case RTCP_PT_SR:
        cnt = (flags >> 8) & 0x1f;
        switch (flags & 0xff) {
        case RTCP_PT_SR:


@@ -234,16 +227,16 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                        printf(" [%d]", len);
                if (vflag)
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                        printf(" [%d]", len);
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));

                if ((u_char *)(sr + 1) > ep) {
                        printf(" [|rtcp]");
                        return (ep);
                }
                if ((u_char *)(sr + 1) > ep) {
                        printf(" [|rtcp]");
                        return (ep);
                }

-               ts = (double)((u_int32_t)ntohl(sr->sr_ntp.upper)) +
-                   ((double)((u_int32_t)ntohl(sr->sr_ntp.lower)) /
+               ts = (double)(EXTRACT_32BITS(&sr->sr_ntp.upper)) +
+                   ((double)(EXTRACT_32BITS(&sr->sr_ntp.lower)) /

                    4294967296.0);
                    4294967296.0);

-               printf(" @%.2f %u %up %ub", ts, (u_int32_t)ntohl(sr->sr_ts),
-                   (u_int32_t)ntohl(sr->sr_np), (u_int32_t)ntohl(sr->sr_nb));
+               printf(" @%.2f %u %up %ub", ts, EXTRACT_32BITS(&sr->sr_ts),
+                   EXTRACT_32BITS(&sr->sr_np), EXTRACT_32BITS(&sr->sr_nb));

                rr = (struct rtcp_rr *)(sr + 1);
                break;
        case RTCP_PT_RR:
                rr = (struct rtcp_rr *)(sr + 1);
                break;
        case RTCP_PT_RR:


@@ -252,18 +245,18 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                        printf(" [%d]", len);
                rr = (struct rtcp_rr *)(rh + 1);
                if (vflag)
                        printf(" [%d]", len);
                rr = (struct rtcp_rr *)(rh + 1);
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));

                break;
        case RTCP_PT_SDES:
                printf(" sdes %d", len);
                if (vflag)
                break;
        case RTCP_PT_SDES:
                printf(" sdes %d", len);
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));

                cnt = 0;
                break;
        case RTCP_PT_BYE:
                printf(" bye %d", len);
                if (vflag)
                cnt = 0;
                break;
        case RTCP_PT_BYE:
                printf(" bye %d", len);
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
+                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));

                cnt = 0;
                break;
        default:
                cnt = 0;
                break;
        default:


@@ -279,22 +272,21 @@ rtcp_print(const u_char *hdr, const u_char *ep)
                        return (ep);
                }
                if (vflag)
                        return (ep);
                }
                if (vflag)

-                       printf(" %u", (u_int32_t)ntohl(rr->rr_srcid));
-               ts = (double)((u_int32_t)ntohl(rr->rr_lsr)) / 65536.;
-               dts = (double)((u_int32_t)ntohl(rr->rr_dlsr)) / 65536.;
+                       printf(" %u", EXTRACT_32BITS(&rr->rr_srcid));
+               ts = (double)(EXTRACT_32BITS(&rr->rr_lsr)) / 65536.;
+               dts = (double)(EXTRACT_32BITS(&rr->rr_dlsr)) / 65536.;

                printf(" %ul %us %uj @%.2f+%.2f",
                printf(" %ul %us %uj @%.2f+%.2f",

-                   (u_int32_t)ntohl(rr->rr_nl) & 0x00ffffff,
-                   (u_int32_t)ntohl(rr->rr_ls),
-                   (u_int32_t)ntohl(rr->rr_dv), ts, dts);
+                   EXTRACT_32BITS(&rr->rr_nl) & 0x00ffffff,
+                   EXTRACT_32BITS(&rr->rr_ls),
+                   EXTRACT_32BITS(&rr->rr_dv), ts, dts);

        }
        return (hdr + len);
 }
 
 static int udp_cksum(register const struct ip *ip,
                     register const struct udphdr *up,
        }
        return (hdr + len);
 }
 
 static int udp_cksum(register const struct ip *ip,
                     register const struct udphdr *up,

-                    register int len)
+                    register u_int len)

 {
 {

-       int i, tlen;

        union phu {
                struct phdr {
                        u_int32_t src;
        union phu {
                struct phdr {
                        u_int32_t src;


@@ -306,40 +298,27 @@ static int udp_cksum(register const struct ip *ip,
                u_int16_t pa[6];
        } phu;
        register const u_int16_t *sp;
                u_int16_t pa[6];
        } phu;
        register const u_int16_t *sp;

-       u_int32_t sum;
-       tlen = ntohs(ip->ip_len) - ((const char *)up-(const char*)ip);

 
        /* pseudo-header.. */
 
        /* pseudo-header.. */

-       phu.ph.len = htons(tlen);
+       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));

-       memcpy(&phu.ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       if (IP_HL(ip) == 5)
+               memcpy(&phu.ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       else
+               phu.ph.dst = ip_finddst(ip);

 
        sp = &phu.pa[0];
 
        sp = &phu.pa[0];

-       sum = sp[0]+sp[1]+sp[2]+sp[3]+sp[4]+sp[5];
-
-       sp = (const u_int16_t *)up;
-
-       for (i=0; i<(tlen&~1); i+= 2)
-               sum += *sp++;
-
-       if (tlen & 1) {
-               sum += htons( (*(const u_int8_t *)sp) << 8);
-       }
-
-       while (sum > 0xffff)
-               sum = (sum & 0xffff) + (sum >> 16);
-       sum = ~sum & 0xffff;
-
-       return (sum);
+       return in_cksum((u_short *)up, len,
+                       sp[0]+sp[1]+sp[2]+sp[3]+sp[4]+sp[5]);

 }
 
 #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 {


@@ -353,14 +332,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 = ntohs(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;


@@ -369,10 +345,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)


@@ -383,37 +359,61 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
 }
 #endif
 
 }
 #endif
 

+static void
+udpipaddr_print(const struct ip *ip, int sport, int dport)
+{
+#ifdef INET6
+       const struct ip6_hdr *ip6;

 
 

-/* XXX probably should use getservbyname() and cache answers */
-#define TFTP_PORT 69           /*XXX*/
-#define KERBEROS_PORT 88       /*XXX*/
-#define SUNRPC_PORT 111                /*XXX*/
-#define SNMP_PORT 161          /*XXX*/
-#define NTP_PORT 123           /*XXX*/
-#define SNMPTRAP_PORT 162      /*XXX*/
-#define ISAKMP_PORT 500                /*XXX*/
-#define TIMED_PORT 525         /*XXX*/
-#define RIP_PORT 520           /*XXX*/
-#define KERBEROS_SEC_PORT 750  /*XXX*/
-#define L2TP_PORT 1701         /*XXX*/
-#define ISAKMP_PORT_USER1 7500 /*??? - nonstandard*/
-#define ISAKMP_PORT_USER2 8500 /*??? - nonstandard*/
-#define RX_PORT_LOW 7000       /*XXX*/
-#define RX_PORT_HIGH 7009      /*XXX*/
-#define NETBIOS_NS_PORT   137
-#define NETBIOS_DGRAM_PORT   138
-#define CISCO_AUTORP_PORT 496  /*XXX*/
-#define RADIUS_PORT 1645
-#define RADIUS_NEW_PORT 1812
-#define RADIUS_ACCOUNTING_PORT 1646
-#define RADIUS_NEW_ACCOUNTING_PORT 1813
-#define LWRES_PORT             921
+       if (IP_V(ip) == 6)
+               ip6 = (const struct ip6_hdr *)ip;
+       else
+               ip6 = NULL;

 
 

-#ifdef INET6
-#define RIPNG_PORT 521         /*XXX*/
-#define DHCP6_SERV_PORT 546    /*XXX*/
-#define DHCP6_CLI_PORT 547     /*XXX*/
-#endif
+       if (ip6) {
+               if (ip6->ip6_nxt == IPPROTO_UDP) {
+                       if (sport == -1) {
+                               (void)printf("%s > %s: ",
+                                       ip6addr_string(&ip6->ip6_src),
+                                       ip6addr_string(&ip6->ip6_dst));
+                       } else {
+                               (void)printf("%s.%s > %s.%s: ",
+                                       ip6addr_string(&ip6->ip6_src),
+                                       udpport_string(sport),
+                                       ip6addr_string(&ip6->ip6_dst),
+                                       udpport_string(dport));
+                       }
+               } else {
+                       if (sport != -1) {
+                               (void)printf("%s > %s: ",
+                                       udpport_string(sport),
+                                       udpport_string(dport));
+                       }
+               }
+       } else
+#endif /*INET6*/
+       {
+               if (ip->ip_p == IPPROTO_UDP) {
+                       if (sport == -1) {
+                               (void)printf("%s > %s: ",
+                                       ipaddr_string(&ip->ip_src),
+                                       ipaddr_string(&ip->ip_dst));
+                       } else {
+                               (void)printf("%s.%s > %s.%s: ",
+                                       ipaddr_string(&ip->ip_src),
+                                       udpport_string(sport),
+                                       ipaddr_string(&ip->ip_dst),
+                                       udpport_string(dport));
+                       }
+               } else {
+                       if (sport != -1) {
+                               (void)printf("%s > %s: ",
+                                       udpport_string(sport),
+                                       udpport_string(dport));
+                       }
+               }
+       }
+}

 
 void
 udp_print(register const u_char *bp, u_int length,
 
 void
 udp_print(register const u_char *bp, u_int length,


@@ -439,27 +439,32 @@ udp_print(register const u_char *bp, u_int length,
                ip6 = NULL;
 #endif /*INET6*/
        cp = (u_char *)(up + 1);
                ip6 = NULL;
 #endif /*INET6*/
        cp = (u_char *)(up + 1);

-       if (cp > snapend) {
-               (void)printf("%s > %s: [|udp]",
-                       ipaddr_string(&ip->ip_src), ipaddr_string(&ip->ip_dst));
+       if (!TTEST(up->uh_dport)) {
+               udpipaddr_print(ip, -1, -1);
+               (void)printf("[|udp]");

                return;
        }
                return;
        }

+
+       sport = EXTRACT_16BITS(&up->uh_sport);
+       dport = EXTRACT_16BITS(&up->uh_dport);
+

        if (length < sizeof(struct udphdr)) {
        if (length < sizeof(struct udphdr)) {

-               (void)printf("%s > %s: truncated-udp %d",
-                       ipaddr_string(&ip->ip_src), ipaddr_string(&ip->ip_dst),
-                       length);
+               udpipaddr_print(ip, sport, dport);
+               (void)printf("truncated-udp %d", length);

                return;
        }
        length -= sizeof(struct udphdr);
 
                return;
        }
        length -= sizeof(struct udphdr);
 

-       sport = ntohs(up->uh_sport);
-       dport = ntohs(up->uh_dport);
-       ulen = ntohs(up->uh_ulen);
+       if (cp > snapend) {
+               udpipaddr_print(ip, sport, dport);
+               (void)printf("[|udp]");
+               return;
+       }
+
+       ulen = EXTRACT_16BITS(&up->uh_ulen);

        if (ulen < 8) {
        if (ulen < 8) {

-               (void)printf("%s > %s: truncated-udplength %d",
-                            ipaddr_string(&ip->ip_src),
-                            ipaddr_string(&ip->ip_dst),
-                            ulen);
+               udpipaddr_print(ip, sport, dport);
+               (void)printf("truncated-udplength %d", ulen);

                return;
        }
        if (packettype) {
                return;
        }
        if (packettype) {


@@ -469,26 +474,18 @@ udp_print(register const u_char *bp, u_int length,
                switch (packettype) {
 
                case PT_VAT:
                switch (packettype) {
 
                case PT_VAT:

-                       (void)printf("%s.%s > %s.%s:",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
-                       vat_print((void *)(up + 1), length, up);
+                       udpipaddr_print(ip, sport, dport);
+                       vat_print((void *)(up + 1), up);

                        break;
 
                case PT_WB:
                        break;
 
                case PT_WB:

-                       (void)printf("%s.%s > %s.%s:",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
+                       udpipaddr_print(ip, sport, dport);

                        wb_print((void *)(up + 1), length);
                        break;
 
                case PT_RPC:
                        rp = (struct rpc_msg *)(up + 1);
                        wb_print((void *)(up + 1), length);
                        break;
 
                case PT_RPC:
                        rp = (struct rpc_msg *)(up + 1);

-                       direction = (enum msg_type)ntohl(rp->rm_direction);
+                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);

                        if (direction == CALL)
                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);
                        if (direction == CALL)
                                sunrpcrequest_print((u_char *)rp, length,
                                    (u_char *)ip);


@@ -498,40 +495,39 @@ udp_print(register const u_char *bp, u_int length,
                        break;
 
                case PT_RTP:
                        break;
 
                case PT_RTP:

-                       (void)printf("%s.%s > %s.%s:",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
+                       udpipaddr_print(ip, sport, dport);

                        rtp_print((void *)(up + 1), length, up);
                        break;
 
                case PT_RTCP:
                        rtp_print((void *)(up + 1), length, up);
                        break;
 
                case PT_RTCP:

-                       (void)printf("%s.%s > %s.%s:",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
+                       udpipaddr_print(ip, sport, dport);

                        while (cp < ep)
                                cp = rtcp_print(cp, ep);
                        break;
 
                case PT_SNMP:
                        while (cp < ep)
                                cp = rtcp_print(cp, ep);
                        break;
 
                case PT_SNMP:

-                       (void)printf("%s.%s > %s.%s:",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
+                       udpipaddr_print(ip, sport, dport);

                        snmp_print((const u_char *)(up + 1), length);
                        break;
 
                case PT_CNFP:
                        snmp_print((const u_char *)(up + 1), length);
                        break;
 
                case PT_CNFP:

-                       (void)printf("%s.%s > %s.%s:",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
-                       cnfp_print(cp, length, (const u_char *)ip);
+                       udpipaddr_print(ip, sport, dport);
+                       cnfp_print(cp, (const u_char *)ip);
+                       break;
+
+               case PT_TFTP:
+                       udpipaddr_print(ip, sport, dport);
+                       tftp_print(cp, length);
+                       break;
+
+               case PT_AODV:
+                       udpipaddr_print(ip, sport, dport);
+                       aodv_print((const u_char *)(up + 1), length,
+#ifdef INET6
+                           ip6 != NULL);
+#else
+                           FALSE);
+#endif

                        break;
                }
                return;
                        break;
                }
                return;


@@ -543,7 +539,7 @@ udp_print(register const u_char *bp, u_int length,
 
                rp = (struct rpc_msg *)(up + 1);
                if (TTEST(rp->rm_direction)) {
 
                rp = (struct rpc_msg *)(up + 1);
                if (TTEST(rp->rm_direction)) {

-                       direction = (enum msg_type)ntohl(rp->rm_direction);
+                       direction = (enum msg_type)EXTRACT_32BITS(&rp->rm_direction);

                        if (dport == NFS_PORT && direction == CALL) {
                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);
                        if (dport == NFS_PORT && direction == CALL) {
                                nfsreq_print((u_char *)rp, length,
                                    (u_char *)ip);


@@ -570,49 +566,18 @@ udp_print(register const u_char *bp, u_int length,
                        return;
                }
        }
                        return;
                }
        }

-#if 0
-       (void)printf("%s.%s > %s.%s:",
-               ipaddr_string(&ip->ip_src), udpport_string(sport),
-               ipaddr_string(&ip->ip_dst), udpport_string(dport));
-#else
-#ifdef INET6
-       if (ip6) {
-               if (ip6->ip6_nxt == IPPROTO_UDP) {
-                       (void)printf("%s.%s > %s.%s: ",
-                               ip6addr_string(&ip6->ip6_src),
-                               udpport_string(sport),
-                               ip6addr_string(&ip6->ip6_dst),
-                               udpport_string(dport));
-               } else {
-                       (void)printf("%s > %s: ",
-                               udpport_string(sport), udpport_string(dport));
-               }
-       } else
-#endif /*INET6*/
-       {
-               if (ip->ip_p == IPPROTO_UDP) {
-                       (void)printf("%s.%s > %s.%s: ",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
-               } else {
-                       (void)printf("%s > %s: ",
-                               udpport_string(sport), udpport_string(dport));
-               }
-       }
-#endif
+       udpipaddr_print(ip, sport, dport);

 
        if (IP_V(ip) == 4 && vflag && !fragmented) {
                int sum = up->uh_sum;
                if (sum == 0) {
 
        if (IP_V(ip) == 4 && vflag && !fragmented) {
                int sum = up->uh_sum;
                if (sum == 0) {

-                       (void)printf(" [no cksum]");
+                       (void)printf("[no cksum] ");

                } else if (TTEST2(cp[0], length)) {
                } else if (TTEST2(cp[0], length)) {

-                       sum = udp_cksum(ip, up, length);
+                       sum = udp_cksum(ip, up, length + sizeof(struct udphdr));

                        if (sum != 0)
                        if (sum != 0)

-                               (void)printf(" [bad udp cksum %x!]", sum);
+                               (void)printf("[bad udp cksum %x!] ", sum);

                        else
                        else

-                               (void)printf(" [udp sum ok]");
+                               (void)printf("[udp sum ok] ");

                }
        }
 #ifdef INET6
                }
        }
 #ifdef INET6


@@ -620,11 +585,11 @@ udp_print(register const u_char *bp, u_int length,
                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)
                        if (sum != 0)

-                               (void)printf(" [bad udp cksum %x!]", sum);
+                               (void)printf("[bad udp cksum %x!] ", sum);

                        else
                        else

-                               (void)printf(" [udp sum ok]");
+                               (void)printf("[udp sum ok] ");

                }
        }
 #endif
                }
        }
 #endif


@@ -632,16 +597,24 @@ udp_print(register const u_char *bp, u_int length,
        if (!qflag) {
 #define ISPORT(p) (dport == (p) || sport == (p))
                if (ISPORT(NAMESERVER_PORT))
        if (!qflag) {
 #define ISPORT(p) (dport == (p) || sport == (p))
                if (ISPORT(NAMESERVER_PORT))

-                       ns_print((const u_char *)(up + 1), length);
+                       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))
                else if (ISPORT(TIMED_PORT))

-                       timed_print((const u_char *)(up + 1), length);
+                       timed_print((const u_char *)(up + 1));

                else if (ISPORT(TFTP_PORT))
                        tftp_print((const u_char *)(up + 1), length);
                else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))
                else if (ISPORT(TFTP_PORT))
                        tftp_print((const u_char *)(up + 1), length);
                else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))

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

                else if (ISPORT(RIP_PORT))
                        rip_print((const u_char *)(up + 1), length);
                else if (ISPORT(RIP_PORT))
                        rip_print((const u_char *)(up + 1), length);

+               else if (ISPORT(AODV_PORT))
+                       aodv_print((const u_char *)(up + 1), length,
+#ifdef INET6
+                           ip6 != NULL);
+#else
+                           FALSE);
+#endif

                else if (ISPORT(ISAKMP_PORT))
                        isakmp_print((const u_char *)(up + 1), length, bp2);
 #if 1 /*???*/
                else if (ISPORT(ISAKMP_PORT))
                        isakmp_print((const u_char *)(up + 1), length, bp2);
 #if 1 /*???*/


@@ -653,31 +626,32 @@ udp_print(register const u_char *bp, u_int length,
                else if (ISPORT(NTP_PORT))
                        ntp_print((const u_char *)(up + 1), length);
                else if (ISPORT(KERBEROS_PORT) || ISPORT(KERBEROS_SEC_PORT))
                else if (ISPORT(NTP_PORT))
                        ntp_print((const u_char *)(up + 1), length);
                else if (ISPORT(KERBEROS_PORT) || ISPORT(KERBEROS_SEC_PORT))

-                       krb_print((const void *)(up + 1), length);
+                       krb_print((const void *)(up + 1));

                else if (ISPORT(L2TP_PORT))
                        l2tp_print((const u_char *)(up + 1), length);
                else if (ISPORT(L2TP_PORT))
                        l2tp_print((const u_char *)(up + 1), length);

-               else if (ISPORT(NETBIOS_NS_PORT)) {
+#ifdef TCPDUMP_DO_SMB
+               else if (ISPORT(NETBIOS_NS_PORT))

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

-               }
-               else if (ISPORT(NETBIOS_DGRAM_PORT)) {
-                       nbt_udp138_print((const u_char *)(up + 1), length);
-               }
+               else if (ISPORT(NETBIOS_DGRAM_PORT))
+                       nbt_udp138_print((const u_char *)(up + 1), length);
+#endif

                else if (dport == 3456)
                else if (dport == 3456)

-                       vat_print((const void *)(up + 1), length, up);
-               /*
-                * Since there are 10 possible ports to check, I think
-                * a <> test would be more efficient
-                */
-               else if ((sport >= RX_PORT_LOW && sport <= RX_PORT_HIGH) ||
-                        (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
-                       rx_print((const void *)(up + 1), length, sport, dport,
-                                (u_char *) ip);
+                       vat_print((const void *)(up + 1), up);
+               else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
+                       zephyr_print((const void *)(up + 1), length);
+               /*
+                * Since there are 10 possible ports to check, I think
+                * a <> test would be more efficient
+                */
+               else if ((sport >= RX_PORT_LOW && sport <= RX_PORT_HIGH) ||
+                        (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
+                       rx_print((const void *)(up + 1), length, sport, dport,
+                                (u_char *) ip);

 #ifdef INET6
                else if (ISPORT(RIPNG_PORT))
                        ripng_print((const u_char *)(up + 1), length);
                else if (ISPORT(DHCP6_SERV_PORT) || ISPORT(DHCP6_CLI_PORT)) {
 #ifdef INET6
                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*/
                /*


@@ -689,15 +663,24 @@ udp_print(register const u_char *bp, u_int length,
                        cisco_autorp_print((const void *)(up + 1), length);
                else if (ISPORT(RADIUS_PORT) ||
                         ISPORT(RADIUS_NEW_PORT) ||
                        cisco_autorp_print((const void *)(up + 1), length);
                else if (ISPORT(RADIUS_PORT) ||
                         ISPORT(RADIUS_NEW_PORT) ||

-                        ISPORT(RADIUS_ACCOUNTING_PORT) || 
+                        ISPORT(RADIUS_ACCOUNTING_PORT) ||

                         ISPORT(RADIUS_NEW_ACCOUNTING_PORT) )
                        radius_print((const u_char *)(up+1), length);
                         ISPORT(RADIUS_NEW_ACCOUNTING_PORT) )
                        radius_print((const u_char *)(up+1), length);

+               else if (dport == HSRP_PORT)
+                       hsrp_print((const u_char *)(up + 1), length);

                else if (ISPORT(LWRES_PORT))
                        lwres_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))
+                       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 (dport == BFD_CONTROL_PORT ||
+                        dport == BFD_ECHO_PORT )
+                       bfd_print((const u_char *)(up+1), length, dport);

                else
                else

-                       (void)printf(" udp %u",
+                       (void)printf("UDP, length: %u",

                            (u_int32_t)(ulen - sizeof(*up)));
 #undef ISPORT
        } else
                            (u_int32_t)(ulen - sizeof(*up)));
 #undef ISPORT
        } else

-               (void)printf(" udp %u", (u_int32_t)(ulen - sizeof(*up)));
+               (void)printf("UDP, length: %u", (u_int32_t)(ulen - sizeof(*up)));

 }
 }