aboutsummaryrefslogtreecommitdiffstats
path: root/main/iptraf-ng
diff options
context:
space:
mode:
Diffstat (limited to 'main/iptraf-ng')
-rw-r--r--main/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch128
-rw-r--r--main/iptraf-ng/APKBUILD17
2 files changed, 142 insertions, 3 deletions
diff --git a/main/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch b/main/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
new file mode 100644
index 0000000000..e5c04cd891
--- /dev/null
+++ b/main/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
@@ -0,0 +1,128 @@
+From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001
+Message-Id: <72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab.1337783673.git.npajkovs@redhat.com>
+From: Nikola Pajkovsky <npajkovs@redhat.com>
+Date: Wed, 23 May 2012 16:32:27 +0200
+Subject: [PATCH] token-ring: kernel v3.5 kill off token-ring support
+
+Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
+---
+ src/hostmon.c | 10 ----------
+ src/iptraf-ng-compat.h | 1 -
+ src/othptab.c | 6 ------
+ src/packet.c | 27 ---------------------------
+ src/tcptable.c | 4 ----
+ 5 files changed, 48 deletions(-)
+
+diff --git a/src/hostmon.c b/src/hostmon.c
+index 40a2b95..72b91f8 100644
+--- a/src/hostmon.c
++++ b/src/hostmon.c
+@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr,
+ FDDI_K_ALEN);
+ list = flist;
+ break; }
+- case ARPHRD_IEEE802:
+- case ARPHRD_IEEE802_TR: {
+- struct trh_hdr *hdr_trh =
+- (struct trh_hdr *)pkt.pkt_buf;
+- memcpy(scratch_saddr, hdr_trh->saddr,
+- TR_ALEN);
+- memcpy(scratch_daddr, hdr_trh->daddr,
+- TR_ALEN);
+- list = flist;
+- break; }
+ default:
+ /* unknown link protocol */
+ continue;
+diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
+index d5aee4a..2d9da96 100644
+--- a/src/iptraf-ng-compat.h
++++ b/src/iptraf-ng-compat.h
+@@ -39,7 +39,6 @@
+ #include <linux/if_ether.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_fddi.h>
+-#include <linux/if_tr.h>
+ #include <linux/types.h>
+ #include <linux/isdn.h>
+
+diff --git a/src/othptab.c b/src/othptab.c
+index d12cdfd..1181eb1 100644
+--- a/src/othptab.c
++++ b/src/othptab.c
+@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
+ saddr), new_entry->smacaddr);
+ convmacaddr((char *) (((struct fddihdr *) packet)->
+ daddr), new_entry->dmacaddr);
+- } else if ((pkt->pkt_hatype == ARPHRD_IEEE802)
+- || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) {
+- convmacaddr((char *) (((struct trh_hdr *) packet)->
+- saddr), new_entry->smacaddr);
+- convmacaddr((char *) (((struct trh_hdr *) packet)->
+- daddr), new_entry->dmacaddr);
+ }
+ }
+
+diff --git a/src/packet.c b/src/packet.c
+index a43a27a..f3e4304 100644
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len)
+ return (u_short) (~sum);
+ }
+
+-static unsigned int get_tr_ip_offset(char *pkt)
+-{
+- struct trh_hdr *trh;
+- unsigned int riflen = 0;
+-
+- trh = (struct trh_hdr *) pkt;
+-
+- /*
+- * Check if this packet has TR routing information and get
+- * its length.
+- */
+- if (trh->saddr[0] & TR_RII)
+- riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
+-
+- return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen +
+- sizeof(struct trllc);
+-}
+-
+ static int packet_adjust(struct pkt_hdr *pkt)
+ {
+ int retval = 0;
+@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt)
+ pkt->pkt_payload += sizeof(struct fddihdr);
+ pkt->pkt_len -= sizeof(struct fddihdr);
+ break;
+- case ARPHRD_IEEE802_TR:
+- case ARPHRD_IEEE802:
+- pkt->pkt_payload = pkt->pkt_buf;
+- /* Token Ring patch supplied by Tomas Dvorak */
+- /* Get the start of the IP packet from the Token Ring frame. */
+- unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload);
+- pkt->pkt_payload += dataoffset;
+- pkt->pkt_len -= dataoffset;
+- break;
+ default:
+ /* return a NULL packet to signal an unrecognized link */
+ /* protocol to the caller. Hopefully, this switch statement */
+diff --git a/src/tcptable.c b/src/tcptable.c
+index 56c4780..b0e5ccc 100644
+--- a/src/tcptable.c
++++ b/src/tcptable.c
+@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
+ } else if (linkproto == ARPHRD_FDDI) {
+ convmacaddr((char *) (((struct fddihdr *) packet)->
+ saddr), newmacaddr);
+- } else if ((linkproto == ARPHRD_IEEE802)
+- || (linkproto == ARPHRD_IEEE802_TR)) {
+- convmacaddr((char *) (((struct trh_hdr *) packet)->
+- saddr), newmacaddr);
+ }
+
+ if (tableentry->smacaddr[0] != '\0') {
+--
+1.7.10
+
diff --git a/main/iptraf-ng/APKBUILD b/main/iptraf-ng/APKBUILD
index 605bcca985..7fb417a740 100644
--- a/main/iptraf-ng/APKBUILD
+++ b/main/iptraf-ng/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=iptraf-ng
pkgver=1.1.3.1
-pkgrel=0
+pkgrel=1
pkgdesc="IP Network Monitoring Software (fork of original iptraf)"
url="https://fedorahosted.org/iptraf-ng/"
arch="all"
@@ -11,11 +11,17 @@ depends=
makedepends="ncurses-dev"
install=
subpackages="$pkgname-doc"
-source="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz
+ 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch"
_builddir="$srcdir"/iptraf-ng-$pkgver
prepare() {
cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
}
@@ -31,4 +37,9 @@ package() {
make DESTDIR="$pkgdir" install
}
-md5sums="1a2c02944b0b012d6a3de96207610fa2 iptraf-ng-1.1.3.1.tar.gz"
+md5sums="1a2c02944b0b012d6a3de96207610fa2 iptraf-ng-1.1.3.1.tar.gz
+e381baa0847040085f4e0db98ecc3416 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch"
+sha256sums="687b5632290d9b4963842df36f3572d97e333656d1fb6c5f341ab7df651dc185 iptraf-ng-1.1.3.1.tar.gz
+a36aaf8d110611ba8f9bd95a4ecdcb51fc90416b2f23fd708e130d4e87dec15d 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch"
+sha512sums="eb477afa5d01a3c787a4db153669713fe13af866b76446191f5679098d96c2e72b3e21dbeceda202770022204d8c5217b52dc5c25e545129aef6de2de622c04a iptraf-ng-1.1.3.1.tar.gz
+16f0aaa181ba6bc4f1812783eb9bd110bed735ce0066a0db6384447f5c145f87ff0819fb3a6056af4e5cdb6eac2b0391a520d7ee15f7178118a505c245458b2c 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch"