Merge pull request #760 from leres/master

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index f3c1a8329d992def11c57c4a637e96ecbf815ce8..636663365548927dfafd26bacfdc7afb7dc4a6ac 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -85,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);
                goto invalid;
        /* version */
        ND_TCHECK_1(cp);

-       version = EXTRACT_U_1(cp);
+       version = GET_U_1(cp);

        cp += 1;
        /* type */
        ND_TCHECK_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);
        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);
        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
        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


@@ -120,7 +120,7 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
        }
 
 invalid: /* fail current packet */
        }
 
 invalid: /* fail current packet */

-       ND_PRINT("%s", istr);
+       nd_print_invalid(ndo);

        ND_TCHECK_LEN(cp, ep - cp);
        return ep;
 trunc:
        ND_TCHECK_LEN(cp, ep - cp);
        return ep;
 trunc: