"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ngrep.h" between
ngrep-1_45.tar.gz and ngrep-1_47.tar.gz

About: ngrep (network grep) applies GNU grep’s common features to the network layer.

ngrep.h  (ngrep-1_45)	:	ngrep.h  (ngrep-1_47)
/*		/*
* $Id$		* Copyright (c) 2017 Jordan Ritter <jpr5@darkridge.com>
*
* Copyright (c) 2006 Jordan Ritter <jpr5@darkridge.com>
*		*
* Please refer to the LICENSE file for more information.		* Please refer to the LICENSE file for more information.
*		*
*/		*/
#define VERSION "1.45"		#define VERSION "1.47.1-git"
/*		/*
* We cache the standard frame sizes here to save us time and		* We cache the standard frame sizes here to save us time and
* additional dependencies on more operating system include files.		* additional dependencies on more operating system include files.
*/		*/
#define ETHHDR_SIZE 14		#define ETHHDR_SIZE 14
#define TOKENRING_SIZE 22		#define TOKENRING_SIZE 22
#define PPPHDR_SIZE 4		#define PPPHDR_SIZE 4
#define SLIPHDR_SIZE 16		#define SLIPHDR_SIZE 16
#define RAWHDR_SIZE 0		#define RAWHDR_SIZE 0
#define LOOPHDR_SIZE 4		#define LOOPHDR_SIZE 4
#define FDDIHDR_SIZE 21		#define FDDIHDR_SIZE 21
#define ISDNHDR_SIZE 16		#define ISDNHDR_SIZE 16
#define IEEE80211HDR_SIZE 32		#define IEEE80211HDR_SIZE 32
		#define PFLOGHDR_SIZE 48
		#define VLANHDR_SIZE 4
		#define IPNETHDR_SIZE 24
		#ifndef ETHERTYPE_IP
		#define ETHERTYPE_IP 0x0800
		#endif
		#ifndef ETHERTYPE_IPV6
		#define ETHERTYPE_IPV6 0x86dd
		#endif
		#define EXTRACT_16BITS(p) \
		((uint16_t)((uint16_t)*((const uint8_t *)(p) + 0) << 8 | \
		(uint16_t)*((const uint8_t *)(p) + 1)))
		#define _atoui32(p) \
		((uint32_t)strtoul((p), (char **)NULL, 10))
/*		/*
* Default patterns for BPF and regular expression filters.		* Default patterns for BPF and regular expression filters.
		*
		* When targeting IP frames with a BPF filter, optionally-present VLAN frames
		* will be excluded by default, thus any IP traffic on a VLAN'd network is
		* invisible to ngrep by default. This requires the user to specify "vlan"
		* every time they are on a VLAN'd network, which gets irritating fast.
		*
		* In turn, this leads to a surprising behavior when working with pcap dump
		* files created from a "vlan" filter: reading and re-processing them requires
		* the same "vlan" filter to be specified, otherwise the traffic will be
		* invisible. IOW, when the dump reader is targeting IP traffic in the dump but
		* doesn't know (or remember) the "vlan" filter was specified, they will see
		* nothing -- and mistakenly blame ngrep.
		*
		* While the behavior is technically consistent, to the user it can be
		* surprising, confusing, and therefore Dumb As Shit. For convenience' sake, we
		* fix this for them by including VLAN (optionally) back into the stream
		* targeting IP traffic, and compensating for the variable offset in the packet
		* decoder.
*/		*/
#if USE_IPv6		#if USE_IPv6
#define BPF_FILTER_IP "(ip or ip6)"		#define BPF_FILTER_IP_TYPE "(ip || ip6)"
#else		#else
#define BPF_FILTER_IP "(ip)"		#define BPF_FILTER_IP_TYPE "(ip)"
#endif		#endif
#define BPF_FILTER_OTHER " and ( %s)"		#define BPF_TEMPLATE_IP BPF_FILTER_IP_TYPE
#define BPF_MAIN_FILTER BPF_FILTER_IP BPF_FILTER_OTHER		#define BPF_TEMPLATE_IP_VLAN "(" BPF_FILTER_IP_TYPE " || (vlan && " BPF
		_FILTER_IP_TYPE "))"
		#define BPF_TEMPLATE_USERSPEC_IP "( %s) and " BPF_TEMPLATE_IP
		#define BPF_TEMPLATE_USERSPEC_IP_VLAN "( %s) and " BPF_TEMPLATE_IP_VLAN
