WebSVN – HelenOS – Diff – /branches/network/uspace/srv/net/app/ping/ping.c

 #include <time.h>
 #include <ipc/services.h>
 #include "../../include/icmp_api.h"
 #include "../../include/in.h"
+#include "../../include/in6.h"
 #include "../../include/inet.h"
 #include "../../include/ip_codes.h"
-#include "../../include/socket_codes.h"
+#include "../../include/socket_errno.h"
 #include "../../err.h"
 #include "../parse.h"
+#include "../print_error.h"
 /** Echo module name.
  */
 #define NAME    "Ping"
 void    print_help( void );
 /** Translates the character string to the address family number.
  *  @param name The address family name. Input parameter.
  *  @returns The corresponding address family number.
+ *  @returns EAFNOSUPPORTED if the address family is not supported.
  */
-int parse_address_family( const char * name );
+int     parse_address_family( const char * name );
 void print_help( void ){
     printf(
         "Network Ping aplication\n" \
         "Usage: ping [options] numeric_address\n" \
         "\n" \
         "--dont_fragment\n" \
         "\tDisable packet fragmentation.\n"
         "\n" \
         "-f address_family | --family=address_family\n" \
-        "\tThe given address family. Only the AF_INET is supported.\n"
+        "\tThe given address family. Only the AF_INET and AF_INET6 are supported.\n"
         "\n" \
         "-h | --help\n" \
         "\tShow this application help.\n"
         "\n" \
         "-s packet_size | --size=packet_size\n" \
+}
 int parse_address_family( const char * name ){
     if( str_lcmp( name, "AF_INET", 7 ) == 0 ){
         return AF_INET;
+    }else if( str_lcmp( name, "AF_INET6", 8 ) == 0 ){
+        return AF_INET6;
+    }
-    return ENOENT;
+    return EAFNOSUPPORT;
+}
 int main( int argc, char * argv[] ){
     ERROR_DECLARE;
     int                 dont_fragment   = 0;
     ip_ttl_t            ttl             = 0;
     ip_tos_t            tos             = 0;
     int                 count           = 3;
     suseconds_t         timeout         = 3000;
-    struct sockaddr_in  address         = { .sin_family = AF_INET, .sin_port = 7 };
+    int                 family          = AF_INET;
+    socklen_t           max_length      = sizeof( struct sockaddr_in6 );
+    uint8_t             address_data[ max_length ];
+    struct sockaddr *       address     = ( struct sockaddr * ) address_data;
+    struct sockaddr_in *    address_in      = ( struct sockaddr_in * ) address;
+    struct sockaddr_in6 *   address_in6 = ( struct sockaddr_in6 * ) address;
+    socklen_t           addrlen;
+    char                address_string[ INET6_ADDRSTRLEN ];
+    uint8_t *           address_start;
     int                 icmp_phone;
     struct timeval      time_before;
     struct timeval      time_after;
     int                 result;
     int                 value;
     for( index = 1; index < argc - 1; ++ index ){
         if( argv[ index ][ 0 ] == '-' ){
             switch( argv[ index ][ 1 ] ){
                 case 'c':   ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & count, "count", 0 ));
                             break;
-                case 'f':   ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & value, "address family", 0, parse_address_family ));
+                case 'f':   ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & family, "address family", 0, parse_address_family ));
-                            address.sin_family = ( uint16_t ) value;
                             break;
                 case 'h':   print_help();
                             return EOK;
                             break;
                 case 's':   ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & value, "packet size", 0 ));
                 case '-':   if( str_lcmp( argv[ index ] + 2, "count=", 6 ) == 0 ){
                                 ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & count, "received count", 8 ))
                             }else if( str_lcmp( argv[ index ] + 2, "dont_fragment", 13 ) == 0 ){
                                 dont_fragment = 1;
                             }else if( str_lcmp( argv[ index ] + 2, "family=", 7 ) == 0 ){
-                                ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & value, "address family", 9, parse_address_family ));
+                                ERROR_PROPAGATE( parse_parameter_name_int( argc, argv, & index, & family, "address family", 9, parse_address_family ));
-                                address.sin_family = ( uint16_t ) value;
                             }else if( str_lcmp( argv[ index ] + 2, "help", 5 ) == 0 ){
                                 print_help();
                                 return EOK;
                             }else if( str_lcmp( argv[ index ] + 2, "size=", 5 ) == 0 ){
                                 ERROR_PROPAGATE( parse_parameter_int( argc, argv, & index, & value, "packet size", 7 ));
             print_help();
             return EINVAL;
+        }
+    }
+    bzero( address_data, max_length );
+    switch( family ){
+        case AF_INET:
+            address_in->sin_family = AF_INET;
+            address_start = ( uint8_t * ) & address_in->sin_addr.s_addr;
+            addrlen = sizeof( struct sockaddr_in );
+            break;
+        case AF_INET6:
+            address_in6->sin6_family = AF_INET6;
+            address_start = ( uint8_t * ) & address_in6->sin6_addr.s6_addr;
+            addrlen = sizeof( struct sockaddr_in6 );
+            break;
+        default:
+            fprintf( stderr, "Protocol family is not supported\n" );
+            return EAFNOSUPPORT;
+    }
-    if( ERROR_OCCURRED( inet_pton( address.sin_family, argv[ argc - 1 ], ( uint8_t * ) & address.sin_addr ))){
+    if( ERROR_OCCURRED( inet_pton( family, argv[ argc - 1 ], address_start ))){
         fprintf( stderr, "Address parse error %d\n", ERROR_CODE );
         return ERROR_CODE;
+    }
     icmp_phone = icmp_connect_module( SERVICE_ICMP );
     if( icmp_phone < 0 ){
         fprintf( stderr, "ICMP connect error %d\n", icmp_phone );
+    }
     printf( "PING %d bytes of data\n", size );
+    if( ERROR_OCCURRED( inet_ntop( address->sa_family, address_start, address_string, sizeof( address_string )))){
+        fprintf( stderr, "Address error %d\n", ERROR_CODE );
+    }else{
+        printf( "Address %s:\n", address_string );
+    }
     while( count > 0 ){
         if( ERROR_OCCURRED( gettimeofday( & time_before, NULL ))){
             fprintf( stderr, "Get time of day error %d\n", ERROR_CODE );
             return ERROR_CODE;
+        }
-        result = icmp_echo_msg( icmp_phone, size, timeout, ttl, tos, dont_fragment, ( struct sockaddr * ) & address, sizeof( address ));
+        result = icmp_echo_msg( icmp_phone, size, timeout, ttl, tos, dont_fragment, address, addrlen );
         if( ERROR_OCCURRED( gettimeofday( & time_after, NULL ))){
             fprintf( stderr, "Get time of day error %d\n", ERROR_CODE );
             return ERROR_CODE;
+        }
         switch( result ){
             case ICMP_ECHO:
                 printf( "Ping round trip time %d microseconds\n", tv_sub( & time_after, & time_before ));
                 break;
-            case ELIMIT:
+            case ETIMEOUT:
                 printf( "Timeouted.\n" );
                 break;
             default:
-                printf( "Error %d.\n", result );
+                print_error( stdout, result, NULL, "\n" );
+        }
         -- count;
+    }
     if( verbose ) printf( "Exiting\n" );

Subversion Repositories HelenOS

(root)/branches/network/uspace/srv/net/app/ping/ping.c – Rev 4717 → 4720