iptraf-ipv6/iptraf-3.0.0-vlan.patch

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