Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-openflow-1.0.c

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index 95a93a99e21e2b654c8c2f2dc3cd869ec541bc6f..73a9fd88e5e7483e5ce175b0e4a01300afc11453 100644 (file)
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -51,10 +51,14 @@
 #include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"

+#include "ether.h"

 #include "ethertype.h"
 #include "ipproto.h"
 #include "openflow.h"
 
 #include "ethertype.h"
 #include "ipproto.h"
 #include "openflow.h"
 

+static const char tstr[] = " [|openflow]";
+static const char cstr[] = " (corrupt)";
+

 #define OFPT_HELLO                    0x00
 #define OFPT_ERROR                    0x01
 #define OFPT_ECHO_REQUEST             0x02
 #define OFPT_HELLO                    0x00
 #define OFPT_ERROR                    0x01
 #define OFPT_ECHO_REQUEST             0x02


@@ -573,7 +577,6 @@ static const struct tok empty_str[] = {
 #define OFP_MAX_PORT_NAME_LEN      16
 #define DESC_STR_LEN              256
 #define SERIAL_NUM_LEN             32
 #define OFP_MAX_PORT_NAME_LEN      16
 #define DESC_STR_LEN              256
 #define SERIAL_NUM_LEN             32

-#define OFP_ETH_ALEN                6

 #define OFP_VLAN_NONE          0xffff
 
 static const char *
 #define OFP_VLAN_NONE          0xffff
 
 static const char *


@@ -623,7 +626,7 @@ of10_data_print(const u_char *cp, const u_char *ep, const u_int len) {
        return cp + len;
 
 trunc:
        return cp + len;
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -640,11 +643,11 @@ of10_vendor_data_print(const u_char *cp, const u_char *ep, const u_int len) {
        return of10_data_print(cp, ep, len - 4);
 
 corrupt: /* skip the undersized data */
        return of10_data_print(cp, ep, len - 4);
 
 corrupt: /* skip the undersized data */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp, len);
        return cp + len;
 trunc:
        TCHECK2(*cp, len);
        return cp + len;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -664,7 +667,7 @@ of10_packet_data_print(const u_char *cp, const u_char *ep, const u_int len) {
        return cp + len;
 
 trunc:
        return cp + len;
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -682,9 +685,9 @@ of10_phy_ports_print(const u_char *cp, const u_char *ep, u_int len) {
                printf("\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp)));
                cp += 2;
                /* hw_addr */
                printf("\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp)));
                cp += 2;
                /* hw_addr */

-               TCHECK2(*cp, OFP_ETH_ALEN);
+               TCHECK2(*cp, ETHER_ADDR_LEN);

                printf(", hw_addr %s", etheraddr_string(cp));
                printf(", hw_addr %s", etheraddr_string(cp));

-               cp += OFP_ETH_ALEN;
+               cp += ETHER_ADDR_LEN;

                /* name */
                TCHECK2(*cp, OFP_MAX_PORT_NAME_LEN);
                printf(", name '");
                /* name */
                TCHECK2(*cp, OFP_MAX_PORT_NAME_LEN);
                printf(", name '");


@@ -733,11 +736,11 @@ next_port:
        return cp;
 
 corrupt: /* skip the undersized trailing data */
        return cp;
 
 corrupt: /* skip the undersized trailing data */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -807,11 +810,11 @@ next_property:
        return cp;
 
 corrupt: /* skip the rest of queue properties */
        return cp;
 
 corrupt: /* skip the rest of queue properties */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -853,11 +856,11 @@ next_queue:
        return cp;
 
 corrupt: /* skip the rest of queues */
        return cp;
 
 corrupt: /* skip the rest of queues */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -882,15 +885,15 @@ of10_match_print(const char *pfx, const u_char *cp, const u_char *ep) {
                printf("%smatch in_port %s", pfx, tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp)));
        cp += 2;
        /* dl_src */
                printf("%smatch in_port %s", pfx, tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp)));
        cp += 2;
        /* dl_src */

-       TCHECK2(*cp, OFP_ETH_ALEN);
+       TCHECK2(*cp, ETHER_ADDR_LEN);

        if (! (wildcards & OFPFW_DL_SRC))
                printf("%smatch dl_src %s", pfx, etheraddr_string(cp));
        if (! (wildcards & OFPFW_DL_SRC))
                printf("%smatch dl_src %s", pfx, etheraddr_string(cp));

-       cp += OFP_ETH_ALEN;
+       cp += ETHER_ADDR_LEN;

        /* dl_dst */
        /* dl_dst */

-       TCHECK2(*cp, OFP_ETH_ALEN);
+       TCHECK2(*cp, ETHER_ADDR_LEN);

        if (! (wildcards & OFPFW_DL_DST))
                printf("%smatch dl_dst %s", pfx, etheraddr_string(cp));
        if (! (wildcards & OFPFW_DL_DST))
                printf("%smatch dl_dst %s", pfx, etheraddr_string(cp));

-       cp += OFP_ETH_ALEN;
+       cp += ETHER_ADDR_LEN;

        /* dl_vlan */
        TCHECK2(*cp, 2);
        if (! (wildcards & OFPFW_DL_VLAN))
        /* dl_vlan */
        TCHECK2(*cp, 2);
        if (! (wildcards & OFPFW_DL_VLAN))


@@ -959,7 +962,7 @@ of10_match_print(const char *pfx, const u_char *cp, const u_char *ep) {
        return cp + 2;
 
 trunc:
        return cp + 2;
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1058,9 +1061,9 @@ of10_actions_print(const char *pfx, const u_char *cp, const u_char *ep,
                case OFPAT_SET_DL_SRC:
                case OFPAT_SET_DL_DST:
                        /* dl_addr */
                case OFPAT_SET_DL_SRC:
                case OFPAT_SET_DL_DST:
                        /* dl_addr */

-                       TCHECK2(*cp, OFP_ETH_ALEN);
+                       TCHECK2(*cp, ETHER_ADDR_LEN);

                        printf(", dl_addr %s", etheraddr_string(cp));
                        printf(", dl_addr %s", etheraddr_string(cp));

-                       cp += OFP_ETH_ALEN;
+                       cp += ETHER_ADDR_LEN;

                        /* pad */
                        TCHECK2(*cp, 6);
                        cp += 6;
                        /* pad */
                        TCHECK2(*cp, 6);
                        cp += 6;


@@ -1120,11 +1123,11 @@ next_action:
        return cp;
 
 corrupt: /* skip the rest of actions */
        return cp;
 
 corrupt: /* skip the rest of actions */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1160,7 +1163,7 @@ of10_features_reply_print(const u_char *cp, const u_char *ep, const u_int len) {
        return of10_phy_ports_print(cp, ep, len - OF_SWITCH_FEATURES_LEN);
 
 trunc:
        return of10_phy_ports_print(cp, ep, len - OF_SWITCH_FEATURES_LEN);
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1216,7 +1219,7 @@ of10_flow_mod_print(const u_char *cp, const u_char *ep, const u_int len) {
        return of10_actions_print("\n\t ", cp, ep, len - OF_FLOW_MOD_LEN);
 
 trunc:
        return of10_actions_print("\n\t ", cp, ep, len - OF_FLOW_MOD_LEN);
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1228,9 +1231,9 @@ of10_port_mod_print(const u_char *cp, const u_char *ep) {
        printf("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp)));
        cp += 2;
        /* hw_addr */
        printf("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp)));
        cp += 2;
        /* hw_addr */

-       TCHECK2(*cp, OFP_ETH_ALEN);
+       TCHECK2(*cp, ETHER_ADDR_LEN);

        printf(", hw_addr %s", etheraddr_string(cp));
        printf(", hw_addr %s", etheraddr_string(cp));

-       cp += OFP_ETH_ALEN;
+       cp += ETHER_ADDR_LEN;

        /* config */
        TCHECK2(*cp, 4);
        printf("\n\t config 0x%08x", EXTRACT_32BITS(cp));
        /* config */
        TCHECK2(*cp, 4);
        printf("\n\t config 0x%08x", EXTRACT_32BITS(cp));


@@ -1251,7 +1254,7 @@ of10_port_mod_print(const u_char *cp, const u_char *ep) {
        return cp + 4;
 
 trunc:
        return cp + 4;
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1329,11 +1332,11 @@ of10_stats_request_print(const u_char *cp, const u_char *ep, u_int len) {
        return cp;
 
 corrupt: /* skip the message body */
        return cp;
 
 corrupt: /* skip the message body */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1374,11 +1377,11 @@ of10_desc_stats_reply_print(const u_char *cp, const u_char *ep, const u_int len)
        return cp + DESC_STR_LEN;
 
 corrupt: /* skip the message body */
        return cp + DESC_STR_LEN;
 
 corrupt: /* skip the message body */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp, len);
        return cp + len;
 trunc:
        TCHECK2(*cp, len);
        return cp + len;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1453,11 +1456,11 @@ of10_flow_stats_reply_print(const u_char *cp, const u_char *ep, u_int len) {
        return cp;
 
 corrupt: /* skip the rest of flow statistics entries */
        return cp;
 
 corrupt: /* skip the rest of flow statistics entries */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1484,11 +1487,11 @@ of10_aggregate_stats_reply_print(const u_char *cp, const u_char *ep,
        return cp + 4;
 
 corrupt: /* skip the message body */
        return cp + 4;
 
 corrupt: /* skip the message body */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp, len);
        return cp + len;
 trunc:
        TCHECK2(*cp, len);
        return cp + len;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1541,11 +1544,11 @@ of10_table_stats_reply_print(const u_char *cp, const u_char *ep, u_int len) {
        return cp;
 
 corrupt: /* skip the undersized trailing data */
        return cp;
 
 corrupt: /* skip the undersized trailing data */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1624,11 +1627,11 @@ next_port:
        return cp;
 
 corrupt: /* skip the undersized trailing data */
        return cp;
 
 corrupt: /* skip the undersized trailing data */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1670,11 +1673,11 @@ of10_queue_stats_reply_print(const u_char *cp, const u_char *ep, u_int len) {
        return cp;
 
 corrupt: /* skip the undersized trailing data */
        return cp;
 
 corrupt: /* skip the undersized trailing data */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1712,7 +1715,7 @@ of10_stats_reply_print(const u_char *cp, const u_char *ep, const u_int len) {
        return cp0 + len;
 
 trunc:
        return cp0 + len;
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1744,11 +1747,11 @@ of10_packet_out_print(const u_char *cp, const u_char *ep, const u_int len) {
        return of10_packet_data_print(cp, ep, len - OF_PACKET_OUT_LEN - actions_len);
 
 corrupt: /* skip the rest of the message body */
        return of10_packet_data_print(cp, ep, len - OF_PACKET_OUT_LEN - actions_len);
 
 corrupt: /* skip the rest of the message body */

-       printf(" (corrupt)");
+       printf("%s", cstr);

        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1779,7 +1782,7 @@ of10_packet_in_print(const u_char *cp, const u_char *ep, const u_int len) {
        return of10_packet_data_print(cp, ep, len - (OF_PACKET_IN_LEN - 2));
 
 trunc:
        return of10_packet_data_print(cp, ep, len - (OF_PACKET_IN_LEN - 2));
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1831,7 +1834,7 @@ of10_flow_removed_print(const u_char *cp, const u_char *ep) {
        return cp + 8;
 
 trunc:
        return cp + 8;
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -1862,7 +1865,7 @@ of10_error_print(const u_char *cp, const u_char *ep, const u_int len) {
        return of10_data_print(cp, ep, len - OF_ERROR_MSG_LEN);
 
 trunc:
        return of10_data_print(cp, ep, len - OF_ERROR_MSG_LEN);
 
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
 
        return ep;
 }
 


@@ -2039,11 +2042,11 @@ of10_header_body_print(const u_char *cp, const u_char *ep, const uint8_t type,
        goto next_message;
 
 corrupt: /* skip the message body */
        goto next_message;
 
 corrupt: /* skip the message body */

-       printf(" (corrupt)");
+       printf("%s", cstr);

 next_message:
        TCHECK2(*cp0, len0 - OF_HEADER_LEN);
        return cp0 + len0 - OF_HEADER_LEN;
 trunc:
 next_message:
        TCHECK2(*cp0, len0 - OF_HEADER_LEN);
        return cp0 + len0 - OF_HEADER_LEN;
 trunc:

-       printf(" [|openflow]");
+       printf("%s", tstr);

        return ep;
 }
        return ep;
 }