Changeset a62ceaf in mainline for uspace/lib/c/generic/inet/addr.c

Timestamp:

2016-02-29T19:19:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

129b92c6

Parents:

5147ff1

Message:

Need better interfaces for handling internet host and host:port specifications.

File:

• uspace/lib/c/generic/inet/addr.c (modified) (12 diffs)

uspace/lib/c/generic/inet/addr.c

@@ -290 +290 @@
 
 static int inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
-    int *prefix)
+    int *prefix, char **endptr)
 {
         uint32_t a = 0;
@@ -306 +306 @@
                 i++;
 
-                if (*cur == '\0' || *cur == '/')
+                if (*cur != '.')
                         break;
-
-                if (*cur != '.')
-                        return EINVAL;
 
                 if (i < 4)
@@ -326 +323 @@
         }
 
-        if (i != 4 || (*cur != '\0'))
+        if (i != 4)
+                return EINVAL;
+
+        if (endptr == NULL && *cur != '\0')
                 return EINVAL;
 
@@ -332 +332 @@
         raddr->addr = a;
 
+        if (endptr != NULL)
+                *endptr = cur;
+
         return EOK;
 }
 
-static int inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix)
+static int inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
+    char **endptr)
 {
         uint8_t data[16];
+        int explicit_groups;
 
         memset(data, 0, 16);
@@ -351 +356 @@
                 wildcard_pos = 0;
                 wildcard_size = 16;
-
-                /* Handle the unspecified address */
-                if (*cur == '\0')
-                        goto success;
         }
 
         while (i < 16) {
                 uint16_t bioctet;
-                int rc = str_uint16_t(cur, &cur, 16, false, &bioctet);
+                const char *gend;
+                int rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
                 if (rc != EOK)
-                        return rc;
+                        break;
 
                 data[i] = (bioctet >> 8) & 0xff;
@@ -375 +377 @@
                 i += 2;
 
-                if (*cur != ':')
+                if (*gend != ':') {
+                        cur = gend;
                         break;
+                }
 
                 if (i < 16) {
-                        cur++;
-
                         /* Handle wildcard */
-                        if (*cur == ':') {
+                        if (gend[1] == ':') {
                                 if (wildcard_pos != (size_t) -1)
                                         return EINVAL;
@@ -388 +390 @@
                                 wildcard_pos = i;
                                 wildcard_size = 16 - i;
-                                cur++;
-
-                                if (*cur == '\0' || *cur == '/')
-                                        break;
+                                cur = gend + 2;
                         }
                 }
         }
+
+        /* Number of explicitly specified groups */
+        explicit_groups = i;
 
         if (prefix != NULL) {
@@ -406 +408 @@
         }
 
-        if (*cur != '\0')
+        if (endptr == NULL && *cur != '\0')
                 return EINVAL;
 
@@ -418 +420 @@
                         data[j] = 0;
                 }
-        }
-
-success:
+        } else {
+                /* Verify that all groups have been specified */
+                if (explicit_groups != 16)
+                        return EINVAL;
+        }
+
         raddr->version = ip_v6;
         memcpy(raddr->addr6, data, 16);
+        if (endptr != NULL)
+                *endptr = (char *)cur;
         return EOK;
 }
 
 /** Parse node address.
+ *
+ * Will fail if @a text contains extra characters at the and and @a endptr
+ * is @c NULL.
  *
  * @param text Network address in common notation.
  * @param addr Place to store node address.
+ * @param endptr Place to store pointer to next character oc @c NULL
  *
  * @return EOK on success, EINVAL if input is not in valid format.
  *
  */
-int inet_addr_parse(const char *text, inet_addr_t *addr)
+int inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
 {
         int rc;
 
-        rc = inet_addr_parse_v4(text, addr, NULL);
+        rc = inet_addr_parse_v4(text, addr, NULL, endptr);
         if (rc == EOK)
                 return EOK;
 
-        rc = inet_addr_parse_v6(text, addr, NULL);
+        rc = inet_addr_parse_v6(text, addr, NULL, endptr);
         if (rc == EOK)
                 return EOK;
@@ -451 +462 @@
 /** Parse network address.
  *
+ * Will fail if @a text contains extra characters at the and and @a endptr
+ * is @c NULL.
+ *
  * @param text  Network address in common notation.
  * @param naddr Place to store network address.
+ * @param endptr Place to store pointer to next character oc @c NULL
  *
  * @return EOK on success, EINVAL if input is not in valid format.
  *
  */
-int inet_naddr_parse(const char *text, inet_naddr_t *naddr)
+int inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
 {
         int rc;
@@ -463 +478 @@
         int prefix;
 
-        rc = inet_addr_parse_v4(text, &addr, &prefix);
+        rc = inet_addr_parse_v4(text, &addr, &prefix, endptr);
         if (rc == EOK) {
                 inet_addr_naddr(&addr, prefix, naddr);
@@ -469 +484 @@
         }
 
-        rc = inet_addr_parse_v6(text, &addr, &prefix);
+        rc = inet_addr_parse_v6(text, &addr, &prefix, endptr);
         if (rc == EOK) {
                 inet_addr_naddr(&addr, prefix, naddr);