Changeset 192565b in mainline for uspace/srv/net/inetsrv/inet_link.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/inet_link.c (modified) (2 diffs)

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;