]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-udp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
On Solaris, for 64-bit builds, use the 64-bit pcap-config.
[tcpdump] / print-udp.c
diff --git a/print-udp.c b/print-udp.c
index d3af575ca199fb21213a57e98060f4a12aa88ad3..4fb0a59170e95e3b8040163d29c46a1619b82732 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -22,10 +22,10 @@
 /* \summary: UDP printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: UDP printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -42,30 +42,26 @@
 
 #include "nfs.h"
 
 
 #include "nfs.h"
 
-static const char vat_tstr[] = " [|vat]";
-static const char rtp_tstr[] = " [|rtp]";
-static const char rtcp_tstr[] = " [|rtcp]";
-static const char udp_tstr[] = " [|udp]";
 
 struct rtcphdr {
 
 struct rtcphdr {
-       uint16_t rh_flags;      /* T:2 P:1 CNT:5 PT:8 */
-       uint16_t rh_len;        /* length of message (in words) */
-       uint32_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 {
-       uint32_t upper; /* more significant 32 bits */
-       uint32_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 */
-       uint32_t sr_ts; /* reference media timestamp */
-       uint32_t sr_np; /* no. packets sent */
-       uint32_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 */
 };
 
 /*
 };
 
 /*
@@ -73,12 +69,12 @@ 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 {
-       uint32_t rr_srcid;      /* sender being reported */
-       uint32_t rr_nl; /* no. packets lost */
-       uint32_t rr_ls; /* extended last seq number received */
-       uint32_t rr_dv; /* jitter (delay variance) */
-       uint32_t rr_lsr;        /* orig. ts from last rr from this src  */
-       uint32_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*/
 };
 
 /*XXX*/
@@ -97,46 +93,46 @@ struct rtcp_rr {
 #define RTCP_PT_APP    204
 
 static void
 #define RTCP_PT_APP    204
 
 static void
-vat_print(netdissect_options *ndo, const void *hdr, register const struct udphdr *up)
+vat_print(netdissect_options *ndo, const u_char *hdr, u_int length)
 {
        /* vat/vt audio */
        u_int ts;
 
 {
        /* vat/vt audio */
        u_int ts;
 
-       ND_TCHECK_16BITS((const u_int *)hdr);
-       ts = EXTRACT_BE_16BITS(hdr);
+       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 */
-               ND_TCHECK_16BITS(&up->uh_ulen);
-               ND_PRINT((ndo, "udp/vt %u %d / %d",
-                            (uint32_t)(EXTRACT_BE_16BITS(&up->uh_ulen) - sizeof(*up)),
-                            ts & 0x3ff, ts >> 10));
+               ND_PRINT("udp/vt %u %u / %u",
+                            length,
+                            ts & 0x3ff, ts >> 10);
        } else {
                /* probably vat */
                uint32_t i0, i1;
 
        } else {
                /* probably vat */
                uint32_t i0, i1;
 
-               ND_TCHECK_32BITS(&((const u_int *)hdr)[0]);
-               i0 = EXTRACT_BE_32BITS(&((const u_int *)hdr)[0]);
-               ND_TCHECK_32BITS(&((const u_int *)hdr)[1]);
-               i1 = EXTRACT_BE_32BITS(&((const u_int *)hdr)[1]);
-               ND_TCHECK_16BITS(&up->uh_ulen);
-               ND_PRINT((ndo, "udp/vat %u c%d %u%s",
-                       (uint32_t)(EXTRACT_BE_16BITS(&up->uh_ulen) - sizeof(*up) - 8),
+               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,
                        i0 & 0xffff,
-                       i1, i0 & 0x800000? "*" : ""));
+                       i1, i0 & 0x800000? "*" : "");
                /* audio format */
                if (i0 & 0x1f0000)
                /* audio format */
                if (i0 & 0x1f0000)
-                       ND_PRINT((ndo, " f%d", (i0 >> 16) & 0x1f));
+                       ND_PRINT(" f%u", (i0 >> 16) & 0x1f);
                if (i0 & 0x3f000000)
                if (i0 & 0x3f000000)
-                       ND_PRINT((ndo, " s%d", (i0 >> 24) & 0x3f));
+                       ND_PRINT(" s%u", (i0 >> 24) & 0x3f);
        }
        }
-
-trunc:
-       ND_PRINT((ndo, "%s", vat_tstr));
 }
 
 static void
 }
 
 static void
