Rename EXTRACT_ macros

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 5d726af71d6e331c95e303299b3f3d8e41289179..b60a5c4b17768f16360a9ee5f69d02b51c94fd54 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -23,40 +23,37 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+/* \summary: TCP printer */
+

 #ifndef lint
 #else
 __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif
 
 #ifndef lint
 #else
 __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

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

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

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 
 #include "tcp.h"
 
 #include "ip.h"
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "tcp.h"
 
 #include "ip.h"

-#ifdef INET6

 #include "ip6.h"
 #include "ip6.h"

-#endif

 #include "ipproto.h"
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 
 #include "ipproto.h"
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 

-#include "nameser.h"
-

 #ifdef HAVE_LIBCRYPTO
 #include <openssl/md5.h>
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/md5.h>

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

 
 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,


@@ -64,6 +61,8 @@ static int tcp_verify_signature(netdissect_options *ndo,
 #endif
 
 static void print_tcp_rst_data(netdissect_options *, register const u_char *sp, u_int length);
 #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,
+                                      u_int datalen, int exp);

 
 #define MAX_RST_DATA_LEN       30
 
 
 #define MAX_RST_DATA_LEN       30
 


@@ -81,7 +80,6 @@ struct tcp_seq_hash {
         tcp_seq ack;
 };
 
         tcp_seq ack;
 };
 

