CMake: Fix the comment about versions. [skip ci]

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 3a8d10002de72086bdcb3063b5d59ec7edfccd10..26371f040119901a0df3995fec9d9fb7bf305822 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -19,26 +19,13 @@
  * 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-udp.c,v 1.135 2004-12-27 00:41:32 guy Exp $ (LBL)";
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: UDP printer */

 
 

-#include <tcpdump-stdinc.h>
-
-#ifdef SEGSIZE
-#undef SEGSIZE
-#endif
-#include <arpa/tftp.h>
+#include <config.h>

 
 

-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 #include "appletalk.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "appletalk.h"


@@ -46,36 +33,33 @@ static const char rcsid[] _U_ =
 #include "udp.h"
 
 #include "ip.h"
 #include "udp.h"
 
 #include "ip.h"

-#ifdef INET6

 #include "ip6.h"
 #include "ip6.h"

-#endif

 #include "ipproto.h"
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 
 #include "ipproto.h"
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 

-#include "nameser.h"

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

-#include "bootp.h"
+

 
 struct rtcphdr {
 
 struct rtcphdr {

-       u_int16_t rh_flags;     /* T:2 P:1 CNT:5 PT:8 */
-       u_int16_t rh_len;       /* length of message (in words) */
-       u_int32_t rh_ssrc;      /* synchronization src id */
+       nd_uint16_t rh_flags;   /* T:2 P:1 CNT:5 PT:8 */
+       nd_uint16_t rh_len;     /* length of message (in words) */
+       nd_uint32_t rh_ssrc;    /* synchronization src id */

 };
 
 typedef struct {
 };
 
 typedef struct {

-       u_int32_t upper;        /* more significant 32 bits */
-       u_int32_t lower;        /* less significant 32 bits */
+       nd_uint32_t upper;      /* more significant 32 bits */
+       nd_uint32_t lower;      /* less significant 32 bits */

 } ntp64;
 
 /*
  * Sender report.
  */
 struct rtcp_sr {
 } ntp64;
 
 /*
  * Sender report.
  */
 struct rtcp_sr {

-       ntp64 sr_ntp;           /* 64-bit ntp timestamp */
-       u_int32_t sr_ts;        /* reference media timestamp */
-       u_int32_t sr_np;        /* no. packets sent */
-       u_int32_t sr_nb;        /* no. bytes sent */
+       ntp64       sr_ntp;     /* 64-bit ntp timestamp */
+       nd_uint32_t sr_ts;      /* reference media timestamp */
+       nd_uint32_t sr_np;      /* no. packets sent */
+       nd_uint32_t sr_nb;      /* no. bytes sent */

 };
 
 /*
 };
 
 /*


@@ -83,79 +67,102 @@ struct rtcp_sr {
  * Time stamps are middle 32-bits of ntp timestamp.
  */
 struct rtcp_rr {
  * Time stamps are middle 32-bits of ntp timestamp.
  */
 struct rtcp_rr {

-       u_int32_t rr_srcid;     /* sender being reported */
-       u_int32_t rr_nl;        /* no. packets lost */
-       u_int32_t rr_ls;        /* extended last seq number received */
-       u_int32_t rr_dv;        /* jitter (delay variance) */
-       u_int32_t rr_lsr;       /* orig. ts from last rr from this src  */
-       u_int32_t rr_dlsr;      /* time from recpt of last rr to xmit time */
+       nd_uint32_t rr_srcid;   /* sender being reported */
+       nd_uint32_t rr_nl;      /* no. packets lost */
+       nd_uint32_t rr_ls;      /* extended last seq number received */
+       nd_uint32_t rr_dv;      /* jitter (delay variance) */
+       nd_uint32_t rr_lsr;     /* orig. ts from last rr from this src  */
+       nd_uint32_t rr_dlsr;    /* time from recpt of last rr to xmit time */

 };
 
 /*XXX*/
 #define RTCP_PT_SR     200
 #define RTCP_PT_RR     201
 #define RTCP_PT_SDES   202
 };
 
 /*XXX*/
 #define RTCP_PT_SR     200
 #define RTCP_PT_RR     201
 #define RTCP_PT_SDES   202

-#define        RTCP_SDES_CNAME 1
-#define        RTCP_SDES_NAME  2
-#define        RTCP_SDES_EMAIL 3
-#define        RTCP_SDES_PHONE 4
-#define        RTCP_SDES_LOC   5
-#define        RTCP_SDES_TOOL  6
-#define        RTCP_SDES_NOTE  7
-#define        RTCP_SDES_PRIV  8
+#define    RTCP_SDES_CNAME     1
+#define    RTCP_SDES_NAME      2
+#define    RTCP_SDES_EMAIL     3
+#define    RTCP_SDES_PHONE     4
+#define    RTCP_SDES_LOC       5
+#define    RTCP_SDES_TOOL      6
+#define    RTCP_SDES_NOTE      7
+#define    RTCP_SDES_PRIV      8

 #define RTCP_PT_BYE    203
 #define RTCP_PT_APP    204
 
 static void
 #define RTCP_PT_BYE    203
 #define RTCP_PT_APP    204
 
 static void

-vat_print(const void *hdr, register const struct udphdr *up)
+vat_print(netdissect_options *ndo, const u_char *hdr, u_int length)

 {
        /* vat/vt audio */
 {
        /* vat/vt audio */

-       u_int ts = *(u_int16_t *)hdr;
+       u_int ts;
+
+       ndo->ndo_protocol = "vat";
+       if (length < 2) {
+               ND_PRINT("udp/va/vat, length %u < 2", length);
+               return;
+       }
+       ts = GET_BE_U_2(hdr);

        if ((ts & 0xf060) != 0) {
                /* probably vt */
        if ((ts & 0xf060) != 0) {
                /* probably vt */

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

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

-               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),
+               uint32_t i0, i1;
+
+               if (length < 8) {
+                       ND_PRINT("udp/vat, length %u < 8", length);
+                       return;
+               }
+               i0 = GET_BE_U_4(&((const u_int *)hdr)[0]);
+               i1 = GET_BE_U_4(&((const u_int *)hdr)[1]);
+               ND_PRINT("udp/vat %u c%u %u%s",
+                       length - 8,

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

-                       printf(" f%d", (i0 >> 16) & 0x1f);
+                       ND_PRINT(" f%u", (i0 >> 16) & 0x1f);

                if (i0 & 0x3f000000)
                if (i0 & 0x3f000000)

-                       printf(" s%d", (i0 >> 24) & 0x3f);
+                       ND_PRINT(" s%u", (i0 >> 24) & 0x3f);

        }
 }
 
 static void
        }
 }
 
 static void

-rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
+rtp_print(netdissect_options *ndo, const u_char *hdr, u_int len)

 {
        /* rtp v1 or v2 */
 {
        /* rtp v1 or v2 */

-       u_int *ip = (u_int *)hdr;
-       u_int hasopt, hasext, contype, hasmarker;
-       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 u_int *ip = (const u_int *)hdr;
+       u_int hasopt, hasext, contype, hasmarker, dlen;
+       uint32_t i0, i1;

        const char * ptype;
 
        const char * ptype;
 

+       ndo->ndo_protocol = "rtp";
+       if (len < 8) {
+               ND_PRINT("udp/rtp, length %u < 8", len);
+               return;
+       }
+       i0 = GET_BE_U_4(&((const u_int *)hdr)[0]);
+       i1 = GET_BE_U_4(&((const u_int *)hdr)[1]);
+       dlen = len - 8;

        ip += 2;
        len >>= 2;
        len -= 2;
        hasopt = 0;
        hasext = 0;
        if ((i0 >> 30) == 1) {
        ip += 2;
        len >>= 2;
        len -= 2;
        hasopt = 0;
        hasext = 0;
        if ((i0 >> 30) == 1) {

-               /* rtp v1 */
+               /* rtp v1 - draft-ietf-avt-rtp-04 */

                hasopt = i0 & 0x800000;
                contype = (i0 >> 16) & 0x3f;
                hasmarker = i0 & 0x400000;
                ptype = "rtpv1";
        } else {
                hasopt = i0 & 0x800000;
                contype = (i0 >> 16) & 0x3f;
                hasmarker = i0 & 0x400000;
                ptype = "rtpv1";
        } else {

-               /* rtp v2 */
+               /* rtp v2 - RFC 3550 */
+               if (dlen < 4) {
+                       ND_PRINT("udp/rtp, length %u < 12", dlen + 8);
+                       return;
+               }

                hasext = i0 & 0x10000000;
                contype = (i0 >> 16) & 0x7f;
                hasmarker = i0 & 0x800000;
                hasext = i0 & 0x10000000;
                contype = (i0 >> 16) & 0x7f;
                hasmarker = i0 & 0x800000;


@@ -164,7 +171,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",
+       ND_PRINT("udp/%s %u c%u %s%s %u %u",

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


@@ -172,15 +179,15 @@ rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
                hasmarker? "*" : "",
                i0 & 0xffff,
                i1);
                hasmarker? "*" : "",
                i0 & 0xffff,
                i1);

-       if (vflag) {
-               printf(" %u", EXTRACT_32BITS(&((u_int *)hdr)[2]));
+       if (ndo->ndo_vflag) {
+               ND_PRINT(" %u", GET_BE_U_4(&((const u_int *)hdr)[2]));

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

-                               i2 = ip[0];
+                               i2 = GET_BE_U_4(ip);

                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {

-                                       printf(" !opt");
+                                       ND_PRINT(" !opt");

                                        return;
                                }
                                ip += optlen;
                                        return;
                                }
                                ip += optlen;


@@ -189,180 +196,122 @@ rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
                }
                if (hasext) {
                        u_int i2, extlen;
                }
                if (hasext) {
                        u_int i2, extlen;

-                       i2 = ip[0];
+                       i2 = GET_BE_U_4(ip);

                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {

-                               printf(" !ext");
+                               ND_PRINT(" !ext");

                                return;
                        }
                        ip += extlen;
                }
                if (contype == 0x1f) /*XXX H.261 */
                                return;
                        }
                        ip += extlen;
                }
                if (contype == 0x1f) /*XXX H.261 */

-                       printf(" 0x%04x", ip[0] >> 16);
+                       ND_PRINT(" 0x%04x", GET_BE_U_4(ip) >> 16);

        }
 }
 
 static const u_char *
        }
 }
 
 static const u_char *

-rtcp_print(const u_char *hdr, const u_char *ep)
+rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)

 {
        /* rtp v2 control (rtcp) */
 {
        /* rtp v2 control (rtcp) */

-       struct rtcp_rr *rr = 0;
-       struct rtcp_sr *sr;
-       struct rtcphdr *rh = (struct rtcphdr *)hdr;
+       const struct rtcp_rr *rr = 0;
+       const struct rtcp_sr *sr;
+       const struct rtcphdr *rh = (const struct rtcphdr *)hdr;

        u_int len;
        u_int len;

-       u_int16_t flags;
-       int cnt;
+       uint16_t flags;
+       u_int cnt;

        double ts, dts;
        double ts, dts;

-       if ((u_char *)(rh + 1) > ep) {
-               printf(" [|rtcp]");
-               return (ep);
-       }
-       len = (EXTRACT_16BITS(&rh->rh_len) + 1) * 4;
-       flags = EXTRACT_16BITS(&rh->rh_flags);
+
+       ndo->ndo_protocol = "rtcp";
+       if ((const u_char *)(rh + 1) > ep)
+               goto trunc;
+       ND_TCHECK_SIZE(rh);
+       len = (GET_BE_U_2(rh->rh_len) + 1) * 4;
+       flags = GET_BE_U_2(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:

-               sr = (struct rtcp_sr *)(rh + 1);
-               printf(" sr");
+               sr = (const struct rtcp_sr *)(rh + 1);
+               ND_PRINT(" sr");

                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))

-                       printf(" [%d]", len);
-               if (vflag)
-                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));
-               if ((u_char *)(sr + 1) > ep) {
-                       printf(" [|rtcp]");
-                       return (ep);
-               }
-               ts = (double)(EXTRACT_32BITS(&sr->sr_ntp.upper)) +
-                   ((double)(EXTRACT_32BITS(&sr->sr_ntp.lower)) /
-                   4294967296.0);
-               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);
+                       ND_PRINT(" [%u]", len);
+               if (ndo->ndo_vflag)
+                       ND_PRINT(" %u", GET_BE_U_4(rh->rh_ssrc));
+               if ((const u_char *)(sr + 1) > ep)
+                       goto trunc;
+               ND_TCHECK_SIZE(sr);
+               ts = (double)(GET_BE_U_4(sr->sr_ntp.upper)) +
+                   ((double)(GET_BE_U_4(sr->sr_ntp.lower)) /
+                    FMAXINT);
+               ND_PRINT(" @%.2f %u %up %ub", ts, GET_BE_U_4(sr->sr_ts),
+                         GET_BE_U_4(sr->sr_np), GET_BE_U_4(sr->sr_nb));
+               rr = (const struct rtcp_rr *)(sr + 1);

                break;
        case RTCP_PT_RR:
                break;
        case RTCP_PT_RR:

-               printf(" rr");
+               ND_PRINT(" rr");

                if (len != cnt * sizeof(*rr) + sizeof(*rh))
                if (len != cnt * sizeof(*rr) + sizeof(*rh))

-                       printf(" [%d]", len);
-               rr = (struct rtcp_rr *)(rh + 1);
-               if (vflag)
-                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));
+                       ND_PRINT(" [%u]", len);
+               rr = (const struct rtcp_rr *)(rh + 1);
+               if (ndo->ndo_vflag)
+                       ND_PRINT(" %u", GET_BE_U_4(rh->rh_ssrc));

                break;
        case RTCP_PT_SDES:
                break;
        case RTCP_PT_SDES:

-               printf(" sdes %d", len);
-               if (vflag)
-                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));
+               ND_PRINT(" sdes %u", len);
+               if (ndo->ndo_vflag)
+                       ND_PRINT(" %u", GET_BE_U_4(rh->rh_ssrc));

                cnt = 0;
                break;
        case RTCP_PT_BYE:
                cnt = 0;
                break;
        case RTCP_PT_BYE:

-               printf(" bye %d", len);
-               if (vflag)
-                       printf(" %u", EXTRACT_32BITS(&rh->rh_ssrc));
+               ND_PRINT(" bye %u", len);
+               if (ndo->ndo_vflag)
+                       ND_PRINT(" %u", GET_BE_U_4(rh->rh_ssrc));

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

-               printf(" type-0x%x %d", flags & 0xff, len);
+               ND_PRINT(" type-0x%x %u", flags & 0xff, len);

                cnt = 0;
                break;
        }
        if (cnt > 1)
                cnt = 0;
                break;
        }
        if (cnt > 1)

-               printf(" c%d", cnt);
-       while (--cnt >= 0) {
-               if ((u_char *)(rr + 1) > ep) {
-                       printf(" [|rtcp]");
-                       return (ep);
-               }
-               if (vflag)
-                       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",
-                   EXTRACT_32BITS(&rr->rr_nl) & 0x00ffffff,
-                   EXTRACT_32BITS(&rr->rr_ls),
-                   EXTRACT_32BITS(&rr->rr_dv), ts, dts);
+               ND_PRINT(" c%u", cnt);
+       while (cnt != 0) {
+               if ((const u_char *)(rr + 1) > ep)
+                       goto trunc;
+               ND_TCHECK_SIZE(rr);
+               if (ndo->ndo_vflag)
+                       ND_PRINT(" %u", GET_BE_U_4(rr->rr_srcid));
+               ts = (double)(GET_BE_U_4(rr->rr_lsr)) / 65536.;
+               dts = (double)(GET_BE_U_4(rr->rr_dlsr)) / 65536.;
+               ND_PRINT(" %ul %us %uj @%.2f+%.2f",
+                   GET_BE_U_4(rr->rr_nl) & 0x00ffffff,
+                   GET_BE_U_4(rr->rr_ls),
+                   GET_BE_U_4(rr->rr_dv), ts, dts);
+               cnt--;

        }
        return (hdr + len);
        }
        return (hdr + len);

+
+trunc:
+       nd_print_trunc(ndo);
+       return ep;

 }
 
 }
 

-static int udp_cksum(register const struct ip *ip,
-                    register const struct udphdr *up,
-                    register u_int len)
+static uint16_t udp_cksum(netdissect_options *ndo, const struct ip *ip,
+                    const struct udphdr *up,
+                    u_int len)

 {
 {

-       union phu {
-               struct phdr {
-                       u_int32_t src;
-                       u_int32_t dst;
-                       u_char mbz;
-                       u_char proto;
-                       u_int16_t len;
-               } ph;
-               u_int16_t pa[6];
-       } phu;
-       register const u_int16_t *sp;
-
-       /* pseudo-header.. */
-       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));
-       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];
-       return in_cksum((u_short *)up, len,
-                       sp[0]+sp[1]+sp[2]+sp[3]+sp[4]+sp[5]);
+       return nextproto4_cksum(ndo, ip, (const uint8_t *)(const void *)up, len, len,
+                               IPPROTO_UDP);

 }
 
 }
 

-#ifdef INET6
-static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
-       u_int len)
+static uint16_t udp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
+                     const struct udphdr *up, u_int len)

 {
 {

-       size_t i;
-       register const u_int16_t *sp;
-       u_int32_t sum;
-       union {
-               struct {
-                       struct in6_addr ph_src;
-                       struct in6_addr ph_dst;
-                       u_int32_t       ph_len;
-                       u_int8_t        ph_zero[3];
-                       u_int8_t        ph_nxt;
-               } ph;
-               u_int16_t pa[20];
-       } phu;
-
-       /* 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(len);
-       phu.ph.ph_nxt = IPPROTO_UDP;
-
-       sum = 0;
-       for (i = 0; i < sizeof(phu.pa) / sizeof(phu.pa[0]); i++)
-               sum += phu.pa[i];
-
-       sp = (const u_int16_t *)up;
-
-       for (i = 0; i < (len & ~1); i += 2)
-               sum += *sp++;
-
-       if (len & 1)
-               sum += htons((*(const u_int8_t *)sp) << 8);
-
-       while (sum > 0xffff)
-               sum = (sum & 0xffff) + (sum >> 16);
-       sum = ~sum & 0xffff;
-
-       return (sum);
+       return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)up, len, len,
+                               IPPROTO_UDP);

 }
 }

-#endif

 
 static void
 
 static void

-udpipaddr_print(const struct ip *ip, int sport, int dport)
+udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dport)

 {
 {

-#ifdef INET6

        const struct ip6_hdr *ip6;
 
        if (IP_V(ip) == 6)
        const struct ip6_hdr *ip6;
 
        if (IP_V(ip) == 6)


@@ -371,322 +320,423 @@ udpipaddr_print(const struct ip *ip, int sport, int dport)
                ip6 = NULL;
 
        if (ip6) {
                ip6 = NULL;
 
        if (ip6) {

-               if (ip6->ip6_nxt == IPPROTO_UDP) {
+               if (GET_U_1(ip6->ip6_nxt) == IPPROTO_UDP) {

                        if (sport == -1) {
                        if (sport == -1) {

-                               (void)printf("%s > %s: ",
-                                       ip6addr_string(&ip6->ip6_src),
-                                       ip6addr_string(&ip6->ip6_dst));
+                               ND_PRINT("%s > %s: ",
+                                       GET_IP6ADDR_STRING(ip6->ip6_src),
+                                       GET_IP6ADDR_STRING(ip6->ip6_dst));

                        } else {
                        } else {

-                               (void)printf("%s.%s > %s.%s: ",
-                                       ip6addr_string(&ip6->ip6_src),
-                                       udpport_string(sport),
-                                       ip6addr_string(&ip6->ip6_dst),
-                                       udpport_string(dport));
+                               ND_PRINT("%s.%s > %s.%s: ",
+                                       GET_IP6ADDR_STRING(ip6->ip6_src),
+                                       udpport_string(ndo, (uint16_t)sport),
+                                       GET_IP6ADDR_STRING(ip6->ip6_dst),
+                                       udpport_string(ndo, (uint16_t)dport));

                        }
                } else {
                        if (sport != -1) {
                        }
                } else {
                        if (sport != -1) {

-                               (void)printf("%s > %s: ",
-                                       udpport_string(sport),
-                                       udpport_string(dport));
+                               ND_PRINT("%s > %s: ",
+                                       udpport_string(ndo, (uint16_t)sport),
+                                       udpport_string(ndo, (uint16_t)dport));

                        }
                }
                        }
                }

-       } else
-#endif /*INET6*/
-       {
-               if (ip->ip_p == IPPROTO_UDP) {
+       } else {
+               if (GET_U_1(ip->ip_p) == IPPROTO_UDP) {

                        if (sport == -1) {
                        if (sport == -1) {

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

                        } else {
                        } else {

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

                        }
                } else {
                        if (sport != -1) {
                        }
                } else {
                        if (sport != -1) {

-                               (void)printf("%s > %s: ",
-                                       udpport_string(sport),
-                                       udpport_string(dport));
+                               ND_PRINT("%s > %s: ",
+                                       udpport_string(ndo, (uint16_t)sport),
+                                       udpport_string(ndo, (uint16_t)dport));

                        }
                }
        }
 }
 
 void
                        }
                }
        }
 }
 
 void

