Have all Internet-checksum computing routines return a uint16_t.

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index c79188e8d518ee49da83c055e66fc34fd11ab816..9daf327d5f4087d3766afeab526f6dff4ac4a50a 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,10 +42,6 @@
 
 #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 {
        nd_uint16_t rh_flags;   /* T:2 P:1 CNT:5 PT:8 */
 
 struct rtcphdr {
        nd_uint16_t rh_flags;   /* T:2 P:1 CNT:5 PT:8 */


@@ -62,7 +58,7 @@ typedef struct {
  * Sender report.
  */
 struct rtcp_sr {
  * Sender report.
  */
 struct rtcp_sr {

-       ntp64 sr_ntp;           /* 64-bit ntp timestamp */
+       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 */
        nd_uint32_t sr_ts;      /* reference media timestamp */
        nd_uint32_t sr_np;      /* no. packets sent */
        nd_uint32_t sr_nb;      /* no. bytes sent */


@@ -97,46 +93,53 @@ 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 void *hdr, u_int length)

 {
        /* vat/vt audio */
        u_int ts;
 
 {
        /* vat/vt audio */
        u_int ts;
 

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

        ND_TCHECK_2((const u_int *)hdr);
        ts = EXTRACT_BE_U_2(hdr);
        if ((ts & 0xf060) != 0) {
                /* probably vt */
        ND_TCHECK_2((const u_int *)hdr);
        ts = EXTRACT_BE_U_2(hdr);
        if ((ts & 0xf060) != 0) {
                /* probably vt */

-               ND_TCHECK_2(up->uh_ulen);
-               ND_PRINT((ndo, "udp/vt %u %d / %d",
-                            (uint32_t)(EXTRACT_BE_U_2(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;
 

+               if (length < 8) {
+                       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]);
                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]);

-               ND_TCHECK_2(up->uh_ulen);
-               ND_PRINT((ndo, "udp/vat %u c%d %u%s",
-                       (uint32_t)(EXTRACT_BE_U_2(up->uh_ulen) - sizeof(*up) - 8),
+               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);

        }
        }

+       return;

 
 trunc:
 
 trunc:

-       ND_PRINT((ndo, "%s", vat_tstr));
+       nd_print_trunc(ndo);

 }
 
 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 void *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 +147,16 @@ 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;
 

+       ndo->ndo_protocol = "rtp";
+       if (len < 8) {
+               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]);
        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]);

-       ND_TCHECK_2(up->uh_ulen);
-       dlen = EXTRACT_BE_U_2(up->uh_ulen) - sizeof(*up) - 8;
+       dlen = len - 8;

        ip += 2;
        len >>= 2;
        len -= 2;
        ip += 2;
        len >>= 2;
        len -= 2;


@@ -163,6 +170,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,17 +182,17 @@ 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) {
                ND_TCHECK_4(&((const u_int *)hdr)[2]);
        if (ndo->ndo_vflag) {
                ND_TCHECK_4(&((const u_int *)hdr)[2]);

-               ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(&((const u_int *)hdr)[2])));
+               ND_PRINT(" %u", EXTRACT_BE_U_4(&((const u_int *)hdr)[2]));

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


@@ -189,7 +200,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                                i2 = EXTRACT_BE_U_4(ip);
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
                                i2 = EXTRACT_BE_U_4(ip);
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {

-                                       ND_PRINT((ndo, " !opt"));
+                                       ND_PRINT(" !opt");

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


@@ -202,18 +213,19 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                        i2 = EXTRACT_BE_U_4(ip);
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
                        i2 = EXTRACT_BE_U_4(ip);
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {

-                               ND_PRINT((ndo, " !ext"));
+                               ND_PRINT(" !ext");

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

-                       ND_PRINT((ndo, " 0x%04x", EXTRACT_BE_U_4(ip) >> 16));
+                       ND_PRINT(" 0x%04x", EXTRACT_BE_U_4(ip) >> 16);

        }
        }

+       return;

 
 trunc:
 
 trunc:

-       ND_PRINT((ndo, "%s", rtp_tstr));
+       nd_print_trunc(ndo);

 }
 
 static const u_char *
 }
 
 static const u_char *


@@ -225,88 +237,91 @@ 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;
+       u_int cnt;

        double ts, dts;
        double ts, dts;

