Changeset 04cd242 in mainline

Timestamp:

2011-11-27T18:20:58Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a4ee3ab2

Parents:

762b48a

Message:

Implement socket provider API in tcp module (active side).

Location:

uspace

Files:

• lib/c/include/errno.h (modified) (1 diff)
• srv/net/tl/tcp/Makefile (modified) (1 diff)
• srv/net/tl/tcp/sock.c (added)
• srv/net/tl/tcp/sock.h (added)
• srv/net/tl/tcp/tcp.c (modified) (3 diffs)
• srv/net/tl/tcp/tcp.h (modified) (1 diff)
• srv/net/tl/tcp/tcp_type.h (modified) (2 diffs)
• srv/net/tl/tcp/test.c (modified) (1 diff)

uspace/lib/c/include/errno.h

@@ -96 +96 @@
 #define ENOTCONN  (-10057)
 
+#define ECONNREFUSED  (-10058)
+
 /** The requested operation was not performed. Try again later. */
 #define EAGAIN  (-11002)

uspace/srv/net/tl/tcp/Makefile

@@ -40 +40 @@
         segment.c \
         seq_no.c \
+        sock.c \
         tcp.c \
         test.c \

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

@@ -55 +55 @@
 #include "pdu.h"
 #include "rqueue.h"
+#include "sock.h"
 #include "std.h"
 #include "tcp.h"
@@ -61 +62 @@
 #define NAME       "tcp"
 
-static async_sess_t *net_sess;
+async_sess_t *net_sess;
 static async_sess_t *icmp_sess;
 static async_sess_t *ip_sess;
-static packet_dimensions_t pkt_dims;
+packet_dimensions_t pkt_dims;
 
 static void tcp_received_pdu(tcp_pdu_t *pdu);
@@ -354 +355 @@
     size_t *answer_count)
 {
+        async_sess_t *callback;
+
         log_msg(LVL_DEBUG, "tl_message()");
+
+        *answer_count = 0;
+        callback = async_callback_receive_start(EXCHANGE_SERIALIZE, call);
+        if (callback)
+                return tcp_sock_connection(callback, callid, *call);
+
         return ENOTSUP;
 }

uspace/srv/net/tl/tcp/tcp.h

@@ -36 +36 @@
 #define TCP_H
 
+#include <async.h>
+#include <packet_remote.h>
 #include "tcp_type.h"
 
+extern async_sess_t *net_sess;
 extern void tcp_transmit_pdu(tcp_pdu_t *);
 

uspace/srv/net/tl/tcp/tcp_type.h

@@ -37 +37 @@
 
 #include <adt/list.h>
+#include <async.h>
 #include <bool.h>
 #include <fibril_synch.h>
+#include <socket_core.h>
 #include <sys/types.h>
 
@@ -288 +290 @@
 } tcp_pdu_t;
 
+typedef struct {
+        async_sess_t *sess;
+        socket_cores_t sockets;
+} tcp_client_t;
+
+typedef struct {
+        tcp_client_t *client;
+        tcp_conn_t *conn;
+} tcp_sockdata_t;
+
 #endif
 

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

@@ -124 +124 @@
         }
 
-        rc = thread_create(test_cli, NULL, "test_cli", &cli_tid);
-        if (rc != EOK) {
-                printf("Failed to create client thread.\n");
-                return;
+        if (0) {
+                rc = thread_create(test_cli, NULL, "test_cli", &cli_tid);
+                if (rc != EOK) {
+                        printf("Failed to create client thread.\n");
+                        return;
+                }
         }
 }