-udp_print(register const u_char *bp, u_int length,
-         register const u_char *bp2, int fragmented)
+udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
+         const u_char *bp2, int fragmented, u_int ttl_hl)

 {
 {

-       register const struct udphdr *up;
-       register const struct ip *ip;
-       register const u_char *cp;
-       register const u_char *ep = bp + length;
-       u_int16_t sport, dport, ulen;
-#ifdef INET6
-       register const struct ip6_hdr *ip6;
-#endif
+       const struct udphdr *up;
+       const struct ip *ip;
+       const u_char *cp;
+       const u_char *ep = ndo->ndo_snapend;
+       uint16_t sport, dport;
+       u_int ulen;
+       const struct ip6_hdr *ip6;

 
 

-       if (ep > snapend)
-               ep = snapend;
-       up = (struct udphdr *)bp;
-       ip = (struct ip *)bp2;
-#ifdef INET6
+       ndo->ndo_protocol = "udp";
+       up = (const struct udphdr *)bp;
+       ip = (const struct ip *)bp2;

        if (IP_V(ip) == 6)
        if (IP_V(ip) == 6)

-               ip6 = (struct ip6_hdr *)bp2;
+               ip6 = (const struct ip6_hdr *)bp2;

        else
                ip6 = NULL;
        else
                ip6 = NULL;

-#endif /*INET6*/
-       cp = (u_char *)(up + 1);
-       if (!TTEST(up->uh_dport)) {
-               udpipaddr_print(ip, -1, -1);
-               (void)printf("[|udp]");
-               return;
+       if (!ND_TTEST_2(up->uh_dport)) {
+               udpipaddr_print(ndo, ip, -1, -1);
+               goto trunc;

        }
 
        }
 

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

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

-               udpipaddr_print(ip, sport, dport);
-               (void)printf("truncated-udp %d", length);
+               udpipaddr_print(ndo, ip, sport, dport);
+               ND_PRINT("truncated-udp %u", length);

                return;
        }
                return;
        }

