X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/063f3f7ea4bbc9d316cf6ebbf4e625aecf8cc58c..0f328b4aa16b0b47f05a85c440ce1d07719e3cac:/print-tcp.c diff --git a/print-tcp.c b/print-tcp.c index 7a04a6ff..67c15edd 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -76,8 +76,8 @@ struct tha { 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 { @@ -89,8 +89,8 @@ struct tha6 { 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 @@ -127,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" }, @@ -186,10 +187,8 @@ tcp_print(netdissect_options *ndo, return; } - sport = EXTRACT_16BITS(&tp->th_sport); - dport = EXTRACT_16BITS(&tp->th_dport); - - hlen = TH_OFF(tp) * 4; + sport = EXTRACT_BE_U_2(&tp->th_sport); + dport = EXTRACT_BE_U_2(&tp->th_dport); if (ip6) { if (ip6->ip6_nxt == IPPROTO_TCP) { @@ -203,7 +202,7 @@ tcp_print(netdissect_options *ndo, tcpport_string(ndo, sport), tcpport_string(ndo, dport))); } } else { - if (ip->ip_p == IPPROTO_TCP) { + if (EXTRACT_U_1(ip->ip_p) == IPPROTO_TCP) { ND_PRINT((ndo, "%s.%s > %s.%s: ", ipaddr_string(ndo, &ip->ip_src), tcpport_string(ndo, sport), @@ -215,18 +214,20 @@ 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); - 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)); @@ -237,7 +238,7 @@ tcp_print(netdissect_options *ndo, return; } - flags = tp->th_flags; + flags = EXTRACT_U_1(tp->th_flags); ND_PRINT((ndo, "Flags [%s]", bittok2str_nosep(tcp_flag_values, "none", flags))); if (!ndo->ndo_Sflag && (flags & TH_ACK)) { @@ -251,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) { @@ -371,7 +372,7 @@ tcp_print(netdissect_options *ndo, 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) @@ -383,7 +384,7 @@ tcp_print(netdissect_options *ndo, } else if (IP_V(ip) == 6 && ip6->ip6_plen) { if (ND_TTEST2(tp->th_sport, 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)); if (sum != 0) @@ -427,13 +428,15 @@ tcp_print(netdissect_options *ndo, while (hlen > 0) { if (ch != '\0') ND_PRINT((ndo, "%c", ch)); - ND_TCHECK(*cp); - opt = *cp++; + ND_TCHECK_1(cp); + opt = EXTRACT_U_1(cp); + cp++; 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 */ @@ -452,13 +455,13 @@ tcp_print(netdissect_options *ndo, 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: datalen = 1; LENCHECK(datalen); - ND_PRINT((ndo, " %u", *cp)); + ND_PRINT((ndo, " %u", EXTRACT_U_1(cp))); break; case TCPOPT_SACK: @@ -471,9 +474,9 @@ tcp_print(netdissect_options *ndo, 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); - e = EXTRACT_32BITS(cp + i + 4); + e = EXTRACT_BE_U_4(cp + i + 4); if (rev) { s -= thseq; e -= thseq; @@ -498,15 +501,15 @@ tcp_print(netdissect_options *ndo, */ 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", - EXTRACT_32BITS(cp), - EXTRACT_32BITS(cp + 4))); + EXTRACT_BE_U_4(cp), + EXTRACT_BE_U_4(cp + 4))); break; case TCPOPT_SIGNATURE: @@ -528,24 +531,44 @@ tcp_print(netdissect_options *ndo, case CANT_CHECK_SIGNATURE: ND_PRINT((ndo, "can't check - ")); for (i = 0; i < TCP_SIGLEN; ++i) - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(cp + i))); break; } #else for (i = 0; i < TCP_SIGLEN; ++i) - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(cp + i))); #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", EXTRACT_U_1(cp), EXTRACT_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((ndo, " invalid")); + } else { + LENCHECK(1); + ND_PRINT((ndo, " keyid %u", EXTRACT_U_1(cp))); + LENCHECK(2); + ND_PRINT((ndo, " rnextkeyid %u", EXTRACT_U_1(cp + 1))); + if (datalen > 2) { + ND_PRINT((ndo, " mac 0x")); + for (i = 2; i < datalen; i++) { + LENCHECK(i + 1); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(cp + i))); + } + } + } + break; case TCPOPT_EOL: case TCPOPT_NOP: @@ -559,7 +582,7 @@ tcp_print(netdissect_options *ndo, case TCPOPT_UTO: datalen = 2; LENCHECK(datalen); - utoval = EXTRACT_16BITS(cp); + utoval = EXTRACT_BE_U_2(cp); ND_PRINT((ndo, " 0x%x", utoval)); if (utoval & 0x0001) utoval = (utoval >> 1) * 60; @@ -588,7 +611,7 @@ tcp_print(netdissect_options *ndo, if (datalen < 2) goto bad; /* RFC6994 */ - magic = EXTRACT_16BITS(cp); + magic = EXTRACT_BE_U_2(cp); ND_PRINT((ndo, "-")); switch(magic) { @@ -609,8 +632,8 @@ tcp_print(netdissect_options *ndo, if (datalen) ND_PRINT((ndo, " 0x")); for (i = 0; i < datalen; ++i) { - LENCHECK(i); - ND_PRINT((ndo, "%02x", cp[i])); + LENCHECK(i + 1); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(cp + i))); } break; } @@ -666,6 +689,9 @@ tcp_print(netdissect_options *ndo, } 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); else if (IS_SRC_OR_DST_PORT(PPTP_PORT)) @@ -697,7 +723,7 @@ tcp_print(netdissect_options *ndo, * 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); + domain_print(ndo, bp + 2, length - 2, 0); } else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) { msdp_print(ndo, bp, length); } else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) { @@ -707,7 +733,7 @@ tcp_print(netdissect_options *ndo, 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. @@ -718,20 +744,20 @@ tcp_print(netdissect_options *ndo, register const struct sunrpc_msg *rp; 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 (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) { - ND_PRINT((ndo, ": NFS request xid %u ", EXTRACT_32BITS(&rp->rm_xid))); - nfsreq_print_noaddr(ndo, (const u_char *)rp, fraglen, (const 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) { - ND_PRINT((ndo, ": NFS reply xid %u ", EXTRACT_32BITS(&rp->rm_xid))); - nfsreply_print_noaddr(ndo, (const u_char *)rp, fraglen, (const 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; } } @@ -777,7 +803,8 @@ print_tcp_rst_data(netdissect_options *ndo, } ND_PRINT((ndo, " ")); while (length-- && sp < ndo->ndo_snapend) { - c = *sp++; + c = EXTRACT_U_1(sp); + sp++; safeputchar(ndo, c); } ND_PRINT((ndo, "]")); @@ -802,7 +829,7 @@ print_tcp_fastopen_option(netdissect_options *ndo, register const u_char *cp, } else { ND_PRINT((ndo, " cookie ")); for (i = 0; i < datalen; ++i) - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(cp + i))); } } } @@ -844,14 +871,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)); - 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)); - 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));