X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e3591424ed82947e1fe791958ca917850948a370..6c78ecd7a8b996bc81cc28d412ed9afa55f0b84c:/print-mptcp.c

diff --git a/print-mptcp.c b/print-mptcp.c
index 551fcbd9..a604e563 100644
--- a/print-mptcp.c
+++ b/print-mptcp.c
@@ -46,164 +46,367 @@
 #include "addrtoname.h"
 
 #include "ipproto.h"
-#include "mptcp.h"
+#include "tcp.h"
 
-static int dummy_print(const u_char *opt _U_, u_int opt_len _U_)
+#define MPTCP_SUB_CAPABLE       0x0
+#define MPTCP_SUB_JOIN          0x1
+#define MPTCP_SUB_DSS           0x2
+#define MPTCP_SUB_ADD_ADDR      0x3
+#define MPTCP_SUB_REMOVE_ADDR   0x4
+#define MPTCP_SUB_PRIO          0x5
+#define MPTCP_SUB_FAIL          0x6
+#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 */
+};
+
+#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];
+};
+
+#define MP_CAPABLE_OPT_VERSION(sub_ver) (((sub_ver) >> 0) & 0xF)
+#define MP_CAPABLE_C                    0x80
+#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;
+        union {
+                struct {
+                        u_int8_t         token[4];
+                        u_int8_t         nonce[4];
+                } syn;
+                struct {
+                        u_int8_t         mac[8];
+                        u_int8_t         nonce[4];
+                } synack;
+                struct {
+                        u_int8_t        mac[20];
+                } ack;
+        } u;
+};
+
+#define MP_JOIN_B                       0x01
+
+struct mp_dss {
+        u_int8_t        kind;
+        u_int8_t        len;
+        u_int8_t        sub;
+        u_int8_t        flags;
+};
+
+#define MP_DSS_F                        0x10
+#define MP_DSS_m                        0x08
+#define MP_DSS_M                        0x04
+#define MP_DSS_a                        0x02
+#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;
+        union {
+                struct {
+                        u_int8_t         addr[4];
+                        u_int8_t         port[2];
+                } v4;
+                struct {
+                        u_int8_t         addr[16];
+                        u_int8_t         port[2];
+                } v6;
+        } u;
+};
+
+#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;
+        /* list of addr_id */
+        u_int8_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];
+};
+
+struct mp_close {
+        u_int8_t        kind;
+        u_int8_t        len;
+        u_int8_t        sub;
+        u_int8_t        rsv;
+        u_int8_t        key[8];
+};
+
+struct mp_prio {
+        u_int8_t        kind;
+        u_int8_t        len;
+        u_int8_t        sub_b;
+        u_int8_t        addr_id;
+};
+
+#define MP_PRIO_B                       0x01
+
+static int dummy_print(const u_char *opt _U_, u_int opt_len _U_, u_char flags _U_)
 {
         return 1;
 }
 
-static int mp_capable_print(const u_char *opt, u_int opt_len)
+static int mp_capable_print(const u_char *opt, u_int opt_len, u_char flags)
 {
         struct mp_capable *mpc = (struct mp_capable *) opt;
 
-        if (mpc->c)
+        if (!(opt_len == 12 && flags & TH_SYN) &&
+            !(opt_len == 20 && (flags & (TH_SYN | TH_ACK)) == TH_ACK))
+                return 0;
+
+        if (MP_CAPABLE_OPT_VERSION(mpc->sub_ver) != 0) {
+                printf(" Unknown Version (%d)", MP_CAPABLE_OPT_VERSION(mpc->sub_ver));
+                return 1;
+        }
+
+        if (mpc->flags & MP_CAPABLE_C)
                 printf(" csum");
-        printf(" {0x%" PRIx64, mpc->sender_key);
-        if (opt_len == 20)
-                printf(",0x%" PRIx64, mpc->receiver_key);
+        printf(" {0x%" PRIx64, EXTRACT_64BITS(mpc->sender_key));
+        if (opt_len == 20) /* ACK */
+                printf(",0x%" PRIx64, EXTRACT_64BITS(mpc->receiver_key));
         printf("}");
         return 1;
 }
 
-static int mp_join_print(const u_char *opt, u_int opt_len)
+static int mp_join_print(const u_char *opt, u_int opt_len, u_char flags)
 {
         struct mp_join *mpj = (struct mp_join *) opt;
 
-        if (mpj->b)
-                printf(" backup");
-        printf(" id %" PRIu8, mpj->addr_id);
+        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))
+                return 0;
 
