Skip to content

Refs #984: sendpacket: avoid endless retries on ENOBUFS/EAGAIN #986

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
d3156 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refs #984: sendpacket: avoid endless retries on ENOBUFS/EAGAIN #986

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: 8 additions & 0 deletions src/common/sendpacket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ sendpacket(sendpacket_t *sp, const u_char *data, size_t len, struct pcap_pkthdr
* prevent page misses on stack
*/
static const size_t buffer_payload_size = sizeof(buffer) + sizeof(struct pcap_pkthdr);
size_t retry_count = 0;
const size_t max_retry_count = 100;

assert(sp);
#ifndef HAVE_LIBXDP
Expand All @@ -268,6 +270,11 @@ sendpacket(sendpacket_t *sp, const u_char *data, size_t len, struct pcap_pkthdr
return -1;

TRY_SEND_AGAIN:

// On retries, sleep briefly to avoid busy-looping and putting unnecessary load on the kernel.
if (retry_count > 0) usleep(0);
if (++retry_count > max_retry_count) goto EXIT_MAX_RETRIES;

sp->attempt++;

switch (sp->handle_type) {
Expand Down Expand Up @@ -498,6 +505,7 @@ sendpacket(sendpacket_t *sp, const u_char *data, size_t len, struct pcap_pkthdr
errx(-1, "Unsupported sp->handle_type = %d", sp->handle_type);
} /* end case */

EXIT_MAX_RETRIES:
if (retcode < 0) {
sp->failed++;
} else if (sp->abort) {
Expand Down