Skip to content

Set closed global file descriptors to -1 #2000

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

Set closed global file descriptors to -1 #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90c6545
Set closed file descriptors to -1
WatcherOfTheSkies Jan 22, 2026
0c6e2b6
Merge branch 'esnet:master' into fix-bad-file-descriptor
WatcherOfTheSkies Jan 23, 2026
9b8f42d
Trigger CI
WatcherOfTheSkies Jan 23, 2026
25c16bd
File tidy up, no functional change.
WatcherOfTheSkies Jan 23, 2026
2845c76
Merge changes from #1990
WatcherOfTheSkies Jan 26, 2026
e7fc680
Merge branch 'master' into fix-bad-file-descriptor
WatcherOfTheSkies Jan 26, 2026
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
12 changes: 10 additions & 2 deletions src/iperf_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4698,8 +4698,14 @@ iperf_free_stream(struct iperf_stream *sp)
/* XXX: need to free interval list too! */
munmap(sp->buffer, sp->test->settings->blksize);
close(sp->buffer_fd);
if (sp->diskfile_fd >= 0)
close(sp->diskfile_fd);
sp->buffer_fd = -1;

if (sp->diskfile_fd >= 0) {
close(sp->diskfile_fd);
sp->diskfile_fd = -1;
}


for (irp = TAILQ_FIRST(&sp->result->interval_results); irp != NULL; irp = nirp) {
nirp = TAILQ_NEXT(irp, irlistentries);
free(irp);
Expand Down Expand Up @@ -4819,6 +4825,8 @@ iperf_new_stream(struct iperf_test *test, int s, int sender)

if ((ret < 0) || (iperf_init_stream(sp, test) < 0)) {
close(sp->buffer_fd);
sp->buffer_fd = -1;

munmap(sp->buffer, sp->test->settings->blksize);
free(sp->result);
free(sp);
Expand Down
5 changes: 4 additions & 1 deletion src/iperf_client_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@ iperf_client_end(struct iperf_test *test)
/* Close all stream sockets */
SLIST_FOREACH(sp, &test->streams, streams) {
close(sp->socket);
sp->socket = -1;
}

/* show final summary */
Expand All @@ -559,8 +560,10 @@ iperf_client_end(struct iperf_test *test)
}

/* Close control socket */
if (test->ctrl_sck >= 0)
if (test->ctrl_sck >= 0) {
close(test->ctrl_sck);
test->ctrl_sck = -1;
}

return 0;
}
Expand Down
7 changes: 5 additions & 2 deletions src/iperf_server_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ iperf_handle_message_server(struct iperf_test *test)
FD_CLR(sp->socket, &test->read_set);
FD_CLR(sp->socket, &test->write_set);
close(sp->socket);
sp->socket = -1;
}
test->reporter_callback(test);
if (iperf_set_send_state(test, EXCHANGE_RESULTS) != 0)
Expand Down Expand Up @@ -304,6 +305,7 @@ iperf_handle_message_server(struct iperf_test *test)
FD_CLR(sp->socket, &test->read_set);
FD_CLR(sp->socket, &test->write_set);
close(sp->socket);
sp->socket = -1;
}
iperf_set_test_state(test, IPERF_DONE);
break;
Expand All @@ -324,6 +326,7 @@ server_timer_proc(TimerClientData client_data, struct iperf_time *nowP)
if (test->done)
return;
test->done = 1;

close(test->ctrl_sck);
test->ctrl_sck = -1;
}
Expand Down Expand Up @@ -844,9 +847,9 @@ iperf_run_server(struct iperf_test *test)
if (test->no_delay || test->settings->mss || test->settings->socket_bufsize) {
FD_CLR(test->listener, &test->read_set);
close(test->listener);
test->listener = -1;
test->listener = -1;
if ((s = netannounce(test->settings->domain, Ptcp, test->bind_address, test->bind_dev, test->server_port)) < 0) {
cleanup_server(test);
cleanup_server(test);
i_errno = IELISTEN;
return -1;
}
Expand Down
Loading