From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dror Birkman Subject: [PATCH] pcap: fix captured frame length Date: Thu, 28 Jan 2016 13:09:50 +0200 Message-ID: <1453979390-36685-1-git-send-email-dror.birkman@lightcyber.com> Cc: dev@dpdk.org, Dror Birkman To: nicolas.pernas.maradei@emutex.com, john.mcnamara@intel.com Return-path: Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id 9C372C424 for ; Thu, 28 Jan 2016 12:09:55 +0100 (CET) Received: by mail-wm0-f51.google.com with SMTP id p63so19376093wmp.1 for ; Thu, 28 Jan 2016 03:09:55 -0800 (PST) List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The actual captured length is header.caplen, whereas header.len is the original length on the wire. Signed-off-by: Dror Birkman --- Without this fix, if the captured length is smaller than the original length on the wire, mbuf will contain incorrect data. drivers/net/pcap/rte_eth_pcap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index f9230eb..1d121f8 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -220,25 +220,25 @@ eth_pcap_rx(void *queue, buf_size = (uint16_t)(rte_pktmbuf_data_room_size(pcap_q->mb_pool) - RTE_PKTMBUF_HEADROOM); - if (header.len <= buf_size) { + if (header.caplen <= buf_size) { /* pcap packet will fit in the mbuf, go ahead and copy */ rte_memcpy(rte_pktmbuf_mtod(mbuf, void *), packet, - header.len); - mbuf->data_len = (uint16_t)header.len; + header.caplen); + mbuf->data_len = (uint16_t)header.caplen; } else { /* Try read jumbo frame into multi mbufs. */ if (unlikely(eth_pcap_rx_jumbo(pcap_q->mb_pool, mbuf, packet, - header.len) == -1)) + header.caplen) == -1)) break; } - mbuf->pkt_len = (uint16_t)header.len; + mbuf->pkt_len = (uint16_t)header.caplen; mbuf->port = pcap_q->in_port; bufs[num_rx] = mbuf; num_rx++; - rx_bytes += header.len; + rx_bytes += header.caplen; } pcap_q->rx_pkts += num_rx; pcap_q->rx_bytes += rx_bytes; -- 2.6.3