#define WORD_REGEX "((^%s\\W)|(\\W%s$)|(\\W%s\\W))"		#define WORD_REGEX "((^%s\\W)|(\\W%s$)|(\\W%s\\W))"
/*		/*
* For retarded operating systems like Solaris that don't have this,		* For retarded operating systems like Solaris that don't have this,
* when everyone else does. Good job, Sun!		* when everyone else does. Good job, Sun!
*/		*/
#ifndef IP_OFFMASK		#ifndef IP_OFFMASK
#define IP_OFFMASK 0x1fff		#define IP_OFFMASK 0x1fff
skipping to change at line 75		skipping to change at line 110
*/		*/
typedef enum {		typedef enum {
TCP = 'T', UDP = 'U', ICMP = 'I', ICMPv6 = 'I', IGMP = 'G', UNKNOWN = '?'		TCP = 'T', UDP = 'U', ICMP = 'I', ICMPv6 = 'I', IGMP = 'G', UNKNOWN = '?'
} netident_t;		} netident_t;
/*		/*
* Prototypes function signatures.		* Prototypes function signatures.
*/		*/
		int setup_pcap_source(void);
		int setup_bpf_filter(char **);
		int setup_matcher(void);
void process(u_char *, struct pcap_pkthdr *, u_char *);		void process(u_char *, struct pcap_pkthdr *, u_char *);
void version(void);		void version(void);
void usage(int8_t);		void usage();
		void update_windowsize(int32_t);
void clean_exit(int32_t);		void clean_exit(int32_t);
void dump_packet(struct pcap_pkthdr *, u_char *, uint8_t, unsigned char *, uint3 2_t,		void dump_packet(struct pcap_pkthdr *, u_char *, uint8_t, unsigned char *, uint3 2_t,
const char *, const char *, uint16_t, uint16_t, uint8_t,		const char *, const char *, uint16_t, uint16_t, uint8_t,
uint16_t, uint8_t, uint16_t, uint32_t);		uint16_t, uint8_t, uint16_t, uint32_t);
void dump_unwrapped(unsigned char *, uint32_t);		void dump_unwrapped(unsigned char *, uint32_t, uint16_t, uint16_t);
void dump_formatted(unsigned char *, uint32_t);		void dump_formatted(unsigned char *, uint32_t, uint16_t, uint16_t);
void dump_byline (unsigned char *, uint32_t);		void dump_byline (unsigned char *, uint32_t, uint16_t, uint16_t);
void dump_delay_proc_init(struct pcap_pkthdr *);		void dump_delay_proc_init(struct pcap_pkthdr *);
void dump_delay_proc (struct pcap_pkthdr *);		void dump_delay_proc (struct pcap_pkthdr *);
int8_t re_match_func (unsigned char *, uint32_t);		int8_t re_match_func (unsigned char *, uint32_t, uint16_t *, uint16_t *);
int8_t bin_match_func (unsigned char *, uint32_t);		int8_t bin_match_func (unsigned char *, uint32_t, uint16_t *, uint16_t *);
int8_t blank_match_func(unsigned char *, uint32_t);		int8_t blank_match_func(unsigned char *, uint32_t, uint16_t *, uint16_t *);
void print_time_absolute(struct pcap_pkthdr *);		void print_time_absolute(struct pcap_pkthdr *);
void print_time_diff (struct pcap_pkthdr *);		void print_time_diff (struct pcap_pkthdr *);
		void print_time_offset (struct pcap_pkthdr *);
char *get_filter_from_string(char *);		char *get_filter_from_string(char *);
char *get_filter_from_argv (char **);		char *get_filter_from_argv (char **);
uint8_t strishex(char *);		uint8_t strishex(char *);
#if !defined(_WIN32)		#if !defined(_WIN32)
void update_windowsize(int32_t);
void drop_privs(void);		void drop_privs(void);
#endif		#endif
#if defined(_WIN32)		#if defined(_WIN32)
int8_t win32_initwinsock(void);		int8_t win32_initwinsock(void);
void win32_listdevices(void);		void win32_listdevices(void);
char *win32_usedevice(const char *);		char *win32_usedevice(const char *);
		char *win32_choosedevice(void);
#endif		#endif
struct NGREP_rtaphdr_t {		struct NGREP_rtaphdr_t {
uint8_t it_version;		uint8_t it_version;
uint8_t it_pad;		uint8_t it_pad;
uint16_t it_len;		uint16_t it_len;
uint32_t it_present;		uint32_t it_present;
};		};
		/*
		* ANSI color/hilite stuff.
		*/
		const char ANSI_red[] = "\33[01;31m";
		const char ANSI_bold[] = "\33[01m";
		const char *ANSI_hilite = ANSI_red;
		const char ANSI_off[] = "\33[00m";
End of changes. 15 change blocks.
16 lines changed or deleted		58 lines changed or added

---