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

File:

• uspace/srv/net/il/arp/arp.c (modified) (12 diffs)

uspace/srv/net/il/arp/arp.c

@@ -43 +43 @@
 #include <str.h>
 #include <task.h>
-
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 
-#include "../../err.h"
-#include "../../messages.h"
-#include "../../modules.h"
-
-#include "../../include/byteorder.h"
-#include "../../include/device.h"
-#include "../../include/arp_interface.h"
-#include "../../include/nil_interface.h"
-#include "../../include/protocol_map.h"
-
-#include "../../structures/measured_strings.h"
-#include "../../structures/packet/packet.h"
-#include "../../structures/packet/packet_client.h"
-
-#include "../il_messages.h"
+#include <net_err.h>
+#include <net_messages.h>
+#include <net_modules.h>
+#include <net_byteorder.h>
+#include <net_device.h>
+#include <arp_interface.h>
+#include <nil_interface.h>
+#include <protocol_map.h>
+#include <adt/measured_strings.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <packet_remote.h>
+#include <il_messages.h>
+#include <il_interface.h>
+#include <il_local.h>
+#include <arp_messages.h>
 
 #include "arp.h"
@@ -67 +67 @@
 #include "arp_oc.h"
 #include "arp_module.h"
-#include "arp_messages.h"
+
+
+/** ARP module name.
+ */
+#define NAME  "arp"
 
 /** ARP global data.
@@ -337 +341 @@
                         return ERROR_CODE;
                 }
-                printf("New device registered:\n\tid\t= %d\n\ttype\t= 0x%x\n\tservice\t= %d\n\tproto\t= %d\n", device->device_id, device->hardware, device->service, protocol);
+                printf("%s: Device registered (id: %d, type: 0x%x, service: %d, proto: %d)\n",
+                    NAME, device->device_id, device->hardware, device->service, protocol);
         }
         fibril_rwlock_write_unlock(&arp_globals.lock);
@@ -368 +373 @@
 }
 
-int arp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int arp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, int *answer_count)
+{
         ERROR_DECLARE;
-
+        
         measured_string_ref address;
         measured_string_ref translation;
@@ -376 +383 @@
         packet_t packet;
         packet_t next;
-
-//      printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_ARP_FIRST);
+        
         *answer_count = 0;
-        switch(IPC_GET_METHOD(*call)){
+        switch (IPC_GET_METHOD(*call)) {
                 case IPC_M_PHONE_HUNGUP:
                         return EOK;
@@ -416 +422 @@
                         return EOK;
                 case NET_IL_RECEIVED:
-                        if(! ERROR_OCCURRED(packet_translate(arp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate_remote(arp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 fibril_rwlock_read_lock(&arp_globals.lock);
                                 do{
@@ -422 +428 @@
                                         ERROR_CODE = arp_receive_message(IPC_GET_DEVICE(call), packet);
                                         if(ERROR_CODE != 1){
-                                                pq_release(arp_globals.net_phone, packet_get_id(packet));
+                                                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
                                         }
                                         packet = next;
@@ -432 +438 @@
                         return arp_mtu_changed_message(IPC_GET_DEVICE(call), IPC_GET_MTU(call));
         }
+        
         return ENOTSUP;
 }
@@ -568 +575 @@
                 return NULL;
         }
-        packet = packet_get_4(arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix);
+        packet = packet_get_4_remote(arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix);
         if(! packet){
                 return NULL;
@@ -574 +581 @@
         header = (arp_header_ref) packet_suffix(packet, length);
         if(! header){
-                pq_release(arp_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
                 return NULL;
         }
@@ -591 +598 @@
         memcpy(((uint8_t *) header) + length, target->value, target->length);
         if(packet_set_addr(packet, (uint8_t *) device->addr->value, (uint8_t *) device->broadcast_addr->value, CONVERT_SIZE(char, uint8_t, device->addr->length)) != EOK){
-                pq_release(arp_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
                 return NULL;
         }
@@ -618 +625 @@
 }
 
+/** Default thread for new connections.
+ *
+ *  @param[in] iid The initial message identifier.
+ *  @param[in] icall The initial message call structure.
+ *
+ */
+static void il_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 = il_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(il_module_start_standalone(il_client_connection)))
+                return ERROR_CODE;
+        
+        return EOK;
+}
+
 /** @}
  */