+
+       ndo->ndo_protocol = "rtcp";

        if ((const u_char *)(rh + 1) > ep)
                goto trunc;
        if ((const u_char *)(rh + 1) > ep)
                goto trunc;

-       ND_TCHECK(*rh);
+       ND_TCHECK_SIZE(rh);

        len = (EXTRACT_BE_U_2(rh->rh_len) + 1) * 4;
        flags = EXTRACT_BE_U_2(rh->rh_flags);
        cnt = (flags >> 8) & 0x1f;
        switch (flags & 0xff) {
        case RTCP_PT_SR:
                sr = (const struct rtcp_sr *)(rh + 1);
        len = (EXTRACT_BE_U_2(rh->rh_len) + 1) * 4;
        flags = EXTRACT_BE_U_2(rh->rh_flags);
        cnt = (flags >> 8) & 0x1f;
        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_U_4(rh->rh_ssrc)));
+                       ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));

                if ((const u_char *)(sr + 1) > ep)
                        goto trunc;
                if ((const u_char *)(sr + 1) > ep)
                        goto trunc;

-               ND_TCHECK(*sr);
+               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);
                ts = (double)(EXTRACT_BE_U_4(sr->sr_ntp.upper)) +
                    ((double)(EXTRACT_BE_U_4(sr->sr_ntp.lower)) /
                     4294967296.0);

-               ND_PRINT((ndo, " @%.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)));
+               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));

                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_U_4(rh->rh_ssrc)));
+                       ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_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_U_4(rh->rh_ssrc)));
+                       ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_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_U_4(rh->rh_ssrc)));
+                       ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_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) {
+               ND_PRINT(" c%u", cnt);
+       while (cnt != 0) {

                if ((const u_char *)(rr + 1) > ep)
                        goto trunc;
                if ((const u_char *)(rr + 1) > ep)
                        goto trunc;

-               ND_TCHECK(*rr);
+               ND_TCHECK_SIZE(rr);

                if (ndo->ndo_vflag)
                if (ndo->ndo_vflag)

-                       ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(rr->rr_srcid)));
+                       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.;
                ts = (double)(EXTRACT_BE_U_4(rr->rr_lsr)) / 65536.;
                dts = (double)(EXTRACT_BE_U_4(rr->rr_dlsr)) / 65536.;

-               ND_PRINT((ndo, " %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_nl) & 0x00ffffff,
                    EXTRACT_BE_U_4(rr->rr_ls),

-                   EXTRACT_BE_U_4(rr->rr_dv), ts, dts));
+                   EXTRACT_BE_U_4(rr->rr_dv), ts, dts);
+               cnt--;

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

-       ND_PRINT((ndo, "%s", rtcp_tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
        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,


@@ -324,68 +339,67 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
                ip6 = NULL;
 
        if (ip6) {
                ip6 = NULL;
 
        if (ip6) {

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

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

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

                        } else {
                        } else {

-                               ND_PRINT((ndo, "%s.%s > %s.%s: ",
-                                       ip6addr_string(ndo, &ip6->ip6_src),
+                               ND_PRINT("%s.%s > %s.%s: ",
+                                       ip6addr_string(ndo, ip6->ip6_src),

                                        udpport_string(ndo, sport),
                                        udpport_string(ndo, sport),

-                                       ip6addr_string(ndo, &ip6->ip6_dst),
-                                       udpport_string(ndo, dport)));
+                                       ip6addr_string(ndo, ip6->ip6_dst),
+                                       udpport_string(ndo, dport));

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

-                               ND_PRINT((ndo, "%s > %s: ",
+                               ND_PRINT("%s > %s: ",

                                        udpport_string(ndo, sport),
                                        udpport_string(ndo, sport),

-                                       udpport_string(ndo, dport)));
+                                       udpport_string(ndo, dport));

                        }
                }
        } else {
                if (EXTRACT_U_1(ip->ip_p) == IPPROTO_UDP) {
                        if (sport == -1) {
                        }
                }
        } else {
                if (EXTRACT_U_1(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)));
+                               ND_PRINT("%s > %s: ",
+                                       ipaddr_string(ndo, ip->ip_src),
+                                       ipaddr_string(ndo, ip->ip_dst));

                        } else {
                        } else {

-                               ND_PRINT((ndo, "%s.%s > %s.%s: ",
-                                       ipaddr_string(ndo, &ip->ip_src),
+                               ND_PRINT("%s.%s > %s.%s: ",
+                                       ipaddr_string(ndo, ip->ip_src),

                                        udpport_string(ndo, sport),
                                        udpport_string(ndo, sport),

-                                       ipaddr_string(ndo, &ip->ip_dst),
-                                       udpport_string(ndo, dport)));
+                                       ipaddr_string(ndo, ip->ip_dst),
+                                       udpport_string(ndo, dport));

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

-                               ND_PRINT((ndo, "%s > %s: ",
+                               ND_PRINT("%s > %s: ",

                                        udpport_string(ndo, sport),
                                        udpport_string(ndo, sport),

-                                       udpport_string(ndo, dport)));
+                                       udpport_string(ndo, dport));

                        }
                }
        }
 }
 
 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)

 {
 {

-       register const struct udphdr *up;
-       register const struct ip *ip;
-       register const u_char *cp;
-       register const u_char *ep = bp + length;
+       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, ulen;

-       register const struct ip6_hdr *ip6;
+       const struct ip6_hdr *ip6;

 
 

-       if (ep > ndo->ndo_snapend)
-               ep = ndo->ndo_snapend;
+       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)) {
+       if (!ND_TTEST_2(up->uh_dport)) {

                udpipaddr_print(ndo, ip, -1, -1);
                goto trunc;
        }
                udpipaddr_print(ndo, ip, -1, -1);
                goto trunc;
        }


@@ -395,17 +409,17 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 
        if (length < sizeof(struct udphdr)) {
                udpipaddr_print(ndo, ip, sport, dport);
 
        if (length < sizeof(struct udphdr)) {
                udpipaddr_print(ndo, ip, sport, dport);

-               ND_PRINT((ndo, "truncated-udp %d", length));
+               ND_PRINT("truncated-udp %u", length);

                return;
        }
                return;
        }

-       if (!ND_TTEST(up->uh_ulen)) {
+       if (!ND_TTEST_2(up->uh_ulen)) {

                udpipaddr_print(ndo, ip, sport, dport);
                goto trunc;
        }
        ulen = EXTRACT_BE_U_2(up->uh_ulen);
        if (ulen < sizeof(struct udphdr)) {
                udpipaddr_print(ndo, ip, sport, dport);
                udpipaddr_print(ndo, ip, sport, dport);
                goto trunc;
        }
        ulen = EXTRACT_BE_U_2(up->uh_ulen);
        if (ulen < sizeof(struct udphdr)) {
                udpipaddr_print(ndo, ip, sport, dport);

-               ND_PRINT((ndo, "truncated-udplength %d", ulen));
+               ND_PRINT("truncated-udplength %u", ulen);

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


@@ -420,24 +434,25 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
        }
 
        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:
                        udpipaddr_print(ndo, ip, sport, dport);
                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, (const void *)(up + 1), 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 void *)(up + 1), length);
+                       wb_print(ndo, (const u_char *)(up + 1), length);

                        break;
 
                case PT_RPC:
                        rp = (const struct sunrpc_msg *)(up + 1);
                        break;
 
                case PT_RPC:
                        rp = (const struct sunrpc_msg *)(up + 1);

-                       direction = (enum sunrpc_msg_type) EXTRACT_BE_U_4(&rp->rm_direction);
+                       ND_TCHECK_4(rp->rm_direction);
+                       direction = (enum sunrpc_msg_type) EXTRACT_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);


@@ -448,7 +463,7 @@ udp_print(netdissect_options *ndo, register 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, up);
+                       rtp_print(ndo, (const void *)(up + 1), length);

                        break;
 
                case PT_RTCP:
                        break;
 
                case PT_RTCP:


@@ -503,20 +518,22 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 
        udpipaddr_print(ndo, ip, sport, dport);
        if (!ndo->ndo_qflag) {
 
        udpipaddr_print(ndo, ip, sport, dport);
        if (!ndo->ndo_qflag) {

-               register const struct sunrpc_msg *rp;
+               const struct sunrpc_msg *rp;

                enum sunrpc_msg_type direction;
 
                rp = (const struct sunrpc_msg *)(up + 1);
                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_U_4(&rp->rm_direction);
+               if (ND_TTEST_4(rp->rm_direction)) {
+                       direction = (enum sunrpc_msg_type) EXTRACT_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_U_4(&rp->rm_xid)));
+                               ND_PRINT("NFS request xid %u ",
+                                        EXTRACT_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_U_4(&rp->rm_xid)));
+                               ND_PRINT("NFS reply xid %u ",
+                                        EXTRACT_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;


@@ -539,32 +556,34 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                 * TCP does, and we do so for UDP-over-IPv6.
                 */
                if (IP_V(ip) == 4 && (ndo->ndo_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 (udp_sum == 0) {
                        udp_sum = EXTRACT_BE_U_2(up->uh_sum);
                        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));
 
                                if (sum != 0) {
                                sum = udp_cksum(ndo, ip, up, length + sizeof(struct udphdr));
 
                                if (sum != 0) {

-                                       ND_PRINT((ndo, "[bad udp cksum 0x%04x -> 0x%04x!] ",
+                                       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) {
                        /* for IPv6, UDP checksum is mandatory */
                        }
                }
                else if (IP_V(ip) == 6 && ip6->ip6_plen) {
                        /* 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));

+                               ND_TCHECK_2(up->uh_sum);

                                udp_sum = EXTRACT_BE_U_2(up->uh_sum);
 
                                if (sum != 0) {
                                udp_sum = EXTRACT_BE_U_2(up->uh_sum);
 
                                if (sum != 0) {

-                                       ND_PRINT((ndo, "[bad udp cksum 0x%04x -> 0x%04x!] ",
+                                       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] ");

                        }
                }
        }
                        }
                }
        }


@@ -596,7 +615,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                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))
                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 void *)(up + 1));
+                       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);
 #ifdef ENABLE_SMB
                else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
                        l2tp_print(ndo, (const u_char *)(up + 1), length);
 #ifdef ENABLE_SMB


@@ -606,16 +625,16 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                        nbt_udp138_print(ndo, (const u_char *)(up + 1), length);
 #endif
                else if (dport == VAT_PORT)
                        nbt_udp138_print(ndo, (const u_char *)(up + 1), length);
 #endif
                else if (dport == VAT_PORT)

-                       vat_print(ndo, (const void *)(up + 1), up);
+                       vat_print(ndo, (const void *)(up + 1), 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, (const u_char *)(up + 1), length);

                /*
                 * Since there are 10 possible ports to check, I think
                 * a <> test would be more efficient
                 */
                else if ((sport >= RX_PORT_LOW && sport <= RX_PORT_HIGH) ||
                         (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
                /*
                 * 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, (const u_char *)(up + 1), length, sport, dport,

                                 (const u_char *) ip);
                else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
                        ripng_print(ndo, (const u_char *)(up + 1), length);
                                 (const u_char *) ip);
                else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
                        ripng_print(ndo, (const u_char *)(up + 1), length);


@@ -631,9 +650,9 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int 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, (const u_char *)(up + 1), 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, (const u_char *)(up + 1), 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) ||
                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) ||


@@ -681,36 +700,28 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                        lisp_print(ndo, (const u_char *)(up + 1), length);
                else if (IS_SRC_OR_DST_PORT(VXLAN_GPE_PORT))
                        vxlan_gpe_print(ndo, (const u_char *)(up + 1), length);
                        lisp_print(ndo, (const u_char *)(up + 1), length);
                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))) {
+               else if (ND_TTEST_1(((const struct LAP *)cp)->type) &&
+                        EXTRACT_U_1(((const struct LAP *)cp)->type) == lapDDP &&
+                        (atalk_port(sport) || atalk_port(dport))) {

                        if (ndo->ndo_vflag)
                        if (ndo->ndo_vflag)

-                               ND_PRINT((ndo, "kip "));
+                               ND_PRINT("kip ");

                        llap_print(ndo, cp, length);
                } else {
                        if (ulen > length)
                        llap_print(ndo, cp, length);
                } else {
                        if (ulen > length)

-                               ND_PRINT((ndo, "UDP, bad length %u > %u",
-                                   ulen, length));
+                               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 {
                if (ulen > length)
                }
        } else {
                if (ulen > length)

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

-       ND_PRINT((ndo, "%s", udp_tstr));
+       nd_print_trunc(ndo);

 }
 }

-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */