diff options
| author | delphij <delphij@FreeBSD.org> | 2015-01-07 19:55:18 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-01-07 19:55:18 +0000 |
| commit | f49c5d523af9076a4a59e8dd664f9a897108432e (patch) | |
| tree | e268839e08c106e178b33bd461d8d0a9c6fb5ad9 /contrib/tcpdump/print-rrcp.c | |
| parent | c371846049d370ab78d943e60e789cdffe0aad3d (diff) | |
| parent | 08263d19579d35a7a65e0c8bcb768504ce76d04e (diff) | |
| download | FreeBSD-src-f49c5d523af9076a4a59e8dd664f9a897108432e.zip FreeBSD-src-f49c5d523af9076a4a59e8dd664f9a897108432e.tar.gz | |
MFV r276761: tcpdump 4.6.2.
MFC after: 1 month
Diffstat (limited to 'contrib/tcpdump/print-rrcp.c')
| -rw-r--r-- | contrib/tcpdump/print-rrcp.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/contrib/tcpdump/print-rrcp.c b/contrib/tcpdump/print-rrcp.c index c5b1fdd..2370d9c 100644 --- a/contrib/tcpdump/print-rrcp.c +++ b/contrib/tcpdump/print-rrcp.c @@ -21,29 +21,18 @@ * 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 - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include <tcpdump-stdinc.h> -#include <stdio.h> -#include <string.h> - -#include "netdissect.h" +#include "interface.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 */ @@ -86,8 +75,8 @@ 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]; @@ -100,8 +89,8 @@ rrcp_print(netdissect_options *ndo, 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)), + etheraddr_string(ndo, ESRC(ep)), + etheraddr_string(ndo, EDST(ep)), tok2strbuf(proto_values,"RRCP-0x%02x",rrcp_proto,proto_str,sizeof(proto_str)), ((*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query")); if (rrcp_proto==1){ @@ -125,7 +114,7 @@ rrcp_print(netdissect_options *ndo, 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), + etheraddr_string(ndo, rrcp + RRCP_UPLINK_MAC_OFFSET), EXTRACT_32BITS(rrcp + RRCP_VENDOR_ID_OFFSET), EXTRACT_16BITS(rrcp + RRCP_CHIP_ID_OFFSET))); }else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){ @@ -134,8 +123,6 @@ rrcp_print(netdissect_options *ndo, EXTRACT_32BITS(rrcp + RRCP_COOKIE2_OFFSET), EXTRACT_32BITS(rrcp + RRCP_COOKIE1_OFFSET))); } - if (!ndo->ndo_vflag) - return; return; trunc: |
