Changeset bf9e6fc in mainline

Timestamp:

2012-05-13T10:01:08Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ce1836e

Parents:

f8dbc12

Message:

Detect duplicate address names.

Location:

uspace

Files:

• app/inet/inet.c (modified) (1 diff)
• srv/net/inetsrv/addrobj.c (modified) (5 diffs)
• srv/net/inetsrv/addrobj.h (modified) (1 diff)
• srv/net/inetsrv/inet_link.c (modified) (2 diffs)
• srv/net/inetsrv/inetcfg.c (modified) (1 diff)

uspace/app/inet/inet.c

@@ -187 +187 @@
         rc = inetcfg_addr_create_static(aobj_name, &naddr, link_id, &addr_id);
         if (rc != EOK) {
-                printf(NAME ": Failed creating static address '%s' (%d)\n",
-                    aobj_name, rc);
+                printf(NAME ": Failed creating static address '%s' (%s)\n",
+                    aobj_name, str_error(rc));
                 return EIO;
         }

uspace/srv/net/inetsrv/addrobj.c

@@ -48 +48 @@
 #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);
 static LIST_INITIALIZE(addr_list);
@@ -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;
 }
 

uspace/srv/net/inetsrv/addrobj.h

@@ -50 +50 @@
 extern inet_addrobj_t *inet_addrobj_new(void);
 extern void inet_addrobj_delete(inet_addrobj_t *);
-extern void inet_addrobj_add(inet_addrobj_t *);
+extern int inet_addrobj_add(inet_addrobj_t *);
 extern void inet_addrobj_remove(inet_addrobj_t *);
 extern inet_addrobj_t *inet_addrobj_find(inet_addr_t *, inet_addrobj_find_t);

uspace/srv/net/inetsrv/inet_link.c

@@ -207 +207 @@
         addr->ilink = ilink;
         addr->name = str_dup("v4a");
-        inet_addrobj_add(addr);
+        rc = inet_addrobj_add(addr);
+        if (rc != EOK) {
+                log_msg(LVL_ERROR, "Failed setting IP address on internet link.");
+                inet_addrobj_delete(addr);
+                /* XXX Roll back */
+                return rc;
+        }
 
         iaddr.ipv4 = addr->naddr.ipv4;
@@ -213 +219 @@
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed setting IP address on internet link.");
+                inet_addrobj_remove(addr);
+                inet_addrobj_delete(addr);
                 /* XXX Roll back */
                 return rc;

uspace/srv/net/inetsrv/inetcfg.c

@@ -75 +75 @@
         addr->ilink = ilink;
         addr->name = str_dup(name);
-        inet_addrobj_add(addr);
+        rc = inet_addrobj_add(addr);
+        if (rc != EOK) {
+                log_msg(LVL_DEBUG, "Duplicate address name '%s'.", addr->name);
+                inet_addrobj_delete(addr);
+                return rc;
+        }
 
         iaddr.ipv4 = addr->naddr.ipv4;