-       length -= sizeof(struct udphdr);
-
-       if (cp > snapend) {
-               udpipaddr_print(ip, sport, dport);
-               (void)printf("[|udp]");
+       if (!ND_TTEST_2(up->uh_ulen)) {
+               udpipaddr_print(ndo, ip, sport, dport);
+               goto trunc;
+       }
+       ulen = GET_BE_U_2(up->uh_ulen);
+       /*
+        * IPv6 Jumbo Datagrams; see RFC 2675.
+        * If the length is zero, and the length provided to us is
+        * > 65535, use the provided length as the length.
+        */
+       if (ulen == 0 && length > 65535)
+               ulen = length;
+       if (ulen < sizeof(struct udphdr)) {
+               udpipaddr_print(ndo, ip, sport, dport);
+               ND_PRINT("truncated-udplength %u", 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) {
-               udpipaddr_print(ip, sport, dport);
-               (void)printf("truncated-udplength %d", ulen);
-               return;
+       cp = (const u_char *)(up + 1);
+       if (cp > ndo->ndo_snapend) {
+               udpipaddr_print(ndo, ip, sport, dport);
+               goto trunc;

        }
        }

-       if (packettype) {
-               register struct sunrpc_msg *rp;
+
+       if (ndo->ndo_packettype) {
+               const struct sunrpc_msg *rp;

                enum sunrpc_msg_type direction;
 
                enum sunrpc_msg_type direction;
 

-               switch (packettype) {
+               switch (ndo->ndo_packettype) {

 
                case PT_VAT:
 
                case PT_VAT:

-                       udpipaddr_print(ip, sport, dport);
-                       vat_print((void *)(up + 1), up);
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       vat_print(ndo, cp, length);

                        break;
 
                case PT_WB:
                        break;
 
                case PT_WB:

-                       udpipaddr_print(ip, sport, dport);
-                       wb_print((void *)(up + 1), length);
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       wb_print(ndo, cp, length);

                        break;
 
                case PT_RPC:
                        break;
 
                case PT_RPC:

-                       rp = (struct sunrpc_msg *)(up + 1);
-                       direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+                       rp = (const struct sunrpc_msg *)cp;
+                       direction = (enum sunrpc_msg_type) GET_BE_U_4(rp->rm_direction);

                        if (direction == SUNRPC_CALL)
                        if (direction == SUNRPC_CALL)

-                               sunrpcrequest_print((u_char *)rp, length,
-                                   (u_char *)ip);
+                               sunrpc_print(ndo, (const u_char *)rp, length,
+                                   (const u_char *)ip);

                        else
                        else

-                               nfsreply_print((u_char *)rp, length,
-                                   (u_char *)ip);                      /*XXX*/
+                               nfsreply_print(ndo, (const u_char *)rp, length,
+                                   (const u_char *)ip);                        /*XXX*/

                        break;
 
                case PT_RTP:
                        break;
 
                case PT_RTP:

-                       udpipaddr_print(ip, sport, dport);
-                       rtp_print((void *)(up + 1), length, up);
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       rtp_print(ndo, cp, length);

                        break;
 
                case PT_RTCP:
                        break;
 
                case PT_RTCP:

-                       udpipaddr_print(ip, sport, dport);
+                       udpipaddr_print(ndo, ip, sport, dport);

                        while (cp < ep)
                        while (cp < ep)

-                               cp = rtcp_print(cp, ep);
+                               cp = rtcp_print(ndo, cp, ep);

                        break;
 
                case PT_SNMP:
                        break;
 
                case PT_SNMP:

-                       udpipaddr_print(ip, sport, dport);
-                       snmp_print((const u_char *)(up + 1), length);
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       snmp_print(ndo, cp, length);

                        break;
 
                case PT_CNFP:
                        break;
 
                case PT_CNFP:

-                       udpipaddr_print(ip, sport, dport);
-                       cnfp_print(cp, (const u_char *)ip);
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       cnfp_print(ndo, cp);

                        break;
 
                case PT_TFTP:
                        break;
 
                case PT_TFTP:

-                       udpipaddr_print(ip, sport, dport);
-                       tftp_print(cp, length);
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       tftp_print(ndo, cp, length);

                        break;
 
                case PT_AODV:
                        break;
 
                case PT_AODV:

-                       udpipaddr_print(ip, sport, dport);
-                       aodv_print((const u_char *)(up + 1), length,
-#ifdef INET6
-                           ip6 != NULL);
-#else
-                           FALSE);
-#endif
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       aodv_print(ndo, cp, length, IP_V(ip) == 6);
+                       break;
+
+               case PT_RADIUS:
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       radius_print(ndo, cp, length);
+                       break;
+
+               case PT_VXLAN:
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       vxlan_print(ndo, cp, length);
+                       break;
+
+               case PT_PGM:
+               case PT_PGM_ZMTP1:
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       pgm_print(ndo, cp, length, bp2);
+                       break;
+               case PT_LMP:
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       lmp_print(ndo, cp, length);
+                       break;
+               case PT_PTP:
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       ptp_print(ndo, cp, length);
+                       break;
+               case PT_SOMEIP:
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       someip_print(ndo, cp, length);
+                       break;
+               case PT_DOMAIN:
+                       udpipaddr_print(ndo, ip, sport, dport);
+                       /* over_tcp: FALSE, is_mdns: FALSE */
+                       domain_print(ndo, cp, length, FALSE, FALSE);

                        break;
                }
                return;
        }
 
                        break;
                }
                return;
        }
 

-       if (!qflag) {
-               register struct sunrpc_msg *rp;
+       udpipaddr_print(ndo, ip, sport, dport);
+       if (!ndo->ndo_qflag) {
+               const struct sunrpc_msg *rp;

                enum sunrpc_msg_type direction;
 
                enum sunrpc_msg_type direction;
 

-               rp = (struct sunrpc_msg *)(up + 1);
-               if (TTEST(rp->rm_direction)) {
-                       direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+               rp = (const struct sunrpc_msg *)cp;
+               if (ND_TTEST_4(rp->rm_direction)) {
+                       direction = (enum sunrpc_msg_type) GET_BE_U_4(rp->rm_direction);

                        if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                        if (dport == NFS_PORT && direction == SUNRPC_CALL) {

-                               nfsreq_print((u_char *)rp, length,
-                                   (u_char *)ip);
+                               ND_PRINT("NFS request xid %u ",
+                                        GET_BE_U_4(rp->rm_xid));
+                               nfsreq_noaddr_print(ndo, (const u_char *)rp, length,
+                                   (const u_char *)ip);

                                return;
                        }
                        if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                return;
                        }
                        if (sport == NFS_PORT && direction == SUNRPC_REPLY) {

-                               nfsreply_print((u_char *)rp, length,
-                                   (u_char *)ip);
+                               ND_PRINT("NFS reply xid %u ",
+                                        GET_BE_U_4(rp->rm_xid));
+                               nfsreply_noaddr_print(ndo, (const u_char *)rp, length,
+                                   (const u_char *)ip);

                                return;
                        }
 #ifdef notdef
                        if (dport == SUNRPC_PORT && direction == SUNRPC_CALL) {
                                return;
                        }
 #ifdef notdef
                        if (dport == SUNRPC_PORT && direction == SUNRPC_CALL) {

-                               sunrpcrequest_print((u_char *)rp, length, (u_char *)ip);
+                               sunrpc_print((const u_char *)rp, length, (const u_char *)ip);

                                return;
                        }
 #endif
                }
                                return;
                        }
 #endif
                }

-               if (TTEST(((struct LAP *)cp)->type) &&
-                   ((struct LAP *)cp)->type == lapDDP &&
-                   (atalk_port(sport) || atalk_port(dport))) {
-                       if (vflag)
-                               fputs("kip ", stdout);
-                       llap_print(cp, length);
-                       return;
-               }
-       }
-       udpipaddr_print(ip, sport, dport);
-
-       if (IP_V(ip) == 4 && (vflag > 1) && !fragmented) {
-               int sum = up->uh_sum;
-               if (sum == 0) {
-                       (void)printf("[no cksum] ");
-               } else if (TTEST2(cp[0], length)) {
-                       sum = udp_cksum(ip, up, length + sizeof(struct udphdr));
-                       if (sum != 0)
-                               (void)printf("[bad udp cksum %x!] ", sum);
-                       else
-                               (void)printf("[udp sum ok] ");
-               }

        }
        }

