Changeset ad7a6c9 in mainline for uspace/lib/net/tl/socket_core.c

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/lib/net/tl/socket_core.c (modified) (7 diffs)

uspace/lib/net/tl/socket_core.c

@@ -107 +107 @@
                 socket_release(socket);
 
-        socket_cores_exclude(local_sockets, socket->socket_id);
+        socket_cores_exclude(local_sockets, socket->socket_id, free);
 }
 
@@ -161 +161 @@
 static int
 socket_port_add_core(socket_port_t *socket_port, socket_core_t *socket,
-    const char *key, size_t key_length)
+    const uint8_t *key, size_t key_length)
 {
         socket_core_t **socket_ref;
@@ -216 +216 @@
                 goto fail;
         
-        rc = socket_port_add_core(socket_port, socket, SOCKET_MAP_KEY_LISTENING,
-            0);
+        rc = socket_port_add_core(socket_port, socket,
+            (const uint8_t *) SOCKET_MAP_KEY_LISTENING, 0);
         if (rc != EOK)
                 goto fail;
@@ -230 +230 @@
 
 fail:
-        socket_port_map_destroy(&socket_port->map);
+        socket_port_map_destroy(&socket_port->map, free);
         free(socket_port);
         return rc;
@@ -602 +602 @@
  */
 socket_core_t *
-socket_port_find(socket_ports_t *global_sockets, int port, const char *key,
+socket_port_find(socket_ports_t *global_sockets, int port, const uint8_t *key,
     size_t key_length)
 {
@@ -649 +649 @@
                         if (socket_port->count <= 0) {
                                 // destroy the map
-                                socket_port_map_destroy(&socket_port->map);
+                                socket_port_map_destroy(&socket_port->map, free);
                                 // release the port
                                 socket_ports_exclude(global_sockets,
-                                    socket->port);
+                                    socket->port, free);
                         } else {
                                 // remove
                                 socket_port_map_exclude(&socket_port->map,
-                                    socket->key, socket->key_length);
+                                    socket->key, socket->key_length, free);
                         }
                 }
@@ -680 +680 @@
 int
 socket_port_add(socket_ports_t *global_sockets, int port,
-    socket_core_t *socket, const char *key, size_t key_length)
+    socket_core_t *socket, const uint8_t *key, size_t key_length)
 {
         socket_port_t *socket_port;