SOURCES: iptraf-iface.patch, iptraf-llh.patch, iptraf.patch - upda...

areq areq at pld-linux.org
Sun Jun 3 21:10:38 CEST 2007


Author: areq                         Date: Sun Jun  3 19:10:38 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated (http://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0-3.diff.gz)

---- Files affected:
SOURCES:
   iptraf-iface.patch (1.4 -> 1.5) , iptraf-llh.patch (1.1 -> 1.2) , iptraf.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/iptraf-iface.patch
diff -u SOURCES/iptraf-iface.patch:1.4 SOURCES/iptraf-iface.patch:1.5
--- SOURCES/iptraf-iface.patch:1.4	Tue Apr 11 08:22:30 2006
+++ SOURCES/iptraf-iface.patch	Sun Jun  3 21:10:33 2007
@@ -1,6 +1,5 @@
-diff -urN iptraf-3.0.0.orig/src/ifaces.c iptraf-3.0.0/src/ifaces.c
---- iptraf-3.0.0.orig/src/ifaces.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/ifaces.c	2006-04-11 07:57:37.261675250 +0200
+--- iptraf-3.0.0/src/ifaces.c.orig	2007-06-03 19:03:27.312372537 +0000
++++ iptraf-3.0.0/src/ifaces.c	2007-06-03 19:07:20.170408147 +0000
 @@ -32,14 +32,14 @@
  #include "error.h"
  
@@ -13,15 +12,14 @@
  char ifaces[][6] =
      { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
      "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
--    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
+-    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath"
 +    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "bond", "ath"
  };
  
  char *ltrim(char *buf)
-diff -urN iptraf-3.0.0.orig/src/packet.c iptraf-3.0.0/src/packet.c
---- iptraf-3.0.0.orig/src/packet.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/packet.c	2006-04-11 08:04:50.208732750 +0200
-@@ -90,7 +90,8 @@
+--- iptraf-3.0.0/src/packet.c.orig	2007-06-03 19:03:27.312372537 +0000
++++ iptraf-3.0.0/src/packet.c	2007-06-03 19:03:27.316372709 +0000
+@@ -91,7 +91,8 @@
          else if (strncmp(ifname, "ipsec", 5) == 0)
              result = LINK_ETHERNET;
          else if ((strncmp(ifname, "wvlan", 5) == 0)

================================================================
Index: SOURCES/iptraf-llh.patch
diff -u SOURCES/iptraf-llh.patch:1.1 SOURCES/iptraf-llh.patch:1.2
--- SOURCES/iptraf-llh.patch:1.1	Mon May  9 12:00:01 2005
+++ SOURCES/iptraf-llh.patch	Sun Jun  3 21:10:33 2007
@@ -1,11 +1,21 @@
 --- iptraf-2.7.0/src/tcptable.h.orig	2005-05-09 11:49:03.000000000 +0200
 +++ iptraf-2.7.0/src/tcptable.h	2005-05-09 11:50:28.000000000 +0200
-@@ -19,12 +19,12 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <net/if_arp.h>
-+#include <net/if.h>
+@@ -12,19 +12,17 @@
+ #include <fcntl.h>
+ #include <curses.h>
+ #include <panel.h>
+-#include <netdb.h>
+ #include <time.h>
+ #include <sys/types.h>
+-#include <sys/socket.h>
+-#include <netinet/in.h>
+-#include <arpa/inet.h>
+-#include <net/if_arp.h>
  #include <asm/types.h>
++#include <linux/socket.h>
++#include <sys/socket.h>
++#include <linux/net.h>
++#include <linux/if.h>
  #include <linux/if_packet.h>
  #include <linux/if_ether.h>
  #include <linux/if_fddi.h>
@@ -14,13 +24,36 @@
  #include <netinet/ip.h>
  #include <netinet/udp.h>
  #include "servname.h"
---- iptraf-2.7.0/src/othptab.c.orig	2005-05-09 11:52:54.000000000 +0200
-+++ iptraf-2.7.0/src/othptab.c	2005-05-09 11:52:39.000000000 +0200
-@@ -16,6 +16,7 @@
+--- iptraf-3.0.0.orig/src/othptab.c
++++ iptraf-3.0.0/src/othptab.c
+@@ -16,14 +16,28 @@
  
  ***/
  
-+#include <net/if.h>
++/* ARP protocol opcodes. */
++#define ARPOP_REQUEST   1               /* ARP request.  */
++#define ARPOP_REPLY     2               /* ARP reply.  */
++#define ARPOP_RREQUEST  3               /* RARP request.  */
++#define ARPOP_RREPLY    4               /* RARP reply.  */
++#define ARPOP_InREQUEST 8               /* InARP request.  */
++#define ARPOP_InREPLY   9               /* InARP reply.  */
++#define ARPOP_NAK       10              /* (ATM)ARP NAK.  */
++
++
  #include <asm/types.h>
++#include "options.h"
++#include "tcptable.h"
++/*#include <linux/socket.h>*/
++#include <linux/if.h>
  #include <linux/if_ether.h>
  #include <linux/if_tr.h>
+ #include <linux/if_fddi.h>
++#include <linux/if_arp.h>
++#include <netdb.h>
+ #include <winops.h>
+ #include "arphdr.h"
+-#include "options.h"
+-#include "tcptable.h"
+ #include "othptab.h"
+ #include "deskman.h"
+ #include "attrs.h"

================================================================
Index: SOURCES/iptraf.patch
diff -u SOURCES/iptraf.patch:1.5 SOURCES/iptraf.patch:1.6
--- SOURCES/iptraf.patch:1.5	Sun May 19 21:59:53 2002
+++ SOURCES/iptraf.patch	Sun Jun  3 21:10:33 2007
@@ -1,7 +1,111 @@
-diff -Nur iptraf-2.7.0.orig/Documentation/iptraf.8 iptraf-2.7.0/Documentation/iptraf.8
---- iptraf-2.7.0.orig/Documentation/iptraf.8	Sun May 19 20:47:44 2002
-+++ iptraf-2.7.0/Documentation/iptraf.8	Sun May 19 20:48:27 2002
-@@ -86,7 +86,7 @@
+--- iptraf-3.0.0.orig/Documentation/iptraf.8
++++ iptraf-3.0.0/Documentation/iptraf.8
+@@ -2,22 +2,22 @@
+ .SH NAME
+ iptraf \- Interactive Colorful IP LAN Monitor
+ .SH SYNOPSIS
+-.BR iptraf " { [ " -f " ] [ " -q " ] [ { " -i 
++.BR iptraf " { [ " \-f " ] [ " \-q " ] [ " \-u " ] [ { " \-i 
+ .IR iface " | " 
+-.BR -g " | " -d
++.BR \-g " | " \-d
+ .IR iface " | "
+-.BR -s
++.BR \-s
+ .IR iface " | "
+-.BR -z
++.BR \-z
+ .IR iface " | "
+-.BR -l 
++.BR \-l 
+ .IR iface " } [ " 
+-.BR -t
++.BR \-t
+ .IR timeout " ] [ "
+-.BR -B " [ "
+-.BR -L
++.BR \-B " [ "
++.BR \-L
+ .IR logfile " ] ] ] | [ "
+-.BR -h " ] }"
++.BR \-h " ] }"
+ .br
+ .SH DESCRIPTION
+ .B iptraf
+@@ -30,38 +30,38 @@
+ .SH OPTIONS
+ These options can also be supplied to the command:
+ .TP
+-.BI "-i " iface
++.BI "\-i " iface
+ immediately start the IP traffic monitor on the specified interface, or
+-all interfaces if "-i all" is specified
++all interfaces if "\-i all" is specified
+ .TP
+-.B "-g"
++.B "\-g"
+ immediately start the general interface statistics
+ .TP
+-.BI "-d " iface
++.BI "\-d " iface
+ allows you to immediately start the detailed on the indicated interface (iface)
+ .TP
+-.BI "-s " iface
++.BI "\-s " iface
+ allows you to immediately monitor TCP and UDP traffic on the specified interface (iface)
+ .TP
+-.BI "-z " iface
++.BI "\-z " iface
+ shows packet counts by size on the specified interface
+ .TP
+-.BI "-l " iface
++.BI "\-l " iface
+ start the LAN station monitor on the specified interface, or all LAN
+-interfaces if "-l all" is specified
++interfaces if "\-l all" is specified
+ .TP
+-.BI "-t " timeout
++.BI "\-t " timeout
+ tells IPTraf to run the specified facility for only
+ .I timeout
+ minutes.  This option is used only with one of the above parameters.
+ .TP
+-.B "-B"
++.B "\-B"
+ redirect standard output to /dev/null, closes standard input, and forks
+ the program into the background.  Can be used only with one of the
+ facility invocation parameters above.  Send the backgrounded process a
+ USR2 signal to terminate.
+ .TP
+-.B "-L logfile"
++.B "\-L logfile"
+ allows you to specify an alternate log file name.  The default log file
+ name is based on either the interface selected (detailed interface
+ statistics, TCP/UDP service statistics, packet size breakdown), or the
+@@ -69,15 +69,19 @@
+ path is not specified, the log file is placed in
+ .B /var/log/iptraf
+ .TP
+-.B "-f"
++.B "\-f"
+ clears all locks and counters, causing this instance of IPTraf to think
+ it's the first one running.  This should only be used to recover from
+ an abnormal termination or system crash.
+ .TP
+-.BI "-q"
++.B "\-u"
++allow use of unsupported interfaces as ethernet devices.  This is needed if
++you changed the name of an interface (ex: ip link set eth0 name foo0)
++.TP
++.BI "\-q"
+ no longer needed, maintained only for compatibility.
+ .TP
+-.B "-h"
++.B "\-h"
+ shows a command summary
+ .SH SIGNALS
+ 
+@@ -86,7 +90,7 @@
  
  .SH FILES
   /var/log/iptraf/*.log - log file
@@ -10,9 +114,16 @@
  
  .SH SEE ALSO
   Documentation/* - complete documentation written by the author
-diff -Nur iptraf-2.7.0.orig/Documentation/rvnamed.8 iptraf-2.7.0/Documentation/rvnamed.8
---- iptraf-2.7.0.orig/Documentation/rvnamed.8	Sun May 19 20:47:44 2002
-+++ iptraf-2.7.0/Documentation/rvnamed.8	Sun May 19 20:49:00 2002
+@@ -96,6 +100,6 @@
+ Gerard Paul Java (riker at mozcom.com)
+ 
+ .SH MANUAL AUTHOR
+-Frederic Peters (fpeters at debian.org), using iptraf --help
++Frederic Peters (fpeters at debian.org), using iptraf \-h
+ General manual page modifications by Gerard Paul Java (riker at mozcom.com)
+ 
+--- iptraf-3.0.0.orig/Documentation/rvnamed.8
++++ iptraf-3.0.0/Documentation/rvnamed.8
 @@ -11,7 +11,7 @@
  This program is only used by iptraf and, therefore, is useless alone.
  
@@ -22,69 +133,515 @@
  
  .SH SEE ALSO
  README.rvnamed - documentation from the author
-diff -Nur iptraf-2.7.0.orig/src/Makefile iptraf-2.7.0/src/Makefile
---- iptraf-2.7.0.orig/src/Makefile	Sun May 19 20:47:44 2002
-+++ iptraf-2.7.0/src/Makefile	Sun May 19 20:51:38 2002
-@@ -31,7 +31,7 @@
- # options to be passed to the compiler.  I don't believe they need to be
- # modified (except for -m486 on non-Intel x86 platforms).
- 
--CFLAGS		= -Wall #-O2 #-m486
-+CFLAGS		= $(RPM_OPT_FLAGS)
- DIRS		= -DWORKDIR=\"$(WORKDIR)\" \
+--- iptraf-3.0.0.orig/src/ifstats.c
++++ iptraf-3.0.0/src/ifstats.c
+@@ -32,7 +32,7 @@
+ #include <arpa/inet.h>
+ #include <net/if_arp.h>
+ #include <linux/if_packet.h>
+-#include <net/if.h>
++#include <linux/if.h>
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+ #include <netinet/udp.h>
+@@ -129,7 +129,7 @@
+ {
+     FILE *fd;
+     char buf[161];
+-    char ifname[10];
++    char ifname[18];
+     struct iflist *itmp = NULL;
+     struct iflist *tail = NULL;
+     unsigned int index = 0;
+@@ -433,7 +433,7 @@
+     FILE *logfile = NULL;
+ 
+     int br;
+-    char ifname[10];
++    char ifname[18];
+ 
+     int ch;
+ 
+@@ -760,7 +760,7 @@
+     char *tpacket;
+     unsigned int iphlen;
+ 
+-    char ifname[10];
++    char ifname[18];
+     struct sockaddr_ll fromaddr;
+     unsigned short linktype;
+ 
+--- iptraf-3.0.0.orig/src/iptraf.c
++++ iptraf-3.0.0/src/iptraf.c
+@@ -410,7 +410,7 @@
+ {
+     printf("\nSyntax:\n");
+     printf
+-        ("    iptraf [ -f ] [ { -i iface | -g | -d iface | -s iface | -z iface |\n");
++        ("    iptraf [ -f ] [ -u ] [ { -i iface | -g | -d iface | -s iface | -z iface |\n");
+     printf
+         ("           -l iface } [ -t timeout ] [ -B ] [ -L logfile ] [-I interval] ] \n\n");
+     printf
+@@ -445,6 +445,8 @@
+         ("-f          - clear all locks and counters.  Use with great caution.\n");
+     printf
+         ("              Normally used to recover from an abnormal termination.\n\n");
++    printf
++        ("-u          - allow use of unsupported interfaces as ethernet devices.\n");
+     printf("IPTraf %s Copyright (c) Gerard Paul Java 1997-2004\n",
+            VERSION);
+ }
+@@ -616,6 +618,18 @@
+     freopen("/dev/null", "r", stdin);
+     freopen("/dev/null", "w", stderr);
+ #endif
++    
++    /* Check whether LOCKDIR exists (/var/run is on a tmpfs in Ubuntu) */
++    if(access(LOCKDIR,F_OK) != 0) {
++	if(mkdir(LOCKDIR, 0700) == -1) {
++	    fprintf(stderr, "Cannot create %s: %s", LOCKDIR, strerror(errno));
++	    exit(1);
++        }
++	if(chown(LOCKDIR, 0, 0) == -1) {
++	    fprintf(stderr, "Cannot change owner of %s: %s", LOCKDIR, strerror(errno));
++	    exit(1);
++	}
++    }
+ 
+     initscr();
+ 
+--- iptraf-3.0.0.orig/src/itrafmon.c
++++ iptraf-3.0.0/src/itrafmon.c
+@@ -604,7 +604,7 @@
+     int curwin = 0;
+ 
+     int readlen;
+-    char ifname[10];
++    char ifname[18];
+ 
+     unsigned long long total_pkts = 0;
+ 
+--- iptraf-3.0.0.orig/src/ifstats.h
++++ iptraf-3.0.0/src/ifstats.h
+@@ -6,7 +6,7 @@
+ ***/
+ 
+ struct iflist {
+-    char ifname[8];
++    char ifname[18];
+     unsigned int encap;
+     unsigned long long iptotal;
+     unsigned long badtotal;
+--- iptraf-3.0.0.orig/src/othptab.h
++++ iptraf-3.0.0/src/othptab.h
+@@ -9,14 +9,12 @@
+ #include <malloc.h>
+ #include <string.h>
+ #include <sys/types.h>
+-#include <sys/socket.h>
+-#include <netinet/in.h>
++#include <linux/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/ip_icmp.h>
+ #include <netinet/udp.h>
+ #include <curses.h>
+ #include <panel.h>
+-#include <netdb.h>
+ #include <linux/if_ether.h>
+ #include "servname.h"
+ #include "addproto.h"
+@@ -42,7 +40,7 @@
+     int s_fstat;
+     int d_fstat;
+     unsigned int protocol;
+-    char iface[8];
++    char iface[18];
+     unsigned int pkt_length;
+ 
+     union {
+--- iptraf-3.0.0.orig/src/tcptable.h
++++ iptraf-3.0.0/src/tcptable.h
+@@ -64,7 +62,7 @@
+     unsigned long finack;
+     int partial;
+     int finsent;
+-    char ifname[8];
++    char ifname[18];
+     unsigned int index;
+     int reused;
+     int timedout;
+--- iptraf-3.0.0.orig/src/Makefile
++++ iptraf-3.0.0/src/Makefile
+@@ -36,6 +36,11 @@
  		  -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\"
  LDOPTS		= #-static
-@@ -68,12 +68,12 @@
- # installation target directory.  The iptraf and rvnamed programs get
- # stored here.  iptraf also exec's rvnamed from this directory.
- 
--TARGET		= /usr/local/bin
-+TARGET		= /usr/bin
- 
- # The IPTraf working directory; if you change this.  Starting with this
- # version, this definition overrides dirs.h.
- 
--WORKDIR		= /var/local/iptraf
-+WORKDIR		= /var/lib/iptraf
- 
- # The IPTraf log file directory.  IPTraf log files are placed here.
- # This definition overrides dirs.h
-@@ -89,7 +89,7 @@
- # DO NOT MAKE THIS POINT TO AN EXISTING/SYSTEM DIRECTORY!!!!  THE
- # LOCK OVERRIDE (iptraf -f) WILL ERASE FILES HERE!
- #*****************************************************************
--LOCKDIR		= /var/run/iptraf
-+LOCKDIR		= /var/run
- 
- #####################################################################
- ############### IPTRAF COMPILATION AND LINK RULES
-diff -Nur iptraf-2.7.0.orig/src/dirs.h iptraf-2.7.0/src/dirs.h
---- iptraf-2.7.0.orig/src/dirs.h	Sun May 19 20:47:44 2002
-+++ iptraf-2.7.0/src/dirs.h	Sun May 19 20:52:11 2002
-@@ -26,7 +26,7 @@
-  */
-  
- #ifndef WORKDIR
--#define WORKDIR		"/var/local/iptraf"
-+#define WORKDIR		"/var/lib/iptraf"
- #endif
  
- #ifndef LOGDIR
-@@ -34,7 +34,7 @@
- #endif
- 
- #ifndef EXECDIR
--#define EXECDIR		"/usr/local/bin"
-+#define EXECDIR		"/usr/bin"
- #endif
++
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++CFLAGS += -g
++endif
++
+ # you may want to change this to point to your ncurses include directory
+ # if the ncurses include files are not in the default location.
+ 
+@@ -145,7 +150,7 @@
+ # installation rule
+ 
+ install:
+-	@./install.sh $(TARGET) $(WORKDIR) $(LOGDIR) $(LOCKDIR)
++	@./install.sh $(TARGET) $(WORKDIR) $(LOGDIR) $(LOCKDIR) $(DESTDIR)
+ 
+ # Upgrade rule
+ #
+--- iptraf-3.0.0.orig/src/promisc.c
++++ iptraf-3.0.0/src/promisc.c
+@@ -32,7 +32,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <netinet/in.h>
+-#include <net/if.h>
++#include <linux/if.h>
+ #include <linux/if_ether.h>
+ #include "ifstats.h"
+ #include "ifaces.h"
+@@ -49,7 +49,7 @@
+ {
+     FILE *fd;
+     int ifd;
+-    char buf[8];
++    char buf[18];
+     struct promisc_states *ptmp;
+     struct promisc_states *tail = NULL;
+     struct ifreq ifr;
+@@ -81,6 +81,7 @@
+              */
+ 
+             if ((strncmp(buf, "eth", 3) == 0) ||
++	        (strncmp(buf, "ath", 3) == 0) ||
+                 (strncmp(buf, "fddi", 4) == 0) ||
+                 (strncmp(buf, "tr", 2) == 0) ||
+                 (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
+--- iptraf-3.0.0.orig/src/hostmon.c
++++ iptraf-3.0.0/src/hostmon.c
+@@ -711,7 +711,7 @@
+     int is_ip;
+     int ch;
+ 
+-    char ifname[10];
++    char ifname[18];
+ 
+     struct timeval tv;
+     unsigned long starttime;
+--- iptraf-3.0.0.orig/src/serv.c
++++ iptraf-3.0.0/src/serv.c
+@@ -739,7 +739,7 @@
+     unsigned short linktype;
+     int br;
+ 
+-    char iface[8];
++    char iface[18];
+     unsigned int idx = 1;
+ 
+     unsigned int sport = 0;
+--- iptraf-3.0.0.orig/src/packet.c
++++ iptraf-3.0.0/src/packet.c
+@@ -31,13 +31,12 @@
+ #include <netinet/tcp.h>
+ #include <sys/time.h>
+ #include <net/if_arp.h>
+-#include <net/if.h>
++#include <linux/if.h>
+ #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>
+ #include <msgboxes.h>
+ #include "deskman.h"
+@@ -79,6 +78,8 @@
+     case ARPHRD_ETHER:
+         if (strncmp(ifname, "eth", 3) == 0)
+             result = LINK_ETHERNET;
++	else if (strncmp(ifname, "ath", 3) == 0)
++	    result = LINK_ETHERNET;
+         else if (strncmp(ifname, "plip", 4) == 0)
+             result = LINK_PLIP;
+         else if (strncmp(ifname, "fddi", 4) == 0)       /* For some Ethernet- */
+--- iptraf-3.0.0.orig/src/rvnamed.c
++++ iptraf-3.0.0/src/rvnamed.c
+@@ -219,6 +219,9 @@
+     signal(SIGCHLD, childreap);
+ 
+     logfile = fopen(RVNDLOGFILE, "a");
++    if ( logfile == NULL ) { /* unable to open file -> /dev/null */
++	logfile = fopen("/dev/null", "a");
++    }
+ 
+     if (logfile == NULL)
+         logfile = fopen("/dev/null", "a");
+--- iptraf-3.0.0.orig/src/rvnamed.h
++++ iptraf-3.0.0/src/rvnamed.h
+@@ -1,9 +1,9 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+-#define CHILDSOCKNAME "/dev/rvndcldcomsk"
+-#define PARENTSOCKNAME "/dev/rvndpntcomsk"
+-#define IPTSOCKNAME "/dev/rvndiptcomsk"
++#define CHILDSOCKNAME "/var/run/rvndcldcomsk"
++#define PARENTSOCKNAME "/var/run/rvndpntcomsk"
++#define IPTSOCKNAME "/var/run/rvndiptcomsk"
+ 
+ #define SOCKET_PREFIX	"isock"
+ 
+--- iptraf-3.0.0.orig/src/ifaces.c
++++ iptraf-3.0.0/src/ifaces.c
+@@ -24,7 +24,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+-#include <net/if.h>
++#include <linux/if.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <linux/if_packet.h>
+@@ -39,7 +39,7 @@
+ char ifaces[][6] =
+     { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
+     "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
+-    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
++    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath"
+ };
+ 
+ char *ltrim(char *buf)
+@@ -102,7 +102,7 @@
+ int iface_supported(char *iface)
+ {
+     int i;
+-
++    
+     if (accept_unsupported_interfaces)
+         return 1;
+ 
+--- iptraf-3.0.0.orig/src/isdntab.h
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/iptraf-iface.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/iptraf-llh.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/iptraf.patch?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list