-#ifdef INET6
-       if (IP_V(ip) == 6 && ip6->ip6_plen && vflag && !fragmented) {
-               int sum = up->uh_sum;
-               /* for IPv6, UDP checksum is mandatory */
-               if (TTEST2(cp[0], length)) {
-                       sum = udp6_cksum(ip6, up, length + sizeof(struct udphdr));
-                       if (sum != 0)
-                               (void)printf("[bad udp cksum %x!] ", sum);
-                       else
-                               (void)printf("[udp sum ok] ");
+
+       if (ndo->ndo_vflag && !ndo->ndo_Kflag && !fragmented) {
+               /* Check the checksum, if possible. */
+               uint16_t sum, udp_sum;
+
+               /*
+                * XXX - do this even if vflag == 1?
+                * TCP does, and we do so for UDP-over-IPv6.
+                */
+               if (IP_V(ip) == 4 && (ndo->ndo_vflag > 1)) {
+                       udp_sum = GET_BE_U_2(up->uh_sum);
+                       if (udp_sum == 0) {
+                               ND_PRINT("[no cksum] ");
+                       } else if (ND_TTEST_LEN(cp, length)) {
+                               sum = udp_cksum(ndo, ip, up, length + sizeof(struct udphdr));
+
+                               if (sum != 0) {
+                                       ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
+                                           udp_sum,
+                                           in_cksum_shouldbe(udp_sum, sum));
+                               } else
+                                       ND_PRINT("[udp sum ok] ");
+                       }
+               } else if (IP_V(ip) == 6) {
+                       /* for IPv6, UDP checksum is mandatory */
+                       if (ND_TTEST_LEN(cp, length)) {
+                               sum = udp6_cksum(ndo, ip6, up, length + sizeof(struct udphdr));
+                               udp_sum = GET_BE_U_2(up->uh_sum);
+
+                               if (sum != 0) {
+                                       ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
+                                           udp_sum,
+                                           in_cksum_shouldbe(udp_sum, sum));
+                               } else
+                                       ND_PRINT("[udp sum ok] ");
+                       }

                }
        }
                }
        }

-#endif

 
 

-       if (!qflag) {
-#define ISPORT(p) (dport == (p) || sport == (p))
-               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))
-                       tftp_print((const u_char *)(up + 1), length);
-               else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))
-                       bootp_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);
+       if (!ndo->ndo_qflag) {
+               if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT))
+                       /* over_tcp: FALSE, is_mdns: FALSE */
+                       domain_print(ndo, cp, length, FALSE, FALSE);
+               else if (IS_SRC_OR_DST_PORT(BOOTPC_PORT) ||
+                        IS_SRC_OR_DST_PORT(BOOTPS_PORT))
+                       bootp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(TFTP_PORT))
+                       tftp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(KERBEROS_PORT))
+                       krb_print(ndo, (const u_char *)cp);
+               else if (IS_SRC_OR_DST_PORT(NTP_PORT))
+                       ntp_print(ndo, cp, length);
+#ifdef ENABLE_SMB
+               else if (IS_SRC_OR_DST_PORT(NETBIOS_NS_PORT))
+                       nbt_udp137_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(NETBIOS_DGRAM_PORT))
+                       nbt_udp138_print(ndo, cp, length);

 #endif
 #endif

-               else if (ISPORT(ISAKMP_PORT))
-                       isakmp_print((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);
-#endif
-               else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
-                       snmp_print((const u_char *)(up + 1), length);
-               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));
-               else if (ISPORT(L2TP_PORT))
-                       l2tp_print((const u_char *)(up + 1), length);
-#ifdef TCPDUMP_DO_SMB
-               else if (ISPORT(NETBIOS_NS_PORT))
-                       nbt_udp137_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)
-                       vat_print((const void *)(up + 1), up);
-               else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
-                       zephyr_print((const void *)(up + 1), length);
+               else if (IS_SRC_OR_DST_PORT(SNMP_PORT) ||
+                        IS_SRC_OR_DST_PORT(SNMPTRAP_PORT))
+                       snmp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(PTP_EVENT_PORT) ||
+                        IS_SRC_OR_DST_PORT(PTP_GENERAL_PORT))
+                       ptp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))
+                       cisco_autorp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT))
+                        isakmp_print(ndo, cp, length, bp2);
+               else if (IS_SRC_OR_DST_PORT(SYSLOG_PORT))
+                       syslog_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(RIP_PORT))
+                       rip_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
+                       ripng_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(TIMED_PORT))
+                       timed_print(ndo, (const u_char *)cp);
+               else if (IS_SRC_OR_DST_PORT(DHCP6_SERV_PORT) ||
+                        IS_SRC_OR_DST_PORT(DHCP6_CLI_PORT))
+                       dhcp6_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(LDP_PORT))
+                       ldp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(AODV_PORT))
+                       aodv_print(ndo, cp, length, IP_V(ip) == 6);
+               else if (IS_SRC_OR_DST_PORT(OLSR_PORT))
+                       olsr_print(ndo, cp, length, IP_V(ip) == 6);
+               else if (IS_SRC_OR_DST_PORT(LMP_PORT))
+                       lmp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(KERBEROS_SEC_PORT))
+                       krb_print(ndo, (const u_char *)cp);
+               else if (IS_SRC_OR_DST_PORT(LWRES_PORT))
+                       lwres_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(MULTICASTDNS_PORT))
+                       /* over_tcp: FALSE, is_mdns: TRUE */
+                       domain_print(ndo, cp, length, FALSE, TRUE);
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_NATT))
+                        isakmp_rfc3948_print(ndo, cp, length, bp2, IP_V(ip), fragmented, ttl_hl);
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER1) || IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER2))
+                       isakmp_print(ndo, cp, length, bp2);
+               else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
+                       l2tp_print(ndo, cp, length);
+               else if (dport == VAT_PORT)
+                       vat_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(ZEPHYR_SRV_PORT) || IS_SRC_OR_DST_PORT(ZEPHYR_CLT_PORT))
+                       zephyr_print(ndo, cp, 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))
                /*
                 * 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)) {
-                       dhcp6_print((const u_char *)(up + 1), length);
-               }
-#endif /*INET6*/
+                       rx_print(ndo, cp, length, sport, dport,
+                                (const u_char *) ip);
+               else if (IS_SRC_OR_DST_PORT(AHCP_PORT))
+                       ahcp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(BABEL_PORT) || IS_SRC_OR_DST_PORT(BABEL_PORT_OLD))
+                       babel_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(HNCP_PORT))
+                       hncp_print(ndo, cp, length);

                /*
                 * Kludge in test for whiteboard packets.
                 */
                /*
                 * Kludge in test for whiteboard packets.
                 */

