summaryrefslogtreecommitdiff
path: root/net/tcptrace/files/patch-tcpdump.c.diff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-07-13 18:02:26 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-07-13 18:02:26 +0000
commitfa80014180872977a3e11add4ae53dcf60f6ba1f (patch)
tree959841612e0b2c604a1d83c467e2e282a6ce79a1 /net/tcptrace/files/patch-tcpdump.c.diff
parent- Update to 2005.07.03 (diff)
- Update to 6.6.7
PR: ports/80665 Submitted by: Vasil Dimov <vd@datamax.bg> Approved by: maintainer timeout (2 months)
Diffstat (limited to '')
-rw-r--r--net/tcptrace/files/patch-tcpdump.c.diff17
1 files changed, 17 insertions, 0 deletions
diff --git a/net/tcptrace/files/patch-tcpdump.c.diff b/net/tcptrace/files/patch-tcpdump.c.diff
new file mode 100644
index 000000000000..6741840aaa4f
--- /dev/null
+++ b/net/tcptrace/files/patch-tcpdump.c.diff
@@ -0,0 +1,17 @@
+--- tcpdump.c.orig Thu May 5 18:41:30 2005
++++ tcpdump.c Thu May 5 18:41:53 2005
+@@ -112,10 +112,13 @@
+ /* 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(&eth_header, buf, EH_SIZE); /* save ether header */
+ switch (offset)
+ {
++ case EH_SIZE + ETHER_VLAN_ENCAP_LEN:
++ memcpy(&eth_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;