Merge pull request #760 from leres/master

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index ee972cfe6b8de3d4101efab5420fb1c58627dbde..636663365548927dfafd26bacfdc7afb7dc4a6ac 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -43,7 +43,6 @@
 #include "openflow.h"
 #include "oui.h"
 
-static const char tstr[] = " [|openflow]";
 
 #define OF_VER_1_0    0x01
 
@@ -86,19 +85,19 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
                goto invalid;
        /* version */
        ND_TCHECK_1(cp);
-       version = EXTRACT_U_1(cp);
+       version = GET_U_1(cp);
        cp += 1;
        /* type */
        ND_TCHECK_1(cp);
-       type = EXTRACT_U_1(cp);
+       type = GET_U_1(cp);
        cp += 1;
        /* length */
        ND_TCHECK_2(cp);
-       length = EXTRACT_BE_U_2(cp);
+       length = GET_BE_U_2(cp);
        cp += 2;
        /* xid */
        ND_TCHECK_4(cp);
-       xid = EXTRACT_BE_U_4(cp);
+       xid = GET_BE_U_4(cp);
        cp += 4;
        /* Message length includes the header length and a message always includes
         * the basic header. A message length underrun fails decoding of the rest of
@@ -121,11 +120,11 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
        }
 
 invalid: /* fail current packet */
-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);
        ND_TCHECK_LEN(cp, ep - cp);
        return ep;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -134,6 +133,7 @@ trunc:
 void
 openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len _U_)
 {
+       ndo->ndo_protocol = "openflow";
        ND_PRINT(": OpenFlow");
        while (cp < ndo->ndo_snapend)
                cp = of_header_body_print(ndo, cp, ndo->ndo_snapend);