The Tcpdump Group git mirrors - tcpdump/blobdiff

* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

*/

* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

*/

+/* \summary: TCP printer */

+

#ifndef lint

-static const char rcsid[] _U_ =

-"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.135 2008-11-09 23:35:03 mcr Exp $ (LBL)";

#else

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

#endif

#ifdef HAVE_CONFIG_H

#else

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

#endif

#ifdef HAVE_CONFIG_H

-#include "config.h"

+#include <config.h>

#endif

-#include <tcpdump-stdinc.h>

+#include "netdissect-stdinc.h"

-#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <stdlib.h>

#include <string.h>

-#include "interface.h"

+#define ND_LONGJMP_FROM_TCHECK

+#include "netdissect.h"

#include "addrtoname.h"

#include "extract.h"

#include "addrtoname.h"

#include "extract.h"

+#include "diag-control.h"

+

#include "tcp.h"

#include "ip.h"

#include "tcp.h"

#include "ip.h"

-#ifdef INET6

#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(const struct ip *ip, const struct tcphdr *tp,

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

+static int tcp_verify_signature(netdissect_options *ndo,

+ const struct ip *ip, const struct tcphdr *tp,

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

#endif

-static void print_tcp_rst_data(register const u_char *sp, u_int length);

+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);

#define MAX_RST_DATA_LEN 30

struct tha {

#define MAX_RST_DATA_LEN 30

struct tha {

-#ifndef INET6

- struct in_addr src;

- struct in_addr dst;

-#else

- struct in6_addr src;

- struct in6_addr dst;

-#endif /*INET6*/

+ nd_ipv4 src;

+ nd_ipv4 dst;

u_int port;

};

struct tcp_seq_hash {

struct tcp_seq_hash *nxt;

struct tha addr;

u_int port;

};

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 {

+ nd_ipv6 src;

+ nd_ipv6 dst;

+ u_int port;

+};

+

+struct tcp_seq_hash6 {

+ struct tcp_seq_hash6 *nxt;

+ struct tha6 addr;

+ uint32_t seq;

+ uint32_t ack;

};

#define TSEQ_HASHSIZE 919

};

#define TSEQ_HASHSIZE 919

-/* These tcp optinos do not have the size octet */

+/* These tcp options do not have the size octet */

#define ZEROLENOPT(o) ((o) == TCPOPT_EOL || (o) == TCPOPT_NOP)

-static struct tcp_seq_hash tcp_seq_hash[TSEQ_HASHSIZE];

+static struct tcp_seq_hash tcp_seq_hash4[TSEQ_HASHSIZE];

+static struct tcp_seq_hash6 tcp_seq_hash6[TSEQ_HASHSIZE];

-struct tok tcp_flag_values[] = {

+const struct tok tcp_flag_values[] = {

{ TH_FIN, "F" },

{ TH_SYN, "S" },

{ TH_RST, "R" },

{ TH_FIN, "F" },

{ TH_SYN, "S" },

{ TH_RST, "R" },

{ 0, NULL }

};

{ 0, NULL }

};

-struct tok tcp_option_values[] = {

+static const struct tok tcp_option_values[] = {

{ TCPOPT_EOL, "eol" },

{ TCPOPT_NOP, "nop" },

{ TCPOPT_MAXSEG, "mss" },

{ TCPOPT_EOL, "eol" },

{ TCPOPT_NOP, "nop" },

{ TCPOPT_MAXSEG, "mss" },

{ 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_TCPAO, "tcp-ao" },

+ { TCPOPT_MPTCP, "mptcp" },

+ { TCPOPT_FASTOPEN, "tfo" },

+ { TCPOPT_EXPERIMENT2, "exp" },

{ 0, NULL }

};

{ 0, NULL }

};

-static int tcp_cksum(register const struct ip *ip,

- register const struct tcphdr *tp,

- register u_int len)

+static uint16_t

+tcp_cksum(netdissect_options *ndo,

+ const struct ip *ip,

+ const struct tcphdr *tp,

+ u_int len)

+{

+ return nextproto4_cksum(ndo, ip, (const uint8_t *)tp, len, len,

+ IPPROTO_TCP);

+}

+

+static uint16_t

+tcp6_cksum(netdissect_options *ndo,

+ const struct ip6_hdr *ip6,

+ const struct tcphdr *tp,

+ u_int len)

{

- return (nextproto4_cksum(ip, (const u_int8_t *)tp, len,

- IPPROTO_TCP));

+ return nextproto6_cksum(ndo, ip6, (const uint8_t *)tp, len, len,

+ IPPROTO_TCP);

}

void

}

void

-tcp_print(register const u_char *bp, register u_int length,

- register const u_char *bp2, int fragmented)

