diff options
| author | David Crocker <dcrocker@eschertech.com> | 2018-10-17 16:00:52 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2018-10-17 16:00:52 +0300 |
| commit | 54709646636d530aea6f4a93cba5401dc36b5309 (patch) | |
| tree | 552bb569a9e7ad54b889e208b88eb148eb0f813c /src/Networking/W5500Ethernet | |
| parent | 1347ea638627e7969ea1fa6f059d497c8692925a (diff) | |
Version 2.02RC3 provisional
More refactoring of IP addresses in network code
Diffstat (limited to 'src/Networking/W5500Ethernet')
| -rw-r--r-- | src/Networking/W5500Ethernet/W5500Interface.cpp | 2 | ||||
| -rw-r--r-- | src/Networking/W5500Ethernet/Wiznet/Ethernet/socketlib.cpp | 4 | ||||
| -rw-r--r-- | src/Networking/W5500Ethernet/Wiznet/Internet/DHCP/dhcp.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Networking/W5500Ethernet/W5500Interface.cpp b/src/Networking/W5500Ethernet/W5500Interface.cpp index 89fc3d84..fb8ba382 100644 --- a/src/Networking/W5500Ethernet/W5500Interface.cpp +++ b/src/Networking/W5500Ethernet/W5500Interface.cpp @@ -312,7 +312,7 @@ void W5500Interface::Spin(bool full) if (full && wizphy_getphylink() == PHY_LINK_ON) { - usingDhcp = (ipAddress.GetV4() == 0); + usingDhcp = ipAddress.IsNull(); if (usingDhcp) { // IP address is all zeros, so use DHCP diff --git a/src/Networking/W5500Ethernet/Wiznet/Ethernet/socketlib.cpp b/src/Networking/W5500Ethernet/Wiznet/Ethernet/socketlib.cpp index 43a82fc8..37db94de 100644 --- a/src/Networking/W5500Ethernet/Wiznet/Ethernet/socketlib.cpp +++ b/src/Networking/W5500Ethernet/Wiznet/Ethernet/socketlib.cpp @@ -109,7 +109,7 @@ int8_t socket(uint8_t sn, uint8_t protocol, uint16_t port, uint8_t flag) { IPAddress taddr; getSIPR(taddr); - if (taddr.GetV4() == 0) + if (taddr.IsNull()) { return SOCKERR_SOCKINIT; } @@ -264,7 +264,7 @@ int32_t sendto(uint8_t sn, const uint8_t * buf, uint16_t len, IPAddress destIp, } CHECK_SOCKDATA(); - if (destIp.GetV4() == 0) + if (destIp.IsNull()) { return SOCKERR_IPINVALID; } diff --git a/src/Networking/W5500Ethernet/Wiznet/Internet/DHCP/dhcp.cpp b/src/Networking/W5500Ethernet/Wiznet/Internet/DHCP/dhcp.cpp index 9283d780..f1103a33 100644 --- a/src/Networking/W5500Ethernet/Wiznet/Internet/DHCP/dhcp.cpp +++ b/src/Networking/W5500Ethernet/Wiznet/Internet/DHCP/dhcp.cpp @@ -613,7 +613,7 @@ int8_t parseDHCPMSG(void) case subnetMask : p++; p++; - DHCP_allocated_sn.SetV4(*p); + DHCP_allocated_sn.SetV4(p); p += 4; break; case routersOnSubnet : |