Index: uspace/srv/net/socket/socket_client.c =================================================================== --- uspace/srv/net/socket/socket_client.c (revision 1a0fb3f8aa71e3bb907eb17703615fc685752ca1) +++ uspace/srv/net/socket/socket_client.c (revision 1b053ca2a56e62dbf155643a2a356f845125a2c2) @@ -40,4 +40,6 @@ #include #include +#include +#include #include @@ -74,4 +76,8 @@ */ #define SOCKET_CONNECT_TIMEOUT ( 1 * 1000 * 1000 ) + +/** Maximum number of random attempts to find a new socket identifier before switching to the sequence. + */ +#define SOCKET_ID_TRIES 100 /** Type definition of the socket specific data. @@ -155,4 +161,7 @@ */ int udp_phone; +// /** The last socket identifier. +// */ +// int last_id; /** Active sockets. */ @@ -168,4 +177,5 @@ .tcp_phone = -1, .udp_phone = -1, +// .last_id = 0, .sockets = NULL, .lock = { @@ -199,4 +209,10 @@ */ static sockets_ref socket_get_sockets( void ); + +/** Tries to find a new free socket identifier. + * @returns The new socket identifier. + * @returns ELIMIT if there is no socket identifier available. + */ +static int socket_generate_new_id( void ); /** Default thread for new connections. @@ -288,6 +304,38 @@ socket_globals.sockets = NULL; } + srand( task_get_id()); } return socket_globals.sockets; +} + +static int socket_generate_new_id( void ){ + sockets_ref sockets; + int socket_id; + int count; + + sockets = socket_get_sockets(); + count = 0; +// socket_id = socket_globals.last_id; + do{ + if( count < SOCKET_ID_TRIES ){ + socket_id = rand() % INT_MAX; + ++ count; + }else if( count == SOCKET_ID_TRIES ){ + socket_id = 1; + ++ count; + // only this branch for last_id + }else{ + if( socket_id < INT_MAX ){ + ++ socket_id; +/* }else if( socket_globals.last_id ){ +* socket_globals.last_id = 0; +* socket_id = 1; +*/ }else{ + return ELIMIT; + } + } + }while( sockets_find( sockets, socket_id )); +// last_id = socket_id + return socket_id; } @@ -311,5 +359,4 @@ ipc_call_t call; socket_ref socket; - socket_ref new_socket; while( true ){ @@ -318,53 +365,5 @@ switch( IPC_GET_METHOD( call )){ case NET_SOCKET_RECEIVED: - fibril_rwlock_read_lock( & socket_globals.lock ); - // find the socket - socket = sockets_find( socket_get_sockets(), SOCKET_GET_SOCKET_ID( call )); - if( ! socket ){ - ERROR_CODE = ENOTSOCK; - }else{ - fibril_mutex_lock( & socket->receive_lock ); - // 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 ); - } - fibril_rwlock_read_unlock( & socket_globals.lock ); - break; case NET_SOCKET_ACCEPTED: - fibril_rwlock_read_lock( & socket_globals.lock ); - // find the socket - socket = sockets_find( socket_get_sockets(), SOCKET_GET_SOCKET_ID( call )); - if( ! socket ){ - ERROR_CODE = ENOTSOCK; - }else{ - // create a new scoket - new_socket = ( socket_ref ) malloc( sizeof( socket_t )); - if( ! new_socket ){ - ERROR_CODE = ENOMEM; - }else{ - bzero( new_socket, sizeof( * new_socket )); - socket_initialize( new_socket, SOCKET_GET_NEW_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 ); - }else{ - // signal the accepted socket - fibril_condvar_signal( & socket->accept_signal ); - } - fibril_mutex_unlock( & socket->accept_lock ); - ERROR_CODE = EOK; - } - } - } - fibril_rwlock_read_unlock( & socket_globals.lock ); - break; case NET_SOCKET_DATA_FRAGMENT_SIZE: fibril_rwlock_read_lock( & socket_globals.lock ); @@ -374,12 +373,37 @@ ERROR_CODE = ENOTSOCK; }else{ - fibril_rwlock_write_lock( & socket->sending_lock ); - // set the data fragment size - socket->data_fragment_size = SOCKET_GET_DATA_FRAGMENT_SIZE( call ); - fibril_rwlock_write_unlock( & socket->sending_lock ); - ERROR_CODE = EOK; + switch( IPC_GET_METHOD( call )){ + case NET_SOCKET_RECEIVED: + fibril_mutex_lock( & socket->receive_lock ); + // 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 ); + break; + case NET_SOCKET_ACCEPTED: + // push the new socket identifier + fibril_mutex_lock( & socket->accept_lock ); + if( ERROR_OCCURRED( dyn_fifo_push( & socket->accepted, SOCKET_GET_NEW_SOCKET_ID( call ), SOCKET_MAX_ACCEPTED_SIZE ))){ + sockets_exclude( socket_get_sockets(), SOCKET_GET_NEW_SOCKET_ID( call )); + }else{ + // signal the accepted socket + fibril_condvar_signal( & socket->accept_signal ); + } + fibril_mutex_unlock( & socket->accept_lock ); + break; + default: + ERROR_CODE = ENOTSUP; + } + if(( SOCKET_GET_DATA_FRAGMENT_SIZE( call ) > 0 ) + && ( SOCKET_GET_DATA_FRAGMENT_SIZE( call ) != socket->data_fragment_size )){ + fibril_rwlock_write_lock( & socket->sending_lock ); + // set the data fragment size + socket->data_fragment_size = SOCKET_GET_DATA_FRAGMENT_SIZE( call ); + fibril_rwlock_write_unlock( & socket->sending_lock ); + } } fibril_rwlock_read_unlock( & socket_globals.lock ); - break; default: ERROR_CODE = ENOTSUP; @@ -396,4 +420,5 @@ int socket_id; services_t service; + int count; // find the appropriate service @@ -437,6 +462,15 @@ if( ! socket ) return ENOMEM; bzero( socket, sizeof( * socket )); + count = 0; + fibril_rwlock_write_lock( & socket_globals.lock ); // request a new socket - if( ERROR_OCCURRED(( int ) async_req_3_3( phone, NET_SOCKET, 0, 0, service, ( ipcarg_t * ) & socket_id, ( ipcarg_t * ) & socket->data_fragment_size, ( ipcarg_t * ) & socket->header_size ))){ + socket_id = socket_generate_new_id(); + if( socket_id <= 0 ){ + fibril_rwlock_write_unlock( & socket_globals.lock ); + free( socket ); + return socket_id; + } + if( ERROR_OCCURRED(( int ) async_req_3_3( phone, NET_SOCKET, socket_id, 0, service, NULL, ( ipcarg_t * ) & socket->data_fragment_size, ( ipcarg_t * ) & socket->header_size ))){ + fibril_rwlock_write_unlock( & socket_globals.lock ); free( socket ); return ERROR_CODE; @@ -445,5 +479,4 @@ socket_initialize( socket, socket_id, phone, service ); // store the new socket - fibril_rwlock_write_lock( & socket_globals.lock ); ERROR_CODE = sockets_add( socket_get_sockets(), socket_id, socket ); fibril_rwlock_write_unlock( & socket_globals.lock ); @@ -509,4 +542,5 @@ int accept( int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen ){ socket_ref socket; + socket_ref new_socket; aid_t message_id; int result; @@ -515,9 +549,9 @@ if(( ! cliaddr ) || ( ! addrlen )) return EBADMEM; - fibril_rwlock_read_lock( & socket_globals.lock ); + fibril_rwlock_write_lock( & socket_globals.lock ); // find the socket socket = sockets_find( socket_get_sockets(), socket_id ); if( ! socket ){ - fibril_rwlock_read_unlock( & socket_globals.lock ); + fibril_rwlock_write_unlock( & socket_globals.lock ); return ENOTSOCK; } @@ -526,20 +560,49 @@ ++ socket->blocked; while( dyn_fifo_value( & socket->accepted ) <= 0 ){ - fibril_rwlock_read_unlock( & socket_globals.lock ); + fibril_rwlock_write_unlock( & socket_globals.lock ); fibril_condvar_wait( & socket->accept_signal, & socket->accept_lock ); - fibril_rwlock_read_lock( & socket_globals.lock ); + fibril_rwlock_write_lock( & socket_globals.lock ); } -- socket->blocked; + + // create a new scoket + new_socket = ( socket_ref ) malloc( sizeof( socket_t )); + if( ! new_socket ){ + fibril_mutex_unlock( & socket->accept_lock ); + fibril_rwlock_write_unlock( & socket_globals.lock ); + return ENOMEM; + } + bzero( new_socket, sizeof( * new_socket )); + socket_id = socket_generate_new_id(); + if( socket_id <= 0 ){ + fibril_mutex_unlock( & socket->accept_lock ); + fibril_rwlock_write_unlock( & socket_globals.lock ); + free( new_socket ); + return socket_id; + } + socket_initialize( new_socket, socket_id, socket->phone, socket->service ); + result = sockets_add( socket_get_sockets(), new_socket->socket_id, new_socket ); + if( result < 0 ){ + fibril_mutex_unlock( & socket->accept_lock ); + fibril_rwlock_write_unlock( & socket_globals.lock ); + free( new_socket ); + return result; + } + // request accept - message_id = async_send_3( socket->phone, NET_SOCKET_ACCEPT, ( ipcarg_t ) socket->socket_id, 0, socket->service, & answer ); + message_id = async_send_5( socket->phone, NET_SOCKET_ACCEPT, ( ipcarg_t ) socket->socket_id, 0, socket->service, 0, new_socket->socket_id, & answer ); // read address - async_data_read_start( socket->phone, cliaddr, * addrlen ); - fibril_rwlock_read_unlock( & socket_globals.lock ); + ipc_data_read_start( socket->phone, cliaddr, * addrlen ); + fibril_rwlock_write_unlock( & socket_globals.lock ); async_wait_for( message_id, ( ipcarg_t * ) & result ); if( result > 0 ){ + if( result != socket_id ){ + result = EINVAL; + } // dequeue the accepted socket if successful dyn_fifo_pop( & socket->accepted ); // set address length * addrlen = SOCKET_GET_ADDRESS_LENGTH( answer ); + new_socket->data_fragment_size = SOCKET_GET_DATA_FRAGMENT_SIZE( answer ); }else if( result == ENOTSOCK ){ // empty the queue if no accepted sockets @@ -609,4 +672,5 @@ ipcarg_t result; size_t fragments; + ipc_call_t answer; if( ! data ) return EBADMEM; @@ -621,8 +685,12 @@ fibril_rwlock_read_lock( & socket->sending_lock ); // compute data fragment count - fragments = ( datalength + socket->header_size ) / socket->data_fragment_size; - if(( datalength + socket->header_size ) % socket->data_fragment_size ) ++ fragments; + if( socket->data_fragment_size > 0 ){ + fragments = ( datalength + socket->header_size ) / socket->data_fragment_size; + if(( datalength + socket->header_size ) % socket->data_fragment_size ) ++ fragments; + }else{ + fragments = 1; + } // request send - message_id = async_send_5( socket->phone, message, ( ipcarg_t ) socket->socket_id, socket->data_fragment_size, socket->service, ( ipcarg_t ) flags, fragments, NULL ); + message_id = async_send_5( socket->phone, message, ( ipcarg_t ) socket->socket_id, ( fragments == 1 ? datalength : socket->data_fragment_size ), socket->service, ( ipcarg_t ) flags, fragments, & answer ); // send the address if given if(( ! toaddr ) || ( async_data_write_start( socket->phone, toaddr, addrlen ) == EOK )){ @@ -643,7 +711,12 @@ } } + async_wait_for( message_id, & result ); + if(( SOCKET_GET_DATA_FRAGMENT_SIZE( answer ) > 0 ) + && ( SOCKET_GET_DATA_FRAGMENT_SIZE( answer ) != socket->data_fragment_size )){ + // set the data fragment size + socket->data_fragment_size = SOCKET_GET_DATA_FRAGMENT_SIZE( answer ); + } fibril_rwlock_read_unlock( & socket->sending_lock ); fibril_rwlock_read_unlock( & socket_globals.lock ); - async_wait_for( message_id, & result ); return ( int ) result; } Index: uspace/srv/net/socket/socket_core.c =================================================================== --- uspace/srv/net/socket/socket_core.c (revision 1a0fb3f8aa71e3bb907eb17703615fc685752ca1) +++ uspace/srv/net/socket/socket_core.c (revision 1b053ca2a56e62dbf155643a2a356f845125a2c2) @@ -35,4 +35,7 @@ */ +#include +#include + #include "../err.h" @@ -51,4 +54,8 @@ #include "socket_core.h" + +/** Maximum number of random attempts to find a new socket identifier before switching to the sequence. + */ +#define SOCKET_ID_TRIES 100 /** Bound port sockets. @@ -94,4 +101,12 @@ */ int socket_port_add_core( socket_port_ref socket_port, socket_core_ref socket, const char * key, size_t key_length ); + +/** Tries to find a new free socket identifier. + * @param[in] local_sockets The local sockets to be searched. + * @param[in] positive A value indicating whether a positive identifier is 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 ); INT_MAP_IMPLEMENT( socket_cores, socket_core_t ); @@ -230,4 +245,34 @@ } + +static int socket_generate_new_id( socket_cores_ref local_sockets, int positive ){ + int socket_id; + int count; + + count = 0; +// socket_id = socket_globals.last_id; + do{ + if( count < SOCKET_ID_TRIES ){ + socket_id = rand() % INT_MAX; + ++ count; + }else if( count == SOCKET_ID_TRIES ){ + socket_id = 1; + ++ count; + // only this branch for last_id + }else{ + if( socket_id < INT_MAX ){ + ++ socket_id; +/* }else if( socket_globals.last_id ){ +* socket_globals.last_id = 0; +* socket_id = 1; +*/ }else{ + return ELIMIT; + } + } + }while( socket_cores_find( local_sockets, (( positive ? 1 : -1 ) * socket_id ))); +// last_id = socket_id + return socket_id; +} + int socket_create( socket_cores_ref local_sockets, int app_phone, void * specific_data, int * socket_id ){ ERROR_DECLARE; @@ -235,6 +280,20 @@ socket_core_ref socket; int res; - - if( ! socket_id ) return EBADMEM; + int positive; + + if( ! socket_id ) return EINVAL; + // store the socket + if( * socket_id <= 0 ){ + positive = ( * socket_id == 0 ); + * socket_id = socket_generate_new_id( local_sockets, positive ); + if( * socket_id <= 0 ){ + return * socket_id; + } + if( ! positive ){ + * socket_id *= -1; + } + }else if( socket_cores_find( local_sockets, * socket_id )){ + return EEXIST; + } socket = ( socket_core_ref ) malloc( sizeof( * socket )); if( ! socket ) return ENOMEM; @@ -254,7 +313,5 @@ return ERROR_CODE; } - // get a next free socket number - socket->socket_id = socket_cores_count( local_sockets ) + 1; - // store the socket + socket->socket_id = * socket_id; res = socket_cores_add( local_sockets, socket->socket_id, socket ); if( res < 0 ){ @@ -264,6 +321,4 @@ return res; } - // return the socket identifier - * socket_id = socket->socket_id; return EOK; } Index: uspace/srv/net/socket/socket_core.h =================================================================== --- uspace/srv/net/socket/socket_core.h (revision 1a0fb3f8aa71e3bb907eb17703615fc685752ca1) +++ uspace/srv/net/socket/socket_core.h (revision 1b053ca2a56e62dbf155643a2a356f845125a2c2) @@ -177,7 +177,7 @@ * @param[in] app_phone The application phone. * @param[in] specific_data The socket specific data. - * @param[out] socket_id The new socket identifier. - * @returns EOK on success. - * @returns EBADMEM if the socket_id parameter is NULL. + * @param[in,out] socket_id The new socket identifier. A new identifier is chosen if set to zero (0) 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. */ Index: uspace/srv/net/socket/socket_messages.h =================================================================== --- uspace/srv/net/socket/socket_messages.h (revision 1a0fb3f8aa71e3bb907eb17703615fc685752ca1) +++ uspace/srv/net/socket/socket_messages.h (revision 1b053ca2a56e62dbf155643a2a356f845125a2c2) @@ -142,14 +142,4 @@ #define SOCKET_GET_OPT_LEVEL( call ) ( int ) IPC_GET_ARG2( call ) -/** Sets the address length in the message answer. - * @param[out] answer The message answer structure. - */ -#define SOCKET_SET_ADDRESS_LENGTH( answer ) ( socklen_t * ) & IPC_GET_ARG2( answer ) - -/** Returns the address length message parameter. - * @param[in] call The message call structure. - */ -#define SOCKET_GET_ADDRESS_LENGTH( call ) ( socklen_t ) IPC_GET_ARG2( call ) - /** Returns the data fragment size message parameter. * @param[in] call The message call structure. @@ -161,4 +151,14 @@ */ #define SOCKET_SET_DATA_FRAGMENT_SIZE( answer ) ( size_t * ) & IPC_GET_ARG2( answer ) + +/** Sets the address length in the message answer. + * @param[out] answer The message answer structure. + */ +#define SOCKET_SET_ADDRESS_LENGTH( answer ) ( socklen_t * ) & IPC_GET_ARG3( answer ) + +/** Returns the address length message parameter. + * @param[in] call The message call structure. + */ +#define SOCKET_GET_ADDRESS_LENGTH( call ) ( socklen_t ) IPC_GET_ARG3( call ) /** Sets the header size in the message answer.