aboutsummaryrefslogtreecommitdiffstats
path: root/main/iptraf/iptraf-3.0.0-vlan.patch
blob: f0087bf39478924e8e8355ddd735c5255343dbdd (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
--- src/packet.c.orig	2008-03-07 17:56:48.000000000 +0200
+++ src/packet.c	2008-03-07 18:05:41.000000000 +0200
@@ -101,8 +101,8 @@
             result = LINK_ETHERNET;
         else if (strncmp(ifname, "tun", 3) == 0)
             result = LINK_ETHERNET;
-        else if (strncmp(ifname, "vlan", 3) == 0)
-            result = LINK_VLAN;
+        else if (strncmp(ifname, "vlan", 4) == 0)
+            result = LINK_ETHERNET;
         else if (strncmp(ifname, "brg", 3) == 0)
             result = LINK_ETHERNET;
         else if (strncmp(ifname, "tap", 3) == 0)
@@ -231,14 +231,6 @@
     case LINK_IPIP:
         *packet = tpacket;
         break;
-    case LINK_VLAN:
-        *packet = tpacket + VLAN_ETH_HLEN;
-        readlen -= VLAN_ETH_HLEN;
-        /*
-         * Move IP datagram into an aligned buffer.
-         */
-        memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen));
-        *packet = aligned_buf;
     default:
         *packet = (char *) NULL;        /* return a NULL packet to signal */
         break;                  /* an unrecognized link protocol */