- Update to 1.10.0 * Require, and assume, some level of C99 support in the C compiler * Add support for capturing on DPDK devices * rpcap: support rpcap-over-TLS * Fix some memory leaks, including in pcap_compile() * Linux: handle systems without AF_INET or AF_UNIX socket support * Catch invalid IPv4 addresses in filters * Show special Linux BPF offsets symbolically in bpf_image() and bpf_dump() * Linux: get rid of Wireless Extensions for turning monitor mode on * Linux: proper memory sync for PACKET_MMAP * Linux: drop support for libnl 1 and 2. * Linux: Require PF_PACKET support, and kernel 2.6.27 or later * Add DLT_LINUX_SLL2 * Add a new filter "ifindex" for DLT_LINUX_SLL2 files and live Linux captures * optimizer: add a hack to try to catch certain optimizer loops * Probe CONFIGURATION descriptor of connected USB devices * Linux: return error on interface going away, but not if it just went down * Linux: set socket protocol only after packet ring configured, reducing bogus packet drop reports * Linux: get ifdrop stats from sysfs. * Fix various security issues reported by Charles Smith at Tangible Security * Fix various security issues reported by Include Security * rpcapd: on UN*X, don't tell the client why authentication failed * Linux: when adjusting BPF programs, do not subtract the SLL[2]_HDR_LEN if the location is negative (special metadata offset) OBS-URL: https://build.opensuse.org/request/show/872631 OBS-URL: https://build.opensuse.org/package/show/Base:System/libpcap?expand=0&rev=71
26 lines
791 B
Diff
26 lines
791 B
Diff
From b9fa92532328daad84766753422e8a21fd474e6f Mon Sep 17 00:00:00 2001
|
|
From: Michal Sekletar <msekleta@redhat.com>
|
|
Date: Mon, 29 Sep 2014 08:37:25 +0200
|
|
Subject: [PATCH 3/4] pcap-linux: apparently ctc interfaces on s390 has
|
|
ethernet DLT
|
|
|
|
---
|
|
pcap-linux.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
Index: libpcap-1.10.0/pcap-linux.c
|
|
===================================================================
|
|
--- libpcap-1.10.0.orig/pcap-linux.c
|
|
+++ libpcap-1.10.0/pcap-linux.c
|
|
@@ -2461,6 +2461,10 @@ activate_pf_packet(pcap_t *handle, int i
|
|
}
|
|
}
|
|
|
|
+ /* Hack to make things work on s390 ctc interfaces */
|
|
+ if (strncmp("ctc", device, 3) == 0)
|
|
+ handle->linktype = DLT_EN10MB;
|
|
+
|
|
handlep->ifindex = iface_get_id(sock_fd, device,
|
|
handle->errbuf);
|
|
if (handlep->ifindex == -1) {
|