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

File:

• uspace/srv/net/tl/icmp/icmp.c (modified) (2 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 <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 <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.
@@ -819 +820 @@
 }
 
-#ifdef CONFIG_NETWORKING_modular
-
-#include <tl_standalone.h>
-
-/** 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(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;
-        
-        /* Print the module label */
-        printf("Task %d - %s\n", task_get_id(), NAME);
-        
-        /* Start the module */
-        if (ERROR_OCCURRED(tl_module_start(tl_client_connection))) {
-                printf(" - ERROR %i\n", ERROR_CODE);
-                return ERROR_CODE;
-        }
-        
-        return EOK;
-}
-
-#endif /* CONFIG_NETWORKING_modular */
-
 /** @}
  */