+tcp_print(netdissect_options *ndo,

+ 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;

- u_int16_t sport, dport, win, urp;

- u_int32_t seq, ack, thseq, thack;

+ 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;

- int threv;

-#ifdef INET6

- register const struct ip6_hdr *ip6;

-#endif

-

- tp = (struct tcphdr *)bp;

- ip = (struct ip *)bp2;

-#ifdef INET6

+ uint16_t magic;

+ int rev;

+ const struct ip6_hdr *ip6;

+ u_int header_len; /* Header length in bytes */

+

+ ndo->ndo_protocol = "tcp";

+ tp = (const struct tcphdr *)bp;

+ ip = (const struct ip *)bp2;

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 (!TTEST(tp->th_dport)) {

- (void)printf("%s > %s: [|tcp]",

- ipaddr_string(&ip->ip_src),

- ipaddr_string(&ip->ip_dst));

- return;

+ if (!ND_TTEST_2(tp->th_dport)) {

+ if (ip6) {

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

+ GET_IP6ADDR_STRING(ip6->ip6_src),

+ GET_IP6ADDR_STRING(ip6->ip6_dst));

+ } else {

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

+ GET_IPADDR_STRING(ip->ip_src),

+ GET_IPADDR_STRING(ip->ip_dst));

+ }

+ nd_trunc_longjmp(ndo);

}

- sport = EXTRACT_16BITS(&tp->th_sport);

- dport = EXTRACT_16BITS(&tp->th_dport);

-

- hlen = TH_OFF(tp) * 4;

+ sport = GET_BE_U_2(tp->th_sport);

+ dport = GET_BE_U_2(tp->th_dport);

- /*

- * If data present, header length valid, and NFS port used,

- * assume NFS.

- * Pass offset of data plus 4 bytes for RPC TCP msg length

- * to NFS print routines.

- */

