"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "pcap-int.h" between
libpcap-1.10.0.tar.gz and libpcap-1.10.1.tar.gz

About: libpcap is a packet filter library used by tools like tcpdump.

pcap-int.h  (libpcap-1.10.0):pcap-int.h  (libpcap-1.10.1)
skipping to change at line 43 skipping to change at line 43
#ifndef pcap_int_h #ifndef pcap_int_h
#define pcap_int_h #define pcap_int_h
#include <stddef.h> #include <stddef.h>
#include <signal.h> #include <signal.h>
#include <pcap/pcap.h> #include <pcap/pcap.h>
#ifdef MSDOS
#include <fcntl.h>
#include <io.h>
#endif
#include "varattrs.h" #include "varattrs.h"
#include "fmtutils.h" #include "fmtutils.h"
#include <stdarg.h>
#include "portability.h"
/* /*
* Version string. * Version string.
* Uses PACKAGE_VERSION from config.h. * Uses PACKAGE_VERSION from config.h.
*/ */
#define PCAP_VERSION_STRING "libpcap version " PACKAGE_VERSION #define PCAP_VERSION_STRING "libpcap version " PACKAGE_VERSION
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
skipping to change at line 83 skipping to change at line 92
extern int pcap_new_api; extern int pcap_new_api;
/* /*
* If pcap_utf_8_mode is set, on Windows we treat strings as UTF-8. * If pcap_utf_8_mode is set, on Windows we treat strings as UTF-8.
* *
* On UN*Xes, we assume all strings are and should be in UTF-8, regardless * On UN*Xes, we assume all strings are and should be in UTF-8, regardless
* of the setting of this flag. * of the setting of this flag.
*/ */
extern int pcap_utf_8_mode; extern int pcap_utf_8_mode;
#ifdef MSDOS
#include <fcntl.h>
#include <io.h>
#endif
/* /*
* Swap byte ordering of unsigned long long timestamp on a big endian * Swap byte ordering of unsigned long long timestamp on a big endian
* machine. * machine.
*/ */
#define SWAPLL(ull) ((ull & 0xff00000000000000ULL) >> 56) | \ #define SWAPLL(ull) ((ull & 0xff00000000000000ULL) >> 56) | \
((ull & 0x00ff000000000000ULL) >> 40) | \ ((ull & 0x00ff000000000000ULL) >> 40) | \
((ull & 0x0000ff0000000000ULL) >> 24) | \ ((ull & 0x0000ff0000000000ULL) >> 24) | \
((ull & 0x000000ff00000000ULL) >> 8) | \ ((ull & 0x000000ff00000000ULL) >> 8) | \
((ull & 0x00000000ff000000ULL) << 8) | \ ((ull & 0x00000000ff000000ULL) << 8) | \
((ull & 0x0000000000ff0000ULL) << 24) | \ ((ull & 0x0000000000ff0000ULL) << 24) | \
skipping to change at line 436 skipping to change at line 440
const u_char **pkt; const u_char **pkt;
pcap_t *pd; pcap_t *pd;
}; };
#ifndef min #ifndef min
#define min(a, b) ((a) > (b) ? (b) : (a)) #define min(a, b) ((a) > (b) ? (b) : (a))
#endif #endif
int pcap_offline_read(pcap_t *, int, pcap_handler, u_char *); int pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
#include <stdarg.h>
#include "portability.h"
/* /*
* Does the packet count argument to a module's read routine say * Does the packet count argument to a module's read routine say
* "supply packets until you run out of packets"? * "supply packets until you run out of packets"?
*/ */
#define PACKET_COUNT_IS_UNLIMITED(count) ((count) <= 0) #define PACKET_COUNT_IS_UNLIMITED(count) ((count) <= 0)
/* /*
* Routines that most pcap implementations can use for non-blocking mode. * Routines that most pcap implementations can use for non-blocking mode.
*/ */
#if !defined(_WIN32) && !defined(MSDOS) #if !defined(_WIN32) && !defined(MSDOS)
skipping to change at line 595 skipping to change at line 595
/* /*
* Internal interfaces for doing user-mode filtering of packets and * Internal interfaces for doing user-mode filtering of packets and
* validating filter programs. * validating filter programs.
*/ */
/* /*
* Auxiliary data, for use when interpreting a filter intended for the * Auxiliary data, for use when interpreting a filter intended for the
* Linux kernel when the kernel rejects the filter (requiring us to * Linux kernel when the kernel rejects the filter (requiring us to
* run it in userland). It contains VLAN tag information. * run it in userland). It contains VLAN tag information.
*/ */
struct bpf_aux_data { struct pcap_bpf_aux_data {
u_short vlan_tag_present; u_short vlan_tag_present;
u_short vlan_tag; u_short vlan_tag;
}; };
/* /*
* Filtering routine that takes the auxiliary data as an additional * Filtering routine that takes the auxiliary data as an additional
* argument. * argument.
*/ */
u_int pcap_filter_with_aux_data(const struct bpf_insn *, u_int pcap_filter_with_aux_data(const struct bpf_insn *,
const u_char *, u_int, u_int, const struct bpf_aux_data *); const u_char *, u_int, u_int, const struct pcap_bpf_aux_data *);
/* /*
* Filtering routine that doesn't. * Filtering routine that doesn't.
*/ */
u_int pcap_filter(const struct bpf_insn *, const u_char *, u_int, u_int); u_int pcap_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
/* /*
* Routine to validate a BPF program. * Routine to validate a BPF program.
*/ */
int pcap_validate_filter(const struct bpf_insn *, int); int pcap_validate_filter(const struct bpf_insn *, int);
 End of changes. 6 change blocks. 
11 lines changed or deleted 11 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)