Changeset fa101c4 in mainline for uspace/srv

Timestamp:

2012-03-08T22:30:19Z (14 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).

Location:

uspace/srv/inet

Files:

• addrobj.c (modified) (3 diffs)
• addrobj.h (modified) (1 diff)
• inetcfg.c (modified) (4 diffs)

uspace/srv/inet/addrobj.c

@@ -41 +41 @@
 #include <ipc/loc.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include "addrobj.h"
@@ -119 +120 @@
                         fibril_mutex_unlock(&addr_list_lock);
                         log_msg(LVL_DEBUG, "inet_addrobj_find: found %p",
-                            addr);
+                            naddr);
                         return naddr;
                 }
@@ -125 +126 @@
 
         log_msg(LVL_DEBUG, "inet_addrobj_find: Not found");
+        fibril_mutex_unlock(&addr_list_lock);
+
+        return NULL;
+}
+
+/** Find address object on a link, with a specific name.
+ *
+ * @param name  Address object name
+ * @param ilink Inet link
+ * @return      Address object
+ */
+inet_addrobj_t *inet_addrobj_find_by_name(const char *name, inet_link_t *ilink)
+{
+        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name('%s', '%s')",
+            name, ilink->svc_name);
+
+        fibril_mutex_lock(&addr_list_lock);
+
+        list_foreach(addr_list, link) {
+                inet_addrobj_t *naddr = list_get_instance(link,
+                    inet_addrobj_t, addr_list);
+
+                if (naddr->ilink == ilink && str_cmp(naddr->name, name) == 0) {
+                        fibril_mutex_unlock(&addr_list_lock);
+                        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name: found %p",
+                            naddr);
+                        return naddr;
+                }
+        }
+
+        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name: Not found");
         fibril_mutex_unlock(&addr_list_lock);
 

uspace/srv/inet/addrobj.h

@@ -53 +53 @@
 extern void inet_addrobj_remove(inet_addrobj_t *);
 extern inet_addrobj_t *inet_addrobj_find(inet_addr_t *, inet_addrobj_find_t);
+extern inet_addrobj_t *inet_addrobj_find_by_name(const char *, inet_link_t *);
 extern inet_addrobj_t *inet_addrobj_get_by_id(sysarg_t);
 extern int inet_addrobj_send_dgram(inet_addrobj_t *, inet_dgram_t *,

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);