Changeset 4a5a18be in mainline

Timestamp:

2013-05-23T17:11:10Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c90aed4

Parents:

6e8ed225

Message:

use default IP address 10.0.2.15 and default gateway 10.0.2.2
this should be convenient for the majority of people running HelenOS in QEMU

Location:

uspace/srv/net/inetsrv

Files:

• inet_link.c (modified) (2 diffs)
• inetsrv.c (modified) (1 diff)

uspace/srv/net/inetsrv/inet_link.c

@@ -196 +196 @@
 
         static int first = 1;
-        /* XXX For testing: set static IP address 192.168.0.4/24 */
+        /* XXX For testing: set static IP address 10.0.2.15/24 */
         addr = inet_addrobj_new();
         if (first) {
@@ -202 +202 @@
                 first = 0;
         } else {
-                addr->naddr.ipv4 = (192 << 24) + (168 << 16) + (0 << 8) + 4;
+                addr->naddr.ipv4 = (10 << 24) + (0 << 16) + (2 << 8) + 15;
         }
         addr->naddr.bits = 24;

uspace/srv/net/inetsrv/inetsrv.c

@@ -106 +106 @@
         sroute->dest.ipv4 = 0;
         sroute->dest.bits = 0;
-        sroute->router.ipv4 = (192 << 24) | (168 << 16) | (0 << 8) | 1;
+        sroute->router.ipv4 = (10 << 24) | (0 << 16) | (2 << 8) | 2;
         sroute->name = str_dup("default");
         inet_sroute_add(sroute);