Skip to content

Added 1 second timeout to read data in readLine #104

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

Merged
merged 3 commits into from
Jul 29, 2021
Merged

Added 1 second timeout to read data in readLine #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd7f7a6
Added 1 second timeout to read data in readLine
ONLYstcm Mar 27, 2021
5a2cf90
PR-104 Review Changes
ONLYstcm Jun 24, 2021
2f8f0aa
2nd pass review changes
ONLYstcm Jun 25, 2021
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
3 changes: 3 additions & 0 deletions src/tiny_websockets/network/generic_esp/generic_esp_clients.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ namespace websockets { namespace network {
WSString line = "";

int ch = -1;

const uint64_t millisBeforeReadingHeaders = millis();
while( ch != '\n' && available()) {
if (millis() - millisBeforeReadingHeaders > _CONNECTION_TIMEOUT) return "";
ch = client.read();
if (ch < 0) continue;
line += (char) ch;
Expand Down
3 changes: 3 additions & 0 deletions src/tiny_websockets/network/teensy41/teensy41_tcp_client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ namespace websockets { namespace network {
WSString line = "";

int ch = -1;

const uint64_t millisBeforeReadingHeaders = millis();
while( ch != '\n' && available()) {
// It is important to call `client.available()`. Otherwise no data can be read.
if (millis() - millisBeforeReadingHeaders > _CONNECTION_TIMEOUT) return "";
if (client.available()) {
ch = client.read();
if (ch >= 0) {
Expand Down
3 changes: 2 additions & 1 deletion src/tiny_websockets/ws_config_defs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once

#define _WS_CONFIG_NO_TRUE_RANDOMNESS
#define _WS_BUFFER_SIZE 512
#define _WS_BUFFER_SIZE 512
#define _CONNECTION_TIMEOUT 1000