diff options
Diffstat (limited to 'Projects/Webserver/Lib')
| -rw-r--r-- | Projects/Webserver/Lib/DHCPClientApp.c | 3 | ||||
| -rw-r--r-- | Projects/Webserver/Lib/TELNETServerApp.c | 2 | ||||
| -rw-r--r-- | Projects/Webserver/Lib/uIPManagement.c | 8 | ||||
| -rw-r--r-- | Projects/Webserver/Lib/uIPManagement.h | 2 |
4 files changed, 2 insertions, 13 deletions
diff --git a/Projects/Webserver/Lib/DHCPClientApp.c b/Projects/Webserver/Lib/DHCPClientApp.c index 6a2f02938..599def05b 100644 --- a/Projects/Webserver/Lib/DHCPClientApp.c +++ b/Projects/Webserver/Lib/DHCPClientApp.c @@ -157,9 +157,6 @@ void DHCPClientApp_Callback(void) uip_setnetmask((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.Netmask); uip_setdraddr((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.GatewayIP); - /* Indicate to the user that we now have a valid IP configuration */ - HaveIPConfiguration = true; - AppState->DHCPClient.CurrentState = DHCP_STATE_AddressLeased; } diff --git a/Projects/Webserver/Lib/TELNETServerApp.c b/Projects/Webserver/Lib/TELNETServerApp.c index 436a619fa..e6eba5364 100644 --- a/Projects/Webserver/Lib/TELNETServerApp.c +++ b/Projects/Webserver/Lib/TELNETServerApp.c @@ -146,7 +146,7 @@ static void TELNETServerApp_DisplayTCPConnections(void) if (CurrConnection->tcpstateflags != UIP_CLOSED) { /* Add the current connection's details to the out buffer */ - ResponseLen += sprintf_P(&AppData[ResponseLen], PSTR("%u) %02d.%02d.%02d.%02d (Local %u, Remote %u)\r\n"), + ResponseLen += sprintf_P(&AppData[ResponseLen], PSTR("%u) %d.%d.%d.%d (Local Port %u <=> Remote Port %u)\r\n"), ++ActiveConnCount, CurrConnection->ripaddr.u8[0], CurrConnection->ripaddr.u8[1], diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c index 59045c06a..8bc27afb7 100644 --- a/Projects/Webserver/Lib/uIPManagement.c +++ b/Projects/Webserver/Lib/uIPManagement.c @@ -46,9 +46,6 @@ static struct timer ARPTimer; /** MAC address of the RNDIS device, when enumerated. */ struct uip_eth_addr MACAddress; -/** Indicates if an IP configuration has been set in the device. */ -bool HaveIPConfiguration; - /** Configures the uIP stack ready for network traffic processing. */ void uIPManagement_Init(void) @@ -76,7 +73,6 @@ void uIPManagement_Init(void) DHCPServerApp_Init(); #endif - HaveIPConfiguration = true; uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress; uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS[0], DEVICE_IP_ADDRESS[1], DEVICE_IP_ADDRESS[2], DEVICE_IP_ADDRESS[3]); uip_ipaddr(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]); @@ -88,10 +84,8 @@ void uIPManagement_Init(void) else { #if defined(ENABLE_DHCP_CLIENT) - HaveIPConfiguration = false; DHCPClientApp_Init(); #else - HaveIPConfiguration = true; uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress; uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS[0], DEVICE_IP_ADDRESS[1], DEVICE_IP_ADDRESS[2], DEVICE_IP_ADDRESS[3]); uip_ipaddr(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]); @@ -228,7 +222,7 @@ static void uIPManagement_ProcessIncomingPacket(void) } } - LEDs_SetAllLEDs(LEDMASK_USB_READY | ((HaveIPConfiguration) ? LEDMASK_UIP_READY_CONFIG : LEDMASK_UIP_READY_NOCONFIG)); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** Manages the currently open network connections, including TCP and (if enabled) UDP. */ diff --git a/Projects/Webserver/Lib/uIPManagement.h b/Projects/Webserver/Lib/uIPManagement.h index c42e13225..8fe656d68 100644 --- a/Projects/Webserver/Lib/uIPManagement.h +++ b/Projects/Webserver/Lib/uIPManagement.h @@ -70,8 +70,6 @@ /* External Variables: */ extern struct uip_eth_addr MACAddress; - extern bool HaveIPConfiguration; - /* Function Prototypes: */ void uIPManagement_Init(void); void uIPManagement_ManageNetwork(void); |