Merge pull request #8003 from Taiki-San/patch-2

Leverage the simplification of the IPv6 parsing primitive

Author: 0xc0170

UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake

@@ -14,7 +14,10 @@ set(unittest-sources
   ../features/netsocket/NetworkInterface.cpp
   ../features/netsocket/NetworkStack.cpp
   ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
   ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
 )
 
 # Test files

UNITTESTS/features/netsocket/InternetSocket/unittest.cmake

@@ -8,7 +8,10 @@ set(unittest-sources
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/InternetSocket.cpp
   ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
   ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
 )
 
 set(unittest-test-sources

UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake

@@ -9,7 +9,10 @@ set(unittest-sources
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/NetworkInterface.cpp
   ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
   ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
 )
 
 # Test files

UNITTESTS/features/netsocket/NetworkStack/unittest.cmake

@@ -12,7 +12,10 @@ set(unittest-sources
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/NetworkInterface.cpp
   ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
   ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
 )
 
 # Test files

UNITTESTS/features/netsocket/SocketAddress/unittest.cmake

@@ -6,19 +6,14 @@
 # Unit test suite name
 set(TEST_SUITE_NAME "features_netsocket_SocketAddress")
 
-# We want to get rid of ip6string.h fake include to use the real definitions.
-list(REMOVE_ITEM unittest-includes "${PROJECT_SOURCE_DIR}/target_h")
-
 # Source files
 set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
-  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
-# Adding real ip6-related features, to test the relevant functions fully.
   ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
+  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
   ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
-  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
-  
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
 )
 
 # Test files

UNITTESTS/features/netsocket/TCPServer/unittest.cmake

@@ -13,7 +13,10 @@ set(unittest-sources
   ../features/netsocket/TCPSocket.cpp
   ../features/netsocket/TCPServer.cpp
   ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
   ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
 )
 
 set(unittest-test-sources

UNITTESTS/features/netsocket/TCPSocket/unittest.cmake

@@ -9,7 +9,10 @@ set(unittest-sources
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/TCPSocket.cpp
   ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
   ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
 )
 
 set(unittest-test-sources

UNITTESTS/features/netsocket/UDPSocket/unittest.cmake

@@ -9,7 +9,10 @@ set(unittest-sources
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/UDPSocket.cpp
   ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
   ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
+  ../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
+  ../features/frameworks/nanostack-libservice/source/libBits/common_functions.c  
 )
 
 set(unittest-test-sources

UNITTESTS/target_h/ip6string.h

@@ -24,26 +24,6 @@
 
 
 
-static bool ipv6_is_valid(const char *addr)
-{
-    // Check each digit for [0-9a-fA-F:]
-    // Must also have at least 2 colons
-    int colons = 0;
-    for (int i = 0; addr[i]; i++) {
-        if (!(addr[i] >= '0' && addr[i] <= '9') &&
-                !(addr[i] >= 'a' && addr[i] <= 'f') &&
-                !(addr[i] >= 'A' && addr[i] <= 'F') &&
-                addr[i] != ':') {
-            return false;
-        }
-        if (addr[i] == ':') {
-            colons++;
-        }
-    }
-
-    return colons >= 2;
-}
-
 SocketAddress::SocketAddress(nsapi_addr_t addr, uint16_t port)
 {
     _ip_address = NULL;
@@ -80,9 +60,8 @@ bool SocketAddress::set_ip_address(const char *addr)
     if (addr && stoip4(addr, strlen(addr), _addr.bytes)) {
         _addr.version = NSAPI_IPv4;
         return true;
-    } else if (addr && ipv6_is_valid(addr)) {
+    } else if (addr && stoip6(addr, strlen(addr), _addr.bytes)) {
         _addr.version = NSAPI_IPv6;
-        stoip6(addr, strlen(addr), _addr.bytes);
         return true;
     } else {
         _addr = nsapi_addr_t();