summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Marchand <david.marchand@6wind.com>2013-11-22 11:24:57 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2013-11-22 13:37:20 +0100
commitf60fa0292aa4b39919dcaa9cc77acb5d6efa0e6a (patch)
treea9d407e89aac468b1cfcbb35b4a29c4a5d5e0bc9
parent2eade84c5f2da0ccf4c77262410fd82f4e625c77 (diff)
downloaddpdk-stable-f60fa0292aa4b39919dcaa9cc77acb5d6efa0e6a.zip
dpdk-stable-f60fa0292aa4b39919dcaa9cc77acb5d6efa0e6a.tar.gz
dpdk-stable-f60fa0292aa4b39919dcaa9cc77acb5d6efa0e6a.tar.xz
pcap: fix build when pcap_sendpacket is unavailable
Before libpcap 1.0.0, pcap_sendpacket was not available on linux targets (unless backported). When using such a library, we won't be able to send packet on the wire, yet we can still dump packets into a pcap file. Signed-off-by: David Marchand <david.marchand@6wind.com> Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
-rw-r--r--lib/librte_pmd_pcap/rte_eth_pcap.c12
-rw-r--r--lib/librte_pmd_pcap/rte_eth_pcap.h6
2 files changed, 18 insertions, 0 deletions
diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c
index 50de885..19d19b3 100644
--- a/lib/librte_pmd_pcap/rte_eth_pcap.c
+++ b/lib/librte_pmd_pcap/rte_eth_pcap.c
@@ -199,6 +199,7 @@ eth_pcap_tx_dumper(void *queue,
return num_tx;
}
+#ifdef PCAP_CAN_SEND
/*
* Callback to handle sending packets through a real NIC.
*/
@@ -229,6 +230,17 @@ eth_pcap_tx(void *queue,
tx_queue->err_pkts += nb_pkts - num_tx;
return num_tx;
}
+#else
+static uint16_t
+eth_pcap_tx(__rte_unused void *queue,
+ __rte_unused struct rte_mbuf **bufs,
+ __rte_unused uint16_t nb_pkts)
+{
+ RTE_LOG(ERR, PMD, "pcap library cannot send packets, please rebuild "
+ "with a more up to date libpcap\n");
+ return -1;
+}
+#endif
static int
eth_dev_start(struct rte_eth_dev *dev)
diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.h b/lib/librte_pmd_pcap/rte_eth_pcap.h
index a1bd513..368ed88 100644
--- a/lib/librte_pmd_pcap/rte_eth_pcap.h
+++ b/lib/librte_pmd_pcap/rte_eth_pcap.h
@@ -39,6 +39,12 @@ extern "C" {
#endif
#include <pcap.h>
+#ifdef pcap_sendpacket
+#define PCAP_CAN_SEND
+#else
+#undef PCAP_CAN_SEND
+#endif
+
#define RTE_ETH_PCAP_PARAM_NAME "eth_pcap"
int rte_eth_from_pcaps(pcap_t * const rx_queues[],