Handle rpcaps:// URLs as well, for rpcap-over-TLS.

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index b18a72d432c30c096bdec5d657d483b708137153..8a912063b8820d022a62684378b13c2e44aedf54 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
 
@@ -121,22 +120,21 @@ 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;
 }
 
 /* Print a TCP segment worth of OpenFlow messages presuming the segment begins
  * on a message boundary. */
 void
-openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len)
+openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len _U_)
 {
-       const u_char *ep = cp + len;
-
+       ndo->ndo_protocol = "openflow";
        ND_PRINT(": OpenFlow");
-       while (cp < ep)
-               cp = of_header_body_print(ndo, cp, ep);
+       while (cp < ndo->ndo_snapend)
+               cp = of_header_body_print(ndo, cp, ndo->ndo_snapend);
 }