Changes in uspace/srv/net/tcp/test.c [a2e3ee6:69a93df7] in mainline

File:

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

uspace/srv/net/tcp/test.c

@@ -38 +38 @@
 #include <errno.h>
 #include <stdio.h>
-#include <fibril.h>
+#include <thread.h>
 #include <str.h>
 #include "tcp_type.h"
@@ -47 +47 @@
 #define RCV_BUF_SIZE 64
 
-static int test_srv(void *arg)
+static void test_srv(void *arg)
 {
         tcp_conn_t *conn;
@@ -57 +57 @@
 
         printf("test_srv()\n");
-        
-        inet_addr(&lsock.addr, 127, 0, 0, 1);
         lsock.port = 80;
-        
-        inet_addr(&fsock.addr, 127, 0, 0, 1);
+        lsock.addr.ipv4 = 0x7f000001;
         fsock.port = 1024;
-        
+        fsock.addr.ipv4 = 0x7f000001;
         printf("S: User open...\n");
         tcp_uc_open(&lsock, &fsock, ap_passive, 0, &conn);
@@ -87 +84 @@
 
         printf("test_srv() terminating\n");
-        return 0;
 }
 
-static int test_cli(void *arg)
+static void test_cli(void *arg)
 {
         tcp_conn_t *conn;
@@ -98 +94 @@
 
         printf("test_cli()\n");
-        
-        inet_addr(&lsock.addr, 127, 0, 0, 1);
+
         lsock.port = 1024;
-        
-        inet_addr(&fsock.addr, 127, 0, 0, 1);
+        lsock.addr.ipv4 = 0x7f000001;
         fsock.port = 80;
+        fsock.addr.ipv4 = 0x7f000001;
 
         async_usleep(1000*1000*3);
@@ -117 +112 @@
         printf("C: User close...\n");
         tcp_uc_close(conn);
-
-        return 0;
 }
 
 void tcp_test(void)
 {
-        fid_t srv_fid;
-        fid_t cli_fid;
+        thread_id_t srv_tid;
+        thread_id_t cli_tid;
+        int rc;
 
         printf("tcp_test()\n");
@@ -131 +125 @@
 
         if (0) {
-                srv_fid = fibril_create(test_srv, NULL);
-                if (srv_fid == 0) {
-                        printf("Failed to create server fibril.\n");
+                rc = thread_create(test_srv, NULL, "test_srv", &srv_tid);
+                if (rc != EOK) {
+                        printf("Failed to create server thread.\n");
                         return;
                 }
-
-                fibril_add_ready(srv_fid);
         }
 
         if (0) {
-                cli_fid = fibril_create(test_cli, NULL);
-                if (cli_fid == 0) {
-                        printf("Failed to create client fibril.\n");
+                rc = thread_create(test_cli, NULL, "test_cli", &cli_tid);
+                if (rc != EOK) {
+                        printf("Failed to create client thread.\n");
                         return;
                 }
-
-                fibril_add_ready(cli_fid);
         }
 }