-rtp_print(netdissect_options *ndo, 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 */
        const u_int *ip = (const u_int *)hdr;
 {
        /* rtp v1 or v2 */
        const u_int *ip = (const u_int *)hdr;
@@ -144,12 +140,14 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
        uint32_t i0, i1;
        const char * ptype;
 
        uint32_t i0, i1;
        const char * ptype;
 
-       ND_TCHECK_32BITS(&((const u_int *)hdr)[0]);
-       i0 = EXTRACT_BE_32BITS(&((const u_int *)hdr)[0]);
-       ND_TCHECK_32BITS(&((const u_int *)hdr)[1]);
-       i1 = EXTRACT_BE_32BITS(&((const u_int *)hdr)[1]);
-       ND_TCHECK_16BITS(&up->uh_ulen);
-       dlen = EXTRACT_BE_16BITS(&up->uh_ulen) - sizeof(*up) - 8;
+       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;
        ip += 2;
        len >>= 2;
        len -= 2;
@@ -163,6 +161,10 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                ptype = "rtpv1";
        } else {
                /* rtp v2 - RFC 3550 */
                ptype = "rtpv1";
        } else {
                /* 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;
@@ -171,25 +173,23 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                ip += 1;
                len -= 1;
        }
                ip += 1;
                len -= 1;
        }
-       ND_PRINT((ndo, "udp/%s %d c%d %s%s %d %u",
+       ND_PRINT("udp/%s %u c%u %s%s %u %u",
                ptype,
                dlen,
                contype,
                (hasopt || hasext)? "+" : "",
                hasmarker? "*" : "",
                i0 & 0xffff,
                ptype,
                dlen,
                contype,
                (hasopt || hasext)? "+" : "",
                hasmarker? "*" : "",
                i0 & 0xffff,
-               i1));
+               i1);
        if (ndo->ndo_vflag) {
        if (ndo->ndo_vflag) {
-               ND_TCHECK_32BITS(&((const u_int *)hdr)[2]);
-               ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(&((const u_int *)hdr)[2])));
+               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 {
-                               ND_TCHECK_32BITS(ip);
-                               i2 = EXTRACT_BE_32BITS(ip);
+                               i2 = GET_BE_U_4(ip);
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
-                                       ND_PRINT((ndo, " !opt"));
+                                       ND_PRINT(" !opt");
                                        return;
                                }
                                ip += optlen;
                                        return;
                                }
                                ip += optlen;
@@ -198,26 +198,21 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                }
                if (hasext) {
                        u_int i2, extlen;
                }
                if (hasext) {
                        u_int i2, extlen;
-                       ND_TCHECK_32BITS(ip);
-                       i2 = EXTRACT_BE_32BITS(ip);
+                       i2 = GET_BE_U_4(ip);
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
-                               ND_PRINT((ndo, " !ext"));
+                               ND_PRINT(" !ext");
                                return;
                        }
                        ip += extlen;
                }
                                return;
                        }
                        ip += extlen;
                }
-               ND_TCHECK_32BITS(ip);
                if (contype == 0x1f) /*XXX H.261 */
                if (contype == 0x1f) /*XXX H.261 */
-                       ND_PRINT((ndo, " 0x%04x", EXTRACT_BE_32BITS(ip) >> 16));
+                       ND_PRINT(" 0x%04x", GET_BE_U_4(ip) >> 16);
        }
        }
-
-trunc:
-       ND_PRINT((ndo, "%s", rtp_tstr));
 }
 
 static const u_char *
 }
 
 static const u_char *
-rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
+rtcp_print(netdissect_options *ndo, const u_char *hdr)
 {
        /* rtp v2 control (rtcp) */
        const struct rtcp_rr *rr = 0;
 {
        /* rtp v2 control (rtcp) */
        const struct rtcp_rr *rr = 0;
@@ -225,88 +220,80 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
        const struct rtcphdr *rh = (const struct rtcphdr *)hdr;
        u_int len;
        uint16_t flags;
        const struct rtcphdr *rh = (const struct rtcphdr *)hdr;
        u_int len;
        uint16_t flags;
-       int cnt;
+       uint32_t ssrc;
+       u_int cnt;
        double ts, dts;
        double ts, dts;
-       if ((const u_char *)(rh + 1) > ep)
-               goto trunc;
-       ND_TCHECK(*rh);
-       len = (EXTRACT_BE_16BITS(&rh->rh_len) + 1) * 4;
-       flags = EXTRACT_BE_16BITS(&rh->rh_flags);
+
+       ndo->ndo_protocol = "rtcp";
+       len = (GET_BE_U_2(rh->rh_len) + 1) * 4;
+       flags = GET_BE_U_2(rh->rh_flags);
        cnt = (flags >> 8) & 0x1f;
        cnt = (flags >> 8) & 0x1f;
+       ssrc = GET_BE_U_4(rh->rh_ssrc);
        switch (flags & 0xff) {
        case RTCP_PT_SR:
                sr = (const struct rtcp_sr *)(rh + 1);
        switch (flags & 0xff) {
        case RTCP_PT_SR:
                sr = (const struct rtcp_sr *)(rh + 1);
-               ND_PRINT((ndo, " sr"));
+               ND_PRINT(" sr");
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
-                       ND_PRINT((ndo, " [%d]", len));
+                       ND_PRINT(" [%u]", len);
                if (ndo->ndo_vflag)
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(&rh->rh_ssrc)));
-               if ((const u_char *)(sr + 1) > ep)
-                       goto trunc;
-               ND_TCHECK(*sr);
-               ts = (double)(EXTRACT_BE_32BITS(&sr->sr_ntp.upper)) +
-                   ((double)(EXTRACT_BE_32BITS(&sr->sr_ntp.lower)) /
-                    4294967296.0);
-               ND_PRINT((ndo, " @%.2f %u %up %ub", ts, EXTRACT_BE_32BITS(&sr->sr_ts),
-                         EXTRACT_BE_32BITS(&sr->sr_np), EXTRACT_BE_32BITS(&sr->sr_nb)));
+                       ND_PRINT(" %u", ssrc);
+               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:
                rr = (const struct rtcp_rr *)(sr + 1);
                break;
        case RTCP_PT_RR:
-               ND_PRINT((ndo, " rr"));
+               ND_PRINT(" rr");
                if (len != cnt * sizeof(*rr) + sizeof(*rh))
                if (len != cnt * sizeof(*rr) + sizeof(*rh))
-                       ND_PRINT((ndo, " [%d]", len));
+                       ND_PRINT(" [%u]", len);
                rr = (const struct rtcp_rr *)(rh + 1);
                if (ndo->ndo_vflag)
                rr = (const struct rtcp_rr *)(rh + 1);
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(&rh->rh_ssrc)));
+                       ND_PRINT(" %u", ssrc);
                break;
        case RTCP_PT_SDES:
                break;
        case RTCP_PT_SDES:
-               ND_PRINT((ndo, " sdes %d", len));
+               ND_PRINT(" sdes %u", len);
                if (ndo->ndo_vflag)
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(&rh->rh_ssrc)));
+                       ND_PRINT(" %u", ssrc);
                cnt = 0;
                break;
        case RTCP_PT_BYE:
                cnt = 0;
                break;
        case RTCP_PT_BYE:
-               ND_PRINT((ndo, " bye %d", len));
+               ND_PRINT(" bye %u", len);
                if (ndo->ndo_vflag)
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(&rh->rh_ssrc)));
+                       ND_PRINT(" %u", ssrc);
                cnt = 0;
                break;
        default:
                cnt = 0;
                break;
        default:
-               ND_PRINT((ndo, " 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)
-               ND_PRINT((ndo, " c%d", cnt));
-       while (--cnt >= 0) {
-               if ((const u_char *)(rr + 1) > ep)
-                       goto trunc;
-               ND_TCHECK(*rr);
+               ND_PRINT(" c%u", cnt);
+       while (cnt != 0) {
                if (ndo->ndo_vflag)
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(&rr->rr_srcid)));
-               ts = (double)(EXTRACT_BE_32BITS(&rr->rr_lsr)) / 65536.;
-               dts = (double)(EXTRACT_BE_32BITS(&rr->rr_dlsr)) / 65536.;
-               ND_PRINT((ndo, " %ul %us %uj @%.2f+%.2f",
-                   EXTRACT_BE_32BITS(&rr->rr_nl) & 0x00ffffff,
-                   EXTRACT_BE_32BITS(&rr->rr_ls),
-                   EXTRACT_BE_32BITS(&rr->rr_dv), ts, dts));
+                       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((ndo, "%s", rtcp_tstr));
-       return ep;
 }
 
 }
 
-static int udp_cksum(netdissect_options *ndo, 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)
 {
        return nextproto4_cksum(ndo, ip, (const uint8_t *)(const void *)up, len, len,
                                IPPROTO_UDP);
 }
 
 {
        return nextproto4_cksum(ndo, ip, (const uint8_t *)(const void *)up, len, len,
                                IPPROTO_UDP);
 }
 
-static int udp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
+static uint16_t udp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
                      const struct udphdr *up, u_int len)
 {
        return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)up, len, len,
                      const struct udphdr *up, u_int len)
 {
        return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)up, len, len,
@@ -314,130 +301,109 @@ static int udp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
 }
 
 static void
 }
 
 static void
-udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dport)
+udpipaddr_print(netdissect_options *ndo,
+                const struct ip *ip, const uint16_t sport, const uint16_t dport)
 {
 {
-       const struct ip6_hdr *ip6;
-
-       if (IP_V(ip) == 6)
-               ip6 = (const struct ip6_hdr *)ip;
-       else
-               ip6 = NULL;
+       const struct ip6_hdr *ip6 = (const struct ip6_hdr *)ip;
+
+       if (IP_V(ip) == 4 && GET_U_1(ip->ip_p) == IPPROTO_UDP) {
+               ND_PRINT("%s.%s > %s.%s: ",
+                       GET_IPADDR_STRING(ip->ip_src),
+                       udpport_string(ndo, sport),
+                       GET_IPADDR_STRING(ip->ip_dst),
+                       udpport_string(ndo, dport));
+       } else if (IP_V(ip) == 6 && GET_U_1(ip6->ip6_nxt) == IPPROTO_UDP) {
+               ND_PRINT("%s.%s > %s.%s: ",
+                       GET_IP6ADDR_STRING(ip6->ip6_src),
+                       udpport_string(ndo, sport),
+                       GET_IP6ADDR_STRING(ip6->ip6_dst),
+                       udpport_string(ndo, dport));
+       } else
+               ND_PRINT("%s > %s: ",
+                       udpport_string(ndo, sport), udpport_string(ndo, dport));
+}
 
 
-       if (ip6) {
-               if (ip6->ip6_nxt == IPPROTO_UDP) {
-                       if (sport == -1) {
-                               ND_PRINT((ndo, "%s > %s: ",
-                                       ip6addr_string(ndo, &ip6->ip6_src),
-                                       ip6addr_string(ndo, &ip6->ip6_dst)));
-                       } else {
-                               ND_PRINT((ndo, "%s.%s > %s.%s: ",
-                                       ip6addr_string(ndo, &ip6->ip6_src),
-                                       udpport_string(ndo, sport),
-                                       ip6addr_string(ndo, &ip6->ip6_dst),
-                                       udpport_string(ndo, dport)));
-                       }
-               } else {
-                       if (sport != -1) {
-                               ND_PRINT((ndo, "%s > %s: ",
-                                       udpport_string(ndo, sport),
-                                       udpport_string(ndo, dport)));
-                       }
-               }
-       } else {
-               if (ip->ip_p == IPPROTO_UDP) {
-                       if (sport == -1) {
-                               ND_PRINT((ndo, "%s > %s: ",
-                                       ipaddr_string(ndo, &ip->ip_src),
-                                       ipaddr_string(ndo, &ip->ip_dst)));
-                       } else {
-                               ND_PRINT((ndo, "%s.%s > %s.%s: ",
-                                       ipaddr_string(ndo, &ip->ip_src),
-                                       udpport_string(ndo, sport),
-                                       ipaddr_string(ndo, &ip->ip_dst),
-                                       udpport_string(ndo, dport)));
-                       }
-               } else {
-                       if (sport != -1) {
-                               ND_PRINT((ndo, "%s > %s: ",
-                                       udpport_string(ndo, sport),
-                                       udpport_string(ndo, dport)));
-                       }
-               }
+static void
+udpipaddr_noport_print(netdissect_options *ndo, const struct ip *ip)
+{
+       const struct ip6_hdr *ip6 = (const struct ip6_hdr *)ip;
+
+       if (IP_V(ip) == 4 && GET_U_1(ip->ip_p) == IPPROTO_UDP) {
+               ND_PRINT("%s > %s: ",
+                       GET_IPADDR_STRING(ip->ip_src),
+                       GET_IPADDR_STRING(ip->ip_dst));
+       } else if (IP_V(ip) == 6 && GET_U_1(ip6->ip6_nxt) == IPPROTO_UDP) {
+               ND_PRINT("%s > %s: ",
+                       GET_IP6ADDR_STRING(ip6->ip6_src),
+                       GET_IP6ADDR_STRING(ip6->ip6_dst));
        }
 }
 
 void
        }
 }
 
 void
