[LWIP] update LWIP 2.0.2: support IPV6.

5 files changed, 64 insertions, 35 deletions

diff --git a/components/net/KConfig b/components/net/KConfig
index b5f50de180..6b87735030 100644
--- a/components/net/KConfig
+++ b/components/net/KConfig
@@ -6,10 +6,10 @@ config RT_USING_LWIP
     default n
 
     if RT_USING_LWIP
-        choice 
+        choice
             prompt "lwIP version"
             default RT_USING_LWIP141
-            help 
+            help
                 Select the lwIP version
 
             config RT_USING_LWIP141
@@ -19,6 +19,12 @@ config RT_USING_LWIP
                 bool "lwIP v2.0.2"
         endchoice
 
+        if RT_USING_LWIP202
+            config RT_USING_LWIP_IPV6
+                bool "IPV6 protocol"
+                default n
+        endif
+
         config RT_LWIP_IGMP
             bool "IGMP protocol"
             default n
@@ -45,7 +51,7 @@ config RT_USING_LWIP
                 config IP_SOF_BROADCAST
                     int "SOF broadcast"
                     default 1
-                
+
                 config IP_SOF_BROADCAST_RECV
                     int "SOF broadcast recv"
                     default 1
@@ -63,7 +69,7 @@ config RT_USING_LWIP
                 config RT_LWIP_GWADDR
                     string "IPv4: Gateway address"
                     default 192.168.1.1
-                
+
                 config RT_LWIP_MSKADDR
                     string "IPv4: Mask address"
                     default 255.255.255.0
@@ -76,7 +82,7 @@ config RT_USING_LWIP
         config RT_LWIP_TCP
             bool "TCP protocol"
             default y
-        
+
         config RT_LWIP_RAW
             bool "RAW protocol"
             default n
@@ -138,11 +144,11 @@ config RT_USING_LWIP
         config RT_LWIP_ETHTHREAD_PRIORITY
             int "the priority level value of ethernet thread"
             default 12
-        
+
         config RT_LWIP_ETHTHREAD_STACKSIZE
             int "the stack size of ethernet thread"
             default 1024
-        
+
         config RT_LWIP_ETHTHREAD_MBOX_SIZE
             int "the number of mail in the ethernet thread mailbox"
             default 8
diff --git a/components/net/lwip-2.0.2/SConscript b/components/net/lwip-2.0.2/SConscript
index fa8a087c8d..84125a4cb2 100644
--- a/components/net/lwip-2.0.2/SConscript
+++ b/components/net/lwip-2.0.2/SConscript
@@ -74,7 +74,10 @@ if GetDepend(['RT_LWIP_SNMP']):
 if GetDepend(['RT_LWIP_PPP']):
     src += ppp_src
     path += [GetCurrentDir() + '/src/netif/ppp']
-    
+
+if GetDepend(['RT_USING_LWIP_IPV6']):
+    src += ipv6_src
+
 group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP202'], CPPPATH = path)
 
 Return('group')
diff --git a/components/net/lwip-2.0.2/src/arch/sys_arch.c b/components/net/lwip-2.0.2/src/arch/sys_arch.c
index 6e4bc64dc3..06198d5191 100644
--- a/components/net/lwip-2.0.2/src/arch/sys_arch.c
+++ b/components/net/lwip-2.0.2/src/arch/sys_arch.c
@@ -69,7 +69,7 @@ static void tcpip_init_done_callback(void *arg)
 {
     rt_device_t device;
     struct eth_device *ethif;
-    ip_addr_t ipaddr, netmask, gw;
+    ip4_addr_t ipaddr, netmask, gw;
     struct rt_list_node* node;
     struct rt_object* object;
     struct rt_object_information *information;
diff --git a/components/net/lwip-2.0.2/src/lwipopts.h b/components/net/lwip-2.0.2/src/lwipopts.h
index 98aac01d56..76e3a0f948 100644
--- a/components/net/lwip-2.0.2/src/lwipopts.h
+++ b/components/net/lwip-2.0.2/src/lwipopts.h
@@ -6,7 +6,12 @@
 #define ERRNO                       1
 
 #define LWIP_IPV4                   1
+
+#ifdef RT_USING_LWIP_IPV6
+#define LWIP_IPV6                   1
+#else
 #define LWIP_IPV6                   0
+#endif /* RT_USING_LWIP_IPV6 */
 
 #define NO_SYS                      0
 #define LWIP_SOCKET                 1
@@ -375,8 +380,6 @@
 #define LWIP_NETIF_API                  1
 #endif
 
-/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts. */
-#define MEMP_NUM_SYS_TIMEOUT       (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT)
 #ifdef LWIP_IGMP
 #include <stdlib.h>
 #define LWIP_RAND                  rand
diff --git a/components/net/lwip-2.0.2/src/netif/ethernetif.c b/components/net/lwip-2.0.2/src/netif/ethernetif.c
index 362c4ea4ae..bd28815c4b 100644
--- a/components/net/lwip-2.0.2/src/netif/ethernetif.c
+++ b/components/net/lwip-2.0.2/src/netif/ethernetif.c
@@ -76,6 +76,10 @@
 
 #include "lwip/inet.h"
 
+#if LWIP_IPV6
+#include "lwip/ethip6.h"
+#endif /* LWIP_IPV6 */
+
 #define netifapi_netif_set_link_up(n)      netifapi_netif_common(n, netif_set_link_up, NULL)
 #define netifapi_netif_set_link_down(n)    netifapi_netif_common(n, netif_set_link_down, NULL)
 
@@ -168,6 +172,13 @@ static err_t eth_netif_device_init(struct netif *netif)
         /* copy device flags to netif flags */
         netif->flags = (ethif->flags & 0xff);
 
+#if LWIP_IPV6
+		netif->output_ip6 = ethip6_output;
+		netif->ip6_autoconfig_enabled = 1;
+		netif_create_ip6_linklocal_address(netif, 1);
+		netif->flags |= NETIF_FLAG_MLD6;
+#endif /* LWIP_IPV6 */
+
         /* set default netif */
         if (netif_default == RT_NULL)
             netif_set_default(ethif->netif);
@@ -232,9 +243,6 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
 
     /* set output */
     netif->output       = etharp_output;
-#if LWIP_IPV6
-    netif->output_ip6   = ethip6_output;
-#endif /* LWIP_IPV6 */
     netif->linkoutput   = ethernetif_linkoutput;
 
 #if LWIP_NETIF_HOSTNAME
@@ -245,7 +253,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
     /* if tcp thread has been started up, we add this netif to the system */
     if (rt_thread_find("tcpip") != RT_NULL)
     {
-        ip_addr_t ipaddr, netmask, gw;
+        ip4_addr_t ipaddr, netmask, gw;
 
 #if !LWIP_DHCP
         ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
@@ -266,19 +274,6 @@ rt_err_t eth_device_init(struct eth_device * dev, char *name)
 {
     rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP;
 
-#if LWIP_IPV6 && LWIP_IPV6_MLD
-    /*
-    * For hardware/netifs that implement MAC filtering.
-    * All-nodes link-local is handled by default, so we must let the hardware know
-    * to allow multicast packets in.
-    * Should set mld_mac_filter previously. */
-    if (netif->mld_mac_filter != NULL) {
-        ip6_addr_t ip6_allnodes_ll;
-        ip6_addr_set_allnodes_linklocal(&ip6_allnodes_ll);
-        netif->mld_mac_filter(netif, &ip6_allnodes_ll, MLD6_ADD_MAC_FILTER);
-    }
-#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
-
 #if LWIP_IGMP
     /* IGMP support */
     flags |= NETIF_FLAG_IGMP;
@@ -468,8 +463,8 @@ int eth_system_device_init_private(void)
 #include <finsh.h>
 void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr)
 {
-    ip_addr_t *ip;
-    ip_addr_t addr;
+    ip4_addr_t *ip;
+    ip4_addr_t addr;
     struct netif * netif = netif_list;
 
     if(strlen(netif_name) > sizeof(netif->name))
@@ -491,22 +486,22 @@ void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr)
         }
     }
 
-    ip = (ip_addr_t *)&addr;
+    ip = (ip4_addr_t *)&addr;
 
     /* set ip address */
-    if ((ip_addr != RT_NULL) && ipaddr_aton(ip_addr, &addr))
+    if ((ip_addr != RT_NULL) && ip4addr_aton(ip_addr, &addr))
     {
         netif_set_ipaddr(netif, ip);
     }
 
     /* set gateway address */
-    if ((gw_addr != RT_NULL) && ipaddr_aton(gw_addr, &addr))
+    if ((gw_addr != RT_NULL) && ip4addr_aton(gw_addr, &addr))
     {
         netif_set_gw(netif, ip);
     }
 
     /* set netmask address */
-    if ((nm_addr != RT_NULL) && ipaddr_aton(nm_addr, &addr))
+    if ((nm_addr != RT_NULL) && ip4addr_aton(nm_addr, &addr))
     {
         netif_set_netmask(netif, ip);
     }
@@ -557,8 +552,30 @@ void list_if(void)
         rt_kprintf("ip address: %s\n", ipaddr_ntoa(&(netif->ip_addr)));
         rt_kprintf("gw address: %s\n", ipaddr_ntoa(&(netif->gw)));
         rt_kprintf("net mask  : %s\n", ipaddr_ntoa(&(netif->netmask)));
+#if LWIP_IPV6
+		{
+			ip6_addr_t *addr;
+			int addr_state;
+			int i;
+			
+			addr = (ip6_addr_t *)&netif->ip6_addr[0];
+			addr_state = netif->ip6_addr_state[0];
+			
+			rt_kprintf("\nipv6 link-local: %s state:%02X %s\n", ip6addr_ntoa(addr), 
+			addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
+			
+			for(i=1; i<LWIP_IPV6_NUM_ADDRESSES; i++)
+			{
+				addr = (ip6_addr_t *)&netif->ip6_addr[i];
+				addr_state = netif->ip6_addr_state[i];
+			
+				rt_kprintf("ipv6[%d] address: %s state:%02X %s\n", i, ip6addr_ntoa(addr), 
+				addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
+			}
+			
+		}
         rt_kprintf("\r\n");
-
+#endif /* LWIP_IPV6 */
         netif = netif->next;
     }