-#ifdef INET6

 struct tha6 {
         struct in6_addr src;
         struct in6_addr dst;
 struct tha6 {
         struct in6_addr src;
         struct in6_addr dst;


@@ -94,7 +92,6 @@ struct tcp_seq_hash6 {
         tcp_seq seq;
         tcp_seq ack;
 };
         tcp_seq seq;
         tcp_seq ack;
 };

-#endif

 
 #define TSEQ_HASHSIZE 919
 
 
 #define TSEQ_HASHSIZE 919
 


@@ -102,9 +99,7 @@ struct tcp_seq_hash6 {
 #define ZEROLENOPT(o) ((o) == TCPOPT_EOL || (o) == TCPOPT_NOP)
 
 static struct tcp_seq_hash tcp_seq_hash4[TSEQ_HASHSIZE];
 #define ZEROLENOPT(o) ((o) == TCPOPT_EOL || (o) == TCPOPT_NOP)
 
 static struct tcp_seq_hash tcp_seq_hash4[TSEQ_HASHSIZE];

-#ifdef INET6

 static struct tcp_seq_hash6 tcp_seq_hash6[TSEQ_HASHSIZE];
 static struct tcp_seq_hash6 tcp_seq_hash6[TSEQ_HASHSIZE];

-#endif

 
 static const struct tok tcp_flag_values[] = {
         { TH_FIN, "F" },
 
 static const struct tok tcp_flag_values[] = {
         { TH_FIN, "F" },


@@ -132,9 +127,11 @@ static const struct tok tcp_option_values[] = {
         { TCPOPT_CCNEW, "ccnew" },
         { TCPOPT_CCECHO, "" },
         { TCPOPT_SIGNATURE, "md5" },
         { TCPOPT_CCNEW, "ccnew" },
         { TCPOPT_CCECHO, "" },
         { TCPOPT_SIGNATURE, "md5" },

-        { TCPOPT_AUTH, "enhanced auth" },
+        { TCPOPT_SCPS, "scps" },

         { TCPOPT_UTO, "uto" },
         { TCPOPT_UTO, "uto" },

+        { TCPOPT_TCPAO, "tcp-ao" },

         { TCPOPT_MPTCP, "mptcp" },
         { TCPOPT_MPTCP, "mptcp" },

+        { TCPOPT_FASTOPEN, "tfo" },

         { TCPOPT_EXPERIMENT2, "exp" },
         { 0, NULL }
 };
         { TCPOPT_EXPERIMENT2, "exp" },
         { 0, NULL }
 };


@@ -145,7 +142,17 @@ tcp_cksum(netdissect_options *ndo,
           register const struct tcphdr *tp,
           register u_int len)
 {
           register const struct tcphdr *tp,
           register u_int len)
 {

-       return nextproto4_cksum(ndo, ip, (const u_int8_t *)tp, len, len,
+       return nextproto4_cksum(ndo, ip, (const uint8_t *)tp, len, len,
+                               IPPROTO_TCP);
+}
+
+static int
+tcp6_cksum(netdissect_options *ndo,
+           register const struct ip6_hdr *ip6,
+           register const struct tcphdr *tp,
+           register u_int len)
+{
+       return nextproto6_cksum(ndo, ip6, (const uint8_t *)tp, len, len,

                                IPPROTO_TCP);
 }
 
                                IPPROTO_TCP);
 }
 


@@ -159,75 +166,68 @@ tcp_print(netdissect_options *ndo,
         register u_char flags;
         register u_int hlen;
         register char ch;
         register u_char flags;
         register u_int hlen;
         register char ch;

-        u_int16_t sport, dport, win, urp;
-        u_int32_t seq, ack, thseq, thack;
+        uint16_t sport, dport, win, urp;
+        uint32_t seq, ack, thseq, thack;

         u_int utoval;
         u_int utoval;

-        u_int16_t magic;
+        uint16_t magic;

         register int rev;
         register int rev;

-#ifdef INET6

         register const struct ip6_hdr *ip6;
         register const struct ip6_hdr *ip6;

-#endif

 
 

-        tp = (struct tcphdr *)bp;
-        ip = (struct ip *)bp2;
-#ifdef INET6
+        tp = (const struct tcphdr *)bp;
+        ip = (const struct ip *)bp2;

         if (IP_V(ip) == 6)
         if (IP_V(ip) == 6)

-                ip6 = (struct ip6_hdr *)bp2;
+                ip6 = (const struct ip6_hdr *)bp2;

         else
                 ip6 = NULL;
         else
                 ip6 = NULL;

-#endif /*INET6*/

         ch = '\0';
         if (!ND_TTEST(tp->th_dport)) {
                 ND_PRINT((ndo, "%s > %s: [|tcp]",
         ch = '\0';
         if (!ND_TTEST(tp->th_dport)) {
                 ND_PRINT((ndo, "%s > %s: [|tcp]",

-                             ipaddr_string(&ip->ip_src),
-                             ipaddr_string(&ip->ip_dst)));
+                             ipaddr_string(ndo, &ip->ip_src),
+                             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);

 
 

-        hlen = TH_OFF(tp) * 4;
-
-#ifdef INET6

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

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

                 } else {
                         ND_PRINT((ndo, "%s > %s: ",
                 } else {
                         ND_PRINT((ndo, "%s > %s: ",

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

                 }
                 }

-        } else
-#endif /*INET6*/
-        {
+        } else {

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

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

                 } else {
                         ND_PRINT((ndo, "%s > %s: ",
                 } else {
                         ND_PRINT((ndo, "%s > %s: ",

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

                 }
         }
 
                 }
         }
 

+        ND_TCHECK(*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)));
                 return;
         }
 
         if (hlen < sizeof(*tp)) {
                 ND_PRINT((ndo, " tcp %d [bad hdr length %u - too short, < %lu]",
                              length - hlen, hlen, (unsigned long)sizeof(*tp)));
                 return;
         }
 

-        ND_TCHECK(*tp);
-
-        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) {
                 ND_PRINT((ndo, "tcp %d", length - hlen));
 
         if (ndo->ndo_qflag) {
                 ND_PRINT((ndo, "tcp %d", length - hlen));


@@ -249,16 +249,15 @@ tcp_print(netdissect_options *ndo,
                  * both directions).
                  */
                 rev = 0;
                  * both directions).
                  */
                 rev = 0;

-#ifdef INET6

                 if (ip6) {
                         register struct tcp_seq_hash6 *th;
                         struct tcp_seq_hash6 *tcp_seq_hash;
                 if (ip6) {
                         register struct tcp_seq_hash6 *th;
                         struct tcp_seq_hash6 *tcp_seq_hash;

-                        const struct in6_addr *src, *dst;
+                        const void *src, *dst;

                         struct tha6 tha;
 
                         tcp_seq_hash = tcp_seq_hash6;
                         struct tha6 tha;
 
                         tcp_seq_hash = tcp_seq_hash6;

-                        src = &ip6->ip6_src;
-                        dst = &ip6->ip6_dst;
+                        src = (const void *)&ip6->ip6_src;
+                        dst = (const void *)&ip6->ip6_dst;

                         if (sport > dport)
                                 rev = 1;
                         else if (sport == dport) {
                         if (sport > dport)
                                 rev = 1;
                         else if (sport == dport) {


@@ -287,7 +286,8 @@ tcp_print(netdissect_options *ndo,
                                         th->nxt = (struct tcp_seq_hash6 *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)
                                         th->nxt = (struct tcp_seq_hash6 *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)

-                                                error("tcp_print: calloc");
+                                                (*ndo->ndo_error)(ndo,
+                                                                 "tcp_print: calloc");

                                 }
                                 th->addr = tha;
                                 if (rev)
                                 }
                                 th->addr = tha;
                                 if (rev)


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

-#else  /*INET6*/
-                {
-#endif /*INET6*/

                         register struct tcp_seq_hash *th;
                         struct tcp_seq_hash *tcp_seq_hash;
                         register struct tcp_seq_hash *th;
                         struct tcp_seq_hash *tcp_seq_hash;

-                        const struct in_addr *src, *dst;

                         struct tha tha;
 
                         tcp_seq_hash = tcp_seq_hash4;
                         struct tha tha;
 
                         tcp_seq_hash = tcp_seq_hash4;

-                        src = &ip->ip_src;
-                        dst = &ip->ip_dst;

                         if (sport > dport)
                                 rev = 1;
                         else if (sport == dport) {
                         if (sport > dport)
                                 rev = 1;
                         else if (sport == dport) {

-                                if (UNALIGNED_MEMCMP(src, dst, sizeof ip->ip_dst) > 0)
+                                if (UNALIGNED_MEMCMP(&ip->ip_src, &ip->ip_dst, sizeof ip->ip_dst) > 0)

                                         rev = 1;
                         }
                         if (rev) {
                                         rev = 1;
                         }
                         if (rev) {

-                                UNALIGNED_MEMCPY(&tha.src, dst, sizeof ip->ip_dst);
-                                UNALIGNED_MEMCPY(&tha.dst, src, sizeof ip->ip_src);
+                                UNALIGNED_MEMCPY(&tha.src, &ip->ip_dst, sizeof ip->ip_dst);
+                                UNALIGNED_MEMCPY(&tha.dst, &ip->ip_src, sizeof ip->ip_src);

                                 tha.port = dport << 16 | sport;
                         } else {
                                 tha.port = dport << 16 | sport;
                         } else {

-                                UNALIGNED_MEMCPY(&tha.dst, dst, sizeof ip->ip_dst);
-                                UNALIGNED_MEMCPY(&tha.src, src, sizeof ip->ip_src);
+                                UNALIGNED_MEMCPY(&tha.dst, &ip->ip_dst, sizeof ip->ip_dst);
+                                UNALIGNED_MEMCPY(&tha.src, &ip->ip_src, sizeof ip->ip_src);

                                 tha.port = sport << 16 | dport;
                         }
 
                                 tha.port = sport << 16 | dport;
                         }
 


@@ -343,7 +337,8 @@ tcp_print(netdissect_options *ndo,
                                         th->nxt = (struct tcp_seq_hash *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)
                                         th->nxt = (struct tcp_seq_hash *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)

-                                                error("tcp_print: calloc");
+                                                (*ndo->ndo_error)(ndo,
+                                                                 "tcp_print: calloc");

                                 }
                                 th->addr = tha;
                                 if (rev)
                                 }
                                 th->addr = tha;
                                 if (rev)


@@ -372,12 +367,12 @@ tcp_print(netdissect_options *ndo,
 
         if (ndo->ndo_vflag && !ndo->ndo_Kflag && !fragmented) {
                 /* Check the checksum, if possible. */
 
         if (ndo->ndo_vflag && !ndo->ndo_Kflag && !fragmented) {
                 /* Check the checksum, if possible. */

-                u_int16_t sum, tcp_sum;
+                uint16_t sum, tcp_sum;

 
                 if (IP_V(ip) == 4) {
                         if (ND_TTEST2(tp->th_sport, length)) {
                                 sum = tcp_cksum(ndo, ip, tp, length);
 
                 if (IP_V(ip) == 4) {
                         if (ND_TTEST2(tp->th_sport, 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));
                                 if (sum != 0)
 
                                 ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum));
                                 if (sum != 0)


@@ -386,13 +381,10 @@ tcp_print(netdissect_options *ndo,
                                 else
                                         ND_PRINT((ndo, " (correct)"));
                         }
                                 else
                                         ND_PRINT((ndo, " (correct)"));
                         }

-                }
-#ifdef INET6
-                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_TTEST2(tp->th_sport, length)) {

-                                sum = nextproto6_cksum(ip6, (const u_int8_t *)tp,
-                                                       length, length, IPPROTO_TCP);
-                                tcp_sum = EXTRACT_16BITS(&tp->th_sum);
+                                sum = tcp6_cksum(ndo, ip6, tp, length);
+                                tcp_sum = EXTRACT_BE_U_2(&tp->th_sum);

 
                                 ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum));
                                 if (sum != 0)
 
                                 ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum));
                                 if (sum != 0)


@@ -403,7 +395,6 @@ tcp_print(netdissect_options *ndo,
 
                         }
                 }
 
                         }
                 }

-#endif

         }
 
         length -= hlen;
         }
 
         length -= hlen;


@@ -438,12 +429,14 @@ tcp_print(netdissect_options *ndo,
                         if (ch != '\0')
                                 ND_PRINT((ndo, "%c", ch));
                         ND_TCHECK(*cp);
                         if (ch != '\0')
                                 ND_PRINT((ndo, "%c", ch));
                         ND_TCHECK(*cp);

-                        opt = *cp++;
+                        opt = EXTRACT_U_1(cp);
+                        cp++;

                         if (ZEROLENOPT(opt))
                                 len = 1;
                         else {
                                 ND_TCHECK(*cp);
                         if (ZEROLENOPT(opt))
                                 len = 1;
                         else {
                                 ND_TCHECK(*cp);

-                                len = *cp++;   /* total including type, len */
+                                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 */


@@ -462,7 +455,7 @@ tcp_print(netdissect_options *ndo,
                         case TCPOPT_MAXSEG:
                                 datalen = 2;
                                 LENCHECK(datalen);
                         case TCPOPT_MAXSEG:
                                 datalen = 2;
                                 LENCHECK(datalen);

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

                                 break;
 
                         case TCPOPT_WSCALE:
                                 break;
 
                         case TCPOPT_WSCALE:


@@ -474,16 +467,16 @@ tcp_print(netdissect_options *ndo,
                         case TCPOPT_SACK:
                                 datalen = len - 2;
                                 if (datalen % 8 != 0) {
                         case TCPOPT_SACK:
                                 datalen = len - 2;
                                 if (datalen % 8 != 0) {

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

                                 } else {
                                 } else {

-                                        u_int32_t s, e;
+                                        uint32_t s, e;

 
                                         ND_PRINT((ndo, " %d ", datalen / 8));
                                         for (i = 0; i < datalen; i += 8) {
                                                 LENCHECK(i + 4);
 
                                         ND_PRINT((ndo, " %d ", datalen / 8));
                                         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;


@@ -508,20 +501,21 @@ tcp_print(netdissect_options *ndo,
                                  */
                                 datalen = 4;
                                 LENCHECK(datalen);
                                  */
                                 datalen = 4;
                                 LENCHECK(datalen);

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

                                 break;
 
                         case TCPOPT_TIMESTAMP:
                                 datalen = 8;
                                 LENCHECK(datalen);
                                 ND_PRINT((ndo, " val %u ecr %u",
                                 break;
 
                         case TCPOPT_TIMESTAMP:
                                 datalen = 8;
                                 LENCHECK(datalen);
                                 ND_PRINT((ndo, " val %u ecr %u",

-                                             EXTRACT_32BITS(cp),
-                                             EXTRACT_32BITS(cp + 4)));
+                                             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, " "));

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


@@ -546,15 +540,35 @@ tcp_print(netdissect_options *ndo,
 #endif
                                 break;
 
 #endif
                                 break;
 

-                        case TCPOPT_AUTH:
-                                ND_PRINT((ndo, "keyid %d", *cp++));
-                                datalen = len - 3;
-                                for (i = 0; i < datalen; ++i) {
-                                        LENCHECK(i);
-                                        ND_PRINT((ndo, "%02x", cp[i]));
-                                }
+                        case TCPOPT_SCPS:
+                                datalen = 2;
+                                LENCHECK(datalen);
+                                ND_PRINT((ndo, " cap %02x id %u", cp[0], cp[1]));

                                 break;
 
                                 break;
 

+                        case TCPOPT_TCPAO:
+                                datalen = len - 2;
+                                /* RFC 5925 Section 2.2:
+                                 * "The Length value MUST be greater than or equal to 4."
+                                 * (This includes the Kind and Length fields already processed
+                                 * at this point.)
+                                 */
+                                if (datalen < 2) {
+                                        ND_PRINT((ndo, " invalid"));
+                                } else {
+                                        LENCHECK(1);
+                                        ND_PRINT((ndo, " keyid %u", cp[0]));
+                                        LENCHECK(2);
+                                        ND_PRINT((ndo, " rnextkeyid %u", cp[1]));
+                                        if (datalen > 2) {
+                                                ND_PRINT((ndo, " mac 0x"));
+                                                for (i = 2; i < datalen; i++) {
+                                                        LENCHECK(i + 1);
+                                                        ND_PRINT((ndo, "%02x", cp[i]));
+                                                }
+                                        }
+                                }
+                                break;

 
                         case TCPOPT_EOL:
                         case TCPOPT_NOP:
 
                         case TCPOPT_EOL:
                         case TCPOPT_NOP:


@@ -568,8 +582,8 @@ 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((ndo, " 0x%x", utoval));

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


@@ -584,32 +598,26 @@ tcp_print(netdissect_options *ndo,
                                         goto bad;
                                 break;
 
                                         goto bad;
                                 break;
 

+                        case TCPOPT_FASTOPEN:
+                                datalen = len - 2;
+                                LENCHECK(datalen);
+                                ND_PRINT((ndo, " "));
+                                print_tcp_fastopen_option(ndo, cp, datalen, FALSE);
+                                break;
+

                         case TCPOPT_EXPERIMENT2:
                                 datalen = len - 2;
                                 LENCHECK(datalen);
                                 if (datalen < 2)
                                         goto bad;
                                 /* RFC6994 */
                         case TCPOPT_EXPERIMENT2:
                                 datalen = len - 2;
                                 LENCHECK(datalen);
                                 if (datalen < 2)
                                         goto bad;
                                 /* RFC6994 */

-                                magic = EXTRACT_16BITS(cp);
+                                magic = EXTRACT_BE_U_2(cp);

                                 ND_PRINT((ndo, "-"));
 
                                 switch(magic) {
 
                                 ND_PRINT((ndo, "-"));
 
                                 switch(magic) {
 

-                                case 0xf989:
-                                        /* TCP Fast Open: draft-ietf-tcpm-fastopen-04 */
-                                        if (datalen == 2) {
-                                                /* Fast Open Cookie Request */
-                                                ND_PRINT((ndo, "tfo cookiereq"));
-                                        } else {
-                                                /* Fast Open Cookie */
-                                                if (datalen % 2 != 0 || datalen < 6 || datalen > 18) {
-                                                        ND_PRINT((ndo, "tfo malformed"));
-                                                } else {
-                                                        ND_PRINT((ndo, "tfo cookie "));
-                                                        for (i = 2; i < datalen; ++i)
-                                                                ND_PRINT((ndo, "%02x", cp[i]));
-                                                }
-                                        }
+                                case 0xf989: /* TCP Fast Open RFC 7413 */
+                                        print_tcp_fastopen_option(ndo, cp + 2, datalen - 2, TRUE);

                                         break;
 
                                 default:
                                         break;
 
                                 default:


@@ -624,7 +632,7 @@ tcp_print(netdissect_options *ndo,
                                 if (datalen)
                                         ND_PRINT((ndo, " 0x"));
                                 for (i = 0; i < datalen; ++i) {
                                 if (datalen)
                                         ND_PRINT((ndo, " 0x"));
                                 for (i = 0; i < datalen; ++i) {

-                                        LENCHECK(i);
+                                        LENCHECK(i + 1);

                                         ND_PRINT((ndo, "%02x", cp[i]));
                                 }
                                 break;
                                         ND_PRINT((ndo, "%02x", cp[i]));
                                 }
                                 break;


@@ -669,45 +677,62 @@ tcp_print(netdissect_options *ndo,
                 case PT_ZMTP1:
                         zmtp1_print(ndo, bp, length);
                         break;
                 case PT_ZMTP1:
                         zmtp1_print(ndo, bp, length);
                         break;

+                case PT_RESP:
+                        resp_print(ndo, bp, length);
+                        break;

                 }
                 return;
         }
 
                 }
                 return;
         }
 

-        if (sport == TELNET_PORT || dport == TELNET_PORT) {
-                if (!ndo->ndo_qflag && ndo->ndo_vflag)
-                        telnet_print(ndo, bp, length);
-        } else if (sport == BGP_PORT || dport == BGP_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, ": "));
+                smtp_print(ndo, bp, length);
+        } else if (IS_SRC_OR_DST_PORT(WHOIS_PORT)) {
+                ND_PRINT((ndo, ": "));
+                txtproto_print(ndo, bp, length, "whois", NULL, 0); /* RFC 3912 */
+        } else if (IS_SRC_OR_DST_PORT(BGP_PORT))

                 bgp_print(ndo, bp, length);
                 bgp_print(ndo, bp, length);

-        else if (sport == PPTP_PORT || dport == PPTP_PORT)
+        else if (IS_SRC_OR_DST_PORT(PPTP_PORT))

                 pptp_print(ndo, bp);
                 pptp_print(ndo, bp);

-#ifdef TCPDUMP_DO_SMB
-        else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)
+        else if (IS_SRC_OR_DST_PORT(REDIS_PORT))
+                resp_print(ndo, bp, length);
+#ifdef ENABLE_SMB
+        else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT))

                 nbt_tcp_print(ndo, bp, length);
                 nbt_tcp_print(ndo, bp, length);

-       else if (sport == SMB_PORT || dport == SMB_PORT)
+       else if (IS_SRC_OR_DST_PORT(SMB_PORT))

                smb_tcp_print(ndo, bp, length);
 #endif
                smb_tcp_print(ndo, bp, length);
 #endif

-        else if (sport == BEEP_PORT || dport == BEEP_PORT)
+        else if (IS_SRC_OR_DST_PORT(BEEP_PORT))

                 beep_print(ndo, bp, length);
                 beep_print(ndo, bp, length);

-        else if (sport == OPENFLOW_PORT_OLD || dport == OPENFLOW_PORT_OLD ||
-                 sport == OPENFLOW_PORT_IANA || dport == OPENFLOW_PORT_IANA)
+        else if (IS_SRC_OR_DST_PORT(OPENFLOW_PORT_OLD) || IS_SRC_OR_DST_PORT(OPENFLOW_PORT_IANA))

                 openflow_print(ndo, bp, length);
                 openflow_print(ndo, bp, length);

-        else if (length > 2 &&
-                 (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT ||
-                  sport == MULTICASTDNS_PORT || dport == MULTICASTDNS_PORT)) {
+        else if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
+                ND_PRINT((ndo, ": "));
+                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, ": "));
+                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, ": "));
+                rtsp_print(ndo, bp, length);
+        } else if (length > 2 &&
+                 (IS_SRC_OR_DST_PORT(NAMESERVER_PORT))) {

                 /*
                  * TCP DNS query has 2byte length at the head.
                  * XXX packet could be unaligned, it can go strange
                  */
                 /*
                  * TCP DNS query has 2byte length at the head.
                  * XXX packet could be unaligned, it can go strange
                  */

-                ns_print(ndo, bp + 2, length - 2, 0);
-        } else if (sport == MSDP_PORT || dport == MSDP_PORT) {
+                domain_print(ndo, bp + 2, length - 2, 0);
+        } else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) {

                 msdp_print(ndo, bp, length);
                 msdp_print(ndo, bp, length);

-        } else if (sport == RPKI_RTR_PORT || dport == RPKI_RTR_PORT) {
+        } else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) {

                 rpki_rtr_print(ndo, bp, length);
         }
                 rpki_rtr_print(ndo, bp, length);
         }

-        else if (length > 0 && (sport == LDP_PORT || dport == LDP_PORT)) {
+        else if (length > 0 && (IS_SRC_OR_DST_PORT(LDP_PORT))) {

                 ldp_print(ndo, bp, length);
         }
                 ldp_print(ndo, bp, length);
         }

-        else if ((sport == NFS_PORT || dport == NFS_PORT) &&
+        else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) &&

                  length >= 4 && ND_TTEST2(*bp, 4)) {
                 /*
                  * If data present, header length valid, and NFS port used,
                  length >= 4 && ND_TTEST2(*bp, 4)) {
                 /*
                  * If data present, header length valid, and NFS port used,


@@ -715,24 +740,24 @@ tcp_print(netdissect_options *ndo,
                  * Pass offset of data plus 4 bytes for RPC TCP msg length
                  * to NFS print routines.
                  */
                  * Pass offset of data plus 4 bytes for RPC TCP msg length
                  * to NFS print routines.
                  */

-                u_int32_t fraglen;
-                register struct sunrpc_msg *rp;
+                uint32_t fraglen;
+                register 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;
                 if (fraglen > (length) - 4)
                         fraglen = (length) - 4;

-                rp = (struct sunrpc_msg *)(bp + 4);
+                rp = (const struct sunrpc_msg *)(bp + 4);

                 if (ND_TTEST(rp->rm_direction)) {
                 if (ND_TTEST(rp->rm_direction)) {

-                        direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&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)));
-                                nfsreq_print_noaddr(ndo, (u_char *)rp, fraglen, (u_char *)ip);
+                                ND_PRINT((ndo, ": 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) {
                                 return;
                         }
                         if (sport == NFS_PORT && direction == SUNRPC_REPLY) {

-                                ND_PRINT((ndo, ": NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid)));
-                                nfsreply_print_noaddr(ndo, (u_char *)rp, fraglen, (u_char *)ip);
+                                ND_PRINT((ndo, ": 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;
                         }
                 }
                                 return;
                         }
                 }


@@ -777,13 +802,38 @@ print_tcp_rst_data(netdissect_options *ndo,
                 ND_PRINT((ndo, "+"));                  /* indicate we truncate */
         }
         ND_PRINT((ndo, " "));
                 ND_PRINT((ndo, "+"));                  /* indicate we truncate */
         }
         ND_PRINT((ndo, " "));

-        while (length-- && sp <= ndo->ndo_snapend) {
-                c = *sp++;
+        while (length-- && sp < ndo->ndo_snapend) {
+                c = EXTRACT_U_1(sp);
+                sp++;

                 safeputchar(ndo, c);
         }
         ND_PRINT((ndo, "]"));
 }
 
                 safeputchar(ndo, c);
         }
         ND_PRINT((ndo, "]"));
 }
 

