Fixed potential NULL pointer dereference in the HID Host mode Class Driver (thanks...

[pub/USBasp.git] / Projects / Webserver / Lib / uIPManagement.c

diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c
index c0ffcd4..d89b787 100644 (file)
--- a/Projects/Webserver/Lib/uIPManagement.c
+++ b/Projects/Webserver/Lib/uIPManagement.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -70,7 +70,7 @@ void uIPManagement_Init(void)
                MACAddress.addr[5] = SERVER_MAC_ADDRESS[5];
 
                #if defined(ENABLE_DHCP_SERVER)
-               DHCPServerApp_Init();   
+               DHCPServerApp_Init();
                #endif
 
                uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress;
@@ -84,7 +84,7 @@ void uIPManagement_Init(void)
        else
        {
                #if defined(ENABLE_DHCP_CLIENT)
-               DHCPClientApp_Init();   
+               DHCPClientApp_Init();
                #else
                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]);
@@ -113,7 +113,7 @@ void uIPManagement_Init(void)
  */
 void uIPManagement_ManageNetwork(void)
 {
-       if (((USB_CurrentMode == USB_MODE_Host) && (USB_HostState == HOST_STATE_Configured)) ||
+       if (((USB_CurrentMode == USB_MODE_Host)   && (USB_HostState   == HOST_STATE_Configured)) ||
            ((USB_CurrentMode == USB_MODE_Device) && (USB_DeviceState == DEVICE_STATE_Configured)))
        {
                uIPManagement_ProcessIncomingPacket();
@@ -170,7 +170,7 @@ static void uIPManagement_ProcessIncomingPacket(void)
                /* If no packet received, exit processing routine */
                if (!(RNDIS_Device_IsPacketReceived(&Ethernet_RNDIS_Interface_Device)))
                  return;
-       
+
                LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
 
                /* Read the Incoming packet straight into the UIP packet buffer */
@@ -181,13 +181,13 @@ static void uIPManagement_ProcessIncomingPacket(void)
                /* If no packet received, exit processing routine */
                if (!(RNDIS_Host_IsPacketReceived(&Ethernet_RNDIS_Interface_Host)))
                  return;
-       
+
                LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
 
                /* Read the Incoming packet straight into the UIP packet buffer */
                RNDIS_Host_ReadPacket(&Ethernet_RNDIS_Interface_Host, uip_buf, &uip_len);
        }
-       
+
        /* If the packet contains an Ethernet frame, process it */
        if (uip_len > 0)
        {