Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4733 → Rev 4734

/branches/network/uspace/srv/net/app/echo/echo.c
104,7 → 104,7
"\tThe maximum receive data size the application should accept. The default is 1024 bytes.\n" \
"\n" \
"-t socket_type | --type=socket_type\n" \
"\tThe listenning socket type. Only the SOCK_DGRAM is supported.\n" \
"\tThe listenning socket type. Only the SOCK_DGRAM and the SOCK_STREAM are supported.\n" \
"\n" \
"-v | --verbose\n" \
"\tShow all output messages.\n"
123,6 → 123,8
int parse_socket_type( const char * name ){
if( str_lcmp( name, "SOCK_DGRAM", 11 ) == 0 ){
return SOCK_DGRAM;
}else if( str_lcmp( name, "SOCK_STREAM", 12 ) == 0 ){
return SOCK_STREAM;
}
return ESOCKTNOSUPPORT;
}
147,6 → 149,7
char address_string[ INET6_ADDRSTRLEN ];
uint8_t * address_start;
int socket_id;
int listening_id;
char * data;
size_t length;
int index;
159,7 → 162,7
for( index = 1; index < argc; ++ index ){
if( argv[ index ][ 0 ] == '-' ){
switch( argv[ index ][ 1 ] ){
case 'c': ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & count, "count", 0 ));
case 'c': ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & count, "message count", 0 ));
break;
case 'f': ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & family, "protocol family", 0, parse_protocol_family ));
break;
174,13 → 177,13
case 's': ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & value, "receive size", 0 ));
size = (value >= 0 ) ? ( size_t ) value : 0;
break;
case 't': ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & value, "socket_type", 0, parse_socket_type ));
case 't': ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & value, "socket type", 0, parse_socket_type ));
type = ( sock_type_t ) value;
break;
case 'v': verbose = 1;
break;
case '-': if( str_lcmp( argv[ index ] + 2, "count=", 6 ) == 0 ){
ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & count, "received count", 8 ))
ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & count, "message count", 8 ));
}else if( str_lcmp( argv[ index ] + 2, "family=", 7 ) == 0 ){
ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & family, "protocol family", 9, parse_protocol_family ));
}else if( str_lcmp( argv[ index ] + 2, "help", 5 ) == 0 ){
195,7 → 198,7
ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & value, "receive size", 7 ));
size = (value >= 0 ) ? ( size_t ) value : 0;
}else if( str_lcmp( argv[ index ] + 2, "type=", 5 ) == 0 ){
ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & value, "socket_type", 7, parse_socket_type ));
ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & value, "socket type", 7, parse_socket_type ));
type = ( sock_type_t ) value;
}else if( str_lcmp( argv[ index ] + 2, "verbose", 8 ) == 0 ){
verbose = 1;
230,10 → 233,10
 
reply_length = reply ? str_length( reply ) : 0;
 
socket_id = socket( family, type, 0 );
if( socket_id < 0 ){
fprintf( stderr, "Socket create error %d\n", socket_id );
return socket_id;
listening_id = socket( family, type, 0 );
if( listening_id < 0 ){
socket_print_error( stderr, listening_id, "Socket create: ", "\n" );
return listening_id;
}
 
bzero( address_data, max_length );
240,12 → 243,12
switch( family ){
case PF_INET:
address_in->sin_family = AF_INET;
address_in->sin_port = port;
address_in->sin_port = htons( port );
addrlen = sizeof( struct sockaddr_in );
break;
case PF_INET6:
address_in6->sin6_family = AF_INET6;
address_in6->sin6_port = port;
address_in6->sin6_port = htons( port );
addrlen = sizeof( struct sockaddr_in6 );
break;
default:
252,7 → 255,23
fprintf( stderr, "Protocol family is not supported\n" );
return EAFNOSUPPORT;
}
if( ERROR_OCCURRED( bind( socket_id, address, addrlen ))){
 
listening_id = socket( family, type, 0 );
if( listening_id < 0 ){
socket_print_error( stderr, listening_id, "Socket create: ", "\n" );
return listening_id;
}
 
if( type == SOCK_STREAM ){
if( ERROR_OCCURRED( listen( listening_id, 3 ))){
socket_print_error( stderr, ERROR_CODE, "Socket listen: ", "\n" );
return ERROR_CODE;
}
}else{
socket_id = listening_id;
}
 
if( ERROR_OCCURRED( bind( listening_id, address, addrlen ))){
socket_print_error( stderr, ERROR_CODE, "Socket bind: ", "\n" );
return ERROR_CODE;
}
261,36 → 280,49
 
while( count ){
addrlen = max_length;
value = recvfrom( socket_id, data, size, 0, address, & addrlen );
if( value < 0 ){
socket_print_error( stderr, value, "Socket receive: ", "\n" );
}else{
length = ( size_t ) value;
if( verbose ){
address_start = NULL;
switch( address->sa_family ){
case AF_INET:
port = address_in->sin_port;
address_start = ( uint8_t * ) & address_in->sin_addr.s_addr;
break;
case AF_INET6:
port = address_in6->sin6_port;
address_start = ( uint8_t * ) & address_in6->sin6_addr.s6_addr;
break;
default:
fprintf( stderr, "Address family %d (0x%X) is not supported.\n", address->sa_family );
}
if( address_start ){
if( ERROR_OCCURRED( inet_ntop( address->sa_family, address_start, address_string, sizeof( address_string )))){
fprintf( stderr, "Received address error %d\n", ERROR_CODE );
}else{
data[ length ] = '\0';
printf( "Received %d bytes from %s:%d\n%s\n", length, address_string, port, data );
if( type == SOCK_STREAM ){
socket_id = accept( listening_id, address, & addrlen );
if( socket_id <= 0 ){
socket_print_error( stderr, socket_id, "Socket accept: ", "\n" );
}
}
if( socket_id > 0 ){
value = recvfrom( socket_id, data, size, 0, address, & addrlen );
if( value < 0 ){
socket_print_error( stderr, value, "Socket receive: ", "\n" );
}else{
length = ( size_t ) value;
if( verbose ){
address_start = NULL;
switch( address->sa_family ){
case AF_INET:
port = ntohs( address_in->sin_port );
address_start = ( uint8_t * ) & address_in->sin_addr.s_addr;
break;
case AF_INET6:
port = ntohs( address_in6->sin6_port );
address_start = ( uint8_t * ) & address_in6->sin6_addr.s6_addr;
break;
default:
fprintf( stderr, "Address family %d (0x%X) is not supported.\n", address->sa_family );
}
if( address_start ){
if( ERROR_OCCURRED( inet_ntop( address->sa_family, address_start, address_string, sizeof( address_string )))){
fprintf( stderr, "Received address error %d\n", ERROR_CODE );
}else{
data[ length ] = '\0';
printf( "Received %d bytes from %s:%d\n%s\n", length, address_string, port, data );
}
}
}
if( ERROR_OCCURRED( sendto( socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen ))){
socket_print_error( stderr, ERROR_CODE, "Socket send: ", "\n" );
}
}
if( ERROR_OCCURRED( sendto( socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen ))){
socket_print_error( stderr, ERROR_CODE, "Socket send: ", "\n" );
if( type == SOCK_STREAM ){
if( ERROR_OCCURRED( closesocket( socket_id ))){
socket_print_error( stderr, ERROR_CODE, "Close socket: ", "\n" );
}
}
}
if( count > 0 ){
301,7 → 333,7
 
if( verbose ) printf( "Closing the socket\n" );
 
if( ERROR_OCCURRED( closesocket( socket_id ))){
if( ERROR_OCCURRED( closesocket( listening_id ))){
socket_print_error( stderr, ERROR_CODE, "Close socket: ", "\n" );
return ERROR_CODE;
}