Skip to content

fixed af_packet pcap source #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weyrick merged 1 commit into from
Apr 6, 2021
Merged

fixed af_packet pcap source #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/inputs/pcap/afpacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ void AFPacket::walk_block(struct block_desc *pbd)
uint64_t bytes = 0;
struct tpacket3_hdr *ppd;

ppd = reinterpret_cast<struct tpacket3_hdr *>(reinterpret_cast<uint8_t *>(pbd) + pbd->h1.offset_to_first_pkt);
ppd = (struct tpacket3_hdr *)((uint8_t *)pbd + pbd->h1.offset_to_first_pkt);
for (i = 0; i < num_pkts; ++i) {
bytes += ppd->tp_snaplen;

auto data_pointer = reinterpret_cast<uint8_t *>(pbd) + ppd->tp_mac;
auto data_pointer = (uint8_t *)ppd + ppd->tp_mac;
pcpp::RawPacket packet(data_pointer, ppd->tp_snaplen, timespec{pbd->h1.ts_last_pkt.ts_sec, pbd->h1.ts_last_pkt.ts_nsec},
false, pcpp::LINKTYPE_ETHERNET);
cb(&packet, nullptr, inputStream);

ppd = reinterpret_cast<struct tpacket3_hdr *>(reinterpret_cast<uint8_t *>(pbd) + ppd->tp_next_offset);
ppd = (struct tpacket3_hdr *)((uint8_t *)ppd + ppd->tp_next_offset);
}
}

Expand Down Expand Up @@ -236,6 +236,8 @@ void AFPacket::start_capture()
// Configure the packet socket.
setup();

running = true;

cap_thread = std::make_unique<std::thread>([this] {
unsigned int current_block_num = 0;

Expand Down