-        if (opt_len == 12)
-                printf(" token 0x%" PRIx32, mpj->u.syn.token);
+        if (opt_len != 24) {
+                if (mpj->sub_b & MP_JOIN_B)
+                        printf(" backup");
+                printf(" id %u", mpj->addr_id);
+        }
 
+        switch (opt_len) {
+        case 12: /* SYN */
+                printf(" token 0x%x" " nonce 0x%x",
+                        EXTRACT_32BITS(mpj->u.syn.token),
+                        EXTRACT_32BITS(mpj->u.syn.nonce));
+                break;
+        case 16: /* SYN/ACK */
+                printf(" hmac 0x%" PRIx64 " nonce 0x%x",
+                        EXTRACT_64BITS(mpj->u.synack.mac),
+                        EXTRACT_32BITS(mpj->u.synack.nonce));
+                break;
+        case 24: {/* ACK */
+                size_t i;
+                printf(" hmac 0x");
+                for (i = 0; i < sizeof(mpj->u.ack.mac); ++i)
+                        printf("%02x", mpj->u.ack.mac[i]);
+        }
+        default:
+                break;
+        }
         return 1;
 }
 
-static u_int mp_dss_len(struct mp_dss *m, u_int csum)
+static u_int mp_dss_len(struct mp_dss *m, int csum)
 {
-        return 4 + m->A * (4 + m->a * 4) + m->M * (10 + m->m * 4 + csum * 2);
+        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(const u_char *opt, u_int opt_len)
+static int mp_dss_print(const u_char *opt, u_int opt_len, u_char flags)
 {
         struct mp_dss *mdss = (struct mp_dss *) opt;
 
-        if (mdss->F)
+        if ((opt_len != mp_dss_len(mdss, 1) &&
+             opt_len != mp_dss_len(mdss, 0)) || flags & TH_SYN)
+                return 0;
+
+        if (mdss->flags & MP_DSS_F)
                 printf(" fin");
 
         opt += 4;
-        if (mdss->A) {
+        if (mdss->flags & MP_DSS_A) {
                 printf(" ack ");
-                if (mdss->a)
+                if (mdss->flags & MP_DSS_a) {
                         printf("%" PRIu64, EXTRACT_64BITS(opt));
-                else
-                        printf("%" PRIu32, EXTRACT_32BITS(opt));
-                opt += mdss->a ? 8 : 4;
+                        opt += 8;
+                } else {
+                        printf("%u", EXTRACT_32BITS(opt));
+                        opt += 4;
+                }
         }
 
-        if (mdss->M) {
+        if (mdss->flags & MP_DSS_M) {
                 printf(" seq ");
-                if (mdss->m)
+                if (mdss->flags & MP_DSS_m) {
                         printf("%" PRIu64, EXTRACT_64BITS(opt));
-                else
-                        printf("%" PRIu32, EXTRACT_32BITS(opt));
-                opt += mdss->m ? 8 : 4;
-                printf(" subseq %" PRIu32, EXTRACT_32BITS(opt));
+                        opt += 8;
+                } else {
+                        printf("%u", EXTRACT_32BITS(opt));
+                        opt += 4;
+                }
+                printf(" subseq %u", EXTRACT_32BITS(opt));
                 opt += 4;
-                printf(" len %" PRIu16, EXTRACT_16BITS(opt));
+                printf(" len %u", EXTRACT_16BITS(opt));
                 opt += 2;
 
                 if (opt_len == mp_dss_len(mdss, 1))
-                        printf(" csum 0x%" PRIx16, EXTRACT_16BITS(opt));
+                        printf(" csum 0x%x", EXTRACT_16BITS(opt));
         }
         return 1;
 }
 
-static int add_addr_print(const u_char *opt, u_int opt_len)
+static int add_addr_print(const u_char *opt, u_int opt_len, u_char flags _U_)
 {
         struct mp_add_addr *add_addr = (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) &&
+            !((opt_len == 20 || opt_len == 22) && ipver == 6))
+                return 0;
 
-        printf(" id %" PRIu8, add_addr->addr_id);
-        switch (add_addr->ipver) {
+        printf(" id %u", add_addr->addr_id);
+        switch (ipver) {
         case 4:
-                printf(" %s", ipaddr_string(&add_addr->u.v4.addr));
+                printf(" %s", ipaddr_string(add_addr->u.v4.addr));
+                if (opt_len == 10)
+                        printf(":%u", EXTRACT_16BITS(add_addr->u.v4.port));
                 break;
-#ifdef INET6
         case 6:
-                printf(" %s", ip6addr_string(&add_addr->u.v6.addr));
-                break;
+#ifdef INET6
+                printf(" %s", ip6addr_string(add_addr->u.v6.addr));
 #endif
+                if (opt_len == 22)
+                        printf(":%u", EXTRACT_16BITS(add_addr->u.v6.port));
+                break;
         default:
                 return 0;
         }
-        if (opt_len == 10 || opt_len == 22)
-                printf(":%" PRIu16, ntohs(add_addr->ipver == 4 ?
-                                         add_addr->u.v4.port :
-                                         add_addr->u.v6.port));
+
         return 1;
 }
 
-static int remove_addr_print(const u_char *opt, u_int opt_len)
+static int remove_addr_print(const u_char *opt, u_int opt_len, u_char flags _U_)
 {
-        struct mp_remove_addr *rem_addr = (struct mp_remove_addr *) opt;
-        u_int8_t *addr_id = &rem_addr->addrs_id;
+        struct mp_remove_addr *remove_addr = (struct mp_remove_addr *) opt;
+        u_int8_t *addr_id = &remove_addr->addrs_id;
+
+        if (opt_len < 4)
+                return 0;
 
         opt_len -= 3;
         printf(" id");
         while (opt_len--)
-                printf(" %" PRIu8, *addr_id++);
+                printf(" %u", *addr_id++);
         return 1;
 }
 
-static int mp_prio_print(const u_char *opt, u_int opt_len)
+static int mp_prio_print(const u_char *opt, u_int opt_len, u_char flags _U_)
 {
         struct mp_prio *mpp = (struct mp_prio *) opt;
 
-        if (mpp->b)
+        if (opt_len != 3 && opt_len != 4)
+                return 0;
+
+        if (mpp->sub_b & MP_PRIO_B)
                 printf(" backup");
         else
                 printf(" non-backup");
         if (opt_len == 4)
-                printf(" id %" PRIu8, mpp->addr_id);
+                printf(" id %u", mpp->addr_id);
 
         return 1;
 }
 
-static int mp_fail_print(const u_char *opt, u_int opt_len _U_)
+static int mp_fail_print(const u_char *opt, u_int opt_len, u_char flags _U_)
 {
-        opt += 4;
-        printf(" seq %" PRIu64, EXTRACT_64BITS(opt));
+        if (opt_len != 12)
+                return 0;
+
+        printf(" seq %" PRIu64, EXTRACT_64BITS(opt + 4));
         return 1;
 }
 
-static int mp_fast_close_print(const u_char *opt, u_int opt_len _U_)
+static int mp_fast_close_print(const u_char *opt, u_int opt_len, u_char flags _U_)
 {
-        opt += 4;
-        printf(" key 0x%" PRIx64, *((uint64_t *)opt));
+        if (opt_len != 12)
+                return 0;
+
+        printf(" key 0x%" PRIx64, EXTRACT_64BITS(opt + 4));
         return 1;
 }
 
-static struct {
+static const struct {
         const char *name;
-        int (*print)(const u_char *, u_int);
+        int (*print)(const u_char *, u_int, u_char);
 } mptcp_options[] = {
-        { "capable",        mp_capable_print },
-        { "join",        mp_join_print },
+        { "capable", mp_capable_print},
+        { "join",       mp_join_print },
         { "dss",        mp_dss_print },
-        { "add-addr",        add_addr_print },
-        { "rem-addr",        remove_addr_print },
-        { "prio",        mp_prio_print },
-        { "fail",        mp_fail_print },
-        { "fast-close",        mp_fast_close_print },
-        { "unknown",        dummy_print },
+        { "add-addr",   add_addr_print },
+        { "rem-addr",   remove_addr_print },
+        { "prio",       mp_prio_print },
+        { "fail",       mp_fail_print },
+        { "fast-close", mp_fast_close_print },
+        { "unknown",    dummy_print },
 };
 
-int mptcp_print(const u_char *cp, u_int len)
+int mptcp_print(const u_char *cp, u_int len, u_char flags)
 {
-        struct mptcp_option *opt = (struct mptcp_option *) cp;
-        u_int subtype = min(opt->sub, MPTCP_SUB_FCLOSE + 1);
+        struct mptcp_option *opt;
+        u_int subtype;
+
+        if (len < 3)
+                return 0;
+
+        opt = (struct mptcp_option *) cp;
+        subtype = min(MPTCP_OPT_SUBTYPE(opt->sub_etc), MPTCP_SUB_FCLOSE + 1);
 
         printf(" %s", mptcp_options[subtype].name);
-        return mptcp_options[subtype].print(cp, len);
+        return mptcp_options[subtype].print(cp, len, flags);
 }