Changeset 7943c43 in mainline for uspace/srv/net/tl/tcp/test.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/tl/tcp/test.c (modified) (2 diffs)

uspace/srv/net/tl/tcp/test.c

@@ -62 +62 @@
         fsock.addr.ipv4 = 0x7f000001;
         printf("S: User open...\n");
-        tcp_uc_open(&lsock, &fsock, ap_passive, &conn);
+        tcp_uc_open(&lsock, &fsock, ap_passive, 0, &conn);
         conn->name = (char *) "S";
 
@@ -102 +102 @@
         async_usleep(1000*1000*3);
         printf("C: User open...\n");
-        tcp_uc_open(&lsock, &fsock, ap_active, &conn);
+        tcp_uc_open(&lsock, &fsock, ap_active, 0, &conn);
         conn->name = (char *) "C";