diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2019-02-17 15:15:34 +0100 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2019-02-17 15:17:54 +0100 |
| commit | e2c5f5be51b7e3144c853d05d2bd055be0074afa (patch) | |
| tree | 17bb295f75ba69ace253eb9c9bfcf89007af887d /net-analyzer/fragroute/files | |
| parent | net-print/cups-filters: Bump to version 1.22.1 (diff) | |
| download | gentoo-e2c5f5be51b7e3144c853d05d2bd055be0074afa.tar.gz gentoo-e2c5f5be51b7e3144c853d05d2bd055be0074afa.tar.bz2 gentoo-e2c5f5be51b7e3144c853d05d2bd055be0074afa.zip | |
net-analyzer/fragroute: Fix pcap_open clash
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/662474
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'net-analyzer/fragroute/files')
| -rw-r--r-- | net-analyzer/fragroute/files/fragroute-1.2.6-pcap_open.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/net-analyzer/fragroute/files/fragroute-1.2.6-pcap_open.patch b/net-analyzer/fragroute/files/fragroute-1.2.6-pcap_open.patch new file mode 100644 index 000000000000..6dedb535d3b5 --- /dev/null +++ b/net-analyzer/fragroute/files/fragroute-1.2.6-pcap_open.patch @@ -0,0 +1,44 @@ +--- a/fragtest.c ++++ b/fragtest.c +@@ -458,7 +458,7 @@ + if ((ctx.ip = ip_open()) == NULL) + err(1, "couldn't open raw IP interface"); + +- if ((ctx.pcap = pcap_open(ifent.intf_name)) == NULL) ++ if ((ctx.pcap = fragroute_pcap_open(ifent.intf_name)) == NULL) + err(1, "couldn't open %s for sniffing", ifent.intf_name); + + if ((ctx.dloff = pcap_dloff(ctx.pcap)) < 0) +--- a/tun-loop.c ++++ b/tun-loop.c +@@ -331,7 +331,7 @@ + return (tun_close(tun)); + + /* Set up to sniff on loopback. */ +- if ((tun->pcap = pcap_open(tun->ifent->intf_name)) == NULL) ++ if ((tun->pcap = fragroute_pcap_open(tun->ifent->intf_name)) == NULL) + return (tun_close(tun)); + + if (pcap_filter(tun->pcap, "ip dst %s", addr_ntoa(dst)) < 0) +--- a/pcaputil.c ++++ b/pcaputil.c +@@ -27,7 +27,7 @@ + #include "pcaputil.h" + + pcap_t * +-pcap_open(char *device) ++fragroute_pcap_open(char *device) + { + char ebuf[PCAP_ERRBUF_SIZE]; + pcap_t *pcap; +--- a/pcaputil.h ++++ b/pcaputil.h +@@ -9,7 +9,7 @@ + #ifndef PCAPUTIL_H + #define PCAPUTIL_H + +-pcap_t *pcap_open(char *device); ++pcap_t *fragroute_pcap_open(char *device); + int pcap_dloff(pcap_t *pcap); + int pcap_filter(pcap_t *pcap, const char *fmt, ...); + |