Only in iptraf-3.0.0.fix: makefile
diff -r -c iptraf-3.0.0/src/fltedit.c iptraf-3.0.0.fix/src/fltedit.c
*** iptraf-3.0.0/src/fltedit.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/fltedit.c	2008-12-05 20:27:38.000000000 +0100
***************
*** 21,27 ****
  #include <string.h>
  #include <ctype.h>
  #include <stdlib.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <unistd.h>
--- 21,27 ----
  #include <string.h>
  #include <ctype.h>
  #include <stdlib.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <unistd.h>
diff -r -c iptraf-3.0.0/src/fltmgr.c iptraf-3.0.0.fix/src/fltmgr.c
*** iptraf-3.0.0/src/fltmgr.c	2005-09-13 09:27:51.000000000 +0200
--- iptraf-3.0.0.fix/src/fltmgr.c	2008-12-05 20:27:51.000000000 +0100
***************
*** 21,27 ****
  #include <stdlib.h>
  #include <unistd.h>
  #include <fcntl.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <netdb.h>
  #include <sys/socket.h>
--- 21,27 ----
  #include <stdlib.h>
  #include <unistd.h>
  #include <fcntl.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <netdb.h>
  #include <sys/socket.h>
diff -r -c iptraf-3.0.0/src/fltselect.h iptraf-3.0.0.fix/src/fltselect.h
*** iptraf-3.0.0/src/fltselect.h	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/fltselect.h	2008-12-05 20:27:11.000000000 +0100
***************
*** 7,13 ****
  			
  ***/
  
! #include <sys/types.h>
  #include <netinet/udp.h>
  #include "ipfilter.h"
  
--- 7,13 ----
  			
  ***/
  
! //#include <sys/types.h>
  #include <netinet/udp.h>
  #include "ipfilter.h"
  
diff -r -c iptraf-3.0.0/src/hostmon.c iptraf-3.0.0.fix/src/hostmon.c
*** iptraf-3.0.0/src/hostmon.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/hostmon.c	2008-12-05 20:26:30.000000000 +0100
***************
*** 25,31 ****
  #include <signal.h>
  #include <ctype.h>
  #include <sys/socket.h>
! #include <sys/types.h>
  #include <asm/types.h>
  #include <netinet/in.h>
  #include <linux/if_packet.h>
--- 25,31 ----
  #include <signal.h>
  #include <ctype.h>
  #include <sys/socket.h>
! //#include <sys/types.h>
  #include <asm/types.h>
  #include <netinet/in.h>
  #include <linux/if_packet.h>
diff -r -c iptraf-3.0.0/src/ifaces.c iptraf-3.0.0.fix/src/ifaces.c
*** iptraf-3.0.0/src/ifaces.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/ifaces.c	2008-12-05 20:27:56.000000000 +0100
***************
*** 19,25 ****
  
  #include <stdio.h>
  #include <unistd.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
--- 19,25 ----
  
  #include <stdio.h>
  #include <unistd.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
***************
*** 32,43 ****
  #include "error.h"
  
  extern int accept_unsupported_interfaces;
! #define NUM_SUPPORTED_IFACES 26
  
  extern int daemonized;
  
  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"
  };
--- 32,43 ----
  #include "error.h"
  
  extern int accept_unsupported_interfaces;
! #define NUM_SUPPORTED_IFACES 27
  
  extern int daemonized;
  
  char ifaces[][6] =
!     { "lo", "eth", "ath", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
      "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
      "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
  };
diff -r -c iptraf-3.0.0/src/ifstats.c iptraf-3.0.0.fix/src/ifstats.c
*** iptraf-3.0.0/src/ifstats.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/ifstats.c	2008-12-05 20:26:44.000000000 +0100
***************
*** 25,31 ****
  #include <unistd.h>
  #include <time.h>
  #include <sys/time.h>
! #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/ioctl.h>
  #include <netinet/in.h>
--- 25,31 ----
  #include <unistd.h>
  #include <time.h>
  #include <sys/time.h>
! //#include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/ioctl.h>
  #include <netinet/in.h>
diff -r -c iptraf-3.0.0/src/instances.c iptraf-3.0.0.fix/src/instances.c
*** iptraf-3.0.0/src/instances.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/instances.c	2008-12-05 20:27:42.000000000 +0100
***************
*** 18,24 ****
  
  #include <stdio.h>
  #include <string.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <unistd.h>
--- 18,24 ----
  
  #include <stdio.h>
  #include <string.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <unistd.h>
diff -r -c iptraf-3.0.0/src/ipcsum.h iptraf-3.0.0.fix/src/ipcsum.h
*** iptraf-3.0.0/src/ipcsum.h	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/ipcsum.h	2008-12-05 20:29:12.000000000 +0100
***************
*** 5,10 ****
  
  ***/
  
! #include <sys/types.h>
  
  int in_cksum(u_short * addr, int len);
--- 5,10 ----
  
  ***/
  
! //#include <sys/types.h>
  
  int in_cksum(u_short * addr, int len);
diff -r -c iptraf-3.0.0/src/ipfilter.c iptraf-3.0.0.fix/src/ipfilter.c
*** iptraf-3.0.0/src/ipfilter.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/ipfilter.c	2008-12-05 20:27:34.000000000 +0100
***************
*** 22,28 ****
  #include <string.h>
  #include <ctype.h>
  #include <time.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
--- 22,28 ----
  #include <string.h>
  #include <ctype.h>
  #include <time.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
diff -r -c iptraf-3.0.0/src/iptraf.c iptraf-3.0.0.fix/src/iptraf.c
*** iptraf-3.0.0/src/iptraf.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/iptraf.c	2008-12-05 20:27:00.000000000 +0100
***************
*** 31,37 ****
  #include <signal.h>
  #include <string.h>
  #include <time.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <dirent.h>
--- 31,37 ----
  #include <signal.h>
  #include <string.h>
  #include <time.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <dirent.h>
diff -r -c iptraf-3.0.0/src/landesc.c iptraf-3.0.0.fix/src/landesc.c
*** iptraf-3.0.0/src/landesc.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/landesc.c	2008-12-05 20:27:46.000000000 +0100
***************
*** 22,28 ****
  #include <curses.h>
  #include <panel.h>
  #include <stdlib.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
--- 22,28 ----
  #include <curses.h>
  #include <panel.h>
  #include <stdlib.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
diff -r -c iptraf-3.0.0/src/options.c iptraf-3.0.0.fix/src/options.c
*** iptraf-3.0.0/src/options.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/options.c	2008-12-05 20:27:05.000000000 +0100
***************
*** 20,26 ****
  #include <panel.h>
  #include <fcntl.h>
  #include <unistd.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <winops.h>
  #include <menurt.h>
--- 20,26 ----
  #include <panel.h>
  #include <fcntl.h>
  #include <unistd.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <winops.h>
  #include <menurt.h>
diff -r -c iptraf-3.0.0/src/othptab.c iptraf-3.0.0.fix/src/othptab.c
*** iptraf-3.0.0/src/othptab.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/othptab.c	2008-12-05 20:31:53.000000000 +0100
***************
*** 15,21 ****
  details.
  
  ***/
! 
  #include <asm/types.h>
  #include <linux/if_ether.h>
  #include <linux/if_tr.h>
--- 15,21 ----
  details.
  
  ***/
! #include <stdlib.h>
  #include <asm/types.h>
  #include <linux/if_ether.h>
  #include <linux/if_tr.h>
diff -r -c iptraf-3.0.0/src/othptab.h iptraf-3.0.0.fix/src/othptab.h
*** iptraf-3.0.0/src/othptab.h	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/othptab.h	2008-12-05 20:24:01.000000000 +0100
***************
*** 8,14 ****
  
  #include <malloc.h>
  #include <string.h>
! #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
--- 8,14 ----
  
  #include <malloc.h>
  #include <string.h>
! //#include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
diff -r -c iptraf-3.0.0/src/packet.c iptraf-3.0.0.fix/src/packet.c
*** iptraf-3.0.0/src/packet.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/packet.c	2008-12-05 20:28:12.000000000 +0100
***************
*** 24,30 ****
  #include <string.h>
  #include <unistd.h>
  #include <errno.h>
! #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <netinet/ip.h>
--- 24,30 ----
  #include <string.h>
  #include <unistd.h>
  #include <errno.h>
! //#include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <netinet/ip.h>
***************
*** 79,84 ****
--- 79,86 ----
      case ARPHRD_ETHER:
          if (strncmp(ifname, "eth", 3) == 0)
              result = LINK_ETHERNET;
+     	else if (strncmp(ifname, "ath", 3) == 0)    /* For MadWifi */
+  	    result = LINK_ETHERNET;
          else if (strncmp(ifname, "plip", 4) == 0)
              result = LINK_PLIP;
          else if (strncmp(ifname, "fddi", 4) == 0)       /* For some Ethernet- */
