Changeset c4b0317 in mainline for uspace/srv/net/inetsrv/addrobj.c

Timestamp:

2012-05-18T08:14:19Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67435b1

Parents:

8f6bffdd (diff), 3e67ab1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/net/inetsrv/addrobj.c (moved) (moved from uspace/srv/net/inet/addrobj.c ) (5 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -44 +44 @@
 
 #include "addrobj.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_link.h"
 #include "inet_util.h"
+
+static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *, inet_link_t *);
 
 static FIBRIL_MUTEX_INITIALIZE(addr_list_lock);
@@ -77 +79 @@
 }
 
-void inet_addrobj_add(inet_addrobj_t *addr)
-{
-        fibril_mutex_lock(&addr_list_lock);
+int inet_addrobj_add(inet_addrobj_t *addr)
+{
+        inet_addrobj_t *aobj;
+
+        fibril_mutex_lock(&addr_list_lock);
+        aobj = inet_addrobj_find_by_name_locked(addr->name, addr->ilink);
+        if (aobj != NULL) {
+                /* Duplicate address name */
+                fibril_mutex_unlock(&addr_list_lock);
+                return EEXISTS;
+        }
+
         list_append(&addr->addr_list, &addr_list);
         fibril_mutex_unlock(&addr_list_lock);
+
+        return EOK;
 }
 
@@ -130 +143 @@
  * @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')",
+static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *name, inet_link_t *ilink)
+{
+        assert(fibril_mutex_is_locked(&addr_list_lock));
+
+        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked('%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,
@@ -142 +155 @@
 
                 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",
+                        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p",
                             naddr);
                         return naddr;
@@ -149 +161 @@
         }
 
-        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name: Not found");
-        fibril_mutex_unlock(&addr_list_lock);
+        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked: Not found");
 
         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)
+{
+        inet_addrobj_t *aobj;
+
+        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name('%s', '%s')",
+            name, ilink->svc_name);
+
+        fibril_mutex_lock(&addr_list_lock);
+        aobj = inet_addrobj_find_by_name_locked(name, ilink);
+        fibril_mutex_unlock(&addr_list_lock);
+
+        return aobj;
 }