Changeset 71b00dcc in mainline for uspace/srv/net/include/socket.h


Ignore:
Timestamp:
2010-03-07T22:51:38Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
60ab6c3
Parents:
b5cbff4 (diff), 31c80a5 (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:~lukasmejdrech/helenos/network.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/include/socket.h

    rb5cbff4 r71b00dcc  
    6161 *  @returns EPROTONOSUPPORT if the protocol is not supported.
    6262 *  @returns ENOMEM if there is not enough memory left.
     63 *  @returns ELIMIT if there was not a free socket identifier found this time.
    6364 *  @returns Other error codes as defined for the NET_SOCKET message.
    6465 *  @returns Other error codes as defined for the bind_service_timeout() function.
    6566 */
    66 int     socket( int domain, int type, int protocol );
     67int socket(int domain, int type, int protocol);
    6768
    6869/** Binds the socket to a port address.
    … …  
    7677 *  @returns Other error codes as defined for the NET_SOCKET_BIND message.
    7778 */
    78 int     bind( int socket_id, const struct sockaddr * my_addr, socklen_t addrlen );
     79int bind(int socket_id, const struct sockaddr * my_addr, socklen_t addrlen);
    7980
    8081/** Sets the number of connections waiting to be accepted.
    … …  
    8687 *  @returns Other error codes as defined for the NET_SOCKET_LISTEN message.
    8788 */
    88 int     listen( int socket_id, int backlog );
     89int listen(int socket_id, int backlog);
    8990
    9091/** Accepts waiting socket.
    … …  
    99100 *  @returns Other error codes as defined for the NET_SOCKET_ACCEPT message.
    100101 */
    101 int     accept( int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen );
     102int accept(int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen);
    102103
    103104/** Connects socket to the remote server.
    … …  
    111112 *  @returns Other error codes as defined for the NET_SOCKET_CONNECT message.
    112113 */
    113 int     connect( int socket_id, const struct sockaddr * serv_addr, socklen_t addrlen );
     114int connect(int socket_id, const struct sockaddr * serv_addr, socklen_t addrlen);
    114115
    115116/** Closes the socket.
    … …  
    120121 *  @returns Other error codes as defined for the NET_SOCKET_CLOSE message.
    121122 */
    122 int     closesocket( int socket_id );
     123int closesocket(int socket_id);
    123124
    124125/** Sends data via the socket.
    … …  
    133134 *  @returns Other error codes as defined for the NET_SOCKET_SEND message.
    134135 */
    135 int send( int socket_id, void * data, size_t datalength, int flags );
     136int send(int socket_id, void * data, size_t datalength, int flags);
    136137
    137138/** Sends data via the socket to the remote address.
    … …  
    149150 *  @returns Other error codes as defined for the NET_SOCKET_SENDTO message.
    150151 */
    151 int sendto( int socket_id, const void * data, size_t datalength, int flags, const struct sockaddr * toaddr, socklen_t addrlen );
     152int sendto(int socket_id, const void * data, size_t datalength, int flags, const struct sockaddr * toaddr, socklen_t addrlen);
    152153
    153154/** Receives data via the socket.
    … …  
    162163 *  @returns Other error codes as defined for the NET_SOCKET_RECV message.
    163164 */
    164 int recv( int socket_id, void * data, size_t datalength, int flags );
     165int recv(int socket_id, void * data, size_t datalength, int flags);
    165166
    166167/** Receives data via the socket.
    … …  
    177178 *  @returns Other error codes as defined for the NET_SOCKET_RECVFROM message.
    178179 */
    179 int recvfrom( int socket_id, void * data, size_t datalength, int flags, struct sockaddr * fromaddr, socklen_t * addrlen );
     180int recvfrom(int socket_id, void * data, size_t datalength, int flags, struct sockaddr * fromaddr, socklen_t * addrlen);
    180181
    181182/** Gets socket option.
    … …  
    191192 *  @returns Other error codes as defined for the NET_SOCKET_GETSOCKOPT message.
    192193 */
    193 int     getsockopt( int socket_id, int level, int optname, void * value, size_t * optlen );
     194int getsockopt(int socket_id, int level, int optname, void * value, size_t * optlen);
    194195
    195196/** Sets socket option.
    … …  
    205206 *  @returns Other error codes as defined for the NET_SOCKET_SETSOCKOPT message.
    206207 */
    207 int     setsockopt( int socket_id, int level, int optname, const void * value, size_t optlen );
     208int setsockopt(int socket_id, int level, int optname, const void * value, size_t optlen);
    208209
    209210/*@}*/
Note: See TracChangeset for help on using the changeset viewer.