X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bbedebc666a341d8e14922dce37a92766400c798..01cd3621f1ded1d0ec5cb55a87bcc3d735d59422:/print-mptcp.c diff --git a/print-mptcp.c b/print-mptcp.c index 6d763d57..8cca477e 100644 --- a/print-mptcp.c +++ b/print-mptcp.c @@ -32,14 +32,17 @@ * SUCH DAMAGE. */ -#define NETDISSECT_REWORKED +/* \summary: Multipath TCP (MPTCP) printer */ + +/* specification: RFC 6824 */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" @@ -55,20 +58,20 @@ #define MPTCP_SUB_FCLOSE 0x7 struct mptcp_option { - u_int8_t kind; - u_int8_t len; - u_int8_t sub_etc; /* subtype upper 4 bits, other stuff lower 4 bits */ + uint8_t kind; + uint8_t len; + uint8_t sub_etc; /* subtype upper 4 bits, other stuff lower 4 bits */ }; #define MPTCP_OPT_SUBTYPE(sub_etc) (((sub_etc) >> 4) & 0xF) struct mp_capable { - u_int8_t kind; - u_int8_t len; - u_int8_t sub_ver; - u_int8_t flags; - u_int8_t sender_key[8]; - u_int8_t receiver_key[8]; + uint8_t kind; + uint8_t len; + uint8_t sub_ver; + uint8_t flags; + uint8_t sender_key[8]; + uint8_t receiver_key[8]; }; #define MP_CAPABLE_OPT_VERSION(sub_ver) (((sub_ver) >> 0) & 0xF) @@ -76,21 +79,21 @@ struct mp_capable { #define MP_CAPABLE_S 0x01 struct mp_join { - u_int8_t kind; - u_int8_t len; - u_int8_t sub_b; - u_int8_t addr_id; + uint8_t kind; + uint8_t len; + uint8_t sub_b; + uint8_t addr_id; union { struct { - u_int8_t token[4]; - u_int8_t nonce[4]; + uint8_t token[4]; + uint8_t nonce[4]; } syn; struct { - u_int8_t mac[8]; - u_int8_t nonce[4]; + uint8_t mac[8]; + uint8_t nonce[4]; } synack; struct { - u_int8_t mac[20]; + uint8_t mac[20]; } ack; } u; }; @@ -98,10 +101,10 @@ struct mp_join { #define MP_JOIN_B 0x01 struct mp_dss { - u_int8_t kind; - u_int8_t len; - u_int8_t sub; - u_int8_t flags; + uint8_t kind; + uint8_t len; + uint8_t sub; + uint8_t flags; }; #define MP_DSS_F 0x10 @@ -111,18 +114,18 @@ struct mp_dss { #define MP_DSS_A 0x01 struct mp_add_addr { - u_int8_t kind; - u_int8_t len; - u_int8_t sub_ipver; - u_int8_t addr_id; + uint8_t kind; + uint8_t len; + uint8_t sub_ipver; + uint8_t addr_id; union { struct { - u_int8_t addr[4]; - u_int8_t port[2]; + uint8_t addr[4]; + uint8_t port[2]; } v4; struct { - u_int8_t addr[16]; - u_int8_t port[2]; + uint8_t addr[16]; + uint8_t port[2]; } v6; } u; }; @@ -130,34 +133,34 @@ struct mp_add_addr { #define MP_ADD_ADDR_IPVER(sub_ipver) (((sub_ipver) >> 0) & 0xF) struct mp_remove_addr { - u_int8_t kind; - u_int8_t len; - u_int8_t sub; + uint8_t kind; + uint8_t len; + uint8_t sub; /* list of addr_id */ - u_int8_t addrs_id; + uint8_t addrs_id; }; struct mp_fail { - u_int8_t kind; - u_int8_t len; - u_int8_t sub; - u_int8_t resv; - u_int8_t data_seq[8]; + uint8_t kind; + uint8_t len; + uint8_t sub; + uint8_t resv; + uint8_t data_seq[8]; }; struct mp_close { - u_int8_t kind; - u_int8_t len; - u_int8_t sub; - u_int8_t rsv; - u_int8_t key[8]; + uint8_t kind; + uint8_t len; + uint8_t sub; + uint8_t rsv; + uint8_t key[8]; }; struct mp_prio { - u_int8_t kind; - u_int8_t len; - u_int8_t sub_b; - u_int8_t addr_id; + uint8_t kind; + uint8_t len; + uint8_t sub_b; + uint8_t addr_id; }; #define MP_PRIO_B 0x01 @@ -173,9 +176,9 @@ static int mp_capable_print(netdissect_options *ndo, const u_char *opt, u_int opt_len, u_char flags) { - struct mp_capable *mpc = (struct mp_capable *) opt; + const struct mp_capable *mpc = (const struct mp_capable *) opt; - if (!(opt_len == 12 && flags & TH_SYN) && + if (!(opt_len == 12 && (flags & TH_SYN)) && !(opt_len == 20 && (flags & (TH_SYN | TH_ACK)) == TH_ACK)) return 0; @@ -186,9 +189,9 @@ mp_capable_print(netdissect_options *ndo, if (mpc->flags & MP_CAPABLE_C) ND_PRINT((ndo, " csum")); - ND_PRINT((ndo, " {0x%" PRIx64, EXTRACT_64BITS(mpc->sender_key))); + ND_PRINT((ndo, " {0x%" PRIx64, EXTRACT_BE_64BITS(mpc->sender_key))); if (opt_len == 20) /* ACK */ - ND_PRINT((ndo, ",0x%" PRIx64, EXTRACT_64BITS(mpc->receiver_key))); + ND_PRINT((ndo, ",0x%" PRIx64, EXTRACT_BE_64BITS(mpc->receiver_key))); ND_PRINT((ndo, "}")); return 1; } @@ -197,11 +200,11 @@ static int mp_join_print(netdissect_options *ndo, const u_char *opt, u_int opt_len, u_char flags) { - struct mp_join *mpj = (struct mp_join *) opt; + const struct mp_join *mpj = (const struct mp_join *) opt; - if (!(opt_len == 12 && flags & TH_SYN) && + if (!(opt_len == 12 && (flags & TH_SYN)) && !(opt_len == 16 && (flags & (TH_SYN | TH_ACK)) == (TH_SYN | TH_ACK)) && - !(opt_len == 24 && flags & TH_ACK)) + !(opt_len == 24 && (flags & TH_ACK))) return 0; if (opt_len != 24) { @@ -213,13 +216,13 @@ mp_join_print(netdissect_options *ndo, switch (opt_len) { case 12: /* SYN */ ND_PRINT((ndo, " token 0x%x" " nonce 0x%x", - EXTRACT_32BITS(mpj->u.syn.token), - EXTRACT_32BITS(mpj->u.syn.nonce))); + EXTRACT_BE_32BITS(mpj->u.syn.token), + EXTRACT_BE_32BITS(mpj->u.syn.nonce))); break; case 16: /* SYN/ACK */ ND_PRINT((ndo, " hmac 0x%" PRIx64 " nonce 0x%x", - EXTRACT_64BITS(mpj->u.synack.mac), - EXTRACT_32BITS(mpj->u.synack.nonce))); + EXTRACT_BE_64BITS(mpj->u.synack.mac), + EXTRACT_BE_32BITS(mpj->u.synack.nonce))); break; case 24: {/* ACK */ size_t i; @@ -233,76 +236,92 @@ mp_join_print(netdissect_options *ndo, return 1; } -static u_int mp_dss_len(struct mp_dss *m, int csum) -{ - u_int len; - - len = 4; - if (m->flags & MP_DSS_A) { - /* Ack present - 4 or 8 octets */ - len += (m->flags & MP_DSS_a) ? 8 : 4; - } - if (m->flags & MP_DSS_M) { - /* - * Data Sequence Number (DSN), Subflow Sequence Number (SSN), - * Data-Level Length present, and Checksum possibly present. - * All but the Checksum are 10 bytes if the m flag is - * clear (4-byte DSN) and 14 bytes if the m flag is set - * (8-byte DSN). - */ - len += (m->flags & MP_DSS_m) ? 14 : 10; - - /* - * The Checksum is present only if negotiated. - */ - if (csum) - len += 2; - } - return len; -} - static int mp_dss_print(netdissect_options *ndo, const u_char *opt, u_int opt_len, u_char flags) { - struct mp_dss *mdss = (struct mp_dss *) opt; + const struct mp_dss *mdss = (const struct mp_dss *) opt; + + /* We need the flags, at a minimum. */ + if (opt_len < 4) + return 0; - if ((opt_len != mp_dss_len(mdss, 1) && - opt_len != mp_dss_len(mdss, 0)) || flags & TH_SYN) + if (flags & TH_SYN) return 0; if (mdss->flags & MP_DSS_F) ND_PRINT((ndo, " fin")); opt += 4; + opt_len -= 4; if (mdss->flags & MP_DSS_A) { + /* Ack present */ ND_PRINT((ndo, " ack ")); + /* + * If the a flag is set, we have an 8-byte ack; if it's + * clear, we have a 4-byte ack. + */ if (mdss->flags & MP_DSS_a) { - ND_PRINT((ndo, "%" PRIu64, EXTRACT_64BITS(opt))); + if (opt_len < 8) + return 0; + ND_PRINT((ndo, "%" PRIu64, EXTRACT_BE_64BITS(opt))); opt += 8; + opt_len -= 8; } else { - ND_PRINT((ndo, "%u", EXTRACT_32BITS(opt))); + if (opt_len < 4) + return 0; + ND_PRINT((ndo, "%u", EXTRACT_BE_32BITS(opt))); opt += 4; + opt_len -= 4; } } if (mdss->flags & MP_DSS_M) { + /* + * Data Sequence Number (DSN), Subflow Sequence Number (SSN), + * Data-Level Length present, and Checksum possibly present. + */ ND_PRINT((ndo, " seq ")); + /* + * If the m flag is set, we have an 8-byte NDS; if it's clear, + * we have a 4-byte DSN. + */ if (mdss->flags & MP_DSS_m) { - ND_PRINT((ndo, "%" PRIu64, EXTRACT_64BITS(opt))); + if (opt_len < 8) + return 0; + ND_PRINT((ndo, "%" PRIu64, EXTRACT_BE_64BITS(opt))); opt += 8; + opt_len -= 8; } else { - ND_PRINT((ndo, "%u", EXTRACT_32BITS(opt))); + if (opt_len < 4) + return 0; + ND_PRINT((ndo, "%u", EXTRACT_BE_32BITS(opt))); opt += 4; + opt_len -= 4; } - ND_PRINT((ndo, " subseq %u", EXTRACT_32BITS(opt))); + if (opt_len < 4) + return 0; + ND_PRINT((ndo, " subseq %u", EXTRACT_BE_32BITS(opt))); opt += 4; - ND_PRINT((ndo, " len %u", EXTRACT_16BITS(opt))); + opt_len -= 4; + if (opt_len < 2) + return 0; + ND_PRINT((ndo, " len %u", EXTRACT_BE_16BITS(opt))); opt += 2; + opt_len -= 2; - if (opt_len == mp_dss_len(mdss, 1)) - ND_PRINT((ndo, " csum 0x%x", EXTRACT_16BITS(opt))); + /* + * The Checksum is present only if negotiated. + * If there are at least 2 bytes left, process the next 2 + * bytes as the Checksum. + */ + if (opt_len >= 2) { + ND_PRINT((ndo, " csum 0x%x", EXTRACT_BE_16BITS(opt))); + opt_len -= 2; + } } + if (opt_len != 0) + return 0; return 1; } @@ -310,7 +329,7 @@ static int add_addr_print(netdissect_options *ndo, const u_char *opt, u_int opt_len, u_char flags _U_) { - struct mp_add_addr *add_addr = (struct mp_add_addr *) opt; + const struct mp_add_addr *add_addr = (const struct mp_add_addr *) opt; u_int ipver = MP_ADD_ADDR_IPVER(add_addr->sub_ipver); if (!((opt_len == 8 || opt_len == 10) && ipver == 4) && @@ -322,14 +341,12 @@ add_addr_print(netdissect_options *ndo, case 4: ND_PRINT((ndo, " %s", ipaddr_string(ndo, add_addr->u.v4.addr))); if (opt_len == 10) - ND_PRINT((ndo, ":%u", EXTRACT_16BITS(add_addr->u.v4.port))); + ND_PRINT((ndo, ":%u", EXTRACT_BE_16BITS(add_addr->u.v4.port))); break; case 6: -#ifdef INET6 ND_PRINT((ndo, " %s", ip6addr_string(ndo, add_addr->u.v6.addr))); -#endif if (opt_len == 22) - ND_PRINT((ndo, ":%u", EXTRACT_16BITS(add_addr->u.v6.port))); + ND_PRINT((ndo, ":%u", EXTRACT_BE_16BITS(add_addr->u.v6.port))); break; default: return 0; @@ -342,16 +359,18 @@ static int remove_addr_print(netdissect_options *ndo, const u_char *opt, u_int opt_len, u_char flags _U_) { - struct mp_remove_addr *remove_addr = (struct mp_remove_addr *) opt; - u_int8_t *addr_id = &remove_addr->addrs_id; + const struct mp_remove_addr *remove_addr = (const struct mp_remove_addr *) opt; + const uint8_t *addr_id = &remove_addr->addrs_id; if (opt_len < 4) return 0; opt_len -= 3; ND_PRINT((ndo, " id")); - while (opt_len--) - ND_PRINT((ndo, " %u", *addr_id++)); + while (opt_len--) { + ND_PRINT((ndo, " %u", EXTRACT_8BITS(addr_id))); + addr_id++; + } return 1; } @@ -359,7 +378,7 @@ static int mp_prio_print(netdissect_options *ndo, const u_char *opt, u_int opt_len, u_char flags _U_) { - struct mp_prio *mpp = (struct mp_prio *) opt; + const struct mp_prio *mpp = (const struct mp_prio *) opt; if (opt_len != 3 && opt_len != 4) return 0; @@ -381,7 +400,7 @@ mp_fail_print(netdissect_options *ndo, if (opt_len != 12) return 0; - ND_PRINT((ndo, " seq %" PRIu64, EXTRACT_64BITS(opt + 4))); + ND_PRINT((ndo, " seq %" PRIu64, EXTRACT_BE_64BITS(opt + 4))); return 1; } @@ -392,7 +411,7 @@ mp_fast_close_print(netdissect_options *ndo, if (opt_len != 12) return 0; - ND_PRINT((ndo, " key 0x%" PRIx64, EXTRACT_64BITS(opt + 4))); + ND_PRINT((ndo, " key 0x%" PRIx64, EXTRACT_BE_64BITS(opt + 4))); return 1; } @@ -415,13 +434,13 @@ int mptcp_print(netdissect_options *ndo, const u_char *cp, u_int len, u_char flags) { - struct mptcp_option *opt; + const struct mptcp_option *opt; u_int subtype; if (len < 3) return 0; - opt = (struct mptcp_option *) cp; + opt = (const struct mptcp_option *) cp; subtype = min(MPTCP_OPT_SUBTYPE(opt->sub_etc), MPTCP_SUB_FCLOSE + 1); ND_PRINT((ndo, " %s", mptcp_options[subtype].name));