]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-udp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10
[tcpdump] / print-udp.c
diff --git a/print-udp.c b/print-udp.c
index 7ad5cd9165de7077e741bbd359fe7d712eb49adb..982ddb9291f62d6d81f4075d60089c8b251b11c0 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,9 +21,7 @@
 
 /* \summary: UDP printer */
 
 
 /* \summary: UDP printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 
@@ -81,19 +79,19 @@ struct rtcp_rr {
 #define RTCP_PT_SR     200
 #define RTCP_PT_RR     201
 #define RTCP_PT_SDES   202
 #define RTCP_PT_SR     200
 #define RTCP_PT_RR     201
 #define RTCP_PT_SDES   202
-#define        RTCP_SDES_CNAME 1
-#define        RTCP_SDES_NAME  2
-#define        RTCP_SDES_EMAIL 3
-#define        RTCP_SDES_PHONE 4
-#define        RTCP_SDES_LOC   5
-#define        RTCP_SDES_TOOL  6
-#define        RTCP_SDES_NOTE  7
-#define        RTCP_SDES_PRIV  8
+#define    RTCP_SDES_CNAME     1
+#define    RTCP_SDES_NAME      2
+#define    RTCP_SDES_EMAIL     3
+#define    RTCP_SDES_PHONE     4
+#define    RTCP_SDES_LOC       5
+#define    RTCP_SDES_TOOL      6
+#define    RTCP_SDES_NOTE      7
+#define    RTCP_SDES_PRIV      8
 #define RTCP_PT_BYE    203
 #define RTCP_PT_APP    204
 
 static void
 #define RTCP_PT_BYE    203
 #define RTCP_PT_APP    204
 
 static void
-vat_print(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,7 +101,6 @@ 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 = GET_BE_U_2(hdr);
        if ((ts & 0xf060) != 0) {
                /* probably vt */
        ts = GET_BE_U_2(hdr);
        if ((ts & 0xf060) != 0) {
                /* probably vt */
@@ -118,9 +115,7 @@ 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 = GET_BE_U_4(&((const u_int *)hdr)[0]);
                i0 = GET_BE_U_4(&((const u_int *)hdr)[0]);
-               ND_TCHECK_4(&((const u_int *)hdr)[1]);
                i1 = GET_BE_U_4(&((const u_int *)hdr)[1]);
                ND_PRINT("udp/vat %u c%u %u%s",
                        length - 8,
                i1 = GET_BE_U_4(&((const u_int *)hdr)[1]);
                ND_PRINT("udp/vat %u c%u %u%s",
                        length - 8,
@@ -132,14 +127,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,9 +143,7 @@ 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 = GET_BE_U_4(&((const u_int *)hdr)[0]);
        i0 = GET_BE_U_4(&((const u_int *)hdr)[0]);
-       ND_TCHECK_4(&((const u_int *)hdr)[1]);
        i1 = GET_BE_U_4(&((const u_int *)hdr)[1]);
        dlen = len - 8;
        ip += 2;
        i1 = GET_BE_U_4(&((const u_int *)hdr)[1]);
        dlen = len - 8;
        ip += 2;
@@ -191,12 +180,10 @@ 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", GET_BE_U_4(&((const u_int *)hdr)[2]));
                if (hasopt) {
                        u_int i2, optlen;
                        do {
                ND_PRINT(" %u", GET_BE_U_4(&((const u_int *)hdr)[2]));
                if (hasopt) {
                        u_int i2, optlen;
                        do {
-                               ND_TCHECK_4(ip);
                                i2 = GET_BE_U_4(ip);
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
                                i2 = GET_BE_U_4(ip);
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
@@ -209,7 +196,6 @@ 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 = GET_BE_U_4(ip);
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
                        i2 = GET_BE_U_4(ip);
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
@@ -218,18 +204,13 @@ 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 */
                        ND_PRINT(" 0x%04x", GET_BE_U_4(ip) >> 16);
        }
                if (contype == 0x1f) /*XXX H.261 */
                        ND_PRINT(" 0x%04x", GET_BE_U_4(ip) >> 16);
        }
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
 }
 
 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;
@@ -237,16 +218,15 @@ 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;
+       uint32_t ssrc;
        u_int cnt;
        double ts, dts;
 
        ndo->ndo_protocol = "rtcp";
        u_int cnt;
        double ts, dts;
 
        ndo->ndo_protocol = "rtcp";
-       if ((const u_char *)(rh + 1) > ep)
-               goto trunc;
-       ND_TCHECK_SIZE(rh);
        len = (GET_BE_U_2(rh->rh_len) + 1) * 4;
        flags = GET_BE_U_2(rh->rh_flags);
        cnt = (flags >> 8) & 0x1f;
        len = (GET_BE_U_2(rh->rh_len) + 1) * 4;
        flags = GET_BE_U_2(rh->rh_flags);
        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);
@@ -254,13 +234,10 @@ 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", GET_BE_U_4(rh->rh_ssrc));
-               if ((const u_char *)(sr + 1) > ep)
-                       goto trunc;
-               ND_TCHECK_SIZE(sr);
+                       ND_PRINT(" %u", ssrc);
                ts = (double)(GET_BE_U_4(sr->sr_ntp.upper)) +
                    ((double)(GET_BE_U_4(sr->sr_ntp.lower)) /
                ts = (double)(GET_BE_U_4(sr->sr_ntp.upper)) +
                    ((double)(GET_BE_U_4(sr->sr_ntp.lower)) /
-                    4294967296.0);
+                    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);
                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);
@@ -271,18 +248,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", GET_BE_U_4(rh->rh_ssrc));
+                       ND_PRINT(" %u", 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", GET_BE_U_4(rh->rh_ssrc));
+                       ND_PRINT(" %u", 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", GET_BE_U_4(rh->rh_ssrc));
+                       ND_PRINT(" %u", ssrc);
                cnt = 0;
                break;
        default:
                cnt = 0;
                break;
        default:
@@ -293,9 +270,6 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
        if (cnt > 1)
                ND_PRINT(" c%u", cnt);
        while (cnt != 0) {
        if (cnt > 1)
                ND_PRINT(" c%u", cnt);
        while (cnt != 0) {
-               if ((const u_char *)(rr + 1) > ep)
-                       goto trunc;
-               ND_TCHECK_SIZE(rr);
                if (ndo->ndo_vflag)
                        ND_PRINT(" %u", GET_BE_U_4(rr->rr_srcid));
                ts = (double)(GET_BE_U_4(rr->rr_lsr)) / 65536.;
                if (ndo->ndo_vflag)
                        ND_PRINT(" %u", GET_BE_U_4(rr->rr_srcid));
                ts = (double)(GET_BE_U_4(rr->rr_lsr)) / 65536.;
@@ -307,10 +281,6 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
                cnt--;
        }
        return (hdr + len);
                cnt--;
        }
        return (hdr + len);
-
-trunc:
-       nd_print_trunc(ndo);
-       return ep;
 }
 
 static uint16_t udp_cksum(netdissect_options *ndo, const struct ip *ip,
 }
 
 static uint16_t udp_cksum(netdissect_options *ndo, const struct ip *ip,
@@ -329,55 +299,41 @@ static uint16_t 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 (GET_U_1(ip6->ip6_nxt) == IPPROTO_UDP) {
-                       if (sport == -1) {
-                               ND_PRINT("%s > %s: ",
-                                       ip6addr_string(ndo, ip6->ip6_src),
-                                       ip6addr_string(ndo, ip6->ip6_dst));
-                       } else {
-                               ND_PRINT("%s.%s > %s.%s: ",
-                                       ip6addr_string(ndo, ip6->ip6_src),
-                                       udpport_string(ndo, (uint16_t)sport),
-                                       ip6addr_string(ndo, ip6->ip6_dst),
-                                       udpport_string(ndo, (uint16_t)dport));
-                       }
-               } else {
-                       if (sport != -1) {
-                               ND_PRINT("%s > %s: ",
-                                       udpport_string(ndo, (uint16_t)sport),
-                                       udpport_string(ndo, (uint16_t)dport));
-                       }
-               }
-       } else {
-               if (GET_U_1(ip->ip_p) == IPPROTO_UDP) {
-                       if (sport == -1) {
-                               ND_PRINT("%s > %s: ",
-                                       ipaddr_string(ndo, ip->ip_src),
-                                       ipaddr_string(ndo, ip->ip_dst));
-                       } else {
-                               ND_PRINT("%s.%s > %s.%s: ",
-                                       ipaddr_string(ndo, ip->ip_src),
-                                       udpport_string(ndo, (uint16_t)sport),
-                                       ipaddr_string(ndo, ip->ip_dst),
-                                       udpport_string(ndo, (uint16_t)dport));
-                       }
-               } else {
-                       if (sport != -1) {
-                               ND_PRINT("%s > %s: ",
-                                       udpport_string(ndo, (uint16_t)sport),
-                                       udpport_string(ndo, (uint16_t)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));
        }
 }
 
        }
 }
 
@@ -389,7 +345,9 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
        const struct ip *ip;
        const u_char *cp;
        const u_char *ep = ndo->ndo_snapend;
        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;
+       uint16_t udp_sum;
        const struct ip6_hdr *ip6;
 
        ndo->ndo_protocol = "udp";
        const struct ip6_hdr *ip6;
 
        ndo->ndo_protocol = "udp";
@@ -400,38 +358,33 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
        else
                ip6 = NULL;
        if (!ND_TTEST_2(up->uh_dport)) {
        else
                ip6 = NULL;
        if (!ND_TTEST_2(up->uh_dport)) {
-               udpipaddr_print(ndo, ip, -1, -1);
-               goto trunc;
+               udpipaddr_noport_print(ndo, ip);
+               nd_trunc_longjmp(ndo);
        }
 
        sport = GET_BE_U_2(up->uh_sport);
        dport = GET_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)) {
+       if (ndo->ndo_packettype != PT_RPC)
                udpipaddr_print(ndo, ip, sport, dport);
                udpipaddr_print(ndo, ip, sport, dport);
-               ND_PRINT("truncated-udp %u", length);
-               return;
-       }
-       if (!ND_TTEST_2(up->uh_ulen)) {
-               udpipaddr_print(ndo, ip, sport, dport);
-               goto trunc;
-       }
+
+       ND_ICHECKMSG_ZU("undersized-udp", length, <, sizeof(struct udphdr));
        ulen = GET_BE_U_2(up->uh_ulen);
        ulen = GET_BE_U_2(up->uh_ulen);
-       if (ulen < sizeof(struct udphdr)) {
-               udpipaddr_print(ndo, ip, sport, dport);
-               ND_PRINT("truncated-udplength %u", ulen);
-               return;
-       }
+       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_ICHECKMSG_ZU("undersized-udplength", ulen, <,
+                       sizeof(struct udphdr));
        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) {
                const struct sunrpc_msg *rp;
 
        if (ndo->ndo_packettype) {
                const struct sunrpc_msg *rp;
@@ -440,18 +393,15 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
                switch (ndo->ndo_packettype) {
 
                case PT_VAT:
                switch (ndo->ndo_packettype) {
 
                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:
                        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);
+                       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,
                        direction = (enum sunrpc_msg_type) GET_BE_U_4(rp->rm_direction);
                        if (direction == SUNRPC_CALL)
                                sunrpc_print(ndo, (const u_char *)rp, length,
@@ -462,66 +412,67 @@ udp_print(netdissect_options *ndo, 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);
+                       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,
-                           ip6 != NULL);
+                       aodv_print(ndo, cp, length, IP_V(ip) == 6);
                        break;
 
                case PT_RADIUS:
                        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;
+               case PT_QUIC:
+                       quic_print(ndo, cp);
+                       break;
                }
                return;
        }
 
                }
                return;
        }
 
-       udpipaddr_print(ndo, ip, sport, dport);
        if (!ndo->ndo_qflag) {
                const struct sunrpc_msg *rp;
                enum sunrpc_msg_type direction;
 
        if (!ndo->ndo_qflag) {
                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)) {
                        direction = (enum sunrpc_msg_type) GET_BE_U_4(rp->rm_direction);
                        if (dport == NFS_PORT && direction == SUNRPC_CALL) {
                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) {
@@ -548,37 +499,32 @@ 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;
 
                /*
                 * 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 = GET_BE_U_2(up->uh_sum);
+               if (IP_V(ip) == 4 && (ndo->ndo_vflag > 1)) {
                        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));
                                } else
                                        ND_PRINT("[udp sum ok] ");
                        }
                                        ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
                                            udp_sum,
                                            in_cksum_shouldbe(udp_sum, sum));
                                } else
                                        ND_PRINT("[udp sum ok] ");
                        }
-               }
-               else if (IP_V(ip) == 6 && 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 = 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,133 +536,154 @@ 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);
-               else if (IS_SRC_OR_DST_PORT(MULTICASTDNS_PORT))
-                       domain_print(ndo, (const u_char *)(up + 1), length, 1);
-               else if (IS_SRC_OR_DST_PORT(TIMED_PORT))
-                       timed_print(ndo, (const u_char *)(up + 1));
+                       /* over_tcp: FALSE, is_mdns: FALSE */
+                       domain_print(ndo, cp, length, FALSE, FALSE);
+               else if (IS_SRC_OR_DST_PORT(BOOTPC_PORT) ||
+                        IS_SRC_OR_DST_PORT(BOOTPS_PORT))
+                       bootp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(TFTP_PORT))
                else if (IS_SRC_OR_DST_PORT(TFTP_PORT))
-                       tftp_print(ndo, (const u_char *)(up + 1), length);
-               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);
-               else if (IS_SRC_OR_DST_PORT(RIP_PORT))
-                       rip_print(ndo, (const u_char *)(up + 1), length);
-               else if (IS_SRC_OR_DST_PORT(AODV_PORT))
-                       aodv_print(ndo, (const u_char *)(up + 1), length,
-                           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, 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, (const u_char *)(up + 1), length, bp2);
-               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);
+                       tftp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(KERBEROS_PORT))
+                       krb_print(ndo, (const u_char *)cp);
                else if (IS_SRC_OR_DST_PORT(NTP_PORT))
                else if (IS_SRC_OR_DST_PORT(NTP_PORT))
