domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libpcap: update to version 1.7.4

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 46776
This commit is contained in:
Felix Fietkau
2015-09-03 13:14:56 +00:00
parent 55a76c19b1
commit 41a9f280c4
6 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -380,7 +380,7 @@ static int iface_get_id(int fd, const ch
@@ -414,7 +414,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_arptype(int fd, const char *device, char *ebuf);
#ifdef HAVE_PF_PACKET_SOCKETS
@@ -9,7 +9,7 @@
#ifdef IW_MODE_MONITOR
static int has_wext(int sock_fd, const char *device, char *ebuf);
#endif /* IW_MODE_MONITOR */
@@ -963,7 +963,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle)
@@ -1028,7 +1028,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle)
* (We assume that if we have Wireless Extensions support
* we also have PF_PACKET support.)
*/
@@ -18,7 +18,7 @@
if (sock_fd == -1) {
(void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno));
@@ -1251,6 +1251,9 @@ pcap_activate_linux(pcap_t *handle)
@@ -1337,6 +1337,9 @@ pcap_activate_linux(pcap_t *handle)
handle->read_op = pcap_read_linux;
handle->stats_op = pcap_stats_linux;
@@ -28,7 +28,7 @@
/*
* The "any" device is a special device which causes us not
* to bind to a particular device and thus to look at all
@@ -3012,8 +3015,8 @@ activate_new(pcap_t *handle)
@@ -3160,8 +3163,8 @@ activate_new(pcap_t *handle)
* try a SOCK_RAW socket for the raw interface.
*/
sock_fd = is_any_device ?
@@ -39,7 +39,7 @@
if (sock_fd == -1) {
if (errno == EINVAL || errno == EAFNOSUPPORT) {
@@ -3130,7 +3133,7 @@ activate_new(pcap_t *handle)
@@ -3279,7 +3282,7 @@ activate_new(pcap_t *handle)
return PCAP_ERROR;
}
sock_fd = socket(PF_PACKET, SOCK_DGRAM,
@@ -48,7 +48,7 @@
if (sock_fd == -1) {
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno));
@@ -3193,7 +3196,7 @@ activate_new(pcap_t *handle)
@@ -3343,7 +3346,7 @@ activate_new(pcap_t *handle)
}
if ((err = iface_bind(sock_fd, handlep->ifindex,
@@ -57,7 +57,7 @@
close(sock_fd);
if (err < 0)
return err;
@@ -4667,7 +4670,7 @@ iface_get_id(int fd, const char *device,
@@ -5050,7 +5053,7 @@ iface_get_id(int fd, const char *device,
* or a PCAP_ERROR_ value on a hard error.
*/
static int
@@ -66,7 +66,7 @@
{
struct sockaddr_ll sll;
int err;
@@ -4676,7 +4679,7 @@ iface_bind(int fd, int ifindex, char *eb
@@ -5059,7 +5062,7 @@ iface_bind(int fd, int ifindex, char *eb
memset(&sll, 0, sizeof(sll));
sll.sll_family = AF_PACKET;
sll.sll_ifindex = ifindex;
@@ -75,7 +75,7 @@
if (bind(fd, (struct sockaddr *) &sll, sizeof(sll)) == -1) {
if (errno == ENETDOWN) {
@@ -5561,7 +5564,7 @@ activate_old(pcap_t *handle)
@@ -6049,7 +6052,7 @@ activate_old(pcap_t *handle)
/* Open the socket */
@@ -86,15 +86,15 @@
"socket: %s", pcap_strerror(errno));
--- a/pcap.c
+++ b/pcap.c
@@ -556,6 +556,7 @@ pcap_create_common(const char *source, c
@@ -562,6 +562,7 @@ pcap_create_common(const char *source, c
p->opt.promisc = 0;
p->opt.rfmon = 0;
p->opt.immediate = 0;
+ p->opt.proto = -1;
p->opt.tstamp_type = -1; /* default to not setting time stamp type */
p->opt.tstamp_precision = PCAP_TSTAMP_PRECISION_MICRO;
return (p);
@@ -713,6 +714,15 @@ pcap_get_tstamp_precision(pcap_t *p)
@@ -725,6 +726,15 @@ pcap_get_tstamp_precision(pcap_t *p)
}
int
@@ -112,7 +112,7 @@
int status;
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -68,6 +68,7 @@ extern "C" {
@@ -66,6 +66,7 @@ extern "C" {
#define PCAP_VERSION_MINOR 4
#define PCAP_ERRBUF_SIZE 256
@@ -130,7 +130,7 @@
int pcap_activate(pcap_t *);
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -88,6 +88,7 @@ struct pcap_opt {
@@ -109,6 +109,7 @@ struct pcap_opt {
char *source;
int timeout; /* timeout for buffering */
int buffer_size;