__RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
#endif
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "netdissect-stdinc.h"
#include "addrtoname.h"
#include "extract.h"
+#include "diag-control.h"
+
#include "tcp.h"
#include "ip.h"
struct tha {
- struct in_addr src;
- struct in_addr dst;
+ nd_ipv4 src;
+ nd_ipv4 dst;
u_int port;
};
};
struct tha6 {
- struct in6_addr src;
- struct in6_addr dst;
+ nd_ipv6 src;
+ nd_ipv6 dst;
u_int port;
};
{ TCPOPT_TIMESTAMP, "TS" },
{ TCPOPT_CC, "cc" },
{ TCPOPT_CCNEW, "ccnew" },
- { TCPOPT_CCECHO, "" },
+ { TCPOPT_CCECHO, "ccecho" },
{ TCPOPT_SIGNATURE, "md5" },
{ TCPOPT_SCPS, "scps" },
{ TCPOPT_UTO, "uto" },
uint16_t magic;
int rev;
const struct ip6_hdr *ip6;
+ u_int header_len; /* Header length in bytes */
ndo->ndo_protocol = "tcp";
tp = (const struct tcphdr *)bp;
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;
if (ip6) {
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: ",
} else {
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: ",
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;
}
if (th->nxt == NULL)
(*ndo->ndo_error)(ndo,
S_ERR_ND_MEM_ALLOC,
- "tcp_print: calloc");
+ "%s: calloc", __func__);
}
th->addr = tha;
if (rev)
if (th->nxt == NULL)
(*ndo->ndo_error)(ndo,
S_ERR_ND_MEM_ALLOC,
- "tcp_print: calloc");
+ "%s: calloc", __func__);
}
th->addr = tha;
if (rev)
while (hlen > 0) {
if (ch != '\0')
ND_PRINT("%c", ch);
- ND_TCHECK_1(cp);
opt = GET_U_1(cp);
cp++;
if (ZEROLENOPT(opt))
len = 1;
else {
- ND_TCHECK_1(cp);
len = GET_U_1(cp);
cp++; /* total including type, len */
if (len < 2 || len > hlen)
break;
case TCPOPT_MPTCP:
+ {
+ const u_char *snapend_save;
+ int ret;
+
datalen = len - 2;
LENCHECK(datalen);
- if (!mptcp_print(ndo, cp-2, len, flags))
+ /* Update the snapend to the end of the option
+ * before calling mptcp_print(). Some options
+ * (MPTCP or others) may be present after a
+ * MPTCP option. This prevents that, in
+ * mptcp_print(), the remaining length < the
+ * remaining caplen.
+ */
+ snapend_save = ndo->ndo_snapend;
+ ndo->ndo_snapend = ND_MIN(cp - 2 + len,
+ ndo->ndo_snapend);
+ ret = mptcp_print(ndo, cp - 2, len, flags);
+ ndo->ndo_snapend = snapend_save;
+ if (!ret)
goto bad;
break;
+ }
case TCPOPT_FASTOPEN:
datalen = len - 2;
*/
ND_PRINT(", length %u", length);
- if (length <= 0)
+ if (length == 0)
return;
/*
* Decode payload if necessary.
*/
- bp += TH_OFF(tp) * 4;
+ header_len = TH_OFF(tp) * 4;
+ /*
+ * Do a bounds check before decoding the payload.
+ * At least the header data is required.
+ */
+ if (!ND_TTEST_LEN(bp, header_len)) {
+ ND_PRINT(" [remaining caplen(%u) < header length(%u)]",
+ ND_BYTES_AVAILABLE_AFTER(bp), header_len);
+ nd_trunc_longjmp(ndo);
+ }
+ bp += header_len;
if ((flags & TH_RST) && ndo->ndo_vflag) {
print_tcp_rst_data(ndo, bp, length);
return;
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;
}
- if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
+ if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
+ ND_PRINT(": ");
+ ftp_print(ndo, bp, length);
+ } else if (IS_SRC_OR_DST_PORT(SSH_PORT)) {
+ ssh_print(ndo, bp, length);
+ } else if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
telnet_print(ndo, bp, length);
} else if (IS_SRC_OR_DST_PORT(SMTP_PORT)) {
ND_PRINT(": ");
smtp_print(ndo, bp, length);
} else if (IS_SRC_OR_DST_PORT(WHOIS_PORT)) {
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);
+ whois_print(ndo, bp, length);
+ } 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(HTTP_PORT)) {
+ ND_PRINT(": ");
+ http_print(ndo, bp, length);
#ifdef ENABLE_SMB
- else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT))
+ } 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))
+#endif
+ } else if (IS_SRC_OR_DST_PORT(BGP_PORT)) {
+ bgp_print(ndo, bp, length);
+ } else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) {
+ rpki_rtr_print(ndo, bp, length);
+#ifdef ENABLE_SMB
+ } else if (IS_SRC_OR_DST_PORT(SMB_PORT)) {
smb_tcp_print(ndo, bp, length);
#endif
+ } else if (IS_SRC_OR_DST_PORT(RTSP_PORT)) {
+ ND_PRINT(": ");
+ rtsp_print(ndo, bp, length);
+ } else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) {
+ msdp_print(ndo, bp, length);
+ } else if (IS_SRC_OR_DST_PORT(LDP_PORT)) {
+ ldp_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(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))
+ 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(": ");
- ftp_print(ndo, bp, length);
- } else if (IS_SRC_OR_DST_PORT(HTTP_PORT) || IS_SRC_OR_DST_PORT(HTTP_PORT_ALT)) {
+ } else if (IS_SRC_OR_DST_PORT(HTTP_PORT_ALT)) {
ND_PRINT(": ");
http_print(ndo, bp, length);
- } else if (IS_SRC_OR_DST_PORT(RTSP_PORT) || IS_SRC_OR_DST_PORT(RTSP_PORT_ALT)) {
+ } else if (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(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))) {
- 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,
}
return;
- bad:
+bad:
ND_PRINT("[bad opt]");
if (ch != '\0')
ND_PRINT("]");
return;
- trunc:
+trunc:
nd_print_trunc(ndo);
if (ch != '\0')
ND_PRINT(">");
}
#ifdef HAVE_LIBCRYPTO
-USES_APPLE_DEPRECATED_API
+DIAG_OFF_DEPRECATION
static int
tcp_verify_signature(netdissect_options *ndo,
const struct ip *ip, const struct tcphdr *tp,
else
return (SIGNATURE_INVALID);
}
-USES_APPLE_RST
+DIAG_ON_DEPRECATION
#endif /* HAVE_LIBCRYPTO */
projects / tcpdump / blobdiff