diff options
| author | wbx <wbx@hydrogenium.(none)> | 2009-05-17 14:41:34 +0200 |
|---|---|---|
| committer | wbx <wbx@hydrogenium.(none)> | 2009-05-17 14:41:34 +0200 |
| commit | 219a6dab8995aad9ac4860cc1a84d6f3509a03a4 (patch) | |
| tree | b9c0f3c43aebba2fcfef777592d0add39f2072f4 /package/iptraf/patches/patch-src_packet_c | |
Initial import
Diffstat (limited to 'package/iptraf/patches/patch-src_packet_c')
| -rw-r--r-- | package/iptraf/patches/patch-src_packet_c | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/package/iptraf/patches/patch-src_packet_c b/package/iptraf/patches/patch-src_packet_c new file mode 100644 index 000000000..c5669deca --- /dev/null +++ b/package/iptraf/patches/patch-src_packet_c @@ -0,0 +1,50 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/packet.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/packet.c 2008-10-09 17:34:11.000000000 +0200 +@@ -35,7 +35,6 @@ details. + #include <sys/ioctl.h> + #include <linux/if_packet.h> + #include <linux/if_ether.h> +-#include <linux/if_fddi.h> + #include <linux/if_tr.h> + #include <linux/isdn.h> + #include <linux/sockios.h> +@@ -81,8 +80,6 @@ unsigned short getlinktype(unsigned shor + result = LINK_ETHERNET; + else if (strncmp(ifname, "plip", 4) == 0) + result = LINK_PLIP; +- else if (strncmp(ifname, "fddi", 4) == 0) /* For some Ethernet- */ +- result = LINK_ETHERNET; /* emulated FDDI ifaces */ + else if (strncmp(ifname, "dvb", 3) == 0) + result = LINK_ETHERNET; + else if (strncmp(ifname, "sbni", 4) == 0) +@@ -136,9 +133,6 @@ unsigned short getlinktype(unsigned shor + case ARPHRD_PPP: + result = LINK_PPP; + break; +- case ARPHRD_FDDI: +- result = LINK_FDDI; +- break; + case ARPHRD_IEEE802: + case ARPHRD_IEEE802_TR: + result = LINK_TR; +@@ -194,19 +188,6 @@ void adjustpacket(char *tpacket, unsigne + *packet = tpacket + 4; + *readlen -= 4; + break; +- case LINK_FDDI: +- *packet = tpacket + sizeof(struct fddihdr); +- *readlen -= sizeof(struct fddihdr); +- +- /* +- * Move IP data into an aligned buffer. 96 bytes should be sufficient +- * for IP and TCP headers with reasonable numbers of options and some +- * data. +- */ +- +- memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen)); +- *packet = aligned_buf; +- break; + case LINK_TR: + /* + * Token Ring patch supplied by Tomas Dvorak |