From 312d486a430f279b83cba1752983b1abfbfdca6f Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Tue, 2 Oct 2018 15:13:17 -0400 Subject: [PATCH] Allowing read() to continue after socket close if data is still available Only for modules that buffer the data internally --- .gitignore | 4 +--- src/TinyGsmClientBG96.h | 2 +- src/TinyGsmClientM95.h | 2 +- src/TinyGsmClientMC60.h | 2 +- src/TinyGsmClientSIM800.h | 2 +- src/TinyGsmClientUBLOX.h | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8e2e182..56a63d4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,4 @@ extras/docs/* .gcc-flags.json platformio.ini lib/readme.txt -.vscode/.browse.c_cpp.db* -.vscode/c_cpp_properties.json -.vscode/launch.json +\.vscode/ diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h index 5809f04..efa8d0d 100644 --- a/src/TinyGsmClientBG96.h +++ b/src/TinyGsmClientBG96.h @@ -122,7 +122,7 @@ public: TINY_GSM_YIELD(); at->maintain(); size_t cnt = 0; - while (cnt < size && sock_connected) { + while (cnt < size) { size_t chunk = TinyGsmMin(size-cnt, rx.size()); if (chunk > 0) { rx.get(buf, chunk); diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h index 2642b2f..1e132c7 100644 --- a/src/TinyGsmClientM95.h +++ b/src/TinyGsmClientM95.h @@ -122,7 +122,7 @@ public: TINY_GSM_YIELD(); at->maintain(); size_t cnt = 0; - while (cnt < size && sock_connected) { + while (cnt < size) { size_t chunk = TinyGsmMin(size-cnt, rx.size()); if (chunk > 0) { rx.get(buf, chunk); diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h index 08cd77d..fd67780 100644 --- a/src/TinyGsmClientMC60.h +++ b/src/TinyGsmClientMC60.h @@ -126,7 +126,7 @@ public: TINY_GSM_YIELD(); at->maintain(); size_t cnt = 0; - while (cnt < size && sock_connected) { + while (cnt < size) { size_t chunk = TinyGsmMin(size-cnt, rx.size()); if (chunk > 0) { rx.get(buf, chunk); diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h index 69e3c3b..a23ec5a 100644 --- a/src/TinyGsmClientSIM800.h +++ b/src/TinyGsmClientSIM800.h @@ -135,7 +135,7 @@ public: TINY_GSM_YIELD(); at->maintain(); size_t cnt = 0; - while (cnt < size && sock_connected) { + while (cnt < size) { size_t chunk = TinyGsmMin(size-cnt, rx.size()); if (chunk > 0) { rx.get(buf, chunk); diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h index 43a1c63..2a2aa2e 100644 --- a/src/TinyGsmClientUBLOX.h +++ b/src/TinyGsmClientUBLOX.h @@ -120,7 +120,7 @@ public: TINY_GSM_YIELD(); at->maintain(); size_t cnt = 0; - while (cnt < size && sock_connected) { + while (cnt < size) { size_t chunk = TinyGsmMin(size-cnt, rx.size()); if (chunk > 0) { rx.get(buf, chunk);