]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-udp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove redundant ND_TCHECK, let GET_ routines handle checks
[tcpdump] / print-udp.c
diff --git a/print-udp.c b/print-udp.c
index 9daf327d5f4087d3766afeab526f6dff4ac4a50a..151b7e6b6872b323d7da1402d17dc897a564436a 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -93,7 +93,7 @@ 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, u_int length)
+vat_print(netdissect_options *ndo, const u_char *hdr, u_int length)
 {
        /* vat/vt audio */
        u_int ts;
 {
        /* vat/vt audio */
        u_int ts;
@@ -103,8 +103,7 @@ vat_print(netdissect_options *ndo, const void *hdr, u_int length)
                ND_PRINT("udp/va/vat, length %u < 2", length);
                return;
        }
                ND_PRINT("udp/va/vat, length %u < 2", length);
                return;
        }
-       ND_TCHECK_2((const u_int *)hdr);
-       ts = EXTRACT_BE_U_2(hdr);
+       ts = GET_BE_U_2(hdr);
        if ((ts & 0xf060) != 0) {
                /* probably vt */
                ND_PRINT("udp/vt %u %u / %u",
        if ((ts & 0xf060) != 0) {
                /* probably vt */
                ND_PRINT("udp/vt %u %u / %u",
@@ -118,10 +117,8 @@ vat_print(netdissect_options *ndo, const void *hdr, u_int length)
                        ND_PRINT("udp/vat, length %u < 8", length);
                        return;
                }
                        ND_PRINT("udp/vat, length %u < 8", length);
                        return;
                }
-               ND_TCHECK_4(&((const u_int *)hdr)[0]);
-               i0 = EXTRACT_BE_U_4(&((const u_int *)hdr)[0]);
-               ND_TCHECK_4(&((const u_int *)hdr)[1]);
-               i1 = EXTRACT_BE_U_4(&((const u_int *)hdr)[1]);
+               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,
                ND_PRINT("udp/vat %u c%u %u%s",
                        length - 8,
                        i0 & 0xffff,
@@ -132,14 +129,10 @@ vat_print(netdissect_options *ndo, const void *hdr, u_int length)
                if (i0 & 0x3f000000)
                        ND_PRINT(" s%u", (i0 >> 24) & 0x3f);
        }
                if (i0 & 0x3f000000)
                        ND_PRINT(" s%u", (i0 >> 24) & 0x3f);
        }
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
 }
 
 static void
 }
 
 static void
-rtp_print(netdissect_options *ndo, const void *hdr, u_int len)
+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;
@@ -152,10 +145,8 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len)
                ND_PRINT("udp/rtp, length %u < 8", len);
                return;
        }
                ND_PRINT("udp/rtp, length %u < 8", len);
                return;
        }
-       ND_TCHECK_4(&((const u_int *)hdr)[0]);
-       i0 = EXTRACT_BE_U_4(&((const u_int *)hdr)[0]);
-       ND_TCHECK_4(&((const u_int *)hdr)[1]);
-       i1 = EXTRACT_BE_U_4(&((const u_int *)hdr)[1]);
+       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;
        dlen = len - 8;
        ip += 2;
        len >>= 2;
@@ -191,13 +182,11 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len)
                i0 & 0xffff,
                i1);
        if (ndo->ndo_vflag) {
                i0 & 0xffff,
                i1);
        if (ndo->ndo_vflag) {
-               ND_TCHECK_4(&((const u_int *)hdr)[2]);
-               ND_PRINT(" %u", EXTRACT_BE_U_4(&((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_4(ip);
-                               i2 = EXTRACT_BE_U_4(ip);
+                               i2 = GET_BE_U_4(ip);
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
                                        ND_PRINT(" !opt");
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
                                        ND_PRINT(" !opt");
@@ -209,8 +198,7 @@ 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_4(ip);
-                       i2 = EXTRACT_BE_U_4(ip);
+                       i2 = GET_BE_U_4(ip);
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
                                ND_PRINT(" !ext");
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
                                ND_PRINT(" !ext");
@@ -218,14 +206,9 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len)
                        }
                        ip += extlen;
                }
                        }
                        ip += extlen;
                }
-               ND_TCHECK_4(ip);
                if (contype == 0x1f) /*XXX H.261 */
                if (contype == 0x1f) /*XXX H.261 */
-                       ND_PRINT(" 0x%04x", EXTRACT_BE_U_4(ip) >> 16);
+                       ND_PRINT(" 0x%04x", GET_BE_U_4(ip) >> 16);
        }
        }
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
 }
 
 static const u_char *
 }
 
 static const u_char *
@@ -244,8 +227,8 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
        if ((const u_char *)(rh + 1) > ep)
                goto trunc;
        ND_TCHECK_SIZE(rh);
        if ((const u_char *)(rh + 1) > ep)
                goto trunc;
        ND_TCHECK_SIZE(rh);
-       len = (EXTRACT_BE_U_2(rh->rh_len) + 1) * 4;
-       flags = EXTRACT_BE_U_2(rh->rh_flags);
+       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:
@@ -254,15 +237,15 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                        ND_PRINT(" [%u]", len);
                if (ndo->ndo_vflag)
                if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
                        ND_PRINT(" [%u]", len);
                if (ndo->ndo_vflag)
-                       ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));
+                       ND_PRINT(" %u", GET_BE_U_4(rh->rh_ssrc));
                if ((const u_char *)(sr + 1) > ep)
                        goto trunc;
                ND_TCHECK_SIZE(sr);
                if ((const u_char *)(sr + 1) > ep)
                        goto trunc;
                ND_TCHECK_SIZE(sr);
-               ts = (double)(EXTRACT_BE_U_4(sr->sr_ntp.upper)) +
-                   ((double)(EXTRACT_BE_U_4(sr->sr_ntp.lower)) /
-                    4294967296.0);
-               ND_PRINT(" @%.2f %u %up %ub", ts, EXTRACT_BE_U_4(sr->sr_ts),
-                         EXTRACT_BE_U_4(sr->sr_np), EXTRACT_BE_U_4(sr->sr_nb));
+               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:
@@ -271,18 +254,18 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
                        ND_PRINT(" [%u]", len);
                rr = (const struct rtcp_rr *)(rh + 1);
                if (ndo->ndo_vflag)
                        ND_PRINT(" [%u]", len);
                rr = (const struct rtcp_rr *)(rh + 1);
                if (ndo->ndo_vflag)
-                       ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));
+                       ND_PRINT(" %u", GET_BE_U_4(rh->rh_ssrc));
                break;
        case RTCP_PT_SDES:
                ND_PRINT(" sdes %u", len);
                if (ndo->ndo_vflag)
                break;
        case RTCP_PT_SDES:
                ND_PRINT(" sdes %u", len);
                if (ndo->ndo_vflag)
-                       ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));
+                       ND_PRINT(" %u", GET_BE_U_4(rh->rh_ssrc));
                cnt = 0;
                break;
        case RTCP_PT_BYE:
                ND_PRINT(" bye %u", len);
                if (ndo->ndo_vflag)
                cnt = 0;
                break;
        case RTCP_PT_BYE:
                ND_PRINT(" bye %u", len);
                if (ndo->ndo_vflag)
-                       ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));
+                       ND_PRINT(" %u", GET_BE_U_4(rh->rh_ssrc));
                cnt = 0;
                break;
        default:
                cnt = 0;
                break;
        default:
@@ -297,13 +280,13 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
                        goto trunc;
                ND_TCHECK_SIZE(rr);
                if (ndo->ndo_vflag)
                        goto trunc;
                ND_TCHECK_SIZE(rr);
                if (ndo->ndo_vflag)
