diff -r -c iptraf-3.0.1/CHANGES iptraf-3.0.2/CHANGES *** iptraf-3.0.1/CHANGES 2005-09-13 11:06:23.000000000 +0200 --- iptraf-3.0.2/CHANGES 2009-11-29 11:10:00.000000000 +0100 *************** *** 1,3 **** --- 1,9 ---- + CHANGES File for IPTraf 3.0.2 + Added ifname length patch. + + CHANGES File for IPTraf 3.0.1 + Added ath devices support. + CHANGES File for IPTraf 3.0.0 Changes to IPTraf 2.7.0 and new features in IPTraf 3.0.0 diff -r -c iptraf-3.0.1/Documentation/version iptraf-3.0.2/Documentation/version *** iptraf-3.0.1/Documentation/version 2002-12-26 03:26:03.000000000 +0100 --- iptraf-3.0.2/Documentation/version 2009-11-29 11:57:52.000000000 +0100 *************** *** 1 **** ! 3.0.0 --- 1 ---- ! 3.0.2 diff -r -c iptraf-3.0.1/INSTALL iptraf-3.0.2/INSTALL *** iptraf-3.0.1/INSTALL 2002-12-30 09:17:17.000000000 +0100 --- iptraf-3.0.2/INSTALL 2009-11-29 11:57:20.000000000 +0100 *************** *** 5,11 **** IMPORTANT: READ THE SYSTEM REQUIREMENTS SECTION IN THE README. IPTRAF 2 REQUIRES LINUX 2.2 OR LATER. ! To compile and install, just change to the iptraf-3.0.0 top-level directory and type: ./Setup --- 5,11 ---- IMPORTANT: READ THE SYSTEM REQUIREMENTS SECTION IN THE README. IPTRAF 2 REQUIRES LINUX 2.2 OR LATER. ! To compile and install, just change to the iptraf-3.0.2 top-level directory and type: ./Setup diff -r -c iptraf-3.0.1/RELEASE-NOTES iptraf-3.0.2/RELEASE-NOTES *** iptraf-3.0.1/RELEASE-NOTES 2002-12-30 09:15:40.000000000 +0100 --- iptraf-3.0.2/RELEASE-NOTES 2009-11-29 11:57:30.000000000 +0100 *************** *** 1,5 **** =============================================================================== ! RELEASE NOTES FOR IPTRAF 3.0.0 ------------------------------------------------------------------------------- This file contains important release information for IPTraf 3.0.0. Please read it in full before running this new version for the first time. --- 1,5 ---- =============================================================================== ! RELEASE NOTES FOR IPTRAF 3.0.2 ------------------------------------------------------------------------------- This file contains important release information for IPTraf 3.0.0. Please read it in full before running this new version for the first time. diff -r -c iptraf-3.0.1/makefile iptraf-3.0.2/makefile *** iptraf-3.0.1/makefile 2008-12-05 21:08:26.000000000 +0100 --- iptraf-3.0.2/makefile 2009-11-29 11:58:59.000000000 +0100 *************** *** 1,4 **** --- 1,7 ---- + default: + make -C ./src/ + src: make -C ./src/ all diff -r -c iptraf-3.0.1/src/hostmon.c iptraf-3.0.2/src/hostmon.c *** iptraf-3.0.1/src/hostmon.c 2008-12-05 20:26:30.000000000 +0100 --- iptraf-3.0.2/src/hostmon.c 2009-11-29 11:36:59.000000000 +0100 *************** *** 38,43 **** --- 38,44 ---- #include #include #include + #include "options.h" #include "dirs.h" #include "deskman.h" #include "links.h" *************** *** 51,57 **** #include "log.h" #include "timer.h" #include "landesc.h" - #include "options.h" #include "instances.h" #include "mode.h" #include "logvars.h" --- 52,57 ---- *************** *** 711,717 **** int is_ip; int ch; ! char ifname[10]; struct timeval tv; unsigned long starttime; --- 711,717 ---- int is_ip; int ch; ! char ifname[IFACE_LENGTH]; struct timeval tv; unsigned long starttime; diff -r -c iptraf-3.0.1/src/hostmon.h iptraf-3.0.2/src/hostmon.h *** iptraf-3.0.1/src/hostmon.h 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/hostmon.h 2009-11-29 11:13:01.000000000 +0100 *************** *** 25,31 **** char eth_addr[ETH_ALEN]; char ascaddr[15]; char desc[65]; ! char ifname[10]; int withdesc; int printed; unsigned int linktype; --- 25,31 ---- char eth_addr[ETH_ALEN]; char ascaddr[15]; char desc[65]; ! char ifname[IFACE_LENGTH]; int withdesc; int printed; unsigned int linktype; diff -r -c iptraf-3.0.1/src/ifaces.h iptraf-3.0.2/src/ifaces.h *** iptraf-3.0.1/src/ifaces.h 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/ifaces.h 2009-11-29 11:34:02.000000000 +0100 *************** *** 2,9 **** ifaces.h - prototype declaration for interface support determination routine. - ***/ FILE *open_procnetdev(void); void get_next_iface(FILE * fd, char *ifname); --- 2,11 ---- ifaces.h - prototype declaration for interface support determination routine. ***/ + #ifndef __IFACES_H__ + #define __IFACES_H__ + FILE *open_procnetdev(void); void get_next_iface(FILE * fd, char *ifname); *************** *** 13,15 **** --- 15,19 ---- void err_iface_down(void); void isdn_iface_check(int *fd, char *ifname); char *gen_iface_msg(char *ifptr); + + #endif \ No newline at end of file diff -r -c iptraf-3.0.1/src/ifstats.c iptraf-3.0.2/src/ifstats.c *** iptraf-3.0.1/src/ifstats.c 2008-12-05 20:26:44.000000000 +0100 --- iptraf-3.0.2/src/ifstats.c 2009-11-29 11:38:42.000000000 +0100 *************** *** 41,53 **** #include #include #include #include "ifstats.h" #include "ifaces.h" #include "isdntab.h" #include "fltdefs.h" #include "fltselect.h" #include "packet.h" - #include "options.h" #include "log.h" #include "dirs.h" #include "deskman.h" --- 41,53 ---- #include #include #include + #include "options.h" #include "ifstats.h" #include "ifaces.h" #include "isdntab.h" #include "fltdefs.h" #include "fltselect.h" #include "packet.h" #include "log.h" #include "dirs.h" #include "deskman.h" *************** *** 129,135 **** { FILE *fd; char buf[161]; ! char ifname[10]; struct iflist *itmp = NULL; struct iflist *tail = NULL; unsigned int index = 0; --- 129,135 ---- { FILE *fd; char buf[161]; ! char ifname[IFACE_LENGTH]; struct iflist *itmp = NULL; struct iflist *tail = NULL; unsigned int index = 0; *************** *** 433,439 **** FILE *logfile = NULL; int br; ! char ifname[10]; int ch; --- 433,439 ---- FILE *logfile = NULL; int br; ! char ifname[IFACE_LENGTH]; int ch; *************** *** 760,766 **** char *tpacket; unsigned int iphlen; ! char ifname[10]; struct sockaddr_ll fromaddr; unsigned short linktype; --- 760,766 ---- char *tpacket; unsigned int iphlen; ! char ifname[IFACE_LENGTH]; struct sockaddr_ll fromaddr; unsigned short linktype; diff -r -c iptraf-3.0.1/src/ifstats.h iptraf-3.0.2/src/ifstats.h *** iptraf-3.0.1/src/ifstats.h 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/ifstats.h 2009-11-29 11:14:49.000000000 +0100 *************** *** 6,12 **** ***/ struct iflist { ! char ifname[8]; unsigned int encap; unsigned long long iptotal; unsigned long badtotal; --- 6,12 ---- ***/ struct iflist { ! char ifname[IFACE_LENGTH]; unsigned int encap; unsigned long long iptotal; unsigned long badtotal; diff -r -c iptraf-3.0.1/src/iptraf.c iptraf-3.0.2/src/iptraf.c *** iptraf-3.0.1/src/iptraf.c 2008-12-05 20:27:00.000000000 +0100 --- iptraf-3.0.2/src/iptraf.c 2009-11-29 11:37:43.000000000 +0100 *************** *** 5,11 **** Written by Gerard Paul Java Copyright (c) Gerard Paul Java 1997-2004 ! Version 3.0.0 Main Module --------------------------------------------------------------------------- --- 5,11 ---- Written by Gerard Paul Java Copyright (c) Gerard Paul Java 1997-2004 ! Version 3.0.2 Main Module --------------------------------------------------------------------------- *************** *** 39,44 **** --- 39,45 ---- #include #include #include + #include "options.h" #include "dirs.h" #include "deskman.h" #include "fltdefs.h" *************** *** 47,53 **** #include "fltedit.h" #include "ifstats.h" #include "serv.h" - #include "options.h" #include "promisc.h" #include "externs.h" #include "instances.h" --- 48,53 ---- *************** *** 234,240 **** struct filterstate ofilter; struct ffnode *fltfiles; ! char ifname[10]; char *ifptr = NULL; struct porttab *ports; --- 234,240 ---- struct filterstate ofilter; struct ffnode *fltfiles; ! char ifname[IFACE_LENGTH]; char *ifptr = NULL; struct porttab *ports; diff -r -c iptraf-3.0.1/src/isdntab.c iptraf-3.0.2/src/isdntab.c *** iptraf-3.0.1/src/isdntab.c 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/isdntab.c 2009-11-29 11:39:57.000000000 +0100 *************** *** 21,26 **** --- 21,27 ---- #include #include #include + #include "options.h" #include "isdntab.h" diff -r -c iptraf-3.0.1/src/isdntab.h iptraf-3.0.2/src/isdntab.h *** iptraf-3.0.1/src/isdntab.h 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/isdntab.h 2009-11-29 11:15:41.000000000 +0100 *************** *** 1,5 **** struct isdntabent { ! char ifname[10]; unsigned int encap; struct isdntabent *next_entry; }; --- 1,5 ---- struct isdntabent { ! char ifname[IFACE_LENGTH]; unsigned int encap; struct isdntabent *next_entry; }; diff -r -c iptraf-3.0.1/src/itrafmon.c iptraf-3.0.2/src/itrafmon.c *** iptraf-3.0.1/src/itrafmon.c 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/itrafmon.c 2009-11-29 11:50:03.000000000 +0100 *************** *** 24,36 **** #include #include #include "options.h" #include "tcptable.h" #include "othptab.h" #include "fltdefs.h" #include "fltselect.h" #include "isdntab.h" #include "packet.h" - #include "ifaces.h" #include "promisc.h" #include "deskman.h" #include "error.h" --- 24,36 ---- #include #include #include "options.h" + #include "ifaces.h" #include "tcptable.h" #include "othptab.h" #include "fltdefs.h" #include "fltselect.h" #include "isdntab.h" #include "packet.h" #include "promisc.h" #include "deskman.h" #include "error.h" *************** *** 604,610 **** int curwin = 0; int readlen; ! char ifname[10]; unsigned long long total_pkts = 0; --- 604,610 ---- int curwin = 0; int readlen; ! char ifname[IFACE_LENGTH]; unsigned long long total_pkts = 0; diff -r -c iptraf-3.0.1/src/options.h iptraf-3.0.2/src/options.h *** iptraf-3.0.1/src/options.h 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/options.h 2009-11-29 11:33:48.000000000 +0100 *************** *** 13,15 **** --- 13,17 ---- #define KBYTES 1 #define DEFAULT_UPDATE_DELAY 50000 /* usec screen delay if update rate 0 */ #define HOSTMON_UPDATE_DELAY 100000 + + #define IFACE_LENGTH 12 \ No newline at end of file diff -r -c iptraf-3.0.1/src/othptab.h iptraf-3.0.2/src/othptab.h *** iptraf-3.0.1/src/othptab.h 2008-12-05 20:24:01.000000000 +0100 --- iptraf-3.0.2/src/othptab.h 2009-11-29 11:21:51.000000000 +0100 *************** *** 42,48 **** int s_fstat; int d_fstat; unsigned int protocol; ! char iface[8]; unsigned int pkt_length; union { --- 42,48 ---- int s_fstat; int d_fstat; unsigned int protocol; ! char iface[IFACE_LENGTH]; unsigned int pkt_length; union { diff -r -c iptraf-3.0.1/src/parseproto.c iptraf-3.0.2/src/parseproto.c *** iptraf-3.0.1/src/parseproto.c 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/parseproto.c 2009-11-29 11:41:37.000000000 +0100 *************** *** 18,23 **** --- 18,24 ---- #include #include #include + #include "options.h" #include "parseproto.h" diff -r -c iptraf-3.0.1/src/pktsize.c iptraf-3.0.2/src/pktsize.c *** iptraf-3.0.1/src/pktsize.c 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/pktsize.c 2009-11-29 11:39:25.000000000 +0100 *************** *** 30,35 **** --- 30,36 ---- #include #include #include + #include "options.h" #include "attrs.h" #include "dirs.h" #include "fltdefs.h" *************** *** 40,46 **** #include "deskman.h" #include "error.h" #include "pktsize.h" - #include "options.h" #include "timer.h" #include "instances.h" #include "log.h" --- 41,46 ---- *************** *** 175,181 **** char buf[MAX_PACKET_SIZE]; int br; char *ipacket; ! char iface[10]; unsigned int mtu; struct sockaddr_ll fromaddr; --- 175,181 ---- char buf[MAX_PACKET_SIZE]; int br; char *ipacket; ! char iface[IFACE_LENGTH]; unsigned int mtu; struct sockaddr_ll fromaddr; diff -r -c iptraf-3.0.1/src/promisc.c iptraf-3.0.2/src/promisc.c *** iptraf-3.0.1/src/promisc.c 2008-12-05 20:26:21.000000000 +0100 --- iptraf-3.0.2/src/promisc.c 2009-11-29 11:41:23.000000000 +0100 *************** *** 34,41 **** #include #include #include #include "ifstats.h" - #include "ifaces.h" #include "error.h" #include "promisc.h" #include "dirs.h" --- 34,41 ---- #include #include #include + #include "options.h" #include "ifstats.h" #include "error.h" #include "promisc.h" #include "dirs.h" *************** *** 49,55 **** { FILE *fd; int ifd; ! char buf[8]; struct promisc_states *ptmp; struct promisc_states *tail = NULL; struct ifreq ifr; --- 49,55 ---- { FILE *fd; int ifd; ! char buf[IFACE_LENGTH]; struct promisc_states *ptmp; struct promisc_states *tail = NULL; struct ifreq ifr; diff -r -c iptraf-3.0.1/src/promisc.h iptraf-3.0.2/src/promisc.h *** iptraf-3.0.1/src/promisc.h 2005-09-13 08:42:54.000000000 +0200 --- iptraf-3.0.2/src/promisc.h 2009-11-29 11:16:32.000000000 +0100 *************** *** 9,15 **** */ struct promisc_params { ! char ifname[8]; int saved_state; int state_valid; }; --- 9,15 ---- */ struct promisc_params { ! char ifname[IFACE_LENGTH]; int saved_state; int state_valid; }; diff -r -c iptraf-3.0.1/src/serv.c iptraf-3.0.2/src/serv.c *** iptraf-3.0.1/src/serv.c 2008-12-05 20:26:36.000000000 +0100 --- iptraf-3.0.2/src/serv.c 2009-11-29 11:42:32.000000000 +0100 *************** *** 39,44 **** --- 39,45 ---- #include #include #include + #include "options.h" #include "tcphdr.h" #include "dirs.h" #include "ipcsum.h" *************** *** 55,61 **** #include "log.h" #include "timer.h" #include "promisc.h" - #include "options.h" #include "instances.h" #include "packet.h" #include "logvars.h" --- 56,61 ---- *************** *** 739,745 **** unsigned short linktype; int br; ! char iface[8]; unsigned int idx = 1; unsigned int sport = 0; --- 739,745 ---- unsigned short linktype; int br; ! char iface[IFACE_LENGTH]; unsigned int idx = 1; unsigned int sport = 0; diff -r -c iptraf-3.0.1/src/tcptable.h iptraf-3.0.2/src/tcptable.h *** iptraf-3.0.1/src/tcptable.h 2008-12-05 20:24:35.000000000 +0100 --- iptraf-3.0.2/src/tcptable.h 2009-11-29 11:16:59.000000000 +0100 *************** *** 64,70 **** unsigned long finack; int partial; int finsent; ! char ifname[8]; unsigned int index; int reused; int timedout; --- 64,70 ---- unsigned long finack; int partial; int finsent; ! char ifname[IFACE_LENGTH]; unsigned int index; int reused; int timedout; diff -r -c iptraf-3.0.1/src/version iptraf-3.0.2/src/version *** iptraf-3.0.1/src/version 2008-12-05 20:46:09.000000000 +0100 --- iptraf-3.0.2/src/version 2009-11-29 11:10:16.000000000 +0100 *************** *** 1 **** ! 3.0.1 --- 1 ---- ! 3.0.2