NDOize OpenFlow, IEEE slow and telnet decoders

1 files changed, 19 insertions, 18 deletions

diff --git a/print-openflow.c b/print-openflow.c
index d37f7ba3..9a675855 100644
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -30,6 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -46,15 +47,15 @@ static const char cstr[] = " (corrupt)";
 #define OF_VER_1_0    0x01
 
 static void
-of_header_print(const uint8_t version, const uint8_t type,
+of_header_print(netdissect_options *ndo, const uint8_t version, const uint8_t type,
                       const uint16_t length, const uint32_t xid) {
-	printf("\n\tversion unknown (0x%02x), type 0x%02x, length %u, xid 0x%08x",
-	       version, type, length, xid);
+	ND_PRINT((ndo, "\n\tversion unknown (0x%02x), type 0x%02x, length %u, xid 0x%08x",
+	       version, type, length, xid));
 }
 
 /* Print a single OpenFlow message. */
 static const u_char *
-of_header_body_print(const u_char *cp, const u_char *ep) {
+of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
 	uint8_t version, type;
 	uint16_t length;
 	uint32_t xid;
@@ -62,19 +63,19 @@ of_header_body_print(const u_char *cp, const u_char *ep) {
 	if (ep < cp + OF_HEADER_LEN)
 		goto corrupt;
 	/* version */
-	TCHECK2(*cp, 1);
+	ND_TCHECK2(*cp, 1);
 	version = *cp;
 	cp += 1;
 	/* type */
-	TCHECK2(*cp, 1);
+	ND_TCHECK2(*cp, 1);
 	type = *cp;
 	cp += 1;
 	/* length */
-	TCHECK2(*cp, 2);
+	ND_TCHECK2(*cp, 2);
 	length = EXTRACT_16BITS(cp);
 	cp += 2;
 	/* xid */
-	TCHECK2(*cp, 4);
+	ND_TCHECK2(*cp, 4);
 	xid = EXTRACT_32BITS(cp);
 	cp += 4;
 	/* Message length includes the header length and a message always includes
@@ -83,36 +84,36 @@ of_header_body_print(const u_char *cp, const u_char *ep) {
 	 * message as possible even when it does not end within the current TCP
 	 * segment. */
 	if (length < OF_HEADER_LEN) {
-		of_header_print(version, type, length, xid);
+		of_header_print(ndo, version, type, length, xid);
 		goto corrupt;
 	}
 	/* Decode known protocol versions further without printing the header (the
 	 * type decoding is version-specific. */
 	switch (version) {
 	case OF_VER_1_0:
-		return of10_header_body_print(cp, ep, type, length, xid);
+		return of10_header_body_print(ndo, cp, ep, type, length, xid);
 	default:
-		of_header_print(version, type, length, xid);
-		TCHECK2(*cp, length - OF_HEADER_LEN);
+		of_header_print(ndo, version, type, length, xid);
+		ND_TCHECK2(*cp, length - OF_HEADER_LEN);
 		return cp + length - OF_HEADER_LEN; /* done with current message */
 	}
 
 corrupt: /* fail current packet */
-	printf("%s", cstr);
-	TCHECK2(*cp, ep - cp);
+	ND_PRINT((ndo, "%s", cstr));
+	ND_TCHECK2(*cp, ep - cp);
 	return ep;
 trunc:
-	printf("%s", tstr);
+	ND_PRINT((ndo, "%s", tstr));
 	return ep;
 }
 
 /* Print a TCP segment worth of OpenFlow messages presuming the segment begins
  * on a message boundary. */
 void
-openflow_print(const u_char *cp, const u_int len) {
+openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len) {
 	const u_char *ep = cp + len;
 
-	printf(": OpenFlow");
+	ND_PRINT((ndo, ": OpenFlow"));
 	while (cp < ep)
-		cp = of_header_body_print(cp, ep);
+		cp = of_header_body_print(ndo, cp, ep);
 }