-                       ntp_print(ndo, (const u_char *)(up + 1), length);
-               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));
-               else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
-                       l2tp_print(ndo, (const u_char *)(up + 1), length);
+                       ntp_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
 #endif
+               else if (IS_SRC_OR_DST_PORT(SNMP_PORT) ||
+                        IS_SRC_OR_DST_PORT(SNMPTRAP_PORT))
+                       snmp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(PTP_EVENT_PORT) ||
+                        IS_SRC_OR_DST_PORT(PTP_GENERAL_PORT))
+                       ptp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))
+                       cisco_autorp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT))
+                        isakmp_print(ndo, cp, length, bp2);
+               else if (IS_SRC_OR_DST_PORT(SYSLOG_PORT))
+                       syslog_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(RIP_PORT))
+                       rip_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
+                       ripng_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(TIMED_PORT))
+                       timed_print(ndo, (const u_char *)cp);
+               else if (IS_SRC_OR_DST_PORT(DHCP6_SERV_PORT) ||
+                        IS_SRC_OR_DST_PORT(DHCP6_CLI_PORT))
+                       dhcp6_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(LDP_PORT))
+                       ldp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(AODV_PORT))
+                       aodv_print(ndo, cp, length, IP_V(ip) == 6);
+               else if (IS_SRC_OR_DST_PORT(OLSR_PORT))
+                       olsr_print(ndo, cp, length, IP_V(ip) == 6);
+               else if (IS_SRC_OR_DST_PORT(LMP_PORT))
+                       lmp_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(KERBEROS_SEC_PORT))
+                       krb_print(ndo, (const u_char *)cp);
+               else if (IS_SRC_OR_DST_PORT(LWRES_PORT))
+                       lwres_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(MULTICASTDNS_PORT))
+                       /* over_tcp: FALSE, is_mdns: TRUE */
+                       domain_print(ndo, cp, length, FALSE, TRUE);
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_NATT))
+                        isakmp_rfc3948_print(ndo, cp, length, bp2, IP_V(ip), fragmented, ttl_hl);
+               else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER1) || IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER2))
+                       isakmp_print(ndo, cp, length, bp2);
+               else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
+                       l2tp_print(ndo, cp, length);
                else if (dport == VAT_PORT)
                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);
                                 (const u_char *) ip);
