Changeset 80cd7cd in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2011-01-13T20:58:24Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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/tcp.c (modified) (13 diffs)

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

@@ -36 +36 @@
  */
 
-#include "tcp.h"
-#include "tcp_header.h"
-#include "tcp_module.h"
-
 #include <assert.h>
 #include <async.h>
@@ -72 +68 @@
 #include <socket_core.h>
 #include <tl_common.h>
-#include <tl_local.h>
-#include <tl_interface.h>
+#include <tl_remote.h>
+#include <tl_skel.h>
+
+#include "tcp.h"
+#include "tcp_header.h"
 
 /** TCP module name. */
-#define NAME    "TCP protocol"
+#define NAME  "tcp"
 
 /** The TCP window default value. */
@@ -154 +153 @@
 
         /** Port map key. */
-        char *key;
+        uint8_t *key;
 
         /** Port map key length. */
@@ -220 +219 @@
 /** TCP global data. */
 tcp_globals_t tcp_globals;
-
-/** Initializes the TCP module.
- *
- * @param[in] client_connection The client connection processing function. The
- *                      module skeleton propagates its own one.
- * @return              EOK on success.
- * @return              ENOMEM if there is not enough memory left.
- */
-int tcp_initialize(async_client_conn_t client_connection)
-{
-        int rc;
-
-        assert(client_connection);
-
-        fibril_rwlock_initialize(&tcp_globals.lock);
-        fibril_rwlock_write_lock(&tcp_globals.lock);
-
-        tcp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP,
-            ICMP_CONNECT_TIMEOUT);
-        tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP,
-            SERVICE_TCP, client_connection);
-        if (tcp_globals.ip_phone < 0) {
-                fibril_rwlock_write_unlock(&tcp_globals.lock);
-                return tcp_globals.ip_phone;
-        }
-        
-        rc = socket_ports_initialize(&tcp_globals.sockets);
-        if (rc != EOK)
-                goto out;
-
-        rc = packet_dimensions_initialize(&tcp_globals.dimensions);
-        if (rc != EOK) {
-                socket_ports_destroy(&tcp_globals.sockets);
-                goto out;
-        }
-
-        tcp_globals.last_used_port = TCP_FREE_PORTS_START - 1;
-
-out:
-        fibril_rwlock_write_unlock(&tcp_globals.lock);
-        return rc;
-}
 
 int tcp_received_msg(device_id_t device_id, packet_t *packet,
@@ -358 +315 @@
         /* Find the destination socket */
         socket = socket_port_find(&tcp_globals.sockets,
-            ntohs(header->destination_port), (const char *) src, addrlen);
+            ntohs(header->destination_port), (uint8_t *) src, addrlen);
         if (!socket) {
                 /* Find the listening destination socket */
                 socket = socket_port_find(&tcp_globals.sockets,
-                    ntohs(header->destination_port), SOCKET_MAP_KEY_LISTENING,
-                    0);
+                    ntohs(header->destination_port),
+                    (uint8_t *) SOCKET_MAP_KEY_LISTENING, 0);
         }
 
@@ -998 +955 @@
         /* Find the destination socket */
         listening_socket = socket_port_find(&tcp_globals.sockets,
-            listening_port, SOCKET_MAP_KEY_LISTENING, 0);
+            listening_port, (uint8_t *) SOCKET_MAP_KEY_LISTENING, 0);
         if (!listening_socket ||
             (listening_socket->socket_id != listening_socket_id)) {
@@ -1022 +979 @@
 
         rc = socket_port_add(&tcp_globals.sockets, listening_port, socket,
-            (const char *) socket_data->addr, socket_data->addrlen);
+            (uint8_t *) socket_data->addr, socket_data->addrlen);
         assert(socket == socket_port_find(&tcp_globals.sockets, listening_port,
-            (const char *) socket_data->addr, socket_data->addrlen));
+            (uint8_t *) socket_data->addr, socket_data->addrlen));
 
 //      rc = socket_bind_free_port(&tcp_globals.sockets, socket,
@@ -1260 +1217 @@
  * @see IS_NET_TCP_MESSAGE()
  */
