mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-12-01 05:53:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
3c8f3e13b0
tcpdump/print-rrcp.c

147 lines
5.0 KiB
C
Raw Normal View History

From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
/*
* Copyright (c) 2007 - Andrey "nording" Chernyak <andrew@nording.ru>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code distributions
* retain the above copyright notice and this paragraph in its entirety, (2)
* distributions including binary code include the above copyright notice and
* this paragraph in its entirety in the documentation or other materials
* provided with the distribution, and (3) all advertising materials mentioning
* features or use of this software display the following acknowledgement:
* ``This product includes software developed by the University of California,
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
* the University nor the names of its contributors may be used to endorse
* or promote products derived from this software without specific prior
* written permission.
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* Format and print Realtek Remote Control Protocol (RRCP)
* and Realtek Echo Protocol (RRCP-REP) packets.
*/
Move the printer summaries from INSTALL.txt to each printer with the tag '\summary:' for greping. Remark: Currently some printers have no summary line. Moreover: Summarize all printers with a single line in INSTALL.txt
2016-08-14 21:42:19 +08:00
/* \summary: Realtek Remote Control Protocol (RRCP) printer */
Point to some RRCP specifications.
2017-11-19 08:48:34 +08:00
/*
* 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.
*/
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Rename 'tcpdump-stdinc.h' to 'netdissect-stdinc.h' Get the full log via: git log --follow netdissect-stdinc.h
2015-09-10 04:42:38 +08:00
#include <netdissect-stdinc.h>
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
Printers must include 'netdissect.h', not 'interface.h'
2015-09-06 05:35:58 +08:00
#include "netdissect.h"
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
#include "addrtoname.h"
#include "extract.h"
#include "ether.h"
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
#define RRCP_OPCODE_MASK 0x7F /* 0x00 = hello, 0x01 = get, 0x02 = set */
#define RRCP_ISREPLY 0x80 /* 0 = request to switch, 0x80 = reply from switch */
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
#define RRCP_PROTO_OFFSET 0 /* proto - 1 byte, must be 1 */
#define RRCP_OPCODE_ISREPLY_OFFSET 1 /* opcode and isreply flag - 1 byte */
#define RRCP_AUTHKEY_OFFSET 2 /* authorization key - 2 bytes, 0x2379 by default */
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
/* most packets */
#define RRCP_REG_ADDR_OFFSET 4 /* register address - 2 bytes */
#define RRCP_REG_DATA_OFFSET 6 /* register data - 4 bytes */
#define RRCP_COOKIE1_OFFSET 10 /* 4 bytes */
#define RRCP_COOKIE2_OFFSET 14 /* 4 bytes */
/* hello reply packets */
#define RRCP_DOWNLINK_PORT_OFFSET 4 /* 1 byte */
#define RRCP_UPLINK_PORT_OFFSET 5 /* 1 byte */
#define RRCP_UPLINK_MAC_OFFSET 6 /* 6 byte MAC address */
#define RRCP_CHIP_ID_OFFSET 12 /* 2 bytes */
#define RRCP_VENDOR_ID_OFFSET 14 /* 4 bytes */
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
Use tok2strbuf() rather than doing it by hand (with potentially-unsafe routines). Thanks and a tip of the Hatlo hat to OpenBSD's linker for warning about that.
2009-10-12 03:49:05 +08:00
static const struct tok proto_values[] = {
{ 1, "RRCP" },
{ 2, "RRCP-REP" },
{ 0, NULL }
};
static const struct tok opcode_values[] = {
{ 0, "hello" },
{ 1, "get" },
{ 2, "set" },
{ 0, NULL }
};
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
/*
* Print RRCP requests
*/
void
rrcp_print(netdissect_options *ndo,
register const u_char *cp,
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
u_int length _U_,
const struct lladdr_info *src,
const struct lladdr_info *dst)
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
{
u_intN_t is dead, long live uintN_t. And, as we require at least autoconf 2.61, and as autoconf 2.61 and later have AC_TYPE_UINTn_T and AC_TYPE_INTn_T macros, we use them to define the uintN_t and intN_t macros if the system doesn't define them for us. This lets us get rid of bitypes.h as well.
2014-04-23 15:20:40 +08:00
uint8_t rrcp_proto;
uint8_t rrcp_opcode;
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
ND_TCHECK(*(cp + RRCP_PROTO_OFFSET));
Use more the EXTRACT_8BITS() macro to fetch a one-byte value (18/n) Assignment, *(p op e) Partial list.
2017-11-22 04:53:35 +08:00
rrcp_proto = EXTRACT_8BITS(cp + RRCP_PROTO_OFFSET);
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
ND_TCHECK(*(cp + RRCP_OPCODE_ISREPLY_OFFSET));
Use more the EXTRACT_8BITS() macro to fetch a one-byte value (15/n) Assignment, one operator (step 2). (*e1) op e2
2017-11-22 01:12:03 +08:00
rrcp_opcode = EXTRACT_8BITS((cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
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",
refine tok2str() buffer use Switch RRCP and BGP functions from tok2strbuf() to tok2str() to avoid unnecessary local buffer management. The latter function does it in a way to allow up to 4 calls to itself from printf(). After that tok2strbuf() remains used by tok2str() only and can be refined later. Remove a duplicate macro and place the remaining definition into the right file.
2015-06-29 22:53:06 +08:00
tok2str(proto_values,"RRCP-0x%02x",rrcp_proto),
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
((*(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query"));
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
if (rrcp_proto==1){
Use tok2strbuf() rather than doing it by hand (with potentially-unsafe routines). Thanks and a tip of the Hatlo hat to OpenBSD's linker for warning about that.
2009-10-12 03:49:05 +08:00
ND_PRINT((ndo, ": %s",
refine tok2str() buffer use Switch RRCP and BGP functions from tok2strbuf() to tok2str() to avoid unnecessary local buffer management. The latter function does it in a way to allow up to 4 calls to itself from printf(). After that tok2strbuf() remains used by tok2str() only and can be refined later. Remove a duplicate macro and place the remaining definition into the right file.
2015-06-29 22:53:06 +08:00
tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode)));
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
}
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
if (rrcp_opcode==1 || rrcp_opcode==2){
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
ND_TCHECK2(*(cp + RRCP_REG_ADDR_OFFSET), 6);
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
ND_PRINT((ndo, " addr=0x%04x, data=0x%08x",
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
EXTRACT_LE_16BITS(cp + RRCP_REG_ADDR_OFFSET),
EXTRACT_LE_32BITS(cp + RRCP_REG_DATA_OFFSET)));
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
}
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
if (rrcp_proto==1){
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
ND_TCHECK2(*(cp + RRCP_AUTHKEY_OFFSET), 2);
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
ND_PRINT((ndo, ", auth=0x%04x",
Rename EXTRACT_nBITS() macros to EXTRACT_BE_nBITS() It indicates clearly that these macros are used to extract big-endian integral values.
2017-11-18 18:52:52 +08:00
EXTRACT_BE_16BITS(cp + RRCP_AUTHKEY_OFFSET)));
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
}
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
if (rrcp_proto==1 && rrcp_opcode==0 &&
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
((*(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){
ND_TCHECK2(*(cp + RRCP_VENDOR_ID_OFFSET), 4);
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
ND_PRINT((ndo, " downlink_port=%d, uplink_port=%d, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
*(cp + RRCP_DOWNLINK_PORT_OFFSET),
*(cp + RRCP_UPLINK_PORT_OFFSET),
etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_OFFSET),
Rename EXTRACT_nBITS() macros to EXTRACT_BE_nBITS() It indicates clearly that these macros are used to extract big-endian integral values.
2017-11-18 18:52:52 +08:00
EXTRACT_BE_32BITS(cp + RRCP_VENDOR_ID_OFFSET),
EXTRACT_BE_16BITS(cp + RRCP_CHIP_ID_OFFSET)));
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
}else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){
CVE-2016-7985,7986/Change the way protocols print link-layer addresses. If a protocol that runs under a link-layer protocol would print the link-layer addresses for the packet as source and destination addresses for the packet, don't have it blithely assume those link-layer addresses are present or are at a particular offset from the beginning of that protocol's data; Ethertypes, for example, are used by a number of protocols, not all of which have Ethernet headers and not all of which have any MAC headers. Instead, pass the printers for those protocols structures with a pointer to the address data and a pointer to a routine that prints the address. Fixes some heap overflows found with American Fuzzy Lop by Hanno Böck.
2015-07-04 06:54:14 +08:00
ND_TCHECK2(*(cp + RRCP_COOKIE2_OFFSET), 4);
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
ND_PRINT((ndo, ", cookie=0x%08x%08x ",
Rename EXTRACT_nBITS() macros to EXTRACT_BE_nBITS() It indicates clearly that these macros are used to extract big-endian integral values.
2017-11-18 18:52:52 +08:00
EXTRACT_BE_32BITS(cp + RRCP_COOKIE2_OFFSET),
EXTRACT_BE_32BITS(cp + RRCP_COOKIE1_OFFSET)));
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
}
Add __attribute__((format)) to the declarations of the ndo_printf, ndo_error, and ndo_warning function pointers in a netdissect_options structure. Fix some errors adding that caught. Have the RRCP dissector extract fields itself, with the EXTRACT_ macros and a u_char pointer, rather than printing numbers from a structure which doesn't put structure members on natural boundaries (__attribute__((packed)) doesn't help, as not all compilers support it) - note also that not all processors support dereferencing unaligned pointers, e.g. SPARC - and assuming some fields are in the "right" byte order. Also have it check whether data is available in the packet before referring to it.
2009-05-25 05:06:10 +08:00
return;
trunc:
ND_PRINT((ndo, "[|rrcp]"));
From Andrew Silent: Realtek Remote Control Protocol support (see OpenRRCP.org.ru for details).
2008-02-06 18:47:53 +08:00
}
Reference in New Issue Copy Permalink