Changeset 8ad5470 in mainline for uspace/srv/net/inetsrv/inetcfg.c

Timestamp:

2012-05-24T15:30:53Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

fa3704d

Parents:

15b794d (diff), df3f85f (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 with mainline

File:

• uspace/srv/net/inetsrv/inetcfg.c (moved) (moved from uspace/srv/net/inet/inetcfg.c ) (2 diffs)

uspace/srv/net/inetsrv/inetcfg.c

@@ -46 +46 @@
 
 #include "addrobj.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_link.h"
 #include "inetcfg.h"
@@ -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;