diff options
Diffstat (limited to 'net/tcptrace/files/patch-tcpdump.c')
| -rw-r--r-- | net/tcptrace/files/patch-tcpdump.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/net/tcptrace/files/patch-tcpdump.c b/net/tcptrace/files/patch-tcpdump.c new file mode 100644 index 000000000000..f82fb83b2b38 --- /dev/null +++ b/net/tcptrace/files/patch-tcpdump.c @@ -0,0 +1,17 @@ +--- tcpdump.c.orig 2013-07-01 18:43:14 UTC ++++ tcpdump.c +@@ -114,10 +114,13 @@ static int callback( + /* for some reason, the windows version of tcpdump is using */ + /* this. It looks just like ethernet to me */ + case PCAP_DLT_EN10MB: +- offset = find_ip_eth(buf); /* Here we check if we are dealing with Straight Ethernet encapsulation or PPPoE */ ++ offset = find_ip_eth(buf); /* Here we check if we are dealing with Straight Ethernet encapsulation, PPPoE or .1q VLAN encapsulation */ + memcpy(ð_header, buf, EH_SIZE); /* save ether header */ + switch (offset) + { ++ case EH_SIZE + ETHER_VLAN_ENCAP_LEN: ++ memcpy(ð_header.ether_type, buf+EH_SIZE+2, 2); ++ /* FALLTHROUGH */ + case EH_SIZE: /* straight Ethernet encapsulation */ + memcpy((char *)ip_buf,buf+offset,iplen-offset); + callback_plast = ip_buf+iplen-offset-1; |