Skip to content

Add reentrancy guards to telnetd_poll and websocketd_poll #20

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

Add reentrancy guards to telnetd_poll and websocketd_poll #20

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions telnetd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,14 @@ void telnet_stream_handler (sessiondata_t *session)

void telnetd_poll (void)
{
static bool in_poll = false;

if(in_poll)
return; // Prevent reentrancy from stream_tx_blocking callback

in_poll = true;
telnet_stream_handler(&streamSession);
in_poll = false;
}

// Deprecated - remove
Expand Down
9 changes: 9 additions & 0 deletions websocketd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,6 +1368,13 @@ static void websocket_stream_handler (ws_sessiondata_t *session)
//
void websocketd_poll (void)
{
static bool in_poll = false;

if(in_poll)
return; // Prevent reentrancy from stream_tx_blocking callback

in_poll = true;

ws_sessiondata_t *client;
uint_fast16_t idx = WEBUI_MAX_CLIENTS;

Expand All @@ -1380,6 +1387,8 @@ void websocketd_poll (void)
} else if(client->state == WsState_Closing)
websocket_close_conn(client, client->pcb);
} while(idx);

in_poll = false;
}

void websocketd_notify_link_status (bool up)
Expand Down