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

Timestamp:

2012-06-29T15:31:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/inet_link.c (moved) (moved from uspace/srv/net/inet/inet_link.c ) (3 diffs)

uspace/srv/net/inetsrv/inet_link.c

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