Changeset 0e94b979 in mainline for uspace/app/inetcfg/inetcfg.c

Timestamp:

2012-03-08T21:12:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

291c792

Parents:

a88a6eac

Message:

Listing configured addresses.

File:

• uspace/app/inetcfg/inetcfg.c (modified) (5 diffs)

uspace/app/inetcfg/inetcfg.c

@@ -40 +40 @@
 #include <loc.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <str_error.h>
 #include <sys/types.h>
@@ -86 +87 @@
 }
 
+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_create_static(int argc, char *argv[])
 {
@@ -129 +144 @@
                 printf(NAME ": Failed creating static address '%s' (%d)\n",
                     "v4s", rc);
-                return 1;
-        }
+                return EIO;
+        }
+
+        return EOK;
+}
+
+static int addr_list(void)
+{
+        sysarg_t *addr_list;
+        inet_addr_info_t ainfo;
+        inet_link_info_t linfo;
+
+        size_t count;
+        size_t i;
+        int rc;
+        char *astr;
+
+        rc = inetcfg_get_addr_list(&addr_list, &count);
+        if (rc != EOK) {
+                printf(NAME ": Failed getting address list.\n");
+                return rc;
+        }
+
+        for (i = 0; i < count; i++) {
+                rc = inetcfg_addr_get(addr_list[i], &ainfo);
+                if (rc != EOK) {
+                        printf("Failed getting properties of address %zu.\n",
+                            (size_t)addr_list[i]);
+                        continue;
+                }
+
+                rc = inetcfg_link_get(ainfo.ilink, &linfo);
+                if (rc != EOK) {
+                        printf("Failed getting properties of link %zu.\n",
+                            (size_t)ainfo.ilink);
+                        continue;
+                }
+
+                rc = naddr_format(&ainfo.naddr, &astr);
+                if (rc != EOK) {
+                        printf("Memory allocation failed.\n");
+                        goto out;
+                }
+
+                printf("%s %s %s\n", astr, linfo.name,
+                    ainfo.name);
+
+                free(astr);
+                free(ainfo.name);
+                free(linfo.name);
+        }
+out:
+        free(addr_list);
 
         return EOK;
@@ -138 +204 @@
 {
         int rc;
-
-        if (argc < 2) {
-                printf(NAME ": Missing argument.\n");
-                print_syntax();
-                return 1;
-        }
 
         rc = inetcfg_init();
@@ -150 +210 @@
                     rc);
                 return 1;
+        }
+
+        if (argc < 2) {
+                rc = addr_list();
+                if (rc != EOK)
+                        return 1;
+                return 0;
         }