-                       ND_PRINT(" %u", EXTRACT_BE_U_4(rr->rr_srcid));
-               ts = (double)(EXTRACT_BE_U_4(rr->rr_lsr)) / 65536.;
-               dts = (double)(EXTRACT_BE_U_4(rr->rr_dlsr)) / 65536.;
+                       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",
                ND_PRINT(" %ul %us %uj @%.2f+%.2f",
-                   EXTRACT_BE_U_4(rr->rr_nl) & 0x00ffffff,
-                   EXTRACT_BE_U_4(rr->rr_ls),
-                   EXTRACT_BE_U_4(rr->rr_dv), ts, dts);
+                   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);
                cnt--;
        }
        return (hdr + len);
@@ -339,7 +322,7 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
                ip6 = NULL;
 
        if (ip6) {
                ip6 = NULL;
 
        if (ip6) {
-               if (EXTRACT_U_1(ip6->ip6_nxt) == IPPROTO_UDP) {
+               if (GET_U_1(ip6->ip6_nxt) == IPPROTO_UDP) {
                        if (sport == -1) {
                                ND_PRINT("%s > %s: ",
                                        ip6addr_string(ndo, ip6->ip6_src),
                        if (sport == -1) {
                                ND_PRINT("%s > %s: ",
                                        ip6addr_string(ndo, ip6->ip6_src),
@@ -347,19 +330,19 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
                        } else {
                                ND_PRINT("%s.%s > %s.%s: ",
                                        ip6addr_string(ndo, ip6->ip6_src),
                        } else {
                                ND_PRINT("%s.%s > %s.%s: ",
                                        ip6addr_string(ndo, ip6->ip6_src),
-                                       udpport_string(ndo, sport),
+                                       udpport_string(ndo, (uint16_t)sport),
                                        ip6addr_string(ndo, ip6->ip6_dst),
                                        ip6addr_string(ndo, ip6->ip6_dst),
-                                       udpport_string(ndo, dport));
+                                       udpport_string(ndo, (uint16_t)dport));
                        }
                } else {
                        if (sport != -1) {
                                ND_PRINT("%s > %s: ",
                        }
                } else {
                        if (sport != -1) {
                                ND_PRINT("%s > %s: ",
-                                       udpport_string(ndo, sport),
-                                       udpport_string(ndo, dport));
+                                       udpport_string(ndo, (uint16_t)sport),
+                                       udpport_string(ndo, (uint16_t)dport));
                        }
                }
        } else {
                        }
                }
        } else {
-               if (EXTRACT_U_1(ip->ip_p) == IPPROTO_UDP) {
+               if (GET_U_1(ip->ip_p) == IPPROTO_UDP) {
                        if (sport == -1) {
                                ND_PRINT("%s > %s: ",
                                        ipaddr_string(ndo, ip->ip_src),
                        if (sport == -1) {
                                ND_PRINT("%s > %s: ",
                                        ipaddr_string(ndo, ip->ip_src),
@@ -367,15 +350,15 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
                        } else {
                                ND_PRINT("%s.%s > %s.%s: ",
                                        ipaddr_string(ndo, ip->ip_src),
                        } else {
                                ND_PRINT("%s.%s > %s.%s: ",
                                        ipaddr_string(ndo, ip->ip_src),
-                                       udpport_string(ndo, sport),
+                                       udpport_string(ndo, (uint16_t)sport),
                                        ipaddr_string(ndo, ip->ip_dst),
                                        ipaddr_string(ndo, ip->ip_dst),
-                                       udpport_string(ndo, dport));
+                                       udpport_string(ndo, (uint16_t)dport));
                        }
                } else {
                        if (sport != -1) {
                                ND_PRINT("%s > %s: ",
                        }
                } else {
                        if (sport != -1) {
                                ND_PRINT("%s > %s: ",
-                                       udpport_string(ndo, sport),
-                                       udpport_string(ndo, dport));
+                                       udpport_string(ndo, (uint16_t)sport),
+                                       udpport_string(ndo, (uint16_t)dport));
                        }
                }
        }
                        }
                }
        }
@@ -383,13 +366,14 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
 
 void
 udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
 void
 udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
-         const u_char *bp2, int fragmented)
+         const u_char *bp2, int fragmented, u_int ttl_hl)
 {
        const struct udphdr *up;
        const struct ip *ip;
        const u_char *cp;
        const u_char *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, ulen;
+       uint16_t sport, dport;
+       u_int ulen;
        const struct ip6_hdr *ip6;
 
        ndo->ndo_protocol = "udp";
        const struct ip6_hdr *ip6;
 
        ndo->ndo_protocol = "udp";
@@ -404,8 +388,8 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
                goto trunc;
        }
 
                goto trunc;
        }
 
-       sport = EXTRACT_BE_U_2(up->uh_sport);
-       dport = EXTRACT_BE_U_2(up->uh_dport);
+       sport = GET_BE_U_2(up->uh_sport);
+       dport = GET_BE_U_2(up->uh_dport);
 
        if (length < sizeof(struct udphdr)) {
                udpipaddr_print(ndo, ip, sport, dport);
 
        if (length < sizeof(struct udphdr)) {
                udpipaddr_print(ndo, ip, sport, dport);
@@ -416,7 +400,14 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
                udpipaddr_print(ndo, ip, sport, dport);
                goto trunc;
        }
                udpipaddr_print(ndo, ip, sport, dport);
                goto trunc;
        }
-       ulen = EXTRACT_BE_U_2(up->uh_ulen);
+       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);
        if (ulen < sizeof(struct udphdr)) {
                udpipaddr_print(ndo, ip, sport, dport);
                ND_PRINT("truncated-udplength %u", ulen);
@@ -441,18 +432,17 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
                case PT_VAT:
                        udpipaddr_print(ndo, ip, sport, dport);
 
                case PT_VAT:
                        udpipaddr_print(ndo, ip, sport, dport);
-                       vat_print(ndo, (const void *)(up + 1), length);
+                       vat_print(ndo, cp, length);
                        break;
 
                case PT_WB:
                        udpipaddr_print(ndo, ip, sport, dport);
                        break;
 
                case PT_WB:
                        udpipaddr_print(ndo, ip, sport, dport);
-                       wb_print(ndo, (const u_char *)(up + 1), length);
+                       wb_print(ndo, cp, length);
                        break;
 
                case PT_RPC:
                        break;
 
                case PT_RPC:
-                       rp = (const struct sunrpc_msg *)(up + 1);
-                       ND_TCHECK_4(rp->rm_direction);
-                       direction = (enum sunrpc_msg_type) EXTRACT_BE_U_4(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);
@@ -463,7 +453,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
                case PT_RTP:
                        udpipaddr_print(ndo, ip, sport, dport);
 
                case PT_RTP:
                        udpipaddr_print(ndo, ip, sport, dport);
-                       rtp_print(ndo, (const void *)(up + 1), length);
+                       rtp_print(ndo, cp, length);
                        break;
 
                case PT_RTCP:
                        break;
 
                case PT_RTCP:
@@ -474,7 +464,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
                case PT_SNMP:
                        udpipaddr_print(ndo, ip, sport, dport);
 
                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:
@@ -489,7 +479,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
                case PT_AODV:
                        udpipaddr_print(ndo, ip, sport, dport);
 
                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;
 
                            ip6 != NULL);
                        break;
 
