hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libpcap: update to 1.3.0

Browse Source 
Disabled canusb by setting ac_cv_header_libusb_1_0_libusb_h to no in
Makefile.  Upstream configure script ignores --disable-canusb.

Signed-off-by: Russell Senior <russell@personaltelco.net>

SVN-Revision: 36150
master
Felix Fietkau 12 years ago
parent 2a390f5706
commit 5a13c60771
4 changed files with 102 additions and 120 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      package/libs/libpcap/Makefile
  2. 130
      package/libs/libpcap/patches/100-debian_shared_lib.patch
  3. 37
      package/libs/libpcap/patches/102-makefile_disable_manpages.patch
  4. 43
      package/libs/libpcap/patches/202-protocol_api.patch

12
package/libs/libpcap/Makefile
Unescape View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2013 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libpcap PKG_NAME:=libpcap
PKG_VERSION:=1.1.1 PKG_VERSION:=1.3.0
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tcpdump.org/release/ PKG_SOURCE_URL:=http://www.tcpdump.org/release/
PKG_MD5SUM:=1bca27d206970badae248cfa471bbb47 PKG_MD5SUM:=f78455a92622b7a3c05c58b6ad1cec7e
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
@ -45,7 +45,9 @@ TARGET_CFLAGS += \
-fdata-sections -fdata-sections
CONFIGURE_VARS += \ CONFIGURE_VARS += \
ac_cv_linux_vers=$(LINUX_VERSION) ac_cv_linux_vers=$(LINUX_VERSION) \
ac_cv_header_libusb_1_0_libusb_h=no
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-shared \ --enable-shared \

130
package/libs/libpcap/patches/100-debian_shared_lib.patch
Unescape View File

