pcap: wake blocked receive via eventfd when daq_instance_interrupt() is called#40
Open
ssam18 wants to merge 1 commit into
Open
pcap: wake blocked receive via eventfd when daq_instance_interrupt() is called#40ssam18 wants to merge 1 commit into
ssam18 wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
pcap_daq_interrupt()currently just sets avolatile boolthat the receive loop checks at the top of each iteration. On Linux withTPACKET_V3and idle/virtual interfaces the in-pcap timeout isn't always honored, so the secondpcap_next_ex()call insidepcap_daq_msg_receive()blocks insidepoll()and never sees the flag. This leaves a Snort thread parked indefinitely afterdaq_instance_interrupt()and contributes to the service-stop hang in snort3/snort3#338. This change creates aneventfdinpcap_daq_start()for live captures, haspcap_daq_interrupt()write to it, and replaces the blocking fallback in the receive loop with apoll()over the pcap selectable fd and the eventfd, so an interrupt wakes the thread immediately and the receive returnsDAQ_RSTAT_INTERRUPTED. The fast path (packets are already available) is unchanged. Note:eventfdis Linux-specific, happy to switch to a self-pipe if a portable implementation is preferred.Refs snort3/snort3#338