-udp_print(netdissect_options *ndo, 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;
-       uint16_t sport, dport, ulen;
-       register const struct ip6_hdr *ip6;
-
-       if (ep > ndo->ndo_snapend)
-               ep = ndo->ndo_snapend;
+       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;
+       uint16_t udp_sum;
+       const struct ip6_hdr *ip6;
+
+       ndo->ndo_protocol = "udp";
        up = (const struct udphdr *)bp;
        ip = (const struct ip *)bp2;
        if (IP_V(ip) == 6)
                ip6 = (const struct ip6_hdr *)bp2;
        else
                ip6 = NULL;
        up = (const struct udphdr *)bp;
        ip = (const struct ip *)bp2;
        if (IP_V(ip) == 6)
                ip6 = (const struct ip6_hdr *)bp2;
        else
                ip6 = NULL;
-       if (!ND_TTEST(up->uh_dport)) {
-               udpipaddr_print(ndo, ip, -1, -1);
-               goto trunc;
+       if (!ND_TTEST_2(up->uh_dport)) {
+               udpipaddr_noport_print(ndo, ip);
+               nd_trunc_longjmp(ndo);
        }
 
        }
 
-       sport = EXTRACT_BE_16BITS(&up->uh_sport);
-       dport = EXTRACT_BE_16BITS(&up->uh_dport);
-
-       if (length < sizeof(struct udphdr)) {
-               udpipaddr_print(ndo, ip, sport, dport);
-               ND_PRINT((ndo, "truncated-udp %d", length));
-               return;
-       }
-       if (!ND_TTEST(up->uh_ulen)) {
-               udpipaddr_print(ndo, ip, sport, dport);
-               goto trunc;
-       }
-       ulen = EXTRACT_BE_16BITS(&up->uh_ulen);
-       if (ulen < sizeof(struct udphdr)) {
+       sport = GET_BE_U_2(up->uh_sport);
+       dport = GET_BE_U_2(up->uh_dport);
+       if (ndo->ndo_packettype != PT_RPC)
                udpipaddr_print(ndo, ip, sport, dport);
                udpipaddr_print(ndo, ip, sport, dport);
-               ND_PRINT((ndo, "truncated-udplength %d", ulen));
-               return;
-       }
+
+       ND_LCHECKMSG_ZU(length, sizeof(struct udphdr), "undersized-udp");
+       ulen = GET_BE_U_2(up->uh_ulen);
+       udp_sum = GET_BE_U_2(up->uh_sum);
+       /*
+        * 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;
+       ND_LCHECKMSG_ZU(ulen, sizeof(struct udphdr), "undersized-udplength");
        ulen -= sizeof(struct udphdr);
        length -= sizeof(struct udphdr);
        if (ulen < length)
                length = ulen;
 
        cp = (const u_char *)(up + 1);
        ulen -= sizeof(struct udphdr);
        length -= sizeof(struct udphdr);
        if (ulen < length)
                length = ulen;
 
        cp = (const u_char *)(up + 1);
-       if (cp > ndo->ndo_snapend) {
-               udpipaddr_print(ndo, ip, sport, dport);
-               goto trunc;
-       }
 
        if (ndo->ndo_packettype) {
 
        if (ndo->ndo_packettype) {
-               register const struct sunrpc_msg *rp;
+               const struct sunrpc_msg *rp;
                enum sunrpc_msg_type direction;
 
                switch (ndo->ndo_packettype) {
 
                case PT_VAT:
                enum sunrpc_msg_type direction;
 
                switch (ndo->ndo_packettype) {
 
                case PT_VAT:
-                       udpipaddr_print(ndo, ip, sport, dport);
-                       vat_print(ndo, (const void *)(up + 1), up);
+                       vat_print(ndo, cp, length);
                        break;
 
                case PT_WB:
                        break;
 
                case PT_WB:
-                       udpipaddr_print(ndo, ip, sport, dport);
-                       wb_print(ndo, (const void *)(up + 1), length);
+                       wb_print(ndo, cp, length);
                        break;
 
                case PT_RPC:
                        break;
 
                case PT_RPC:
-                       rp = (const struct sunrpc_msg *)(up + 1);
-                       direction = (enum sunrpc_msg_type) EXTRACT_BE_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)
                                sunrpc_print(ndo, (const u_char *)rp, length,
                                    (const u_char *)ip);
                        if (direction == SUNRPC_CALL)
                                sunrpc_print(ndo, (const u_char *)rp, length,
                                    (const u_char *)ip);
@@ -447,76 +413,77 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                        break;
 
                case PT_RTP:
                        break;
 
                case PT_RTP:
-                       udpipaddr_print(ndo, ip, sport, dport);
-                       rtp_print(ndo, (const void *)(up + 1), length, up);
+                       rtp_print(ndo, cp, length);
                        break;
 
                case PT_RTCP:
                        break;
 
                case PT_RTCP:
-                       udpipaddr_print(ndo, ip, sport, dport);
                        while (cp < ep)
                        while (cp < ep)
-                               cp = rtcp_print(ndo, cp, ep);
+                               cp = rtcp_print(ndo, cp);
                        break;
 
                case PT_SNMP:
                        break;
 
                case PT_SNMP:
-                       udpipaddr_print(ndo, ip, sport, dport);
-                       snmp_print(ndo, (const u_char *)(up + 1), length);
+                       snmp_print(ndo, cp, length);
                        break;
 
                case PT_CNFP:
                        break;
 
                case PT_CNFP:
-                       udpipaddr_print(ndo, ip, sport, dport);
                        cnfp_print(ndo, cp);
                        break;
 
                case PT_TFTP:
                        cnfp_print(ndo, cp);
                        break;
 
                case PT_TFTP:
-                       udpipaddr_print(ndo, ip, sport, dport);
                        tftp_print(ndo, cp, length);
                        break;
 
                case PT_AODV:
                        tftp_print(ndo, cp, length);
                        break;
 
                case PT_AODV:
-                       udpipaddr_print(ndo, ip, sport, dport);
-                       aodv_print(ndo, (const u_char *)(up + 1), length,
+                       aodv_print(ndo, cp, length,
                            ip6 != NULL);
                        break;
 
                case PT_RADIUS:
                            ip6 != NULL);
                        break;
 
                case PT_RADIUS:
-                       udpipaddr_print(ndo, ip, sport, dport);
                        radius_print(ndo, cp, length);
                        break;
 
                case PT_VXLAN:
                        radius_print(ndo, cp, length);
                        break;
 
                case PT_VXLAN:
-                       udpipaddr_print(ndo, ip, sport, dport);
-                       vxlan_print(ndo, (const u_char *)(up + 1), length);
+                       vxlan_print(ndo, cp, length);
                        break;
 
                case PT_PGM:
                case PT_PGM_ZMTP1:
                        break;
 
                case PT_PGM:
                case PT_PGM_ZMTP1:
-                       udpipaddr_print(ndo, ip, sport, dport);
                        pgm_print(ndo, cp, length, bp2);
                        break;
                case PT_LMP:
                        pgm_print(ndo, cp, length, bp2);
                        break;
                case PT_LMP:
-                       udpipaddr_print(ndo, ip, sport, dport);
                        lmp_print(ndo, cp, length);
                        break;
                        lmp_print(ndo, cp, length);
                        break;
+               case PT_PTP:
+                       ptp_print(ndo, cp, length);
+                       break;
+               case PT_SOMEIP:
+                       someip_print(ndo, cp, length);
+                       break;
+               case PT_DOMAIN:
+                       /* over_tcp: FALSE, is_mdns: FALSE */
+                       domain_print(ndo, cp, length, FALSE, FALSE);
+                       break;
                }
                return;
        }
 
                }
                return;
        }
 
