From 3bcd95bb1da97f00eb0e1d6e8d497911c14b4e44 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Mon, 7 Apr 2014 16:30:15 +0200 Subject: pcap_io: fill sll when reading pcap When reading from a pcap in Kuznetsov/netsniff-ng format, we currently do not fill out sll. Do so so that users can see pkttype and the interface. Reported-by: Flavio Leitner Signed-off-by: Daniel Borkmann --- netsniff-ng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'netsniff-ng.c') diff --git a/netsniff-ng.c b/netsniff-ng.c index 351dcc9..6a83702 100644 --- a/netsniff-ng.c +++ b/netsniff-ng.c @@ -281,7 +281,7 @@ static void pcap_to_xmit(struct ctx *ctx) !bpf_run_filter(&bpf_ops, out, pcap_get_length(&phdr, ctx->magic))); - pcap_pkthdr_to_tpacket_hdr(&phdr, ctx->magic, &hdr->tp_h); + pcap_pkthdr_to_tpacket_hdr(&phdr, ctx->magic, &hdr->tp_h, NULL); ctx->tx_bytes += hdr->tp_h.tp_len;; ctx->tx_packets++; @@ -620,7 +620,7 @@ static void read_pcap(struct ctx *ctx) !bpf_run_filter(&bpf_ops, out, pcap_get_length(&phdr, ctx->magic))); - pcap_pkthdr_to_tpacket_hdr(&phdr, ctx->magic, &fm.tp_h); + pcap_pkthdr_to_tpacket_hdr(&phdr, ctx->magic, &fm.tp_h, &fm.s_ll); ctx->tx_bytes += fm.tp_h.tp_len; ctx->tx_packets++; -- cgit v1.2.3-54-g00ecf