From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ani Sinha Subject: Re: [tcpdump-workers] vlan tagged packets and libpcap breakage Date: Thu, 6 Dec 2012 17:31:29 -0800 (PST) Message-ID: References: <3246.1351717319@obiwan.sandelman.ca> <87mwyi9h1x.fsf@xmission.com> <12918.1353190488@obiwan.sandelman.ca> <87obivu7n7.fsf@xmission.com> <87sj7iesdl.fsf@xmission.com> <87hanyekr3.fsf@xmission.com> Reply-To: ani@aristanetworks.com Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Michael Richardson , tcpdump-workers@lists.tcpdump.org, netdev@vger.kernel.org, Francesco Ruggeri To: "Eric W. Biederman" Return-path: Received: from mail-da0-f46.google.com ([209.85.210.46]:35695 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754663Ab2LGBbb (ORCPT ); Thu, 6 Dec 2012 20:31:31 -0500 Received: by mail-da0-f46.google.com with SMTP id p5so3019880dak.19 for ; Thu, 06 Dec 2012 17:31:31 -0800 (PST) In-Reply-To: <87hanyekr3.fsf@xmission.com> Sender: netdev-owner@vger.kernel.org List-ID: > > The patch is whitespace damaged. And one of your test is using || > instead of && OK, using alpine now :-) > > The test should be && not ||. aargh! I am retarded! Fixed. Hopefully 3rd time is a charm :-) ani pcap-linux.c | 50 +++++++++++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 19 deletions(-) diff --git a/pcap-linux.c b/pcap-linux.c index a42c3ac..b2c1a08 100644 --- a/pcap-linux.c +++ b/pcap-linux.c @@ -133,6 +133,7 @@ static const char rcsid[] _U_ = #include #include #include +#include #include #include #include @@ -1543,7 +1544,13 @@ pcap_read_packet(pcap_t *handle, pcap_handler callback, u_char *userdata) continue; aux = (struct tpacket_auxdata *)CMSG_DATA(cmsg); - if (aux->tp_vlan_tci == 0) +#if defined(TP_STATUS_VLAN_VALID) + if ((aux->tp_vlan_tci == 0) && !(aux->tp_status & TP_STATUS_VLAN_VALID)) +#else + if (aux->tp_vlan_tci == 0) /* this is ambigious but without the + TP_STATUS_VLAN_VALID flag, there is + nothing that we can do */ +#endif continue; len = packet_len > iov.iov_len ? iov.iov_len : packet_len; @@ -3936,7 +3926,12 @@ pcap_read_linux_mmap(pcap_t *handle, int max_packets, pcap_handler callback, } #ifdef HAVE_TPACKET2 - if (handle->md.tp_version == TPACKET_V2 && h.h2->tp_vlan_tci && + if ((handle->md.tp_version == TPACKET_V2) && +#if defined(TP_STATUS_VLAN_VALID) + (h.h2->tp_vlan_tci || (h.h2->tp_status & TP_STATUS_VLAN_VALID)) && +#else + h.h2->tp_vlan_tci && +#endif handle->md.vlan_offset != -1 && tp_snaplen >= (unsigned int) handle->md.vlan_offset) { struct vlan_tag *tag;