mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-24 02:23:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
0b3880c91e
tcpdump/netdissect.h

702 lines
33 KiB
C
Raw Normal View History

beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
/*
* Copyright (c) 1988-1997
* The Regents of the University of California. All rights reserved.
*
minor whitespace changes
2012-04-08 08:31:47 +08:00
* Copyright (c) 1998-2012 Michael Richardson <mcr@tcpdump.org>
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
* The TCPDUMP project
*
* 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.
*/
#ifndef netdissect_h
#define netdissect_h
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
#include <sys/types.h>
Add a status exit code to the function ndo_error() The status are defined in an enum in status-exit-codes.h. Moreover: Use ndo_error() instead of ndo_warning() for malloc() errors in print-esp.c.
2018-02-25 18:04:39 +08:00
#include "status-exit-codes.h"
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
Use the nd_uintN_t types more. Define them in netdissect.h. Use them in ip.h, and *don't* mark the structures as UNALIGNED; that should no longer be necessary. Add a new nd_ipv4 type to use as an IPv4 address; it represents the 4 bytes of IPv4 address as an array of unsigned chars, so that its natural alignment is only on a byte boundary. Those changes found some places where we weren't using UNALIGNED_MEMCPY() to extract IPv4 addresses from packets; use it.
2015-10-07 15:14:20 +08:00
/*
* Data types corresponding to multi-byte integral values within data
* structures. These are defined as arrays of octets, so that they're
* not aligned on their "natural" boundaries, and so that you *must*
* use the EXTRACT_ macros to extract them (which you should be doing
* *anyway*, so as not to assume a particular byte order or alignment
* in your code).
Make nd_uint8_t and nd_int8_t arrays, to catch direct references. This catches direct references, so we can change them to use EXTRACT_U_1 or EXTRACT_S_1. Also, change some structures to use the nd_ types that weren't already using them. Then make the appropriate EXTRACT_{U,S}_1() changes.
2017-12-11 08:23:34 +08:00
*
* We even want EXTRACT_U_1 used for 8-bit integral values, so we
* define nd_uint8_t and nd_int8_t as arrays as well.
Use the nd_uintN_t types more. Define them in netdissect.h. Use them in ip.h, and *don't* mark the structures as UNALIGNED; that should no longer be necessary. Add a new nd_ipv4 type to use as an IPv4 address; it represents the 4 bytes of IPv4 address as an array of unsigned chars, so that its natural alignment is only on a byte boundary. Those changes found some places where we weren't using UNALIGNED_MEMCPY() to extract IPv4 addresses from packets; use it.
2015-10-07 15:14:20 +08:00
*/
Make nd_uint8_t and nd_int8_t arrays, to catch direct references. This catches direct references, so we can change them to use EXTRACT_U_1 or EXTRACT_S_1. Also, change some structures to use the nd_ types that weren't already using them. Then make the appropriate EXTRACT_{U,S}_1() changes.
2017-12-11 08:23:34 +08:00
typedef unsigned char nd_uint8_t[1];
Use the nd_uintN_t types more. Define them in netdissect.h. Use them in ip.h, and *don't* mark the structures as UNALIGNED; that should no longer be necessary. Add a new nd_ipv4 type to use as an IPv4 address; it represents the 4 bytes of IPv4 address as an array of unsigned chars, so that its natural alignment is only on a byte boundary. Those changes found some places where we weren't using UNALIGNED_MEMCPY() to extract IPv4 addresses from packets; use it.
2015-10-07 15:14:20 +08:00
typedef unsigned char nd_uint16_t[2];
typedef unsigned char nd_uint24_t[3];
typedef unsigned char nd_uint32_t[4];
typedef unsigned char nd_uint40_t[5];
typedef unsigned char nd_uint48_t[6];
typedef unsigned char nd_uint56_t[7];
typedef unsigned char nd_uint64_t[8];
Make nd_uint8_t and nd_int8_t arrays, to catch direct references. This catches direct references, so we can change them to use EXTRACT_U_1 or EXTRACT_S_1. Also, change some structures to use the nd_ types that weren't already using them. Then make the appropriate EXTRACT_{U,S}_1() changes.
2017-12-11 08:23:34 +08:00
typedef signed char nd_int8_t[1];
Use nd_ types, clean up ICMPv6 dissection. Use nd_ types for various packet structures, and use EXTRACT_ macros as necessary. Get rid of & in EXTRACT_ macros if not necessary. The 1-byte pad RPL suboption is called PAD1, not PAD0, in the RFC. Rename rpl_dio_printopt() to rpl_printopts() because 1) it's for all RPL messages and 2) it prints multiple options. Clean up its processing loop. Pass rpl_print() the ICMPv6 code, not a pointer to the full header; all it needs is the code. Use %u to print unsigned values. In Node Information node address lists, the TTL comes before the address, as per the RFC. Dissect it that way.
2017-12-19 13:41:03 +08:00
/*
* "unsigned char" so that sign extension isn't done on the
* individual bytes while they're being assembled.
*/
typedef unsigned char nd_int32_t[4];
Use nd_ types, add host-endian extract routines, clean up signed vs. unsigned. We now define the structures for Linux USB headers in print-usb.c, so it doesn't need to include <pcap/usb.h>; don't check for it.
2018-01-12 03:10:21 +08:00
typedef unsigned char nd_int64_t[8];
Use nd_ types, clean up ICMPv6 dissection. Use nd_ types for various packet structures, and use EXTRACT_ macros as necessary. Get rid of & in EXTRACT_ macros if not necessary. The 1-byte pad RPL suboption is called PAD1, not PAD0, in the RFC. Rename rpl_dio_printopt() to rpl_printopts() because 1) it's for all RPL messages and 2) it prints multiple options. Clean up its processing loop. Pass rpl_print() the ICMPv6 code, not a pointer to the full header; all it needs is the code. Use %u to print unsigned values. In Node Information node address lists, the TTL comes before the address, as per the RFC. Dissect it that way.
2017-12-19 13:41:03 +08:00
Use the nd_uintN_t types more. Define them in netdissect.h. Use them in ip.h, and *don't* mark the structures as UNALIGNED; that should no longer be necessary. Add a new nd_ipv4 type to use as an IPv4 address; it represents the 4 bytes of IPv4 address as an array of unsigned chars, so that its natural alignment is only on a byte boundary. Those changes found some places where we weren't using UNALIGNED_MEMCPY() to extract IPv4 addresses from packets; use it.
2015-10-07 15:14:20 +08:00
/*
Add some new nd_ types for use in structures for packet layouts. Note that nd_ipv4 is used for IPv4 netmasks as well as IPv4 addresses.
2017-12-11 16:08:25 +08:00
* Use this for IPv4 addresses and netmasks.
*
* It's defined as an array of octets, so that it's not guaranteed to
* be aligned on its "natural" boundary (in some packet formats, it
Add EXTRACT_ macros/functions for IPv4 addresses, get rid of structure wrappers. Add EXTRACT_IPV4_TO_HOST_ORDER() and EXTRACT_IPV4_TO_NETWORK_ORDER(); the former extracts a possibly-unaligned IPv4 address, in network byte order, returning a uint32_t in host byte order, and the latter extracts a possibly-unaligned IPv4 address, in network byte order, returning a uint32_t in *network* byte order. Some APIs take an address in network byte order, and some operations are more easily done in host byte order, so both are useful. Remove the structure wrappers around nd_ipv4 and nd_ipv6; that makes it easier to pass variables of those types to functions/macros that take a byte pointer as an argument (because they might be used either with pointers to structure members or raw buffer pointers), and the structure probably wouldn't do much to prevent people from using EXTRACT_BE_U_4() when they really want to extract the value in *network* byte order; using the above EXTRACT_IPV4_ calls should do more to encourage that.
2017-12-20 17:07:48 +08:00
* *isn't* so aligned). We have separate EXTRACT_ calls for them;
* sometimes you want the host-byte-order value, other times you want
* the network-byte-order value.
Expand, and update, a comment.
2017-11-20 03:34:23 +08:00
*
Add EXTRACT_ macros/functions for IPv4 addresses, get rid of structure wrappers. Add EXTRACT_IPV4_TO_HOST_ORDER() and EXTRACT_IPV4_TO_NETWORK_ORDER(); the former extracts a possibly-unaligned IPv4 address, in network byte order, returning a uint32_t in host byte order, and the latter extracts a possibly-unaligned IPv4 address, in network byte order, returning a uint32_t in *network* byte order. Some APIs take an address in network byte order, and some operations are more easily done in host byte order, so both are useful. Remove the structure wrappers around nd_ipv4 and nd_ipv6; that makes it easier to pass variables of those types to functions/macros that take a byte pointer as an argument (because they might be used either with pointers to structure members or raw buffer pointers), and the structure probably wouldn't do much to prevent people from using EXTRACT_BE_U_4() when they really want to extract the value in *network* byte order; using the above EXTRACT_IPV4_ calls should do more to encourage that.
2017-12-20 17:07:48 +08:00
* Don't use EXTRACT_BE_U_4() on them, use EXTRACT_IPV4_TO_HOST_ORDER()
* if you want them in host byte order and EXTRACT_IPV4_TO_NETWORK_ORDER()
* if you want them in network byte order (which you want with system APIs
* that expect network-order IPv4 addresses, such as inet_ntop()).
*
* If, on your little-endian machine (e.g., an "IBM-compatible PC", no matter
* what the OS, or an Intel Mac, no matter what the OS), you get the wrong
* answer, and you've used EXTRACT_BE_U_4(), do *N*O*T* "fix" this by using
* EXTRACT_LE_U_4(), fix it by using EXTRACT_IPV4_TO_NETWORK_ORDER(),
* otherwise you're breaking the result on big-endian machines (e.g.,
* most PowerPC/Power ISA machines, System/390 and z/Architecture, SPARC,
* etc.).
*
* Yes, people do this; that's why Wireshark has tvb_get_ipv4(), to extract
* an IPv4 address from a packet data buffer; it was introduced in reaction
* to somebody who *had* done that.
Use the nd_uintN_t types more. Define them in netdissect.h. Use them in ip.h, and *don't* mark the structures as UNALIGNED; that should no longer be necessary. Add a new nd_ipv4 type to use as an IPv4 address; it represents the 4 bytes of IPv4 address as an array of unsigned chars, so that its natural alignment is only on a byte boundary. Those changes found some places where we weren't using UNALIGNED_MEMCPY() to extract IPv4 addresses from packets; use it.
2015-10-07 15:14:20 +08:00
*/
Add EXTRACT_ macros/functions for IPv4 addresses, get rid of structure wrappers. Add EXTRACT_IPV4_TO_HOST_ORDER() and EXTRACT_IPV4_TO_NETWORK_ORDER(); the former extracts a possibly-unaligned IPv4 address, in network byte order, returning a uint32_t in host byte order, and the latter extracts a possibly-unaligned IPv4 address, in network byte order, returning a uint32_t in *network* byte order. Some APIs take an address in network byte order, and some operations are more easily done in host byte order, so both are useful. Remove the structure wrappers around nd_ipv4 and nd_ipv6; that makes it easier to pass variables of those types to functions/macros that take a byte pointer as an argument (because they might be used either with pointers to structure members or raw buffer pointers), and the structure probably wouldn't do much to prevent people from using EXTRACT_BE_U_4() when they really want to extract the value in *network* byte order; using the above EXTRACT_IPV4_ calls should do more to encourage that.
2017-12-20 17:07:48 +08:00
typedef unsigned char nd_ipv4[4];
Use the nd_uintN_t types more. Define them in netdissect.h. Use them in ip.h, and *don't* mark the structures as UNALIGNED; that should no longer be necessary. Add a new nd_ipv4 type to use as an IPv4 address; it represents the 4 bytes of IPv4 address as an array of unsigned chars, so that its natural alignment is only on a byte boundary. Those changes found some places where we weren't using UNALIGNED_MEMCPY() to extract IPv4 addresses from packets; use it.
2015-10-07 15:14:20 +08:00
Add some new nd_ types for use in structures for packet layouts. Note that nd_ipv4 is used for IPv4 netmasks as well as IPv4 addresses.
2017-12-11 16:08:25 +08:00
/*
* Use this for IPv6 addresses and netmasks.
*/
Add EXTRACT_ macros/functions for IPv4 addresses, get rid of structure wrappers. Add EXTRACT_IPV4_TO_HOST_ORDER() and EXTRACT_IPV4_TO_NETWORK_ORDER(); the former extracts a possibly-unaligned IPv4 address, in network byte order, returning a uint32_t in host byte order, and the latter extracts a possibly-unaligned IPv4 address, in network byte order, returning a uint32_t in *network* byte order. Some APIs take an address in network byte order, and some operations are more easily done in host byte order, so both are useful. Remove the structure wrappers around nd_ipv4 and nd_ipv6; that makes it easier to pass variables of those types to functions/macros that take a byte pointer as an argument (because they might be used either with pointers to structure members or raw buffer pointers), and the structure probably wouldn't do much to prevent people from using EXTRACT_BE_U_4() when they really want to extract the value in *network* byte order; using the above EXTRACT_IPV4_ calls should do more to encourage that.
2017-12-20 17:07:48 +08:00
typedef unsigned char nd_ipv6[16];
Add some new nd_ types for use in structures for packet layouts. Note that nd_ipv4 is used for IPv4 netmasks as well as IPv4 addresses.
2017-12-11 16:08:25 +08:00
/*
* Use this for MAC addresses.
*/
Use nd_ types in 802.x and FDDI headers. Use EXTRACT_U_1() as required by those changes. Remove no-longer-necessary & operators from other EXTRACT_ calls. While we're at it, add MAC_ADDR_LEN to netdissect.h, and use it instead of ETHER_ADDR_LEN; eliminate ETHER_ADDR_LEN. Move the maximum Ethernet length field value to ethertype.h, under the name MAX_ETHERNET_LENGTH_VAL. Move the Ethernet header structure, and the #define for the Ethernet header length, to print-ether.c; in non-Ethernet dissectors that were using the Ethernet header structure, just declare two nd_mac_addr variables for the source and destination MAC addresses and use them instead of the Ethernet header (we don't need the type field there). These changes leave nothing in ether.h, so eliminate it.
2017-12-13 02:36:21 +08:00
#define MAC_ADDR_LEN 6 /* length of MAC addresses */
typedef unsigned char nd_mac_addr[MAC_ADDR_LEN];
Add some new nd_ types for use in structures for packet layouts. Note that nd_ipv4 is used for IPv4 netmasks as well as IPv4 addresses.
2017-12-11 16:08:25 +08:00
/*
* Use this for blobs of bytes; make them arrays of nd_byte.
*/
typedef unsigned char nd_byte;
Make roundup2() generally available.
2018-06-23 02:18:20 +08:00
/*
* Round up x to a multiple of y; y must be a power of 2.
*/
#ifndef roundup2
#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1)))
#endif
Add nd_{v}snprintf() routines/wrappers. Some versions of the MSVC runtime library have a non-C99-compliant vsnprintf(), which we want to avoid. On Windows, use snprintf() and vsnprintf() for VS 2015 and later, where they both exist in C99-compliant forms, and wrap _{v}snprintf_s() otherwise (they're guaranteed to do the null termination that we want).
2018-01-30 07:48:55 +08:00
/* nd_snprintf et al */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
#include <stdarg.h>
Move if_printer to structure netdissect_options The structure 'netdissect_options' can hold if_printer. Thus the structure 'print_info' is useless now. Moreover: Delete useless blank lines Fix indent
2015-09-14 21:34:13 +08:00
#include <pcap.h>
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
NDOize AODV, IPv4 and SCTP decoders
2014-03-26 19:47:29 +08:00
#include "ip.h" /* struct ip for nextproto4_cksum() */
Don't overwrite the destination IPv6 address for routing headers. If we have a routing header, instead of overwriting the packet's IPv6 destination address in the packet with the final destination, so that the next protocol's checksum routine can use it, we do as we do for IPv4, and, in the "next protocol checksum" routine, scan the headers looking for a routing header and, if we find one, copy the final destination from it. While we're at it, clean up a few things.
2016-02-13 12:26:39 +08:00
#include "ip6.h" /* struct ip6 for nextproto6_cksum() */
NDOize AODV, IPv4 and SCTP decoders
2014-03-26 19:47:29 +08:00
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
#ifndef HAVE_STRLCAT
extern size_t strlcat (char *, const char *, size_t);
#endif
#ifndef HAVE_STRLCPY
extern size_t strlcpy (char *, const char *, size_t);
#endif
#ifndef HAVE_STRDUP
extern char *strdup (const char *str);
#endif
The first argument to "ascii_print_with_offset()", "ascii_print()", "hex_print_with_offset()", and "hex_print()" is a string used as a tag; make it a "const char *", not a "const u_char *". Copy the declaration of "strsep()" from "interface.h" to "netdissect.h", and get rid of the include of "interface.h" from "print-esp.c", as it includes "netdissect.h". Update the "ND_TTEST2()" macro to do the same overflow checks that "TTEST2()" now does.
2004-07-22 06:00:10 +08:00
#ifndef HAVE_STRSEP
extern char *strsep(char **, const char *);
#endif
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
struct tok {
base struct tok on unsigned rather than signed int This resolves a few Solaris-specific warnings emitted by /opt/solarisstudio12.3/bin/cc like below: warning: initializer does not fit or is out of range: 0xffffffff (also happened for 0x80000000)
2014-02-26 18:49:56 +08:00
u_int v; /* value */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
const char *s; /* string */
};
Revert "Try to squelch a warning about non-constant format strings." This reverts commit 76ed0bb39212d964946a22380288c34adc09030f. It doesn't help. We may just want to suppress the warning, as in "trust us, we know what we're doing", although it'd be nice if the format string passed to those functions could be checked to make sure it is one that takes exactly one integer argument.
2018-12-11 14:01:39 +08:00
extern const char *tok2strbuf(const struct tok *, const char *, u_int,
char *buf, size_t bufsize);
new tok2strbuf() API.
2004-04-29 10:15:41 +08:00
/* tok2str is deprecated */
Revert "Try to squelch a warning about non-constant format strings." This reverts commit 76ed0bb39212d964946a22380288c34adc09030f. It doesn't help. We may just want to suppress the warning, as in "trust us, we know what we're doing", although it'd be nice if the format string passed to those functions could be checked to make sure it is one that takes exactly one integer argument.
2018-12-11 14:01:39 +08:00
extern const char *tok2str(const struct tok *, const char *, u_int);
extern char *bittok2str(const struct tok *, const char *, u_int);
extern char *bittok2str_nosep(const struct tok *, const char *, u_int);
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
Move some code around. Move stuff to initialize and clean up libraries that are used by netdissect code into nd_init() and nd_cleanup() routines in libnetdissect; this includes Winsock (which is used on Windows by, for example, the code to get names for IP addresses) and libsmi. Call nd_init() when tcpdump starts up, and call nd_cleanup() when it exits. Move util.c routines to tcpdump.c, and make them static. Use ndo->ndo_error to report a failure to open a file in print-esp.c.
2016-08-05 04:19:57 +08:00
/* Initialize netdissect. */
extern int nd_init(char *, size_t);
/* Clean up netdissect. */
extern void nd_cleanup(void);
Move more libsmi stuff to netdissect.c. Have the call to smiLoadModule() be in a nd_load_smi_module() routine. Have it set a *global* flag indicating whether a module has been loaded; that's not per-netdissect_options. Use that global flag in print-snmp.c - and don't test it once per loop iteration, it's not going to change while the loop is running. Have a routine to return the version of the library if we're built with it or NULL if we're not. That removes the last of the code that tests USE_LIBSMI or uses libsmi from tcpdump.c.
2016-08-05 05:35:35 +08:00
/* Do we have libsmi support? */
extern int nd_have_smi_support(void);
/* Load an SMI module. */
extern int nd_load_smi_module(const char *, char *, size_t);
/* Flag indicating whether an SMI module has been loaded. */
extern int nd_smi_module_loaded;
/* Version number of the SMI library, or NULL if we don't have libsmi support. */
extern const char *nd_smi_version_string(void);
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
typedef struct netdissect_options netdissect_options;
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
#define IF_PRINTER_ARGS (netdissect_options *, const struct pcap_pkthdr *, const u_char *)
typedef u_int (*if_printer) IF_PRINTER_ARGS;
Move if_printer to structure netdissect_options The structure 'netdissect_options' can hold if_printer. Thus the structure 'print_info' is useless now. Moreover: Delete useless blank lines Fix indent
2015-09-14 21:34:13 +08:00
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
struct netdissect_options {
from Anantharamu Suryanarayana: add 4-byte AS support to the BGP printer
2009-01-21 04:40:22 +08:00
int ndo_bflag; /* print 4 byte ASes in ASDOT notation */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
int ndo_eflag; /* print ethernet header */
int ndo_fflag; /* don't translate "foreign" IP address */
Fix a comment
2017-09-21 02:45:37 +08:00
int ndo_Kflag; /* don't check IP, TCP or UDP checksums */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
int ndo_nflag; /* leave addresses as numbers */
int ndo_Nflag; /* remove domains from printed host names */
int ndo_qflag; /* quick (shorter) output */
int ndo_Sflag; /* print raw TCP sequence numbers */
int ndo_tflag; /* print packet arrival time */
int ndo_uflag; /* Print undecoded NFS handles */
Update a comment
2015-09-09 04:37:54 +08:00
int ndo_vflag; /* verbosity level */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
int ndo_xflag; /* print packet in hex */
spell ASCII in uppercase
2017-08-10 16:52:46 +08:00
int ndo_Xflag; /* print packet in hex/ASCII */
int ndo_Aflag; /* print packet only in ASCII observing TAB,
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
* LF, CR and SPACE as graphical chars
*/
Use "-H", not "-h", for the 802.11s option, and improve error reporting. I was rudely surprised to find that "tcpdump -h" wasn't printing a usage message, and I'm the person who *added* the "-h" option. Make it "-H", and add an explicit "-h" option to print a usage message, so nobody else makes the same mistake. Also, don't clear opterr, so that if you give an illegal command-line option, you get an explanatory error message.
2011-06-22 09:15:50 +08:00
int ndo_Hflag; /* dissect 802.11s draft mesh standard */
Add the ndo_protocol field in the netdissect_options structure Update this field in printer entry functions. It will be used for some printings.
2018-03-14 23:54:17 +08:00
const char *ndo_protocol; /* protocol */
Add a malloc/free process with garbage collector Use it in the PPP printer.
2018-03-14 20:41:33 +08:00
void *ndo_last_mem_p; /* pointer to the last allocated memory chunk */
Print an optional packet number in the beginning of line The new option is '--number'.
2014-05-06 18:07:55 +08:00
int ndo_packet_number; /* print a packet number in the beginning of line */
Add a flag to suppress the "default_print()" call made in various link-layer print routines if no other print routine claimed the packet. Test whether that flag is set rather than testing whether neither of -x or -q were specified, and have -x, -q, *and* -X set that flag, so that -X suppresses it just as -x does. That way you don't get those pckets dumped twice if -X was specified.
2005-07-07 09:22:15 +08:00
int ndo_suppress_default_print; /* don't use default_print() for unknown packet types */
Add program_name field in the netdissect_options structure A program that use the library should set it. Done for tcpdump. ndo_error() and ndo_warning() print now 'ndo->program_name'. Moreover: Fix indent
2015-09-08 01:04:50 +08:00
int ndo_tstamp_precision; /* requested time stamp precision */
const char *program_name; /* Name of the program using the library */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
char *ndo_espsecret;
print-esp has been "NDO"-ized. replace error() and warning() with ndo-ized version. moved snaplen/snapend to ndo structure.
2004-04-05 08:15:50 +08:00
struct sa_list *ndo_sa_list_head; /* used by print-esp.c */
struct sa_list *ndo_sa_default;
Add program_name field in the netdissect_options structure A program that use the library should set it. Done for tcpdump. ndo_error() and ndo_warning() print now 'ndo->program_name'. Moreover: Fix indent
2015-09-08 01:04:50 +08:00
char *ndo_sigsecret; /* Signature verification secret key */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
int ndo_packettype; /* as specified by -T */
int ndo_snaplen;
/*global pointers to beginning and end of current packet (during printing) */
const u_char *ndo_packetp;
const u_char *ndo_snapend;
Move if_printer to structure netdissect_options The structure 'netdissect_options' can hold if_printer. Thus the structure 'print_info' is useless now. Moreover: Delete useless blank lines Fix indent
2015-09-14 21:34:13 +08:00
/* pointer to the if_printer function */
if_printer ndo_if_printer;
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
/* pointer to void function to output stuff */
void (*ndo_default_print)(netdissect_options *,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *bp, u_int length);
added some comments about ndo functions
2014-07-08 10:05:14 +08:00
/* pointer to function to do regular output */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
int (*ndo_printf)(netdissect_options *,
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
const char *fmt, ...)
Handle attributes for function pointers by checking the compiler version. Handle attributes for function pointers the same way we handle attributes for functions, by explicitly checking for the compiler version with #if rather than with a configure script check. That's one fewer thing that, if you're not using autoconf, has to be done in some other fashion. While we're at it, put NORETURN in the right place to have it work with Microsoft Visual Studio as well as various UN*X compilers.
2017-08-20 02:25:24 +08:00
PRINTFLIKE_FUNCPTR(2, 3);
added some comments about ndo functions
2014-07-08 10:05:14 +08:00
/* pointer to function to output errors */
Handle attributes for function pointers by checking the compiler version. Handle attributes for function pointers the same way we handle attributes for functions, by explicitly checking for the compiler version with #if rather than with a configure script check. That's one fewer thing that, if you're not using autoconf, has to be done in some other fashion. While we're at it, put NORETURN in the right place to have it work with Microsoft Visual Studio as well as various UN*X compilers.
2017-08-20 02:25:24 +08:00
void NORETURN_FUNCPTR (*ndo_error)(netdissect_options *,
Add a status exit code to the function ndo_error() The status are defined in an enum in status-exit-codes.h. Moreover: Use ndo_error() instead of ndo_warning() for malloc() errors in print-esp.c.
2018-02-25 18:04:39 +08:00
status_exit_codes_t status,
Handle attributes for function pointers by checking the compiler version. Handle attributes for function pointers the same way we handle attributes for functions, by explicitly checking for the compiler version with #if rather than with a configure script check. That's one fewer thing that, if you're not using autoconf, has to be done in some other fashion. While we're at it, put NORETURN in the right place to have it work with Microsoft Visual Studio as well as various UN*X compilers.
2017-08-20 02:25:24 +08:00
const char *fmt, ...)
Add a status exit code to the function ndo_error() The status are defined in an enum in status-exit-codes.h. Moreover: Use ndo_error() instead of ndo_warning() for malloc() errors in print-esp.c.
2018-02-25 18:04:39 +08:00
PRINTFLIKE_FUNCPTR(3, 4);
added some comments about ndo functions
2014-07-08 10:05:14 +08:00
/* pointer to function to output warnings */
print-esp has been "NDO"-ized. replace error() and warning() with ndo-ized version. moved snaplen/snapend to ndo structure.
2004-04-05 08:15:50 +08:00
void (*ndo_warning)(netdissect_options *,
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
const char *fmt, ...)
Handle attributes for function pointers by checking the compiler version. Handle attributes for function pointers the same way we handle attributes for functions, by explicitly checking for the compiler version with #if rather than with a configure script check. That's one fewer thing that, if you're not using autoconf, has to be done in some other fashion. While we're at it, put NORETURN in the right place to have it work with Microsoft Visual Studio as well as various UN*X compilers.
2017-08-20 02:25:24 +08:00
PRINTFLIKE_FUNCPTR(2, 3);
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
};
#define PT_VAT 1 /* Visual Audio Tool */
#define PT_WB 2 /* distributed White Board */
#define PT_RPC 3 /* Remote Procedure Call */
#define PT_RTP 4 /* Real-Time Applications protocol */
#define PT_RTCP 5 /* Real-Time Applications control protocol */
#define PT_SNMP 6 /* Simple Network Management Protocol */
#define PT_CNFP 7 /* Cisco NetFlow protocol */
Add "radius" as an option for -T. This allows tcpdump to handle RADIUS running on non-standard ports. Submitted-By: ssb@sourceforge.net Man page also updated by me.
2012-07-01 06:59:18 +08:00
#define PT_TFTP 8 /* trivial file transfer protocol */
#define PT_AODV 9 /* Ad-hoc On-demand Distance Vector Protocol */
fix some PT_* macros indentation with tabs
2013-02-09 16:08:34 +08:00
#define PT_CARP 10 /* Common Address Redundancy Protocol */
#define PT_RADIUS 11 /* RADIUS authentication Protocol */
ZeroMQ initial support (ZMTP/1.0 framing) This change adds support for ZMTP/1.0 (ZeroMQ Message Transport Protocol 1.0) framing in TCP packets, as defined in http://rfc.zeromq.org/spec:13 and implemented in zeromq library. Since there is no assigned port number for ZeroMQ, the user is left responsible for making only the related TCP packets captured and enforcing ZMTP/1.0 decoding through the "-T zmtp1" option. Each ZMTP/1.0 frame of a packet will produce a single additional line of output. The "-v" flag will add up to 8 lines (128 bytes) worth of hex+ASCII dump of the frame body, and "-vv" and higher will dump the full frame body, however long. Beware that this code handles neither IP fragmentation nor TCP segmentation and will incorrectly decode segments not starting at a frame boundary. The included sample capture stands for a short ZeroMQ session between a REQ/REP socket pair doing 3 anonymous 2-way exchanges. It was produced using version 2.1.9 of zeromq library patched to fix its bug #293, so that all MBZ bits of the flags field are set to 0.
2013-02-09 21:36:24 +08:00
#define PT_ZMTP1 12 /* ZeroMQ Message Transport Protocol 1.0 */
- Add support for OTV (draft-hasmit-otv-04). - Use the packettype infrastructure (-T vxlan) for VXLAN parsing (waiting for a well known dest port)
2013-02-26 20:44:11 +08:00
#define PT_VXLAN 13 /* Virtual eXtensible Local Area Network */
use existing PGM decoder for UDP-encapsulated PGM The original PGM uses its own IP protocol number. "EPGM" or "PGM/UDP" stands for UDP-encapsulated PGM, which has no assigned UDP port number and can be decoded only by means of -T option, which now accepts "pgm" protocol type for this purpose. There is also a sample capture of EPGM now (similar to the one of native PGM, but produced using the "epgm://" protocol schema) and a respective test case.
2013-03-15 01:17:53 +08:00
#define PT_PGM 14 /* [UDP-encapsulated] Pragmatic General Multicast */
improve ZeroMQ support (ZMTP/1.0 inside PGM/EPGM) This change adds new code to decode ZeroMQ datagrams, couples it with the PGM decoder and extends the -T option to make all this work. There are two new test cases based on existing captures of ZMTP/1.0 inside [E]PGM to decode the ZMTP/1.0 part of these. This functionality enables decoding of the traffic zeromq library produces for "pgm://" and "epgm://" protocol schemas.
2013-03-15 01:59:38 +08:00
#define PT_PGM_ZMTP1 15 /* ZMTP/1.0 inside PGM (native or UDP-encapsulated) */
LMP: add -T override and fix version 1 test(s) The Link Management Protocol version 1 sample capture added to the tests directory in commit 212eef2 was produced using non-standard UDP port 49998. Later assignment of port 701 reflected in commit 960aee5 made it impossible to decode the capture. This change adds a -T override for LMP, uses it to replace the broken test with two working tests and dismisses the custom test script, lmp.sh.
2013-09-07 16:22:37 +08:00
#define PT_LMP 16 /* Link Management Protocol */
Initial support for the REdis Serialization Protocol known as RESP. This commit adds support for RESP as defined in: http://redis.io/topics/protocol. It also supports inline commands and pipelining. Due to the popularity of RESP, numerous services are emerging that use this protocol. You may decode RESP packets on arbitrary ports using the "-T resp" option. Example captures can be found in tests/resp_*. A simple way to test this parser is to start redis-server and then run redis-cli commands such as "redis-cli set key value". Traditionally, redis-cli monitor is used to debug redis. Unfortunately, the "monitor" command can cause significant load on a redis-server in production. This parser may be used as a non-invasive alternative to redis-cli monitor.
2016-01-13 01:32:55 +08:00
#define PT_RESP 17 /* RESP */
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
#ifndef min
#define min(a,b) ((a)>(b)?(b):(a))
#endif
#ifndef max
#define max(a,b) ((b)>(a)?(b):(a))
#endif
Harmonize TCP source or destination ports tests with UDP ones
2015-12-15 03:28:14 +08:00
/* For source or destination ports tests (UDP, TCP, ...) */
#define IS_SRC_OR_DST_PORT(p) (sport == (p) || dport == (p))
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
/*
Make the default snapshot length the maximum; add a #define for the maximum. Get rid of redundant definition of DEFAULT_SNAPLEN in interface.h. Update the documentation.
2009-03-05 17:01:29 +08:00
* Maximum snapshot length. This should be enough to capture the full
* packet on most network interfaces.
*
Boost the maximum snapshot length to 262144, for USBPcap.
2014-06-26 04:41:22 +08:00
*
* Somewhat arbitrary, but chosen to be:
*
* 1) big enough for maximum-size Linux loopback packets (65549)
* and some USB packets captured with USBPcap:
*
* http://desowin.org/usbpcap/
*
* (> 131072, < 262144)
*
* and
*
* 2) small enough not to cause attempts to allocate huge amounts of
* memory; some applications might use the snapshot length in a
* savefile header to control the size of the buffer they allocate,
* so a size of, say, 2^31-1 might not work well.
Don't treat 65535 as the maximum snapshot length. Make it 131072, instead; the MTU on the Linux loopback interface, in at least some versions of the kernel, is 65536, and that doesn't count the fake Ethernet header, so we need a value bigger than 65536. We don't want a value that's *too* large, so that it causes attempts to allocate huge amounts of memory, however. This (plus the corresponding change to libpcap) should fix GitHub issue
2014-06-26 04:18:18 +08:00
*
With no -s, or with -s 0, don't specify the snapshot length with newer versions of libpcap. That leaves it up to libpcap to choose an appropriate snapshot length, which it'll do. With upcoming versions, it'll choose, when capturing on a D-Bus interface, a very large snapshot length, to handle the maximum D-Bus message size of 128MB. (For older versions, we still use 262144, as those versions won't pick a default value.)
2017-06-03 12:50:45 +08:00
* XXX - does it need to be bigger still? Note that, for versions of
* libpcap with pcap_create()/pcap_activate(), if no -s flag is specified
* or -s 0 is specified, we won't set the snapshot length at all, and will
* let libpcap choose a snapshot length; newer versions may choose a bigger
* value than 262144 for D-Bus, for example.
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
*/
Boost the maximum snapshot length to 262144, for USBPcap.
2014-06-26 04:41:22 +08:00
#define MAXIMUM_SNAPLEN 262144
Make the default snapshot length the maximum; add a #define for the maximum. Get rid of redundant definition of DEFAULT_SNAPLEN in interface.h. Update the documentation.
2009-03-05 17:01:29 +08:00
The first argument to "ascii_print_with_offset()", "ascii_print()", "hex_print_with_offset()", and "hex_print()" is a string used as a tag; make it a "const char *", not a "const u_char *". Copy the declaration of "strsep()" from "interface.h" to "netdissect.h", and get rid of the include of "interface.h" from "print-esp.c", as it includes "netdissect.h". Update the "ND_TTEST2()" macro to do the same overflow checks that "TTEST2()" now does.
2004-07-22 06:00:10 +08:00
/*
Update a comment
2018-09-22 21:19:44 +08:00
* True if "l" bytes from "p" were captured.
The first argument to "ascii_print_with_offset()", "ascii_print()", "hex_print_with_offset()", and "hex_print()" is a string used as a tag; make it a "const char *", not a "const u_char *". Copy the declaration of "strsep()" from "interface.h" to "netdissect.h", and get rid of the include of "interface.h" from "print-esp.c", as it includes "netdissect.h". Update the "ND_TTEST2()" macro to do the same overflow checks that "TTEST2()" now does.
2004-07-22 06:00:10 +08:00
*
* The "ndo->ndo_snapend - (l) <= ndo->ndo_snapend" checks to make sure
* "l" isn't so large that "ndo->ndo_snapend - (l)" underflows.
*
* The check is for <= rather than < because "l" might be 0.
C compilers can, and some do, optimize away pointer underflow checks. Cast the pointers to uintptr_t; use AC_TYPE_UINTPTR_T to get uintptr_t defined on older platforms that don't define it themselves.
2015-03-03 05:25:12 +08:00
*
* We cast the pointers to uintptr_t to make sure that the compiler
* doesn't optimize away any of these tests (which it is allowed to
* do, as adding an integer to, or subtracting an integer from, a
* pointer assumes that the pointer is a pointer to an element of an
* array and that the result of the addition or subtraction yields a
* pointer to another member of the array, so that, for example, if
* you subtract a positive integer from a pointer, the result is
* guaranteed to be less than the original pointer value). See
*
* http://www.kb.cert.org/vuls/id/162289
The first argument to "ascii_print_with_offset()", "ascii_print()", "hex_print_with_offset()", and "hex_print()" is a string used as a tag; make it a "const char *", not a "const u_char *". Copy the declaration of "strsep()" from "interface.h" to "netdissect.h", and get rid of the include of "interface.h" from "print-esp.c", as it includes "netdissect.h". Update the "ND_TTEST2()" macro to do the same overflow checks that "TTEST2()" now does.
2004-07-22 06:00:10 +08:00
*/
netdissect.h: Update ND_TTEST2 to fix issue 443 Add IS_NOT_NEGATIVE macro. Avoid these warnings: - comparison of unsigned expression >= 0 is always true [-Wtype-limits], - comparison is always true due to limited range of data type [-Wtype-limits].
2015-04-28 00:20:59 +08:00
netdissect.h: Add a comment on IS_NOT_NEGATIVE macro
2015-04-28 12:17:16 +08:00
/*
* Test in two parts to avoid these warnings:
* comparison of unsigned expression >= 0 is always true [-Wtype-limits],
* comparison is always true due to limited range of data type [-Wtype-limits].
*/
netdissect.h: Update ND_TTEST2 to fix issue 443 Add IS_NOT_NEGATIVE macro. Avoid these warnings: - comparison of unsigned expression >= 0 is always true [-Wtype-limits], - comparison is always true due to limited range of data type [-Wtype-limits].
2015-04-28 00:20:59 +08:00
#define IS_NOT_NEGATIVE(x) (((x) > 0) || ((x) == 0))
Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (1/n) ND_TTEST2(var, l) -> ND_TTEST_LEN(p, l) ND_TCHECK2(var, l) -> ND_TCHECK_LEN(p, l)
2017-12-11 19:46:51 +08:00
#define ND_TTEST_LEN(p, l) \
(IS_NOT_NEGATIVE(l) && \
((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \
(uintptr_t)(p) <= (uintptr_t)ndo->ndo_snapend - (l)))
Add ND_TTEST_SIZE() and ND_TCHECK_SIZE() macros To replace in next steps: ND_TTEST(var) -> ND_TTEST_SIZE(p) ND_TCHECK(var) -> ND_TCHECK_SIZE(p) Moreover: Add a comment
2018-01-02 22:50:24 +08:00
/* True if "*(p)" was captured */
#define ND_TTEST_SIZE(p) ND_TTEST_LEN(p, sizeof(*(p)))
/* Bail out if "l" bytes from "p" were not captured */
Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (1/n) ND_TTEST2(var, l) -> ND_TTEST_LEN(p, l) ND_TCHECK2(var, l) -> ND_TCHECK_LEN(p, l)
2017-12-11 19:46:51 +08:00
#define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) goto trunc
Add ND_TTEST_SIZE() and ND_TCHECK_SIZE() macros To replace in next steps: ND_TTEST(var) -> ND_TTEST_SIZE(p) ND_TCHECK(var) -> ND_TCHECK_SIZE(p) Moreover: Add a comment
2018-01-02 22:50:24 +08:00
/* Bail out if "*(p)" was not captured */
#define ND_TCHECK_SIZE(p) ND_TCHECK_LEN(p, sizeof(*(p)))
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
#define ND_PRINT(...) (ndo->ndo_printf)(ndo, __VA_ARGS__)
NDO-ized print-arp.c
2004-05-01 00:42:14 +08:00
#define ND_DEFAULTPRINT(ap, length) (*ndo->ndo_default_print)(ndo, ap, length)
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
NDOize some generic code
2014-04-03 21:40:30 +08:00
extern void ts_print(netdissect_options *, const struct timeval *);
CVE-2016-7993/Clean up relative time stamp printing. Have separate routines for signed and unsigned relative time stamps. Have the routine for signed time stamps handle the case of -2^31, where you can't negate it and have the result fit in a 32-bit signed integer. There are currently no users of the signed relative time stamp routine, but it's there in case anybody needs it (and is passing 32-bit quantitites, so that there's a risk that a packet might contain -2^31 as the time stamp). Fixes an array overflow found with American Fuzzy Lop by Hanno Böck.
2015-08-09 03:53:36 +08:00
extern void signed_relts_print(netdissect_options *, int32_t);
extern void unsigned_relts_print(netdissect_options *, uint32_t);
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
CDP: Filter out non-printable characters Add a fn_print_char() to do filtering.
2015-11-09 22:59:58 +08:00
extern void fn_print_char(netdissect_options *, u_char);
Add the fn_print_str() function This function print a null-terminated string, filtering out non-printable characters. DON'T USE IT with a pointer on the packet buffer because there is no truncation check. For this use, see the nd_printX() functions.
2018-05-19 04:18:46 +08:00
extern void fn_print_str(netdissect_options *, const u_char *);
Rename the fn_printX() functions to nd_printX() The functions are: nd_print, nd_printztn, nd_printn and nd_printzp. Trying to make it clearer that they currently have to be used only on part of the packet buffer. Update some comments.
2018-04-30 18:52:10 +08:00
extern int nd_print(netdissect_options *, const u_char *, const u_char *);
extern u_int nd_printztn(netdissect_options *ndo, const u_char *, u_int, const u_char *);
extern int nd_printn(netdissect_options *, const u_char *, u_int, const u_char *);
extern int nd_printzp(netdissect_options *, const u_char *, u_int, const u_char *);
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
More comments.
2014-10-20 04:46:22 +08:00
/*
* Flags for txtproto_print().
*/
#define RESP_CODE_SECOND_TOKEN 0x00000001 /* response code is second token in response line */
Add a routine to print "text protocols", and add FTP/HTTP/SMTP/RTSP support. "Text protocols" are protocols that have the general feel of FTP, with command lines with a command name and space-separated arguments and response lines beginning with a 3-digit reply code. They can also include HTTP-style headers and an entity body. We add support for the FTP control channel, HTTP, SMTP, and RTSP. We also change the SIP printer to use it.
2014-10-20 02:21:44 +08:00
extern void txtproto_print(netdissect_options *, const u_char *, u_int,
const char *, const char **, u_int);
Do our own isascii(), isprint(), isgraph(), and toascii(). We do *not* want the behavior of isprint() and isgraph() to be locale-dependent - we want both of them to return "true" only for ASCII characters. We have to do our own isascii() and toascii() on non-UN*X systems anyway, so let's just do all of them ourselves.
2014-02-03 07:17:06 +08:00
/*
* Locale-independent macros for testing character properties and
Add, and use, macros to do locale-independent case mapping. This means we get the same behavior in Turkish locales (where, if we aren't in the C locale, we might get lower-case "i" mapped to upper-case "I with dot" and upper-case "I" mapped to lower-case "i without dot), and may also suppress some shortening warnings from MSVC.
2018-12-11 15:16:45 +08:00
* stripping the 8th bit from characters.
*
* Byte values outside the ASCII range are considered unprintable, so
* both ND_ISPRINT() and ND_ISGRAPH() return "false" for them.
*
* Assumed to be handed a value between 0 and 255, i.e. don't hand them
* a char, as those might be in the range -128 to 127.
Do our own isascii(), isprint(), isgraph(), and toascii(). We do *not* want the behavior of isprint() and isgraph() to be locale-dependent - we want both of them to return "true" only for ASCII characters. We have to do our own isascii() and toascii() on non-UN*X systems anyway, so let's just do all of them ourselves.
2014-02-03 07:17:06 +08:00
*/
#define ND_ISASCII(c) (!((c) & 0x80)) /* value is an ASCII code point */
#define ND_ISPRINT(c) ((c) >= 0x20 && (c) <= 0x7E)
#define ND_ISGRAPH(c) ((c) > 0x20 && (c) <= 0x7E)
#define ND_TOASCII(c) ((c) & 0x7F)
Add, and use, macros to do locale-independent case mapping. This means we get the same behavior in Turkish locales (where, if we aren't in the C locale, we might get lower-case "i" mapped to upper-case "I with dot" and upper-case "I" mapped to lower-case "i without dot), and may also suppress some shortening warnings from MSVC.
2018-12-11 15:16:45 +08:00
/*
* Locale-independent macros for coverting to upper or lower case.
*
* Byte values outside the ASCII range are not converted. Byte values
* *in* the ASCII range are converted to byte values in the ASCII range;
* in particular, 'i' is upper-cased to 'I" and 'I' is lower-cased to 'i',
* even in Turkish locales.
*
* Assumed to be handed a value between 0 and 255, i.e. don't hand
* them a char, as those might be in the range -128 to 127.
*/
#define ND_TOLOWER(c) (((c) >= 'A' && (c) <= 'Z') ? (c) - 'A' + 'a' : (c))
Umm, wrong.
2018-12-11 15:26:25 +08:00
#define ND_TOUPPER(c) (((c) >= 'a' && (c) <= 'z') ? (c) - 'a' + 'A' : (c))
Add, and use, macros to do locale-independent case mapping. This means we get the same behavior in Turkish locales (where, if we aren't in the C locale, we might get lower-case "i" mapped to upper-case "I with dot" and upper-case "I" mapped to lower-case "i without dot), and may also suppress some shortening warnings from MSVC.
2018-12-11 15:16:45 +08:00
Check for unaligned memory access support at compile time. Don't test at configure time; that doesn't work when cross-compiling and may be a pain to do with CMake.
2017-10-16 16:39:10 +08:00
#if (defined(__i386__) || defined(_M_IX86) || defined(__X86__) || defined(__x86_64__) || defined(_M_X64)) || \
(defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)) || \
(defined(__m68k__) && (!defined(__mc68000__) && !defined(__mc68010__))) || \
(defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PPC64)) || \
(defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || \
defined(__vax__)
/*
* The procesor natively handles unaligned loads, so just use memcpy()
* and memcmp(), to enable those optimizations.
*
* XXX - are those all the x86 tests we need?
* XXX - do we need to worry about ARMv1 through ARMv5, which didn't
* support unaligned loads, and, if so, do we need to worry about all
* of them, or just some of them, e.g. ARMv5?
* XXX - are those the only 68k tests we need not to generated
* unaligned accesses if the target is the 68000 or 68010?
* XXX - are there any tests we don't need, because some definitions are for
* compilers that also predefine the GCC symbols?
* XXX - do we need to test for both 32-bit and 64-bit versions of those
* architectures in all cases?
*/
#define UNALIGNED_MEMCPY(p, q, l) memcpy((p), (q), (l))
#define UNALIGNED_MEMCMP(p, q, l) memcmp((p), (q), (l))
#else
Only do the unaligned_mem{cpy,cmp} hack if necessary. If the processor does unaligned accesses, it's not necessary.
2014-01-18 09:51:04 +08:00
/*
* The processor doesn't natively handle unaligned loads,
* and the compiler might "helpfully" optimize memcpy()
* and memcmp(), when handed pointers that would normally
* be properly aligned, into sequences that assume proper
* alignment.
*
* Do copies and compares of possibly-unaligned data by
* calling routines that wrap memcpy() and memcmp(), to
* prevent that optimization.
*/
Move safememcpy() to util.c so it doesn't get inlined. It appears that some C compilers will inline safememcpy() *and* will, as a result, optimize to assume alignment it if it's passed a putatively-aligned pointer. As the pointers in question are not guaranteed to be aligned, that can cause crashes on, for example, SPARC. Also, rename the function to unaligned_memcpy(), to clarify what's "safe" about it, and change some direct memcpy() calls to use it as well.
2014-01-16 10:12:06 +08:00
extern void unaligned_memcpy(void *, const void *, size_t);
memcmp() doesn't modify either of its arguments.
2014-01-16 15:03:31 +08:00
extern int unaligned_memcmp(const void *, const void *, size_t);
Only do the unaligned_mem{cpy,cmp} hack if necessary. If the processor does unaligned accesses, it's not necessary.
2014-01-18 09:51:04 +08:00
#define UNALIGNED_MEMCPY(p, q, l) unaligned_memcpy((p), (q), (l))
#define UNALIGNED_MEMCMP(p, q, l) unaligned_memcmp((p), (q), (l))
#endif
Move safememcpy() to util.c so it doesn't get inlined. It appears that some C compilers will inline safememcpy() *and* will, as a result, optimize to assume alignment it if it's passed a putatively-aligned pointer. As the pointers in question are not guaranteed to be aligned, that can cause crashes on, for example, SPARC. Also, rename the function to unaligned_memcpy(), to clarify what's "safe" about it, and change some direct memcpy() calls to use it as well.
2014-01-16 10:12:06 +08:00
Fix plurals in packet count messages. Based on a patch from cr4ckn@sourceforge.net, but with a macro PLURAL_SUFFIX() defined to return either "s" or "" (rather than possibly printing a NUL character with %c), and with that macro used in a couple of cases where the equivalent had been done by hand, and with one case the patch missed fixed as well.
2011-03-09 01:11:25 +08:00
#define PLURAL_SUFFIX(n) \
(((n) != 1) ? "s" : "")
Move more prototypes in netdissect.h
2015-06-11 03:12:38 +08:00
extern const char *tok2strary_internal(const char **, int, const char *, int);
#define tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i)
Don't use "struct netdissect_options" in interface.h. Use it in netdissect.h, where it's defined; otherwise, we get a bunch of warnings when compiling modules that include interface.h but don't yet include netdissect.h.
2011-05-05 17:25:42 +08:00
extern if_printer lookup_printer(int);
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
Add the debug macro ND_DEBUG
2018-09-05 03:50:33 +08:00
#define ND_DEBUG {printf(" [%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__); fflush(stdout);}
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
/* The DLT printer routines */
extern u_int ap1394_if_print IF_PRINTER_ARGS;
extern u_int arcnet_if_print IF_PRINTER_ARGS;
extern u_int arcnet_linux_if_print IF_PRINTER_ARGS;
extern u_int atm_if_print IF_PRINTER_ARGS;
extern u_int bt_if_print IF_PRINTER_ARGS;
extern u_int chdlc_if_print IF_PRINTER_ARGS;
extern u_int cip_if_print IF_PRINTER_ARGS;
extern u_int enc_if_print IF_PRINTER_ARGS;
extern u_int ether_if_print IF_PRINTER_ARGS;
extern u_int fddi_if_print IF_PRINTER_ARGS;
extern u_int fr_if_print IF_PRINTER_ARGS;
extern u_int ieee802_11_if_print IF_PRINTER_ARGS;
extern u_int ieee802_11_radio_avs_if_print IF_PRINTER_ARGS;
extern u_int ieee802_11_radio_if_print IF_PRINTER_ARGS;
extern u_int ieee802_15_4_if_print IF_PRINTER_ARGS;
extern u_int ipfc_if_print IF_PRINTER_ARGS;
extern u_int ipnet_if_print IF_PRINTER_ARGS;
Rename some link-layer dissector entry functions Most of them are already named *_if_print. Update the others to have the same prefix. This change allow easier identification.
2017-11-16 14:15:35 +08:00
extern u_int juniper_atm1_if_print IF_PRINTER_ARGS;
extern u_int juniper_atm2_if_print IF_PRINTER_ARGS;
extern u_int juniper_chdlc_if_print IF_PRINTER_ARGS;
extern u_int juniper_es_if_print IF_PRINTER_ARGS;
extern u_int juniper_ether_if_print IF_PRINTER_ARGS;
extern u_int juniper_frelay_if_print IF_PRINTER_ARGS;
extern u_int juniper_ggsn_if_print IF_PRINTER_ARGS;
extern u_int juniper_mfr_if_print IF_PRINTER_ARGS;
extern u_int juniper_mlfr_if_print IF_PRINTER_ARGS;
extern u_int juniper_mlppp_if_print IF_PRINTER_ARGS;
extern u_int juniper_monitor_if_print IF_PRINTER_ARGS;
extern u_int juniper_ppp_if_print IF_PRINTER_ARGS;
extern u_int juniper_pppoe_atm_if_print IF_PRINTER_ARGS;
extern u_int juniper_pppoe_if_print IF_PRINTER_ARGS;
extern u_int juniper_services_if_print IF_PRINTER_ARGS;
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern u_int lane_if_print IF_PRINTER_ARGS;
extern u_int ltalk_if_print IF_PRINTER_ARGS;
extern u_int mfr_if_print IF_PRINTER_ARGS;
extern u_int netanalyzer_if_print IF_PRINTER_ARGS;
extern u_int netanalyzer_transparent_if_print IF_PRINTER_ARGS;
extern u_int nflog_if_print IF_PRINTER_ARGS;
extern u_int null_if_print IF_PRINTER_ARGS;
extern u_int pflog_if_print IF_PRINTER_ARGS;
extern u_int pktap_if_print IF_PRINTER_ARGS;
extern u_int ppi_if_print IF_PRINTER_ARGS;
extern u_int ppp_bsdos_if_print IF_PRINTER_ARGS;
extern u_int ppp_hdlc_if_print IF_PRINTER_ARGS;
extern u_int ppp_if_print IF_PRINTER_ARGS;
extern u_int pppoe_if_print IF_PRINTER_ARGS;
extern u_int prism_if_print IF_PRINTER_ARGS;
extern u_int raw_if_print IF_PRINTER_ARGS;
extern u_int sl_bsdos_if_print IF_PRINTER_ARGS;
extern u_int sl_if_print IF_PRINTER_ARGS;
extern u_int sll_if_print IF_PRINTER_ARGS;
DLT_LINUX_SLL2 support.
2018-07-13 02:49:28 +08:00
extern u_int sll2_if_print IF_PRINTER_ARGS;
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern u_int sunatm_if_print IF_PRINTER_ARGS;
extern u_int symantec_if_print IF_PRINTER_ARGS;
extern u_int token_if_print IF_PRINTER_ARGS;
Rename some link-layer dissector entry functions Most of them are already named *_if_print. Update the others to have the same prefix. This change allow easier identification.
2017-11-16 14:15:35 +08:00
extern u_int usb_linux_48_byte_if_print IF_PRINTER_ARGS;
extern u_int usb_linux_64_byte_if_print IF_PRINTER_ARGS;
reworked print-ether to use netdissect
2010-10-08 02:36:49 +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
/*
* Structure passed to some printers to allow them to print
* link-layer address information if ndo_eflag isn't set
* (because they are for protocols that don't have their
* own addresses, so that we'd want to report link-layer
* address information).
*
* This contains a pointer to an address and a pointer to a routine
* to which we pass that pointer in order to get a string.
*/
struct lladdr_info {
const char *(*addr_string)(netdissect_options *, const u_char *);
const u_char *addr;
};
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
/* The printer routines. */
NDOize print-ascii.c further Introduce netdissect_options into hex_and_ascii_print_with_offset(), hex_and_ascii_print() and related functions.
2014-03-13 15:06:15 +08:00
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void aarp_print(netdissect_options *, const u_char *, u_int);
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
extern int ah_print(netdissect_options *, const u_char *);
NDOize AHCP, OTV and VXLAN decoders
2014-03-08 19:28:13 +08:00
extern void ahcp_print(netdissect_options *, const u_char *, const u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void aodv_print(netdissect_options *, const u_char *, u_int, int);
extern void aoe_print(netdissect_options *, const u_char *, const u_int);
extern void arp_print(netdissect_options *, const u_char *, u_int, u_int);
extern void ascii_print(netdissect_options *, const u_char *, u_int);
extern void atalk_print(netdissect_options *, const u_char *, u_int);
extern void atm_print(netdissect_options *, u_int, u_int, u_int, const u_char *, u_int, u_int);
extern void babel_print(netdissect_options *, const u_char *, u_int);
extern void beep_print(netdissect_options *, const u_char *, u_int);
NDOize ARCNET, BFD and GRE decoders
2014-03-11 20:08:24 +08:00
extern void bfd_print(netdissect_options *, const u_char *, u_int, u_int);
More cleanups. Add the current BGP RFC as a comment. Use unsigned types where appropriate. Use size_t where appropriate. Further whitespace cleanups.
2017-12-17 02:50:00 +08:00
extern void bgp_print(netdissect_options *, const u_char *, u_int);
Add some const qualifiers
2018-03-16 17:39:25 +08:00
extern const char *bgp_vpn_rd_print(netdissect_options *, const u_char *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void bootp_print(netdissect_options *, const u_char *, u_int);
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
extern void calm_fast_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *);
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
extern void carp_print(netdissect_options *, const u_char *, u_int, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void cdp_print(netdissect_options *, const u_char *, u_int, u_int);
extern void cfm_print(netdissect_options *, const u_char *, u_int);
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
extern u_int chdlc_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void cisco_autorp_print(netdissect_options *, const u_char *, u_int);
Use ND_TCHECK() to do bounds checking. While we're at it, just use the record count to when iterating over records; the ND_TCHECK()s will make sure we don't run past the end of the captured data. Also get rid of an unused argument to cnfp_print().
2014-11-10 15:24:53 +08:00
extern void cnfp_print(netdissect_options *, const u_char *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void dccp_print(netdissect_options *, const u_char *, const u_char *, u_int);
extern void decnet_print(netdissect_options *, const u_char *, u_int, u_int);
extern void dhcp6_print(netdissect_options *, const u_char *, u_int);
extern int dstopt_print(netdissect_options *, const u_char *);
extern void dtp_print(netdissect_options *, const u_char *, u_int);
NDOize 7 more small decoders This change converts DVMRP, DLT_ENC, EGP, GeoNet, NetFlow, SLIP and TFTP decoders.
2014-03-21 20:48:24 +08:00
extern void dvmrp_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void eap_print(netdissect_options *, const u_char *, u_int);
NDOize 7 more small decoders This change converts DVMRP, DLT_ENC, EGP, GeoNet, NetFlow, SLIP and TFTP decoders.
2014-03-21 20:48:24 +08:00
extern void egp_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void eigrp_print(netdissect_options *, const u_char *, u_int);
More EXTRACT_8BITS() and other cleanups. Get rid of casts to (int) that aren't needed or wanted. If a field is unsigned, use an unsigned variable for it, print it with %u, not %d, and don't cast it to int. Replace a static variable in print-dvmrp.c with a local variable in dvmrp_print() and a parameter to print_neighbors2().
2017-11-23 02:15:49 +08:00
extern int esp_print(netdissect_options *, const u_char *, const int, const u_char *, u_int *, u_int *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern u_int ether_print(netdissect_options *, const u_char *, u_int, u_int, void (*)(netdissect_options *, const u_char *), const u_char *);
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
extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern u_int fddi_print(netdissect_options *, const u_char *, u_int, u_int);
NDOize ForCES, MPLS LSP ping and OLSR decoders
2014-03-27 18:58:23 +08:00
extern void forces_print(netdissect_options *, const u_char *, u_int);
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
extern u_int fr_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern int frag6_print(netdissect_options *, const u_char *, const u_char *);
extern void ftp_print(netdissect_options *, const u_char *, u_int);
extern void geneve_print(netdissect_options *, const u_char *, u_int);
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
extern void geonet_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void gre_print(netdissect_options *, const u_char *, u_int);
extern int hbhopt_print(netdissect_options *, const u_char *);
extern void hex_and_ascii_print(netdissect_options *, const char *, const u_char *, u_int);
extern void hex_print(netdissect_options *, const char *ident, const u_char *cp, u_int);
extern void hex_print_with_offset(netdissect_options *, const char *ident, const u_char *cp, u_int, u_int);
Printer for HNCP (RFCs 7787 and 7788). This is joint work with Antonin Décimo.
2016-07-29 03:09:41 +08:00
extern void hncp_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void hsrp_print(netdissect_options *, const u_char *, u_int);
extern void http_print(netdissect_options *, const u_char *, u_int);
extern void icmp6_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
extern void icmp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
Fix printing of Linux cooked captures with monitor-mode packets. Apparently, if you have an interface in monitor mode, capturing on the "any" device can get packets that have a SLL hatype of 803, which is the ARPHRD_ value for radiotap, and with the payload containing a radiotap header, followed by an 802.11 header, followed by the 802.11 payload. Handle that.
2018-11-13 14:03:49 +08:00
extern u_int ieee802_11_radio_print(netdissect_options *, const u_char *, u_int, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void igmp_print(netdissect_options *, const u_char *, u_int);
extern void igrp_print(netdissect_options *, const u_char *, u_int);
extern void ip6_print(netdissect_options *, const u_char *, u_int);
extern void ipN_print(netdissect_options *, const u_char *, u_int);
extern void ip_print(netdissect_options *, const u_char *, u_int);
Rename some printer functions to *_print Moreover: Fix spaces.
2018-02-22 21:19:42 +08:00
extern void ip_inner_print(netdissect_options *, const u_char *, u_int, u_int nh, const u_char *);
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
extern void ipcomp_print(netdissect_options *, const u_char *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void ipx_netbios_print(netdissect_options *, const u_char *, u_int);
extern void ipx_print(netdissect_options *, const u_char *, u_int);
extern void isakmp_print(netdissect_options *, const u_char *, u_int, const u_char *);
extern void isakmp_rfc3948_print(netdissect_options *, const u_char *, u_int, const u_char *);
CVE-2017-12897/ISO CLNS: Use ND_TTEST() for the bounds checks in isoclns_print(). This fixes a buffer over-read discovered by Kamil Frankowicz. Don't pass the remaining caplen - that's too hard to get right, and we were getting it wrong in at least one case; just use ND_TTEST(). Add a test using the capture file supplied by the reporter(s).
2017-02-04 04:24:14 +08:00
extern void isoclns_print(netdissect_options *, const u_char *, u_int);
NDOize AppleTalk, CDP and Kerberos decoders
2014-03-28 18:43:43 +08:00
extern void krb_print(netdissect_options *, const u_char *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void l2tp_print(netdissect_options *, const u_char *, u_int);
extern void lane_print(netdissect_options *, const u_char *, u_int, u_int);
extern void ldp_print(netdissect_options *, const u_char *, u_int);
Initial commit for support of Type 3 and Type 4 LISP packets. Fixing Travis CI build for LISP commit Adding testcases for lisp notify and register Fixing build warnings Added ND_TCHECK for relevant headers Fixing ND_TCHECK2 issues Adding support for multiple LOC records for same EID entry Fixing review issues, adding detailed tests Adding support for verbose outputs Adding RFC information for UDP PORT defination Removing Spaces in type names Print EID record related flags in verbose mode Using tok2str Fixing -Wpedantic issues Negative testcases, Packet structure comments, verbose mode flag printing Printing Map Version Print auth_data, decouple type and xtr_present extraction, handle malformed packets correctly Tests for latest code changes Printing useful info incase not built with IPv6 support
2015-08-15 00:06:52 +08:00
extern void lisp_print(netdissect_options *, const u_char *, u_int);
NDOize AppleTalk, CDP and Kerberos decoders
2014-03-28 18:43:43 +08:00
extern u_int llap_print(netdissect_options *, const u_char *, u_int);
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
extern int llc_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void lldp_print(netdissect_options *, const u_char *, u_int);
extern void lmp_print(netdissect_options *, const u_char *, u_int);
extern void loopback_print(netdissect_options *, const u_char *, const u_int);
extern void lspping_print(netdissect_options *, const u_char *, u_int);
extern void lwapp_control_print(netdissect_options *, const u_char *, u_int, int);
extern void lwapp_data_print(netdissect_options *, const u_char *, u_int);
NDOize EAP, IEEE CFM, lwres, SIP & Syslog decoders
2014-04-01 23:42:33 +08:00
extern void lwres_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void m3ua_print(netdissect_options *, const u_char *, const u_int);
CVE-2016-7985,7986/fixup medsa_print() The code in medsa_print() assumed that the MEDSA packet always follows an Ethernet header that is inside the allocated memory buffer. But this is not always the case, see commit 6bc4429 for rationale. Eliminate the Ethernet header pointer and just pass on the struct lladdr_info arguments provided.
2017-01-19 02:01:52 +08:00
extern void medsa_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *);
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
extern u_int mfr_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void mobile_print(netdissect_options *, const u_char *, u_int);
extern int mobility_print(netdissect_options *, const u_char *, const u_char *);
extern void mpcp_print(netdissect_options *, const u_char *, u_int);
extern void mpls_print(netdissect_options *, const u_char *, u_int);
extern int mptcp_print(netdissect_options *, const u_char *, u_int, u_char);
extern void msdp_print(netdissect_options *, const u_char *, u_int);
extern void msnlb_print(netdissect_options *, const u_char *);
Clean up signed vs. unsigned. Use unsigned for lengths. Add additional length checks, as we can no longer cheat and rely on "underflow turns the length negative, so just check for > 0". Show most NBT and SMB numerical fields as unsigned, as that's what they are. Have "d" and "D" treat the value as signed; add "u" and "U" for unsigned values.
2018-01-07 14:18:00 +08:00
extern void nbt_tcp_print(netdissect_options *, const u_char *, u_int);
extern void nbt_udp137_print(netdissect_options *, const u_char *, u_int);
extern void nbt_udp138_print(netdissect_options *, const u_char *, u_int);
extern void netbeui_print(netdissect_options *, u_short, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void nfsreply_print(netdissect_options *, const u_char *, u_int, const u_char *);
NFS: Rename two printer functions Their names must end with '_print'
2017-11-16 20:49:06 +08:00
extern void nfsreply_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *);
extern void nfsreq_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *);
Rename some printer functions to *_print Moreover: Fix spaces.
2018-02-22 21:19:42 +08:00
extern const u_char * ns_nprint(netdissect_options *, const u_char *, const u_char *);
DNS: Rename entry function Most printer entry functions are based on the file name (without print-). Do the same for DNS (ns_print -> domain_print) This change allows easier update by script.
2017-11-16 16:40:19 +08:00
extern void domain_print(netdissect_options *, const u_char *, u_int, int);
Restore alphabetical order in Makefile.in and netdissect.h
2016-03-23 00:23:40 +08:00
extern void nsh_print(netdissect_options *ndo, const u_char *bp, u_int len);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void ntp_print(netdissect_options *, const u_char *, u_int);
CVE-2016-7924/Add some bounds checks. Fixes a heap overflow found with American Fuzzy Lop by Hanno Böck. Also, get rid of the return value for oam_print(), as it's not used and not useful.
2015-07-04 07:39:25 +08:00
extern void oam_print(netdissect_options *, const u_char *, u_int, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void olsr_print(netdissect_options *, const u_char *, u_int, int);
extern void openflow_print(netdissect_options *, const u_char *, const u_int);
extern void ospf6_print(netdissect_options *, const u_char *, u_int);
NDOize DECnet, OSPF and TCP decoders
2014-04-02 16:59:56 +08:00
extern void ospf_print(netdissect_options *, const u_char *, u_int, const u_char *);
Rename some printer functions to *_print Moreover: Fix spaces.
2018-02-22 21:19:42 +08:00
extern int ospf_grace_lsa_print(netdissect_options *, const u_char *, u_int);
extern int ospf_te_lsa_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void otv_print(netdissect_options *, const u_char *, u_int);
extern void pgm_print(netdissect_options *, const u_char *, u_int, const u_char *);
extern void pim_print(netdissect_options *, const u_char *, u_int, const u_char *);
extern void pimv1_print(netdissect_options *, const u_char *, u_int);
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
extern u_int ppp_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern u_int pppoe_print(netdissect_options *, const u_char *, u_int);
extern void pptp_print(netdissect_options *, const u_char *);
extern int print_unknown_data(netdissect_options *, const u_char *, const char *, int);
Add some const qualifiers
2018-03-16 17:39:25 +08:00
extern const char *q922_string(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void q933_print(netdissect_options *, const u_char *, u_int);
extern void radius_print(netdissect_options *, const u_char *, u_int);
Initial support for the REdis Serialization Protocol known as RESP. This commit adds support for RESP as defined in: http://redis.io/topics/protocol. It also supports inline commands and pipelining. Due to the popularity of RESP, numerous services are emerging that use this protocol. You may decode RESP packets on arbitrary ports using the "-T resp" option. Example captures can be found in tests/resp_*. A simple way to test this parser is to start redis-server and then run redis-cli commands such as "redis-cli set key value". Traditionally, redis-cli monitor is used to debug redis. Unfortunately, the "monitor" command can cause significant load on a redis-server in production. This parser may be used as a non-invasive alternative to redis-cli monitor.
2016-01-13 01:32:55 +08:00
extern void resp_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void rip_print(netdissect_options *, const u_char *, u_int);
extern void ripng_print(netdissect_options *, const u_char *, unsigned int);
extern void rpki_rtr_print(netdissect_options *, const u_char *, u_int);
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
extern void rrcp_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *, const struct lladdr_info *);
NDOize LLDP, PPP and RSVP decoders
2014-04-02 20:39:18 +08:00
extern void rsvp_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern int rt6_print(netdissect_options *, const u_char *, const u_char *);
Add a routine to print "text protocols", and add FTP/HTTP/SMTP/RTSP support. "Text protocols" are protocols that have the general feel of FTP, with command lines with a command name and space-separated arguments and response lines beginning with a 3-digit reply code. They can also include HTTP-style headers and an entity body. We add support for the FTP control channel, HTTP, SMTP, and RTSP. We also change the SIP printer to use it.
2014-10-20 02:21:44 +08:00
extern void rtsp_print(netdissect_options *, const u_char *, u_int);
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
extern void rx_print(netdissect_options *, const u_char *, u_int, u_int, u_int, const u_char *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void sctp_print(netdissect_options *, const u_char *, const u_char *, u_int);
extern void sflow_print(netdissect_options *, const u_char *, u_int);
extern void sip_print(netdissect_options *, const u_char *, u_int);
extern void slow_print(netdissect_options *, const u_char *, u_int);
Rename some printer functions to *_print Moreover: Fix spaces.
2018-02-22 21:19:42 +08:00
extern void smb_data_print(netdissect_options *, const u_char *, u_int);
Clean up signed vs. unsigned. Use unsigned for lengths. Add additional length checks, as we can no longer cheat and rely on "underflow turns the length negative, so just check for > 0". Show most NBT and SMB numerical fields as unsigned, as that's what they are. Have "d" and "D" treat the value as signed; add "u" and "U" for unsigned values.
2018-01-07 14:18:00 +08:00
extern void smb_tcp_print(netdissect_options *, const u_char *, u_int);
Add a routine to print "text protocols", and add FTP/HTTP/SMTP/RTSP support. "Text protocols" are protocols that have the general feel of FTP, with command lines with a command name and space-separated arguments and response lines beginning with a 3-digit reply code. They can also include HTTP-style headers and an entity body. We add support for the FTP control channel, HTTP, SMTP, and RTSP. We also change the SIP printer to use it.
2014-10-20 02:21:44 +08:00
extern void smtp_print(netdissect_options *, const u_char *, u_int);
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
extern int snap_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void snmp_print(netdissect_options *, const u_char *, u_int);
extern void stp_print(netdissect_options *, const u_char *, u_int);
SUNRPC: Rename entry function Most printer entry functions are based on the file name (without print-). Do the same for SUNRPC (sunrpcrequest_print -> sunrpc_print). This change allows easier update by script.
2017-11-16 17:18:43 +08:00
extern void sunrpc_print(netdissect_options *, const u_char *, u_int, const u_char *);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void syslog_print(netdissect_options *, const u_char *, u_int);
extern void tcp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
extern void telnet_print(netdissect_options *, const u_char *, u_int);
extern void tftp_print(netdissect_options *, const u_char *, u_int);
extern void timed_print(netdissect_options *, const u_char *);
extern void tipc_print(netdissect_options *, const u_char *, u_int, u_int);
extern u_int token_print(netdissect_options *, const u_char *, u_int, u_int);
extern void udld_print(netdissect_options *, const u_char *, u_int);
extern void udp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
extern int vjc_print(netdissect_options *, const u_char *, u_short);
extern void vqp_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void vrrp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
extern void vtp_print(netdissect_options *, const u_char *, u_int);
Add printing function for Generic Protocol Extension for VXLAN and Network Service Header. This code stands for following internet drafts: - VXLAN GPE: draft-ietf-nvo3-vxlan-gpe-01 - NSH: draft-ietf-sfc-nsh-01
2015-11-16 00:24:19 +08:00
extern void vxlan_gpe_print(netdissect_options *ndo, const u_char *bp, u_int len);
Restore alphabetical order in Makefile.in and netdissect.h
2016-03-23 00:23:40 +08:00
extern void vxlan_print(netdissect_options *, const u_char *, u_int);
Use 'u_char *' type for input buffer pointer like in most similar cases
2018-01-03 02:08:01 +08:00
extern void wb_print(netdissect_options *, const u_char *, u_int);
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern void zephyr_print(netdissect_options *, const u_char *, int);
extern void zmtp1_print(netdissect_options *, const u_char *, u_int);
ZMTP: Rename a printer function Its name must end with '_print'
2017-11-16 21:17:26 +08:00
extern void zmtp1_datagram_print(netdissect_options *, const u_char *, const u_int);
Convert the IPv6 printer to use netdissect.
2010-11-08 04:50:16 +08:00
Checksum stuff must go in netdissect.h (remainder)
2015-06-10 22:17:27 +08:00
/* checksum routines */
extern void init_checksum(void);
extern uint16_t verify_crc10_cksum(uint16_t, const u_char *, int);
extern uint16_t create_osi_cksum(const uint8_t *, int, int);
Go with Wireshark's Internet checksum routine. The Wireshark routine is based on the BSD in-kernel portable checksum routine (thus BSD-licensed); it takes a vector of pointers and lengths and checksums the concatenation of the buffers in question (just as the BSD in-kernel routine checksums a chain of mbufs). This simplifies the "with a pseudo-header" checksums; hopefully it'll fix up the problems being seen on some big-endian platforms, which might be due to hand-calculating some or all of the checksum and doing so incorrectly. It also gets rid of some code that might be dereferencing unaligned pointers.
2011-06-14 05:08:51 +08:00
struct cksum_vec {
More getting rid of old u_intN_t.
2014-04-23 15:45:13 +08:00
const uint8_t *ptr;
Go with Wireshark's Internet checksum routine. The Wireshark routine is based on the BSD in-kernel portable checksum routine (thus BSD-licensed); it takes a vector of pointers and lengths and checksums the concatenation of the buffers in question (just as the BSD in-kernel routine checksums a chain of mbufs). This simplifies the "with a pseudo-header" checksums; hopefully it'll fix up the problems being seen on some big-endian platforms, which might be due to hand-calculating some or all of the checksum and doing so incorrectly. It also gets rid of some code that might be dereferencing unaligned pointers.
2011-06-14 05:08:51 +08:00
int len;
};
More getting rid of old u_intN_t.
2014-04-23 15:45:13 +08:00
extern uint16_t in_cksum(const struct cksum_vec *, int);
extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t);
Checksum stuff must go in netdissect.h
2015-06-10 21:47:54 +08:00
Have all Internet-checksum computing routines return a uint16_t. Those checksums are 16-bit; change the return types of those routines appropriately.
2018-12-11 16:50:15 +08:00
extern uint16_t nextproto4_cksum(netdissect_options *, const struct ip *, const uint8_t *, u_int, u_int, u_int);
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
Don't overwrite the destination IPv6 address for routing headers. If we have a routing header, instead of overwriting the packet's IPv6 destination address in the packet with the final destination, so that the next protocol's checksum routine can use it, we do as we do for IPv4, and, in the "next protocol checksum" routine, scan the headers looking for a routing header and, if we find one, copy the final destination from it. While we're at it, clean up a few things.
2016-02-13 12:26:39 +08:00
/* in print-ip6.c */
Have all Internet-checksum computing routines return a uint16_t. Those checksums are 16-bit; change the return types of those routines appropriately.
2018-12-11 16:50:15 +08:00
extern uint16_t nextproto6_cksum(netdissect_options *, const struct ip6_hdr *, const uint8_t *, u_int, u_int, u_int);
Don't overwrite the destination IPv6 address for routing headers. If we have a routing header, instead of overwriting the packet's IPv6 destination address in the packet with the final destination, so that the next protocol's checksum routine can use it, we do as we do for IPv4, and, in the "next protocol checksum" routine, scan the headers looking for a routing header and, if we find one, copy the final destination from it. While we're at it, clean up a few things.
2016-02-13 12:26:39 +08:00
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
/* Utilities */
Add the nd_print_trunc() function Use the ndo->ndo_protocol field to print a " [|protocol]" message.
2018-05-02 23:12:50 +08:00
extern void nd_print_trunc(netdissect_options *);
Add the nd_print_invalid() function It prints " (invalid)", used for malformed or corrupted packets. Moreover: Update CONTRIBUTING.
2018-09-11 18:27:55 +08:00
extern void nd_print_invalid(netdissect_options *);
Add the nd_print_trunc() function Use the ndo->ndo_protocol field to print a " [|protocol]" message.
2018-05-02 23:12:50 +08:00
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern int mask2plen(uint32_t);
extern int mask62plen(const u_char *);
added "make check" when optimization is not on, glibc6 doesn't define ntohs(), and our attempt to optimize it for x86 doesn't work --- the functions need to be static, not extern. added decryption of IKE v2 payloads, when keys are provided by -E.
2007-11-25 02:13:33 +08:00
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern const char *dnname_string(netdissect_options *, u_short);
extern const char *dnnum_string(netdissect_options *, u_short);
added "make check" when optimization is not on, glibc6 doesn't define ntohs(), and our attempt to optimize it for x86 doesn't work --- the functions need to be static, not extern. added decryption of IKE v2 payloads, when keys are provided by -E.
2007-11-25 02:13:33 +08:00
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
extern int decode_prefix4(netdissect_options *, const u_char *, u_int, char *, u_int);
extern int decode_prefix6(netdissect_options *, const u_char *, u_int, char *, u_int);
extern void esp_print_decodesecret(netdissect_options *);
extern int esp_print_decrypt_buffer_by_ikev2(netdissect_options *, int,
Clean up ISAKMP dissection, use nd_ types and EXTRACT_ macros. Add some RFC numbers. Structures with nd_ types work well if you overlay them on top of the packet buffer, but not as well with an on-the-stack structure into which you copy from the packet, which is ugly if you do *both* with the same structure. Use overlaying uniformly. Add EXTRACT_ macros as necessary for the nd_ types. Make stuff unsigned if it's appropriate. Use unsigned formats for unsigned values. A number of routines are passed the length of a payload, so they don't have to re-fetch that length themselves. That length has been pre-checked to make sure it's big enough for the payload header; note that in comments.
2017-12-18 13:49:46 +08:00
const u_char spii[8],
const u_char spir[8],
Reorganize netdissect.h Group together: - DLT printers (sorted) - other printers (sorted) - utilities
2015-09-18 21:14:31 +08:00
const u_char *, const u_char *);
Adding support for ISO CALM FAST and ETSI GeoNetworking
2013-06-26 05:43:19 +08:00
beginnings of library version of netdissect.
2004-03-25 11:29:53 +08:00
#endif /* netdissect_h */
Reference in New Issue Copy Permalink