Changes in uspace/srv/net/tl/icmp/icmp.c [a000878c:2e99277] in mainline

File:

• uspace/srv/net/tl/icmp/icmp.c (modified) (7 diffs)

uspace/srv/net/tl/icmp/icmp.c

@@ -464 +464 @@
         ERROR_DECLARE;
 
-        measured_string_t       names[] = {{ str_dup("ICMP_ERROR_REPORTING"), 20 }, { str_dup("ICMP_ECHO_REPLYING"), 18 }};
+        measured_string_t       names[] = {{ "ICMP_ERROR_REPORTING", 20 }, { "ICMP_ECHO_REPLYING", 18 }};
         measured_string_ref     configuration;
         size_t                          count = sizeof( names ) / sizeof( measured_string_t );
@@ -658 +658 @@
         ipc_callid_t                    data_callid;
         icmp_echo_ref                   echo_data;
+        int                                             res;
 
         /*
@@ -663 +664 @@
          *  - Answer the first NET_ICMP_INIT call.
          */
-        ipc_answer_0( callid, EOK );
+        res = EOK;
+        answer_count = 0;
 
 //      fibril_rwlock_initialize( & lock );
@@ -669 +671 @@
         echo_data = ( icmp_echo_ref ) malloc( sizeof( * echo_data ));
         if( ! echo_data ) return ENOMEM;
+
         // assign a new identifier
         fibril_rwlock_write_lock( & icmp_globals.lock );
-        ERROR_CODE = icmp_bind_free_id( echo_data );
+        res = icmp_bind_free_id( echo_data );
         fibril_rwlock_write_unlock( & icmp_globals.lock );
-        if( ERROR_CODE < 0 ){
+        if( res < 0 ){
                 free( echo_data );
-                return ERROR_CODE;
+                return res;
         }
 
         while( keep_on_going ){
+
+                // answer the call
+                answer_call( callid, res, & answer, answer_count );
+
+                // refresh data
                 refresh_answer( & answer, & answer_count );
 
+                // get the next call
                 callid = async_get_call( & call );
 
+                // process the call
                 switch( IPC_GET_METHOD( call )){
                         case IPC_M_PHONE_HUNGUP:
                                 keep_on_going = false;
-                                ERROR_CODE = EOK;
+                                res = EHANGUP;
                                 break;
                         case NET_ICMP_ECHO:
 //                              fibril_rwlock_write_lock( & lock );
                                 if( ! async_data_write_receive( & data_callid, & length )){
-                                        ERROR_CODE = EINVAL;
+                                        res = EINVAL;
                                 }else{
                                         addr = malloc( length );
                                         if( ! addr ){
-                                                ERROR_CODE = ENOMEM;
+                                                res = ENOMEM;
                                         }else{
                                                 if( ! ERROR_OCCURRED( async_data_write_finalize( data_callid, addr, length ))){
                                                         fibril_rwlock_write_lock( & icmp_globals.lock );
-                                                        ERROR_CODE = icmp_echo( echo_data->identifier, echo_data->sequence_number, ICMP_GET_SIZE( call ), ICMP_GET_TIMEOUT( call ), ICMP_GET_TTL( call ), ICMP_GET_TOS( call ), ICMP_GET_DONT_FRAGMENT( call ), addr, ( socklen_t ) length );
+                                                        res = icmp_echo( echo_data->identifier, echo_data->sequence_number, ICMP_GET_SIZE( call ), ICMP_GET_TIMEOUT( call ), ICMP_GET_TTL( call ), ICMP_GET_TOS( call ), ICMP_GET_DONT_FRAGMENT( call ), addr, ( socklen_t ) length );
                                                         fibril_rwlock_write_unlock( & icmp_globals.lock );
                                                         free( addr );
@@ -707 +717 @@
                                                                 echo_data->sequence_number = 0;
                                                         }
+                                                }else{
+                                                        res = ERROR_CODE;
                                                 }
                                         }
@@ -713 +725 @@
                                 break;
                         default:
-                                ERROR_CODE = icmp_process_message( & call );
+                                res = icmp_process_message( & call );
                 }
-
-                answer_call( callid, ERROR_CODE, & answer, answer_count );
         }
 
@@ -723 +733 @@
         icmp_echo_data_exclude( & icmp_globals.echo_data, echo_data->identifier );
         fibril_rwlock_write_unlock( & icmp_globals.lock );
-        return EOK;
+        return res;
 }