-       udpipaddr_print(ndo, ip, sport, dport);
        if (!ndo->ndo_qflag) {
        if (!ndo->ndo_qflag) {
-               register const struct sunrpc_msg *rp;
+               const struct sunrpc_msg *rp;
                enum sunrpc_msg_type direction;
 
                enum sunrpc_msg_type direction;
 
-               rp = (const struct sunrpc_msg *)(up + 1);
-               if (ND_TTEST(rp->rm_direction)) {
-                       direction = (enum sunrpc_msg_type) EXTRACT_BE_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) {
-                               ND_PRINT((ndo, "NFS request xid %u ", EXTRACT_BE_32BITS(&rp->rm_xid)));
+                               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) {
                                nfsreq_noaddr_print(ndo, (const u_char *)rp, length,
                                    (const u_char *)ip);
                                return;
                        }
                        if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
-                               ND_PRINT((ndo, "NFS reply xid %u ", EXTRACT_BE_32BITS(&rp->rm_xid)));
+                               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;
                                nfsreply_noaddr_print(ndo, (const u_char *)rp, length,
                                    (const u_char *)ip);
                                return;
@@ -531,186 +498,193 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
        }
 
        if (ndo->ndo_vflag && !ndo->ndo_Kflag && !fragmented) {
        }
 
        if (ndo->ndo_vflag && !ndo->ndo_Kflag && !fragmented) {
-                /* Check the checksum, if possible. */
-                uint16_t sum, udp_sum;
+               /* Check the checksum, if possible. */
+               uint16_t sum;
 
                /*
                 * XXX - do this even if vflag == 1?
                 * TCP does, and we do so for UDP-over-IPv6.
                 */
 
                /*
                 * 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 = EXTRACT_BE_16BITS(&up->uh_sum);
+               if (IP_V(ip) == 4 && (ndo->ndo_vflag > 1)) {
                        if (udp_sum == 0) {
                        if (udp_sum == 0) {
-                               ND_PRINT((ndo, "[no cksum] "));
-                       } else if (ND_TTEST2(cp[0], length)) {
+                               ND_PRINT("[no cksum] ");
+                       } else if (ND_TTEST_LEN(cp, length)) {
                                sum = udp_cksum(ndo, ip, up, length + sizeof(struct udphdr));
 
                                sum = udp_cksum(ndo, ip, up, length + sizeof(struct udphdr));
 
-                               if (sum != 0) {
-                                       ND_PRINT((ndo, "[bad udp cksum 0x%04x -> 0x%04x!] ",
+                               if (sum != 0) {
+                                       ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
                                            udp_sum,
                                            udp_sum,
-                                           in_cksum_shouldbe(udp_sum, sum)));
+                                           in_cksum_shouldbe(udp_sum, sum));
                                } else
                                } else
-                                       ND_PRINT((ndo, "[udp sum ok] "));
+                                       ND_PRINT("[udp sum ok] ");
                        }
                }
                        }
                }
-               else if (IP_V(ip) == 6 && ip6->ip6_plen) {
+               else if (IP_V(ip) == 6) {
                        /* for IPv6, UDP checksum is mandatory */
                        /* for IPv6, UDP checksum is mandatory */
-                       if (ND_TTEST2(cp[0], length)) {
+                       if (ND_TTEST_LEN(cp, length)) {
                                sum = udp6_cksum(ndo, ip6, up, length + sizeof(struct udphdr));
                                sum = udp6_cksum(ndo, ip6, up, length + sizeof(struct udphdr));
-                               udp_sum = EXTRACT_BE_16BITS(&up->uh_sum);
 
 
-                               if (sum != 0) {
-                                       ND_PRINT((ndo, "[bad udp cksum 0x%04x -> 0x%04x!] ",
+                               if (sum != 0) {
+                                       ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
                                            udp_sum,
                                            udp_sum,
-                                           in_cksum_shouldbe(udp_sum, sum)));
+                                           in_cksum_shouldbe(udp_sum, sum));
                                } else
                                } else
-                                       ND_PRINT((ndo, "[udp sum ok] "));
+                                       ND_PRINT("[udp sum ok] ");
                        }
                }
        }
 
        if (!ndo->ndo_qflag) {
                if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT))
                        }
                }
        }
 
        if (!ndo->ndo_qflag) {
                if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT))
