Changeset 048cd69 in mainline for uspace/srv/net/tcp/test.c

Timestamp:

2015-06-07T15:41:04Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

204ba47

Parents:

4d11204 (diff), c3f7d37 (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 network transport layer API rewrite.

File:

• uspace/srv/net/tcp/test.c (modified) (4 diffs)

uspace/srv/net/tcp/test.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -50 +50 @@
 {
         tcp_conn_t *conn;
-        tcp_sock_t lsock;
-        tcp_sock_t fsock;
+        inet_ep2_t epp;
         char rcv_buf[RCV_BUF_SIZE + 1];
         size_t rcvd;
@@ -57 +56 @@
 
         printf("test_srv()\n");
-        
-        inet_addr(&lsock.addr, 127, 0, 0, 1);
-        lsock.port = 80;
-        
-        inet_addr(&fsock.addr, 127, 0, 0, 1);
-        fsock.port = 1024;
-        
+
+        inet_ep2_init(&epp);
+
+        inet_addr(&epp.local.addr, 127, 0, 0, 1);
+        epp.local.port = 80;
+
+        inet_addr(&epp.remote.addr, 127, 0, 0, 1);
+        epp.remote.port = 1024;
+
         printf("S: User open...\n");
-        tcp_uc_open(&lsock, &fsock, ap_passive, 0, &conn);
+        tcp_uc_open(&epp, ap_passive, 0, &conn);
         conn->name = (char *) "S";
 
@@ -93 +94 @@
 {
         tcp_conn_t *conn;
-        tcp_sock_t lsock;
-        tcp_sock_t fsock;
+        inet_ep2_t epp;
         const char *msg = "Hello World!";
 
         printf("test_cli()\n");
-        
-        inet_addr(&lsock.addr, 127, 0, 0, 1);
-        lsock.port = 1024;
-        
-        inet_addr(&fsock.addr, 127, 0, 0, 1);
-        fsock.port = 80;
+
+        inet_ep2_init(&epp);
+
+        inet_addr(&epp.local.addr, 127, 0, 0, 1);
+        epp.local.port = 1024;
+
+        inet_addr(&epp.remote.addr, 127, 0, 0, 1);
+        epp.remote.port = 80;
 
         async_usleep(1000*1000*3);
         printf("C: User open...\n");
-        tcp_uc_open(&lsock, &fsock, ap_active, 0, &conn);
+        tcp_uc_open(&epp, ap_active, 0, &conn);
         conn->name = (char *) "C";