* Fixed memory leak when calling Ethernet.begin() multiple times

richard-sim · cmaglie · commit 47017f5c25b2 · 2012-12-12T12:50:21.000+01:00
* Ensure the UDP socket is closed before trying to open it
diff --git a/Dhcp.cpp b/Dhcp.cpp
@@ -43,6 +43,7 @@ int DhcpClass::request_DHCP_lease(){
     _dhcpTransactionId = random(1UL, 2000UL);
     _dhcpInitialTransactionId = _dhcpTransactionId;
 
+    _dhcpUdpSocket.stop();
     if (_dhcpUdpSocket.begin(DHCP_CLIENT_PORT) == 0)
     {
       // Couldn't get a socket
diff --git a/Ethernet.cpp b/Ethernet.cpp
@@ -10,7 +10,8 @@ uint16_t EthernetClass::_server_port[MAX_SOCK_NUM] = {
 
 int EthernetClass::begin(uint8_t *mac_address)
 {
-  _dhcp = new DhcpClass();
+  static DhcpClass s_dhcp;
+  _dhcp = &s_dhcp;
 
 
   // Initialise the basic info

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ int DhcpClass::request_DHCP_lease(){`
`43`	`43`	`_dhcpTransactionId = random(1UL, 2000UL);`
`44`	`44`	`_dhcpInitialTransactionId = _dhcpTransactionId;`
`45`	`45`
	`46`	`+ _dhcpUdpSocket.stop();`
`46`	`47`	`if (_dhcpUdpSocket.begin(DHCP_CLIENT_PORT) == 0)`
`47`	`48`	`{`
`48`	`49`	`// Couldn't get a socket`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ uint16_t EthernetClass::_server_port[MAX_SOCK_NUM] = {`
`10`	`10`
`11`	`11`	`int EthernetClass::begin(uint8_t *mac_address)`
`12`	`12`	`{`
`13`		`- _dhcp = new DhcpClass();`
	`13`	`+ static DhcpClass s_dhcp;`
	`14`	`+ _dhcp = &s_dhcp;`
`14`	`15`
`15`	`16`
`16`	`17`	`// Initialise the basic info`