-                       domain_print(ndo, (const u_char *)(up + 1), length, 0);
+                       /* over_tcp: FALSE, is_mdns: FALSE */
+                       domain_print(ndo, cp, length, FALSE, FALSE);
                else if (IS_SRC_OR_DST_PORT(MULTICASTDNS_PORT))
                else if (IS_SRC_OR_DST_PORT(MULTICASTDNS_PORT))
-                       domain_print(ndo, (const u_char *)(up + 1), length, 1);
+                       /* over_tcp: FALSE, is_mdns: TRUE */
+                       domain_print(ndo, cp, length, FALSE, TRUE);
                else if (IS_SRC_OR_DST_PORT(TIMED_PORT))
                else if (IS_SRC_OR_DST_PORT(TIMED_PORT))
-                       timed_print(ndo, (const u_char *)(up + 1));
+                       timed_print(ndo, (const u_char *)cp);
                else if (IS_SRC_OR_DST_PORT(TFTP_PORT))
                else if (IS_SRC_OR_DST_PORT(TFTP_PORT))
-                       tftp_print(ndo, (const u_char *)(up + 1), length);
+                       tftp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(BOOTPC_PORT) || IS_SRC_OR_DST_PORT(BOOTPS_PORT))
                else if (IS_SRC_OR_DST_PORT(BOOTPC_PORT) || IS_SRC_OR_DST_PORT(BOOTPS_PORT))
-                       bootp_print(ndo, (const u_char *)(up + 1), length);
+                       bootp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(RIP_PORT))
                else if (IS_SRC_OR_DST_PORT(RIP_PORT))
-                       rip_print(ndo, (const u_char *)(up + 1), length);
+                       rip_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(AODV_PORT))
                else if (IS_SRC_OR_DST_PORT(AODV_PORT))
-                       aodv_print(ndo, (const u_char *)(up + 1), length,
+                       aodv_print(ndo, cp, length,
                            ip6 != NULL);
                            ip6 != NULL);
-               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT))
-                        isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
-               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_NATT))
-                        isakmp_rfc3948_print(ndo, (const u_char *)(up + 1), length, bp2);
-               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER1) || IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER2))
-                       isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT))
+                        isakmp_print(ndo, cp, length, bp2);
+               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(SNMP_PORT) || IS_SRC_OR_DST_PORT(SNMPTRAP_PORT))
                else if (IS_SRC_OR_DST_PORT(SNMP_PORT) || IS_SRC_OR_DST_PORT(SNMPTRAP_PORT))
-                       snmp_print(ndo, (const u_char *)(up + 1), length);
+                       snmp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(NTP_PORT))
                else if (IS_SRC_OR_DST_PORT(NTP_PORT))
-                       ntp_print(ndo, (const u_char *)(up + 1), length);
+                       ntp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(KERBEROS_PORT) || IS_SRC_OR_DST_PORT(KERBEROS_SEC_PORT))
                else if (IS_SRC_OR_DST_PORT(KERBEROS_PORT) || IS_SRC_OR_DST_PORT(KERBEROS_SEC_PORT))
-                       krb_print(ndo, (const void *)(up + 1));
+                       krb_print(ndo, (const u_char *)cp);
                else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
                else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
-                       l2tp_print(ndo, (const u_char *)(up + 1), length);
+                       l2tp_print(ndo, cp, length);
 #ifdef ENABLE_SMB
                else if (IS_SRC_OR_DST_PORT(NETBIOS_NS_PORT))
 #ifdef ENABLE_SMB
                else if (IS_SRC_OR_DST_PORT(NETBIOS_NS_PORT))
-                       nbt_udp137_print(ndo, (const u_char *)(up + 1), length);
+                       nbt_udp137_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(NETBIOS_DGRAM_PORT))
                else if (IS_SRC_OR_DST_PORT(NETBIOS_DGRAM_PORT))
-                       nbt_udp138_print(ndo, (const u_char *)(up + 1), length);
+                       nbt_udp138_print(ndo, cp, length);
 #endif
                else if (dport == VAT_PORT)
 #endif
                else if (dport == VAT_PORT)
-                       vat_print(ndo, (const void *)(up + 1), up);
+                       vat_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(ZEPHYR_SRV_PORT) || IS_SRC_OR_DST_PORT(ZEPHYR_CLT_PORT))
                else if (IS_SRC_OR_DST_PORT(ZEPHYR_SRV_PORT) || IS_SRC_OR_DST_PORT(ZEPHYR_CLT_PORT))
-                       zephyr_print(ndo, (const void *)(up + 1), length);
+                       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(ndo, (const void *)(up + 1), length, sport, dport,
+                       rx_print(ndo, cp, length, sport, dport,
                                 (const u_char *) ip);
                else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
                                 (const u_char *) ip);
                else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
-                       ripng_print(ndo, (const u_char *)(up + 1), length);
+                       ripng_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(DHCP6_SERV_PORT) || IS_SRC_OR_DST_PORT(DHCP6_CLI_PORT))
                else if (IS_SRC_OR_DST_PORT(DHCP6_SERV_PORT) || IS_SRC_OR_DST_PORT(DHCP6_CLI_PORT))
-                       dhcp6_print(ndo, (const u_char *)(up + 1), length);
+                       dhcp6_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(AHCP_PORT))
                else if (IS_SRC_OR_DST_PORT(AHCP_PORT))
-                       ahcp_print(ndo, (const u_char *)(up + 1), length);
+                       ahcp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(BABEL_PORT) || IS_SRC_OR_DST_PORT(BABEL_PORT_OLD))
                else if (IS_SRC_OR_DST_PORT(BABEL_PORT) || IS_SRC_OR_DST_PORT(BABEL_PORT_OLD))
-                       babel_print(ndo, (const u_char *)(up + 1), length);
+                       babel_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(HNCP_PORT))
                else if (IS_SRC_OR_DST_PORT(HNCP_PORT))
-                       hncp_print(ndo, (const u_char *)(up + 1), length);
+                       hncp_print(ndo, cp, length);
                /*
                 * Kludge in test for whiteboard packets.
                 */
                else if (dport == WB_PORT)
                /*
                 * Kludge in test for whiteboard packets.
                 */
                else if (dport == WB_PORT)
-                       wb_print(ndo, (const void *)(up + 1), length);
+                       wb_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))
                else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))
-                       cisco_autorp_print(ndo, (const void *)(up + 1), length);
+                       cisco_autorp_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) )
                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, (const u_char *)(up+1), length);
+                       radius_print(ndo, cp, length);
                else if (dport == HSRP_PORT)
                else if (dport == HSRP_PORT)
-                       hsrp_print(ndo, (const u_char *)(up + 1), length);
+                       hsrp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(LWRES_PORT))
                else if (IS_SRC_OR_DST_PORT(LWRES_PORT))
-                       lwres_print(ndo, (const u_char *)(up + 1), length);
+                       lwres_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(LDP_PORT))
                else if (IS_SRC_OR_DST_PORT(LDP_PORT))
-                       ldp_print(ndo, (const u_char *)(up + 1), length);
+                       ldp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(OLSR_PORT))
                else if (IS_SRC_OR_DST_PORT(OLSR_PORT))
