rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Expose optional DHCP timout parameters to Ethernet:begin()

Browse Source 
A no brainer update.
Expose optional timeout parameter values of dhcp for user to adjust on
their code.
Currently if dhcp server is not available, code will block inside
DhcpClass::request_DHCP_lease() for 60s. Having this parameters exposed
user can specify their timeout requirements without changing the lib
code.
Change is backward compatible as parameters are optional and defaults to
existing values.
This commit is contained in:
chaveiro 2015-09-18 00:50:17 +01:00 committed by Cristian Maglie
parent aa921659f6
commit ef15667ae8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/Ethernet/src/Ethernet.cpp
View File

@ -8,7 +8,7 @@ uint8_t EthernetClass::_state[MAX_SOCK_NUM] = {
uint16_t EthernetClass::_server_port[MAX_SOCK_NUM] = { uint16_t EthernetClass::_server_port[MAX_SOCK_NUM] = {
0, 0, 0, 0 }; 0, 0, 0, 0 };
int EthernetClass::begin(uint8_t *mac_address) int EthernetClass::begin(uint8_t *mac_address, unsigned long timeout, unsigned long responseTimeout)
{ {
static DhcpClass s_dhcp; static DhcpClass s_dhcp;
_dhcp = &s_dhcp; _dhcp = &s_dhcp;
@ -22,7 +22,7 @@ int EthernetClass::begin(uint8_t *mac_address)
SPI.endTransaction(); SPI.endTransaction();
// Now try to get our config info from a DHCP server // Now try to get our config info from a DHCP server
int ret = _dhcp->beginWithDHCP(mac_address); int ret = _dhcp->beginWithDHCP(mac_address, timeout, responseTimeout);
if(ret == 1) if(ret == 1)
{ {
// We've successfully found a DHCP server and got our configuration info, so set things // We've successfully found a DHCP server and got our configuration info, so set things

2
libraries/Ethernet/src/Ethernet.h
View File

@ -20,7 +20,7 @@ public:
// Initialise the Ethernet shield to use the provided MAC address and gain the rest of the // Initialise the Ethernet shield to use the provided MAC address and gain the rest of the
// configuration through DHCP. // configuration through DHCP.
// Returns 0 if the DHCP configuration failed, and 1 if it succeeded // Returns 0 if the DHCP configuration failed, and 1 if it succeeded
int begin(uint8_t *mac_address); int begin(uint8_t *mac_address, unsigned long timeout = 60000, unsigned long responseTimeout = 4000);
void begin(uint8_t *mac_address, IPAddress local_ip); void begin(uint8_t *mac_address, IPAddress local_ip);
void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server); void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server);
void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway); void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway);