SOURCES: iptraf-vlan.patch, iptraf-iface.patch - patch from Jakub ...

[dzimi]

Author: dzimi                        Date: Thu Jan 19 09:03:25 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- patch from Jakub Sochacki - added ath0 interface (from madwifi) to iptraf

---- Files affected:
SOURCES:
   iptraf-vlan.patch (1.1 -> 1.2) , iptraf-iface.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/iptraf-vlan.patch
diff -u SOURCES/iptraf-vlan.patch:1.1 SOURCES/iptraf-vlan.patch:1.2
--- SOURCES/iptraf-vlan.patch:1.1	Thu Oct 30 09:25:09 2003
+++ SOURCES/iptraf-vlan.patch	Thu Jan 19 10:03:18 2006
@@ -37,16 +37,16 @@
  #include "error.h"
  
  extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 23
-+#define NUM_SUPPORTED_IFACES 24
+-#define NUM_SUPPORTED_IFACES 24
++#define NUM_SUPPORTED_IFACES 25
  
  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", "cipcb", "tunl", "bond" };
-+      "pent", "lec", "cipcb", "tunl", "bond", "vlan" };
+-      "pent", "lec", "cipcb", "tunl", "bond", "ath" };
++      "pent", "lec", "cipcb", "tunl", "bond", "ath", "vlan" };
  
  char *ltrim(char *buf)
  {

================================================================
Index: SOURCES/iptraf-iface.patch
diff -u SOURCES/iptraf-iface.patch:1.2 SOURCES/iptraf-iface.patch:1.3
--- SOURCES/iptraf-iface.patch:1.2	Tue Sep 16 00:07:33 2003
+++ SOURCES/iptraf-iface.patch	Thu Jan 19 10:03:18 2006
@@ -6,7 +6,7 @@
  
  extern int accept_unsupported_interfaces;
 -#define NUM_SUPPORTED_IFACES 20
-+#define NUM_SUPPORTED_IFACES 23
++#define NUM_SUPPORTED_IFACES 24
  
  extern int daemonized;
  
@@ -14,7 +14,7 @@
      { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
        "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
 -      "pent", "lec" };
-+      "pent", "lec", "cipcb", "tunl", "bond" };
++      "pent", "lec", "cipcb", "tunl", "bond", "ath" };
  
  char *ltrim(char *buf)
  {
@@ -36,6 +36,15 @@
 diff -urN iptraf-2.7.0.org/src/packet.c iptraf-2.7.0/src/packet.c
 --- iptraf-2.7.0.org/src/packet.c	2003-09-16 00:01:34.000000000 +0200
 +++ iptraf-2.7.0/src/packet.c	2003-09-16 00:05:03.000000000 +0200
+@@ -90,7 +90,7 @@
+ 	    result = LINK_ETHERNET;
+ 	else if (strncmp(ifname, "ipsec", 5) == 0)
+ 	    result = LINK_ETHERNET;
+-	else if ((strncmp(ifname, "wvlan", 5) == 0) || (strncmp(ifname, "wlan", 4) == 0))
++	else if ((strncmp(ifname, "wvlan", 5) == 0) || (strncmp(ifname, "wlan", 4) == 0)|| (strncmp(ifname, "ath", 3) == 0))
+ 	    result = LINK_ETHERNET;
+         else if ((strncmp(ifname, "sm2", 3) == 0) || (strncmp(ifname, "sm3", 3) == 0))
+             result = LINK_ETHERNET;
 @@ -139,7 +139,13 @@
          break;
      case ARPHRD_DLCI:
================================================================

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