From 72ccb1c03c874140ab9dcb724657d2b445d26aca Mon Sep 17 00:00:00 2001
From: megacct <96644325+megacct@users.noreply.github.com>
Date: Fri, 14 Mar 2025 19:19:57 +0000
Subject: [PATCH 1/2] Update SocketHelpers.h expose ping timeout
---
libraries/SocketWrapper/src/SocketHelpers.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libraries/SocketWrapper/src/SocketHelpers.h b/libraries/SocketWrapper/src/SocketHelpers.h
index e285d166c..428ab4a63 100644
--- 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);
From a0305ea2b939aac4d2e14565ff5e3a9f48fcc807 Mon Sep 17 00:00:00 2001
From: megacct <96644325+megacct@users.noreply.github.com>
Date: Fri, 14 Mar 2025 19:22:38 +0000
Subject: [PATCH 2/2] Update SocketHelpers.cpp to expose ping timeout
---
libraries/SocketWrapper/src/SocketHelpers.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libraries/SocketWrapper/src/SocketHelpers.cpp b/libraries/SocketWrapper/src/SocketHelpers.cpp
index b7e39b42c..b113e510f 100644
--- 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) {