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

Need to differentiate ip saved from a host by name and by direct ip

Browse Source
This commit is contained in:
Sara Damiano
2019-05-30 17:16:43 -04:00
parent e7fc1b44eb
commit 17979905d2
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/TinyGsmClientXBee.h
View File

@@ -263,6 +263,7 @@ public:
resetPin = -1; resetPin = -1;
savedIP = IPAddress(0,0,0,0); savedIP = IPAddress(0,0,0,0);
savedHost = ""; savedHost = "";
savedHostIP = IPAddress(0,0,0,0);
inCommandMode = false; inCommandMode = false;
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
@@ -275,6 +276,7 @@ public:
this->resetPin = resetPin; this->resetPin = resetPin;
savedIP = IPAddress(0,0,0,0); savedIP = IPAddress(0,0,0,0);
savedHost = ""; savedHost = "";
savedHostIP = IPAddress(0,0,0,0);
inCommandMode = false; inCommandMode = false;
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
@@ -845,16 +847,20 @@ protected:
bool retVal = false; bool retVal = false;
XBEE_COMMAND_START_DECORATOR(5, false) XBEE_COMMAND_START_DECORATOR(5, false)
// If it's a new host or we dont' have a good IP, we need to do a DNS // If this is a new host name, replace the saved host and wipe out the saved host IP
// search for the IP to connect to if (this->savedHost != String(host)) {
if (this->savedHost != String(host) || savedIP == IPAddress(0,0,0,0)) {
this->savedHost = String(host); this->savedHost = String(host);
savedIP = getHostIP(host, timeout_s); // This will return 0.0.0.0 if lookup fails savedHostIP = IPAddress(0,0,0,0);
}
// If we don't have a good IP for the host, we need to do a DNS search
if (savedHostIP == IPAddress(0,0,0,0)) {
savedHostIP = getHostIP(host, timeout_s); // This will return 0.0.0.0 if lookup fails
} }
// If we now have a valid IP address, use it to connect // If we now have a valid IP address, use it to connect
if (savedIP != IPAddress(0,0,0,0)) { // Only re-set connection information if we have an IP address if (savedHostIP != IPAddress(0,0,0,0)) { // Only re-set connection information if we have an IP address
retVal = modemConnect(savedIP, port, mux, ssl, timeout_ms - (millis() - startMillis)); retVal = modemConnect(savedHostIP, port, mux, ssl, timeout_ms - (millis() - startMillis));
} }
XBEE_COMMAND_END_DECORATOR XBEE_COMMAND_END_DECORATOR
@@ -1147,7 +1153,7 @@ finish:
} }
bool gotIPforSavedHost() { bool gotIPforSavedHost() {
if (savedHost != "" && savedIP != IPAddress(0,0,0,0)) return true; if (savedHost != "" && savedHostIP != IPAddress(0,0,0,0)) return true;
else return false; else return false;
} }
@@ -1160,6 +1166,7 @@ protected:
XBeeType beeType; XBeeType beeType;
IPAddress savedIP; IPAddress savedIP;
String savedHost; String savedHost;
IPAddress savedHostIP;
bool inCommandMode; bool inCommandMode;
uint32_t lastCommandModeMillis; uint32_t lastCommandModeMillis;
GsmClient* sockets[TINY_GSM_MUX_COUNT]; GsmClient* sockets[TINY_GSM_MUX_COUNT];