diff options
Diffstat (limited to 'print-rrcp.c')
| -rw-r--r-- | print-rrcp.c | 86 |
1 files changed, 36 insertions, 50 deletions
diff --git a/print-rrcp.c b/print-rrcp.c index c5b1fdd..936b3ea 100644 --- a/print-rrcp.c +++ b/print-rrcp.c @@ -21,29 +21,19 @@ * 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 */ #ifdef HAVE_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 */ @@ -83,59 +73,55 @@ static const struct tok opcode_values[] = { void rrcp_print(netdissect_options *ndo, register const u_char *cp, - u_int length _U_) + 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%02x",rrcp_proto,proto_str,sizeof(proto_str)), - ((*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query")); + uint8_t rrcp_proto; + uint8_t rrcp_opcode; + + ND_TCHECK(*(cp + RRCP_PROTO_OFFSET)); + rrcp_proto = *(cp + RRCP_PROTO_OFFSET); + ND_TCHECK(*(cp + RRCP_OPCODE_ISREPLY_OFFSET)); + rrcp_opcode = (*(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK; + if (src != NULL && dst != NULL) { + ND_PRINT((ndo, "%s > %s, ", + (src->addr_string)(ndo, src->addr), + (dst->addr_string)(ndo, dst->addr))); + } + ND_PRINT((ndo, "%s %s", + tok2str(proto_values,"RRCP-0x%02x",rrcp_proto), + ((*(cp + 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); + ND_TCHECK2(*(cp + RRCP_REG_ADDR_OFFSET), 6); ND_PRINT((ndo, " addr=0x%04x, data=0x%08x", - EXTRACT_LE_16BITS(rrcp + RRCP_REG_ADDR_OFFSET), - EXTRACT_LE_32BITS(rrcp + RRCP_REG_DATA_OFFSET))); + EXTRACT_LE_16BITS(cp + RRCP_REG_ADDR_OFFSET), + EXTRACT_LE_32BITS(cp + RRCP_REG_DATA_OFFSET))); } if (rrcp_proto==1){ - ND_TCHECK2(*(rrcp + RRCP_AUTHKEY_OFFSET), 2); + ND_TCHECK2(*(cp + RRCP_AUTHKEY_OFFSET), 2); ND_PRINT((ndo, ", auth=0x%04x", - EXTRACT_16BITS(rrcp + RRCP_AUTHKEY_OFFSET))); + EXTRACT_16BITS(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); + ((*(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){ + ND_TCHECK2(*(cp + 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))); + *(cp + RRCP_DOWNLINK_PORT_OFFSET), + *(cp + RRCP_UPLINK_PORT_OFFSET), + etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_OFFSET), + EXTRACT_32BITS(cp + RRCP_VENDOR_ID_OFFSET), + EXTRACT_16BITS(cp + RRCP_CHIP_ID_OFFSET))); }else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){ - ND_TCHECK2(*(rrcp + RRCP_COOKIE2_OFFSET), 4); + ND_TCHECK2(*(cp + RRCP_COOKIE2_OFFSET), 4); ND_PRINT((ndo, ", cookie=0x%08x%08x ", - EXTRACT_32BITS(rrcp + RRCP_COOKIE2_OFFSET), - EXTRACT_32BITS(rrcp + RRCP_COOKIE1_OFFSET))); + EXTRACT_32BITS(cp + RRCP_COOKIE2_OFFSET), + EXTRACT_32BITS(cp + RRCP_COOKIE1_OFFSET))); } - if (!ndo->ndo_vflag) - return; return; trunc: |