- if (!qflag && hlen >= sizeof(*tp) && hlen <= length &&

- (length - hlen) >= 4) {

- u_char *fraglenp;

- u_int32_t fraglen;

- register struct sunrpc_msg *rp;

- enum sunrpc_msg_type direction;

-

- fraglenp = (u_char *)tp + hlen;

- if (TTEST2(*fraglenp, 4)) {

- fraglen = EXTRACT_32BITS(fraglenp) & 0x7FFFFFFF;

- if (fraglen > (length - hlen) - 4)

- fraglen = (length - hlen) - 4;

- rp = (struct sunrpc_msg *)(fraglenp + 4);

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

- direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);

- if (dport == NFS_PORT &&

- direction == SUNRPC_CALL) {

- nfsreq_print((u_char *)rp, fraglen,

- (u_char *)ip);

- return;

- }

- if (sport == NFS_PORT &&

- direction == SUNRPC_REPLY) {

- nfsreply_print((u_char *)rp, fraglen,

- (u_char *)ip);

- return;

- }

-#ifdef INET6

if (ip6) {

- if (ip6->ip6_nxt == IPPROTO_TCP) {

- (void)printf("%s.%s > %s.%s: ",

- ip6addr_string(&ip6->ip6_src),

- tcpport_string(sport),

- ip6addr_string(&ip6->ip6_dst),

- tcpport_string(dport));

+ if (GET_U_1(ip6->ip6_nxt) == IPPROTO_TCP) {

+ ND_PRINT("%s.%s > %s.%s: ",

+ GET_IP6ADDR_STRING(ip6->ip6_src),

+ tcpport_string(ndo, sport),

+ GET_IP6ADDR_STRING(ip6->ip6_dst),

+ tcpport_string(ndo, dport));

} else {

- (void)printf("%s > %s: ",

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

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

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

}

- } else

-#endif /*INET6*/

- {

- if (ip->ip_p == IPPROTO_TCP) {

- (void)printf("%s.%s > %s.%s: ",

- ipaddr_string(&ip->ip_src),

- tcpport_string(sport),

- ipaddr_string(&ip->ip_dst),

- tcpport_string(dport));

+ } else {

+ if (GET_U_1(ip->ip_p) == IPPROTO_TCP) {

+ ND_PRINT("%s.%s > %s.%s: ",

+ GET_IPADDR_STRING(ip->ip_src),

+ tcpport_string(ndo, sport),

+ GET_IPADDR_STRING(ip->ip_dst),

+ tcpport_string(ndo, dport));

} else {

- (void)printf("%s > %s: ",

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

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

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

}

+ hlen = TH_OFF(tp) * 4;

+

if (hlen < sizeof(*tp)) {

- (void)printf(" tcp %d [bad hdr length %u - too short, < %lu]",

- length - hlen, hlen, (unsigned long)sizeof(*tp));

- return;

+ ND_PRINT(" tcp %u [bad hdr length %u - too short, < %zu]",

+ length - hlen, hlen, sizeof(*tp));

+ goto invalid;

}

- TCHECK(*tp);

+ seq = GET_BE_U_4(tp->th_seq);

+ ack = GET_BE_U_4(tp->th_ack);

+ win = GET_BE_U_2(tp->th_win);

+ urp = GET_BE_U_2(tp->th_urp);

- seq = EXTRACT_32BITS(&tp->th_seq);

- ack = EXTRACT_32BITS(&tp->th_ack);

- win = EXTRACT_16BITS(&tp->th_win);

- urp = EXTRACT_16BITS(&tp->th_urp);

-

- if (qflag) {

- (void)printf("tcp %d", length - hlen);

+ if (ndo->ndo_qflag) {

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

if (hlen > length) {

- (void)printf(" [bad hdr length %u - too long, > %u]",

- hlen, length);

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

+ hlen, length);

+ goto invalid;

}

return;

}

return;

}

- flags = tp->th_flags;

- printf("Flags [%s]", bittok2str_nosep(tcp_flag_values, "none", flags));

+ flags = GET_U_1(tp->th_flags);

+ ND_PRINT("Flags [%s]", bittok2str_nosep(tcp_flag_values, "none", flags));

- if (!Sflag && (flags & TH_ACK)) {

- register struct tcp_seq_hash *th;

- const void *src, *dst;

- register int rev;

- struct tha tha;

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

/*

* Find (or record) the initial sequence numbers for

* this conversation. (we pick an arbitrary

* collating order so there's only one entry for

* both directions).

*/

/*

* Find (or record) the initial sequence numbers for

* this conversation. (we pick an arbitrary

* collating order so there's only one entry for

* both directions).

*/

-#ifdef INET6

rev = 0;

if (ip6) {

rev = 0;

if (ip6) {

- src = &ip6->ip6_src;

- dst = &ip6->ip6_dst;

+ struct tcp_seq_hash6 *th;

+ struct tcp_seq_hash6 *tcp_seq_hash;

+ const void *src, *dst;

+ struct tha6 tha;

+

+ tcp_seq_hash = tcp_seq_hash6;

+ 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) {

- if (memcmp(src, dst, sizeof ip6->ip6_dst) > 0)

+ if (UNALIGNED_MEMCMP(src, dst, sizeof(ip6->ip6_dst)) > 0)

rev = 1;

}

if (rev) {

rev = 1;

}

if (rev) {

- memcpy(&tha.src, dst, sizeof ip6->ip6_dst);

- memcpy(&tha.dst, src, sizeof ip6->ip6_src);

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

+ UNALIGNED_MEMCPY(&tha.src, dst, sizeof(ip6->ip6_dst));

+ UNALIGNED_MEMCPY(&tha.dst, src, sizeof(ip6->ip6_src));

+ tha.port = ((u_int)dport) << 16 | sport;

+ } else {

+ UNALIGNED_MEMCPY(&tha.dst, dst, sizeof(ip6->ip6_dst));

+ UNALIGNED_MEMCPY(&tha.src, src, sizeof(ip6->ip6_src));

+ tha.port = ((u_int)sport) << 16 | dport;

+ }

+

+ for (th = &tcp_seq_hash[tha.port % TSEQ_HASHSIZE];

+ th->nxt; th = th->nxt)

+ if (memcmp((char *)&tha, (char *)&th->addr,

+ sizeof(th->addr)) == 0)

+ break;

+

+ if (!th->nxt || (flags & TH_SYN)) {

+ /* didn't find it or new conversation */

+ /* calloc() return used by the 'tcp_seq_hash6'

+ hash table: do not free() */

+ if (th->nxt == NULL) {

+ th->nxt = (struct tcp_seq_hash6 *)

+ calloc(1, sizeof(*th));

+ if (th->nxt == NULL)

+ (*ndo->ndo_error)(ndo,

+ S_ERR_ND_MEM_ALLOC,

+ "%s: calloc", __func__);

+ }

+ th->addr = tha;

+ if (rev)

+ th->ack = seq, th->seq = ack - 1;

+ else

+ th->seq = seq, th->ack = ack - 1;

} else {

- memcpy(&tha.dst, dst, sizeof ip6->ip6_dst);

- memcpy(&tha.src, src, sizeof ip6->ip6_src);

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

+ if (rev)

+ seq -= th->ack, ack -= th->seq;

+ else

+ seq -= th->seq, ack -= th->ack;

}

+

+ thseq = th->seq;

+ thack = th->ack;

} else {

- /*

- * Zero out the tha structure; the src and dst

- * fields are big enough to hold an IPv6

- * address, but we only have IPv4 addresses

- * and thus must clear out the remaining 124

- * bits.

- *

- * XXX - should we just clear those bytes after

- * copying the IPv4 addresses, rather than

- * zeroing out the entire structure and then

- * overwriting some of the zeroes?

- *

- * XXX - this could fail if we see TCP packets

- * with an IPv6 address with the lower 124 bits

- * all zero and also see TCP packes with an

- * IPv4 address with the same 32 bits as the

- * upper 32 bits of the IPv6 address in question.

- * Can that happen? Is it likely enough to be

- * an issue?

- */

- memset(&tha, 0, sizeof(tha));

- src = &ip->ip_src;

- dst = &ip->ip_dst;

+ struct tcp_seq_hash *th;

+ struct tcp_seq_hash *tcp_seq_hash;

+ struct tha tha;

+

+ tcp_seq_hash = tcp_seq_hash4;

if (sport > dport)

rev = 1;

else if (sport == dport) {

if (sport > dport)

rev = 1;

else if (sport == dport) {

- if (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) {

- memcpy(&tha.src, dst, sizeof ip->ip_dst);

- memcpy(&tha.dst, src, sizeof ip->ip_src);

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

+ UNALIGNED_MEMCPY(&tha.src, ip->ip_dst,

+ sizeof(ip->ip_dst));

+ UNALIGNED_MEMCPY(&tha.dst, ip->ip_src,

+ sizeof(ip->ip_src));

+ tha.port = ((u_int)dport) << 16 | sport;

} else {

- memcpy(&tha.dst, dst, sizeof ip->ip_dst);

- memcpy(&tha.src, src, sizeof ip->ip_src);

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

+ UNALIGNED_MEMCPY(&tha.dst, ip->ip_dst,

+ sizeof(ip->ip_dst));

+ UNALIGNED_MEMCPY(&tha.src, ip->ip_src,

+ sizeof(ip->ip_src));

+ tha.port = ((u_int)sport) << 16 | dport;

}

- }

-#else

- rev = 0;

- src = &ip->ip_src;

- dst = &ip->ip_dst;

- if (sport > dport)

- rev = 1;

- else if (sport == dport) {

- if (memcmp(src, dst, sizeof ip->ip_dst) > 0)

- rev = 1;

- }

- if (rev) {

- memcpy(&tha.src, dst, sizeof ip->ip_dst);

- memcpy(&tha.dst, src, sizeof ip->ip_src);

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

- } else {

- memcpy(&tha.dst, dst, sizeof ip->ip_dst);

- memcpy(&tha.src, src, sizeof ip->ip_src);

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

- }

-#endif

- threv = rev;

- for (th = &tcp_seq_hash[tha.port % TSEQ_HASHSIZE];

- th->nxt; th = th->nxt)

- if (memcmp((char *)&tha, (char *)&th->addr,

- sizeof(th->addr)) == 0)

- break;

+ for (th = &tcp_seq_hash[tha.port % TSEQ_HASHSIZE];

+ th->nxt; th = th->nxt)

+ if (memcmp((char *)&tha, (char *)&th->addr,

+ sizeof(th->addr)) == 0)

+ break;

- if (!th->nxt || (flags & TH_SYN)) {

- /* didn't find it or new conversation */

- if (th->nxt == NULL) {

- th->nxt = (struct tcp_seq_hash *)

- calloc(1, sizeof(*th));

- if (th->nxt == NULL)

- error("tcp_print: calloc");

+ if (!th->nxt || (flags & TH_SYN)) {

+ /* didn't find it or new conversation */

+ /* calloc() return used by the 'tcp_seq_hash4'

+ hash table: do not free() */

+ if (th->nxt == NULL) {

+ th->nxt = (struct tcp_seq_hash *)

+ calloc(1, sizeof(*th));

+ if (th->nxt == NULL)

+ (*ndo->ndo_error)(ndo,

+ S_ERR_ND_MEM_ALLOC,

+ "%s: calloc", __func__);

+ }

+ th->addr = tha;

+ if (rev)

+ th->ack = seq, th->seq = ack - 1;

+ else

+ th->seq = seq, th->ack = ack - 1;

+ } else {

+ if (rev)

+ seq -= th->ack, ack -= th->seq;

+ else

+ seq -= th->seq, ack -= th->ack;

}

- th->addr = tha;

- if (rev)

- th->ack = seq, th->seq = ack - 1;

- else

- th->seq = seq, th->ack = ack - 1;

- } else {

- if (rev)

- seq -= th->ack, ack -= th->seq;

- else

- seq -= th->seq, ack -= th->ack;

- }

- thseq = th->seq;

- thack = th->ack;

+ thseq = th->seq;

+ thack = th->ack;

+ }

} else {

/*fool gcc*/

} else {

/*fool gcc*/

- thseq = thack = threv = 0;

+ thseq = thack = rev = 0;

}

if (hlen > length) {

}

if (hlen > length) {

- (void)printf(" [bad hdr length %u - too long, > %u]",

- hlen, length);

- return;

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

+ hlen, length);

+ goto invalid;

}

- if (vflag && !Kflag && !fragmented) {

+ 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 (TTEST2(tp->th_sport, length)) {

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

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

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

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

+ tcp_sum = GET_BE_U_2(tp->th_sum);

- (void)printf(", cksum 0x%04x", tcp_sum);

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

if (sum != 0)

- (void)printf(" (incorrect -> 0x%04x)",

+ ND_PRINT(" (incorrect -> 0x%04x)",

in_cksum_shouldbe(tcp_sum, sum));

else

in_cksum_shouldbe(tcp_sum, sum));

else

- (void)printf(" (correct)");

+ ND_PRINT(" (correct)");

}

- }

-#ifdef INET6

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

- if (TTEST2(tp->th_sport, length)) {

- sum = nextproto6_cksum(ip6, (const u_int8_t *)tp, length, IPPROTO_TCP);

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

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

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

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

+ tcp_sum = GET_BE_U_2(tp->th_sum);

- (void)printf(", cksum 0x%04x", tcp_sum);

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

if (sum != 0)

- (void)printf(" (incorrect -> 0x%04x)",

+ ND_PRINT(" (incorrect -> 0x%04x)",

in_cksum_shouldbe(tcp_sum, sum));

else

in_cksum_shouldbe(tcp_sum, sum));

else

- (void)printf(" (correct)");

+ ND_PRINT(" (correct)");

}

-#endif

}

length -= hlen;

}

length -= hlen;

- if (vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST)) {

- (void)printf(", seq %u", seq);

+ if (ndo->ndo_vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST)) {

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

if (length > 0) {

- (void)printf(":%u", seq + length);

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

}

if (flags & TH_ACK) {

}

if (flags & TH_ACK) {

- (void)printf(", ack %u", ack);

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

}

- (void)printf(", win %d", win);

+ ND_PRINT(", win %u", win);

if (flags & TH_URG)

- (void)printf(", 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);

- printf(", options [");

+ ND_PRINT(", options [");

while (hlen > 0) {

if (ch != '\0')

while (hlen > 0) {

if (ch != '\0')

- putchar(ch);

- TCHECK(*cp);

- opt = *cp++;

+ ND_PRINT("%c", ch);

+ opt = GET_U_1(cp);

+ cp++;

if (ZEROLENOPT(opt))

len = 1;

else {

if (ZEROLENOPT(opt))

len = 1;

else {

- TCHECK(*cp);

- len = *cp++; /* total including type, len */

+ len = GET_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 */

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; TCHECK2(*cp, l); }

+#define LENCHECK(l) { if ((l) > hlen) goto bad; }

- printf("%s", tok2str(tcp_option_values, "Unknown Option %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);

- (void)printf(" %u", EXTRACT_16BITS(cp));

+ ND_PRINT(" %u", GET_BE_U_2(cp));

break;

case TCPOPT_WSCALE:

datalen = 1;

LENCHECK(datalen);

break;

case TCPOPT_WSCALE:

datalen = 1;

LENCHECK(datalen);

- (void)printf(" %u", *cp);

+ ND_PRINT(" %u", GET_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) {

- (void)printf("malformed sack");

+ ND_PRINT(" invalid sack");

} else {

- u_int32_t s, e;

+ uint32_t s, e;

- (void)printf(" %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 = GET_BE_U_4(cp + i);

LENCHECK(i + 8);

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

- if (threv) {

+ e = GET_BE_U_4(cp + i + 4);

+ if (rev) {

s -= thseq;

e -= thseq;

} else {

s -= thack;

e -= thack;

}

s -= thseq;

e -= thseq;

} else {

s -= thack;

e -= thack;

}

- (void)printf("{%u:%u}", s, e);

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

}

break;

}

break;

*/

datalen = 4;

LENCHECK(datalen);

*/

datalen = 4;

LENCHECK(datalen);

- (void)printf(" %u", EXTRACT_32BITS(cp));

+ ND_PRINT(" %u", GET_BE_U_4(cp));

break;

case TCPOPT_TIMESTAMP:

datalen = 8;

LENCHECK(datalen);

break;

case TCPOPT_TIMESTAMP:

datalen = 8;

LENCHECK(datalen);

- (void)printf(" val %u ecr %u",

- EXTRACT_32BITS(cp),

- EXTRACT_32BITS(cp + 4));

+ ND_PRINT(" val %u ecr %u",

+ GET_BE_U_4(cp),

+ GET_BE_U_4(cp + 4));

break;

case TCPOPT_SIGNATURE:

datalen = TCP_SIGLEN;

LENCHECK(datalen);

break;

case TCPOPT_SIGNATURE:

datalen = TCP_SIGLEN;

LENCHECK(datalen);

+ ND_TCHECK_LEN(cp, datalen);

+ ND_PRINT(" ");

#ifdef HAVE_LIBCRYPTO

- switch (tcp_verify_signature(ip, tp,

+ switch (tcp_verify_signature(ndo, ip, tp,

bp + TH_OFF(tp) * 4, length, cp)) {

case SIGNATURE_VALID:

bp + TH_OFF(tp) * 4, length, cp)) {

case SIGNATURE_VALID:

- (void)printf("valid");

+ ND_PRINT("valid");

break;

case SIGNATURE_INVALID:

break;

case SIGNATURE_INVALID:

- (void)printf("invalid");

+ nd_print_invalid(ndo);

break;

case CANT_CHECK_SIGNATURE:

break;

case CANT_CHECK_SIGNATURE:

- (void)printf("can't check - ");

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

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

- (void)printf("%02x", cp[i]);

+ ND_PRINT("%02x",

+ GET_U_1(cp + i));

break;

}

#else

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

break;

}

#else

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

- (void)printf("%02x", cp[i]);

+ ND_PRINT("%02x", GET_U_1(cp + i));

#endif

break;

#endif

break;

- case TCPOPT_AUTH:

- (void)printf("keyid %d", *cp++);

- datalen = len - 3;

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

- LENCHECK(i);

- (void)printf("%02x", cp[i]);

- }

+ case TCPOPT_SCPS:

+ datalen = 2;

+ LENCHECK(datalen);

+ ND_PRINT(" cap %02x id %u", GET_U_1(cp),

+ GET_U_1(cp + 1));

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_invalid(ndo);

+ } else {

+ LENCHECK(1);

+ ND_PRINT(" keyid %u", GET_U_1(cp));

+ LENCHECK(2);

+ ND_PRINT(" rnextkeyid %u",

+ GET_U_1(cp + 1));

+ if (datalen > 2) {

+ ND_PRINT(" mac 0x");

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

+ LENCHECK(i + 1);

+ ND_PRINT("%02x",

+ GET_U_1(cp + i));

+ }

+ break;

case TCPOPT_EOL:

case TCPOPT_NOP:

case TCPOPT_EOL:

case TCPOPT_NOP:

case TCPOPT_UTO:

datalen = 2;

LENCHECK(datalen);

case TCPOPT_UTO:

datalen = 2;

LENCHECK(datalen);

- utoval = EXTRACT_16BITS(cp);

- (void)printf("0x%x", utoval);

+ utoval = GET_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;

- (void)printf(" %u", utoval);

+ ND_PRINT(" %u", utoval);

+ break;

+

+ case TCPOPT_MPTCP:

+ {

+ const u_char *snapend_save;

+ int ret;

+

+ datalen = len - 2;

+ LENCHECK(datalen);

+ /* FIXME: Proof-read mptcp_print() and if it

+ * always covers all bytes when it returns 1,

+ * only do ND_TCHECK_LEN() if it returned 0.

+ */

+ ND_TCHECK_LEN(cp, datalen);

+ /* Update the snapend to the end of the option

+ * before calling mptcp_print(). Some options

+ * (MPTCP or others) may be present after a

+ * MPTCP option. This prevents that, in

+ * mptcp_print(), the remaining length < the

+ * remaining caplen.

+ */

+ snapend_save = ndo->ndo_snapend;

+ ndo->ndo_snapend = ND_MIN(cp - 2 + len,

+ ndo->ndo_snapend);

+ ret = mptcp_print(ndo, cp - 2, len, flags);

+ ndo->ndo_snapend = snapend_save;

+ if (!ret)

+ goto bad;

+ break;

+ }

+

+ case TCPOPT_FASTOPEN:

+ datalen = len - 2;

+ LENCHECK(datalen);

+ ND_TCHECK_LEN(cp, datalen);

+ ND_PRINT(" ");

+ print_tcp_fastopen_option(ndo, cp, datalen);

+ break;

+

+ case TCPOPT_EXPERIMENT2:

+ datalen = len - 2;

+ LENCHECK(datalen);

+ ND_TCHECK_LEN(cp, datalen);

+ if (datalen < 2)

+ goto bad;

+ /* RFC6994 */

+ magic = GET_BE_U_2(cp);

+ ND_PRINT("-");

+

+ switch(magic) {

+

+ case 0xf989: /* TCP Fast Open RFC 7413 */

+ ND_PRINT("tfo");

+ print_tcp_fastopen_option(ndo, cp + 2, datalen - 2);

+ break;

+

+ default:

+ /* Unknown magic number */

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

+ break;

+ }

break;

default:

datalen = len - 2;

break;

default:

datalen = len - 2;

+ if (datalen)

+ ND_PRINT(" 0x");

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

- LENCHECK(i);

- (void)printf("%02x", cp[i]);

+ LENCHECK(i + 1);

+ ND_PRINT("%02x", GET_U_1(cp + i));

}

break;

}

break;

}

hlen -= datalen;

/* Check specification against observed length */

hlen -= datalen;

/* Check specification against observed length */

- ++datalen; /* option octet */

+ ++datalen; /* option octet */

if (!ZEROLENOPT(opt))

- ++datalen; /* size octet */

+ ++datalen; /* size octet */

if (datalen != len)

- (void)printf("[len %d]", len);

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

ch = ',';

if (opt == TCPOPT_EOL)

break;

}

ch = ',';

if (opt == TCPOPT_EOL)

break;

}

- putchar(']');

+ ND_PRINT("]");

}

/*

* Print length field before crawling down the stack.

*/

}

/*

* Print length field before crawling down the stack.

*/

- printf(", length %u", length);

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

- if (length <= 0)

+ if (length == 0)

return;

/*

* Decode payload if necessary.

*/

return;

/*

* Decode payload if necessary.

*/

- bp += TH_OFF(tp) * 4;

- if ((flags & TH_RST) && vflag) {

- print_tcp_rst_data(bp, length);

+ header_len = TH_OFF(tp) * 4;

+ /*

+ * Do a bounds check before decoding the payload.

+ * At least the header data is required.

+ */

+ if (!ND_TTEST_LEN(bp, header_len)) {

+ ND_PRINT(" [remaining caplen(%u) < header length(%u)]",

+ ND_BYTES_AVAILABLE_AFTER(bp), header_len);

+ nd_trunc_longjmp(ndo);

+ }

+ bp += header_len;

+ if ((flags & TH_RST) && ndo->ndo_vflag) {

+ print_tcp_rst_data(ndo, bp, length);

return;

- }

+ }

- if (packettype) {

- switch (packettype) {

+ if (ndo->ndo_packettype) {

+ switch (ndo->ndo_packettype) {

case PT_ZMTP1:

- zmtp1_print(bp, length);

+ zmtp1_print(ndo, bp, length);

+ break;

+ case PT_RESP:

+ resp_print(ndo, bp, length);

+ break;

+ case PT_DOMAIN:

+ /* over_tcp: TRUE, is_mdns: FALSE */

+ domain_print(ndo, bp, length, TRUE, FALSE);

break;

}

return;

}

break;

}

return;

}

- if (sport == TELNET_PORT || dport == TELNET_PORT) {

- if (!qflag && vflag)

- telnet_print(bp, length);

- } else if (sport == BGP_PORT || dport == BGP_PORT)

- bgp_print(bp, length);

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

- pptp_print(bp);

-#ifdef TCPDUMP_DO_SMB

- else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)

- nbt_tcp_print(bp, length);

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

- smb_tcp_print(bp, length);

+ if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {

+ telnet_print(ndo, bp, length);

+ } else if (IS_SRC_OR_DST_PORT(SMTP_PORT)) {

+ ND_PRINT(": ");

+ smtp_print(ndo, bp, length);

+ } else if (IS_SRC_OR_DST_PORT(WHOIS_PORT)) {

+ ND_PRINT(": ");

+ whois_print(ndo, bp, length);

+ } else if (IS_SRC_OR_DST_PORT(BGP_PORT))

+ bgp_print(ndo, bp, length);

+ else if (IS_SRC_OR_DST_PORT(PPTP_PORT))

+ pptp_print(ndo, bp);

+ else if (IS_SRC_OR_DST_PORT(REDIS_PORT))

+ resp_print(ndo, bp, length);

+ else if (IS_SRC_OR_DST_PORT(SSH_PORT))

+ ssh_print(ndo, bp, length);

+#ifdef ENABLE_SMB

+ else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT))

