config to device.h

Author: viteo

device/device.h

@@ -18,6 +18,10 @@
 #define IP_ADDR2   7
 #define IP_ADDR3   1
 
+/*DHCP Client addresses: IP_ADDR0.IP_ADDR1.IP_ADDR2.DHCP_ADDR_x*/
+#define DHCP_ADDR_1     2
+#define DHCP_ADDR_2     3
+
 /*NETMASK*/
 #define NETMASK_ADDR0   255
 #define NETMASK_ADDR1   255

lib/USB_RNDIS/usb_endp.c

@@ -105,7 +105,6 @@ void EP3_OUT_Callback(void)
 	{
 		rndis_received = 0;
 	}
-//	DCD_EP_PrepareRx(pdev, RNDIS_DATA_OUT_EP, (uint8_t*) usb_rx_buffer, RNDIS_DATA_OUT_SZ);
 	SetEPRxCount(CDC_DAT_EP_OUT_IDX, CDC_DATA_SIZE);
 	SetEPRxStatus(CDC_DAT_EP_OUT_IDX, EP_RX_VALID);
 }

lib/dhcp-server/dhserver.h

@@ -39,6 +39,8 @@
 #include "lwip/udp.h"
 #include "netif/etharp.h"
 
+#define PORT_DHCP 67
+
 typedef struct dhcp_entry
 {
 	uint8_t  mac[6];

lib/dns-server/dnserver.h

@@ -32,6 +32,8 @@
 
 #include "lwip/udp.h"
 
+#define PORT_DNS 53
+
 typedef uint32_t (*dns_query_proc_t)(const char *name, ip_addr_t *addr);
 
 err_t dnserv_init(const ip_addr_t *bind, uint16_t port, dns_query_proc_t query_proc);

lib/lwip_port/netconf.c

@@ -11,24 +11,32 @@
 #include "lwip/init.h"
 #include "netif/ethernet.h"
 
-struct netif rndis_netif;
+struct netif rndis_netif; //network interface
 const ip_addr_t ipaddr  = IPADDR4_INIT_BYTES(IP_ADDR0, IP_ADDR1, IP_ADDR2, IP_ADDR3);
 const ip_addr_t netmask = IPADDR4_INIT_BYTES(NETMASK_ADDR0, NETMASK_ADDR1, NETMASK_ADDR2, NETMASK_ADDR3);
 const ip_addr_t gateway = IPADDR4_INIT_BYTES(GW_ADDR0, GW_ADDR1, GW_ADDR2, GW_ADDR3);
 
 #include "dhserver.h"
 static dhcp_entry_t entries[] =
 {
-    /* mac    ip address                           subnet mask                        lease time */
-    { {0}, IPADDR4_INIT_BYTES(192, 168, 7, 2), IPADDR4_INIT_BYTES(255, 255, 255, 0), 24 * 60 * 60 },
-    { {0}, IPADDR4_INIT_BYTES(192, 168, 7, 3), IPADDR4_INIT_BYTES(255, 255, 255, 0), 24 * 60 * 60 },
-    { {0}, IPADDR4_INIT_BYTES(192, 168, 7, 4), IPADDR4_INIT_BYTES(255, 255, 255, 0), 24 * 60 * 60 }
+    {
+    		{0},
+			IPADDR4_INIT_BYTES(IP_ADDR0, IP_ADDR1, IP_ADDR2, DHCP_ADDR_1),
+			IPADDR4_INIT_BYTES(NETMASK_ADDR0, NETMASK_ADDR1, NETMASK_ADDR2, NETMASK_ADDR3),
+			24 * 60 * 60
+    },
+    {
+    		{0},
+			IPADDR4_INIT_BYTES(IP_ADDR0, IP_ADDR1, IP_ADDR2, DHCP_ADDR_2),
+			IPADDR4_INIT_BYTES(NETMASK_ADDR0, NETMASK_ADDR1, NETMASK_ADDR2, NETMASK_ADDR3),
+			24 * 60 * 60
+    },
 };
 
 static dhcp_config_t dhcp_config =
 {
 	&ipaddr,              /* server address */
-	67,                   /* port */
+	PORT_DHCP,            /* port */
     &ipaddr,              /* dns server */
     "stm",                /* dns suffix */
     sizeof(entries) / sizeof(entries[0]),       /* entry count */
@@ -65,7 +73,7 @@ void LwIP_Init(void)
 
     while (dhserv_init(&dhcp_config)) ;
 
-    while (dnserv_init(&ipaddr, 53, dns_query_proc)) ;
+    while (dnserv_init(&ipaddr, PORT_DNS, dns_query_proc)) ;
 }
 
 /**