Changes in uspace/srv/net/tl/tcp/tcp.c [86f6121:774e6d1a] in mainline

File:

• uspace/srv/net/tl/tcp/tcp.c (modified) (10 diffs)

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

@@ -154 +154 @@
 
         /** Port map key. */
-        char *key;
+        uint8_t *key;
 
         /** Port map key length. */
@@ -358 +358 @@
         /* 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 +998 @@
         /* 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 +1022 @@
 
         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,
@@ -1262 +1262 @@
 int
 tcp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *answer_count)
 {
         packet_t *packet;
@@ -1276 +1276 @@
 //              fibril_rwlock_read_lock(&tcp_globals.lock);
                 rc = packet_translate_remote(tcp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    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));
+                rc = tcp_received_msg(IPC_GET_DEVICE(*call), packet, SERVICE_TCP,
+                    IPC_GET_ERROR(*call));
 //              fibril_rwlock_read_unlock(&tcp_globals.lock);
                 return rc;
@@ -1323 +1323 @@
         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 +1330 @@
         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 +2109 @@
 
         /* 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;
@@ -2502 +2502 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
 
                 /* Clear the answer structure */