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

File:

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

uspace/srv/net/tl/udp/udp.c

@@ -192 +192 @@
         ERROR_DECLARE;
 
-        measured_string_t       names[] = {{ str_dup("UDP_CHECKSUM_COMPUTING"), 22 }, { str_dup("UDP_AUTOBINDING"), 15 }};
+        measured_string_t       names[] = {{ "UDP_CHECKSUM_COMPUTING", 22 }, { "UDP_AUTOBINDING", 15 }};
         measured_string_ref     configuration;
         size_t                          count = sizeof( names ) / sizeof( measured_string_t );
@@ -390 +390 @@
         fibril_rwlock_write_unlock( & udp_globals.lock );
         async_msg_5( socket->phone, NET_SOCKET_RECEIVED, ( ipcarg_t ) socket->socket_id, packet_dimension->content, 0, 0, ( ipcarg_t ) fragments );
-/*      fibril_rwlock_write_unlock( & udp_globals.lock );
-        async_msg_5( socket->phone, NET_SOCKET_RECEIVED, ( ipcarg_t ) socket->socket_id, 0, 0, 0, ( ipcarg_t ) fragments );
-*/      return EOK;
+        return EOK;
 }
 
@@ -429 +427 @@
          *  - Answer the first IPC_M_CONNECT_TO_ME call.
          */
-        ipc_answer_0( callid, EOK );
+        res = EOK;
+        answer_count = 0;
 
         // The client connection is only in one fibril and therefore no additional locks are needed.
@@ -437 +436 @@
 
         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 );
-//              printf( "message %d\n", IPC_GET_METHOD( * call ));
-
+
+                // process the call
                 switch( IPC_GET_METHOD( call )){
                         case IPC_M_PHONE_HUNGUP:
                                 keep_on_going = false;
-                                res = EOK;
+                                res = EHANGUP;
                                 break;
                         case NET_SOCKET:
@@ -514 +518 @@
                                 break;
                 }
-
-//              printf( "res = %d\n", res );
-
-                answer_call( callid, res, & answer, answer_count );
         }
 
@@ -523 +523 @@
         socket_cores_release( udp_globals.net_phone, & local_sockets, & udp_globals.sockets, NULL );
 
-        return EOK;
+        return res;
 }
 
@@ -618 +618 @@
         header->checksum = 0;
         if( udp_globals.checksum_computing ){
-//              if( ERROR_OCCURRED( ip_get_route_req( udp_globals.ip_phone, IPPROTO_UDP, addr, addrlen, & device_id, & ip_header, & headerlen ))){
-//                      return udp_release_and_return( packet, ERROR_CODE );
-//              }
-                if( ERROR_OCCURRED( ip_client_set_pseudo_header_data_length( ip_header, headerlen, total_length + UDP_HEADER_SIZE))){
+                // update the pseudo header
+                if( ERROR_OCCURRED( ip_client_set_pseudo_header_data_length( ip_header, headerlen, total_length + UDP_HEADER_SIZE ))){
                         free( ip_header );
                         return udp_release_and_return( packet, ERROR_CODE );
                 }
+                // finish the checksum computation
                 checksum = compute_checksum( checksum, ip_header, headerlen );
                 checksum = compute_checksum( checksum, ( uint8_t * ) header, sizeof( * header ));