Bug#804709: iptraf: please add support for predictable interface names as of udev >= 197

[Antonio Terceiro]

Package: iptraf
Version: 3.0.0-8.1
Severity: wishlist
Tags: patch

Patch attached.

-- System Information:
Debian Release: stretch/sid
  APT prefers buildd-unstable
  APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (500, 'testing'), 
(1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages iptraf depends on:
ii  libc6        2.19-22
ii  libncurses5  6.0+20151024-2
ii  libtinfo5    6.0+20151024-2

iptraf recommends no packages.

iptraf suggests no packages.

-- no debconf information

-- 
Antonio Terceiro <terce...@debian.org>

diff -u iptraf-3.0.0/src/ifaces.c iptraf-3.0.0/src/ifaces.c
--- iptraf-3.0.0/src/ifaces.c
+++ iptraf-3.0.0/src/ifaces.c
@@ -32,7 +32,7 @@
 #include "error.h"
 
 extern int accept_unsupported_interfaces;
-#define NUM_SUPPORTED_IFACES 28
+#define NUM_SUPPORTED_IFACES 30
 
 extern int daemonized;
 
@@ -40,7 +40,7 @@
     { "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", "ath",
-    "ra"
+    "ra", "en", "wl"
 };
 
 char *ltrim(char *buf)
diff -u iptraf-3.0.0/src/packet.c iptraf-3.0.0/src/packet.c
--- iptraf-3.0.0/src/packet.c
+++ iptraf-3.0.0/src/packet.c
@@ -78,6 +78,8 @@
     case ARPHRD_ETHER:
         if (strncmp(ifname, "eth", 3) == 0)
             result = LINK_ETHERNET;
+	else if (strncmp(ifname, "en", 2) == 0)
+            result = LINK_ETHERNET;
 	else if (strncmp(ifname, "ath", 3) == 0)
 	    result = LINK_ETHERNET;
         else if (strncmp(ifname, "plip", 4) == 0)
@@ -91,7 +93,7 @@
         else if (strncmp(ifname, "ipsec", 5) == 0)
             result = LINK_ETHERNET;
         else if ((strncmp(ifname, "wvlan", 5) == 0)
-                 || (strncmp(ifname, "wlan", 4) == 0))
+                 || (strncmp(ifname, "wl", 2) == 0))
             result = LINK_ETHERNET;
         else if ((strncmp(ifname, "sm2", 3) == 0)
                  || (strncmp(ifname, "sm3", 3) == 0))
diff -u iptraf-3.0.0/src/promisc.c iptraf-3.0.0/src/promisc.c
--- iptraf-3.0.0/src/promisc.c
+++ iptraf-3.0.0/src/promisc.c
@@ -81,6 +81,7 @@
              */
 
             if ((strncmp(buf, "eth", 3) == 0) ||
+	        (strncmp(buf, "en", 2) == 0) ||
 	        (strncmp(buf, "ath", 3) == 0) ||
                 (strncmp(buf, "fddi", 4) == 0) ||
                 (strncmp(buf, "tr", 2) == 0) ||

signature.asc
Description: PGP signature