+ nbt_tcp_print(ndo, bp, length);

+ else if (IS_SRC_OR_DST_PORT(SMB_PORT))

+ smb_tcp_print(ndo, bp, length);

#endif

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

- beep_print(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(BEEP_PORT))

+ beep_print(ndo, bp, length);

+ 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(": ");

+ ftp_print(ndo, bp, length);

+ } else if (IS_SRC_OR_DST_PORT(HTTP_PORT) || IS_SRC_OR_DST_PORT(HTTP_PORT_ALT)) {

+ ND_PRINT(": ");

+ http_print(ndo, bp, length);

+ } else if (IS_SRC_OR_DST_PORT(RTSP_PORT) || IS_SRC_OR_DST_PORT(RTSP_PORT_ALT)) {

+ ND_PRINT(": ");

+ rtsp_print(ndo, bp, length);

+ } else if (IS_SRC_OR_DST_PORT(NAMESERVER_PORT)) {

+ /* over_tcp: TRUE, is_mdns: FALSE */

+ domain_print(ndo, bp, length, TRUE, FALSE);

+ } else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) {

+ msdp_print(ndo, bp, length);

+ } else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) {

+ rpki_rtr_print(ndo, bp, length);

+ } else if (IS_SRC_OR_DST_PORT(LDP_PORT)) {

+ ldp_print(ndo, bp, length);

+ } else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) &&

+ length >= 4) {

/*

- * TCP DNS query has 2byte length at the head.

- * XXX packet could be unaligned, it can go strange

+ * If data present, header length valid, and NFS port used,

+ * assume NFS.

+ * Pass offset of data plus 4 bytes for RPC TCP msg length

+ * to NFS print routines.

*/

- ns_print(bp + 2, length - 2, 0);

- } else if (sport == MSDP_PORT || dport == MSDP_PORT) {

- msdp_print(bp, length);

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

- rpki_rtr_print(bp, length);

- }

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

- ldp_print(bp, length);

+ uint32_t fraglen;

+ const struct sunrpc_msg *rp;

+ enum sunrpc_msg_type direction;

+

+ fraglen = GET_BE_U_4(bp) & 0x7FFFFFFF;

+ if (fraglen > (length) - 4)

+ fraglen = (length) - 4;

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

+ if (ND_TTEST_4(rp->rm_direction)) {

+ direction = (enum sunrpc_msg_type) GET_BE_U_4(rp->rm_direction);

+ if (dport == NFS_PORT && direction == SUNRPC_CALL) {

+ ND_PRINT(": NFS request xid %u ",

+ GET_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) {

+ ND_PRINT(": NFS reply xid %u ",

+ GET_BE_U_4(rp->rm_xid));

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

+ return;

+ }

}

return;

}