@@ -500,7 +490,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
                case PT_VXLAN:
                        udpipaddr_print(ndo, ip, sport, dport);
 
                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:
                        break;
 
                case PT_PGM:
@@ -512,6 +502,19 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
                        udpipaddr_print(ndo, ip, sport, dport);
                        lmp_print(ndo, cp, length);
                        break;
                        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;
        }
                }
                return;
        }
@@ -521,19 +524,19 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
                const struct sunrpc_msg *rp;
                enum sunrpc_msg_type direction;
 
                const struct sunrpc_msg *rp;
                enum sunrpc_msg_type direction;
 
-               rp = (const struct sunrpc_msg *)(up + 1);
+               rp = (const struct sunrpc_msg *)cp;
                if (ND_TTEST_4(rp->rm_direction)) {
                if (ND_TTEST_4(rp->rm_direction)) {
-                       direction = (enum sunrpc_msg_type) EXTRACT_BE_U_4(rp->rm_direction);
+                       direction = (enum sunrpc_msg_type) GET_BE_U_4(rp->rm_direction);
                        if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                                ND_PRINT("NFS request xid %u ",
                        if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                                ND_PRINT("NFS request xid %u ",
-                                        EXTRACT_BE_U_4(rp->rm_xid));
+                                        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) {
                                ND_PRINT("NFS reply xid %u ",
                                nfsreq_noaddr_print(ndo, (const u_char *)rp, length,
                                    (const u_char *)ip);
                                return;
                        }
                        if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                ND_PRINT("NFS reply xid %u ",
-                                        EXTRACT_BE_U_4(rp->rm_xid));
+                                        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;
@@ -548,22 +551,21 @@ udp_print(netdissect_options *ndo, 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, udp_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)) {
-                       ND_TCHECK_2(up->uh_sum);
-                       udp_sum = EXTRACT_BE_U_2(up->uh_sum);
+               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 (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) {
+                               if (sum != 0) {
                                        ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
                                            udp_sum,
                                            in_cksum_shouldbe(udp_sum, sum));
                                        ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
                                            udp_sum,
                                            in_cksum_shouldbe(udp_sum, sum));
@@ -571,14 +573,13 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
                                        ND_PRINT("[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 */
                        if (ND_TTEST_LEN(cp, length)) {
                                sum = udp6_cksum(ndo, ip6, up, length + sizeof(struct udphdr));
                        /* for IPv6, UDP checksum is mandatory */
                        if (ND_TTEST_LEN(cp, length)) {
                                sum = udp6_cksum(ndo, ip6, up, length + sizeof(struct udphdr));
-                               ND_TCHECK_2(up->uh_sum);
-                               udp_sum = EXTRACT_BE_U_2(up->uh_sum);
+                               udp_sum = GET_BE_U_2(up->uh_sum);
 
 
-                               if (sum != 0) {
+                               if (sum != 0) {
                                        ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
                                            udp_sum,
                                            in_cksum_shouldbe(udp_sum, sum));
                                        ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
                                            udp_sum,
                                            in_cksum_shouldbe(udp_sum, sum));
@@ -590,131 +591,146 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
        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 u_char *)(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), length);
+                       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 u_char *)(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 u_char *)(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 u_char *)(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 u_char *)(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 == 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 (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);
+                       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) &&
                else if (ND_TTEST_1(((const struct LAP *)cp)->type) &&
-                        EXTRACT_U_1(((const struct LAP *)cp)->type) == lapDDP &&
+                        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);
                         (atalk_port(sport) || atalk_port(dport))) {
                        if (ndo->ndo_vflag)
                                ND_PRINT("kip ");
                        llap_print(ndo, cp, length);
-               } else {
-                       if (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
                                ND_PRINT("UDP, length %u", ulen);
                }
        } else {
                                ND_PRINT("UDP, bad length %u > %u",
                                    ulen, length);
                        else
                                ND_PRINT("UDP, length %u", ulen);
                }
        } else {
-               if (ulen > length)
+               if (ulen > length && !fragmented)
                        ND_PRINT("UDP, bad length %u > %u",
                            ulen, length);
                else
                        ND_PRINT("UDP, bad length %u > %u",
                            ulen, length);
                else
[mirror] the TCPdump network dissector