Changeset bf9e6fc in mainline for uspace/srv/net/inetsrv/inet_link.c

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.

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (2 diffs)

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;