Changeset 61bfc370 in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2011-01-07T18:57:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e08a733

Parents:

7c34b28f

Message:

• make measured_string and other network-related data types binary-safe
• fix several network-related routines binary-safe (replace clearly suspicious use of str_lcmp() with bcmp())
• rename spawn() to net_spawn()

File:

• uspace/srv/net/tl/tcp/tcp.c (modified) (5 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,
@@ -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;