X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f052d2b3962c791a541f20a012a43ff471438045..10ac80fdecfa9b9b7d259d8f50d0b72ef1b18f12:/print-tcp.c diff --git a/print-tcp.c b/print-tcp.c index 4b605733..a1aae18a 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -68,8 +68,8 @@ static void print_tcp_fastopen_option(netdissect_options *ndo, const u_char *cp, struct tha { - struct in_addr src; - struct in_addr dst; + nd_ipv4 src; + nd_ipv4 dst; u_int port; }; @@ -81,8 +81,8 @@ struct tcp_seq_hash { }; struct tha6 { - struct in6_addr src; - struct in6_addr dst; + nd_ipv6 src; + nd_ipv6 dst; u_int port; }; @@ -95,7 +95,7 @@ struct tcp_seq_hash6 { #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_hash4[TSEQ_HASHSIZE]; @@ -136,7 +136,7 @@ static const struct tok tcp_option_values[] = { { 0, NULL } }; -static int +static uint16_t tcp_cksum(netdissect_options *ndo, const struct ip *ip, const struct tcphdr *tp, @@ -146,7 +146,7 @@ tcp_cksum(netdissect_options *ndo, IPPROTO_TCP); } -static int +static uint16_t tcp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6, const struct tcphdr *tp, @@ -184,37 +184,37 @@ tcp_print(netdissect_options *ndo, if (!ND_TTEST_2(tp->th_dport)) { if (ip6) { ND_PRINT("%s > %s:", - ip6addr_string(ndo, ip6->ip6_src), - ip6addr_string(ndo, ip6->ip6_dst)); + GET_IP6ADDR_STRING(ip6->ip6_src), + GET_IP6ADDR_STRING(ip6->ip6_dst)); } else { ND_PRINT("%s > %s:", - ipaddr_string(ndo, ip->ip_src), - ipaddr_string(ndo, ip->ip_dst)); + GET_IPADDR_STRING(ip->ip_src), + GET_IPADDR_STRING(ip->ip_dst)); } nd_print_trunc(ndo); return; } - sport = EXTRACT_BE_U_2(tp->th_sport); - dport = EXTRACT_BE_U_2(tp->th_dport); + sport = GET_BE_U_2(tp->th_sport); + dport = GET_BE_U_2(tp->th_dport); if (ip6) { - if (EXTRACT_U_1(ip6->ip6_nxt) == IPPROTO_TCP) { + if (GET_U_1(ip6->ip6_nxt) == IPPROTO_TCP) { ND_PRINT("%s.%s > %s.%s: ", - ip6addr_string(ndo, ip6->ip6_src), + GET_IP6ADDR_STRING(ip6->ip6_src), tcpport_string(ndo, sport), - ip6addr_string(ndo, ip6->ip6_dst), + GET_IP6ADDR_STRING(ip6->ip6_dst), tcpport_string(ndo, dport)); } else { ND_PRINT("%s > %s: ", tcpport_string(ndo, sport), tcpport_string(ndo, dport)); } } else { - if (EXTRACT_U_1(ip->ip_p) == IPPROTO_TCP) { + if (GET_U_1(ip->ip_p) == IPPROTO_TCP) { ND_PRINT("%s.%s > %s.%s: ", - ipaddr_string(ndo, ip->ip_src), + GET_IPADDR_STRING(ip->ip_src), tcpport_string(ndo, sport), - ipaddr_string(ndo, ip->ip_dst), + GET_IPADDR_STRING(ip->ip_dst), tcpport_string(ndo, dport)); } else { ND_PRINT("%s > %s: ", @@ -227,15 +227,15 @@ tcp_print(netdissect_options *ndo, hlen = TH_OFF(tp) * 4; if (hlen < sizeof(*tp)) { - ND_PRINT(" tcp %u [bad hdr length %u - too short, < %lu]", - length - hlen, hlen, (unsigned long)sizeof(*tp)); + ND_PRINT(" tcp %u [bad hdr length %u - too short, < %zu]", + length - hlen, hlen, sizeof(*tp)); return; } - 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); + 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); if (ndo->ndo_qflag) { ND_PRINT("tcp %u", length - hlen); @@ -246,7 +246,7 @@ tcp_print(netdissect_options *ndo, return; } - flags = EXTRACT_U_1(tp->th_flags); + flags = GET_U_1(tp->th_flags); ND_PRINT("Flags [%s]", bittok2str_nosep(tcp_flag_values, "none", flags)); if (!ndo->ndo_Sflag && (flags & TH_ACK)) { @@ -298,7 +298,7 @@ tcp_print(netdissect_options *ndo, if (th->nxt == NULL) (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, - "tcp_print: calloc"); + "%s: calloc", __func__); } th->addr = tha; if (rev) @@ -356,7 +356,7 @@ tcp_print(netdissect_options *ndo, if (th->nxt == NULL) (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, - "tcp_print: calloc"); + "%s: calloc", __func__); } th->addr = tha; if (rev) @@ -390,7 +390,7 @@ tcp_print(netdissect_options *ndo, if (IP_V(ip) == 4) { if (ND_TTEST_LEN(tp->th_sport, length)) { sum = tcp_cksum(ndo, ip, tp, length); - tcp_sum = EXTRACT_BE_U_2(tp->th_sum); + tcp_sum = GET_BE_U_2(tp->th_sum); ND_PRINT(", cksum 0x%04x", tcp_sum); if (sum != 0) @@ -399,10 +399,10 @@ tcp_print(netdissect_options *ndo, else ND_PRINT(" (correct)"); } - } else if (IP_V(ip) == 6 && ip6->ip6_plen) { + } else if (IP_V(ip) == 6) { if (ND_TTEST_LEN(tp->th_sport, length)) { sum = tcp6_cksum(ndo, ip6, tp, length); - tcp_sum = EXTRACT_BE_U_2(tp->th_sum); + tcp_sum = GET_BE_U_2(tp->th_sum); ND_PRINT(", cksum 0x%04x", tcp_sum); if (sum != 0) @@ -446,14 +446,12 @@ tcp_print(netdissect_options *ndo, while (hlen > 0) { if (ch != '\0') ND_PRINT("%c", ch); - ND_TCHECK_1(cp); - opt = EXTRACT_U_1(cp); + opt = GET_U_1(cp); cp++; if (ZEROLENOPT(opt)) len = 1; else { - ND_TCHECK_1(cp); - len = EXTRACT_U_1(cp); + len = GET_U_1(cp); cp++; /* total including type, len */ if (len < 2 || len > hlen) goto bad; @@ -473,13 +471,13 @@ tcp_print(netdissect_options *ndo, case TCPOPT_MAXSEG: datalen = 2; LENCHECK(datalen); - ND_PRINT(" %u", EXTRACT_BE_U_2(cp)); + ND_PRINT(" %u", GET_BE_U_2(cp)); break; case TCPOPT_WSCALE: datalen = 1; LENCHECK(datalen); - ND_PRINT(" %u", EXTRACT_U_1(cp)); + ND_PRINT(" %u", GET_U_1(cp)); break; case TCPOPT_SACK: @@ -492,9 +490,9 @@ tcp_print(netdissect_options *ndo, ND_PRINT(" %u ", datalen / 8); for (i = 0; i < datalen; i += 8) { LENCHECK(i + 4); - s = EXTRACT_BE_U_4(cp + i); + s = GET_BE_U_4(cp + i); LENCHECK(i + 8); - e = EXTRACT_BE_U_4(cp + i + 4); + e = GET_BE_U_4(cp + i + 4); if (rev) { s -= thseq; e -= thseq; @@ -519,15 +517,15 @@ tcp_print(netdissect_options *ndo, */ datalen = 4; LENCHECK(datalen); - ND_PRINT(" %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(" %u", GET_BE_U_4(cp)); break; case TCPOPT_TIMESTAMP: datalen = 8; LENCHECK(datalen); ND_PRINT(" val %u ecr %u", - EXTRACT_BE_U_4(cp), - EXTRACT_BE_U_4(cp + 4)); + GET_BE_U_4(cp), + GET_BE_U_4(cp + 4)); break; case TCPOPT_SIGNATURE: @@ -543,25 +541,27 @@ tcp_print(netdissect_options *ndo, break; case SIGNATURE_INVALID: - ND_PRINT("invalid"); + nd_print_invalid(ndo); break; case CANT_CHECK_SIGNATURE: ND_PRINT("can't check - "); for (i = 0; i < TCP_SIGLEN; ++i) - ND_PRINT("%02x", EXTRACT_U_1(cp + i)); + ND_PRINT("%02x", + GET_U_1(cp + i)); break; } #else for (i = 0; i < TCP_SIGLEN; ++i) - ND_PRINT("%02x", EXTRACT_U_1(cp + i)); + ND_PRINT("%02x", GET_U_1(cp + i)); #endif break; case TCPOPT_SCPS: datalen = 2; LENCHECK(datalen); - ND_PRINT(" cap %02x id %u", EXTRACT_U_1(cp), EXTRACT_U_1(cp + 1)); + ND_PRINT(" cap %02x id %u", GET_U_1(cp), + GET_U_1(cp + 1)); break; case TCPOPT_TCPAO: @@ -572,17 +572,19 @@ tcp_print(netdissect_options *ndo, * at this point.) */ if (datalen < 2) { - ND_PRINT(" invalid"); + nd_print_invalid(ndo); } else { LENCHECK(1); - ND_PRINT(" keyid %u", EXTRACT_U_1(cp)); + ND_PRINT(" keyid %u", GET_U_1(cp)); LENCHECK(2); - ND_PRINT(" rnextkeyid %u", EXTRACT_U_1(cp + 1)); + 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", EXTRACT_U_1(cp + i)); + ND_PRINT("%02x", + GET_U_1(cp + i)); } } } @@ -600,7 +602,7 @@ tcp_print(netdissect_options *ndo, case TCPOPT_UTO: datalen = 2; LENCHECK(datalen); - utoval = EXTRACT_BE_U_2(cp); + utoval = GET_BE_U_2(cp); ND_PRINT(" 0x%x", utoval); if (utoval & 0x0001) utoval = (utoval >> 1) * 60; @@ -629,7 +631,7 @@ tcp_print(netdissect_options *ndo, if (datalen < 2) goto bad; /* RFC6994 */ - magic = EXTRACT_BE_U_2(cp); + magic = GET_BE_U_2(cp); ND_PRINT("-"); switch(magic) { @@ -651,7 +653,7 @@ tcp_print(netdissect_options *ndo, ND_PRINT(" 0x"); for (i = 0; i < datalen; ++i) { LENCHECK(i + 1); - ND_PRINT("%02x", EXTRACT_U_1(cp + i)); + ND_PRINT("%02x", GET_U_1(cp + i)); } break; } @@ -698,6 +700,10 @@ tcp_print(netdissect_options *ndo, 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; } @@ -709,13 +715,16 @@ tcp_print(netdissect_options *ndo, smtp_print(ndo, bp, length); } else if (IS_SRC_OR_DST_PORT(WHOIS_PORT)) { ND_PRINT(": "); - txtproto_print(ndo, bp, length, "whois", NULL, 0); /* RFC 3912 */ + ndo->ndo_protocol = "whois"; /* needed by txtproto_print() */ + txtproto_print(ndo, bp, length, 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)) 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); @@ -735,28 +744,16 @@ tcp_print(netdissect_options *ndo, } 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 (length > 2 && - (IS_SRC_OR_DST_PORT(NAMESERVER_PORT))) { - /* domain_print() assumes it does not have to prepend a space before its - * own output to separate it from the output of the calling function. This - * works well with udp_print(), but requires a small prop here. - */ - ND_PRINT(" "); - - /* - * TCP DNS query has 2byte length at the head. - * XXX packet could be unaligned, it can go strange - */ - domain_print(ndo, bp + 2, length - 2, 0); + } 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 (length > 0 && (IS_SRC_OR_DST_PORT(LDP_PORT))) { + } else if (IS_SRC_OR_DST_PORT(LDP_PORT)) { ldp_print(ndo, bp, length); - } - else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) && + } else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) && length >= 4 && ND_TTEST_4(bp)) { /* * If data present, header length valid, and NFS port used, @@ -768,21 +765,21 @@ tcp_print(netdissect_options *ndo, const struct sunrpc_msg *rp; enum sunrpc_msg_type direction; - fraglen = EXTRACT_BE_U_4(bp) & 0x7FFFFFFF; + 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) EXTRACT_BE_U_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 ", - EXTRACT_BE_U_4(rp->rm_xid)); + 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 ", - EXTRACT_BE_U_4(rp->rm_xid)); + GET_BE_U_4(rp->rm_xid)); nfsreply_noaddr_print(ndo, (const u_char *)rp, fraglen, (const u_char *)ip); return; } @@ -790,12 +787,12 @@ tcp_print(netdissect_options *ndo, } return; - bad: +bad: ND_PRINT("[bad opt]"); if (ch != '\0') ND_PRINT("]"); return; - trunc: +trunc: nd_print_trunc(ndo); if (ch != '\0') ND_PRINT(">"); @@ -820,7 +817,7 @@ static void print_tcp_rst_data(netdissect_options *ndo, const u_char *sp, u_int length) { - int c; + u_char c; ND_PRINT(ND_TTEST_LEN(sp, length) ? " [RST" : " [!RST"); if (length > MAX_RST_DATA_LEN) { @@ -828,10 +825,11 @@ print_tcp_rst_data(netdissect_options *ndo, ND_PRINT("+"); /* indicate we truncate */ } ND_PRINT(" "); - while (length-- && sp < ndo->ndo_snapend) { - c = EXTRACT_U_1(sp); + while (length && sp < ndo->ndo_snapend) { + c = GET_U_1(sp); sp++; fn_print_char(ndo, c); + length--; } ND_PRINT("]"); } @@ -851,11 +849,11 @@ print_tcp_fastopen_option(netdissect_options *ndo, const u_char *cp, } else { /* Fast Open Cookie */ if (datalen % 2 != 0 || datalen < 4 || datalen > 16) { - ND_PRINT(" invalid"); + nd_print_invalid(ndo); } else { ND_PRINT(" cookie "); for (i = 0; i < datalen; ++i) - ND_PRINT("%02x", EXTRACT_U_1(cp + i)); + ND_PRINT("%02x", GET_U_1(cp + i)); } } } @@ -897,14 +895,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_BE_U_2(ip->ip_len) - IP_HL(ip) * 4; + tlen = GET_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_BE_U_2(ip6->ip6_plen)); + len32 = htonl(GET_BE_U_2(ip6->ip6_plen)); MD5_Update(&ctx, (const char *)&len32, sizeof(len32)); nxt = 0; MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));