-               else if (dport == 4567)
-                       wb_print((const void *)(up + 1), length);
-               else if (ISPORT(CISCO_AUTORP_PORT))
-                       cisco_autorp_print((const void *)(up + 1), length);
-               else if (ISPORT(RADIUS_PORT) ||
-                        ISPORT(RADIUS_NEW_PORT) ||
-                        ISPORT(RADIUS_ACCOUNTING_PORT) ||
-                        ISPORT(RADIUS_NEW_ACCOUNTING_PORT) )
-                       radius_print((const u_char *)(up+1), length);
+               else if (dport == WB_PORT)
+                       wb_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(RADIUS_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_NEW_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_ACCOUNTING_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_NEW_ACCOUNTING_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_CISCO_COA_PORT) ||
+                        IS_SRC_OR_DST_PORT(RADIUS_COA_PORT) )
+                       radius_print(ndo, cp, length);

                else if (dport == HSRP_PORT)
                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(LDP_PORT))
-                       ldp_print((const u_char *)(up + 1), length);
-                else if (ISPORT(MPLS_LSP_PING_PORT))
-                       lspping_print((const u_char *)(up + 1), length);
+                       hsrp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(MPLS_LSP_PING_PORT))
+                       lspping_print(ndo, cp, length);

                else if (dport == BFD_CONTROL_PORT ||
                else if (dport == BFD_CONTROL_PORT ||

+                        dport == BFD_MULTIHOP_PORT ||
+                        dport == BFD_LAG_PORT ||

                         dport == BFD_ECHO_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(SIP_PORT))
-                       sip_print((const u_char *)(up + 1), length);
-                else if (ISPORT(SYSLOG_PORT))
-                       syslog_print((const u_char *)(up + 1), length);
+                       bfd_print(ndo, cp, length, dport);
+               else if (IS_SRC_OR_DST_PORT(VQP_PORT))
+                       vqp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(SFLOW_PORT))
+                       sflow_print(ndo, cp, length);
+               else if (dport == LWAPP_CONTROL_PORT)
+                       lwapp_control_print(ndo, cp, length, 1);
+               else if (sport == LWAPP_CONTROL_PORT)
+                       lwapp_control_print(ndo, cp, length, 0);
+               else if (IS_SRC_OR_DST_PORT(LWAPP_DATA_PORT))
+                       lwapp_data_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(SIP_PORT))
+                       sip_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(OTV_PORT))
+                       otv_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(VXLAN_PORT))
+                       vxlan_print(ndo, cp, length);
+               else if (dport == GENEVE_PORT)
+                       geneve_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(LISP_CONTROL_PORT))
+                       lisp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(VXLAN_GPE_PORT))
+                       vxlan_gpe_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(ZEP_PORT))
+                       zep_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(MPLS_PORT))
+                       mpls_print(ndo, cp, length);
+               else if (ND_TTEST_1(((const struct LAP *)cp)->type) &&
+                        GET_U_1(((const struct LAP *)cp)->type) == lapDDP &&
+                        (atalk_port(sport) || atalk_port(dport))) {
+                       if (ndo->ndo_vflag)
+                               ND_PRINT("kip ");
+                       llap_print(ndo, cp, length);
+               } else if (IS_SRC_OR_DST_PORT(SOMEIP_PORT))
+                       someip_print(ndo, cp, length);
+               else if (sport == BCM_LI_PORT)
+                       bcm_li_print(ndo, cp, length);
+               else {
+                       if (ulen > length && !fragmented)
+                               ND_PRINT("UDP, bad length %u > %u",
+                                   ulen, length);
+                       else
+                               ND_PRINT("UDP, length %u", ulen);
+               }
+       } else {
+               if (ulen > length && !fragmented)
+                       ND_PRINT("UDP, bad length %u > %u",
+                           ulen, length);

                else
                else

-                       (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)));
+                       ND_PRINT("UDP, length %u", ulen);
+       }
+       return;
+
+trunc:
+       nd_print_trunc(ndo);

 }
 }