Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/net/socket_client.c

    rae972834 rb278b4e  
    2727 */
    2828
    29 /** @addtogroup libc 
     29/** @addtogroup libc
    3030 *  @{
    3131 */
     
    177177//      .last_id = 0,
    178178        .sockets = NULL,
    179         .lock = {
    180                 .readers = 0,
    181                 .writers = 0,
    182                 .waiters = {
    183                         .prev = &socket_globals.lock.waiters,   /* XXX */
    184                         .next = &socket_globals.lock.waiters    /* XXX */
    185                 }
    186         }
     179        .lock = FIBRIL_RWLOCK_INITIALIZER(socket_globals.lock)
    187180};
    188181
     
    516509/** Sends message to the socket parent module with specified data.
    517510 *
    518  *  @param[in] socket_id Socket identifier.
    519  *  @param[in] message  The action message.
    520  *  @param[in] arg2     The second message parameter.
    521  *  @param[in] data     The data to be sent.
    522  *  @param[in] datalength The data length.
    523  *  @returns            EOK on success.
    524  *  @returns            ENOTSOCK if the socket is not found.
    525  *  @returns            EBADMEM if the data parameter is NULL.
    526  *  @returns            NO_DATA if the datalength parameter is zero (0).
    527  *  @returns            Other error codes as defined for the spcific message.
     511 * @param[in] socket_id Socket identifier.
     512 * @param[in] message   The action message.
     513 * @param[in] arg2      The second message parameter.
     514 * @param[in] data      The data to be sent.
     515 * @param[in] datalength The data length.
     516 * @returns             EOK on success.
     517 * @returns             ENOTSOCK if the socket is not found.
     518 * @returns             EBADMEM if the data parameter is NULL.
     519 * @returns             NO_DATA if the datalength parameter is zero (0).
     520 * @returns             Other error codes as defined for the spcific message.
    528521 */
    529522static int
     
    805798/** Sends data via the socket to the remote address.
    806799 *
    807  *  Binds the socket to a free port if not already connected/bound.
    808  *
    809  *  @param[in] message  The action message.
    810  *  @param[in] socket_id Socket identifier.
    811  *  @param[in] data     The data to be sent.
    812  *  @param[in] datalength The data length.
    813  *  @param[in] flags    Various send flags.
    814  *  @param[in] toaddr   The destination address. May be NULL for connected
     800 * Binds the socket to a free port if not already connected/bound.
     801 *
     802 * @param[in] message   The action message.
     803 * @param[in] socket_id Socket identifier.
     804 * @param[in] data      The data to be sent.
     805 * @param[in] datalength The data length.
     806 * @param[in] flags     Various send flags.
     807 * @param[in] toaddr    The destination address. May be NULL for connected
    815808 *                      sockets.
    816  *  @param[in] addrlen  The address length. Used only if toaddr is not NULL.
    817  *  @returns            EOK on success.
    818  *  @returns            ENOTSOCK if the socket is not found.
    819  *  @returns            EBADMEM if the data or toaddr parameter is NULL.
    820  *  @returns            NO_DATA if the datalength or the addrlen parameter is
     809 * @param[in] addrlen   The address length. Used only if toaddr is not NULL.
     810 * @returns             EOK on success.
     811 * @returns             ENOTSOCK if the socket is not found.
     812 * @returns             EBADMEM if the data or toaddr parameter is NULL.
     813 * @returns             NO_DATA if the datalength or the addrlen parameter is
    821814 *                      zero (0).
    822  *  @returns            Other error codes as defined for the NET_SOCKET_SENDTO
     815 * @returns             Other error codes as defined for the NET_SOCKET_SENDTO
    823816 *                      message.
    824817 */
     
    966959/** Receives data via the socket.
    967960 *
    968  *  @param[in] message  The action message.
    969  *  @param[in] socket_id Socket identifier.
    970  *  @param[out] data    The data buffer to be filled.
    971  *  @param[in] datalength The data length.
    972  *  @param[in] flags    Various receive flags.
    973  *  @param[out] fromaddr The source address. May be NULL for connected sockets.
    974  *  @param[in,out] addrlen The address length. The maximum address length is
     961 * @param[in] message   The action message.
     962 * @param[in] socket_id Socket identifier.
     963 * @param[out] data     The data buffer to be filled.
     964 * @param[in] datalength The data length.
     965 * @param[in] flags     Various receive flags.
     966 * @param[out] fromaddr The source address. May be NULL for connected sockets.
     967 * @param[in,out] addrlen The address length. The maximum address length is
    975968 *                      read. The actual address length is set. Used only if
    976969 *                      fromaddr is not NULL.
    977  *  @returns            EOK on success.
    978  *  @returns            ENOTSOCK if the socket is not found.
    979  *  @returns            EBADMEM if the data parameter is NULL.
    980  *  @returns            NO_DATA if the datalength or addrlen parameter is zero.
    981  *  @returns            Other error codes as defined for the spcific message.
     970 * @returns             EOK on success.
     971 * @returns             ENOTSOCK if the socket is not found.
     972 * @returns             EBADMEM if the data parameter is NULL.
     973 * @returns             NO_DATA if the datalength or addrlen parameter is zero.
     974 * @returns             Other error codes as defined for the spcific message.
    982975 */
    983976static int
Note: See TracChangeset for help on using the changeset viewer.