@ -1,20 +1,15 @@
Debian-specific modifications to the upstream Makefile.in to Debian-specific modifications to the upstream Makefile.in to
build a shared library. build a shared library.
---
Makefile.in | 45 ++++++++++++++++++++++++++++++++++++++++++---
configure | 2 +-
configure.in | 2 +-
3 files changed, 44 insertions(+), 5 deletions(-)
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -40,6 +40,14 @@ mandir = @mandir@ @@ -40,6 +40,14 @@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
+# some defines for shared library compilation +# some defines for shared library compilation
+MAJ=1.1 +MAJ=1.3
+LIBVERSION=$(MAJ).1 +LIBVERSION=$(MAJ).0
+LIBNAME=pcap +LIBNAME=pcap
+LIBRARY=lib$(LIBNAME).a +LIBRARY=lib$(LIBNAME).a
+SOLIBRARY=lib$(LIBNAME).so +SOLIBRARY=lib$(LIBNAME).so
@ -23,28 +18,30 @@ build a shared library.
# #
# You shouldn't need to edit anything below. # You shouldn't need to edit anything below.
# #
@@ -59,6 +67,7 @@ PROG=libpcap @@ -60,7 +68,8 @@
PROG=libpcap
# Standard CFLAGS # Standard CFLAGS
CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
+FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) $(CPPFLAGS)
+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) +CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -78,7 +87,11 @@ YACC = @V_YACC@ @@ -80,7 +89,11 @@
# problem if you don't own the file but can write to the directory. # problem if you don't own the file but can write to the directory.
.c.o: .c.o:
@rm -f $@ @rm -f $@
- $(CC) $(CFLAGS) -c $(srcdir)/$*.c - $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
+ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c + $(CC) $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c
+ +
+%_pic.o: %.c +%_pic.o: %.c
+ @rm -f $@ + @rm -f $@
+ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c + $(CC) -fPIC $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c
PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@ PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@ @NETFILTER_SRC@ @CANUSB_SRC@
FSRC = fad-@V_FINDALLDEVS@.c FSRC = fad-@V_FINDALLDEVS@.c
@@ -94,6 +107,7 @@ SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $( @@ -96,6 +109,7 @@
# We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
# hack the extra indirection # hack the extra indirection
OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
@ -52,97 +49,77 @@ build a shared library.
PUBHDR = \ PUBHDR = \
pcap.h \ pcap.h \
pcap-bpf.h \ pcap-bpf.h \
@@ -131,7 +145,7 @@ TAGFILES = \ @@ -148,7 +162,7 @@
CLEANFILES = $(OBJ) libpcap.* filtertest findalldevstest selpolltest \ CLEANFILES = $(OBJ) libpcap.* $(TESTS) \
opentest $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \ $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
- lex.yy.c pcap-config - lex.yy.c pcap-config
+ lex.yy.c pcap-config $(OBJ_PIC) + lex.yy.c pcap-config $(OBJ_PIC)
MAN1 = pcap-config.1 MAN1 = pcap-config.1
@@ -324,21 +338,14 @@ EXTRA_DIST = \ @@ -352,7 +366,7 @@
Win32/Src/inet_net.c \ $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
Win32/Src/inet_pton.c
-all: libpcap.a shared pcap-config
+all: libpcap.a shared pcap-config $(SHAREDLIB)
libpcap.a: $(OBJ)
@rm -f $@
ar rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
$(RANLIB) $@ $(RANLIB) $@
-shared: libpcap.$(DYEXT) -shared: libpcap.$(DYEXT)
-
-libpcap.so: $(OBJ)
- @rm -f $@
- VER=`cat $(srcdir)/VERSION`; \
- MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
- @V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.$$MAJOR_VER $(LDFLAGS) \
- -o $@.$$VER $(OBJ) $(ADDLOBJS) $(LIBS)
+shared: $(SHAREDLIB) +shared: $(SHAREDLIB)
# libpcap.so: $(OBJ)
# The following rule succeeds, but the result is untested. @rm -f $@
@@ -409,6 +416,13 @@ libpcap.shareda: $(OBJ) @@ -430,6 +444,13 @@
# #
libpcap.none: libpcap.none:
+$(SHAREDLIB): $(OBJ_PIC) +$(SHAREDLIB): $(OBJ_PIC)
+ -@rm -f $@ + -@rm -f $@
+ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) + -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc + $(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $(SHAREDLIB) $(OBJ_PIC) -lc $(LIBS)
+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) + ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) + ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
+ +
scanner.c: $(srcdir)/scanner.l scanner.c: $(srcdir)/scanner.l
@rm -f $@ @rm -f $@
$(srcdir)/runlex.sh $(LEX) -o$@ $< $(srcdir)/runlex.sh $(LEX) -o$@ $<
@@ -416,6 +430,9 @@ scanner.c: $(srcdir)/scanner.l @@ -437,6 +458,9 @@
scanner.o: scanner.c tokdefs.h scanner.o: scanner.c tokdefs.h
$(CC) $(CFLAGS) -c scanner.c $(CC) $(FULL_CFLAGS) -c scanner.c
+scanner_pic.o: scanner.c tokdefs.h +scanner_pic.o: scanner.c tokdefs.h
+ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c + $(CC) -fPIC $(FULL_CFLAGS) -o $@ -c scanner.c
+ +
pcap.o: version.h pcap.o: version.h
tokdefs.h: grammar.c tokdefs.h: grammar.c
@@ -429,9 +446,17 @@ grammar.o: grammar.c @@ -450,9 +474,16 @@
@rm -f $@ @rm -f $@
$(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c $(CC) $(FULL_CFLAGS) -Dyylval=pcap_lval -c grammar.c
+grammar_pic.o: grammar.c +grammar_pic.o: grammar.c
+ @rm -f $@ + @rm -f $@
+ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c + $(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
+ +
version.o: version.c version.o: version.c
$(CC) $(CFLAGS) -c version.c $(CC) $(FULL_CFLAGS) -c version.c
+version_pic.o: version.c +version_pic.o: version.c
+ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ + $(CC) -fPIC $(FULL_CFLAGS) -c version.c -o $@
+
+ +
snprintf.o: $(srcdir)/missing/snprintf.c snprintf.o: $(srcdir)/missing/snprintf.c
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
@@ -469,6 +494,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt @@ -490,6 +521,9 @@
bpf_filter.o: bpf_filter.c bpf_filter.o: bpf_filter.c
$(CC) $(CFLAGS) -c bpf_filter.c $(CC) $(FULL_CFLAGS) -c bpf_filter.c
+bpf_filter_pic.o: bpf_filter.c +bpf_filter_pic.o: bpf_filter.c
+ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ + $(CC) -fPIC $(FULL_CFLAGS) -c bpf_filter.c -o $@
+ +
# #
# Generate the pcap-config script. # Generate the pcap-config script.
# #
@@ -562,14 +590,12 @@ install: install-shared install-archive @@ -607,11 +641,9 @@
$(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done install-shared-so: libpcap.so
install-shared: install-shared-$(DYEXT)
-install-shared-so: libpcap.so
+install-shared-so: $(SHAREDLIB)
[ -d $(DESTDIR)$(libdir) ] || \ [ -d $(DESTDIR)$(libdir) ] || \
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
- VER=`cat $(srcdir)/VERSION`; \ - VER=`cat $(srcdir)/VERSION`; \
@ -156,18 +133,18 @@ build a shared library.
install-shared-dylib: libpcap.dylib install-shared-dylib: libpcap.dylib
[ -d $(DESTDIR)$(libdir) ] || \ [ -d $(DESTDIR)$(libdir) ] || \
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
--- a/configure --- a/aclocal.m4
+++ b/configure +++ b/aclocal.m4
@@ -3229,7 +3229,7 @@ _ACEOF @@ -262,7 +262,7 @@
# or accepts command-line arguments like esac
# those the GNU linker accepts. ;;
# esac
- V_CCOPT="$V_CCOPT -fpic" - V_CCOPT="$V_CCOPT $PIC_OPT"
+ V_CCOPT="$V_CCOPT" + V_CCOPT="$V_CCOPT"
V_SONAME_OPT="-Wl,-soname," V_SONAME_OPT="-Wl,-soname,"
V_RPATH_OPT="-Wl,-rpath," V_RPATH_OPT="-Wl,-rpath,"
;; ;;
@@ -3292,7 +3292,7 @@ _ACEOF @@ -325,7 +325,7 @@
# #
# "cc" is GCC. # "cc" is GCC.
# #
@ -176,3 +153,22 @@ build a shared library.
V_SHLIB_CMD="\$(CC)" V_SHLIB_CMD="\$(CC)"
V_SHLIB_OPT="-shared" V_SHLIB_OPT="-shared"
V_SONAME_OPT="-Wl,-soname," V_SONAME_OPT="-Wl,-soname,"
--- a/pcap-config.in
+++ b/pcap-config.in
@@ -36,16 +36,6 @@
esac
shift
done
-if [ "$V_RPATH_OPT" != "" ]
-then
- #
- # If libdir isn't /usr/lib, add it to the run-time linker path.
- #
- if [ "$libdir" != "/usr/lib" ]
- then
- RPATH=$V_RPATH_OPT$libdir
- fi
-fi
if [ "$static" = 1 ]
then
#

37
package/libs/libpcap/patches/102-makefile_disable_manpages.patch
Unescape View File

@ -1,6 +1,6 @@
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -532,62 +532,12 @@ install: install-shared install-archive @@ -571,71 +571,12 @@ install: install-shared install-archive
(mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
[ -d $(DESTDIR)$(includedir)/pcap ] || \ [ -d $(DESTDIR)$(includedir)/pcap ] || \
(mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap) (mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap)
@ -33,12 +33,21 @@
- rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap - rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ - ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
- $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap - $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap
- ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3pcap \
- $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap - rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ - ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
- $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap - $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap - rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ - ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
- $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap - $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap
- ln $(DESTDIR)$(mandir)/man3/pcap_list_datalinks.3pcap \
- $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap
- ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3pcap \
- $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap - rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ - ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
- $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap - $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
@ -62,28 +71,4 @@
- $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done - $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
install-shared: install-shared-$(DYEXT) install-shared: install-shared-$(DYEXT)
install-shared-so: $(SHAREDLIB) install-shared-so: libpcap.so
@@ -642,23 +592,6 @@ uninstall: uninstall-shared
rm -f $(DESTDIR)$(includedir)/$$i; done
-rmdir $(DESTDIR)$(includedir)/pcap
rm -f $(DESTDIR)/$(bindir)/pcap-config
- for i in $(MAN1); do \
- rm -f $(DESTDIR)$(mandir)/man1/$$i; done
- for i in $(MAN3PCAP); do \
- rm -f $(DESTDIR)$(mandir)/man3/$$i; done
- rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
- rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
- for i in $(MANFILE); do \
- rm -f $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
- for i in $(MANMISC); do \
- rm -f $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
uninstall-shared: uninstall-shared-$(DYEXT)
uninstall-shared-so:

43
package/libs/libpcap/patches/202-protocol_api.patch
Unescape View File

@ -4,13 +4,13 @@
char *source; char *source;
int promisc; int promisc;
int rfmon; int rfmon;
+ int proto; /* protocol for packet socket (linux) */ + int proto; /* protocol for packet socket (linux) */
int tstamp_type;
}; };
/*
--- a/pcap-linux.c --- a/pcap-linux.c
+++ b/pcap-linux.c +++ b/pcap-linux.c
@@ -335,7 +335,7 @@ static int iface_get_id(int fd, const ch @@ -363,7 +363,7 @@ static int iface_get_id(int fd, const ch
static int iface_get_mtu(int fd, const char *device, char *ebuf); static int iface_get_mtu(int fd, const char *device, char *ebuf);
static int iface_get_arptype(int fd, const char *device, char *ebuf); static int iface_get_arptype(int fd, const char *device, char *ebuf);
#ifdef HAVE_PF_PACKET_SOCKETS #ifdef HAVE_PF_PACKET_SOCKETS
@ -19,7 +19,7 @@
#ifdef IW_MODE_MONITOR #ifdef IW_MODE_MONITOR
static int has_wext(int sock_fd, const char *device, char *ebuf); static int has_wext(int sock_fd, const char *device, char *ebuf);
#endif /* IW_MODE_MONITOR */ #endif /* IW_MODE_MONITOR */
@@ -881,7 +881,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle) @@ -980,7 +980,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle)
* (We assume that if we have Wireless Extensions support * (We assume that if we have Wireless Extensions support
* we also have PF_PACKET support.) * we also have PF_PACKET support.)
*/ */
@ -28,7 +28,7 @@
if (sock_fd == -1) { if (sock_fd == -1) {
(void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, (void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "socket: %s", pcap_strerror(errno));
@@ -1128,6 +1128,9 @@ pcap_activate_linux(pcap_t *handle) @@ -1266,6 +1266,9 @@ pcap_activate_linux(pcap_t *handle)
handle->read_op = pcap_read_linux; handle->read_op = pcap_read_linux;
handle->stats_op = pcap_stats_linux; handle->stats_op = pcap_stats_linux;
@ -38,7 +38,7 @@
/* /*
* The "any" device is a special device which causes us not * The "any" device is a special device which causes us not
* to bind to a particular device and thus to look at all * to bind to a particular device and thus to look at all
@@ -2684,8 +2687,8 @@ activate_new(pcap_t *handle) @@ -2897,8 +2900,8 @@ activate_new(pcap_t *handle)
* try a SOCK_RAW socket for the raw interface. * try a SOCK_RAW socket for the raw interface.
*/ */
sock_fd = is_any_device ? sock_fd = is_any_device ?
@ -48,8 +48,8 @@
+ socket(PF_PACKET, SOCK_RAW, handle->opt.proto); + socket(PF_PACKET, SOCK_RAW, handle->opt.proto);
if (sock_fd == -1) { if (sock_fd == -1) {
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", if (errno == EINVAL || errno == EAFNOSUPPORT) {
@@ -2783,7 +2786,7 @@ activate_new(pcap_t *handle) @@ -3015,7 +3018,7 @@ activate_new(pcap_t *handle)
return PCAP_ERROR; return PCAP_ERROR;
} }
sock_fd = socket(PF_PACKET, SOCK_DGRAM, sock_fd = socket(PF_PACKET, SOCK_DGRAM,
@ -58,7 +58,7 @@
if (sock_fd == -1) { if (sock_fd == -1) {
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "socket: %s", pcap_strerror(errno));
@@ -2835,7 +2838,7 @@ activate_new(pcap_t *handle) @@ -3078,7 +3081,7 @@ activate_new(pcap_t *handle)
} }
if ((err = iface_bind(sock_fd, handle->md.ifindex, if ((err = iface_bind(sock_fd, handle->md.ifindex,
@ -67,7 +67,7 @@
close(sock_fd); close(sock_fd);
if (err < 0) if (err < 0)
return err; return err;
@@ -3640,7 +3643,7 @@ iface_get_id(int fd, const char *device, @@ -4149,7 +4152,7 @@ iface_get_id(int fd, const char *device,
* or a PCAP_ERROR_ value on a hard error. * or a PCAP_ERROR_ value on a hard error.
*/ */
static int static int
@ -76,7 +76,7 @@
{ {
struct sockaddr_ll sll; struct sockaddr_ll sll;
int err; int err;
@@ -3649,7 +3652,7 @@ iface_bind(int fd, int ifindex, char *eb @@ -4158,7 +4161,7 @@ iface_bind(int fd, int ifindex, char *eb
memset(&sll, 0, sizeof(sll)); memset(&sll, 0, sizeof(sll));
sll.sll_family = AF_PACKET; sll.sll_family = AF_PACKET;
sll.sll_ifindex = ifindex; sll.sll_ifindex = ifindex;
@ -85,7 +85,7 @@
if (bind(fd, (struct sockaddr *) &sll, sizeof(sll)) == -1) { if (bind(fd, (struct sockaddr *) &sll, sizeof(sll)) == -1) {
if (errno == ENETDOWN) { if (errno == ENETDOWN) {
@@ -4359,7 +4362,7 @@ activate_old(pcap_t *handle) @@ -5040,7 +5043,7 @@ activate_old(pcap_t *handle)
/* Open the socket */ /* Open the socket */
@ -96,20 +96,18 @@
"socket: %s", pcap_strerror(errno)); "socket: %s", pcap_strerror(errno));
--- a/pcap.c --- a/pcap.c
+++ b/pcap.c +++ b/pcap.c
@@ -258,6 +258,8 @@ pcap_create_common(const char *source, c @@ -309,6 +309,7 @@ pcap_create_common(const char *source, c
pcap_set_snaplen(p, 65535); /* max packet size */ pcap_set_snaplen(p, 65535); /* max packet size */
p->opt.promisc = 0; p->opt.promisc = 0;
p->opt.buffer_size = 0; p->opt.buffer_size = 0;
+ p->opt.proto = -1; + p->opt.proto = -1;
+ p->opt.tstamp_type = -1; /* default to not setting time stamp type */
return (p); return (p);
} }
@@ -405,6 +406,15 @@ pcap_set_buffer_size(pcap_t *p, int buff
@@ -317,6 +319,15 @@ pcap_set_buffer_size(pcap_t *p, int buff
return 0;
} }
+int int
+pcap_set_protocol(pcap_t *p, unsigned short proto) +pcap_set_protocol(pcap_t *p, unsigned short proto)
+{ +{
+ if (pcap_check_activated(p)) + if (pcap_check_activated(p))
@ -118,9 +116,10 @@
+ return 0; + return 0;
+} +}
+ +
int +int
pcap_activate(pcap_t *p) pcap_activate(pcap_t *p)
{ {
int status;
--- a/pcap/pcap.h --- a/pcap/pcap.h
+++ b/pcap/pcap.h +++ b/pcap/pcap.h
@@ -68,6 +68,7 @@ extern "C" { @@ -68,6 +68,7 @@ extern "C" {
@ -131,11 +130,11 @@
/* /*
* Compatibility for systems that have a bpf.h that * Compatibility for systems that have a bpf.h that
@@ -276,6 +277,7 @@ int pcap_can_set_rfmon(pcap_t *); @@ -280,6 +281,7 @@ int pcap_set_rfmon(pcap_t *, int);
int pcap_set_rfmon(pcap_t *, int);
int pcap_set_timeout(pcap_t *, int); int pcap_set_timeout(pcap_t *, int);
int pcap_set_tstamp_type(pcap_t *, int);
int pcap_set_buffer_size(pcap_t *, int); int pcap_set_buffer_size(pcap_t *, int);
+int pcap_set_protocol(pcap_t *, unsigned short); +int pcap_set_protocol(pcap_t *, unsigned short);
int pcap_activate(pcap_t *); int pcap_activate(pcap_t *);
pcap_t *pcap_open_live(const char *, int, int, int, char *); int pcap_list_tstamp_types(pcap_t *, int **);

Write Preview
Loading…
Cancel
Save