WiFiS3: add timeout check on localIP()

pennam · pennam · commit c22f64425ce3 · 2025-02-10T17:03:15.000+01:00
diff --git a/libraries/WiFiS3/src/WiFi.cpp b/libraries/WiFiS3/src/WiFi.cpp
@@ -329,9 +329,9 @@ IPAddress CWifi::localIP() {
 /* -------------------------------------------------------------------------- */
    modem.begin();
    string res = "";
-   int attempts = 0;
    IPAddress local_IP(0,0,0,0);
 
+   unsigned long start_time = millis();
    do {
       delay(100);
       if(modem.write(string(PROMPT(_MODE)),res, "%s" , CMD_READ(_MODE)))  {
@@ -349,9 +349,8 @@ IPAddress CWifi::localIP() {
             }
          }
       }
-      attempts++;
    }
-   while(local_IP == IPAddress(0,0,0,0) && attempts < 50);
+   while((local_IP == IPAddress(0,0,0,0)) && (millis() - start_time < _timeout));
 
    return local_IP;
 }

Original file line number	Diff line number	Diff line change
`@@ -329,9 +329,9 @@ IPAddress CWifi::localIP() {`
`329`	`329`	`/* -------------------------------------------------------------------------- */`
`330`	`330`	`modem.begin();`
`331`	`331`	`string res = "";`
`332`		`- int attempts = 0;`
`333`	`332`	`IPAddress local_IP(0,0,0,0);`
`334`	`333`
	`334`	`+ unsigned long start_time = millis();`
`335`	`335`	`do {`
`336`	`336`	`delay(100);`
`337`	`337`	`if(modem.write(string(PROMPT(_MODE)),res, "%s" , CMD_READ(_MODE))) {`
`@@ -349,9 +349,8 @@ IPAddress CWifi::localIP() {`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`	`}`
`352`		`- attempts++;`
`353`	`352`	`}`
`354`		`- while(local_IP == IPAddress(0,0,0,0) && attempts < 50);`
	`353`	`+ while((local_IP == IPAddress(0,0,0,0)) && (millis() - start_time < _timeout));`
`355`	`354`
`356`	`355`	`return local_IP;`
`357`	`356`	`}`