X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bbedebc666a341d8e14922dce37a92766400c798..refs/pull/482/head:/print-rrcp.c

diff --git a/print-rrcp.c b/print-rrcp.c
index 7c6ca25f..31551475 100644
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -21,14 +21,13 @@
  * and Realtek Echo Protocol (RRCP-REP) packets.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "ether.h"
@@ -75,11 +74,9 @@ rrcp_print(netdissect_options *ndo,
 	  u_int length _U_)
 {
 	const u_char *rrcp;
-	u_int8_t rrcp_proto;
-	u_int8_t rrcp_opcode;
+	uint8_t rrcp_proto;
+	uint8_t rrcp_opcode;
 	register const struct ether_header *ep;
-	char proto_str[16];
-	char opcode_str[32];
 
 	ep = (const struct ether_header *)cp;
 	rrcp = cp + ETHER_HDRLEN;
@@ -91,11 +88,11 @@ rrcp_print(netdissect_options *ndo,
         ND_PRINT((ndo, "%s > %s, %s %s",
 		etheraddr_string(ndo, ESRC(ep)),
 		etheraddr_string(ndo, EDST(ep)),
-		tok2strbuf(proto_values,"RRCP-0x%02x",rrcp_proto,proto_str,sizeof(proto_str)),
+		tok2str(proto_values,"RRCP-0x%02x",rrcp_proto),
 		((*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query"));
 	if (rrcp_proto==1){
     	    ND_PRINT((ndo, ": %s",
-		     tok2strbuf(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode,opcode_str,sizeof(opcode_str))));
+		     tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode)));
 	}
 	if (rrcp_opcode==1 || rrcp_opcode==2){
 	    ND_TCHECK2(*(rrcp + RRCP_REG_ADDR_OFFSET), 6);