Changeset 192565b in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2013-05-27T13:18:13Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (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/inetsrv.c (modified) (1 diff)

uspace/srv/net/inetsrv/inetsrv.c

@@ -98 +98 @@
         }
         
-        rc = inet_link_discovery_start();
+        inet_sroute_t *sroute = inet_sroute_new();
+        if (sroute == NULL) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating default route (%d).", rc);
+                return ENOMEM;
+        }
+
+        sroute->dest.ipv4 = 0;
+        sroute->dest.bits = 0;
+        sroute->router.ipv4 = (10 << 24) | (0 << 16) | (2 << 8) | 2;
+        sroute->name = str_dup("default");
+        inet_sroute_add(sroute);
+
+        rc = inet_link_discovery_start();
         if (rc != EOK)
                 return EEXIST;