Changeset 98abd40 in mainline for uspace/srv/net/tcp/test.c

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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/tcp/test.c (modified) (2 diffs)

uspace/srv/net/tcp/test.c

@@ -57 +57 @@
 
         printf("test_srv()\n");
+        
+        inet_addr(&lsock.addr, 127, 0, 0, 1);
         lsock.port = 80;
-        lsock.addr.ipv4 = 0x7f000001;
+        
+        inet_addr(&fsock.addr, 127, 0, 0, 1);
         fsock.port = 1024;
-        fsock.addr.ipv4 = 0x7f000001;
+        
         printf("S: User open...\n");
         tcp_uc_open(&lsock, &fsock, ap_passive, 0, &conn);
@@ -95 +98 @@
 
         printf("test_cli()\n");
-
+        
+        inet_addr(&lsock.addr, 127, 0, 0, 1);
         lsock.port = 1024;
-        lsock.addr.ipv4 = 0x7f000001;
+        
+        inet_addr(&fsock.addr, 127, 0, 0, 1);
         fsock.port = 80;
-        fsock.addr.ipv4 = 0x7f000001;
 
         async_usleep(1000*1000*3);