diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2014-05-26 15:10:33 +0200 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2014-08-14 08:48:15 +0200 |
| commit | 97e6f994785ce5f3f486f8eddb62df964119d121 (patch) | |
| tree | d8452eb956ec0eb98b13c0a931dd5abce71c3400 /pcap_io.h | |
| parent | fa32dcaddab2363cb01acc81bddf7dc3d42ab5b1 (diff) | |
netsniff-ng: Restore tpacket v2 capturing
Some older systems (e.g. RHEL 6) don't have tpacket v3 available, but
only tpacket v2. However, since commit d8cdc6a ("ring: netsniff-ng:
migrate capture only to TPACKET_V3") we solely rely on tpacket v3 for
capturing packets.
This patch restores the possibility to capture using tpacket v2. For now
this is just a fallback if the configure script doesn't detect tpacket
v3 (and thus HAVE_TPACKET3 isn't set). Thus, on most modern systems this
shouldn't change anything and they will continue using tpacket v3.
For now this fix contains quite a bit of ugly #ifdefery which should be
cleaned up in the future.
Fixes #76
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'pcap_io.h')
| -rw-r--r-- | pcap_io.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -416,6 +416,7 @@ static inline void tpacket_hdr_to_pcap_pkthdr(struct tpacket2_hdr *thdr, thdr->tp_status, sll, phdr, type); } +#ifdef HAVE_TPACKET3 static inline void tpacket3_hdr_to_pcap_pkthdr(struct tpacket3_hdr *thdr, struct sockaddr_ll *sll, pcap_pkthdr_t *phdr, @@ -425,6 +426,7 @@ static inline void tpacket3_hdr_to_pcap_pkthdr(struct tpacket3_hdr *thdr, thdr->tp_snaplen, thdr->tp_len, 0, sll, phdr, type); } +#endif static inline void pcap_pkthdr_to_tpacket_hdr(pcap_pkthdr_t *phdr, enum pcap_type type, |