mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-23 18:14:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for TCP Fast Open official IANA option number

Browse Source 
https://tools.ietf.org/html/rfc7413
This commit is contained in:
Daniel Lee 2015-04-07 17:42:55 -07:00
parent b341c00e8b
commit cc469325c3
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
print-tcp.c
View File

@ -63,6 +63,8 @@ static int tcp_verify_signature(netdissect_options *ndo,
#endif #endif
static void print_tcp_rst_data(netdissect_options *, register const u_char *sp, u_int length); 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,
u_int datalen, int exp);
#define MAX_RST_DATA_LEN 30 #define MAX_RST_DATA_LEN 30
@ -134,6 +136,7 @@ static const struct tok tcp_option_values[] = {
{ TCPOPT_AUTH, "enhanced auth" }, { TCPOPT_AUTH, "enhanced auth" },
{ TCPOPT_UTO, "uto" }, { TCPOPT_UTO, "uto" },
{ TCPOPT_MPTCP, "mptcp" }, { TCPOPT_MPTCP, "mptcp" },
{ TCPOPT_FASTOPEN, "tfo" },
{ TCPOPT_EXPERIMENT2, "exp" }, { TCPOPT_EXPERIMENT2, "exp" },
{ 0, NULL } { 0, NULL }
}; };
@ -583,6 +586,12 @@ tcp_print(netdissect_options *ndo,
goto bad; goto bad;
break; break;
case TCPOPT_FASTOPEN:
datalen = len - 2;
LENCHECK(datalen);
print_tcp_fastopen_option(ndo, cp, datalen, FALSE);
break;
case TCPOPT_EXPERIMENT2: case TCPOPT_EXPERIMENT2:
datalen = len - 2; datalen = len - 2;
LENCHECK(datalen); LENCHECK(datalen);
@ -594,21 +603,8 @@ tcp_print(netdissect_options *ndo,
switch(magic) { switch(magic) {
case 0xf989: case 0xf989: /* TCP Fast Open RFC 7413 */
/* TCP Fast Open: RFC 7413 */ print_tcp_fastopen_option(ndo, cp + 2, datalen - 2, TRUE);
if (datalen == 2) {
/* Fast Open Cookie Request */
ND_PRINT((ndo, "tfo cookiereq"));
} else {
/* Fast Open Cookie */
if (datalen % 2 != 0 || datalen < 6 || datalen > 18) {
ND_PRINT((ndo, "tfo malformed"));
} else {
ND_PRINT((ndo, "tfo cookie "));
for (i = 2; i < datalen; ++i)
ND_PRINT((ndo, "%02x", cp[i]));
}
}
break; break;
default: default:
@ -796,6 +792,30 @@ print_tcp_rst_data(netdissect_options *ndo,
ND_PRINT((ndo, "]")); ND_PRINT((ndo, "]"));
} }
static void
print_tcp_fastopen_option(netdissect_options *ndo, register const u_char *cp,
u_int datalen, int exp)
{
u_int i;
if (exp)
ND_PRINT((ndo, "tfo"));
if (datalen == 0) {
/* Fast Open Cookie Request */
ND_PRINT((ndo, " cookiereq"));
} else {
/* Fast Open Cookie */
if (datalen % 2 != 0 || datalen < 4 || datalen > 16) {
ND_PRINT((ndo, " malformed"));
} else {
ND_PRINT((ndo, " cookie "));
for (i = 0; i < datalen; ++i)
ND_PRINT((ndo, "%02x", cp[i]));
}
}
}
#ifdef HAVE_LIBCRYPTO #ifdef HAVE_LIBCRYPTO
USES_APPLE_DEPRECATED_API USES_APPLE_DEPRECATED_API
static int static int

1
tcp.h
View File

@ -85,6 +85,7 @@ struct tcphdr {
#define TCPOPT_UTO 28 /* tcp user timeout (rfc5482) */ #define TCPOPT_UTO 28 /* tcp user timeout (rfc5482) */
#define TCPOLEN_UTO 4 #define TCPOLEN_UTO 4
#define TCPOPT_MPTCP 30 /* MPTCP options */ #define TCPOPT_MPTCP 30 /* MPTCP options */
#define TCPOPT_FASTOPEN 34 /* TCP Fast Open (rfc7413) */
#define TCPOPT_EXPERIMENT2 254 /* experimental headers (rfc4727) */ #define TCPOPT_EXPERIMENT2 254 /* experimental headers (rfc4727) */
#define TCPOPT_TSTAMP_HDR \ #define TCPOPT_TSTAMP_HDR \