A stack which works with or without an Mbed os library. Provides IPv4 or IPv6 with a full 1500 byte buffer.
Dependents: oldheating gps motorhome heating
Diff: udp/dhcp.cpp
- Revision:
- 47:73af5c0b0dc2
- Parent:
- 44:83ce5ace337b
- Child:
- 49:1a6336f2b3f9
diff -r 40d33e9037e4 -r 73af5c0b0dc2 udp/dhcp.cpp --- a/udp/dhcp.cpp Tue Oct 24 07:01:35 2017 +0000 +++ b/udp/dhcp.cpp Thu Oct 26 14:50:24 2017 +0000 @@ -187,13 +187,10 @@ } if (DhcpTrace) { - char text[20]; - Ip4AddressToString(srvIp, sizeof(text), text); - LogF(" server=%s", text); - Ip4AddressToString(reqIp, sizeof(text), text); - LogF(" request=%s", text); - Ip4AddressToString(DhcpLocalIp, sizeof(text), text); - LogF(" local=%s\r\n", text); + Log(" server=" ); Ip4AddressLog(srvIp); + Log(" request="); Ip4AddressLog(reqIp); + Log(" local=" ); Ip4AddressLog(DhcpLocalIp); + Log("\r\n"); } bool broadcast = DhcpLocalIp == 0; @@ -256,23 +253,19 @@ char* pOptions = (char*)pPacket + HEADER_LENGTH; readOptions(*pSize - HEADER_LENGTH, pOptions); - char text[30]; switch (dhcpMessageType) { case DHCPOFFER: - Ip4AddressToString(yiaddr, sizeof(text), text); - if (DhcpTrace) LogTimeF("DHCP <- offer ip %s\r\n", text); + if (DhcpTrace) { LogTime("DHCP <- offer ip "); Ip4AddressLog(yiaddr); Log("\r\n"); } *pSize =sendRequest(pPacket, DHCPREQUEST, siaddr, yiaddr); return BROADCAST; case DHCPACK: - Ip4AddressToString(yiaddr, sizeof(text), text); - if (DhcpTrace) LogTimeF("DHCP <- ack ip %s\r\n", text); + if (DhcpTrace) { LogTime("DHCP <- ack ip "); Ip4AddressLog(yiaddr); Log("\r\n"); } DhcpLocalIp = yiaddr; DhcpElapsedTime = 0; break; case DHCPNAK: - Ip4AddressToString(yiaddr, sizeof(text), text); - if (DhcpTrace) LogTimeF("DHCP <- nack ip %s\r\n", text); + if (DhcpTrace) { LogTime("DHCP <- nack ip "); Ip4AddressLog(yiaddr); Log("\r\n"); } break; default: LogTimeF("DHCP <- unknown message %d\r\n", dhcpMessageType);