-int
-tcp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
-{
-        packet_t *packet;
-        int rc;
-
+int tl_module_message(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, size_t *answer_count)
+{
         assert(call);
         assert(answer);
@@ -1273 +1226 @@
         *answer_count = 0;
         switch (IPC_GET_IMETHOD(*call)) {
-        case NET_TL_RECEIVED:
-//              fibril_rwlock_read_lock(&tcp_globals.lock);
-                rc = packet_translate_remote(tcp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
-                if (rc != EOK) {
-//                      fibril_rwlock_read_unlock(&tcp_globals.lock);
-                        return rc;
-                }
-                rc = tcp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_TCP,
-                    IPC_GET_ERROR(call));
-//              fibril_rwlock_read_unlock(&tcp_globals.lock);
-                return rc;
         case IPC_M_CONNECT_TO_ME:
                 return tcp_process_client_messages(callid, *call);
@@ -1323 +1264 @@
         bool keep_on_going = true;
         socket_cores_t local_sockets;
-        int app_phone = IPC_GET_PHONE(&call);
+        int app_phone = IPC_GET_PHONE(call);
         struct sockaddr *addr;
         int socket_id;
@@ -1330 +1271 @@
         fibril_rwlock_t lock;
         ipc_call_t answer;
-        int answer_count;
+        size_t answer_count;
         tcp_socket_data_t *socket_data;
         socket_core_t *socket;
@@ -2109 +2050 @@
 
         /* Copy the key */
-        operation_timeout->key = ((char *) operation_timeout) +
+        operation_timeout->key = ((uint8_t *) operation_timeout) +
             sizeof(*operation_timeout);
         operation_timeout->key_length = socket->key_length;
@@ -2486 +2427 @@
 }
 
-/** Default thread for new connections.
+/** Process IPC messages from the IP module
  *
- * @param[in] iid       The initial message identifier.
- * @param[in] icall     The initial message call structure.
+ * @param[in]     iid   Message identifier.
+ * @param[in,out] icall Message parameters.
  *
  */
-static void tl_client_connection(ipc_callid_t iid, ipc_call_t * icall)
-{
-        /*
-         * Accept the connection
-         *  - Answer the first IPC_M_CONNECT_ME_TO call.
-         */
-        ipc_answer_0(iid, EOK);
-
+static void tcp_receiver(ipc_callid_t iid, ipc_call_t *icall)
+{
+        packet_t *packet;
+        int rc;
+        
         while (true) {
-                ipc_call_t answer;
-                int answer_count;
-
-                /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
-
-                /* Fetch the next message */
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-
-                /* Process the message */
-                int res = tl_module_message_standalone(callid, &call, &answer,
-                    &answer_count);
-
-                /*
-                 * End if told to either by the message or the processing
-                 * result.
-                 */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
-                        return;
-
-                /*
-                 * Answer the message 
-                 */
-                answer_call(callid, res, &answer, answer_count);
-        }
-}
-
-/** Starts the module.
+                switch (IPC_GET_IMETHOD(*icall)) {
+                case NET_TL_RECEIVED:
+                        rc = packet_translate_remote(tcp_globals.net_phone, &packet,
+                            IPC_GET_PACKET(*icall));
+                        if (rc == EOK)
+                                rc = tcp_received_msg(IPC_GET_DEVICE(*icall), packet,
+                                    SERVICE_TCP, IPC_GET_ERROR(*icall));
+                        
+                        ipc_answer_0(iid, (sysarg_t) rc);
+                        break;
+                default:
+                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
+                }
+                
+                iid = async_get_call(icall);
+        }
+}
+
+/** Initialize the TCP module.
  *
- * @return              EOK on success.
- * @return              Other error codes as defined for each specific module
- *                      start function.
+ * @param[in] net_phone Network module phone.
+ *
+ * @return EOK on success.
+ * @return ENOMEM if there is not enough memory left.
+ *
  */
-int
-main(int argc, char *argv[])
-{
-        int rc;
-
-        rc = tl_module_start_standalone(tl_client_connection);
+int tl_initialize(int net_phone)
+{
+        fibril_rwlock_initialize(&tcp_globals.lock);
+        fibril_rwlock_write_lock(&tcp_globals.lock);
+        
+        tcp_globals.net_phone = net_phone;
+        
+        tcp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP,
+            ICMP_CONNECT_TIMEOUT);
+        tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP,
+            SERVICE_TCP, tcp_receiver);
+        if (tcp_globals.ip_phone < 0) {
+                fibril_rwlock_write_unlock(&tcp_globals.lock);
+                return tcp_globals.ip_phone;
+        }
+        
+        int rc = socket_ports_initialize(&tcp_globals.sockets);
+        if (rc != EOK)
+                goto out;
+
+        rc = packet_dimensions_initialize(&tcp_globals.dimensions);
+        if (rc != EOK) {
+                socket_ports_destroy(&tcp_globals.sockets);
+                goto out;
+        }
+
+        tcp_globals.last_used_port = TCP_FREE_PORTS_START - 1;
+
+out:
+        fibril_rwlock_write_unlock(&tcp_globals.lock);
         return rc;
+}
+
+int main(int argc, char *argv[])
+{
+        return tl_module_start(SERVICE_TCP);
 }