| 49,10 → 49,17 |
|---|
| #include "../include/socket.h" |
| #include "../include/socket_errno.h" |
| |
| #include "../structures/dynamic_fifo.h" |
| #include "../structures/int_map.h" |
| |
| #include "socket_messages.h" |
| |
| #define SOCKET_INITIAL_RECEIVED_SIZE 4 |
| #define SOCKET_MAX_RECEIVED_SIZE 64 |
| |
| #define SOCKET_INITIAL_ACCEPTED_SIZE 1 |
| #define SOCKET_MAX_ACCEPTED_SIZE 64 |
| |
| typedef struct socket socket_t; |
| typedef socket_t * socket_ref; |
| |
| 60,11 → 67,12 |
|---|
| int socket_id; |
| int phone; |
| services_t service; |
| int max_content; |
| int received; |
| int header_size; |
| int data_fragment_size; |
| dyn_fifo_t received; |
| fibril_mutex_t receive_lock; |
| fibril_condvar_t receive_signal; |
| int accepted; |
| dyn_fifo_t accepted; |
| fibril_mutex_t accept_lock; |
| fibril_condvar_t accept_signal; |
| }; |
| 85,6 → 93,9 |
|---|
| void socket_connection( ipc_callid_t iid, ipc_call_t * icall ); |
| int socket_send_data( int socket_id, int message, ipcarg_t arg2, const void * data, size_t datalength ); |
| void socket_initialize( socket_ref socket, int socket_id, int phone, services_t service ); |
| void socket_destroy( socket_ref socket ); |
| int recvfrom_core( int message, int socket_id, void * data, size_t datalength, int flags, struct sockaddr * fromaddr, socklen_t * addrlen ); |
| int sendto_core( int message, int socket_id, const void * data, size_t datalength, int flags, const struct sockaddr * toaddr, socklen_t addrlen ); |
| |
| static int socket_get_tcp_phone(){ |
| if( socket_globals.tcp_phone < 0 ){ |
| 116,8 → 127,8 |
|---|
| socket->socket_id = socket_id; |
| socket->phone = phone; |
| socket->service = service; |
| socket->received = 0; |
| socket->accepted = 0; |
| dyn_fifo_initialize( & socket->received, SOCKET_INITIAL_RECEIVED_SIZE ); |
| dyn_fifo_initialize( & socket->accepted, SOCKET_INITIAL_ACCEPTED_SIZE ); |
| fibril_mutex_initialize( & socket->receive_lock ); |
| fibril_condvar_initialize( & socket->receive_signal ); |
| fibril_mutex_initialize( & socket->accept_lock ); |
| 137,6 → 148,7 |
|---|
| callid = async_get_call( & call ); |
| switch( IPC_GET_METHOD( call )){ |
| case NET_SOCKET_RECEIVED: |
| // find the socket |
| socket = sockets_find( socket_get_sockets(), SOCKET_GET_SOCKET_ID( & call )); |
| if( ! socket ){ |
| ERROR_CODE = ENOTSOCK; |
| 143,41 → 155,56 |
|---|
| break; |
| } |
| fibril_mutex_lock( & socket->receive_lock ); |
| ++ socket->received; |
| fibril_condvar_signal( & socket->receive_signal ); |
| // push the number of received packet fragments |
| if( ! ERROR_OCCURRED( dyn_fifo_push( & socket->received, SOCKET_GET_DATA_FRAGMENTS( & call ), SOCKET_MAX_RECEIVED_SIZE ))){ |
| // signal the received packet |
| fibril_condvar_signal( & socket->receive_signal ); |
| } |
| fibril_mutex_unlock( & socket->receive_lock ); |
| ERROR_CODE = EOK; |
| break; |
| case NET_SOCKET_ACCEPTED: |
| // find the socket |
| socket = sockets_find( socket_get_sockets(), SOCKET_GET_SOCKET_ID( & call )); |
| if( ! socket ){ |
| ERROR_CODE = ENOTSOCK; |
| break; |
| } |
| fibril_mutex_lock( & socket->accept_lock ); |
| // create a new scoket |
| new_socket = ( socket_ref ) malloc( sizeof( socket_t )); |
| if( ! new_socket ){ |
| ERROR_CODE = ENOMEM; |
| break; |
| } |
| socket_initialize( new_socket, SOCKET_GET_NEW_SOCKET_ID( & call ), socket->phone, socket->service ); |
| if( ERROR_OCCURRED( sockets_add( socket_get_sockets(), new_socket->socket_id, new_socket ))){ |
| break; |
| socket_initialize( new_socket, SOCKET_GET_SOCKET_ID( & call ), socket->phone, socket->service ); |
| ERROR_CODE = sockets_add( socket_get_sockets(), new_socket->socket_id, new_socket ); |
| if( ERROR_CODE < 0 ){ |
| free( new_socket ); |
| }else{ |
| // push the new socket identifier |
| fibril_mutex_lock( & socket->accept_lock ); |
| if( ERROR_OCCURRED( dyn_fifo_push( & socket->accepted, new_socket->socket_id, SOCKET_MAX_ACCEPTED_SIZE ))){ |
| sockets_exclude( socket_get_sockets(), new_socket->socket_id ); |
| free( new_socket ); |
| }else{ |
| // signal the accepted socket |
| fibril_condvar_signal( & socket->accept_signal ); |
| } |
| fibril_mutex_unlock( & socket->accept_lock ); |
| ERROR_CODE = EOK; |
| } |
| ++ socket->accepted; |
| fibril_condvar_signal( & socket->accept_signal ); |
| fibril_mutex_unlock( & socket->accept_lock ); |
| break; |
| /* case NET_SOCKET_MTU: |
| case NET_SOCKET_DATA_FRAGMENT_SIZE: |
| // find the socket |
| socket = sockets_find( socket_get_sockets(), SOCKET_GET_SOCKET_ID( & call )); |
| if( ! socket ){ |
| ERROR_CODE = ENOTSOCK; |
| break; |
| } |
| socket->mtu = |
| // set the data fragment size |
| socket->data_fragment_size = SOCKET_GET_DATA_FRAGMENT_SIZE( & call ); |
| ERROR_CODE = EOK; |
| break; |
| */ default: |
| default: |
| ERROR_CODE = ENOTSUP; |
| } |
| ipc_answer_0( callid, ERROR_CODE ); |
| 185,11 → 212,14 |
|---|
| } |
| |
| int socket( int domain, int type, int protocol ){ |
| ERROR_DECLARE; |
| |
| socket_ref socket; |
| int phone; |
| int socket_id; |
| services_t service; |
| |
| // find the appropriate service |
| switch( domain ){ |
| case PF_INET: |
| switch( type ){ |
| 224,19 → 254,37 |
|---|
| default: |
| return EPFNOSUPPORT; |
| } |
| assert( phone ); |
| // create a new socket structure |
| socket = ( socket_ref ) malloc( sizeof( socket_t )); |
| if( ! socket ) return ENOMEM; |
| socket_id = async_req_3_0( phone, NET_SOCKET, 0, 0, service ); |
| if( socket_id > 0 ){ |
| socket_initialize( socket, socket_id, phone, service ); |
| if( sockets_add( socket_get_sockets(), socket_id, socket ) != EOK ){ |
| free( socket ); |
| async_msg_3( phone, NET_SOCKET_CLOSE, socket_id, 0, service ); |
| } |
| }else{ |
| if( ERROR_OCCURRED( dyn_fifo_initialize( & socket->received, SOCKET_INITIAL_RECEIVED_SIZE ))){ |
| free( socket ); |
| return ERROR_CODE; |
| } |
| if( ERROR_OCCURRED( dyn_fifo_initialize( & socket->accepted, SOCKET_INITIAL_ACCEPTED_SIZE ))){ |
| dyn_fifo_destroy( & socket->received ); |
| free( socket ); |
| return ERROR_CODE; |
| } |
| // request a new socket |
| if( ERROR_OCCURRED( async_req_3_3( phone, NET_SOCKET, 0, 0, service, ( ipcarg_t * ) & socket_id, ( ipcarg_t * ) & socket->header_size, ( ipcarg_t * ) & socket->data_fragment_size ))){ |
| dyn_fifo_destroy( & socket->received ); |
| dyn_fifo_destroy( & socket->accepted ); |
| free( socket ); |
| return ERROR_CODE; |
| } |
| // finish the new socket initialization |
| socket_initialize( socket, socket_id, phone, service ); |
| // store the new socket |
| ERROR_CODE = sockets_add( socket_get_sockets(), socket_id, socket ); |
| if( ERROR_CODE < 0 ){ |
| dyn_fifo_destroy( & socket->received ); |
| dyn_fifo_destroy( & socket->accepted ); |
| free( socket ); |
| async_msg_3( phone, NET_SOCKET_CLOSE, socket_id, 0, service ); |
| return ERROR_CODE; |
| } |
| |
| return socket_id; |
| } |
| |
| 247,9 → 295,12 |
|---|
| |
| if( ! data ) return EBADMEM; |
| if( ! datalength ) return NO_DATA; |
| // find the socket |
| socket = sockets_find( socket_get_sockets(), socket_id ); |
| if( ! socket ) return ENOTSOCK; |
| // request the message |
| message_id = async_send_3( socket->phone, message, socket->socket_id, arg2, socket->service, NULL ); |
| // send the address |
| ipc_data_write_start( socket->phone, data, datalength ); |
| async_wait_for( message_id, & result ); |
| return ( int ) result; |
| 256,6 → 307,7 |
|---|
| } |
| |
| int bind( int socket_id, const struct sockaddr * my_addr, socklen_t addrlen ){ |
| // send the address |
| return socket_send_data( socket_id, NET_SOCKET_BIND, 0, my_addr, addrlen ); |
| } |
| |
| 263,8 → 315,10 |
|---|
| socket_ref socket; |
| |
| if( backlog <= 0 ) return EINVAL; |
| // find the socket |
| socket = sockets_find( socket_get_sockets(), socket_id ); |
| if( ! socket ) return ENOTSOCK; |
| // request listen backlog change |
| return async_req_3_0( socket->phone, NET_SOCKET_LISTEN, socket->socket_id, backlog, socket->service ); |
| } |
| |
| 271,109 → 325,187 |
|---|
| int accept( int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen ){ |
| socket_ref socket; |
| aid_t message_id; |
| ipcarg_t result; |
| int result; |
| |
| if( ! cliaddr ) return EBADMEM; |
| if( ! addrlen ) return NO_DATA; |
| // find the socket |
| socket = sockets_find( socket_get_sockets(), socket_id ); |
| if( ! socket ) return ENOTSOCK; |
| fibril_mutex_lock( & socket->accept_lock ); |
| while( socket->accepted <= 0 ){ |
| // wait for an accepted socket |
| while( dyn_fifo_value( & socket->accepted ) <= 0 ){ |
| fibril_condvar_wait( & socket->accept_signal, & socket->accept_lock ); |
| } |
| message_id = async_send_3( socket->phone, NET_SOCKET_ACCEPT, socket->socket_id, 0, socket->service, NULL ); |
| // request accept |
| message_id = async_send_3( socket->phone, NET_SOCKET_ACCEPT, socket->socket_id, dyn_fifo_value( & socket->accepted ), socket->service, NULL ); |
| // read address |
| ipc_data_read_start( socket->phone, cliaddr, * addrlen ); |
| async_wait_for( message_id, & result ); |
| async_wait_for( message_id, ( ipcarg_t * ) & result ); |
| if( result > 0 ){ |
| -- socket->accepted; |
| // dequeue the accepted apcket if successful |
| dyn_fifo_pop( & socket->accepted ); |
| } |
| fibril_mutex_unlock( & socket->accept_lock ); |
| return ( int ) result; |
| return result; |
| } |
| |
| int connect( int socket_id, const struct sockaddr * serv_addr, socklen_t addrlen ){ |
| // send the address |
| return socket_send_data( socket_id, NET_SOCKET_CONNECT, 0, serv_addr, addrlen ); |
| } |
| |
| int closesocket( int socket_id ){ |
| ERROR_DECLARE; |
| |
| socket_ref socket; |
| |
| socket = sockets_find( socket_get_sockets(), socket_id ); |
| if( ! socket ) return ENOTSOCK; |
| return async_req_3_0( socket->phone, NET_SOCKET_CLOSE, socket->socket_id, 0, socket->service ); |
| // request close |
| ERROR_PROPAGATE( async_req_3_0( socket->phone, NET_SOCKET_CLOSE, socket->socket_id, 0, socket->service )); |
| // free the socket structure |
| socket_destroy( socket ); |
| return EOK; |
| } |
| |
| void socket_destroy( socket_ref socket ){ |
| int accepted_id; |
| |
| // destroy all accepted sockets |
| while(( accepted_id = dyn_fifo_pop( & socket->accepted ))){ |
| socket_destroy( sockets_find( socket_get_sockets(), accepted_id )); |
| } |
| dyn_fifo_destroy( & socket->received ); |
| dyn_fifo_destroy( & socket->accepted ); |
| sockets_exclude( socket_get_sockets(), socket->socket_id ); |
| } |
| |
| int send( int socket_id, void * data, size_t datalength, int flags ){ |
| return socket_send_data( socket_id, NET_SOCKET_SEND, flags, data, datalength ); |
| // without the address |
| return sendto_core( NET_SOCKET_SEND, socket_id, data, datalength, flags, NULL, 0 ); |
| } |
| |
| int sendto( int socket_id, const void * data, size_t datalength, int flags, const struct sockaddr * toaddr, socklen_t addrlen ){ |
| socket_ref socket; |
| aid_t message_id; |
| ipcarg_t result; |
| |
| if( ! toaddr ) return EBADMEM; |
| if( ! addrlen ) return NO_DATA; |
| if( ! data ) return EBADMEM; |
| if( ! datalength ) return NO_DATA; |
| socket = sockets_find( socket_get_sockets(), socket_id ); |
| if( ! socket ) return ENOTSOCK; |
| message_id = async_send_3( socket->phone, NET_SOCKET_SENDTO, socket->socket_id, flags, socket->service, NULL ); |
| if( ipc_data_write_start( socket->phone, toaddr, addrlen ) == EOK ){ |
| ipc_data_write_start( socket->phone, data, datalength ); |
| } |
| async_wait_for( message_id, & result ); |
| return ( int ) result; |
| // with the address |
| return sendto_core( NET_SOCKET_SENDTO, socket_id, data, datalength, flags, toaddr, addrlen ); |
| } |
| |
| int recv( int socket_id, void * data, size_t datalength, int flags ){ |
| int sendto_core( int message, int socket_id, const void * data, size_t datalength, int flags, const struct sockaddr * toaddr, socklen_t addrlen ){ |
| socket_ref socket; |
| aid_t message_id; |
| ipcarg_t result; |
| int fragments; |
| |
| if( ! data ) return EBADMEM; |
| if( ! datalength ) return NO_DATA; |
| // find socket |
| socket = sockets_find( socket_get_sockets(), socket_id ); |
| if( ! socket ) return ENOTSOCK; |
| fibril_mutex_lock( & socket->receive_lock ); |
| while( socket->received <= 0 ){ |
| fibril_condvar_wait( & socket->receive_signal, & socket->receive_lock ); |
| // compute data fragment count |
| fragments = ( datalength + socket->header_size ) / socket->data_fragment_size; |
| if(( datalength + socket->header_size ) % socket->data_fragment_size ) ++ fragments; |
| // request send |
| message_id = async_send_4( socket->phone, message, socket->socket_id, fragments, socket->service, flags, NULL ); |
| // send the address if given |
| if(( ! toaddr ) || ( ipc_data_write_start( socket->phone, toaddr, addrlen ) == EOK )){ |
| if( fragments == 1 ){ |
| // send all if only one fragment |
| ipc_data_write_start( socket->phone, data, datalength ); |
| }else{ |
| // send the first fragment |
| ipc_data_write_start( socket->phone, data, socket->data_fragment_size - socket->header_size ); |
| data += socket->data_fragment_size - socket->header_size; |
| // send the middle fragments |
| while(( -- fragments ) > 1 ){ |
| ipc_data_write_start( socket->phone, data, socket->data_fragment_size ); |
| data += socket->data_fragment_size; |
| } |
| // send the last fragment |
| ipc_data_write_start( socket->phone, data, ( datalength + socket->header_size ) % socket->data_fragment_size ); |
| } |
| } |
| message_id = async_send_3( socket->phone, NET_SOCKET_RECV, socket->socket_id, flags, socket->service, NULL ); |
| ipc_data_read_start( socket->phone, data, datalength ); |
| async_wait_for( message_id, & result ); |
| if( result > 0 ){ |
| -- socket->received; |
| } |
| fibril_mutex_unlock( & socket->receive_lock ); |
| return ( int ) result; |
| } |
| |
| int recv( int socket_id, void * data, size_t datalength, int flags ){ |
| // without the address |
| return recvfrom_core( NET_SOCKET_RECV, socket_id, data, datalength, flags, NULL, NULL ); |
| } |
| |
| int recvfrom( int socket_id, void * data, size_t datalength, int flags, struct sockaddr * fromaddr, socklen_t * addrlen ){ |
| if( ! fromaddr ) return EBADMEM; |
| if( ! addrlen ) return NO_DATA; |
| // with the address |
| return recvfrom_core( NET_SOCKET_RECVFROM, socket_id, data, datalength, flags, fromaddr, addrlen ); |
| } |
| |
| int recvfrom_core( int message, int socket_id, void * data, size_t datalength, int flags, struct sockaddr * fromaddr, socklen_t * addrlen ){ |
| socket_ref socket; |
| aid_t message_id; |
| ipcarg_t result; |
| int result; |
| int fragments; |
| int * lengths; |
| int index; |
| ipc_call_t answer; |
| |
| if( ! fromaddr ) return EBADMEM; |
| if( ! addrlen ) return NO_DATA; |
| if( ! data ) return EBADMEM; |
| if( ! datalength ) return NO_DATA; |
| // find the socket |
| socket = sockets_find( socket_get_sockets(), socket_id ); |
| if( ! socket ) return ENOTSOCK; |
| fibril_mutex_lock( & socket->receive_lock ); |
| while( socket->received <= 0 ){ |
| // wait for a received packet |
| while(( fragments = dyn_fifo_value( & socket->received )) <= 0 ){ |
| fibril_condvar_wait( & socket->receive_signal, & socket->receive_lock ); |
| } |
| message_id = async_send_3( socket->phone, NET_SOCKET_RECVFROM, socket->socket_id, flags, socket->service, NULL ); |
| if( ipc_data_read_start( socket->phone, fromaddr, * addrlen ) == EOK ){ |
| ipc_data_read_start( socket->phone, data, datalength ); |
| // prepare lengths if more fragments |
| if( fragments > 1 ){ |
| lengths = ( int * ) malloc( sizeof( int ) * ( fragments + 1 )); |
| if( ! lengths ){ |
| fibril_mutex_unlock( & socket->receive_lock ); |
| return ENOMEM; |
| } |
| } |
| async_wait_for( message_id, & result ); |
| if( result > 0 ){ |
| -- socket->received; |
| // request packet data |
| message_id = async_send_4( socket->phone, message, socket->socket_id, 0, socket->service, flags, & answer ); |
| // read the address if desired |
| if( fromaddr ){ |
| * addrlen = sizeof( struct sockaddr_in ); |
| } |
| if(( ! fromaddr ) || ( ipc_data_read_start( socket->phone, fromaddr, * addrlen ) == EOK )){ |
| if( fragments == 1 ){ |
| // read all if only one fragment |
| ipc_data_read_start( socket->phone, data, datalength ); |
| }else{ |
| // read the fragment lengths |
| if( ipc_data_read_start( socket->phone, lengths, sizeof( int ) * ( fragments + 1 )) == EOK ){ |
| if( lengths[ fragments ] <= datalength ){ |
| // read all fragments if long enough |
| for( index = 0; index < fragments; ++ index ){ |
| ipc_data_read_start( socket->phone, data, lengths[ index ] ); |
| data += lengths[ index ]; |
| } |
| } |
| } |
| free( lengths ); |
| } |
| }else if( fragments > 1 ){ |
| free( lengths ); |
| } |
| async_wait_for( message_id, ( ipcarg_t * ) & result ); |
| // if successful |
| if( result == EOK ){ |
| // dequeue the received packet |
| dyn_fifo_pop( & socket->received ); |
| // return read data length |
| result = SOCKET_GET_READ_DATA_LENGTH( & answer ); |
| } |
| fibril_mutex_unlock( & socket->receive_lock ); |
| return ( int ) result; |
| return result; |
| } |
| |
| int getsockopt( int socket_id, int level, int optname, void * value, size_t * optlen ){ |
| 381,18 → 513,26 |
|---|
| aid_t message_id; |
| ipcarg_t result; |
| |
| if( ! value ) return EBADMEM; |
| if( ! optlen ) return NO_DATA; |
| if( !( value && optlen )) return EBADMEM; |
| if( !( * optlen )) return NO_DATA; |
| // find the socket |
| socket = sockets_find( socket_get_sockets(), socket_id ); |
| if( ! socket ) return ENOTSOCK; |
| // request option value |
| message_id = async_send_3( socket->phone, NET_SOCKET_GETSOCKOPT, socket->socket_id, optname, socket->service, NULL ); |
| ipc_data_read_start( socket->phone, value, * optlen ); |
| // read the length |
| if( ipc_data_read_start( socket->phone, optlen, sizeof( * optlen )) == EOK ){ |
| // read the value |
| ipc_data_read_start( socket->phone, value, * optlen ); |
| } |
| async_wait_for( message_id, & result ); |
| return ( int ) result; |
| } |
| |
| int setsockopt( int socket_id, int level, int optname, const void * value, size_t optlen ){ |
| // send the value |
| return socket_send_data( socket_id, NET_SOCKET_SETSOCKOPT, optname, value, optlen ); |
| |
| } |
| |
| /** @} |