Changeset 449 for trunk

Timestamp:

May 1, 2014, 10:10:47 AM (11 years ago)

Author:

katerina

Message:

More fixes for ticket #350 (ipv6 this time).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/cutest_sh_tools.c (modified) (1 diff)
• src/sh_ipvx.c (modified) (1 diff)

trunk/docs/Changelog

@@ -1 @@
-3.1.1:
+3.1.1 (01-0-2014):
         * Disable inline asm on Cygwin (issue reported by Erik)
         * Fix sh_ipvx_is_ipv4 such that numeric hostnames are not
           incorrectly recognised as IP address (reported by A. Hofland)
+        * Fix sh_ipvx_is_ipv6
 
 3.1.0 (31-10-2013):

trunk/src/cutest_sh_tools.c

@@ -115 +115 @@
   input  = strdup("127");
   CuAssertTrue(tc, !sh_ipvx_is_numeric(input));
+#if defined(USE_IPVX)
+  input  = strdup("::1");
+  CuAssertTrue(tc, sh_ipvx_is_numeric(input));
+  input  = strdup("2002:c0a8:101::42");
+  CuAssertTrue(tc, sh_ipvx_is_numeric(input));
+  input  = strdup("2003:dead:beef:4dad:23:46:bb:101");
+  CuAssertTrue(tc, sh_ipvx_is_numeric(input));
+  input  = strdup("::192:168:0:1::");
+  CuAssertTrue(tc, sh_ipvx_is_numeric(input));
+  input  = strdup("1:1:192:168:0:1:1:1");
+  CuAssertTrue(tc, sh_ipvx_is_numeric(input));
+  input  = strdup("1:1:192:168:0:1:1:1:0");
+  CuAssertTrue(tc, !sh_ipvx_is_numeric(input));
+  input  = strdup("2001:0db8:85a3:0000:0000:8a2e:0370:7334");
+  CuAssertTrue(tc, sh_ipvx_is_numeric(input));
+  input  = strdup("2001:db8:85a3:0:0:8a2e:370:7334");
+  CuAssertTrue(tc, sh_ipvx_is_numeric(input));
+  input  = strdup("2001:db8:85a3::8a2e:370:7334");
+  CuAssertTrue(tc, sh_ipvx_is_numeric(input));
+#endif
 }
 

trunk/src/sh_ipvx.c

@@ -82 +82 @@
     else if (c == ':')
       ++k;
-    else if (c == '.' && k < 3)
+    else if (c == '.' && k < 2)
       return (1 == 0); /* ::ffff:ipv4 */
   }
+  if (k < 2 || k > 7)
+    return (1 == 0);
+
   return (1 == 1);
 }