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

Timestamp:

2010-11-19T23:50:06Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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) (15 diffs)

uspace/lib/net/tl/socket_core.c

@@ -68 +68 @@
 INT_MAP_IMPLEMENT(socket_cores, socket_core_t);
 
-GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_ref);
+GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_t *);
 
 INT_MAP_IMPLEMENT(socket_ports, socket_port_t);
@@ -85 +85 @@
  */
 static void
-socket_destroy_core(int packet_phone, socket_core_ref socket,
-    socket_cores_ref local_sockets, socket_ports_ref global_sockets,
-    void (* socket_release)(socket_core_ref socket))
+socket_destroy_core(int packet_phone, socket_core_t *socket,
+    socket_cores_t *local_sockets, socket_ports_t *global_sockets,
+    void (* socket_release)(socket_core_t *socket))
 {
         int packet_id;
@@ -121 +121 @@
  */
 void
-socket_cores_release(int packet_phone, socket_cores_ref local_sockets,
-    socket_ports_ref global_sockets,
-    void (* socket_release)(socket_core_ref socket))
+socket_cores_release(int packet_phone, socket_cores_t *local_sockets,
+    socket_ports_t *global_sockets,
+    void (* socket_release)(socket_core_t *socket))
 {
         int index;
@@ -156 +156 @@
  * @param[in] key       The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns             EOK on success.
- * @returns             ENOMEM if there is not enough memory left.
+ * @return              EOK on success.
+ * @return              ENOMEM if there is not enough memory left.
  */
 static int
-socket_port_add_core(socket_port_ref socket_port, socket_core_ref socket,
+socket_port_add_core(socket_port_t *socket_port, socket_core_t *socket,
     const char *key, size_t key_length)
 {
-        socket_core_ref *socket_ref;
+        socket_core_t **socket_ref;
         int rc;
 
@@ -194 +194 @@
  * @param[in] socket    The socket to be added.
  * @param[in] port      The port number to be bound to.
- * @returns             EOK on success.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              Other error codes as defined for the
  *                       socket_ports_add() function.
  */
 static int
-socket_bind_insert(socket_ports_ref global_sockets, socket_core_ref socket,
+socket_bind_insert(socket_ports_t *global_sockets, socket_core_t *socket,
     int port)
 {
-        socket_port_ref socket_port;
+        socket_port_t *socket_port;
         int rc;
 
@@ -248 +248 @@
  * @param[in] free_ports_end The maximum free port.
  * @param[in] last_used_port The last used free port.
- * @returns             EOK on success.
- * @returns             ENOTSOCK if the socket was not found.
- * @returns             EAFNOSUPPORT if the address family is not supported.
- * @returns             EADDRINUSE if the port is already in use.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              ENOTSOCK if the socket was not found.
+ * @return              EAFNOSUPPORT if the address family is not supported.
+ * @return              EADDRINUSE if the port is already in use.
+ * @return              Other error codes as defined for the
  *                      socket_bind_free_port() function.
- * @returns             Other error codes as defined for the
+ * @return              Other error codes as defined for the
  *                      socket_bind_insert() function.
  */
 int
-socket_bind(socket_cores_ref local_sockets, socket_ports_ref global_sockets,
+socket_bind(socket_cores_t *local_sockets, socket_ports_t *global_sockets,
     int socket_id, void *addr, size_t addrlen, int free_ports_start,
     int free_ports_end, int last_used_port)
 {
-        socket_core_ref socket;
-        socket_port_ref socket_port;
+        socket_core_t *socket;
+        socket_port_t *socket_port;
         struct sockaddr *address;
         struct sockaddr_in *address_in;
@@ -322 +322 @@
  * @param[in] free_ports_end The maximum free port.
  * @param[in] last_used_port The last used free port.
- * @returns             EOK on success.
- * @returns             ENOTCONN if no free port was found.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              ENOTCONN if no free port was found.
+ * @return              Other error codes as defined for the
  *                      socket_bind_insert() function.
  */
 int
-socket_bind_free_port(socket_ports_ref global_sockets, socket_core_ref socket,
+socket_bind_free_port(socket_ports_t *global_sockets, socket_core_t *socket,
     int free_ports_start, int free_ports_end, int last_used_port)
 {
@@ -367 +367 @@
  *                      requested. A negative identifier is requested if set to
  *                      false.
- * @returns             The new socket identifier.
- * @returns             ELIMIT if there is no socket identifier available.
- */
-static int socket_generate_new_id(socket_cores_ref local_sockets, int positive)
+ * @return              The new socket identifier.
+ * @return              ELIMIT if there is no socket identifier available.
+ */
+static int socket_generate_new_id(socket_cores_t *local_sockets, int positive)
 {
         int socket_id;
@@ -410 +410 @@
  *                      chosen if set to zero or negative. A negative identifier
  *                      is chosen if set to negative.
- * @returns             EOK on success.
- * @returns             EINVAL if the socket_id parameter is NULL.
- * @returns             ENOMEM if there is not enough memory left.
+ * @return              EOK on success.
+ * @return              EINVAL if the socket_id parameter is NULL.
+ * @return              ENOMEM if there is not enough memory left.
  */
 int
-socket_create(socket_cores_ref local_sockets, int app_phone,
+socket_create(socket_cores_t *local_sockets, int app_phone,
     void *specific_data, int *socket_id)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         int positive;
         int rc;
@@ -437 +437 @@
         }
         
-        socket = (socket_core_ref) malloc(sizeof(*socket));
+        socket = (socket_core_t *) malloc(sizeof(*socket));
         if (!socket)
                 return ENOMEM;
@@ -482 +482 @@
  * @param[in,out] global_sockets The global sockets to be updated.
  * @param[in] socket_release The client release callback function.
- * @returns             EOK on success.
- * @returns             ENOTSOCK if the socket is not found.
+ * @return              EOK on success.
+ * @return              ENOTSOCK if the socket is not found.
  */
 int
-socket_destroy(int packet_phone, int socket_id, socket_cores_ref local_sockets,
-    socket_ports_ref global_sockets,
-    void (*socket_release)(socket_core_ref socket))
-{
-        socket_core_ref socket;
+socket_destroy(int packet_phone, int socket_id, socket_cores_t *local_sockets,
+    socket_ports_t *global_sockets,
+    void (*socket_release)(socket_core_t *socket))
+{
+        socket_core_t *socket;
         int accepted_id;
 
@@ -516 +516 @@
  * @param[in] packet    The packet to be transfered.
  * @param[out] length   The total data length.
- * @returns             EOK on success.
- * @returns             EBADMEM if the length parameter is NULL.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the data_reply()
+ * @return              EOK on success.
+ * @return              EBADMEM if the length parameter is NULL.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              Other error codes as defined for the data_reply()
  *                      function.
  */
@@ -598 +598 @@
  * @param[in] key       The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns             The found socket.
- * @returns             NULL if no socket was found.
- */
-socket_core_ref
-socket_port_find(socket_ports_ref global_sockets, int port, const char *key,
+ * @return              The found socket.
+ * @return              NULL if no socket was found.
+ */
+socket_core_t *
+socket_port_find(socket_ports_t *global_sockets, int port, const char *key,
     size_t key_length)
 {
-        socket_port_ref socket_port;
-        socket_core_ref *socket_ref;
+        socket_port_t *socket_port;
+        socket_core_t **socket_ref;
 
         socket_port = socket_ports_find(global_sockets, port);
@@ -628 +628 @@
  */
 void
-socket_port_release(socket_ports_ref global_sockets, socket_core_ref socket)
-{
-        socket_port_ref socket_port;
-        socket_core_ref *socket_ref;
+socket_port_release(socket_ports_t *global_sockets, socket_core_t *socket)
+{
+        socket_port_t *socket_port;
+        socket_core_t **socket_ref;
 
         if (!socket->port)
@@ -673 +673 @@
  * @param[in] key       The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns             EOK on success.
- * @returns             ENOENT if the port is not already used.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              ENOENT if the port is not already used.
+ * @return              Other error codes as defined for the
  *                      socket_port_add_core() function.
  */
 int
-socket_port_add(socket_ports_ref global_sockets, int port,
-    socket_core_ref socket, const char *key, size_t key_length)
-{
-        socket_port_ref socket_port;
+socket_port_add(socket_ports_t *global_sockets, int port,
+    socket_core_t *socket, const char *key, size_t key_length)
+{
+        socket_port_t *socket_port;
         int rc;