X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/16ea5aa7a2e5f326f8ff129e740a19bb3fb7829f..a9e0935a90346beb0c981924becc1f55d969a08b:/Projects/Webserver/Lib/uIPManagement.c

diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c
index a2cadd674..45f8a6ae5 100644
--- a/Projects/Webserver/Lib/uIPManagement.c
+++ b/Projects/Webserver/Lib/uIPManagement.c
@@ -30,7 +30,7 @@
 
 /** \file
  *
- *  uIP Managament functions. This file contains the functions and globals needed to maintain the uIP
+ *  uIP Management functions. This file contains the functions and globals needed to maintain the uIP
  *  stack once an RNDIS device has been attached to the system.
  */
 
@@ -46,13 +46,14 @@ struct timer ARPTimer;
 /** MAC address of the RNDIS device, when enumerated */
 struct uip_eth_addr MACAddress;
 
+bool HaveIPConfiguration;
 
 /** Configures the uIP stack ready for network traffic. */
 void uIPManagement_Init(void)
 {
 	/* uIP Timing Initialization */
 	clock_init();
-	timer_set(&ConnectionTimer, CLOCK_SECOND / 8);
+	timer_set(&ConnectionTimer, CLOCK_SECOND / 2);
 	timer_set(&ARPTimer, CLOCK_SECOND * 10);	
 
 	/* uIP Stack Initialization */
@@ -61,9 +62,11 @@ void uIPManagement_Init(void)
 	uip_setethaddr(MACAddress);
 
 	/* DHCP/Server IP Settings Initialization */
-	#if defined(ENABLE_DHCP)
+	#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]);
@@ -77,7 +80,9 @@ void uIPManagement_Init(void)
 	HTTPServerApp_Init();
 	
 	/* TELNET Server Initialization */
+	#if defined(ENABLE_TELNET_SERVER)
 	TELNETServerApp_Init();
+	#endif
 }
 
 /** uIP Management function. This function manages the uIP stack when called while an RNDIS device has been
@@ -87,7 +92,7 @@ void uIPManagement_ManageNetwork(void)
 {
 	if ((USB_CurrentMode == USB_MODE_HOST) && (USB_HostState == HOST_STATE_Configured))
 	{
-		uIPManagement_ProcessIncommingPacket();
+		uIPManagement_ProcessIncomingPacket();
 		uIPManagement_ManageConnections();
 	}
 }
@@ -103,9 +108,11 @@ void uIPManagement_TCPCallback(void)
 		case HTONS(HTTP_SERVER_PORT):
 			HTTPServerApp_Callback();
 			break;
+		#if defined(ENABLE_TELNET_SERVER)
 		case HTONS(TELNET_SERVER_PORT):
 			TELNETServerApp_Callback();
 			break;
+		#endif
 	}
 }
 
@@ -123,8 +130,8 @@ void uIPManagement_UDPCallback(void)
 	}
 }
 
-/** Processes incomming packets to the server from the connected RNDIS device, creating responses as needed. */
-static void uIPManagement_ProcessIncommingPacket(void)
+/** Processes Incoming packets to the server from the connected RNDIS device, creating responses as needed. */
+static void uIPManagement_ProcessIncomingPacket(void)
 {
 	/* If no packet received, exit processing routine */
 	if (!(RNDIS_Host_IsPacketReceived(&Ethernet_RNDIS_Interface)))
@@ -132,7 +139,7 @@ static void uIPManagement_ProcessIncommingPacket(void)
 	  
 	LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
 
-	/* Read the incomming packet straight into the UIP packet buffer */
+	/* Read the Incoming packet straight into the UIP packet buffer */
 	RNDIS_Host_ReadPacket(&Ethernet_RNDIS_Interface, uip_buf, &uip_len);
 
 	/* If the packet contains an Ethernet frame, process it */
@@ -144,7 +151,7 @@ static void uIPManagement_ProcessIncommingPacket(void)
 				/* Filter packet by MAC destination */
 				uip_arp_ipin();
 
-				/* Process incomming packet */
+				/* Process Incoming packet */
 				uip_input();
 
 				/* If a response was generated, send it */
@@ -153,7 +160,7 @@ static void uIPManagement_ProcessIncommingPacket(void)
 					/* Add destination MAC to outgoing packet */
 					uip_arp_out();
 
-					RNDIS_Host_SendPacket(&Ethernet_RNDIS_Interface, uip_buf, uip_len);
+					uip_split_output();
 				}
 				
 				break;
@@ -163,13 +170,13 @@ static void uIPManagement_ProcessIncommingPacket(void)
 				
 				/* If a response was generated, send it */
 				if (uip_len > 0)
-				  RNDIS_Host_SendPacket(&Ethernet_RNDIS_Interface, uip_buf, uip_len);
+				  uip_split_output();
 				
 				break;
 		}
 	}
 
-	LEDs_SetAllLEDs(LEDMASK_USB_READY);
+	LEDs_SetAllLEDs(LEDMASK_USB_READY | ((HaveIPConfiguration) ? LEDMASK_UIP_READY_CONFIG : LEDMASK_UIP_READY_NOCONFIG));
 }
 
 /** Manages the currently open network connections, including TCP and (if enabled) UDP. */
@@ -186,7 +193,8 @@ static void uIPManagement_ManageConnections(void)
 			/* Add destination MAC to outgoing packet */
 			uip_arp_out();
 
-			RNDIS_Host_SendPacket(&Ethernet_RNDIS_Interface, uip_buf, uip_len);
+			/* Split and send the outgoing packet */
+			uip_split_output();
 		}
 	}
 
@@ -208,11 +216,12 @@ static void uIPManagement_ManageConnections(void)
 				/* Add destination MAC to outgoing packet */
 				uip_arp_out();
 
-				RNDIS_Host_SendPacket(&Ethernet_RNDIS_Interface, uip_buf, uip_len);
+				/* Split and send the outgoing packet */
+				uip_split_output();
 			}
 		}
 		
-		#if defined(ENABLE_DHCP)
+		#if defined(ENABLE_DHCP_CLIENT)
 		for (uint8_t i = 0; i < UIP_UDP_CONNS; i++)
 		{
 			/* Run periodic connection management for each UDP connection */
@@ -224,7 +233,8 @@ static void uIPManagement_ManageConnections(void)
 				/* Add destination MAC to outgoing packet */
 				uip_arp_out();
 
-				RNDIS_Host_SendPacket(&Ethernet_RNDIS_Interface, uip_buf, uip_len);
+				/* Split and send the outgoing packet */
+				uip_split_output();
 			}
 		}
 		#endif