Changes in uspace/app/inet/inet.c [b8b1adb1:bf9e6fc] in mainline

File:

• uspace/app/inet/inet.c (modified) (16 diffs)

uspace/app/inet/inet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 
 #include <errno.h>
-#include <inet/addr.h>
 #include <inet/inetcfg.h>
 #include <loc.h>
@@ -44 +43 @@
 #include <sys/types.h>
 
-#define NAME  "inet"
+#define NAME "inet"
 
 static void print_syntax(void)
@@ -55 +54 @@
 }
 
+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[])
 {
@@ -88 +178 @@
         }
 
-        rc = inet_naddr_parse(addr_spec, &naddr);
+        rc = naddr_parse(addr_spec, &naddr);
         if (rc != EOK) {
                 printf(NAME ": Invalid network address format '%s'.\n",
@@ -177 +267 @@
         route_name = argv[2];
 
-        rc = inet_naddr_parse(dest_str, &dest);
+        rc = naddr_parse(dest_str, &dest);
         if (rc != EOK) {
                 printf(NAME ": Invalid network address format '%s'.\n",
@@ -184 +274 @@
         }
 
-        rc = inet_addr_parse(router_str, &router);
+        rc = addr_parse(router_str, &router);
         if (rc != EOK) {
                 printf(NAME ": Invalid address format '%s'.\n", router_str);
@@ -257 +347 @@
         if (count > 0)
                 printf("    [Addr/Width] [Link-Name] [Addr-Name] [Def-MTU]\n");
-        ainfo.name = NULL;
-        linfo.name = NULL;
-        astr = NULL;
+        ainfo.name = linfo.name = astr = NULL;
 
         for (i = 0; i < count; i++) {
@@ -278 +366 @@
                 }
 
-                rc = inet_naddr_format(&ainfo.naddr, &astr);
+                rc = naddr_format(&ainfo.naddr, &astr);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -292 +380 @@
                 free(astr);
 
-                ainfo.name = NULL;
-                linfo.name = NULL;
-                astr = NULL;
+                ainfo.name = linfo.name = astr = NULL;
         }
 
@@ -312 +398 @@
 }
 
-static int link_list(void)
-{
-        sysarg_t *link_list;
-        inet_link_info_t linfo;
-
-        size_t count;
-        size_t i;
-        int rc;
-
-        rc = inetcfg_get_link_list(&link_list, &count);
-        if (rc != EOK) {
-                printf(NAME ": Failed getting link list.\n");
-                return rc;
-        }
-
-        printf("IP links:\n");
-        if (count > 0)
-                printf("    [Link-layer Address] [Link-Name] [Def-MTU]\n");
-
-        for (i = 0; i < count; i++) {
-                rc = inetcfg_link_get(link_list[i], &linfo);
-                if (rc != EOK) {
-                        printf("Failed getting properties of link %zu.\n",
-                            (size_t)link_list[i]);
-                        continue;
-                }
-
-                printf("    %02x:%02x:%02x:%02x:%02x:%02x %s %zu\n",
-                    linfo.mac_addr[0], linfo.mac_addr[1],
-                    linfo.mac_addr[2], linfo.mac_addr[3],
-                    linfo.mac_addr[4], linfo.mac_addr[5],
-                    linfo.name, linfo.def_mtu);
-
-                free(linfo.name);
-
-                linfo.name = NULL;
-        }
-
-        if (count == 0)
-                printf("    None\n");
-
-        free(link_list);
-
-        return EOK;
-}
-
 static int sroute_list(void)
 {
@@ -379 +419 @@
                 printf("    [Dest/Width] [Router-Addr] [Route-Name]\n");
 
-        srinfo.name = NULL;
-        dest_str = NULL;
-        router_str = NULL;
+        srinfo.name = dest_str = router_str = NULL;
 
         for (i = 0; i < count; i++) {
@@ -392 +430 @@
                 }
 
-                rc = inet_naddr_format(&srinfo.dest, &dest_str);
+                rc = naddr_format(&srinfo.dest, &dest_str);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -399 +437 @@
                 }
 
-                rc = inet_addr_format(&srinfo.router, &router_str);
+                rc = addr_format(&srinfo.router, &router_str);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -412 +450 @@
                 free(router_str);
 
-                router_str = NULL;
-                srinfo.name = NULL;
-                dest_str = NULL;
+                router_str = srinfo.name = dest_str = NULL;
         }
 
@@ -448 +484 @@
                         return 1;
                 rc = sroute_list();
-                if (rc != EOK)
-                        return 1;
-                rc = link_list();
                 if (rc != EOK)
                         return 1;