Changeset b5e68c8 in mainline for uspace/lib/net/include/socket_core.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/include/socket_core.h (modified) (4 diffs)

uspace/lib/net/include/socket_core.h

@@ -66 +66 @@
 typedef struct socket_core socket_core_t;
 
-/** Type definition of the socket core pointer.
- * @see socket_core
- */
-typedef socket_core_t *socket_core_ref;
-
 /** Type definition of the socket port.
  * @see socket_port
  */
 typedef struct socket_port socket_port_t;
-
-/** Type definition of the socket port pointer.
- * @see socket_port
- */
-typedef socket_port_t *socket_port_ref;
 
 /** Socket core. */
@@ -96 +86 @@
         void *specific_data;
         /** Socket ports map key. */
-        const char *key;
+        const uint8_t *key;
         /** Length of the Socket ports map key. */
         size_t key_length;
@@ -111 +101 @@
  * the other use the remote addresses.
  */
-GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_ref);
+GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_t *);
 
 /** Ports map.
@@ -118 +108 @@
 INT_MAP_DECLARE(socket_ports, socket_port_t);
 
-extern void socket_cores_release(int, socket_cores_ref, socket_ports_ref,
-    void (*)(socket_core_ref));
-extern int socket_bind(socket_cores_ref, socket_ports_ref, int, void *, size_t,
+extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *,
+    void (*)(socket_core_t *));
+extern int socket_bind(socket_cores_t *, socket_ports_t *, int, void *, size_t,
     int, int, int);
-extern int socket_bind_free_port(socket_ports_ref, socket_core_ref, int, int,
+extern int socket_bind_free_port(socket_ports_t *, socket_core_t *, int, int,
     int);
-extern int socket_create(socket_cores_ref, int, void *, int *);
-extern int socket_destroy(int, int, socket_cores_ref, socket_ports_ref,
-    void (*)(socket_core_ref));
-extern int socket_reply_packets(packet_t, size_t *);
-extern socket_core_ref socket_port_find(socket_ports_ref, int, const char *,
+extern int socket_create(socket_cores_t *, int, void *, int *);
+extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *,
+    void (*)(socket_core_t *));
+extern int socket_reply_packets(packet_t *, size_t *);
+extern socket_core_t *socket_port_find(socket_ports_t *, int, const uint8_t *,
     size_t);
-extern void socket_port_release(socket_ports_ref, socket_core_ref);
-extern int socket_port_add(socket_ports_ref, int, socket_core_ref,
-    const char *, size_t);
+extern void socket_port_release(socket_ports_t *, socket_core_t *);
+extern int socket_port_add(socket_ports_t *, int, socket_core_t *,
+    const uint8_t *, size_t);
 
 #endif