summaryrefslogtreecommitdiff
path: root/package/iptraf
diff options
context:
space:
mode:
Diffstat (limited to 'package/iptraf')
-rw-r--r--package/iptraf/patches/patch-src_Makefile9
-rw-r--r--package/iptraf/patches/patch-src_isdntab_c10
-rw-r--r--package/iptraf/patches/patch-src_packet_c40
3 files changed, 50 insertions, 9 deletions
diff --git a/package/iptraf/patches/patch-src_Makefile b/package/iptraf/patches/patch-src_Makefile
index e03ebb770..031a96362 100644
--- a/package/iptraf/patches/patch-src_Makefile
+++ b/package/iptraf/patches/patch-src_Makefile
@@ -1,6 +1,6 @@
$Id$
--- iptraf-3.0.1.orig/src/Makefile 2005-09-13 11:11:17.000000000 +0200
-+++ iptraf-3.0.1/src/Makefile 2014-06-25 16:51:56.160654472 +0200
++++ iptraf-3.0.1/src/Makefile 2024-02-25 18:13:10.945645560 +0100
@@ -17,8 +17,9 @@ VERSION = -DVERSION=\"$(VERNUMBER)\"
#
BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH)
@@ -34,16 +34,17 @@ $Id$
# You can uncomment this one to disable the backspace key in input fields.
# This means you must use the Del key or Ctrl+H combination to erase the
-@@ -98,7 +101,7 @@ LOCKDIR = /var/run/iptraf
+@@ -98,41 +101,39 @@ LOCKDIR = /var/run/iptraf
# Object file names
OBJS = iptraf.o itrafmon.o packet.o tcptable.o othptab.o ifstats.o deskman.o \
-ipcsum.o hostmon.o fltedit.o tr.o cidr.o \
+ipcsum.o hostmon.o fltedit.o cidr.o \
fltselect.o ipfilter.o fltmgr.o ipfrag.o serv.o servname.o instances.o \
- timer.o revname.o pktsize.o landesc.o isdntab.o options.o promisc.o ifaces.o \
+-timer.o revname.o pktsize.o landesc.o isdntab.o options.o promisc.o ifaces.o \
++timer.o revname.o pktsize.o landesc.o options.o promisc.o ifaces.o \
error.o log.o mode.o getpath.o bar.o parseproto.o
-@@ -106,33 +109,31 @@ error.o log.o mode.o getpath.o bar.o par
+
BINS = iptraf rvnamed rawtime
all: $(BINS)
diff --git a/package/iptraf/patches/patch-src_isdntab_c b/package/iptraf/patches/patch-src_isdntab_c
new file mode 100644
index 000000000..cec46b383
--- /dev/null
+++ b/package/iptraf/patches/patch-src_isdntab_c
@@ -0,0 +1,10 @@
+--- iptraf-3.0.1.orig/src/isdntab.c 2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.1/src/isdntab.c 2024-02-25 18:12:43.421645934 +0100
+@@ -20,7 +20,6 @@ details.
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
+-#include <linux/isdn.h>
+ #include "isdntab.h"
+
+
diff --git a/package/iptraf/patches/patch-src_packet_c b/package/iptraf/patches/patch-src_packet_c
index 85c402678..87c1c1ff4 100644
--- a/package/iptraf/patches/patch-src_packet_c
+++ b/package/iptraf/patches/patch-src_packet_c
@@ -1,14 +1,38 @@
--- iptraf-3.0.1.orig/src/packet.c 2007-09-25 11:21:18.000000000 +0200
-+++ iptraf-3.0.1/src/packet.c 2013-03-04 11:42:52.000000000 +0100
-@@ -36,7 +36,6 @@ details.
++++ iptraf-3.0.1/src/packet.c 2024-02-25 18:13:41.165645150 +0100
+@@ -36,8 +36,6 @@ details.
#include <linux/if_ether.h>
#include <linux/netdevice.h>
#include <linux/if_fddi.h>
-#include <linux/if_tr.h>
- #include <linux/isdn.h>
+-#include <linux/isdn.h>
#include <linux/sockios.h>
#include <msgboxes.h>
-@@ -136,9 +135,6 @@ unsigned short getlinktype(unsigned shor
+ #include "deskman.h"
+@@ -107,21 +105,7 @@ unsigned short getlinktype(unsigned shor
+ result = LINK_ETHERNET;
+ else if (strncmp(ifname, "tap", 3) == 0)
+ result = LINK_ETHERNET;
+- else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) {
+- isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd);
+-
+- switch (isdnent->encap) {
+- case ISDN_NET_ENCAP_RAWIP:
+- result = LINK_ISDN_RAWIP;
+- break;
+- case ISDN_NET_ENCAP_CISCOHDLC:
+- result = LINK_ISDN_CISCOHDLC;
+- break;
+- default:
+- result = LINK_INVALID;
+- break;
+- }
+- } else if (accept_unsupported_interfaces)
++ else if (accept_unsupported_interfaces)
+ result = LINK_ETHERNET;
+ break;
+ case ARPHRD_LOOPBACK:
+@@ -136,9 +120,6 @@ unsigned short getlinktype(unsigned shor
case ARPHRD_PPP:
result = LINK_PPP;
break;
@@ -18,7 +42,7 @@
case ARPHRD_IEEE802:
case ARPHRD_IEEE802_TR:
result = LINK_TR;
-@@ -194,36 +190,6 @@ void adjustpacket(char *tpacket, unsigne
+@@ -194,36 +175,6 @@ void adjustpacket(char *tpacket, unsigne
*packet = tpacket + 4;
*readlen -= 4;
break;
@@ -55,3 +79,9 @@
case LINK_IPIP:
*packet = tpacket;
break;
+@@ -463,5 +414,4 @@ void pkt_cleanup(void)
+ close(isdnfd);
+ isdnfd = -1;
+ destroyfraglist();
+- destroy_isdn_table(&isdntable);
+ }