-               else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
-                       ripng_print(ndo, (const u_char *)(up + 1), length);
-               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);
                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);
-               else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))
-                       cisco_autorp_print(ndo, (const u_char *)(up + 1), length);
+                       wb_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(RADIUS_PORT) ||
                         IS_SRC_OR_DST_PORT(RADIUS_NEW_PORT) ||
                         IS_SRC_OR_DST_PORT(RADIUS_ACCOUNTING_PORT) ||
                         IS_SRC_OR_DST_PORT(RADIUS_NEW_ACCOUNTING_PORT) ||
                         IS_SRC_OR_DST_PORT(RADIUS_CISCO_COA_PORT) ||
                         IS_SRC_OR_DST_PORT(RADIUS_COA_PORT) )
                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);
-               else if (IS_SRC_OR_DST_PORT(LWRES_PORT))
-                       lwres_print(ndo, (const u_char *)(up + 1), length);
-               else if (IS_SRC_OR_DST_PORT(LDP_PORT))
-                       ldp_print(ndo, (const u_char *)(up + 1), length);
-               else if (IS_SRC_OR_DST_PORT(OLSR_PORT))
-                       olsr_print(ndo, (const u_char *)(up + 1), length,
-                                       (IP_V(ip) == 6) ? 1 : 0);
+                       hsrp_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(MPLS_LSP_PING_PORT))
                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 (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(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(OTV_PORT))
+                       otv_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(VXLAN_PORT))
+                       vxlan_print(ndo, cp, length);
+               else if (dport == GENEVE_PORT)
+                       geneve_print(ndo, cp, length);
                else if (IS_SRC_OR_DST_PORT(LISP_CONTROL_PORT))
                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))
                else if (IS_SRC_OR_DST_PORT(ZEP_PORT))
-                       zep_print(ndo, (const u_char *)(up + 1), length);
-               else if (ND_TTEST_1(((const struct LAP *)cp)->type) &&
-                        GET_U_1(((const struct LAP *)cp)->type) == lapDDP &&
-                        (atalk_port(sport) || atalk_port(dport))) {
+                       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)
                                ND_PRINT("kip ");
                        llap_print(ndo, cp, length);
                        if (ndo->ndo_vflag)
                                ND_PRINT("kip ");
                        llap_print(ndo, cp, length);
-               } else {
-                       if (ulen > length)
+               } else if (IS_SRC_OR_DST_PORT(SOMEIP_PORT))
+                       someip_print(ndo, cp, length);
+               else if (IS_SRC_OR_DST_PORT(HTTPS_PORT) &&
+                        quic_detect(ndo, cp, length))
+                       quic_print(ndo, cp);
+               else if (sport == BCM_LI_PORT)
+                       bcm_li_print(ndo, cp, length);
+               else {
+                       if (ulen > length && !fragmented)
                                ND_PRINT("UDP, bad length %u > %u",
                                    ulen, length);
                        else
                                ND_PRINT("UDP, length %u", ulen);
                }
        } else {
                                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
@@ -724,6 +691,6 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
        }
        return;
 
        }
        return;
 
-trunc:
-       nd_print_trunc(ndo);
+invalid:
+       nd_print_invalid(ndo);
 }
 }
[mirror] the TCPdump network dissector