1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00

net/tcptrace: fix build after libcap change

The pcap_offline_read() function is no longer exported from the
pcap library, it has become an internal function named
pcapint_offline_read().

The pcap_dispatch() function can be used instead in this particular
case.

Reported by:	pkg-fallout
This commit is contained in:
Stefan Eßer 2024-10-18 11:01:12 +02:00
parent 6f6400a5d6
commit f12b97f4a0
2 changed files with 21 additions and 2 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= tcptrace
PORTVERSION= 6.6.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
#MASTER_SITES= http://www.tcptrace.org/download/

View File

@ -1,6 +1,16 @@
--- tcpdump.c.orig 2013-07-01 18:43:14 UTC
+++ tcpdump.c
@@ -114,10 +114,13 @@ static int callback(
@@ -68,9 +68,6 @@ static char const GCC_UNUSED rcsid[] =
-/* external ref, in case missing in older version */
-extern int pcap_offline_read(void *, int, pcap_handler, u_char *);
-
/* global pointer, the pcap info header */
static pcap_t *pcap;
@@ -114,10 +111,13 @@ static int callback(
/* for some reason, the windows version of tcpdump is using */
/* this. It looks just like ethernet to me */
case PCAP_DLT_EN10MB:
@ -15,3 +25,12 @@
case EH_SIZE: /* straight Ethernet encapsulation */
memcpy((char *)ip_buf,buf+offset,iplen-offset);
callback_plast = ip_buf+iplen-offset-1;
@@ -250,7 +250,7 @@ pread_tcpdump(
int ret;
while (1) {
- if ((ret = pcap_offline_read(pcap,1,(pcap_handler)callback,0)) != 1) {
+ if ((ret = pcap_dispatch(pcap,1,(pcap_handler)callback,0)) != 1) {
/* prob EOF */
if (ret == -1) {