JSD/TinyGSM_Senseright
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't query closed sock

Browse Source
This commit is contained in:
Sara Damiano
2019-05-21 17:23:01 -04:00
parent 7de65e40d2
commit 39beba60b1
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/TinyGsmClientSaraR4.h
View File

@@ -590,6 +590,8 @@ protected:
} }
size_t modemGetAvailable(uint8_t mux) { size_t modemGetAvailable(uint8_t mux) {
// Querying a closed socket gives an error "operation not allowed"
if (!sockets[mux]->sock_connected) return 0;
sendAT(GF("+USORD="), mux, ",0"); sendAT(GF("+USORD="), mux, ",0");
size_t result = 0; size_t result = 0;
uint8_t res = waitResponse(GF(GSM_NL "+USORD:")); uint8_t res = waitResponse(GF(GSM_NL "+USORD:"));
@@ -608,6 +610,8 @@ protected:
} }
bool modemGetConnected(uint8_t mux) { bool modemGetConnected(uint8_t mux) {
// Querying a closed socket gives an error "operation not allowed"
if (!sockets[mux]->sock_connected) return false;
sendAT(GF("+USOCTL="), mux, ",10"); sendAT(GF("+USOCTL="), mux, ",10");
uint8_t res = waitResponse(GF(GSM_NL "+USOCTL:")); uint8_t res = waitResponse(GF(GSM_NL "+USOCTL:"));
if (res != 1) if (res != 1)
@@ -683,14 +687,14 @@ TINY_GSM_MODEM_STREAM_UTILITIES()
sockets[mux]->sock_available = len; sockets[mux]->sock_available = len;
} }
data = ""; data = "";
DBG("### Got Data:", len, "on", mux); DBG("### URC Data Received:", len, "on", mux);
} else if (data.endsWith(GF(GSM_NL "+UUSOCL:"))) { } else if (data.endsWith(GF(GSM_NL "+UUSOCL:"))) {
int mux = stream.readStringUntil('\n').toInt(); int mux = stream.readStringUntil('\n').toInt();
if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) { if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) {
sockets[mux]->sock_connected = false; sockets[mux]->sock_connected = false;
} }
data = ""; data = "";
DBG("### Closed: ", mux); DBG("### URC Sock Closed:", mux);
} }
} }
} while (millis() - startMillis < timeout_ms); } while (millis() - startMillis < timeout_ms);

8
src/TinyGsmClientUBLOX.h
View File

@@ -596,6 +596,8 @@ protected:
} }
size_t modemGetAvailable(uint8_t mux) { size_t modemGetAvailable(uint8_t mux) {
// Querying a closed socket gives an error "operation not allowed"
if (!sockets[mux]->sock_connected) return 0;
sendAT(GF("+USORD="), mux, ",0"); sendAT(GF("+USORD="), mux, ",0");
size_t result = 0; size_t result = 0;
uint8_t res = waitResponse(GF(GSM_NL "+USORD:")); uint8_t res = waitResponse(GF(GSM_NL "+USORD:"));
@@ -614,6 +616,8 @@ protected:
} }
bool modemGetConnected(uint8_t mux) { bool modemGetConnected(uint8_t mux) {
// Querying a closed socket gives an error "operation not allowed"
if (!sockets[mux]->sock_connected) return false;
sendAT(GF("+USOCTL="), mux, ",10"); sendAT(GF("+USOCTL="), mux, ",10");
uint8_t res = waitResponse(GF(GSM_NL "+USOCTL:")); uint8_t res = waitResponse(GF(GSM_NL "+USOCTL:"));
if (res != 1) if (res != 1)
@@ -689,14 +693,14 @@ TINY_GSM_MODEM_STREAM_UTILITIES()
sockets[mux]->sock_available = len; sockets[mux]->sock_available = len;
} }
data = ""; data = "";
DBG("### Got Data:", len, "on", mux); DBG("### URC Data Received:", len, "on", mux);
} else if (data.endsWith(GF(GSM_NL "+UUSOCL:"))) { } else if (data.endsWith(GF(GSM_NL "+UUSOCL:"))) {
int mux = stream.readStringUntil('\n').toInt(); int mux = stream.readStringUntil('\n').toInt();
if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) { if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) {
sockets[mux]->sock_connected = false; sockets[mux]->sock_connected = false;
} }
data = ""; data = "";
DBG("### Closed: ", mux); DBG("### URC Sock Closed: ", mux);
} }
} }
} while (millis() - startMillis < timeout_ms); } while (millis() - startMillis < timeout_ms);