return;

- bad:

- fputs("[bad opt]", stdout);

+bad:

+ ND_PRINT("[bad opt]");

if (ch != '\0')

- putchar('>');

+ ND_PRINT("]");

return;

- trunc:

- fputs("[|tcp]", stdout);

- if (ch != '\0')

- putchar('>');

+invalid:

+ nd_print_invalid(ndo);

}

/*

}

/*

*/

static void

*/

static void

-print_tcp_rst_data(register const u_char *sp, u_int length)

+print_tcp_rst_data(netdissect_options *ndo,

+ const u_char *sp, u_int length)

{

- int c;

-

- if (TTEST2(*sp, length))

- printf(" [RST");

- else

- printf(" [!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 */

- putchar('+'); /* indicate we truncate */

+ ND_PRINT("+"); /* indicate we truncate */

}

- putchar(' ');

- while (length-- && sp <= snapend) {

- c = *sp++;

- safeputchar(c);

+ ND_PRINT(" ");

+ (void)nd_printn(ndo, sp, length, ndo->ndo_snapend);

+ ND_PRINT("]");

+}

+

+static void

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

+ u_int datalen)

+{

+ u_int i;

+

+ if (datalen == 0) {

+ /* Fast Open Cookie Request */

+ ND_PRINT(" cookiereq");

+ } else {

+ /* Fast Open Cookie */

+ if (datalen % 2 != 0 || datalen < 4 || datalen > 16) {

+ nd_print_invalid(ndo);

+ } else {

+ ND_PRINT(" cookie ");

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

+ ND_PRINT("%02x", GET_U_1(cp + i));

+ }

}

- putchar(']');

}

#ifdef HAVE_LIBCRYPTO

}

#ifdef HAVE_LIBCRYPTO

+DIAG_OFF_DEPRECATION

static int

-tcp_verify_signature(const struct ip *ip, const struct tcphdr *tp,

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

+tcp_verify_signature(netdissect_options *ndo,

+ const struct ip *ip, const struct tcphdr *tp,

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

{

struct tcphdr tp1;

u_char sig[TCP_SIGLEN];

char zero_proto = 0;

MD5_CTX ctx;

{

struct tcphdr tp1;

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 > snapend) {

- printf("snaplen too short, ");

- return (CANT_CHECK_SIGNATURE);

- }

+ if (!ND_TTEST_LEN(data, length)) {

+ ND_PRINT("snaplen too short, ");

+ return (CANT_CHECK_SIGNATURE);

+ }

tp1 = *tp;

- if (sigsecret == NULL) {

- printf("shared secret not supplied with -M, ");

+ if (ndo->ndo_sigsecret == NULL) {

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

return (CANT_CHECK_SIGNATURE);

}

return (CANT_CHECK_SIGNATURE);

}

* 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 = GET_BE_U_2(ip->ip_len) - IP_HL(ip) * 4;

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

- 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(GET_BE_U_2(ip6->ip6_plen));

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

nxt = 0;

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

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

nxt = IPPROTO_TCP;

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

-#endif

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

} else {

-#ifdef INET6

- printf("IP version not 4 or 6, ");

-#else

- printf("IP version not 4, ");

-#endif

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

return (CANT_CHECK_SIGNATURE);

}

return (CANT_CHECK_SIGNATURE);

}

* 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;

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

- tp1.th_sum = savecsum;

+ 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));

+ 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.

*/

/*

* Step 4: Update MD5 hash with shared secret.

*/

/*

* Step 4: Update MD5 hash with shared secret.

*/

- MD5_Update(&ctx, sigsecret, strlen(sigsecret));

+ MD5_Update(&ctx, ndo->ndo_sigsecret, strlen(ndo->ndo_sigsecret));

MD5_Final(sig, &ctx);

if (memcmp(rcvsig, sig, TCP_SIGLEN) == 0)

MD5_Final(sig, &ctx);

if (memcmp(rcvsig, sig, TCP_SIGLEN) == 0)

else

return (SIGNATURE_INVALID);

}

else

return (SIGNATURE_INVALID);

}

+DIAG_ON_DEPRECATION

#endif /* HAVE_LIBCRYPTO */

-

-/*

- * Local Variables:

- * c-style: whitesmith

- * c-basic-offset: 8

- * End:

- */