#endif
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include <stdlib.h>
#include <string.h>
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 *, const u_char *sp, u_int length);
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
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
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)
ip6 = NULL;
ch = '\0';
if (!ND_TTEST_2(tp->th_dport)) {
- ND_PRINT("%s > %s: [|tcp]",
- ipaddr_string(ndo, &ip->ip_src),
- ipaddr_string(ndo, &ip->ip_dst));
+ 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;
}
if (ip6) {
if (EXTRACT_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));
+ ip6addr_string(ndo, ip6->ip6_src),
+ tcpport_string(ndo, sport),
+ ip6addr_string(ndo, ip6->ip6_dst),
+ tcpport_string(ndo, dport));
} else {
ND_PRINT("%s > %s: ",
- tcpport_string(ndo, sport), tcpport_string(ndo, dport));
+ tcpport_string(ndo, sport), tcpport_string(ndo, dport));
}
} else {
if (EXTRACT_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));
+ ipaddr_string(ndo, ip->ip_src),
+ tcpport_string(ndo, sport),
+ ipaddr_string(ndo, ip->ip_dst),
+ tcpport_string(ndo, dport));
} else {
ND_PRINT("%s > %s: ",
- tcpport_string(ndo, sport), tcpport_string(ndo, dport));
+ tcpport_string(ndo, sport), tcpport_string(ndo, dport));
}
}
hlen = TH_OFF(tp) * 4;
if (hlen < sizeof(*tp)) {
- ND_PRINT(" 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, < %lu]",
+ length - hlen, hlen, (unsigned long)sizeof(*tp));
return;
}
urp = EXTRACT_BE_U_2(tp->th_urp);
if (ndo->ndo_qflag) {
- ND_PRINT("tcp %d", length - hlen);
+ ND_PRINT("tcp %u", length - hlen);
if (hlen > length) {
ND_PRINT(" [bad hdr length %u - too long, > %u]",
- hlen, length);
+ hlen, length);
}
return;
}
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];
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)
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];
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)
}
if (hlen > length) {
ND_PRINT(" [bad hdr length %u - too long, > %u]",
- hlen, length);
+ hlen, length);
return;
}
ND_PRINT(", ack %u", ack);
}
- ND_PRINT(", win %d", win);
+ ND_PRINT(", win %u", win);
if (flags & TH_URG)
- ND_PRINT(", urg %d", urp);
+ ND_PRINT(", urg %u", urp);
/*
* Handle any options.
*/
} else {
uint32_t s, e;
- ND_PRINT(" %d ", datalen / 8);
+ ND_PRINT(" %u ", datalen / 8);
for (i = 0; i < datalen; i += 8) {
LENCHECK(i + 4);
s = EXTRACT_BE_U_4(cp + i);
break;
case SIGNATURE_INVALID:
- ND_PRINT("invalid");
+ nd_print_invalid(ndo);
break;
case CANT_CHECK_SIGNATURE:
* at this point.)
*/
if (datalen < 2) {
- ND_PRINT(" invalid");
+ nd_print_invalid(ndo);
} else {
LENCHECK(1);
ND_PRINT(" keyid %u", EXTRACT_U_1(cp));
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("[len %d]", len);
+ ND_PRINT("[len %u]", len);
ch = ',';
if (opt == TCPOPT_EOL)
break;
#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);
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
bad:
ND_PRINT("[bad opt]");
if (ch != '\0')
- ND_PRINT(">");
+ ND_PRINT("]");
return;
trunc:
- ND_PRINT("[|tcp]");
+ nd_print_trunc(ndo);
if (ch != '\0')
ND_PRINT(">");
}
while (length-- && sp < ndo->ndo_snapend) {
c = EXTRACT_U_1(sp);
sp++;
- safeputchar(ndo, c);
+ fn_print_char(ndo, c);
}
ND_PRINT("]");
}
} 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)
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];
uint32_t len32;
uint8_t nxt;
- if (data + length > ndo->ndo_snapend) {
- ND_PRINT("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("shared secret not supplied with -M, ");
+ ND_PRINT("shared secret not supplied with -M, ");
return (CANT_CHECK_SIGNATURE);
}
nxt = IPPROTO_TCP;
MD5_Update(&ctx, (const char *)&nxt, sizeof(nxt));
} else {
- ND_PRINT("IP version not 4 or 6, ");
+ ND_PRINT("IP version not 4 or 6, ");
return (CANT_CHECK_SIGNATURE);
}
}
USES_APPLE_RST
#endif /* HAVE_LIBCRYPTO */
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
projects / tcpdump / blobdiff