Changeset fa101c4 in mainline for uspace/app/inetcfg/inetcfg.c

Timestamp:

2012-03-08T22:30:19Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

637a3b4

Parents:

291c792

Message:

Address deletion (needs better synchronization).

File:

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

uspace/app/inetcfg/inetcfg.c

@@ -48 +48 @@
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " create <addr>/<width> <link-name> <addr-name>\n");
+        printf("syntax:\n");
+        printf("\t" NAME " create <addr>/<width> <link-name> <addr-name>\n");
+        printf("\t" NAME " delete <link-name> <addr-name>\n");
 }
 
@@ -143 +145 @@
         if (rc != EOK) {
                 printf(NAME ": Failed creating static address '%s' (%d)\n",
-                    "v4s", rc);
+                    aobj_name, rc);
+                return EIO;
+        }
+
+        return EOK;
+}
+
+static int addr_delete(int argc, char *argv[])
+{
+        char *aobj_name;
+        char *link_name;
+        sysarg_t link_id;
+        sysarg_t addr_id;
+        int rc;
+
+        if (argc < 2) {
+                printf(NAME ": Missing arguments.\n");
+                print_syntax();
+                return EINVAL;
+        }
+
+        if (argc > 2) {
+                printf(NAME ": Too many arguments.\n");
+                print_syntax();
+                return EINVAL;
+        }
+
+        link_name = argv[0];
+        aobj_name = argv[1];
+
+        rc = loc_service_get_id(link_name, &link_id, 0);
+        if (rc != EOK) {
+                printf(NAME ": Service '%s' not found (%d).\n", link_name, rc);
+                return ENOENT;
+        }
+
+        rc = inetcfg_addr_get_id(aobj_name, link_id, &addr_id);
+        if (rc != EOK) {
+                printf(NAME ": Address '%s' not found (%d).\n", aobj_name, rc);
+                return ENOENT;
+        }
+
+        rc = inetcfg_addr_delete(addr_id);
+        if (rc != EOK) {
+                printf(NAME ": Failed deleting address '%s' (%d)\n", aobj_name,
+                    rc);
                 return EIO;
         }
@@ -223 +270 @@
                 if (rc != EOK)
                         return 1;
+        } else if (str_cmp(argv[1], "delete") == 0) {
+                rc = addr_delete(argc - 2, argv + 2);
+                if (rc != EOK)
+                        return 1;
         } else {
                 printf(NAME ": Unknown command '%s'.\n", argv[1]);