Changeset fa101c4 in mainline for uspace/srv/inet/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/srv/inet/inetcfg.c (modified) (4 diffs)

uspace/srv/inet/inetcfg.c

@@ -85 +85 @@
 static int inetcfg_addr_delete(sysarg_t addr_id)
 {
-        return ENOTSUP;
+        inet_addrobj_t *addr;
+
+        addr = inet_addrobj_get_by_id(addr_id);
+        if (addr == NULL)
+                return ENOENT;
+
+        inet_addrobj_remove(addr);
+        inet_addrobj_delete(addr);
+
+        return EOK;
 }
 
@@ -100 +109 @@
         ainfo->name = str_dup(addr->name);
 
+        return EOK;
+}
+
+static int inetcfg_addr_get_id(char *name, sysarg_t link_id, sysarg_t *addr_id)
+{
+        inet_link_t *ilink;
+        inet_addrobj_t *addr;
+
+        ilink = inet_link_get_by_id(link_id);
+        if (ilink == NULL) {
+                log_msg(LVL_DEBUG, "Link %zu not found.", (size_t) link_id);
+                return ENOENT;
+        }
+
+        addr = inet_addrobj_find_by_name(name, ilink);
+        if (addr == NULL) {
+                log_msg(LVL_DEBUG, "Address '%s' not found.", name);
+                return ENOENT;
+        }
+
+        *addr_id = addr->id;
         return EOK;
 }
@@ -202 +232 @@
         async_answer_3(callid, retval, ainfo.naddr.ipv4, ainfo.naddr.bits,
             ainfo.ilink);
+}
+
+static void inetcfg_addr_get_id_srv(ipc_callid_t callid, ipc_call_t *call)
+{
+        char *name;
+        sysarg_t link_id;
+        sysarg_t addr_id;
+        int rc;
+
+        log_msg(LVL_DEBUG, "inetcfg_addr_get_id_srv()");
+
+        link_id = IPC_GET_ARG1(*call);
+
+        rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN,
+            0, NULL);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        addr_id = 0;
+        rc = inetcfg_addr_get_id(name, link_id, &addr_id);
+        free(name);
+        async_answer_1(callid, rc, addr_id);
 }
 
@@ -333 +387 @@
                         inetcfg_addr_get_srv(callid, &call);
                         break;
+                case INETCFG_ADDR_GET_ID:
+                        inetcfg_addr_get_id_srv(callid, &call);
+                        break;
                 case INETCFG_GET_ADDR_LIST:
                         inetcfg_get_addr_list_srv(callid, &call);