Merge pull request arduino#526 from pennam/eth-timeout

facchinm · web-flow · commit be790901b7bd · 2022-07-27T10:31:55.000+02:00
Ethernet: add possibility to configure timeout with manual configuration
diff --git a/libraries/Ethernet/src/Ethernet.cpp b/libraries/Ethernet/src/Ethernet.cpp
@@ -42,14 +42,14 @@ int arduino::EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPA
   return ret;
 }
 
-int arduino::EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet) {
+int arduino::EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet, unsigned long timeout, unsigned long responseTimeout) {
   config(ip, dns, gateway, subnet);
 
   eth_if->set_dhcp(false);
   eth_if->set_network(_ip, _netmask, _gateway);
   eth_if->add_dns_server(_dnsServer1, nullptr);
 
-  auto ret = begin(mac);
+  auto ret = begin(mac, timeout, responseTimeout);
   return ret;
 }
 
diff --git a/libraries/Ethernet/src/Ethernet.h b/libraries/Ethernet/src/Ethernet.h
@@ -65,7 +65,7 @@ class EthernetClass : public MbedSocketClass {
   int begin(uint8_t *mac, IPAddress ip);
   int begin(uint8_t *mac, IPAddress ip, IPAddress dns);
   int begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway);
-  int begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet);
+  int begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet, unsigned long timeout = 60000, unsigned long responseTimeout = 4000);
 
   int begin(IPAddress ip) {
     return begin(nullptr, ip);

Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@ int arduino::EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPA`
`42`	`42`
`43`	`43`	`}`
`44`	`44`
`45`		`-int arduino::EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet) {`
	`45`	`+int arduino::EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet, unsigned long timeout, unsigned long responseTimeout) {`
`46`	`46`	`config(ip, dns, gateway, subnet);`
`47`	`47`
`48`	`48`	`eth_if->set_dhcp(false);`
`49`	`49`	`eth_if->set_network(_ip, _netmask, _gateway);`
`50`	`50`	`eth_if->add_dns_server(_dnsServer1, nullptr);`
`51`	`51`
`52`		`- auto ret = begin(mac);`
	`52`	`+ auto ret = begin(mac, timeout, responseTimeout);`
`53`	`53`	`return ret;`
`54`	`54`	`}`
`55`	`55`