X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ec799d60f6cd3f41041b57efe3963c28dda94d4a..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-rrcp.c

diff --git a/print-rrcp.c b/print-rrcp.c
index 961fb873..1d76613d 100644
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -21,28 +21,34 @@
  * and Realtek Echo Protocol (RRCP-REP) packets.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rrcp.c,v 1.2 2008-04-11 17:21:34 gianluca Exp $";
-#endif
+/* \summary: Realtek Remote Control Protocol (RRCP) printer */
+
+/*
+ * See, for example, section 8.20 "Realtek Remote Control Protocol" of
+ *
+ *    http://realtek.info/pdf/rtl8324.pdf
+ *
+ * and section 7.22 "Realtek Remote Control Protocol" of
+ *
+ *    http://realtek.info/pdf/rtl8326.pdf
+ *
+ * and this page on the OpenRRCP Wiki:
+ *
+ *    http://openrrcp.org.ru/wiki/rrcp_protocol
+ *
+ * NOTE: none of them indicate the byte order of multi-byte fields in any
+ * obvious fashion.
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
-#include "ether.h"
-
-#ifndef ETH_ALEN 
-#define ETH_ALEN 6
-#endif
 
 #define RRCP_OPCODE_MASK	0x7F	/* 0x00 = hello, 0x01 = get, 0x02 = set */
 #define RRCP_ISREPLY		0x80	/* 0 = request to switch, 0x80 = reply from switch */
@@ -82,62 +88,59 @@ static const struct tok opcode_values[] = {
  */
 void
 rrcp_print(netdissect_options *ndo,
-	  register const u_char *cp,
-	  u_int length _U_)
+	  const u_char *cp,
+	  u_int length _U_,
+	  const struct lladdr_info *src,
+	  const struct lladdr_info *dst)
 {
-	const u_char *rrcp;
-	u_int8_t rrcp_proto;
-	u_int8_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;
-
-	ND_TCHECK(*(rrcp + RRCP_PROTO_OFFSET));
-	rrcp_proto = *(rrcp + RRCP_PROTO_OFFSET);
-	ND_TCHECK(*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET));
-	rrcp_opcode = (*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
-        ND_PRINT((ndo, "%s > %s, %s %s",
-		etheraddr_string(ESRC(ep)),
-		etheraddr_string(EDST(ep)),
-		tok2strbuf(proto_values,"RRCP-0x%02d",rrcp_proto,proto_str,sizeof(proto_str)),
-		((*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query"));
+	uint8_t rrcp_proto;
+	uint8_t rrcp_opcode;
+
+	ndo->ndo_protocol = "rrcp";
+	ND_TCHECK_1(cp + RRCP_PROTO_OFFSET);
+	rrcp_proto = EXTRACT_U_1(cp + RRCP_PROTO_OFFSET);
+	ND_TCHECK_1(cp + RRCP_OPCODE_ISREPLY_OFFSET);
+	rrcp_opcode = EXTRACT_U_1((cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
+	if (src != NULL && dst != NULL) {
+		ND_PRINT("%s > %s, ",
+			(src->addr_string)(ndo, src->addr),
+			(dst->addr_string)(ndo, dst->addr));
+	}
+	ND_PRINT("%s %s",
+		tok2str(proto_values,"RRCP-0x%02x",rrcp_proto),
+		((EXTRACT_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query");
 	if (rrcp_proto==1){
-    	    ND_PRINT((ndo, ": %s",
-		     tok2strbuf(opcode_values,"unknown opcode (0x%02d)",rrcp_opcode,opcode_str,sizeof(opcode_str))));
+    	    ND_PRINT(": %s",
+		     tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode));
 	}
 	if (rrcp_opcode==1 || rrcp_opcode==2){
-	    ND_TCHECK2(*(rrcp + RRCP_REG_ADDR_OFFSET), 6);
-    	    ND_PRINT((ndo, " addr=0x%04x, data=0x%08x",
-		     EXTRACT_16BITS(rrcp + RRCP_REG_ADDR_OFFSET),
-		     EXTRACT_32BITS(rrcp + RRCP_REG_DATA_OFFSET)));
+	    ND_TCHECK_6(cp + RRCP_REG_ADDR_OFFSET);
+    	    ND_PRINT(" addr=0x%04x, data=0x%08x",
+		     EXTRACT_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
+		     EXTRACT_LE_U_4(cp + RRCP_REG_DATA_OFFSET));
 	}
 	if (rrcp_proto==1){
-	    ND_TCHECK2(*(rrcp + RRCP_AUTHKEY_OFFSET), 2);
-    	    ND_PRINT((ndo, ", auth=0x%04x",
-		  EXTRACT_16BITS(rrcp + RRCP_AUTHKEY_OFFSET)));
+	    ND_TCHECK_2(cp + RRCP_AUTHKEY_OFFSET);
+    	    ND_PRINT(", auth=0x%04x",
+		  EXTRACT_BE_U_2(cp + RRCP_AUTHKEY_OFFSET));
 	}
 	if (rrcp_proto==1 && rrcp_opcode==0 &&
-	     ((*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){
-	    ND_TCHECK2(*(rrcp + RRCP_VENDOR_ID_OFFSET), 4);
-	    ND_PRINT((ndo, " downlink_port=%d, uplink_port=%d, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",
-		     *(rrcp + RRCP_DOWNLINK_PORT_OFFSET),
-		     *(rrcp + RRCP_UPLINK_PORT_OFFSET),
-		     etheraddr_string(rrcp + RRCP_UPLINK_MAC_OFFSET),
-		     EXTRACT_32BITS(rrcp + RRCP_VENDOR_ID_OFFSET),
-		     EXTRACT_16BITS(rrcp + RRCP_CHIP_ID_OFFSET)));
+	     ((EXTRACT_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){
+	    ND_TCHECK_4(cp + RRCP_VENDOR_ID_OFFSET);
+	    ND_PRINT(" downlink_port=%u, uplink_port=%u, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",
+		     EXTRACT_U_1(cp + RRCP_DOWNLINK_PORT_OFFSET),
+		     EXTRACT_U_1(cp + RRCP_UPLINK_PORT_OFFSET),
+		     etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_OFFSET),
+		     EXTRACT_BE_U_4(cp + RRCP_VENDOR_ID_OFFSET),
+		     EXTRACT_BE_U_2(cp + RRCP_CHIP_ID_OFFSET));
 	}else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){
-	    ND_TCHECK2(*(rrcp + RRCP_COOKIE2_OFFSET), 4);
-	    ND_PRINT((ndo, ", cookie=0x%08x%08x ",
-		    EXTRACT_32BITS(rrcp + RRCP_COOKIE2_OFFSET),
-		    EXTRACT_32BITS(rrcp + RRCP_COOKIE1_OFFSET)));
+	    ND_TCHECK_4(cp + RRCP_COOKIE2_OFFSET);
+	    ND_PRINT(", cookie=0x%08x%08x ",
+		    EXTRACT_BE_U_4(cp + RRCP_COOKIE2_OFFSET),
+		    EXTRACT_BE_U_4(cp + RRCP_COOKIE1_OFFSET));
 	}
-        if (!ndo->ndo_vflag)
-            return;
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|rrcp]"));
+	nd_print_trunc(ndo);
 }