Ethernet: fixed upcast of byte-pointer

cmaglie · cmaglie · commit 79fde3a63690 · 2014-10-28T17:55:52.000+01:00
diff --git a/libraries/Ethernet/src/Dhcp.cpp b/libraries/Ethernet/src/Dhcp.cpp
@@ -329,8 +329,9 @@ uint8_t DhcpClass::parseDHCPResponse(unsigned long responseTimeout, uint32_t& tr
                 
                 case dhcpServerIdentifier :
                     opt_len = _dhcpUdpSocket.read();
-                    if( *((uint32_t*)_dhcpDhcpServerIp) == 0 || 
-                        IPAddress(_dhcpDhcpServerIp) == _dhcpUdpSocket.remoteIP() )
+                    if ((_dhcpDhcpServerIp[0] == 0 && _dhcpDhcpServerIp[1] == 0 &&
+                         _dhcpDhcpServerIp[2] == 0 && _dhcpDhcpServerIp[3] == 0) ||
+                        IPAddress(_dhcpDhcpServerIp) == _dhcpUdpSocket.remoteIP())
                     {
                         _dhcpUdpSocket.read(_dhcpDhcpServerIp, sizeof(_dhcpDhcpServerIp));
                     }

Original file line number	Diff line number	Diff line change
`@@ -329,8 +329,9 @@ uint8_t DhcpClass::parseDHCPResponse(unsigned long responseTimeout, uint32_t& tr`
`329`	`329`
`330`	`330`	`case dhcpServerIdentifier :`
`331`	`331`	`opt_len = _dhcpUdpSocket.read();`
`332`		`- if( ((uint32_t)_dhcpDhcpServerIp) == 0 \|\|`
`333`		`- IPAddress(_dhcpDhcpServerIp) == _dhcpUdpSocket.remoteIP() )`
	`332`	`+ if ((_dhcpDhcpServerIp[0] == 0 && _dhcpDhcpServerIp[1] == 0 &&`
	`333`	`+ _dhcpDhcpServerIp[2] == 0 && _dhcpDhcpServerIp[3] == 0) \|\|`
	`334`	`+ IPAddress(_dhcpDhcpServerIp) == _dhcpUdpSocket.remoteIP())`
`334`	`335`	`{`
`335`	`336`	`_dhcpUdpSocket.read(_dhcpDhcpServerIp, sizeof(_dhcpDhcpServerIp));`
`336`	`337`	`}`