X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a7a76012a129ffefb64f102948db63fbc715e45e..6ec714988caac3bf9fedc766ae51a2248896ec80:/print-tcp.c diff --git a/print-tcp.c b/print-tcp.c index 793aec24..157cf7b1 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -60,8 +60,8 @@ static int tcp_verify_signature(netdissect_options *ndo, const u_char *data, 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 @@ -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 @@ -138,9 +138,9 @@ static const struct tok tcp_option_values[] = { static int 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); @@ -148,9 +148,9 @@ tcp_cksum(netdissect_options *ndo, static int 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); @@ -158,20 +158,20 @@ tcp6_cksum(netdissect_options *ndo, 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; tp = (const struct tcphdr *)bp; ip = (const struct ip *)bp2; @@ -187,11 +187,11 @@ tcp_print(netdissect_options *ndo, return; } - sport = EXTRACT_BE_16BITS(&tp->th_sport); - dport = EXTRACT_BE_16BITS(&tp->th_dport); + sport = EXTRACT_BE_U_2(tp->th_sport); + dport = EXTRACT_BE_U_2(tp->th_dport); if (ip6) { - if (ip6->ip6_nxt == IPPROTO_TCP) { + if (EXTRACT_U_1(ip6->ip6_nxt) == IPPROTO_TCP) { ND_PRINT((ndo, "%s.%s > %s.%s: ", ip6addr_string(ndo, &ip6->ip6_src), tcpport_string(ndo, sport), @@ -202,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), @@ -224,10 +224,10 @@ tcp_print(netdissect_options *ndo, 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 = 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)); @@ -238,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)) { @@ -250,7 +250,7 @@ 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; @@ -304,7 +304,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; @@ -370,9 +370,9 @@ 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 = EXTRACT_BE_U_2(tp->th_sum); ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum)); if (sum != 0) @@ -382,9 +382,9 @@ tcp_print(netdissect_options *ndo, ND_PRINT((ndo, " (correct)")); } } else if (IP_V(ip) == 6 && ip6->ip6_plen) { - if (ND_TTEST2(tp->th_sport, length)) { + 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 = EXTRACT_BE_U_2(tp->th_sum); ND_PRINT((ndo, ", cksum 0x%04x", tcp_sum)); if (sum != 0) @@ -418,9 +418,9 @@ tcp_print(netdissect_options *ndo, * 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); @@ -428,14 +428,14 @@ tcp_print(netdissect_options *ndo, while (hlen > 0) { if (ch != '\0') ND_PRINT((ndo, "%c", ch)); - ND_TCHECK(*cp); - opt = EXTRACT_8BITS(cp); + ND_TCHECK_1(cp); + opt = EXTRACT_U_1(cp); cp++; if (ZEROLENOPT(opt)) len = 1; else { - ND_TCHECK(*cp); - len = EXTRACT_8BITS(cp); + ND_TCHECK_1(cp); + len = EXTRACT_U_1(cp); cp++; /* total including type, len */ if (len < 2 || len > hlen) goto bad; @@ -445,7 +445,7 @@ 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))); @@ -455,13 +455,13 @@ tcp_print(netdissect_options *ndo, case TCPOPT_MAXSEG: datalen = 2; LENCHECK(datalen); - ND_PRINT((ndo, " %u", EXTRACT_BE_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: @@ -474,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_BE_32BITS(cp + i); + s = EXTRACT_BE_U_4(cp + i); LENCHECK(i + 8); - e = EXTRACT_BE_32BITS(cp + i + 4); + e = EXTRACT_BE_U_4(cp + i + 4); if (rev) { s -= thseq; e -= thseq; @@ -501,15 +501,15 @@ tcp_print(netdissect_options *ndo, */ datalen = 4; LENCHECK(datalen); - ND_PRINT((ndo, " %u", EXTRACT_BE_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_BE_32BITS(cp), - EXTRACT_BE_32BITS(cp + 4))); + EXTRACT_BE_U_4(cp), + EXTRACT_BE_U_4(cp + 4))); break; case TCPOPT_SIGNATURE: @@ -531,19 +531,19 @@ 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_SCPS: datalen = 2; LENCHECK(datalen); - ND_PRINT((ndo, " cap %02x id %u", cp[0], cp[1])); + ND_PRINT((ndo, " cap %02x id %u", EXTRACT_U_1(cp), EXTRACT_U_1(cp + 1))); break; case TCPOPT_TCPAO: @@ -557,14 +557,14 @@ tcp_print(netdissect_options *ndo, ND_PRINT((ndo, " invalid")); } else { LENCHECK(1); - ND_PRINT((ndo, " keyid %u", cp[0])); + ND_PRINT((ndo, " keyid %u", EXTRACT_U_1(cp))); LENCHECK(2); - ND_PRINT((ndo, " rnextkeyid %u", cp[1])); + 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", cp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(cp + i))); } } } @@ -582,7 +582,7 @@ tcp_print(netdissect_options *ndo, case TCPOPT_UTO: datalen = 2; LENCHECK(datalen); - utoval = EXTRACT_BE_16BITS(cp); + utoval = EXTRACT_BE_U_2(cp); ND_PRINT((ndo, " 0x%x", utoval)); if (utoval & 0x0001) utoval = (utoval >> 1) * 60; @@ -611,7 +611,7 @@ tcp_print(netdissect_options *ndo, if (datalen < 2) goto bad; /* RFC6994 */ - magic = EXTRACT_BE_16BITS(cp); + magic = EXTRACT_BE_U_2(cp); ND_PRINT((ndo, "-")); switch(magic) { @@ -633,7 +633,7 @@ tcp_print(netdissect_options *ndo, ND_PRINT((ndo, " 0x")); for (i = 0; i < datalen; ++i) { LENCHECK(i + 1); - ND_PRINT((ndo, "%02x", cp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(cp + i))); } break; } @@ -733,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. @@ -741,22 +741,22 @@ 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 = 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_BE_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_BE_32BITS(&rp->rm_xid))); + 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_BE_32BITS(&rp->rm_xid))); + 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; } @@ -792,18 +792,18 @@ 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; - ND_PRINT((ndo, ND_TTEST2(*sp, length) ? " [RST" : " [!RST")); + ND_PRINT((ndo, 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((ndo, " ")); while (length-- && sp < ndo->ndo_snapend) { - c = EXTRACT_8BITS(sp); + c = EXTRACT_U_1(sp); sp++; safeputchar(ndo, c); } @@ -811,7 +811,7 @@ print_tcp_rst_data(netdissect_options *ndo, } 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; @@ -829,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))); } } } @@ -871,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_BE_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_BE_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)); @@ -895,10 +895,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. */