X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a7a76012a129ffefb64f102948db63fbc715e45e..c2d6a5db5b15f08b9e858e3fcf1e6847aaebe26b:/print-tcp.c diff --git a/print-tcp.c b/print-tcp.c index 793aec24..3310b9e9 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -31,10 +31,10 @@ __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 #endif -#include +#include "netdissect-stdinc.h" #include #include @@ -57,45 +57,45 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $"); static int tcp_verify_signature(netdissect_options *ndo, const struct ip *ip, const struct tcphdr *tp, - const u_char *data, int length, const u_char *rcvsig); + const u_char *data, u_int length, const u_char *rcvsig); #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, +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, int exp); #define MAX_RST_DATA_LEN 30 struct tha { - struct in_addr src; - struct in_addr dst; + nd_ipv4 src; + nd_ipv4 dst; 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 { - struct in6_addr src; - struct in6_addr dst; + nd_ipv6 src; + nd_ipv6 dst; u_int port; }; 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 -/* 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,43 +136,44 @@ static const struct tok tcp_option_values[] = { { 0, NULL } }; -static int +static uint16_t tcp_cksum(netdissect_options *ndo, - register const struct ip *ip, - register const struct tcphdr *tp, - register u_int len) + const struct ip *ip, + const struct tcphdr *tp, + u_int len) { - return nextproto4_cksum(ndo, ip, (const uint8_t *)tp, len, len, - IPPROTO_TCP); + return nextproto4_cksum(ndo, ip, (const uint8_t *)tp, len, len, + IPPROTO_TCP); } -static int +static uint16_t tcp6_cksum(netdissect_options *ndo, - register const struct ip6_hdr *ip6, - register const struct tcphdr *tp, - register u_int len) + const struct ip6_hdr *ip6, + const struct tcphdr *tp, + u_int len) { - return nextproto6_cksum(ndo, ip6, (const uint8_t *)tp, len, len, - IPPROTO_TCP); + 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, - register const u_char *bp2, int fragmented) + 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; + 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; uint16_t magic; - register int rev; - register const struct ip6_hdr *ip6; + int rev; + const struct ip6_hdr *ip6; + ndo->ndo_protocol = "tcp"; tp = (const struct tcphdr *)bp; ip = (const struct ip *)bp2; if (IP_V(ip) == 6) @@ -180,66 +181,73 @@ tcp_print(netdissect_options *ndo, else ip6 = NULL; ch = '\0'; - if (!ND_TTEST(tp->th_dport)) { - ND_PRINT((ndo, "%s > %s: [|tcp]", - ipaddr_string(ndo, &ip->ip_src), - ipaddr_string(ndo, &ip->ip_dst))); + 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)); + } else { + ND_PRINT("%s > %s:", + ipaddr_string(ndo, ip->ip_src), + ipaddr_string(ndo, ip->ip_dst)); + } + nd_print_trunc(ndo); return; } - sport = EXTRACT_BE_16BITS(&tp->th_sport); - dport = EXTRACT_BE_16BITS(&tp->th_dport); + sport = GET_BE_U_2(tp->th_sport); + dport = GET_BE_U_2(tp->th_dport); if (ip6) { - if (ip6->ip6_nxt == IPPROTO_TCP) { - ND_PRINT((ndo, "%s.%s > %s.%s: ", - ip6addr_string(ndo, &ip6->ip6_src), - tcpport_string(ndo, sport), - ip6addr_string(ndo, &ip6->ip6_dst), - tcpport_string(ndo, dport))); + if (GET_U_1(ip6->ip6_nxt) == IPPROTO_TCP) { + ND_PRINT("%s.%s > %s.%s: ", + 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: ", - tcpport_string(ndo, sport), tcpport_string(ndo, dport))); + ND_PRINT("%s > %s: ", + tcpport_string(ndo, sport), tcpport_string(ndo, dport)); } } else { - if (ip->ip_p == IPPROTO_TCP) { - ND_PRINT((ndo, "%s.%s > %s.%s: ", - ipaddr_string(ndo, &ip->ip_src), - tcpport_string(ndo, sport), - ipaddr_string(ndo, &ip->ip_dst), - tcpport_string(ndo, dport))); + if (GET_U_1(ip->ip_p) == IPPROTO_TCP) { + ND_PRINT("%s.%s > %s.%s: ", + 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: ", - tcpport_string(ndo, sport), tcpport_string(ndo, dport))); + ND_PRINT("%s > %s: ", + tcpport_string(ndo, sport), tcpport_string(ndo, dport)); } } - ND_TCHECK(*tp); + ND_TCHECK_SIZE(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))); + ND_PRINT(" tcp %u [bad hdr length %u - too short, < %zu]", + length - hlen, hlen, sizeof(*tp)); return; } - seq = EXTRACT_BE_32BITS(&tp->th_seq); - ack = EXTRACT_BE_32BITS(&tp->th_ack); - win = EXTRACT_BE_16BITS(&tp->th_win); - urp = EXTRACT_BE_16BITS(&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((ndo, "tcp %d", length - hlen)); + ND_PRINT("tcp %u", length - hlen); if (hlen > length) { - ND_PRINT((ndo, " [bad hdr length %u - too long, > %u]", - hlen, length)); + ND_PRINT(" [bad hdr length %u - too long, > %u]", + hlen, length); } return; } - flags = tp->th_flags; - ND_PRINT((ndo, "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 (!ndo->ndo_Sflag && (flags & TH_ACK)) { /* @@ -250,28 +258,28 @@ tcp_print(netdissect_options *ndo, */ rev = 0; if (ip6) { - register struct tcp_seq_hash6 *th; + 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; + src = (const void *)ip6->ip6_src; + dst = (const void *)ip6->ip6_dst; if (sport > dport) rev = 1; else if (sport == dport) { - if (UNALIGNED_MEMCMP(src, dst, sizeof ip6->ip6_dst) > 0) + if (UNALIGNED_MEMCMP(src, dst, sizeof(ip6->ip6_dst)) > 0) rev = 1; } if (rev) { - UNALIGNED_MEMCPY(&tha.src, dst, sizeof ip6->ip6_dst); - UNALIGNED_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 = sport << 16 | dport; + 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]; @@ -282,12 +290,15 @@ tcp_print(netdissect_options *ndo, 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, - "tcp_print: calloc"); + S_ERR_ND_MEM_ALLOC, + "tcp_print: calloc"); } th->addr = tha; if (rev) @@ -304,7 +315,7 @@ tcp_print(netdissect_options *ndo, thseq = th->seq; thack = th->ack; } else { - register struct tcp_seq_hash *th; + struct tcp_seq_hash *th; struct tcp_seq_hash *tcp_seq_hash; struct tha tha; @@ -312,17 +323,21 @@ tcp_print(netdissect_options *ndo, if (sport > dport) rev = 1; else if (sport == dport) { - if (UNALIGNED_MEMCMP(&ip->ip_src, &ip->ip_dst, sizeof ip->ip_dst) > 0) + if (UNALIGNED_MEMCMP(ip->ip_src, ip->ip_dst, sizeof(ip->ip_dst)) > 0) rev = 1; } if (rev) { - 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; + 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 { - 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; + 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; } for (th = &tcp_seq_hash[tha.port % TSEQ_HASHSIZE]; @@ -333,12 +348,15 @@ tcp_print(netdissect_options *ndo, 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, - "tcp_print: calloc"); + S_ERR_ND_MEM_ALLOC, + "tcp_print: calloc"); } th->addr = tha; if (rev) @@ -360,8 +378,8 @@ tcp_print(netdissect_options *ndo, thseq = thack = rev = 0; } if (hlen > length) { - ND_PRINT((ndo, " [bad hdr length %u - too long, > %u]", - hlen, length)); + ND_PRINT(" [bad hdr length %u - too long, > %u]", + hlen, length); return; } @@ -370,28 +388,28 @@ tcp_print(netdissect_options *ndo, uint16_t sum, tcp_sum; if (IP_V(ip) == 4) { - if (ND_TTEST2(tp->th_sport, length)) { + if (ND_TTEST_LEN(tp->th_sport, length)) { sum = tcp_cksum(ndo, ip, tp, length); - tcp_sum = EXTRACT_BE_16BITS(&tp->th_sum); + tcp_sum = GET_BE_U_2(tp->th_sum); - ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum)); + ND_PRINT(", cksum 0x%04x", tcp_sum); if (sum != 0) - ND_PRINT((ndo, " (incorrect -> 0x%04x)", - in_cksum_shouldbe(tcp_sum, sum))); + ND_PRINT(" (incorrect -> 0x%04x)", + in_cksum_shouldbe(tcp_sum, sum)); else - ND_PRINT((ndo, " (correct)")); + ND_PRINT(" (correct)"); } - } else if (IP_V(ip) == 6 && ip6->ip6_plen) { - if (ND_TTEST2(tp->th_sport, length)) { + } 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_16BITS(&tp->th_sum); + tcp_sum = GET_BE_U_2(tp->th_sum); - ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum)); + ND_PRINT(", cksum 0x%04x", tcp_sum); if (sum != 0) - ND_PRINT((ndo, " (incorrect -> 0x%04x)", - in_cksum_shouldbe(tcp_sum, sum))); + ND_PRINT(" (incorrect -> 0x%04x)", + in_cksum_shouldbe(tcp_sum, sum)); else - ND_PRINT((ndo, " (correct)")); + ND_PRINT(" (correct)"); } } @@ -399,43 +417,43 @@ tcp_print(netdissect_options *ndo, length -= hlen; if (ndo->ndo_vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST)) { - ND_PRINT((ndo, ", seq %u", seq)); + ND_PRINT(", seq %u", seq); if (length > 0) { - ND_PRINT((ndo, ":%u", seq + length)); + ND_PRINT(":%u", seq + length); } } if (flags & TH_ACK) { - ND_PRINT((ndo, ", ack %u", ack)); + ND_PRINT(", ack %u", ack); } - ND_PRINT((ndo, ", win %d", win)); + ND_PRINT(", win %u", win); if (flags & TH_URG) - ND_PRINT((ndo, ", urg %d", urp)); + ND_PRINT(", urg %u", urp); /* * 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); - ND_PRINT((ndo, ", options [")); + ND_PRINT(", options ["); while (hlen > 0) { if (ch != '\0') - ND_PRINT((ndo, "%c", ch)); - ND_TCHECK(*cp); - opt = EXTRACT_8BITS(cp); + ND_PRINT("%c", ch); + ND_TCHECK_1(cp); + opt = GET_U_1(cp); cp++; if (ZEROLENOPT(opt)) len = 1; else { - ND_TCHECK(*cp); - len = EXTRACT_8BITS(cp); + ND_TCHECK_1(cp); + len = GET_U_1(cp); cp++; /* total including type, len */ if (len < 2 || len > hlen) goto bad; @@ -445,38 +463,38 @@ tcp_print(netdissect_options *ndo, datalen = 0; /* Bail if "l" bytes of data are not left or were not captured */ -#define LENCHECK(l) { if ((l) > hlen) goto bad; ND_TCHECK2(*cp, l); } +#define LENCHECK(l) { if ((l) > hlen) goto bad; ND_TCHECK_LEN(cp, l); } - ND_PRINT((ndo, "%s", tok2str(tcp_option_values, "unknown-%u", opt))); + ND_PRINT("%s", tok2str(tcp_option_values, "unknown-%u", opt)); switch (opt) { case TCPOPT_MAXSEG: datalen = 2; LENCHECK(datalen); - ND_PRINT((ndo, " %u", EXTRACT_BE_16BITS(cp))); + ND_PRINT(" %u", GET_BE_U_2(cp)); break; case TCPOPT_WSCALE: datalen = 1; LENCHECK(datalen); - ND_PRINT((ndo, " %u", *cp)); + ND_PRINT(" %u", GET_U_1(cp)); break; case TCPOPT_SACK: datalen = len - 2; if (datalen % 8 != 0) { - ND_PRINT((ndo, " invalid sack")); + ND_PRINT(" invalid sack"); } else { uint32_t s, e; - ND_PRINT((ndo, " %d ", datalen / 8)); + ND_PRINT(" %u ", datalen / 8); for (i = 0; i < datalen; i += 8) { LENCHECK(i + 4); - s = EXTRACT_BE_32BITS(cp + i); + s = GET_BE_U_4(cp + i); LENCHECK(i + 8); - e = EXTRACT_BE_32BITS(cp + i + 4); + e = GET_BE_U_4(cp + i + 4); if (rev) { s -= thseq; e -= thseq; @@ -484,7 +502,7 @@ tcp_print(netdissect_options *ndo, s -= thack; e -= thack; } - ND_PRINT((ndo, "{%u:%u}", s, e)); + ND_PRINT("{%u:%u}", s, e); } } break; @@ -501,49 +519,51 @@ tcp_print(netdissect_options *ndo, */ datalen = 4; LENCHECK(datalen); - ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp))); + ND_PRINT(" %u", GET_BE_U_4(cp)); break; case TCPOPT_TIMESTAMP: datalen = 8; LENCHECK(datalen); - ND_PRINT((ndo, " val %u ecr %u", - EXTRACT_BE_32BITS(cp), - EXTRACT_BE_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); - ND_PRINT((ndo, " ")); + ND_PRINT(" "); #ifdef HAVE_LIBCRYPTO switch (tcp_verify_signature(ndo, ip, tp, bp + TH_OFF(tp) * 4, length, cp)) { case SIGNATURE_VALID: - ND_PRINT((ndo, "valid")); + ND_PRINT("valid"); break; case SIGNATURE_INVALID: - ND_PRINT((ndo, "invalid")); + nd_print_invalid(ndo); break; case CANT_CHECK_SIGNATURE: - ND_PRINT((ndo, "can't check - ")); + ND_PRINT("can't check - "); for (i = 0; i < TCP_SIGLEN; ++i) - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT("%02x", + GET_U_1(cp + i)); break; } #else for (i = 0; i < TCP_SIGLEN; ++i) - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT("%02x", GET_U_1(cp + i)); #endif break; case TCPOPT_SCPS: datalen = 2; LENCHECK(datalen); - ND_PRINT((ndo, " cap %02x id %u", cp[0], cp[1])); + ND_PRINT(" cap %02x id %u", GET_U_1(cp), + GET_U_1(cp + 1)); break; case TCPOPT_TCPAO: @@ -554,17 +574,19 @@ tcp_print(netdissect_options *ndo, * at this point.) */ if (datalen < 2) { - ND_PRINT((ndo, " invalid")); + nd_print_invalid(ndo); } else { LENCHECK(1); - ND_PRINT((ndo, " keyid %u", cp[0])); + ND_PRINT(" keyid %u", GET_U_1(cp)); LENCHECK(2); - ND_PRINT((ndo, " rnextkeyid %u", cp[1])); + ND_PRINT(" rnextkeyid %u", + GET_U_1(cp + 1)); if (datalen > 2) { - ND_PRINT((ndo, " mac 0x")); + ND_PRINT(" mac 0x"); for (i = 2; i < datalen; i++) { LENCHECK(i + 1); - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT("%02x", + GET_U_1(cp + i)); } } } @@ -582,13 +604,13 @@ tcp_print(netdissect_options *ndo, case TCPOPT_UTO: datalen = 2; LENCHECK(datalen); - utoval = EXTRACT_BE_16BITS(cp); - ND_PRINT((ndo, " 0x%x", utoval)); + utoval = GET_BE_U_2(cp); + ND_PRINT(" 0x%x", utoval); if (utoval & 0x0001) utoval = (utoval >> 1) * 60; else utoval >>= 1; - ND_PRINT((ndo, " %u", utoval)); + ND_PRINT(" %u", utoval); break; case TCPOPT_MPTCP: @@ -601,7 +623,7 @@ tcp_print(netdissect_options *ndo, case TCPOPT_FASTOPEN: datalen = len - 2; LENCHECK(datalen); - ND_PRINT((ndo, " ")); + ND_PRINT(" "); print_tcp_fastopen_option(ndo, cp, datalen, FALSE); break; @@ -611,8 +633,8 @@ tcp_print(netdissect_options *ndo, if (datalen < 2) goto bad; /* RFC6994 */ - magic = EXTRACT_BE_16BITS(cp); - ND_PRINT((ndo, "-")); + magic = GET_BE_U_2(cp); + ND_PRINT("-"); switch(magic) { @@ -622,7 +644,7 @@ tcp_print(netdissect_options *ndo, default: /* Unknown magic number */ - ND_PRINT((ndo, "%04x", magic)); + ND_PRINT("%04x", magic); break; } break; @@ -630,10 +652,10 @@ tcp_print(netdissect_options *ndo, default: datalen = len - 2; if (datalen) - ND_PRINT((ndo, " 0x")); + ND_PRINT(" 0x"); for (i = 0; i < datalen; ++i) { LENCHECK(i + 1); - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT("%02x", GET_U_1(cp + i)); } break; } @@ -643,22 +665,22 @@ tcp_print(netdissect_options *ndo, 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) - ND_PRINT((ndo, "[len %d]", len)); + ND_PRINT("[len %u]", len); ch = ','; if (opt == TCPOPT_EOL) break; } - ND_PRINT((ndo, "]")); + ND_PRINT("]"); } /* * Print length field before crawling down the stack. */ - ND_PRINT((ndo, ", length %u", length)); + ND_PRINT(", length %u", length); if (length <= 0) return; @@ -687,38 +709,47 @@ tcp_print(netdissect_options *ndo, 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, ": ")); + ND_PRINT(": "); 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 */ + ND_PRINT(": "); + 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); - else if (IS_SRC_OR_DST_PORT(SMB_PORT)) - smb_tcp_print(ndo, bp, length); + else if (IS_SRC_OR_DST_PORT(SMB_PORT)) + smb_tcp_print(ndo, bp, length); #endif 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((ndo, ": ")); + 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((ndo, ": ")); + 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((ndo, ": ")); + 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 @@ -733,7 +764,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. @@ -741,22 +772,24 @@ tcp_print(netdissect_options *ndo, * to NFS print routines. */ uint32_t fraglen; - register const struct sunrpc_msg *rp; + const struct sunrpc_msg *rp; enum sunrpc_msg_type direction; - fraglen = EXTRACT_BE_32BITS(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(rp->rm_direction)) { - direction = (enum sunrpc_msg_type) EXTRACT_BE_32BITS(&rp->rm_direction); + 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((ndo, ": NFS request xid %u ", EXTRACT_BE_32BITS(&rp->rm_xid))); + 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((ndo, ": NFS reply xid %u ", EXTRACT_BE_32BITS(&rp->rm_xid))); + 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; } @@ -765,14 +798,14 @@ tcp_print(netdissect_options *ndo, return; bad: - ND_PRINT((ndo, "[bad opt]")); + ND_PRINT("[bad opt]"); if (ch != '\0') - ND_PRINT((ndo, ">")); + ND_PRINT("]"); return; trunc: - ND_PRINT((ndo, "[|tcp]")); + nd_print_trunc(ndo); if (ch != '\0') - ND_PRINT((ndo, ">")); + ND_PRINT(">"); } /* @@ -792,44 +825,45 @@ tcp_print(netdissect_options *ndo, static void print_tcp_rst_data(netdissect_options *ndo, - register const u_char *sp, u_int length) + const u_char *sp, u_int length) { - int c; + u_char c; - ND_PRINT((ndo, ND_TTEST2(*sp, length) ? " [RST" : " [!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 */ - ND_PRINT((ndo, "+")); /* indicate we truncate */ + ND_PRINT("+"); /* indicate we truncate */ } - ND_PRINT((ndo, " ")); - while (length-- && sp < ndo->ndo_snapend) { - c = EXTRACT_8BITS(sp); + ND_PRINT(" "); + while (length && sp < ndo->ndo_snapend) { + c = GET_U_1(sp); sp++; - safeputchar(ndo, c); + fn_print_char(ndo, c); + length--; } - ND_PRINT((ndo, "]")); + ND_PRINT("]"); } static void -print_tcp_fastopen_option(netdissect_options *ndo, register const u_char *cp, +print_tcp_fastopen_option(netdissect_options *ndo, const u_char *cp, u_int datalen, int exp) { u_int i; if (exp) - ND_PRINT((ndo, "tfo")); + ND_PRINT("tfo"); if (datalen == 0) { /* Fast Open Cookie Request */ - ND_PRINT((ndo, " cookiereq")); + ND_PRINT(" cookiereq"); } else { /* Fast Open Cookie */ if (datalen % 2 != 0 || datalen < 4 || datalen > 16) { - ND_PRINT((ndo, " invalid")); + nd_print_invalid(ndo); } else { - ND_PRINT((ndo, " cookie ")); + ND_PRINT(" cookie "); for (i = 0; i < datalen; ++i) - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT("%02x", GET_U_1(cp + i)); } } } @@ -839,7 +873,7 @@ USES_APPLE_DEPRECATED_API static int tcp_verify_signature(netdissect_options *ndo, const struct ip *ip, const struct tcphdr *tp, - const u_char *data, int length, const u_char *rcvsig) + const u_char *data, u_int length, const u_char *rcvsig) { struct tcphdr tp1; u_char sig[TCP_SIGLEN]; @@ -850,15 +884,15 @@ tcp_verify_signature(netdissect_options *ndo, uint32_t len32; uint8_t nxt; - if (data + length > ndo->ndo_snapend) { - ND_PRINT((ndo, "snaplen too short, ")); - return (CANT_CHECK_SIGNATURE); - } + if (data + length > ndo->ndo_snapend) { + ND_PRINT("snaplen too short, "); + return (CANT_CHECK_SIGNATURE); + } tp1 = *tp; if (ndo->ndo_sigsecret == NULL) { - ND_PRINT((ndo, "shared secret not supplied with -M, ")); + ND_PRINT("shared secret not supplied with -M, "); return (CANT_CHECK_SIGNATURE); } @@ -871,14 +905,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_16BITS(&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_16BITS(&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)); @@ -887,7 +921,7 @@ tcp_verify_signature(netdissect_options *ndo, nxt = IPPROTO_TCP; MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt)); } else { - ND_PRINT((ndo, "IP version not 4 or 6, ")); + ND_PRINT("IP version not 4 or 6, "); return (CANT_CHECK_SIGNATURE); } @@ -895,10 +929,10 @@ tcp_verify_signature(netdissect_options *ndo, * 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; + 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)); - tp1.th_sum = savecsum; + memcpy(tp1.th_sum, &savecsum, sizeof(tp1.th_sum)); /* * Step 3: Update MD5 hash with TCP segment data, if present. */ @@ -917,10 +951,3 @@ tcp_verify_signature(netdissect_options *ndo, } USES_APPLE_RST #endif /* HAVE_LIBCRYPTO */ - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */