X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/cdda157a88595c0945f7719f83446e3976d53b89..1bf91b1413a6d0eefb4c49bafdb612befa838556:/print-tcp.c diff --git a/print-tcp.c b/print-tcp.c index 1473cb38..c9b50fee 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -23,6 +23,8 @@ * 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 $"); @@ -125,8 +127,9 @@ static const struct tok tcp_option_values[] = { { 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" }, @@ -143,6 +146,16 @@ tcp_cksum(netdissect_options *ndo, 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); +} + void tcp_print(netdissect_options *ndo, register const u_char *bp, register u_int length, @@ -177,8 +190,6 @@ tcp_print(netdissect_options *ndo, sport = EXTRACT_16BITS(&tp->th_sport); dport = EXTRACT_16BITS(&tp->th_dport); - hlen = TH_OFF(tp) * 4; - if (ip6) { if (ip6->ip6_nxt == IPPROTO_TCP) { ND_PRINT((ndo, "%s.%s > %s.%s: ", @@ -203,14 +214,16 @@ tcp_print(netdissect_options *ndo, } } + 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; } - ND_TCHECK(*tp); - seq = EXTRACT_32BITS(&tp->th_seq); ack = EXTRACT_32BITS(&tp->th_ack); win = EXTRACT_16BITS(&tp->th_win); @@ -239,12 +252,12 @@ tcp_print(netdissect_options *ndo, 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; - 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) { @@ -370,8 +383,7 @@ tcp_print(netdissect_options *ndo, } } else if (IP_V(ip) == 6 && ip6->ip6_plen) { if (ND_TTEST2(tp->th_sport, length)) { - sum = nextproto6_cksum(ip6, (const uint8_t *)tp, - length, length, IPPROTO_TCP); + sum = tcp6_cksum(ndo, ip6, tp, length); tcp_sum = EXTRACT_16BITS(&tp->th_sum); ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum)); @@ -453,7 +465,7 @@ tcp_print(netdissect_options *ndo, case TCPOPT_SACK: datalen = len - 2; if (datalen % 8 != 0) { - ND_PRINT((ndo, "invalid sack")); + ND_PRINT((ndo, " invalid sack")); } else { uint32_t s, e; @@ -501,6 +513,7 @@ tcp_print(netdissect_options *ndo, 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)) { @@ -525,15 +538,35 @@ tcp_print(netdissect_options *ndo, #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; + 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: @@ -548,7 +581,7 @@ tcp_print(netdissect_options *ndo, datalen = 2; LENCHECK(datalen); utoval = EXTRACT_16BITS(cp); - ND_PRINT((ndo, "0x%x", utoval)); + ND_PRINT((ndo, " 0x%x", utoval)); if (utoval & 0x0001) utoval = (utoval >> 1) * 60; else @@ -566,6 +599,7 @@ tcp_print(netdissect_options *ndo, case TCPOPT_FASTOPEN: datalen = len - 2; LENCHECK(datalen); + ND_PRINT((ndo, " ")); print_tcp_fastopen_option(ndo, cp, datalen, FALSE); break; @@ -596,7 +630,7 @@ tcp_print(netdissect_options *ndo, if (datalen) ND_PRINT((ndo, " 0x")); for (i = 0; i < datalen; ++i) { - LENCHECK(i); + LENCHECK(i + 1); ND_PRINT((ndo, "%02x", cp[i])); } break; @@ -641,6 +675,9 @@ tcp_print(netdissect_options *ndo, case PT_ZMTP1: zmtp1_print(ndo, bp, length); break; + case PT_RESP: + resp_print(ndo, bp, length); + break; } return; } @@ -654,6 +691,8 @@ tcp_print(netdissect_options *ndo, 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); #ifdef ENABLE_SMB else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT)) nbt_tcp_print(ndo, bp, length);