Skip to content
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

Stop serving client that is already gone #598

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Stop serving client that is already gone #598

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3349f9
stop serving client that is already gone
DE-cr Nov 10, 2023
5772e15
abort /QD when client is gone
DE-cr Nov 10, 2023
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
15 changes: 8 additions & 7 deletions BSB_LAN/BSB_LAN.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4587,6 +4587,7 @@ void query(float line_start // begin at this line (ProgNr)
query(line);
if (decodedTelegram.prognr != -1) {
if (!no_print) { // display in web client?
if (!client.connected()) return; // no need to waste time here when client is gone
query_printHTML();
}
}
Expand Down Expand Up @@ -4750,14 +4751,14 @@ void transmitFile(File dataFile) {
printToWebClient(PSTR("Error: Failed to read from SD card - if problem remains after reformatting, card may be incompatible."));
forcedflushToWebClient();
}
while (chars_read == logbuflen) {
while (chars_read == logbuflen && client.connected()) {
client.write(buf, logbuflen);
chars_read = dataFile.read(buf, logbuflen);
#if defined(ESP32)
esp_task_wdt_reset();
#endif
}
if (chars_read > 0) client.write(buf, chars_read);
if (chars_read > 0 && client.connected()) client.write(buf, chars_read);
if (buf != (byte*)bigBuff) free(buf);
}

Expand Down Expand Up @@ -5703,7 +5704,7 @@ void loop() {
} else {
printToWebClient(PSTR(MENU_TEXT_QFA "!"));
}
for (int x=0;x<10;x++) {
for (int x=0; x<10 && client.connected(); x++) {
if (found_ids[x]==0xFF) {
continue;
}
Expand Down Expand Up @@ -5750,7 +5751,7 @@ void loop() {
if (p[3] == 'F') {
printToWebClient(PSTR(MENU_TEXT_QST "...\r\n"));
flushToWebClient();
for (int j=0;j<10000;j++) {
for (int j=0; j<10000 && client.connected(); j++) {
uint32_t cc = get_cmdtbl_cmd(j);
if (cc == c) {
continue;
Expand Down Expand Up @@ -5855,7 +5856,7 @@ void loop() {
int IA2_max = (msg[5+bus->getBusType()*4] << 8) + msg[6+bus->getBusType()*4];
int outBufLen = strlen(outBuf);

for (int IA1_counter = 1; IA1_counter <= IA1_max; IA1_counter++) {
for (int IA1_counter = 1; IA1_counter <= IA1_max && client.connected(); IA1_counter++) {
#if defined(ESP32)
esp_task_wdt_reset();
#endif
Expand All @@ -5869,7 +5870,7 @@ void loop() {
printToWebClient(PSTR("\r\n"));
flushToWebClient();
}
for (int IA2_counter = 1; IA2_counter <= IA2_max; IA2_counter++) {
for (int IA2_counter = 1; IA2_counter <= IA2_max && client.connected(); IA2_counter++) {
#if defined(ESP32)
esp_task_wdt_reset();
#endif
Expand Down Expand Up @@ -6569,7 +6570,7 @@ void loop() {
buf = (byte*)malloc(4096); // try to use 4 KB buffer, for improved transfer rates
#endif
if (buf) logbuflen=4096; else buf=(byte*)bigBuff; // fall back to static buffer, if necessary
while (nBytesToDo) {
while (nBytesToDo && client.connected()) {
int n = dataFile.read(buf, nBytesToDo<logbuflen ?nBytesToDo :logbuflen);
if (n < 0) {
printToWebClient(PSTR("Error: Failed to read from SD card - if problem remains after reformatting, card may be incompatible."));
Expand Down
Loading