From 965f68dcac2d7960219818ae5a7eb30da669aae9 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 16 Apr 2006 14:35:32 +0000 Subject: [PATCH] Update iptraf to 3.0.0 SVN-Revision: 3660 --- openwrt/package/iptraf/Makefile | 4 +- ...s_compile.patch => 01-cross_compile.patch} | 21 +- .../package/iptraf/patches/02-ifaces.patch | 294 ++++++++++ .../iptraf/patches/iptraf-2.7.0-ifaces.patch | 549 ------------------ 4 files changed, 304 insertions(+), 564 deletions(-) rename openwrt/package/iptraf/patches/{iptraf-2.7.0-cross_compile.patch => 01-cross_compile.patch} (53%) create mode 100644 openwrt/package/iptraf/patches/02-ifaces.patch delete mode 100644 openwrt/package/iptraf/patches/iptraf-2.7.0-ifaces.patch diff --git a/openwrt/package/iptraf/Makefile b/openwrt/package/iptraf/Makefile index c5ae8eab75..7c46ed092d 100644 --- a/openwrt/package/iptraf/Makefile +++ b/openwrt/package/iptraf/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iptraf -PKG_VERSION:=2.7.0 +PKG_VERSION:=3.0.0 PKG_RELEASE:=1 -PKG_MD5SUM:=7ff0bc933a0a57a4ca9e2b0443307539 +PKG_MD5SUM:=377371c28ee3c21a76f7024920649ea8 PKG_SOURCE_URL:=ftp://iptraf.seul.org/pub/iptraf/ \ ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/ diff --git a/openwrt/package/iptraf/patches/iptraf-2.7.0-cross_compile.patch b/openwrt/package/iptraf/patches/01-cross_compile.patch similarity index 53% rename from openwrt/package/iptraf/patches/iptraf-2.7.0-cross_compile.patch rename to openwrt/package/iptraf/patches/01-cross_compile.patch index 6c0119df73..c12719d25a 100644 --- a/openwrt/package/iptraf/patches/iptraf-2.7.0-cross_compile.patch +++ b/openwrt/package/iptraf/patches/01-cross_compile.patch @@ -1,17 +1,12 @@ -diff -ruN iptraf-2.7.0-old/support/Makefile iptraf-2.7.0-new/support/Makefile ---- iptraf-2.7.0-old/support/Makefile 2001-11-27 09:37:11.000000000 +0100 -+++ iptraf-2.7.0-new/support/Makefile 2005-10-03 18:40:40.000000000 +0200 -@@ -3,16 +3,21 @@ +diff -urN iptraf-3.0.0/support/Makefile iptraf-3.0.0.new/support/Makefile +--- iptraf-3.0.0/support/Makefile 2002-07-19 18:31:48.000000000 +0200 ++++ iptraf-3.0.0.new/support/Makefile 2006-04-16 16:07:58.000000000 +0200 +@@ -3,16 +3,14 @@ OBJS = input.o menurt.o listbox.o winops.o labels.o \ - msgboxes.o - -+AR=ar -+CC=cc -+RANLIB=ranlib -+CFLAGS= -O2 -g -fPIC -+ - all: libtextbox.a + msgboxes.o txbox.o +-all: libtextbox.a +- libtextbox.a: $(OBJS) rm -rf libtextbox.a - ar cq libtextbox.a $(OBJS) @@ -23,7 +18,7 @@ diff -ruN iptraf-2.7.0-old/support/Makefile iptraf-2.7.0-new/support/Makefile %.o: %.c *.h - gcc -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $< -+ $(CC) $(CFLAGS) -Wall $(INCLUDEDIR) -c -o $*.o $< ++ $(CC) -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $< clean: rm -rf *.o *~ libtextbox.a libtextbox.so diff --git a/openwrt/package/iptraf/patches/02-ifaces.patch b/openwrt/package/iptraf/patches/02-ifaces.patch new file mode 100644 index 0000000000..0b70022f09 --- /dev/null +++ b/openwrt/package/iptraf/patches/02-ifaces.patch @@ -0,0 +1,294 @@ +diff -urN iptraf-3.0.0/src/dirs.h iptraf-3.0.0.new/src/dirs.h +--- iptraf-3.0.0/src/dirs.h 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/dirs.h 2006-04-16 16:08:27.000000000 +0200 +@@ -155,7 +155,6 @@ + */ + + #define ETHFILE get_path(T_WORKDIR, "ethernet.desc") +-#define FDDIFILE get_path(T_WORKDIR, "fddi.desc") + + /* + * The rvnamed program file +diff -urN iptraf-3.0.0/src/hostmon.c iptraf-3.0.0.new/src/hostmon.c +--- iptraf-3.0.0/src/hostmon.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/hostmon.c 2006-04-16 16:29:27.000000000 +0200 +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -293,8 +292,6 @@ + wprintw(table->tabwin, "Ethernet"); + else if (entry->un.desc.linktype == LINK_PLIP) + wprintw(table->tabwin, "PLIP"); +- else if (entry->un.desc.linktype == LINK_FDDI) +- wprintw(table->tabwin, "FDDI"); + + wprintw(table->tabwin, " HW addr: %s", entry->un.desc.ascaddr); + +@@ -722,7 +719,7 @@ + unsigned long long updtime_usec = 0; + + struct desclist elist; /* Ethernet description list */ +- struct desclist flist; /* FDDI description list */ ++ struct desclist flist; /* Other links description list */ + struct desclist *list = NULL; + + FILE *logfile = NULL; +@@ -786,7 +783,6 @@ + + initethtab(&table, options->actmode); + loaddesclist(&elist, LINK_ETHERNET, WITHETCETHERS); +- loaddesclist(&flist, LINK_FDDI, WITHETCETHERS); + + if (logging) { + if (strcmp(current_logfile, "") == 0) { +@@ -900,9 +896,7 @@ + if (pkt_result != PACKET_OK) + continue; + +- if ((linktype == LINK_ETHERNET) || (linktype == LINK_FDDI) +- || (linktype == LINK_PLIP) || (linktype == LINK_TR) || +- (linktype == LINK_VLAN)) { ++ if ((linktype == LINK_ETHERNET) || (linktype == LINK_PLIP) || (linktype == LINK_TR) || (linktype == LINK_VLAN)) { + + if (fromaddr.sll_protocol == htons(ETH_P_IP)) + is_ip = 1; +@@ -920,12 +914,6 @@ + memcpy(scratch_daddr, ((struct ethhdr *) buf)->h_dest, + ETH_ALEN); + list = &elist; +- } else if (linktype == LINK_FDDI) { +- memcpy(scratch_saddr, ((struct fddihdr *) buf)->saddr, +- FDDI_K_ALEN); +- memcpy(scratch_daddr, ((struct fddihdr *) buf)->daddr, +- FDDI_K_ALEN); +- list = &flist; + } else if (linktype == LINK_TR) { + memcpy(scratch_saddr, ((struct trh_hdr *) buf)->saddr, + TR_ALEN); +diff -urN iptraf-3.0.0/src/ifaces.c iptraf-3.0.0.new/src/ifaces.c +--- iptraf-3.0.0/src/ifaces.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/ifaces.c 2006-04-16 16:10:10.000000000 +0200 +@@ -37,7 +37,7 @@ + extern int daemonized; + + char ifaces[][6] = +- { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb", ++ { "lo", "eth", "sl", "ppp", "ippp", "plip", "isdn", "dvb", + "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3", + "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan" + }; +diff -urN iptraf-3.0.0/src/landesc.c iptraf-3.0.0.new/src/landesc.c +--- iptraf-3.0.0/src/landesc.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/landesc.c 2006-04-16 16:10:29.000000000 +0200 +@@ -83,8 +83,6 @@ + + if (linktype == LINK_ETHERNET) + fd = fopen(ETHFILE, "r"); +- else if (linktype == LINK_FDDI) +- fd = fopen(FDDIFILE, "r"); + + if (fd == NULL) { + return; +@@ -205,8 +203,6 @@ + + if (linktype == LINK_ETHERNET) + fd = fopen(ETHFILE, "w"); +- else if (linktype == LINK_FDDI) +- fd = fopen(FDDIFILE, "w"); + + if (fd < 0) { + etherr(); +diff -urN iptraf-3.0.0/src/links.h iptraf-3.0.0.new/src/links.h +--- iptraf-3.0.0/src/links.h 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/links.h 2006-04-16 16:10:39.000000000 +0200 +@@ -6,7 +6,6 @@ + #define LINK_ISDN_RAWIP 6 + #define LINK_ISDN_CISCOHDLC 7 + #define LINK_CISCOHDLC 7 +-#define LINK_FDDI 8 + #define LINK_FRAD 9 + #define LINK_DLCI 10 + #define LINK_TR 11 +diff -urN iptraf-3.0.0/src/log.c iptraf-3.0.0.new/src/log.c +--- iptraf-3.0.0/src/log.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/log.c 2006-04-16 16:10:53.000000000 +0200 +@@ -491,8 +491,6 @@ + ptmp->un.desc.ascaddr); + else if (ptmp->un.desc.linktype == LINK_PLIP) + fprintf(fd, "\nPLIP address: %s", ptmp->un.desc.ascaddr); +- else if (ptmp->un.desc.linktype == LINK_FDDI) +- fprintf(fd, "\nFDDI address: %s", ptmp->un.desc.ascaddr); + + if (ptmp->un.desc.withdesc) + fprintf(fd, " (%s)", ptmp->un.desc.desc); +diff -urN iptraf-3.0.0/src/options.c iptraf-3.0.0.new/src/options.c +--- iptraf-3.0.0/src/options.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/options.c 2006-04-16 16:23:52.000000000 +0200 +@@ -68,8 +68,6 @@ + tx_additem(menu, NULL, NULL); + tx_additem(menu, " ^E^thernet/PLIP host descriptions...", + "Manages descriptions for Ethernet and PLIP addresses"); +- tx_additem(menu, " ^F^DDI/Token Ring host descriptions...", +- "Manages descriptions for FDDI and FDDI addresses"); + tx_additem(menu, NULL, NULL); + tx_additem(menu, " E^x^it configuration", "Returns to main menu"); + } +@@ -371,9 +369,6 @@ + case 14: + ethdescmgr(LINK_ETHERNET); + break; +- case 15: +- ethdescmgr(LINK_FDDI); +- break; + } + + indicatesetting(row, options, statwin); +diff -urN iptraf-3.0.0/src/othptab.c iptraf-3.0.0.new/src/othptab.c +--- iptraf-3.0.0/src/othptab.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/othptab.c 2006-04-16 16:24:21.000000000 +0200 +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + #include "arphdr.h" + #include "options.h" +@@ -139,11 +138,6 @@ + new_entry->smacaddr); + convmacaddr(((struct ethhdr *) packet)->h_dest, + new_entry->dmacaddr); +- } else if (linkproto == LINK_FDDI) { +- convmacaddr(((struct fddihdr *) packet)->saddr, +- new_entry->smacaddr); +- convmacaddr(((struct fddihdr *) packet)->daddr, +- new_entry->dmacaddr); + } else if (linkproto == LINK_TR) { + convmacaddr(((struct trh_hdr *) packet)->saddr, + new_entry->smacaddr); +@@ -373,8 +367,7 @@ + strcat(msgstring, scratchpad); + + if ((entry->linkproto == LINK_ETHERNET) || +- (entry->linkproto == LINK_PLIP) || +- (entry->linkproto == LINK_FDDI)) { ++ (entry->linkproto == LINK_PLIP)) { + sprintf(scratchpad, " from %s to %s on %s", + entry->smacaddr, entry->dmacaddr, entry->iface); + +diff -urN iptraf-3.0.0/src/packet.c iptraf-3.0.0.new/src/packet.c +--- iptraf-3.0.0/src/packet.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/packet.c 2006-04-16 16:11:55.000000000 +0200 +@@ -35,7 +35,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -81,8 +80,6 @@ + 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 @@ + 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 @@ + *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 +diff -urN iptraf-3.0.0/src/promisc.c iptraf-3.0.0.new/src/promisc.c +--- iptraf-3.0.0/src/promisc.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/promisc.c 2006-04-16 16:12:56.000000000 +0200 +@@ -81,8 +81,8 @@ + */ + + if ((strncmp(buf, "eth", 3) == 0) || +- (strncmp(buf, "fddi", 4) == 0) || + (strncmp(buf, "tr", 2) == 0) || ++ (strncmp(buf, "vlan", 4) == 0) || + (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || + (strncmp(ptmp->params.ifname, "lec", 3) == 0) || + (accept_unsupported_interfaces)) { +@@ -195,7 +195,7 @@ + + while (ptmp != NULL) { + if (((strncmp(ptmp->params.ifname, "eth", 3) == 0) || +- (strncmp(ptmp->params.ifname, "fddi", 4) == 0) || ++ (strncmp(ptmp->params.ifname, "vlan", 4) == 0) || + (strncmp(ptmp->params.ifname, "tr", 2) == 0) || + (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || + (strncmp(ptmp->params.ifname, "lec", 3) == 0)) && +diff -urN iptraf-3.0.0/src/rvnamed.h iptraf-3.0.0.new/src/rvnamed.h +--- iptraf-3.0.0/src/rvnamed.h 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/rvnamed.h 2006-04-16 16:13:39.000000000 +0200 +@@ -1,9 +1,9 @@ + #include + #include + +-#define CHILDSOCKNAME "/dev/rvndcldcomsk" +-#define PARENTSOCKNAME "/dev/rvndpntcomsk" +-#define IPTSOCKNAME "/dev/rvndiptcomsk" ++#define CHILDSOCKNAME "/tmp/rvndcldcomsk" ++#define PARENTSOCKNAME "/tmp/rvndpntcomsk" ++#define IPTSOCKNAME "/tmp/rvndiptcomsk" + + #define SOCKET_PREFIX "isock" + +diff -urN iptraf-3.0.0/src/tcptable.c iptraf-3.0.0.new/src/tcptable.c +--- iptraf-3.0.0/src/tcptable.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/tcptable.c 2006-04-16 16:13:54.000000000 +0200 +@@ -600,8 +600,6 @@ + + if ((linkproto == LINK_ETHERNET) || (linkproto == LINK_PLIP)) { + convmacaddr(((struct ethhdr *) packet)->h_source, newmacaddr); +- } else if (linkproto == LINK_FDDI) { +- convmacaddr(((struct fddihdr *) packet)->saddr, newmacaddr); + } else if (linkproto == LINK_TR) { + convmacaddr(((struct trh_hdr *) packet)->saddr, newmacaddr); + } +diff -urN iptraf-3.0.0/src/tcptable.h iptraf-3.0.0.new/src/tcptable.h +--- iptraf-3.0.0/src/tcptable.h 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0.new/src/tcptable.h 2006-04-16 16:14:03.000000000 +0200 +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/openwrt/package/iptraf/patches/iptraf-2.7.0-ifaces.patch b/openwrt/package/iptraf/patches/iptraf-2.7.0-ifaces.patch deleted file mode 100644 index fdf09a2013..0000000000 --- a/openwrt/package/iptraf/patches/iptraf-2.7.0-ifaces.patch +++ /dev/null @@ -1,549 +0,0 @@ -diff -ruN iptraf-2.7.0-old/src/dirs.h iptraf-2.7.0-new/src/dirs.h ---- iptraf-2.7.0-old/src/dirs.h 2001-05-03 12:44:11.000000000 +0200 -+++ iptraf-2.7.0-new/src/dirs.h 2005-10-04 21:51:26.000000000 +0200 -@@ -148,11 +148,10 @@ - #define PORTFILE get_path(T_WORKDIR, "ports.dat") - - /* -- * The Ethernet and FDDI host description files -+ * The Ethernet host description files - */ - - #define ETHFILE get_path(T_WORKDIR, "ethernet.desc") --#define FDDIFILE get_path(T_WORKDIR, "fddi.desc") - - /* - * The rvnamed program file -diff -ruN iptraf-2.7.0-old/src/hostmon.c iptraf-2.7.0-new/src/hostmon.c ---- iptraf-2.7.0-old/src/hostmon.c 2002-04-16 04:15:25.000000000 +0200 -+++ iptraf-2.7.0-new/src/hostmon.c 2005-10-04 21:52:02.000000000 +0200 -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -294,8 +293,6 @@ - wprintw(table->tabwin, "Ethernet"); - else if (entry->un.desc.linktype == LINK_PLIP) - wprintw(table->tabwin, "PLIP"); -- else if (entry->un.desc.linktype == LINK_FDDI) -- wprintw(table->tabwin, "FDDI"); - - wprintw(table->tabwin, " HW addr: %s", entry->un.desc.ascaddr); - -@@ -771,7 +768,6 @@ - - initethtab(&table, options->actmode); - loaddesclist(&elist, LINK_ETHERNET, WITHETCETHERS); -- loaddesclist(&flist, LINK_FDDI, WITHETCETHERS); - - if (logging) { - if (strcmp(current_logfile, "") == 0) -@@ -854,7 +850,7 @@ - } - linktype = getlinktype(fromaddr.sll_hatype, ifname, -1, NULL); - -- if ((linktype == LINK_ETHERNET) || (linktype == LINK_FDDI) -+ if ((linktype == LINK_ETHERNET) - || (linktype == LINK_PLIP) || (linktype == LINK_TR)) { - if (fromaddr.sll_protocol == htons(ETH_P_IP)) - is_ip = 1; -@@ -871,12 +867,6 @@ - memcpy(scratch_daddr, ((struct ethhdr *) buf)->h_dest, - ETH_ALEN); - list = &elist; -- } else if (linktype == LINK_FDDI) { -- memcpy(scratch_saddr, ((struct fddihdr *) buf)->saddr, -- FDDI_K_ALEN); -- memcpy(scratch_daddr, ((struct fddihdr *) buf)->daddr, -- FDDI_K_ALEN); -- list = &flist; - } else if (linktype == LINK_TR) { - memcpy(scratch_saddr, ((struct trh_hdr *) buf)->saddr, - TR_ALEN); -diff -ruN iptraf-2.7.0-old/src/ifaces.c iptraf-2.7.0-new/src/ifaces.c ---- iptraf-2.7.0-old/src/ifaces.c 2002-05-08 11:43:27.000000000 +0200 -+++ iptraf-2.7.0-new/src/ifaces.c 2005-10-04 21:54:00.000000000 +0200 -@@ -37,9 +37,9 @@ - extern int daemonized; - - char ifaces[][6] = -- { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb", -+ { "lo", "eth", "sl", "ppp", "ippp", "plip", "isdn", "dvb", - "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3", -- "pent", "lec" }; -+ "pent", "lec", "vlan" }; - - char *ltrim(char *buf) - { -diff -ruN iptraf-2.7.0-old/src/landesc.c iptraf-2.7.0-new/src/landesc.c ---- iptraf-2.7.0-old/src/landesc.c 2001-11-27 11:23:32.000000000 +0100 -+++ iptraf-2.7.0-new/src/landesc.c 2005-10-04 21:57:33.000000000 +0200 -@@ -82,8 +82,6 @@ - - if (linktype == LINK_ETHERNET) - fd = fopen(ETHFILE, "r"); -- else if (linktype == LINK_FDDI) -- fd = fopen(FDDIFILE, "r"); - - if (fd == NULL) { - return; -@@ -204,8 +202,6 @@ - - if (linktype == LINK_ETHERNET) - fd = fopen(ETHFILE, "w"); -- else if (linktype == LINK_FDDI) -- fd = fopen(FDDIFILE, "w"); - - if (fd < 0) { - etherr(); -diff -ruN iptraf-2.7.0-old/src/links.h iptraf-2.7.0-new/src/links.h ---- iptraf-2.7.0-old/src/links.h 2001-12-18 03:45:16.000000000 +0100 -+++ iptraf-2.7.0-new/src/links.h 2005-10-04 21:57:17.000000000 +0200 -@@ -5,7 +5,6 @@ - #define LINK_LOOPBACK 5 - #define LINK_ISDN_RAWIP 6 - #define LINK_ISDN_CISCOHDLC 7 --#define LINK_FDDI 8 - #define LINK_FRAD 9 - #define LINK_DLCI 10 - #define LINK_TR 11 -diff -ruN iptraf-2.7.0-old/src/log.c iptraf-2.7.0-new/src/log.c ---- iptraf-2.7.0-old/src/log.c 2002-04-22 05:59:15.000000000 +0200 -+++ iptraf-2.7.0-new/src/log.c 2005-10-04 21:57:51.000000000 +0200 -@@ -465,8 +465,6 @@ - ptmp->un.desc.ascaddr); - else if (ptmp->un.desc.linktype == LINK_PLIP) - fprintf(fd, "\nPLIP address: %s", ptmp->un.desc.ascaddr); -- else if (ptmp->un.desc.linktype == LINK_FDDI) -- fprintf(fd, "\nFDDI address: %s", ptmp->un.desc.ascaddr); - - if (ptmp->un.desc.withdesc) - fprintf(fd, " (%s)", ptmp->un.desc.desc); -diff -ruN iptraf-2.7.0-old/src/options.c iptraf-2.7.0-new/src/options.c ---- iptraf-2.7.0-old/src/options.c 2001-12-28 10:39:15.000000000 +0100 -+++ iptraf-2.7.0-new/src/options.c 2005-10-04 21:58:15.000000000 +0200 -@@ -67,8 +67,6 @@ - tx_additem(menu, NULL, NULL); - tx_additem(menu, " ^E^thernet/PLIP host descriptions...", - "Manages descriptions for Ethernet and PLIP addresses"); -- tx_additem(menu, " ^F^DDI/Token Ring host descriptions...", -- "Manages descriptions for FDDI and FDDI addresses"); - tx_additem(menu, NULL, NULL); - tx_additem(menu, " E^x^it configuration", "Returns to main menu"); - } -@@ -366,9 +364,6 @@ - case 14: - ethdescmgr(LINK_ETHERNET); - break; -- case 15: -- ethdescmgr(LINK_FDDI); -- break; - } - - indicatesetting(row, options, statwin); -diff -ruN iptraf-2.7.0-old/src/othptab.c iptraf-2.7.0-new/src/othptab.c ---- iptraf-2.7.0-old/src/othptab.c 2001-12-28 03:23:59.000000000 +0100 -+++ iptraf-2.7.0-new/src/othptab.c 2005-10-04 21:58:33.000000000 +0200 -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - #include "arphdr.h" - #include "options.h" -@@ -139,11 +138,6 @@ - new_entry->smacaddr); - convmacaddr(((struct ethhdr *) packet)->h_dest, - new_entry->dmacaddr); -- } else if (linkproto == LINK_FDDI) { -- convmacaddr(((struct fddihdr *) packet)->saddr, -- new_entry->smacaddr); -- convmacaddr(((struct fddihdr *) packet)->daddr, -- new_entry->dmacaddr); - } else if (linkproto == LINK_TR) { - convmacaddr(((struct trh_hdr *) packet)->saddr, - new_entry->smacaddr); -@@ -373,8 +367,7 @@ - strcat(msgstring, scratchpad); - - if ((entry->linkproto == LINK_ETHERNET) || -- (entry->linkproto == LINK_PLIP) || -- (entry->linkproto == LINK_FDDI)) { -+ (entry->linkproto == LINK_PLIP)) { - sprintf(scratchpad, " from %s to %s on %s", - entry->smacaddr, entry->dmacaddr, entry->iface); - -diff -ruN iptraf-2.7.0-old/src/packet.c iptraf-2.7.0-new/src/packet.c ---- iptraf-2.7.0-old/src/packet.c 2002-05-08 11:44:08.000000000 +0200 -+++ iptraf-2.7.0-new/src/packet.c 2005-10-04 21:59:12.000000000 +0200 -@@ -35,7 +35,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -80,10 +79,10 @@ - case ARPHRD_ETHER: - if (strncmp(ifname, "eth", 3) == 0) - result = LINK_ETHERNET; -+ else if (strncmp(ifname, "vlan", 4) == 0) -+ 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) -@@ -127,9 +126,6 @@ - case ARPHRD_PPP: - result = LINK_PPP; - break; -- case ARPHRD_FDDI: -- result = LINK_FDDI; -- break; - case ARPHRD_IEEE802: - case ARPHRD_IEEE802_TR: - result = LINK_TR; -@@ -179,19 +175,6 @@ - *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 -diff -ruN iptraf-2.7.0-old/src/promisc.c iptraf-2.7.0-new/src/promisc.c ---- iptraf-2.7.0-old/src/promisc.c 2002-01-16 02:51:03.000000000 +0100 -+++ iptraf-2.7.0-new/src/promisc.c 2005-10-04 22:05:25.000000000 +0200 -@@ -81,7 +81,7 @@ - */ - - if ((strncmp(buf, "eth", 3) == 0) || -- (strncmp(buf, "fddi", 4) == 0) || -+ (strncmp(buf, "vlan", 4) == 0) || - (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || - (strncmp(ptmp->params.ifname, "lec", 3) == 0) || - (accept_unsupported_interfaces)) { -@@ -194,7 +194,7 @@ - - while (ptmp != NULL) { - if (((strncmp(ptmp->params.ifname, "eth", 3) == 0) || -- (strncmp(ptmp->params.ifname, "fddi", 4) == 0) || -+ (strncmp(ptmp->params.ifname, "vlan", 4) == 0) || - (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || - (strncmp(ptmp->params.ifname, "lec", 3) == 0)) && - (ptmp->params.state_valid)) { -diff -ruN iptraf-2.7.0-old/src/promisc.~c iptraf-2.7.0-new/src/promisc.~c ---- iptraf-2.7.0-old/src/promisc.~c 1970-01-01 01:00:00.000000000 +0100 -+++ iptraf-2.7.0-new/src/promisc.~c 2005-10-04 22:00:02.000000000 +0200 -@@ -0,0 +1,238 @@ -+/*** -+ -+promisc.c - handles the promiscuous mode flag for the Ethernet/FDDI -+ interfaces -+ -+Written by Gerard Paul Java -+Copyright (c) Gerard Paul Java 1997, 1998 -+ -+This module contains functions that manage the promiscuous states of -+the interfaces. -+ -+This software is open source; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2 of the License, or -+(at your option) any later version. -+ -+This program is distributed WITHOUT ANY WARRANTY; without even the -+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+See the GNU General Public License in the included COPYING file for -+details. -+ -+***/ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "ifstats.h" -+#include "ifaces.h" -+#include "error.h" -+#include "promisc.h" -+#include "dirs.h" -+ -+#define PROMISC_MSG_MAX 80 -+ -+extern int daemonized; -+extern int accept_unsupported_interfaces; -+ -+void init_promisc_list(struct promisc_states **list) -+{ -+ FILE *fd; -+ int ifd; -+ char buf[8]; -+ struct promisc_states *ptmp; -+ struct promisc_states *tail = NULL; -+ struct ifreq ifr; -+ int istat; -+ char err_msg[80]; -+ -+ ifd = socket(PF_INET, SOCK_DGRAM, 0); -+ -+ *list = NULL; -+ fd = open_procnetdev(); -+ -+ do { -+ get_next_iface(fd, buf); -+ -+ if (strcmp(buf, "") != 0) { -+ ptmp = malloc(sizeof(struct promisc_states)); -+ strcpy(ptmp->params.ifname, buf); -+ -+ if (*list == NULL) { -+ *list = ptmp; -+ } else -+ tail->next_entry = ptmp; -+ -+ tail = ptmp; -+ ptmp->next_entry = NULL; -+ -+ /* -+ * Retrieve and save interface flags -+ */ -+ -+ if ((strncmp(buf, "eth", 3) == 0) || -+ (strncmp(buf, "vlan", 4) == 0) || -+ (strncmp(buf, "fddi", 4) == 0) || -+ (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || -+ (strncmp(ptmp->params.ifname, "lec", 3) == 0) || -+ (accept_unsupported_interfaces)) { -+ strcpy(ifr.ifr_name, buf); -+ -+ istat = ioctl(ifd, SIOCGIFFLAGS, &ifr); -+ -+ if (istat < 0) { -+ sprintf(err_msg, -+ "Unable to obtain interface parameters for %s", -+ buf); -+ write_error(err_msg, daemonized); -+ ptmp->params.state_valid = 0; -+ } else { -+ ptmp->params.saved_state = ifr.ifr_flags; -+ ptmp->params.state_valid = 1; -+ } -+ } -+ } -+ } while (strcmp(buf, "") != 0); -+} -+ -+/* -+ * Save interfaces and their states to a temporary file. Used only by the -+ * first IPTraf instance. Needed in case there are subsequent, simultaneous -+ * instances of IPTraf, which may still need promiscuous mode even after -+ * the first instance exits. These subsequent instances will need to restore -+ * the promiscuous state from this file. -+ */ -+ -+void save_promisc_list(struct promisc_states *list) -+{ -+ int fd; -+ struct promisc_states *ptmp = list; -+ -+ fd = open(PROMISCLISTFILE, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); -+ -+ if (fd < 0) { -+ write_error("Unable to save interface flags", daemonized); -+ return; -+ } -+ -+ while (ptmp != NULL) { -+ write(fd, &(ptmp->params), sizeof(struct promisc_params)); -+ ptmp = ptmp->next_entry; -+ } -+ -+ close(fd); -+} -+ -+/* -+ * Load promiscuous states into list -+ */ -+ -+void load_promisc_list(struct promisc_states **list) -+{ -+ int fd; -+ struct promisc_states *ptmp = NULL; -+ struct promisc_states *tail = NULL; -+ int br; -+ -+ fd = open(PROMISCLISTFILE, O_RDONLY); -+ -+ if (fd < 0) { -+ write_error("Unable to retrieve saved interface flags", -+ daemonized); -+ *list = NULL; -+ return; -+ } -+ -+ do { -+ ptmp = malloc(sizeof(struct promisc_states)); -+ br = read(fd, &(ptmp->params), sizeof(struct promisc_params)); -+ -+ if (br > 0) { -+ if (tail != NULL) -+ tail->next_entry = ptmp; -+ else -+ *list = ptmp; -+ -+ ptmp->next_entry = NULL; -+ tail = ptmp; -+ } else -+ free(ptmp); -+ } while (br > 0); -+ -+ close(fd); -+} -+ -+/* -+ * Set/restore interface promiscuous mode. -+ */ -+ -+void srpromisc(int mode, struct promisc_states *list) -+{ -+ int fd; -+ struct ifreq ifr; -+ struct promisc_states *ptmp; -+ int istat; -+ char fullmsg[PROMISC_MSG_MAX]; -+ -+ ptmp = list; -+ -+ fd = socket(PF_INET, SOCK_DGRAM, 0); -+ -+ if (fd < 0) { -+ write_error("Unable to open socket for flag change", daemonized); -+ return; -+ } -+ -+ while (ptmp != NULL) { -+ if (((strncmp(ptmp->params.ifname, "eth", 3) == 0) || -+ (strncmp(ptmp->params.ifname, "vlan", 4) == 0) || -+ (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || -+ (strncmp(ptmp->params.ifname, "lec", 3) == 0)) && -+ (ptmp->params.state_valid)) { -+ -+ strcpy(ifr.ifr_name, ptmp->params.ifname); -+ -+ if (mode) -+ ifr.ifr_flags = ptmp->params.saved_state | IFF_PROMISC; -+ else -+ ifr.ifr_flags = ptmp->params.saved_state; -+ -+ istat = ioctl(fd, SIOCSIFFLAGS, &ifr); -+ -+ if (istat < 0) { -+ sprintf(fullmsg, "Promisc change failed for %s", -+ ptmp->params.ifname); -+ write_error(fullmsg, daemonized); -+ } -+ } -+ ptmp = ptmp->next_entry; -+ } -+ -+ close(fd); -+} -+ -+void destroy_promisc_list(struct promisc_states **list) -+{ -+ struct promisc_states *ptmp = *list; -+ struct promisc_states *ctmp; -+ -+ if (ptmp != NULL) -+ ctmp = ptmp->next_entry; -+ -+ while (ptmp != NULL) { -+ free(ptmp); -+ ptmp = ctmp; -+ if (ctmp != NULL) -+ ctmp = ctmp->next_entry; -+ } -+} -diff -ruN iptraf-2.7.0-old/src/rvnamed.c iptraf-2.7.0-new/src/rvnamed.c ---- iptraf-2.7.0-old/src/rvnamed.c 2002-05-02 03:37:34.000000000 +0200 -+++ iptraf-2.7.0-new/src/rvnamed.c 2005-10-04 22:02:47.000000000 +0200 -@@ -48,7 +48,6 @@ - #include - #include - #include "rvnamed.h" --#include "dirs.h" - - #define NUM_CACHE_ENTRIES 2048 - #define TIME_TARGET_MAX 30 -diff -ruN iptraf-2.7.0-old/src/rvnamed.h iptraf-2.7.0-new/src/rvnamed.h ---- iptraf-2.7.0-old/src/rvnamed.h 2002-05-02 03:36:30.000000000 +0200 -+++ iptraf-2.7.0-new/src/rvnamed.h 2005-10-04 22:03:29.000000000 +0200 -@@ -1,9 +1,10 @@ - #include - #include -+#include "dirs.h" - --#define CHILDSOCKNAME "/dev/rvndcldcomsk" --#define PARENTSOCKNAME "/dev/rvndpntcomsk" --#define IPTSOCKNAME "/dev/rvndiptcomsk" -+#define CHILDSOCKNAME LOCKDIR "/rvndcldcomsk" -+#define PARENTSOCKNAME LOCKDIR "/rvndpntcomsk" -+#define IPTSOCKNAME LOCKDIR "/rvndiptcomsk" - - #define SOCKET_PREFIX "isock" - -diff -ruN iptraf-2.7.0-old/src/tcptable.c iptraf-2.7.0-new/src/tcptable.c ---- iptraf-2.7.0-old/src/tcptable.c 2002-05-08 03:36:27.000000000 +0200 -+++ iptraf-2.7.0-new/src/tcptable.c 2005-10-03 19:25:55.000000000 +0200 -@@ -598,9 +598,6 @@ - if ((linkproto == LINK_ETHERNET) || (linkproto == LINK_PLIP)) { - convmacaddr(((struct ethhdr *) packet)->h_source, - newmacaddr); -- } else if (linkproto == LINK_FDDI) { -- convmacaddr(((struct fddihdr *) packet)->saddr, -- newmacaddr); - } else if (linkproto == LINK_TR) { - convmacaddr(((struct trh_hdr *) packet)->saddr, newmacaddr); - } -diff -ruN iptraf-2.7.0-old/src/tcptable.h iptraf-2.7.0-new/src/tcptable.h ---- iptraf-2.7.0-old/src/tcptable.h 2001-12-28 03:16:39.000000000 +0100 -+++ iptraf-2.7.0-new/src/tcptable.h 2005-10-03 19:26:01.000000000 +0200 -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - #include - #include -- 2.30.2