diff -r -c iptraf-3.0.0/src/promisc.c iptraf-3.0.0.fix/src/promisc.c
*** iptraf-3.0.0/src/promisc.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/promisc.c	2008-12-05 20:26:21.000000000 +0100
***************
*** 25,31 ****
  #include <panel.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <unistd.h>
--- 25,31 ----
  #include <panel.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <unistd.h>
***************
*** 81,86 ****
--- 81,87 ----
               */
  
              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) ||
***************
*** 195,200 ****
--- 196,202 ----
  
      while (ptmp != NULL) {
          if (((strncmp(ptmp->params.ifname, "eth", 3) == 0) ||
+              (strncmp(ptmp->params.ifname, "ath", 3) == 0) ||
               (strncmp(ptmp->params.ifname, "fddi", 4) == 0) ||
               (strncmp(ptmp->params.ifname, "tr", 2) == 0) ||
               (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
diff -r -c iptraf-3.0.0/src/revname.c iptraf-3.0.0.fix/src/revname.c
*** iptraf-3.0.0/src/revname.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/revname.c	2008-12-05 20:27:14.000000000 +0100
***************
*** 29,35 ****
  #include <arpa/inet.h>
  #include <time.h>
  #include <sys/time.h>
! #include <sys/types.h>
  #include <unistd.h>
  #include <errno.h>
  #include <curses.h>
--- 29,35 ----
  #include <arpa/inet.h>
  #include <time.h>
  #include <sys/time.h>
! //#include <sys/types.h>
  #include <unistd.h>
  #include <errno.h>
  #include <curses.h>
diff -r -c iptraf-3.0.0/src/rvnamed.c iptraf-3.0.0.fix/src/rvnamed.c
*** iptraf-3.0.0/src/rvnamed.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/rvnamed.c	2008-12-05 20:28:08.000000000 +0100
***************
*** 36,42 ****
  
  #include <stdio.h>
  #include <unistd.h>
! #include <sys/types.h>
  #include <sys/socket.h>
  #include <errno.h>
  #include <unistd.h>
--- 36,42 ----
  
  #include <stdio.h>
  #include <unistd.h>
! //#include <sys/types.h>
  #include <sys/socket.h>
  #include <errno.h>
  #include <unistd.h>
diff -r -c iptraf-3.0.0/src/serv.c iptraf-3.0.0.fix/src/serv.c
*** iptraf-3.0.0/src/serv.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/serv.c	2008-12-05 20:26:36.000000000 +0100
***************
*** 26,32 ****
  #include <sys/time.h>
  #include <netdb.h>
  #include <ctype.h>
! #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
--- 26,32 ----
  #include <sys/time.h>
  #include <netdb.h>
  #include <ctype.h>
! //#include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
diff -r -c iptraf-3.0.0/src/tcphdr.h iptraf-3.0.0.fix/src/tcphdr.h
*** iptraf-3.0.0/src/tcphdr.h	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/tcphdr.h	2008-12-05 20:28:02.000000000 +0100
***************
*** 4,10 ****
   * provisions for little- and big-endian architectures.
   */
  
! #include <sys/types.h>
  #include <endian.h>
  
  struct tcphdr {
--- 4,10 ----
   * provisions for little- and big-endian architectures.
   */
  
! //#include <sys/types.h>
  #include <endian.h>
  
  struct tcphdr {
diff -r -c iptraf-3.0.0/src/tcptable.h iptraf-3.0.0.fix/src/tcptable.h
*** iptraf-3.0.0/src/tcptable.h	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/tcptable.h	2008-12-05 20:24:35.000000000 +0100
***************
*** 14,20 ****
  #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>
--- 14,20 ----
  #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>
diff -r -c iptraf-3.0.0/src/tr.c iptraf-3.0.0.fix/src/tr.c
*** iptraf-3.0.0/src/tr.c	2005-09-13 08:42:54.000000000 +0200
--- iptraf-3.0.0.fix/src/tr.c	2008-12-05 20:32:58.000000000 +0100
***************
*** 6,11 ****
--- 6,12 ----
   * Copyright (c) Gerard Paul Java 2002
   */
  
+ #include <stdlib.h>
  #include <asm/types.h>
  #include <linux/if_tr.h>
  #include <netinet/in.h>
