Changeset b278b4e in mainline for uspace/lib/c/generic/net/socket_client.c

Timestamp:

2010-10-10T19:52:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

10056483

Parents:

ae972834 (diff), eb51e31 (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 from lp:~jakub/helenos/net.

This is mostly removal of the bundle build support for the networking stack as
we don't want to manually maintain both bundled and modular configurations.

File:

• uspace/lib/c/generic/net/socket_client.c (modified) (5 diffs)

uspace/lib/c/generic/net/socket_client.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libc 
+/** @addtogroup libc
  *  @{
  */
@@ -177 +177 @@
 //      .last_id = 0,
         .sockets = NULL,
-        .lock = {
-                .readers = 0,
-                .writers = 0,
-                .waiters = {
-                        .prev = &socket_globals.lock.waiters,   /* XXX */
-                        .next = &socket_globals.lock.waiters    /* XXX */
-                }
-        }
+        .lock = FIBRIL_RWLOCK_INITIALIZER(socket_globals.lock)
 };
 
@@ -516 +509 @@
 /** Sends message to the socket parent module with specified data.
  *
- *  @param[in] socket_id Socket identifier.
- *  @param[in] message  The action message.
- *  @param[in] arg2     The second message parameter.
- *  @param[in] data     The data to be sent.
- *  @param[in] datalength The data length.
- *  @returns            EOK on success.
- *  @returns            ENOTSOCK if the socket is not found.
- *  @returns            EBADMEM if the data parameter is NULL.
- *  @returns            NO_DATA if the datalength parameter is zero (0).
- *  @returns            Other error codes as defined for the spcific message.
+ * @param[in] socket_id Socket identifier.
+ * @param[in] message   The action message.
+ * @param[in] arg2      The second message parameter.
+ * @param[in] data      The data to be sent.
+ * @param[in] datalength The data length.
+ * @returns             EOK on success.
+ * @returns             ENOTSOCK if the socket is not found.
+ * @returns             EBADMEM if the data parameter is NULL.
+ * @returns             NO_DATA if the datalength parameter is zero (0).
+ * @returns             Other error codes as defined for the spcific message.
  */
 static int
@@ -805 +798 @@
 /** Sends data via the socket to the remote address.
  *
- *  Binds the socket to a free port if not already connected/bound.
- *
- *  @param[in] message  The action message.
- *  @param[in] socket_id Socket identifier.
- *  @param[in] data     The data to be sent.
- *  @param[in] datalength The data length.
- *  @param[in] flags    Various send flags.
- *  @param[in] toaddr   The destination address. May be NULL for connected
+ * Binds the socket to a free port if not already connected/bound.
+ *
+ * @param[in] message   The action message.
+ * @param[in] socket_id Socket identifier.
+ * @param[in] data      The data to be sent.
+ * @param[in] datalength The data length.
+ * @param[in] flags     Various send flags.
+ * @param[in] toaddr    The destination address. May be NULL for connected
  *                      sockets.
- *  @param[in] addrlen  The address length. Used only if toaddr is not NULL.
- *  @returns            EOK on success.
- *  @returns            ENOTSOCK if the socket is not found.
- *  @returns            EBADMEM if the data or toaddr parameter is NULL.
- *  @returns            NO_DATA if the datalength or the addrlen parameter is
+ * @param[in] addrlen   The address length. Used only if toaddr is not NULL.
+ * @returns             EOK on success.
+ * @returns             ENOTSOCK if the socket is not found.
+ * @returns             EBADMEM if the data or toaddr parameter is NULL.
+ * @returns             NO_DATA if the datalength or the addrlen parameter is
  *                      zero (0).
- *  @returns            Other error codes as defined for the NET_SOCKET_SENDTO
+ * @returns             Other error codes as defined for the NET_SOCKET_SENDTO
  *                      message.
  */
@@ -966 +959 @@
 /** Receives data via the socket.
  *
- *  @param[in] message  The action message.
- *  @param[in] socket_id Socket identifier.
- *  @param[out] data    The data buffer to be filled.
- *  @param[in] datalength The data length.
- *  @param[in] flags    Various receive flags.
- *  @param[out] fromaddr The source address. May be NULL for connected sockets.
- *  @param[in,out] addrlen The address length. The maximum address length is
+ * @param[in] message   The action message.
+ * @param[in] socket_id Socket identifier.
+ * @param[out] data     The data buffer to be filled.
+ * @param[in] datalength The data length.
+ * @param[in] flags     Various receive flags.
+ * @param[out] fromaddr The source address. May be NULL for connected sockets.
+ * @param[in,out] addrlen The address length. The maximum address length is
  *                      read. The actual address length is set. Used only if
  *                      fromaddr is not NULL.
- *  @returns            EOK on success.
- *  @returns            ENOTSOCK if the socket is not found.
- *  @returns            EBADMEM if the data parameter is NULL.
- *  @returns            NO_DATA if the datalength or addrlen parameter is zero.
- *  @returns            Other error codes as defined for the spcific message.
+ * @returns             EOK on success.
+ * @returns             ENOTSOCK if the socket is not found.
+ * @returns             EBADMEM if the data parameter is NULL.
+ * @returns             NO_DATA if the datalength or addrlen parameter is zero.
+ * @returns             Other error codes as defined for the spcific message.
  */
 static int