-                       olsr_print(ndo, (const u_char *)(up + 1), length,
+                       olsr_print(ndo, cp, length,
                                        (IP_V(ip) == 6) ? 1 : 0);
                else if (IS_SRC_OR_DST_PORT(MPLS_LSP_PING_PORT))
                                        (IP_V(ip) == 6) ? 1 : 0);
                else if (IS_SRC_OR_DST_PORT(MPLS_LSP_PING_PORT))
-                       lspping_print(ndo, (const u_char *)(up + 1), length);
+                       lspping_print(ndo, cp, length);
+               else if (sport == BCM_LI_PORT)
+                       bcm_li_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 == SBFD_PORT ||
                         dport == BFD_ECHO_PORT )
                         dport == BFD_ECHO_PORT )
-                       bfd_print(ndo, (const u_char *)(up+1), length, dport);
-                else if (IS_SRC_OR_DST_PORT(LMP_PORT))
-                       lmp_print(ndo, (const u_char *)(up + 1), length);
+                       bfd_print(ndo, cp, length, dport);
+               else if (sport == SBFD_PORT)
+                       bfd_print(ndo, cp, length, sport);
+               else if (IS_SRC_OR_DST_PORT(LMP_PORT))
+                       lmp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(VQP_PORT))
                else if (IS_SRC_OR_DST_PORT(VQP_PORT))
-                       vqp_print(ndo, (const u_char *)(up + 1), length);
-                else if (IS_SRC_OR_DST_PORT(SFLOW_PORT))
-                        sflow_print(ndo, (const u_char *)(up + 1), length);
-               else if (dport == LWAPP_CONTROL_PORT)
-                       lwapp_control_print(ndo, (const u_char *)(up + 1), length, 1);
-                else if (sport == LWAPP_CONTROL_PORT)
-                        lwapp_control_print(ndo, (const u_char *)(up + 1), length, 0);
-                else if (IS_SRC_OR_DST_PORT(LWAPP_DATA_PORT))
-                        lwapp_data_print(ndo, (const u_char *)(up + 1), length);
-                else if (IS_SRC_OR_DST_PORT(SIP_PORT))
-                       sip_print(ndo, (const u_char *)(up + 1), length);
-                else if (IS_SRC_OR_DST_PORT(SYSLOG_PORT))
-                       syslog_print(ndo, (const u_char *)(up + 1), length);
-                else if (IS_SRC_OR_DST_PORT(OTV_PORT))
-                       otv_print(ndo, (const u_char *)(up + 1), length);
-                else if (IS_SRC_OR_DST_PORT(VXLAN_PORT))
-                       vxlan_print(ndo, (const u_char *)(up + 1), length);
-                else if (IS_SRC_OR_DST_PORT(GENEVE_PORT))
-                       geneve_print(ndo, (const u_char *)(up + 1), length);
+                       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(SYSLOG_PORT))
+                       syslog_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 (IS_SRC_OR_DST_PORT(GENEVE_PORT))
+                       geneve_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(LISP_CONTROL_PORT))
                else if (IS_SRC_OR_DST_PORT(LISP_CONTROL_PORT))
-                       lisp_print(ndo, (const u_char *)(up + 1), length);
+                       lisp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(VXLAN_GPE_PORT))
                else if (IS_SRC_OR_DST_PORT(VXLAN_GPE_PORT))
-                       vxlan_gpe_print(ndo, (const u_char *)(up + 1), length);
-               else if (ND_TTEST(((const struct LAP *)cp)->type) &&
-                   ((const struct LAP *)cp)->type == lapDDP &&
-                   (atalk_port(sport) || atalk_port(dport))) {
+                       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 ((atalk_port(sport) || atalk_port(dport)) &&
+                        GET_U_1(((const struct LAP *)cp)->type) == lapDDP) {
                        if (ndo->ndo_vflag)
                        if (ndo->ndo_vflag)
-                               ND_PRINT((ndo, "kip "));
+                               ND_PRINT("kip ");
                        llap_print(ndo, cp, length);
                        llap_print(ndo, cp, length);
-               } else {
-                       if (ulen > length)
-                               ND_PRINT((ndo, "UDP, bad length %u > %u",
-                                   ulen, 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(SOMEIP_PORT))
+                       someip_print(ndo, cp, length);
+               else {
+                       if (ulen > length && !fragmented)
+                               ND_PRINT("UDP, bad length %u > %u",
+                                   ulen, length);
                        else
                        else
-                               ND_PRINT((ndo, "UDP, length %u", ulen));
+                               ND_PRINT("UDP, length %u", ulen);
                }
        } else {
                }
        } else {
-               if (ulen > length)
-                       ND_PRINT((ndo, "UDP, bad length %u > %u",
-                           ulen, length));
+               if (ulen > length && !fragmented)
+                       ND_PRINT("UDP, bad length %u > %u",
+                           ulen, length);
                else
                else
-                       ND_PRINT((ndo, "UDP, length %u", ulen));
+                       ND_PRINT("UDP, length %u", ulen);
        }
        return;
 
        }
        return;
 
-trunc:
-       ND_PRINT((ndo, "%s", udp_tstr));
+invalid:
+       nd_print_invalid(ndo);
 }
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
[mirror] the TCPdump network dissector