Merge pull request #1038 from megacct/ping-timeout

pennam · web-flow · commit 8a56bdfdc057 · 2025-05-05T11:09:37.000+02:00
Ping: Expose timeout to interfaces
diff --git a/libraries/SocketWrapper/src/SocketHelpers.cpp b/libraries/SocketWrapper/src/SocketHelpers.cpp
@@ -75,22 +75,22 @@ arduino::IPAddress arduino::MbedSocketClass::dnsIP(int n) {
   return ipAddressFromSocketAddress(ip);
 }
 
-int arduino::MbedSocketClass::ping(const char *hostname, uint8_t ttl)
+int arduino::MbedSocketClass::ping(const char *hostname, uint8_t ttl, uint32_t timeout)
 {
   SocketAddress socketAddress;
   gethostbyname(getNetwork(),hostname, &socketAddress);
-  return ping(socketAddress, ttl);
+  return ping(socketAddress, ttl, timeout);
 }
 
-int arduino::MbedSocketClass::ping(const String &hostname, uint8_t ttl)
+int arduino::MbedSocketClass::ping(const String &hostname, uint8_t ttl, uint32_t timeout)
 {
-  return ping(hostname.c_str(), ttl);
+  return ping(hostname.c_str(), ttl, timeout);
 }
 
-int arduino::MbedSocketClass::ping(IPAddress host, uint8_t ttl)
+int arduino::MbedSocketClass::ping(IPAddress host, uint8_t ttl, uint32_t timeout)
 {
   SocketAddress socketAddress = socketAddressFromIpAddress(host, 0);
-  return ping(socketAddress, ttl);
+  return ping(socketAddress, ttl, timeout);
 }
 
 void arduino::MbedSocketClass::config(arduino::IPAddress local_ip) {
diff --git a/libraries/SocketWrapper/src/SocketHelpers.h b/libraries/SocketWrapper/src/SocketHelpers.h
@@ -118,9 +118,9 @@ class MbedSocketClass {
    *
    * return: RTT in milliseconds or -1 on error
    */
-  int ping(const char* hostname, uint8_t ttl = 255);
-  int ping(const String &hostname, uint8_t ttl = 255);
-  int ping(IPAddress host, uint8_t ttl = 255);
+  int ping(const char* hostname, uint8_t ttl = 255, uint32_t timeout = 5000);
+  int ping(const String &hostname, uint8_t ttl = 255, uint32_t timeout = 5000);
+  int ping(IPAddress host, uint8_t ttl = 255, uint32_t timeout = 5000);
 
   /*
    * Download a file from an HTTP endpoint and save it in the provided `target` location on the fs
@@ -185,7 +185,7 @@ class MbedSocketClass {
 
   void body_callback(const char* data, uint32_t data_len);
 
-  int ping(SocketAddress &socketAddress, uint8_t ttl, uint32_t timeout = 5000);
+  int ping(SocketAddress &socketAddress, uint8_t ttl, uint32_t timeout);
   static arduino::IPAddress ipAddressFromSocketAddress(SocketAddress socketAddress);
   static SocketAddress socketAddressFromIpAddress(arduino::IPAddress ip, uint16_t port);
   static nsapi_error_t gethostbyname(NetworkInterface* interface, const char* aHostname, SocketAddress* socketAddress);

Original file line number	Diff line number	Diff line change
`@@ -75,22 +75,22 @@ arduino::IPAddress arduino::MbedSocketClass::dnsIP(int n) {`
`75`	`75`	`return ipAddressFromSocketAddress(ip);`
`76`	`76`	`}`
`77`	`77`
`78`		`-int arduino::MbedSocketClass::ping(const char *hostname, uint8_t ttl)`
	`78`	`+int arduino::MbedSocketClass::ping(const char *hostname, uint8_t ttl, uint32_t timeout)`
`79`	`79`	`{`
`80`	`80`	`SocketAddress socketAddress;`
`81`	`81`	`gethostbyname(getNetwork(),hostname, &socketAddress);`
`82`		`- return ping(socketAddress, ttl);`
	`82`	`+ return ping(socketAddress, ttl, timeout);`
`83`	`83`	`}`
`84`	`84`
`85`		`-int arduino::MbedSocketClass::ping(const String &hostname, uint8_t ttl)`
	`85`	`+int arduino::MbedSocketClass::ping(const String &hostname, uint8_t ttl, uint32_t timeout)`
`86`	`86`	`{`
`87`		`- return ping(hostname.c_str(), ttl);`
	`87`	`+ return ping(hostname.c_str(), ttl, timeout);`
`88`	`88`	`}`
`89`	`89`
`90`		`-int arduino::MbedSocketClass::ping(IPAddress host, uint8_t ttl)`
	`90`	`+int arduino::MbedSocketClass::ping(IPAddress host, uint8_t ttl, uint32_t timeout)`
`91`	`91`	`{`
`92`	`92`	`SocketAddress socketAddress = socketAddressFromIpAddress(host, 0);`
`93`		`- return ping(socketAddress, ttl);`
	`93`	`+ return ping(socketAddress, ttl, timeout);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`void arduino::MbedSocketClass::config(arduino::IPAddress local_ip) {`