+static void
+print_tcp_fastopen_option(netdissect_options *ndo, register const u_char *cp,
+                          u_int datalen, int exp)
+{
+        u_int i;
+
+        if (exp)
+                ND_PRINT((ndo, "tfo"));
+
+        if (datalen == 0) {
+                /* Fast Open Cookie Request */
+                ND_PRINT((ndo, " cookiereq"));
+        } else {
+                /* Fast Open Cookie */
+                if (datalen % 2 != 0 || datalen < 4 || datalen > 16) {
+                        ND_PRINT((ndo, " invalid"));
+                } else {
+                        ND_PRINT((ndo, " cookie "));
+                        for (i = 0; i < datalen; ++i)
+                                ND_PRINT((ndo, "%02x", cp[i]));
+                }
+        }
+}
+

 #ifdef HAVE_LIBCRYPTO
 USES_APPLE_DEPRECATED_API
 static int
 #ifdef HAVE_LIBCRYPTO
 USES_APPLE_DEPRECATED_API
 static int


@@ -795,12 +845,10 @@ tcp_verify_signature(netdissect_options *ndo,
         u_char sig[TCP_SIGLEN];
         char zero_proto = 0;
         MD5_CTX ctx;
         u_char sig[TCP_SIGLEN];
         char zero_proto = 0;
         MD5_CTX ctx;

-        u_int16_t savecsum, tlen;
-#ifdef INET6
-        struct ip6_hdr *ip6;
-        u_int32_t len32;
-        u_int8_t nxt;
-#endif
+        uint16_t savecsum, tlen;
+        const struct ip6_hdr *ip6;
+        uint32_t len32;
+        uint8_t nxt;

 
        if (data + length > ndo->ndo_snapend) {
                ND_PRINT((ndo, "snaplen too short, "));
 
        if (data + length > ndo->ndo_snapend) {
                ND_PRINT((ndo, "snaplen too short, "));


@@ -810,8 +858,8 @@ tcp_verify_signature(netdissect_options *ndo,
         tp1 = *tp;
 
         if (ndo->ndo_sigsecret == NULL) {
         tp1 = *tp;
 
         if (ndo->ndo_sigsecret == NULL) {

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

         }
 
         MD5_Init(&ctx);
         }
 
         MD5_Init(&ctx);


@@ -819,33 +867,27 @@ tcp_verify_signature(netdissect_options *ndo,
          * Step 1: Update MD5 hash with IP pseudo-header.
          */
         if (IP_V(ip) == 4) {
          * Step 1: Update MD5 hash with IP pseudo-header.
          */
         if (IP_V(ip) == 4) {

-                MD5_Update(&ctx, (char *)&ip->ip_src, sizeof(ip->ip_src));
-                MD5_Update(&ctx, (char *)&ip->ip_dst, sizeof(ip->ip_dst));
-                MD5_Update(&ctx, (char *)&zero_proto, sizeof(zero_proto));
-                MD5_Update(&ctx, (char *)&ip->ip_p, sizeof(ip->ip_p));
-                tlen = EXTRACT_16BITS(&ip->ip_len) - IP_HL(ip) * 4;
+                MD5_Update(&ctx, (const char *)&ip->ip_src, sizeof(ip->ip_src));
+                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_BE_U_2(&ip->ip_len) - IP_HL(ip) * 4;

                 tlen = htons(tlen);
                 tlen = htons(tlen);

-                MD5_Update(&ctx, (char *)&tlen, sizeof(tlen));
-#ifdef INET6
+                MD5_Update(&ctx, (const char *)&tlen, sizeof(tlen));

         } else if (IP_V(ip) == 6) {
         } else if (IP_V(ip) == 6) {

-                ip6 = (struct ip6_hdr *)ip;
-                MD5_Update(&ctx, (char *)&ip6->ip6_src, sizeof(ip6->ip6_src));
-                MD5_Update(&ctx, (char *)&ip6->ip6_dst, sizeof(ip6->ip6_dst));
-                len32 = htonl(EXTRACT_16BITS(&ip6->ip6_plen));
-                MD5_Update(&ctx, (char *)&len32, sizeof(len32));
+                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_BE_U_2(&ip6->ip6_plen));
+                MD5_Update(&ctx, (const char *)&len32, sizeof(len32));

                 nxt = 0;
                 nxt = 0;

-                MD5_Update(&ctx, (char *)&nxt, sizeof(nxt));
-                MD5_Update(&ctx, (char *)&nxt, sizeof(nxt));
-                MD5_Update(&ctx, (char *)&nxt, sizeof(nxt));
+                MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));
+                MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));
+                MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));

                 nxt = IPPROTO_TCP;
                 nxt = IPPROTO_TCP;

-                MD5_Update(&ctx, (char *)&nxt, sizeof(nxt));
-#endif
+                MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));

         } else {
         } else {

-#ifdef INET6

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

-#else
-               ND_PRINT((ndo, "IP version not 4, "));
-#endif

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


@@ -855,7 +897,7 @@ tcp_verify_signature(netdissect_options *ndo,
          */
         savecsum = tp1.th_sum;
         tp1.th_sum = 0;
          */
         savecsum = tp1.th_sum;
         tp1.th_sum = 0;

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

         tp1.th_sum = savecsum;
         /*
          * Step 3: Update MD5 hash with TCP segment data, if present.
         tp1.th_sum = savecsum;
         /*
          * Step 3: Update MD5 hash with TCP segment data, if present.