Changes in uspace/srv/net/tl/icmp/icmp.c [14f1db0:849ed54] in mainline

File:

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

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

@@ -51 +51 @@
 #include <net_modules.h>
 #include <packet/packet_client.h>
-#include <packet_remote.h>
 #include <net_byteorder.h>
 #include <net_checksum.h>
@@ -68 +67 @@
 #include <socket_errno.h>
 #include <tl_messages.h>
-#include <tl_interface.h>
-#include <tl_local.h>
 #include <icmp_messages.h>
 #include <icmp_header.h>
@@ -291 +288 @@
         // TODO do not ask all the time
         ERROR_PROPAGATE(ip_packet_size_req(icmp_globals.ip_phone, -1, &icmp_globals.packet_dimension));
-        packet = packet_get_4_remote(icmp_globals.net_phone, size, icmp_globals.packet_dimension.addr_len, ICMP_HEADER_SIZE + icmp_globals.packet_dimension.prefix, icmp_globals.packet_dimension.suffix);
+        packet = packet_get_4(icmp_globals.net_phone, size, icmp_globals.packet_dimension.addr_len, ICMP_HEADER_SIZE + icmp_globals.packet_dimension.prefix, icmp_globals.packet_dimension.suffix);
         if(! packet){
                 return ENOMEM;
@@ -629 +626 @@
         // compute the reply key
         reply_key = ICMP_GET_REPLY_KEY(header->un.echo.identifier, header->un.echo.sequence_number);
-        pq_release_remote(icmp_globals.net_phone, packet_get_id(packet));
+        pq_release(icmp_globals.net_phone, packet_get_id(packet));
         // lock the globals
         fibril_rwlock_write_lock(&icmp_globals.lock);
@@ -644 +641 @@
 }
 
-int icmp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int icmp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
         ERROR_DECLARE;
 
@@ -652 +649 @@
         switch(IPC_GET_METHOD(*call)){
                 case NET_TL_RECEIVED:
-                        if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 ERROR_CODE = icmp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_ICMP, IPC_GET_ERROR(call));
                         }
@@ -762 +759 @@
         switch(IPC_GET_METHOD(*call)){
                 case NET_ICMP_DEST_UNREACH:
-                        if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 ERROR_CODE = icmp_destination_unreachable_msg(0, ICMP_GET_CODE(call), ICMP_GET_MTU(call), packet);
                         }
                         return ERROR_CODE;
                 case NET_ICMP_SOURCE_QUENCH:
-                        if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 ERROR_CODE = icmp_source_quench_msg(0, packet);
                         }
                         return ERROR_CODE;
                 case NET_ICMP_TIME_EXCEEDED:
-                        if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 ERROR_CODE = icmp_time_exceeded_msg(0, ICMP_GET_CODE(call), packet);
                         }
                         return ERROR_CODE;
                 case NET_ICMP_PARAMETERPROB:
-                        if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 ERROR_CODE = icmp_parameter_problem_msg(0, ICMP_GET_CODE(call), ICMP_GET_POINTER(call), packet);
                         }
@@ -787 +784 @@
 
 int icmp_release_and_return(packet_t packet, int result){
-        pq_release_remote(icmp_globals.net_phone, packet_get_id(packet));
+        pq_release(icmp_globals.net_phone, packet_get_id(packet));
         return result;
 }
@@ -822 +819 @@
 }
 
+#ifdef CONFIG_NETWORKING_modular
+
+#include <tl_standalone.h>
+
 /** Default thread for new connections.
  *
@@ -848 +849 @@
                 
                 /* Process the message */
-                int res = tl_module_message_standalone(callid, &call, &answer,
-                    &answer_count);
+                int res = tl_module_message(callid, &call, &answer, &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -873 +873 @@
         ERROR_DECLARE;
         
+        /* Print the module label */
+        printf("Task %d - %s\n", task_get_id(), NAME);
+        
         /* Start the module */
-        if (ERROR_OCCURRED(tl_module_start_standalone(tl_client_connection)))
+        if (ERROR_OCCURRED(tl_module_start(tl_client_connection))) {
+                printf(" - ERROR %i\n", ERROR_CODE);
                 return ERROR_CODE;
+        }
         
         return EOK;
 }
 
+#endif /* CONFIG_NETWORKING_modular */
+
 /** @}
  */