PPTP: Remove 68 redundant ND_TCHECK_[124] calls

[tcpdump] / print-mptcp.c

diff --git a/print-mptcp.c b/print-mptcp.c
index e3a82fe654149d326219d0351423fb5158b3f733..317f744ca46ccb9c3fc28d6081bdd9e26a1db07e 100644 (file)
--- a/print-mptcp.c
+++ b/print-mptcp.c
@@ -113,25 +113,41 @@ struct mp_dss {
 #define MP_DSS_a                        0x02
 #define MP_DSS_A                        0x01
 
 #define MP_DSS_a                        0x02
 #define MP_DSS_A                        0x01
 

+static const struct tok mptcp_addr_subecho_bits[] = {
+        { 0x6, "v0-ip6" },
+        { 0x4, "v0-ip4" },
+        { 0x1, "v1-echo" },
+        { 0x0, "v1" },
+        { 0, NULL }
+};
+

 struct mp_add_addr {
         nd_uint8_t     kind;
         nd_uint8_t     len;
 struct mp_add_addr {
         nd_uint8_t     kind;
         nd_uint8_t     len;

-        nd_uint8_t     sub_ipver;
+        nd_uint8_t     sub_echo;

         nd_uint8_t     addr_id;
         union {
                 struct {
                         nd_ipv4         addr;
                         nd_uint16_t     port;
         nd_uint8_t     addr_id;
         union {
                 struct {
                         nd_ipv4         addr;
                         nd_uint16_t     port;

+                        nd_uint64_t     mac;

                 } v4;
                 } v4;

+                struct {
+                        nd_ipv4         addr;
+                        nd_uint64_t     mac;
+                } v4np;

                 struct {
                         nd_ipv6         addr;
                         nd_uint16_t     port;
                 struct {
                         nd_ipv6         addr;
                         nd_uint16_t     port;

+                        nd_uint64_t     mac;

                 } v6;
                 } v6;

+                struct {
+                        nd_ipv6         addr;
+                        nd_uint64_t     mac;
+                } v6np;

         } u;
 };
 
         } u;
 };
 

-#define MP_ADD_ADDR_IPVER(sub_ipver)    ((GET_U_1(sub_ipver) >> 0) & 0xF)
-

 struct mp_remove_addr {
         nd_uint8_t     kind;
         nd_uint8_t     len;
 struct mp_remove_addr {
         nd_uint8_t     kind;
         nd_uint8_t     len;


@@ -178,21 +194,30 @@ mp_capable_print(netdissect_options *ndo,
 {
         const struct mp_capable *mpc = (const struct mp_capable *) opt;
 
 {
         const struct mp_capable *mpc = (const struct mp_capable *) opt;
 

-        if (!(opt_len == 12 && (flags & TH_SYN)) &&
-            !(opt_len == 20 && (flags & (TH_SYN | TH_ACK)) == TH_ACK))
+        if (!((opt_len == 12 || opt_len == 4) && flags & TH_SYN) &&
+            !((opt_len == 20 || opt_len == 22) && (flags & (TH_SYN | TH_ACK)) ==
+              TH_ACK))

                 return 0;
 
                 return 0;
 

-        if (MP_CAPABLE_OPT_VERSION(mpc->sub_ver) != 0) {
-                ND_PRINT(" Unknown Version (%u)", MP_CAPABLE_OPT_VERSION(mpc->sub_ver));
-                return 1;
+        switch (MP_CAPABLE_OPT_VERSION(mpc->sub_ver)) {
+                case 0: /* fall through */
+                case 1:
+                        ND_PRINT(" v%u", MP_CAPABLE_OPT_VERSION(mpc->sub_ver));
+                        break;
+                default:
+                        ND_PRINT(" Unknown Version (%u)",
+                                  MP_CAPABLE_OPT_VERSION(mpc->sub_ver));
+                        return 1;

         }
 
         if (GET_U_1(mpc->flags) & MP_CAPABLE_C)
                 ND_PRINT(" csum");
         }
 
         if (GET_U_1(mpc->flags) & MP_CAPABLE_C)
                 ND_PRINT(" csum");

-        ND_PRINT(" {0x%" PRIx64, GET_BE_U_8(mpc->sender_key));
-        if (opt_len == 20) /* ACK */
-                ND_PRINT(",0x%" PRIx64, GET_BE_U_8(mpc->receiver_key));
-        ND_PRINT("}");
+        if (opt_len == 12 || opt_len >= 20) {
+                ND_PRINT(" {0x%" PRIx64, GET_BE_U_8(mpc->sender_key));
+                if (opt_len >= 20)
+                        ND_PRINT(",0x%" PRIx64, GET_BE_U_8(mpc->receiver_key));
+                ND_PRINT("}");
+        }

         return 1;
 }
 
         return 1;
 }
 


@@ -332,26 +357,33 @@ add_addr_print(netdissect_options *ndo,
                const u_char *opt, u_int opt_len, u_char flags _U_)
 {
         const struct mp_add_addr *add_addr = (const struct mp_add_addr *) opt;
                const u_char *opt, u_int opt_len, u_char flags _U_)
 {
         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) &&
-            !((opt_len == 20 || opt_len == 22) && ipver == 6))
+        if (!(opt_len == 8 || opt_len == 10 || opt_len == 16 || opt_len == 18 ||
+            opt_len == 20 || opt_len == 22 || opt_len == 28 || opt_len == 30))

                 return 0;
 
                 return 0;
 

+        ND_PRINT(" %s",
+                 tok2str(mptcp_addr_subecho_bits, "[bad version/echo]",
+                         GET_U_1(add_addr->sub_echo) & 0xF));

         ND_PRINT(" id %u", GET_U_1(add_addr->addr_id));
         ND_PRINT(" id %u", GET_U_1(add_addr->addr_id));

-        switch (ipver) {
-        case 4:
+        if (opt_len == 8 || opt_len == 10 || opt_len == 16 || opt_len == 18) {

                 ND_PRINT(" %s", GET_IPADDR_STRING(add_addr->u.v4.addr));
                 ND_PRINT(" %s", GET_IPADDR_STRING(add_addr->u.v4.addr));

-                if (opt_len == 10)
+                if (opt_len == 10 || opt_len == 18)

                         ND_PRINT(":%u", GET_BE_U_2(add_addr->u.v4.port));
                         ND_PRINT(":%u", GET_BE_U_2(add_addr->u.v4.port));

-                break;
-        case 6:
+                if (opt_len == 16)
+                        ND_PRINT(" hmac 0x%" PRIx64, GET_BE_U_8(add_addr->u.v4np.mac));
+                if (opt_len == 18)
+                        ND_PRINT(" hmac 0x%" PRIx64, GET_BE_U_8(add_addr->u.v4.mac));
+        }
+
+        if (opt_len == 20 || opt_len == 22 || opt_len == 28 || opt_len == 30) {

                 ND_PRINT(" %s", GET_IP6ADDR_STRING(add_addr->u.v6.addr));
                 ND_PRINT(" %s", GET_IP6ADDR_STRING(add_addr->u.v6.addr));

-                if (opt_len == 22)
+                if (opt_len == 22 || opt_len == 30)

                         ND_PRINT(":%u", GET_BE_U_2(add_addr->u.v6.port));
                         ND_PRINT(":%u", GET_BE_U_2(add_addr->u.v6.port));

-                break;
-        default:
-                return 0;
+                if (opt_len == 28)
+                        ND_PRINT(" hmac 0x%" PRIx64, GET_BE_U_8(add_addr->u.v6np.mac));
+                if (opt_len == 30)
+                        ND_PRINT(" hmac 0x%" PRIx64, GET_BE_U_8(add_addr->u.v6.mac));

         }
 
         return 1;
         }
 
         return 1;


@@ -443,7 +475,7 @@ mptcp_print(netdissect_options *ndo,
 
         opt = (const struct mptcp_option *) cp;
         ND_TCHECK_SIZE(opt);
 
         opt = (const struct mptcp_option *) cp;
         ND_TCHECK_SIZE(opt);

-        subtype = min(MPTCP_OPT_SUBTYPE(opt->sub_etc), MPTCP_SUB_FCLOSE + 1);
+        subtype = ND_MIN(MPTCP_OPT_SUBTYPE(opt->sub_etc), MPTCP_SUB_FCLOSE + 1);

 
         ND_PRINT(" %s", mptcp_options[subtype].name);
         return mptcp_options[subtype].print(ndo, cp, len, flags);
 
         ND_PRINT(" %s", mptcp_options[subtype].name);
         return mptcp_options[subtype].print(ndo, cp, len, flags);