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

File:

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

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

@@ -42 +42 @@
 #include <stdint.h>
 #include <str.h>
+
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <net_err.h>
-#include <net_messages.h>
-#include <net_modules.h>
-#include <packet/packet_client.h>
-#include <packet_remote.h>
-#include <net_byteorder.h>
-#include <net_checksum.h>
-#include <icmp_api.h>
-#include <icmp_client.h>
-#include <icmp_codes.h>
-#include <icmp_common.h>
-#include <icmp_interface.h>
-#include <il_interface.h>
-#include <inet.h>
-#include <ip_client.h>
-#include <ip_interface.h>
-#include <ip_protocols.h>
-#include <net_interface.h>
-#include <socket_codes.h>
-#include <socket_errno.h>
-#include <tl_messages.h>
-#include <tl_interface.h>
-#include <tl_local.h>
-#include <icmp_messages.h>
-#include <icmp_header.h>
+#include "../../err.h"
+#include "../../messages.h"
+#include "../../modules.h"
+
+#include "../../structures/packet/packet_client.h"
+
+#include "../../include/byteorder.h"
+#include "../../include/checksum.h"
+#include "../../include/icmp_api.h"
+#include "../../include/icmp_client.h"
+#include "../../include/icmp_codes.h"
+#include "../../include/icmp_common.h"
+#include "../../include/icmp_interface.h"
+#include "../../include/il_interface.h"
+#include "../../include/inet.h"
+#include "../../include/ip_client.h"
+#include "../../include/ip_interface.h"
+#include "../../include/ip_protocols.h"
+#include "../../include/net_interface.h"
+#include "../../include/socket_codes.h"
+#include "../../include/socket_errno.h"
+
+#include "../../tl/tl_messages.h"
 
 #include "icmp.h"
+#include "icmp_header.h"
+#include "icmp_messages.h"
 #include "icmp_module.h"
-
-/** ICMP module name.
- */
-#define NAME    "ICMP protocol"
 
 /** Default ICMP error reporting.
@@ -291 +289 @@
         // 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 +627 @@
         // 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 +642 @@
 }
 
-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 +650 @@
         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 +760 @@
         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 +785 @@
 
 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 +820 @@
 }
 
-/** Default thread for new connections.
- *
- *  @param[in] iid The initial message identifier.
- *  @param[in] icall The initial message call structure.
- *
- */
-static void tl_client_connection(ipc_callid_t iid, ipc_call_t * icall)
-{
-        /*
-         * Accept the connection
-         *  - Answer the first IPC_M_CONNECT_ME_TO call.
-         */
-        ipc_answer_0(iid, EOK);
-        
-        while(true) {
-                ipc_call_t answer;
-                int answer_count;
-                
-                /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
-                
-                /* Fetch the next message */
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                /* Process the message */
-                int res = tl_module_message_standalone(callid, &call, &answer,
-                    &answer_count);
-                
-                /* End if said to either by the message or the processing result */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
-                        return;
-                
-                /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
-        }
-}
-
-/** Starts the module.
- *
- *  @param argc The count of the command line arguments. Ignored parameter.
- *  @param argv The command line parameters. Ignored parameter.
- *
- *  @returns EOK on success.
- *  @returns Other error codes as defined for each specific module start function.
- *
- */
-int main(int argc, char *argv[])
-{
-        ERROR_DECLARE;
-        
-        /* Start the module */
-        if (ERROR_OCCURRED(tl_module_start_standalone(tl_client_connection)))
-                return ERROR_CODE;
-        
-        return EOK;
-}
-
 /** @}
  */