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

Change 7000SSL to check available/state for all mux

Browse Source 
Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
This commit is contained in:
Sara Damiano
2021-05-11 17:18:06 -04:00
parent 644085b30e
commit b5c5a62b2d
1 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/TinyGsmClientSIM7000SSL.h
View File

@@ -344,10 +344,20 @@ class TinyGsmSim7000SSL
if (ssl) { if (ssl) {
// set the ssl version // set the ssl version
// AT+CSSLCFG="SSLVERSION",<ctxindex>,<sslversion>
// <ctxindex> PDP context identifier
// <sslversion> 0: QAPI_NET_SSL_PROTOCOL_UNKNOWN
// 1: QAPI_NET_SSL_PROTOCOL_TLS_1_0
// 2: QAPI_NET_SSL_PROTOCOL_TLS_1_1
// 3: QAPI_NET_SSL_PROTOCOL_TLS_1_2
// 4: QAPI_NET_SSL_PROTOCOL_DTLS_1_0
// 5: QAPI_NET_SSL_PROTOCOL_DTLS_1_2
sendAT(GF("+CSSLCFG=\"sslversion\",0,3")); // TLS 1.2 sendAT(GF("+CSSLCFG=\"sslversion\",0,3")); // TLS 1.2
if (waitResponse(5000L) != 1) return false; if (waitResponse(5000L) != 1) return false;
// set the PDP context to apply SSL to // set the PDP context to apply SSL to
// AT+CSSLCFG="CTXINDEX",<ctxindex>
// <ctxindex> PDP context identifier
sendAT(GF("+CSSLCFG=\"ctxindex\",0")); sendAT(GF("+CSSLCFG=\"ctxindex\",0"));
if (waitResponse(5000L, GF("+CSSLCFG:")) != 1) return false; if (waitResponse(5000L, GF("+CSSLCFG:")) != 1) return false;
streamSkipUntil('\n'); // read out the certificate information streamSkipUntil('\n'); // read out the certificate information
@@ -355,6 +365,9 @@ class TinyGsmSim7000SSL
if (certificates[mux] != "") { if (certificates[mux] != "") {
// apply the correct certificate to the connection // apply the correct certificate to the connection
// AT+CASSLCFG=<cid>,"CACERT",<caname>
// <cid> Application connection ID (set with AT+CACID above)
// <certname> certificate name
sendAT(GF("+CASSLCFG="), mux, ",CACERT,\"", certificates[mux].c_str(), sendAT(GF("+CASSLCFG="), mux, ",CACERT,\"", certificates[mux].c_str(),
"\""); "\"");
if (waitResponse(5000L) != 1) return false; if (waitResponse(5000L) != 1) return false;
@@ -362,6 +375,10 @@ class TinyGsmSim7000SSL
} }
// enable or disable ssl // enable or disable ssl
// AT+CASSLCFG=<cid>,"SSL",<sslFlag>
// <cid> Application connection ID (set with AT+CACID above)
// <sslFlag> 0: Not support SSL
// 1: Support SSL
sendAT(GF("+CASSLCFG="), mux, ',', GF("ssl,"), ssl); sendAT(GF("+CASSLCFG="), mux, ',', GF("ssl,"), ssl);
waitResponse(); waitResponse();
@@ -390,7 +407,7 @@ class TinyGsmSim7000SSL
// 7: Not support the function // 7: Not support the function
// 12: Can’t bind the port // 12: Can’t bind the port
// 13: Can’t listen the port // 13: Can’t listen the port
// 20: Can’t resolv the host // 20: Can’t resolve the host
// 21: Network not active // 21: Network not active
// 23: Remote refuse // 23: Remote refuse
// 24: Certificate’s time expired // 24: Certificate’s time expired
@@ -462,36 +479,45 @@ class TinyGsmSim7000SSL
} }
size_t modemGetAvailable(uint8_t mux) { size_t modemGetAvailable(uint8_t mux) {
if (!sockets[mux]) return 0; // NOTE: This gets how many characters are available on all connections
sendAT(GF("+CARECV?")); sendAT(GF("+CARECV?"));
for (int muxNo = 0; muxNo < TINY_GSM_MUX_COUNT; muxNo++) {
int8_t readMux = -1; if (waitResponse(3000, GF(GSM_NL "+CARECV: ")) != 1) { break; }
size_t result = 0; size_t result = 0;
while (readMux != mux) { // if (streamGetIntBefore(',') != muxNo) { // check the mux no
if (waitResponse(GF("+CARECV:")) != 1) { // DBG("### Warning: misaligned mux numbers!");
sockets[mux]->sock_connected = modemGetConnected(mux); // }
return 0; streamSkipUntil(','); // skip mux [use muxNo]
}; result = streamGetIntBefore('\n');
readMux = streamGetIntBefore(','); GsmClientSim7000SSL* sock = sockets[mux];
result = streamGetIntBefore('\n'); if (sock && muxNo == mux) { sock->sock_available = result; }
} }
waitResponse(); waitResponse(); // Should be an OK at the end
// DBG("### Available:", result, "on", mux); modemGetConnected(mux);
if (!result) { sockets[mux]->sock_connected = modemGetConnected(mux); } if (!sockets[mux]) return 0;
return result; return sockets[mux]->sock_available;
} }
bool modemGetConnected(uint8_t mux) { bool modemGetConnected(uint8_t mux) {
// NOTE: This gets the state of all connections
sendAT(GF("+CASTATE?")); sendAT(GF("+CASTATE?"));
int8_t readMux = -1;
while (readMux != mux) { for (int muxNo = 0; muxNo < TINY_GSM_MUX_COUNT; muxNo++) {
if (waitResponse(3000, GF("+CASTATE:"), GFP(GSM_OK)) != 1) { return 0; } if (waitResponse(3000, GF(GSM_NL "+CASTATE: ")) != 1) { break; }
readMux = streamGetIntBefore(','); uint8_t status = 0;
// if (streamGetIntBefore(',') != muxNo) { // check the mux no
// DBG("### Warning: misaligned mux numbers!");
// }
streamSkipUntil(','); // skip mux [use muxNo]
status = stream.parseInt(); // Read the status
// 0: Closed by remote server or internal error
// 1: Connected to remote server
// 2: Listening (server mode)
GsmClientSim7000SSL* sock = sockets[mux];
if (sock && muxNo == mux) { sock->sock_connected = (status == 1); }
} }
int8_t res = streamGetIntBefore('\n'); waitResponse(); // Should be an OK at the end
waitResponse(); return sockets[mux]->sock_connected;
return 1 == res;
} }
/* /*