Changeset 4c53333 in mainline for uspace/app/inet/inet.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/app/inet/inet.c (moved) (moved from uspace/app/inetcfg/inetcfg.c ) (16 diffs)

uspace/app/inet/inet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup inetcfg
+/** @addtogroup inet
  * @{
  */
@@ -35 +35 @@
  */
 
-#include <async.h>
 #include <errno.h>
+#include <inet/addr.h>
 #include <inet/inetcfg.h>
 #include <loc.h>
@@ -44 +44 @@
 #include <sys/types.h>
 
-#define NAME "inetcfg"
+#define NAME  "inet"
 
 static void print_syntax(void)
@@ -55 +55 @@
 }
 
-static int naddr_parse(const char *text, inet_naddr_t *naddr)
-{
-        unsigned long a[4], bits;
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '/')
-                return EINVAL;
-        ++cp;
-
-        bits = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        naddr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                naddr->ipv4 = (naddr->ipv4 << 8) | a[i];
-        }
-
-        if (bits > 31)
-                return EINVAL;
-
-        naddr->bits = bits;
-        return EOK;
-}
-
-static int addr_parse(const char *text, inet_addr_t *addr)
-{
-        unsigned long a[4];
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        addr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                addr->ipv4 = (addr->ipv4 << 8) | a[i];
-        }
-
-        return EOK;
-}
-
-static int naddr_format(inet_naddr_t *naddr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d/%d", naddr->ipv4 >> 24,
-            (naddr->ipv4 >> 16) & 0xff, (naddr->ipv4 >> 8) & 0xff,
-            naddr->ipv4 & 0xff, naddr->bits);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
-}
-
-static int addr_format(inet_addr_t *addr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24,
-            (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff,
-            addr->ipv4 & 0xff);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
-}
-
 static int addr_create_static(int argc, char *argv[])
 {
@@ -179 +88 @@
         }
 
-        rc = naddr_parse(addr_spec, &naddr);
+        rc = inet_naddr_parse(addr_spec, &naddr);
         if (rc != EOK) {
                 printf(NAME ": Invalid network address format '%s'.\n",
@@ -188 +97 @@
         rc = inetcfg_addr_create_static(aobj_name, &naddr, link_id, &addr_id);
         if (rc != EOK) {
-                printf(NAME ": Failed creating static address '%s' (%d)\n",
-                    aobj_name, rc);
+                printf(NAME ": Failed creating static address '%s' (%s)\n",
+                    aobj_name, str_error(rc));
                 return EIO;
         }
@@ -268 +177 @@
         route_name = argv[2];
 
-        rc = naddr_parse(dest_str, &dest);
+        rc = inet_naddr_parse(dest_str, &dest);
         if (rc != EOK) {
                 printf(NAME ": Invalid network address format '%s'.\n",
@@ -275 +184 @@
         }
 
-        rc = addr_parse(router_str, &router);
+        rc = inet_addr_parse(router_str, &router);
         if (rc != EOK) {
                 printf(NAME ": Invalid address format '%s'.\n", router_str);
@@ -346 +255 @@
 
         printf("Configured addresses:\n");
-
-        ainfo.name = linfo.name = astr = NULL;
+        if (count > 0)
+                printf("    [Addr/Width] [Link-Name] [Addr-Name] [Def-MTU]\n");
+        ainfo.name = NULL;
+        linfo.name = NULL;
+        astr = NULL;
 
         for (i = 0; i < count; i++) {
@@ -366 +278 @@
                 }
 
-                rc = naddr_format(&ainfo.naddr, &astr);
+                rc = inet_naddr_format(&ainfo.naddr, &astr);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -380 +292 @@
                 free(astr);
 
-                ainfo.name = linfo.name = astr = NULL;
+                ainfo.name = NULL;
+                linfo.name = NULL;
+                astr = NULL;
         }
 
@@ -416 +330 @@
 
         printf("Static routes:\n");
-
-        srinfo.name = dest_str = router_str = NULL;
+        if (count > 0)
+                printf("    [Dest/Width] [Router-Addr] [Route-Name]\n");
+
+        srinfo.name = NULL;
+        dest_str = NULL;
+        router_str = NULL;
 
         for (i = 0; i < count; i++) {
@@ -428 +346 @@
                 }
 
-                rc = naddr_format(&srinfo.dest, &dest_str);
+                rc = inet_naddr_format(&srinfo.dest, &dest_str);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -435 +353 @@
                 }
 
-                rc = addr_format(&srinfo.router, &router_str);
+                rc = inet_addr_format(&srinfo.router, &router_str);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -448 +366 @@
                 free(router_str);
 
-                router_str = srinfo.name = dest_str = NULL;
+                router_str = NULL;
+                srinfo.name = NULL;
+                dest_str = NULL;
         }