pcap: fix captured frame length
authorDror Birkman <dror.birkman@lightcyber.com>
Thu, 28 Jan 2016 11:09:50 +0000 (13:09 +0200)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Wed, 16 Mar 2016 18:05:47 +0000 (19:05 +0100)
The actual captured length is header.caplen, whereas header.len is
the original length on the wire.

Fixes: 4c173302c307 ("pcap: add new driver")

Signed-off-by: Dror Birkman <dror.birkman@lightcyber.com>
Acked-by: Nicolás Pernas Maradei <nicolas.pernas.maradei@emutex.com>
drivers/net/pcap/rte_eth_pcap.c

index f9230eb..1d121f8 100644 (file)
@@ -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;