Diff: udp/dhcp/dhcp.c

Revision:

187:122fc1996c86

Parent:

185:e8f516e142c4

--- a/udp/dhcp/dhcp.c	Sat Jan 16 18:34:32 2021 +0000
+++ b/udp/dhcp/dhcp.c	Mon Jan 18 18:23:46 2021 +0000
@@ -300,12 +300,12 @@
             {
                 _offeredIp = yiaddr;
                 readOptionServerId(sizeRx - DHCP_HEADER_LENGTH, pOptions);
-                if (DhcpTrace) { LogTime("DHCP <- offer  "); Ip4AddressLog(_offeredIp); Log(" from server "); Ip4AddressLog(_serverId); Log("\r\n"); }
+                if (DhcpTrace) { LogTime("DHCP <- offer  "); Ip4AddrLog(_offeredIp); Log(" from server "); Ip4AddrLog(_serverId); Log("\r\n"); }
                 _awaitingResponse = false;
             }
             else
             {
-                if (DhcpTrace) { LogTime("DHCP <- offer  "); Ip4AddressLog(_offeredIp); Log(" from server "); Ip4AddressLog(_serverId); Log(" ignored\r\n"); }
+                if (DhcpTrace) { LogTime("DHCP <- offer  "); Ip4AddrLog(_offeredIp); Log(" from server "); Ip4AddrLog(_serverId); Log(" ignored\r\n"); }
             }
             break;
         case DHCPACK:
@@ -314,26 +314,26 @@
                 DhcpLocalIp = yiaddr;
                 readOptions(sizeRx - DHCP_HEADER_LENGTH, pOptions);
                 DhcpServerIp = _serverId;
-                if (DhcpTrace) { LogTime("DHCP <- ack    ");   Ip4AddressLog(DhcpLocalIp); Log(" from server "); Ip4AddressLog(_serverId); Log("\r\n"); }
+                if (DhcpTrace) { LogTime("DHCP <- ack    ");   Ip4AddrLog(DhcpLocalIp); Log(" from server "); Ip4AddrLog(_serverId); Log("\r\n"); }
                 _elapsedLifeMsTimer = MsTimerCount;  //Start the life timer
                 _awaitingResponse = false;
             }
             else
             {
-                if (DhcpTrace) { LogTime("DHCP <- ack    ");   Ip4AddressLog(DhcpLocalIp); Log(" from server "); Ip4AddressLog(_serverId); Log(" ignored\r\n"); }
+                if (DhcpTrace) { LogTime("DHCP <- ack    ");   Ip4AddrLog(DhcpLocalIp); Log(" from server "); Ip4AddrLog(_serverId); Log(" ignored\r\n"); }
             }
             break;
         case DHCPNAK:
             if (_state == STATE_SELECT || _state == STATE_RENEW || _state == STATE_REBIND)
             {
                 readOptionServerId(sizeRx - DHCP_HEADER_LENGTH, pOptions);
-                if (DhcpTrace) { LogTime("DHCP <- nack   ");  Ip4AddressLog(yiaddr); Log(" from server "); Ip4AddressLog(_serverId); Log("\r\n"); }
+                if (DhcpTrace) { LogTime("DHCP <- nack   ");  Ip4AddrLog(yiaddr); Log(" from server "); Ip4AddrLog(_serverId); Log("\r\n"); }
                 clearAll();
                 _awaitingResponse = false;
             }
             else
             {
-                if (DhcpTrace) { LogTime("DHCP <- nack   ");  Ip4AddressLog(yiaddr); Log(" from server "); Ip4AddressLog(_serverId); Log(" ignored\r\n"); }
+                if (DhcpTrace) { LogTime("DHCP <- nack   ");  Ip4AddrLog(yiaddr); Log(" from server "); Ip4AddrLog(_serverId); Log(" ignored\r\n"); }
             }
             break;
         default:
@@ -425,7 +425,7 @@
             break;
             
         case STATE_SELECT:
-            if (DhcpTrace) { LogTimeF("DHCP -> select "); Ip4AddressLog(_offeredIp); Log(" from server "); Ip4AddressLog(_serverId); Log("\r\n"); }
+            if (DhcpTrace) { LogTimeF("DHCP -> select "); Ip4AddrLog(_offeredIp); Log(" from server "); Ip4AddrLog(_serverId); Log("\r\n"); }
             type = DHCPREQUEST;
             ciaddr = 0;
             requestedIp = _offeredIp;
@@ -434,11 +434,11 @@
             break;
             
         case STATE_BOUND:
-            if (DhcpTrace) { LogTimeF("DHCP -- bound  "); Ip4AddressLog(DhcpLocalIp); Log("\r\n"); }
+            if (DhcpTrace) { LogTimeF("DHCP -- bound  "); Ip4AddrLog(DhcpLocalIp); Log("\r\n"); }
             return DO_NOTHING;
             
         case STATE_RENEW:
-            if (DhcpTrace) { LogTimeF("DHCP -> renew (T1) "); Ip4AddressLog(DhcpLocalIp); Log("\r\n"); }
+            if (DhcpTrace) { LogTimeF("DHCP -> renew (T1) "); Ip4AddrLog(DhcpLocalIp); Log("\r\n"); }
             type = DHCPREQUEST;
             ciaddr = DhcpLocalIp;
             requestedIp = 0;
@@ -447,7 +447,7 @@
             break;
             
         case STATE_REBIND:
-            if (DhcpTrace) { LogTimeF("DHCP -> rebind (T2) "); Ip4AddressLog(DhcpLocalIp); Log("\r\n"); }
+            if (DhcpTrace) { LogTimeF("DHCP -> rebind (T2) "); Ip4AddrLog(DhcpLocalIp); Log("\r\n"); }
             type = DHCPREQUEST;
             ciaddr = DhcpLocalIp;
             requestedIp = 0;
@@ -456,7 +456,7 @@
             break;
             
         case STATE_EXPIRED:
-            if (DhcpTrace) { LogTimeF("DHCP -- expired "); Ip4AddressLog(DhcpLocalIp); Log("\r\n"); }
+            if (DhcpTrace) { LogTimeF("DHCP -- expired "); Ip4AddrLog(DhcpLocalIp); Log("\r\n"); }
             clearAll();
             return DO_NOTHING;