RIPng: Use more ND_TCHECK_SIZE() macros

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 8d662a5f8a50292ddb78ff63fa41a3356f30f4bf..5d350f87280456bdffc1612c56161a52fd791467 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -31,10 +31,10 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

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

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -57,11 +57,11 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 
 static int tcp_verify_signature(netdissect_options *ndo,
                                 const struct ip *ip, const struct tcphdr *tp,
 
 static int tcp_verify_signature(netdissect_options *ndo,
                                 const struct ip *ip, const struct tcphdr *tp,

-                                const u_char *data, int length, const u_char *rcvsig);
+                                const u_char *data, u_int length, const u_char *rcvsig);

 #endif
 
 #endif
 

-static void print_tcp_rst_data(netdissect_options *, register const u_char *sp, u_int length);
-static void print_tcp_fastopen_option(netdissect_options *ndo, register const u_char *cp,
+static void print_tcp_rst_data(netdissect_options *, const u_char *sp, u_int length);
+static void print_tcp_fastopen_option(netdissect_options *ndo, const u_char *cp,

                                       u_int datalen, int exp);
 
 #define MAX_RST_DATA_LEN       30
                                       u_int datalen, int exp);
 
 #define MAX_RST_DATA_LEN       30


@@ -76,8 +76,8 @@ struct tha {
 struct tcp_seq_hash {
         struct tcp_seq_hash *nxt;
         struct tha addr;
 struct tcp_seq_hash {
         struct tcp_seq_hash *nxt;
         struct tha addr;

-        tcp_seq seq;
-        tcp_seq ack;
+        uint32_t seq;
+        uint32_t ack;

 };
 
 struct tha6 {
 };
 
 struct tha6 {


@@ -89,8 +89,8 @@ struct tha6 {
 struct tcp_seq_hash6 {
         struct tcp_seq_hash6 *nxt;
         struct tha6 addr;
 struct tcp_seq_hash6 {
         struct tcp_seq_hash6 *nxt;
         struct tha6 addr;

-        tcp_seq seq;
-        tcp_seq ack;
+        uint32_t seq;
+        uint32_t ack;

 };
 
 #define TSEQ_HASHSIZE 919
 };
 
 #define TSEQ_HASHSIZE 919


@@ -138,9 +138,9 @@ static const struct tok tcp_option_values[] = {
 
 static int
 tcp_cksum(netdissect_options *ndo,
 
 static int
 tcp_cksum(netdissect_options *ndo,

-          register const struct ip *ip,
-          register const struct tcphdr *tp,
-          register u_int len)
+          const struct ip *ip,
+          const struct tcphdr *tp,
+          u_int len)

 {
        return nextproto4_cksum(ndo, ip, (const uint8_t *)tp, len, len,
                                IPPROTO_TCP);
 {
        return nextproto4_cksum(ndo, ip, (const uint8_t *)tp, len, len,
                                IPPROTO_TCP);


@@ -148,9 +148,9 @@ tcp_cksum(netdissect_options *ndo,
 
 static int
 tcp6_cksum(netdissect_options *ndo,
 
 static int
 tcp6_cksum(netdissect_options *ndo,

-           register const struct ip6_hdr *ip6,
-           register const struct tcphdr *tp,
-           register u_int len)
+           const struct ip6_hdr *ip6,
+           const struct tcphdr *tp,
+           u_int len)

 {
        return nextproto6_cksum(ndo, ip6, (const uint8_t *)tp, len, len,
                                IPPROTO_TCP);
 {
        return nextproto6_cksum(ndo, ip6, (const uint8_t *)tp, len, len,
                                IPPROTO_TCP);


@@ -158,20 +158,20 @@ tcp6_cksum(netdissect_options *ndo,
 
 void
 tcp_print(netdissect_options *ndo,
 
 void
 tcp_print(netdissect_options *ndo,

-          register const u_char *bp, register u_int length,
-          register const u_char *bp2, int fragmented)
+          const u_char *bp, u_int length,
+          const u_char *bp2, int fragmented)

 {
 {

-        register const struct tcphdr *tp;
-        register const struct ip *ip;
-        register u_char flags;
-        register u_int hlen;
-        register char ch;
+        const struct tcphdr *tp;
+        const struct ip *ip;
+        u_char flags;
+        u_int hlen;
+        char ch;

         uint16_t sport, dport, win, urp;
         uint32_t seq, ack, thseq, thack;
         u_int utoval;
         uint16_t magic;
         uint16_t sport, dport, win, urp;
         uint32_t seq, ack, thseq, thack;
         u_int utoval;
         uint16_t magic;

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

 
         tp = (const struct tcphdr *)bp;
         ip = (const struct ip *)bp2;
 
         tp = (const struct tcphdr *)bp;
         ip = (const struct ip *)bp2;


@@ -180,66 +180,66 @@ tcp_print(netdissect_options *ndo,
         else
                 ip6 = NULL;
         ch = '\0';
         else
                 ip6 = NULL;
         ch = '\0';

-        if (!ND_TTEST(tp->th_dport)) {
-                ND_PRINT((ndo, "%s > %s: [|tcp]",
+        if (!ND_TTEST_2(tp->th_dport)) {
+                ND_PRINT("%s > %s: [|tcp]",

                              ipaddr_string(ndo, &ip->ip_src),
                              ipaddr_string(ndo, &ip->ip_src),

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

                 return;
         }
 
                 return;
         }
 

-        sport = EXTRACT_16BITS(&tp->th_sport);
-        dport = EXTRACT_16BITS(&tp->th_dport);
+        sport = EXTRACT_BE_U_2(tp->th_sport);
+        dport = EXTRACT_BE_U_2(tp->th_dport);

 
         if (ip6) {
 
         if (ip6) {

-                if (ip6->ip6_nxt == IPPROTO_TCP) {
-                        ND_PRINT((ndo, "%s.%s > %s.%s: ",
+                if (EXTRACT_U_1(ip6->ip6_nxt) == IPPROTO_TCP) {
+                        ND_PRINT("%s.%s > %s.%s: ",

                                      ip6addr_string(ndo, &ip6->ip6_src),
                                      tcpport_string(ndo, sport),
                                      ip6addr_string(ndo, &ip6->ip6_dst),
                                      ip6addr_string(ndo, &ip6->ip6_src),
                                      tcpport_string(ndo, sport),
                                      ip6addr_string(ndo, &ip6->ip6_dst),

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

                 } else {
                 } else {

-                        ND_PRINT((ndo, "%s > %s: ",
-                                     tcpport_string(ndo, sport), tcpport_string(ndo, dport)));
+                        ND_PRINT("%s > %s: ",
+                                     tcpport_string(ndo, sport), tcpport_string(ndo, dport));

                 }
         } else {
                 }
         } else {

-                if (ip->ip_p == IPPROTO_TCP) {
-                        ND_PRINT((ndo, "%s.%s > %s.%s: ",
+                if (EXTRACT_U_1(ip->ip_p) == IPPROTO_TCP) {
+                        ND_PRINT("%s.%s > %s.%s: ",

                                      ipaddr_string(ndo, &ip->ip_src),
                                      tcpport_string(ndo, sport),
                                      ipaddr_string(ndo, &ip->ip_dst),
                                      ipaddr_string(ndo, &ip->ip_src),
                                      tcpport_string(ndo, sport),
                                      ipaddr_string(ndo, &ip->ip_dst),

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

                 } else {
                 } else {

-                        ND_PRINT((ndo, "%s > %s: ",
-                                     tcpport_string(ndo, sport), tcpport_string(ndo, dport)));
+                        ND_PRINT("%s > %s: ",
+                                     tcpport_string(ndo, sport), tcpport_string(ndo, dport));

                 }
         }
 
                 }
         }
 

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

 
         hlen = TH_OFF(tp) * 4;
 
         if (hlen < sizeof(*tp)) {
 
         hlen = TH_OFF(tp) * 4;
 
         if (hlen < sizeof(*tp)) {

-                ND_PRINT((ndo, " tcp %d [bad hdr length %u - too short, < %lu]",
-                             length - hlen, hlen, (unsigned long)sizeof(*tp)));
+                ND_PRINT(" tcp %u [bad hdr length %u - too short, < %lu]",
+                             length - hlen, hlen, (unsigned long)sizeof(*tp));

                 return;
         }
 
                 return;
         }
 

-        seq = EXTRACT_32BITS(&tp->th_seq);
-        ack = EXTRACT_32BITS(&tp->th_ack);
-        win = EXTRACT_16BITS(&tp->th_win);
-        urp = EXTRACT_16BITS(&tp->th_urp);
+        seq = EXTRACT_BE_U_4(tp->th_seq);
+        ack = EXTRACT_BE_U_4(tp->th_ack);
+        win = EXTRACT_BE_U_2(tp->th_win);
+        urp = EXTRACT_BE_U_2(tp->th_urp);

 
         if (ndo->ndo_qflag) {
 
         if (ndo->ndo_qflag) {

-                ND_PRINT((ndo, "tcp %d", length - hlen));
+                ND_PRINT("tcp %u", length - hlen);

                 if (hlen > length) {
                 if (hlen > length) {

-                        ND_PRINT((ndo, " [bad hdr length %u - too long, > %u]",
-                                     hlen, length));
+                        ND_PRINT(" [bad hdr length %u - too long, > %u]",
+                                     hlen, length);

                 }
                 return;
         }
 
                 }
                 return;
         }
 

-        flags = tp->th_flags;
-        ND_PRINT((ndo, "Flags [%s]", bittok2str_nosep(tcp_flag_values, "none", flags)));
+        flags = EXTRACT_U_1(tp->th_flags);
+        ND_PRINT("Flags [%s]", bittok2str_nosep(tcp_flag_values, "none", flags));

 
         if (!ndo->ndo_Sflag && (flags & TH_ACK)) {
                 /*
 
         if (!ndo->ndo_Sflag && (flags & TH_ACK)) {
                 /*


@@ -250,7 +250,7 @@ tcp_print(netdissect_options *ndo,
                  */
                 rev = 0;
                 if (ip6) {
                  */
                 rev = 0;
                 if (ip6) {

-                        register struct tcp_seq_hash6 *th;
+                        struct tcp_seq_hash6 *th;

                         struct tcp_seq_hash6 *tcp_seq_hash;
                         const void *src, *dst;
                         struct tha6 tha;
                         struct tcp_seq_hash6 *tcp_seq_hash;
                         const void *src, *dst;
                         struct tha6 tha;


@@ -304,7 +304,7 @@ tcp_print(netdissect_options *ndo,
                         thseq = th->seq;
                         thack = th->ack;
                 } else {
                         thseq = th->seq;
                         thack = th->ack;
                 } else {

-                        register struct tcp_seq_hash *th;
+                        struct tcp_seq_hash *th;

                         struct tcp_seq_hash *tcp_seq_hash;
                         struct tha tha;
 
                         struct tcp_seq_hash *tcp_seq_hash;
                         struct tha tha;
 


@@ -360,8 +360,8 @@ tcp_print(netdissect_options *ndo,
                 thseq = thack = rev = 0;
         }
         if (hlen > length) {
                 thseq = thack = rev = 0;
         }
         if (hlen > length) {

-                ND_PRINT((ndo, " [bad hdr length %u - too long, > %u]",
-                             hlen, length));
+                ND_PRINT(" [bad hdr length %u - too long, > %u]",
+                             hlen, length);

                 return;
         }
 
                 return;
         }
 


@@ -370,28 +370,28 @@ tcp_print(netdissect_options *ndo,
                 uint16_t sum, tcp_sum;
 
                 if (IP_V(ip) == 4) {
                 uint16_t sum, tcp_sum;
 
                 if (IP_V(ip) == 4) {

-                        if (ND_TTEST2(tp->th_sport, length)) {
+                        if (ND_TTEST_LEN(tp->th_sport, length)) {

                                 sum = tcp_cksum(ndo, ip, tp, length);
                                 sum = tcp_cksum(ndo, ip, tp, length);

-                                tcp_sum = EXTRACT_16BITS(&tp->th_sum);
+                                tcp_sum = EXTRACT_BE_U_2(tp->th_sum);

 
 

-                                ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum));
+                                ND_PRINT(", cksum 0x%04x", tcp_sum);

                                 if (sum != 0)
                                 if (sum != 0)

-                                        ND_PRINT((ndo, " (incorrect -> 0x%04x)",
-                                            in_cksum_shouldbe(tcp_sum, sum)));
+                                        ND_PRINT(" (incorrect -> 0x%04x)",
+                                            in_cksum_shouldbe(tcp_sum, sum));

                                 else
                                 else

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

                         }
                 } else if (IP_V(ip) == 6 && ip6->ip6_plen) {
                         }
                 } else if (IP_V(ip) == 6 && ip6->ip6_plen) {

-                        if (ND_TTEST2(tp->th_sport, length)) {
+                        if (ND_TTEST_LEN(tp->th_sport, length)) {

                                 sum = tcp6_cksum(ndo, ip6, tp, length);
                                 sum = tcp6_cksum(ndo, ip6, tp, length);

-                                tcp_sum = EXTRACT_16BITS(&tp->th_sum);
+                                tcp_sum = EXTRACT_BE_U_2(tp->th_sum);

 
 

-                                ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum));
+                                ND_PRINT(", cksum 0x%04x", tcp_sum);

                                 if (sum != 0)
                                 if (sum != 0)

-                                        ND_PRINT((ndo, " (incorrect -> 0x%04x)",
-                                            in_cksum_shouldbe(tcp_sum, sum)));
+                                        ND_PRINT(" (incorrect -> 0x%04x)",
+                                            in_cksum_shouldbe(tcp_sum, sum));

                                 else
                                 else

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

 
                         }
                 }
 
                         }
                 }


@@ -399,42 +399,44 @@ tcp_print(netdissect_options *ndo,
 
         length -= hlen;
         if (ndo->ndo_vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST)) {
 
         length -= hlen;
         if (ndo->ndo_vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST)) {

-                ND_PRINT((ndo, ", seq %u", seq));
+                ND_PRINT(", seq %u", seq);

 
                 if (length > 0) {
 
                 if (length > 0) {

-                        ND_PRINT((ndo, ":%u", seq + length));
+                        ND_PRINT(":%u", seq + length);

                 }
         }
 
         if (flags & TH_ACK) {
                 }
         }
 
         if (flags & TH_ACK) {

-                ND_PRINT((ndo, ", ack %u", ack));
+                ND_PRINT(", ack %u", ack);

         }
 
         }
 

-        ND_PRINT((ndo, ", win %d", win));
+        ND_PRINT(", win %u", win);

 
         if (flags & TH_URG)
 
         if (flags & TH_URG)

-                ND_PRINT((ndo, ", urg %d", urp));
+                ND_PRINT(", urg %u", urp);

         /*
          * Handle any options.
          */
         if (hlen > sizeof(*tp)) {
         /*
          * Handle any options.
          */
         if (hlen > sizeof(*tp)) {

-                register const u_char *cp;
-                register u_int i, opt, datalen;
-                register u_int len;
+                const u_char *cp;
+                u_int i, opt, datalen;
+                u_int len;

 
                 hlen -= sizeof(*tp);
                 cp = (const u_char *)tp + sizeof(*tp);
 
                 hlen -= sizeof(*tp);
                 cp = (const u_char *)tp + sizeof(*tp);

-                ND_PRINT((ndo, ", options ["));
+                ND_PRINT(", options [");

                 while (hlen > 0) {
                         if (ch != '\0')
                 while (hlen > 0) {
                         if (ch != '\0')

-                                ND_PRINT((ndo, "%c", ch));
-                        ND_TCHECK(*cp);
-                        opt = *cp++;
+                                ND_PRINT("%c", ch);
+                        ND_TCHECK_1(cp);
+                        opt = EXTRACT_U_1(cp);
+                        cp++;

                         if (ZEROLENOPT(opt))
                                 len = 1;
                         else {
                         if (ZEROLENOPT(opt))
                                 len = 1;
                         else {

-                                ND_TCHECK(*cp);
-                                len = *cp++;   /* total including type, len */
+                                ND_TCHECK_1(cp);
+                                len = EXTRACT_U_1(cp);
+                                cp++;  /* total including type, len */

                                 if (len < 2 || len > hlen)
                                         goto bad;
                                 --hlen;                /* account for length byte */
                                 if (len < 2 || len > hlen)
                                         goto bad;
                                 --hlen;                /* account for length byte */


@@ -443,38 +445,38 @@ tcp_print(netdissect_options *ndo,
                         datalen = 0;
 
 /* Bail if "l" bytes of data are not left or were not captured  */
                         datalen = 0;
 
 /* Bail if "l" bytes of data are not left or were not captured  */

-#define LENCHECK(l) { if ((l) > hlen) goto bad; ND_TCHECK2(*cp, l); }
+#define LENCHECK(l) { if ((l) > hlen) goto bad; ND_TCHECK_LEN(cp, l); }

 
 
 
 

-                        ND_PRINT((ndo, "%s", tok2str(tcp_option_values, "unknown-%u", opt)));
+                        ND_PRINT("%s", tok2str(tcp_option_values, "unknown-%u", opt));

 
                         switch (opt) {
 
                         case TCPOPT_MAXSEG:
                                 datalen = 2;
                                 LENCHECK(datalen);
 
                         switch (opt) {
 
                         case TCPOPT_MAXSEG:
                                 datalen = 2;
                                 LENCHECK(datalen);

-                                ND_PRINT((ndo, " %u", EXTRACT_16BITS(cp)));
+                                ND_PRINT(" %u", EXTRACT_BE_U_2(cp));

                                 break;
 
                         case TCPOPT_WSCALE:
                                 datalen = 1;
                                 LENCHECK(datalen);
                                 break;
 
                         case TCPOPT_WSCALE:
                                 datalen = 1;
                                 LENCHECK(datalen);

-                                ND_PRINT((ndo, " %u", *cp));
+                                ND_PRINT(" %u", EXTRACT_U_1(cp));

                                 break;
 
                         case TCPOPT_SACK:
                                 datalen = len - 2;
                                 if (datalen % 8 != 0) {
                                 break;
 
                         case TCPOPT_SACK:
                                 datalen = len - 2;
                                 if (datalen % 8 != 0) {

-                                        ND_PRINT((ndo, " invalid sack"));
+                                        ND_PRINT(" invalid sack");

                                 } else {
                                         uint32_t s, e;
 
                                 } else {
                                         uint32_t s, e;
 

-                                        ND_PRINT((ndo, " %d ", datalen / 8));
+                                        ND_PRINT(" %u ", datalen / 8);

                                         for (i = 0; i < datalen; i += 8) {
                                                 LENCHECK(i + 4);
                                         for (i = 0; i < datalen; i += 8) {
                                                 LENCHECK(i + 4);

-                                                s = EXTRACT_32BITS(cp + i);
+                                                s = EXTRACT_BE_U_4(cp + i);

                                                 LENCHECK(i + 8);
                                                 LENCHECK(i + 8);

-                                                e = EXTRACT_32BITS(cp + i + 4);
+                                                e = EXTRACT_BE_U_4(cp + i + 4);

                                                 if (rev) {
                                                         s -= thseq;
                                                         e -= thseq;
                                                 if (rev) {
                                                         s -= thseq;
                                                         e -= thseq;


@@ -482,7 +484,7 @@ tcp_print(netdissect_options *ndo,
                                                         s -= thack;
                                                         e -= thack;
                                                 }
                                                         s -= thack;
                                                         e -= thack;
                                                 }

-                                                ND_PRINT((ndo, "{%u:%u}", s, e));
+                                                ND_PRINT("{%u:%u}", s, e);

                                         }
                                 }
                                 break;
                                         }
                                 }
                                 break;


@@ -499,49 +501,49 @@ tcp_print(netdissect_options *ndo,
                                  */
                                 datalen = 4;
                                 LENCHECK(datalen);
                                  */
                                 datalen = 4;
                                 LENCHECK(datalen);

-                                ND_PRINT((ndo, " %u", EXTRACT_32BITS(cp)));
+                                ND_PRINT(" %u", EXTRACT_BE_U_4(cp));

                                 break;
 
                         case TCPOPT_TIMESTAMP:
                                 datalen = 8;
                                 LENCHECK(datalen);
                                 break;
 
                         case TCPOPT_TIMESTAMP:
                                 datalen = 8;
                                 LENCHECK(datalen);

-                                ND_PRINT((ndo, " val %u ecr %u",
-                                             EXTRACT_32BITS(cp),
-                                             EXTRACT_32BITS(cp + 4)));
+                                ND_PRINT(" val %u ecr %u",
+                                             EXTRACT_BE_U_4(cp),
+                                             EXTRACT_BE_U_4(cp + 4));

                                 break;
 
                         case TCPOPT_SIGNATURE:
                                 datalen = TCP_SIGLEN;
                                 LENCHECK(datalen);
                                 break;
 
                         case TCPOPT_SIGNATURE:
                                 datalen = TCP_SIGLEN;
                                 LENCHECK(datalen);

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

 #ifdef HAVE_LIBCRYPTO
                                 switch (tcp_verify_signature(ndo, ip, tp,
                                                              bp + TH_OFF(tp) * 4, length, cp)) {
 
                                 case SIGNATURE_VALID:
 #ifdef HAVE_LIBCRYPTO
                                 switch (tcp_verify_signature(ndo, ip, tp,
                                                              bp + TH_OFF(tp) * 4, length, cp)) {
 
                                 case SIGNATURE_VALID:

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

                                         break;
 
                                 case SIGNATURE_INVALID:
                                         break;
 
                                 case SIGNATURE_INVALID:

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

                                         break;
 
                                 case CANT_CHECK_SIGNATURE:
                                         break;
 
                                 case CANT_CHECK_SIGNATURE:

-                                        ND_PRINT((ndo, "can't check - "));
+                                        ND_PRINT("can't check - ");

                                         for (i = 0; i < TCP_SIGLEN; ++i)
                                         for (i = 0; i < TCP_SIGLEN; ++i)

-                                                ND_PRINT((ndo, "%02x", cp[i]));
+                                                ND_PRINT("%02x", EXTRACT_U_1(cp + i));

                                         break;
                                 }
 #else
                                 for (i = 0; i < TCP_SIGLEN; ++i)
                                         break;
                                 }
 #else
                                 for (i = 0; i < TCP_SIGLEN; ++i)

-                                        ND_PRINT((ndo, "%02x", cp[i]));
+                                        ND_PRINT("%02x", EXTRACT_U_1(cp + i));

 #endif
                                 break;
 
                         case TCPOPT_SCPS:
                                 datalen = 2;
                                 LENCHECK(datalen);
 #endif
                                 break;
 
                         case TCPOPT_SCPS:
                                 datalen = 2;
                                 LENCHECK(datalen);

-                                ND_PRINT((ndo, " cap %02x id %u", cp[0], cp[1]));
+                                ND_PRINT(" cap %02x id %u", EXTRACT_U_1(cp), EXTRACT_U_1(cp + 1));

                                 break;
 
                         case TCPOPT_TCPAO:
                                 break;
 
                         case TCPOPT_TCPAO:


@@ -552,17 +554,17 @@ tcp_print(netdissect_options *ndo,
                                  * at this point.)
                                  */
                                 if (datalen < 2) {
                                  * at this point.)
                                  */
                                 if (datalen < 2) {

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

                                 } else {
                                         LENCHECK(1);
                                 } else {
                                         LENCHECK(1);

-                                        ND_PRINT((ndo, " keyid %u", cp[0]));
+                                        ND_PRINT(" keyid %u", EXTRACT_U_1(cp));

                                         LENCHECK(2);
                                         LENCHECK(2);

-                                        ND_PRINT((ndo, " rnextkeyid %u", cp[1]));
+                                        ND_PRINT(" rnextkeyid %u", EXTRACT_U_1(cp + 1));

                                         if (datalen > 2) {
                                         if (datalen > 2) {

-                                                ND_PRINT((ndo, " mac 0x"));
+                                                ND_PRINT(" mac 0x");

                                                 for (i = 2; i < datalen; i++) {
                                                         LENCHECK(i + 1);
                                                 for (i = 2; i < datalen; i++) {
                                                         LENCHECK(i + 1);

-                                                        ND_PRINT((ndo, "%02x", cp[i]));
+                                                        ND_PRINT("%02x", EXTRACT_U_1(cp + i));

                                                 }
                                         }
                                 }
                                                 }
                                         }
                                 }


@@ -580,13 +582,13 @@ tcp_print(netdissect_options *ndo,
                         case TCPOPT_UTO:
                                 datalen = 2;
                                 LENCHECK(datalen);
                         case TCPOPT_UTO:
                                 datalen = 2;
                                 LENCHECK(datalen);

-                                utoval = EXTRACT_16BITS(cp);
-                                ND_PRINT((ndo, " 0x%x", utoval));
+                                utoval = EXTRACT_BE_U_2(cp);
+                                ND_PRINT(" 0x%x", utoval);

                                 if (utoval & 0x0001)
                                         utoval = (utoval >> 1) * 60;
                                 else
                                         utoval >>= 1;
                                 if (utoval & 0x0001)
                                         utoval = (utoval >> 1) * 60;
                                 else
                                         utoval >>= 1;

-                                ND_PRINT((ndo, " %u", utoval));
+                                ND_PRINT(" %u", utoval);

                                 break;
 
                         case TCPOPT_MPTCP:
                                 break;
 
                         case TCPOPT_MPTCP:


@@ -599,7 +601,7 @@ tcp_print(netdissect_options *ndo,
                         case TCPOPT_FASTOPEN:
                                 datalen = len - 2;
                                 LENCHECK(datalen);
                         case TCPOPT_FASTOPEN:
                                 datalen = len - 2;
                                 LENCHECK(datalen);

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

                                 print_tcp_fastopen_option(ndo, cp, datalen, FALSE);
                                 break;
 
                                 print_tcp_fastopen_option(ndo, cp, datalen, FALSE);
                                 break;
 


@@ -609,8 +611,8 @@ tcp_print(netdissect_options *ndo,
                                 if (datalen < 2)
                                         goto bad;
                                 /* RFC6994 */
                                 if (datalen < 2)
                                         goto bad;
                                 /* RFC6994 */

-                                magic = EXTRACT_16BITS(cp);
-                                ND_PRINT((ndo, "-"));
+                                magic = EXTRACT_BE_U_2(cp);
+                                ND_PRINT("-");

 
                                 switch(magic) {
 
 
                                 switch(magic) {
 


@@ -620,7 +622,7 @@ tcp_print(netdissect_options *ndo,
 
                                 default:
                                         /* Unknown magic number */
 
                                 default:
                                         /* Unknown magic number */

-                                        ND_PRINT((ndo, "%04x", magic));
+                                        ND_PRINT("%04x", magic);

                                         break;
                                 }
                                 break;
                                         break;
                                 }
                                 break;


@@ -628,10 +630,10 @@ tcp_print(netdissect_options *ndo,
                         default:
                                 datalen = len - 2;
                                 if (datalen)
                         default:
                                 datalen = len - 2;
                                 if (datalen)

-                                        ND_PRINT((ndo, " 0x"));
+                                        ND_PRINT(" 0x");

                                 for (i = 0; i < datalen; ++i) {
                                         LENCHECK(i + 1);
                                 for (i = 0; i < datalen; ++i) {
                                         LENCHECK(i + 1);

-                                        ND_PRINT((ndo, "%02x", cp[i]));
+                                        ND_PRINT("%02x", EXTRACT_U_1(cp + i));

                                 }
                                 break;
                         }
                                 }
                                 break;
                         }


@@ -645,18 +647,18 @@ tcp_print(netdissect_options *ndo,
                         if (!ZEROLENOPT(opt))
                                 ++datalen;             /* size octet */
                         if (datalen != len)
                         if (!ZEROLENOPT(opt))
                                 ++datalen;             /* size octet */
                         if (datalen != len)

-                                ND_PRINT((ndo, "[len %d]", len));
+                                ND_PRINT("[len %u]", len);

                         ch = ',';
                         if (opt == TCPOPT_EOL)
                                 break;
                 }
                         ch = ',';
                         if (opt == TCPOPT_EOL)
                                 break;
                 }

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

         }
 
         /*
          * Print length field before crawling down the stack.
          */
         }
 
         /*
          * Print length field before crawling down the stack.
          */

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

 
         if (length <= 0)
                 return;
 
         if (length <= 0)
                 return;


@@ -685,10 +687,10 @@ tcp_print(netdissect_options *ndo,
         if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
                 telnet_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(SMTP_PORT)) {
         if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
                 telnet_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(SMTP_PORT)) {

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

                 smtp_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(WHOIS_PORT)) {
                 smtp_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(WHOIS_PORT)) {

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

                 txtproto_print(ndo, bp, length, "whois", NULL, 0); /* RFC 3912 */
         } else if (IS_SRC_OR_DST_PORT(BGP_PORT))
                 bgp_print(ndo, bp, length);
                 txtproto_print(ndo, bp, length, "whois", NULL, 0); /* RFC 3912 */
         } else if (IS_SRC_OR_DST_PORT(BGP_PORT))
                 bgp_print(ndo, bp, length);


@@ -707,13 +709,13 @@ tcp_print(netdissect_options *ndo,
         else if (IS_SRC_OR_DST_PORT(OPENFLOW_PORT_OLD) || IS_SRC_OR_DST_PORT(OPENFLOW_PORT_IANA))
                 openflow_print(ndo, bp, length);
         else if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
         else if (IS_SRC_OR_DST_PORT(OPENFLOW_PORT_OLD) || IS_SRC_OR_DST_PORT(OPENFLOW_PORT_IANA))
                 openflow_print(ndo, bp, length);
         else if (IS_SRC_OR_DST_PORT(FTP_PORT)) {

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

                 ftp_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(HTTP_PORT) || IS_SRC_OR_DST_PORT(HTTP_PORT_ALT)) {
                 ftp_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(HTTP_PORT) || IS_SRC_OR_DST_PORT(HTTP_PORT_ALT)) {

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

                 http_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(RTSP_PORT) || IS_SRC_OR_DST_PORT(RTSP_PORT_ALT)) {
                 http_print(ndo, bp, length);
         } else if (IS_SRC_OR_DST_PORT(RTSP_PORT) || IS_SRC_OR_DST_PORT(RTSP_PORT_ALT)) {

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

                 rtsp_print(ndo, bp, length);
         } else if (length > 2 &&
                  (IS_SRC_OR_DST_PORT(NAMESERVER_PORT))) {
                 rtsp_print(ndo, bp, length);
         } else if (length > 2 &&
                  (IS_SRC_OR_DST_PORT(NAMESERVER_PORT))) {


@@ -731,7 +733,7 @@ tcp_print(netdissect_options *ndo,
                 ldp_print(ndo, bp, length);
         }
         else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) &&
                 ldp_print(ndo, bp, length);
         }
         else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) &&

-                 length >= 4 && ND_TTEST2(*bp, 4)) {
+                 length >= 4 && ND_TTEST_4(bp)) {

                 /*
                  * If data present, header length valid, and NFS port used,
                  * assume NFS.
                 /*
                  * If data present, header length valid, and NFS port used,
                  * assume NFS.


@@ -739,22 +741,24 @@ tcp_print(netdissect_options *ndo,
                  * to NFS print routines.
                  */
                 uint32_t fraglen;
                  * to NFS print routines.
                  */
                 uint32_t fraglen;

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

                 enum sunrpc_msg_type direction;
 
                 enum sunrpc_msg_type direction;
 

-                fraglen = EXTRACT_32BITS(bp) & 0x7FFFFFFF;
+                fraglen = EXTRACT_BE_U_4(bp) & 0x7FFFFFFF;

                 if (fraglen > (length) - 4)
                         fraglen = (length) - 4;
                 rp = (const struct sunrpc_msg *)(bp + 4);
                 if (fraglen > (length) - 4)
                         fraglen = (length) - 4;
                 rp = (const struct sunrpc_msg *)(bp + 4);

-                if (ND_TTEST(rp->rm_direction)) {
-                        direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&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_32BITS(&rp->rm_xid)));
+                                ND_PRINT(": NFS request xid %u ",
+                                         EXTRACT_BE_U_4(rp->rm_xid));

                                 nfsreq_noaddr_print(ndo, (const u_char *)rp, fraglen, (const u_char *)ip);
                                 return;
                         }
                         if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
                                 nfsreq_noaddr_print(ndo, (const u_char *)rp, fraglen, (const u_char *)ip);
                                 return;
                         }
                         if (sport == NFS_PORT && direction == SUNRPC_REPLY) {

-                                ND_PRINT((ndo, ": NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid)));
+                                ND_PRINT(": NFS reply xid %u ",
+                                         EXTRACT_BE_U_4(rp->rm_xid));

                                 nfsreply_noaddr_print(ndo, (const u_char *)rp, fraglen, (const u_char *)ip);
                                 return;
                         }
                                 nfsreply_noaddr_print(ndo, (const u_char *)rp, fraglen, (const u_char *)ip);
                                 return;
                         }


@@ -763,14 +767,14 @@ tcp_print(netdissect_options *ndo,
 
         return;
  bad:
 
         return;
  bad:

-        ND_PRINT((ndo, "[bad opt]"));
+        ND_PRINT("[bad opt]");

         if (ch != '\0')
         if (ch != '\0')

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

         return;
  trunc:
         return;
  trunc:

-        ND_PRINT((ndo, "[|tcp]"));
+        ND_PRINT("[|tcp]");

         if (ch != '\0')
         if (ch != '\0')

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

 }
 
 /*
 }
 
 /*


@@ -790,43 +794,44 @@ tcp_print(netdissect_options *ndo,
 
 static void
 print_tcp_rst_data(netdissect_options *ndo,
 
 static void
 print_tcp_rst_data(netdissect_options *ndo,

-                   register const u_char *sp, u_int length)
+                   const u_char *sp, u_int length)

 {
         int c;
 
 {
         int c;
 

-        ND_PRINT((ndo, ND_TTEST2(*sp, length) ? " [RST" : " [!RST"));
+        ND_PRINT(ND_TTEST_LEN(sp, length) ? " [RST" : " [!RST");

         if (length > MAX_RST_DATA_LEN) {
                 length = MAX_RST_DATA_LEN;     /* can use -X for longer */
         if (length > MAX_RST_DATA_LEN) {
                 length = MAX_RST_DATA_LEN;     /* can use -X for longer */

-                ND_PRINT((ndo, "+"));                  /* indicate we truncate */
+                ND_PRINT("+");                 /* indicate we truncate */

         }
         }

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

         while (length-- && sp < ndo->ndo_snapend) {
         while (length-- && sp < ndo->ndo_snapend) {

-                c = *sp++;
+                c = EXTRACT_U_1(sp);
+                sp++;

                 safeputchar(ndo, c);
         }
                 safeputchar(ndo, c);
         }

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

 }
 
 static void
 }
 
 static void

-print_tcp_fastopen_option(netdissect_options *ndo, register const u_char *cp,
+print_tcp_fastopen_option(netdissect_options *ndo, const u_char *cp,

                           u_int datalen, int exp)
 {
         u_int i;
 
         if (exp)
                           u_int datalen, int exp)
 {
         u_int i;
 
         if (exp)

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

 
         if (datalen == 0) {
                 /* Fast Open Cookie Request */
 
         if (datalen == 0) {
                 /* Fast Open Cookie Request */

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

         } else {
                 /* Fast Open Cookie */
                 if (datalen % 2 != 0 || datalen < 4 || datalen > 16) {
         } else {
                 /* Fast Open Cookie */
                 if (datalen % 2 != 0 || datalen < 4 || datalen > 16) {

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

                 } else {
                 } else {

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

                         for (i = 0; i < datalen; ++i)
                         for (i = 0; i < datalen; ++i)

-                                ND_PRINT((ndo, "%02x", cp[i]));
+                                ND_PRINT("%02x", EXTRACT_U_1(cp + i));

                 }
         }
 }
                 }
         }
 }


@@ -836,7 +841,7 @@ USES_APPLE_DEPRECATED_API
 static int
 tcp_verify_signature(netdissect_options *ndo,
                      const struct ip *ip, const struct tcphdr *tp,
 static int
 tcp_verify_signature(netdissect_options *ndo,
                      const struct ip *ip, const struct tcphdr *tp,

-                     const u_char *data, int length, const u_char *rcvsig)
+                     const u_char *data, u_int length, const u_char *rcvsig)

 {
         struct tcphdr tp1;
         u_char sig[TCP_SIGLEN];
 {
         struct tcphdr tp1;
         u_char sig[TCP_SIGLEN];


@@ -848,14 +853,14 @@ tcp_verify_signature(netdissect_options *ndo,
         uint8_t nxt;
 
        if (data + length > ndo->ndo_snapend) {
         uint8_t nxt;
 
        if (data + length > ndo->ndo_snapend) {

-               ND_PRINT((ndo, "snaplen too short, "));
+               ND_PRINT("snaplen too short, ");

                return (CANT_CHECK_SIGNATURE);
        }
 
         tp1 = *tp;
 
         if (ndo->ndo_sigsecret == NULL) {
                return (CANT_CHECK_SIGNATURE);
        }
 
         tp1 = *tp;
 
         if (ndo->ndo_sigsecret == NULL) {

-               ND_PRINT((ndo, "shared secret not supplied with -M, "));
+               ND_PRINT("shared secret not supplied with -M, ");

                 return (CANT_CHECK_SIGNATURE);
         }
 
                 return (CANT_CHECK_SIGNATURE);
         }
 


@@ -868,14 +873,14 @@ tcp_verify_signature(netdissect_options *ndo,
                 MD5_Update(&ctx, (const char *)&ip->ip_dst, sizeof(ip->ip_dst));
                 MD5_Update(&ctx, (const char *)&zero_proto, sizeof(zero_proto));
                 MD5_Update(&ctx, (const char *)&ip->ip_p, sizeof(ip->ip_p));
                 MD5_Update(&ctx, (const char *)&ip->ip_dst, sizeof(ip->ip_dst));
                 MD5_Update(&ctx, (const char *)&zero_proto, sizeof(zero_proto));
                 MD5_Update(&ctx, (const char *)&ip->ip_p, sizeof(ip->ip_p));

-                tlen = EXTRACT_16BITS(&ip->ip_len) - IP_HL(ip) * 4;
+                tlen = EXTRACT_BE_U_2(ip->ip_len) - IP_HL(ip) * 4;

                 tlen = htons(tlen);
                 MD5_Update(&ctx, (const char *)&tlen, sizeof(tlen));
         } else if (IP_V(ip) == 6) {
                 ip6 = (const struct ip6_hdr *)ip;
                 MD5_Update(&ctx, (const char *)&ip6->ip6_src, sizeof(ip6->ip6_src));
                 MD5_Update(&ctx, (const char *)&ip6->ip6_dst, sizeof(ip6->ip6_dst));
                 tlen = htons(tlen);
                 MD5_Update(&ctx, (const char *)&tlen, sizeof(tlen));
         } else if (IP_V(ip) == 6) {
                 ip6 = (const struct ip6_hdr *)ip;
                 MD5_Update(&ctx, (const char *)&ip6->ip6_src, sizeof(ip6->ip6_src));
                 MD5_Update(&ctx, (const char *)&ip6->ip6_dst, sizeof(ip6->ip6_dst));

-                len32 = htonl(EXTRACT_16BITS(&ip6->ip6_plen));
+                len32 = htonl(EXTRACT_BE_U_2(ip6->ip6_plen));

                 MD5_Update(&ctx, (const char *)&len32, sizeof(len32));
                 nxt = 0;
                 MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));
                 MD5_Update(&ctx, (const char *)&len32, sizeof(len32));
                 nxt = 0;
                 MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));


@@ -884,7 +889,7 @@ tcp_verify_signature(netdissect_options *ndo,
                 nxt = IPPROTO_TCP;
                 MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));
         } else {
                 nxt = IPPROTO_TCP;
                 MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));
         } else {

-               ND_PRINT((ndo, "IP version not 4 or 6, "));
+               ND_PRINT("IP version not 4 or 6, ");

                 return (CANT_CHECK_SIGNATURE);
         }
 
                 return (CANT_CHECK_SIGNATURE);
         }
 


@@ -892,10 +897,10 @@ tcp_verify_signature(netdissect_options *ndo,
          * Step 2: Update MD5 hash with TCP header, excluding options.
          * The TCP checksum must be set to zero.
          */
          * Step 2: Update MD5 hash with TCP header, excluding options.
          * The TCP checksum must be set to zero.
          */

-        savecsum = tp1.th_sum;
-        tp1.th_sum = 0;
+        memcpy(&savecsum, tp1.th_sum, sizeof(savecsum));
+        memset(tp1.th_sum, 0, sizeof(tp1.th_sum));

         MD5_Update(&ctx, (const char *)&tp1, sizeof(struct tcphdr));
         MD5_Update(&ctx, (const char *)&tp1, sizeof(struct tcphdr));

-        tp1.th_sum = savecsum;
+        memcpy(tp1.th_sum, &savecsum, sizeof(tp1.th_sum));

         /*
          * Step 3: Update MD5 hash with TCP segment data, if present.
          */
         /*
          * Step 3: Update MD5 hash with TCP segment data, if present.
          */