Skip to content

This fixes a number of problems around the pcap-fifo handling #8

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
pjsg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

This fixes a number of problems around the pcap-fifo handling #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12c7818
Try to improve the buffering
pjsg Sep 28, 2022
0d7d587
Actually make the close flush out all the data
pjsg Sep 29, 2022
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
14 changes: 10 additions & 4 deletions sratunnel/output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ static bool out_nmsg_mod_checked = false;
void
out_close(void)
{
out_flush();
// Try to flush for up to 10 seconds
int n = 0;
do {
out_flush();
usleep(10000);
} while (out_buf_len > 0 && n++ < 1000);

if (out_pcap_dumper != NULL) {
pcap_dump_close(out_pcap_dumper);
Expand Down Expand Up @@ -98,7 +103,8 @@ out_flush(void)
&& errno != EINTR) {
axa_error_msg("write(%s): %s",
out_addr, strerror(errno));
stop(EX_IOERR);
// Can't call stop as it recurses....
exit(EX_IOERR);
}
} else {
out_buf_base += wlen;
Expand Down Expand Up @@ -590,10 +596,10 @@ out_ip_pcap_file(const uint8_t *pkt, size_t caplen, size_t len,
return;
}

if (caplen + sizeof(sf_hdr) > sizeof(out_buf) - out_buf_len
if (caplen + sizeof(sf_hdr) + out_buf_len > sizeof(out_buf) / 2
|| out_buf_base != 0) {
out_flush();
if (caplen > sizeof(out_buf) - sizeof(sf_hdr) - out_buf_len) {
if (caplen + sizeof(sf_hdr) + out_buf_len > sizeof(out_buf)) {
out_error("forwarding output stalled; dropping");
return;
}
Expand Down