Skip to content

pcap: fix race condition when add bpf socket #79

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

Open
cw-Guo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pcap: fix race condition when add bpf socket #79

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
23 changes: 9 additions & 14 deletions src/Linux/mod_pcap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,6 @@ extern "C" {

static void tap_close(EVMod *mod, BPFSoc *bpfs) {
bpfs->adaptor = NULL;
if(bpfs->sock > 0) {
// The fd socket belongs to pcap, not to EVSocket. We
// can tell EVSocketClose not to touch it but this way
// is more ostentatious.
bpfs->sock->fd = -1;
}
if(bpfs->pcap) {
pcap_close(bpfs->pcap);
bpfs->pcap = NULL;
Expand All @@ -436,18 +430,19 @@ extern "C" {
-----------------___________________________------------------
*/
static bool addBPFSocket(EVMod *mod, HSPPcap *pcap, SFLAdaptor *adaptor) {
HSP_mod_PCAP *mdata = (HSP_mod_PCAP *)mod->data;
BPFSoc search = { .deviceName = adaptor->deviceName };
if(UTHashGet(mdata->bpf_socs, &search)) {
EVDebug(mod, 1, "sampling already configured for device=%s", adaptor->deviceName);
return NO;
HSP_mod_PCAP *mdata = (HSP_mod_PCAP *) mod->data;
BPFSoc *bpfs = (BPFSoc *) my_calloc(sizeof(BPFSoc));
setStr(&bpfs->deviceName, adaptor->deviceName);
if (UTHashGetOrAdd(mdata->bpf_socs, bpfs)) {
EVDebug(mod, 1, "sampling already configured for device=%s", adaptor->deviceName);
if (bpfs->deviceName)
my_free(bpfs->deviceName);
my_free(bpfs);
return NO;
}
EVDebug(mod, 1, "addBPFSocket(%s) speed=%"PRIu64, adaptor->deviceName, adaptor->ifSpeed);
BPFSoc *bpfs = (BPFSoc *)my_calloc(sizeof(BPFSoc));
UTHashAdd(mdata->bpf_socs, bpfs);
bpfs->module = mod;
bpfs->adaptor = adaptor;
setStr(&bpfs->deviceName, adaptor->deviceName);
bpfs->promisc = pcap->promisc;
bpfs->vport = pcap->vport;
bpfs->vport_set = pcap->vport_set;
Expand Down