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

File:

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

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

@@ -57 +57 @@
 #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>
 
@@ -71 +68 @@
 /** ARP module name.
  */
-#define NAME  "arp"
+#define NAME    "ARP protocol"
 
 /** ARP global data.
@@ -341 +338 @@
                         return ERROR_CODE;
                 }
-                printf("%s: Device registered (id: %d, type: 0x%x, service: %d, proto: %d)\n",
-                    NAME, device->device_id, device->hardware, device->service, protocol);
+                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);
         }
         fibril_rwlock_write_unlock(&arp_globals.lock);
@@ -373 +369 @@
 }
 
-int arp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
-{
+int arp_message(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;
@@ -383 +377 @@
         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;
@@ -422 +417 @@
                         return EOK;
                 case NET_IL_RECEIVED:
-                        if(! ERROR_OCCURRED(packet_translate_remote(arp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
+                        if(! ERROR_OCCURRED(packet_translate(arp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){
                                 fibril_rwlock_read_lock(&arp_globals.lock);
                                 do{
@@ -428 +423 @@
                                         ERROR_CODE = arp_receive_message(IPC_GET_DEVICE(call), packet);
                                         if(ERROR_CODE != 1){
-                                                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
+                                                pq_release(arp_globals.net_phone, packet_get_id(packet));
                                         }
                                         packet = next;
@@ -438 +433 @@
                         return arp_mtu_changed_message(IPC_GET_DEVICE(call), IPC_GET_MTU(call));
         }
-        
         return ENOTSUP;
 }
@@ -575 +569 @@
                 return NULL;
         }
-        packet = packet_get_4_remote(arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix);
+        packet = packet_get_4(arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix);
         if(! packet){
                 return NULL;
@@ -581 +575 @@
         header = (arp_header_ref) packet_suffix(packet, length);
         if(! header){
-                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
+                pq_release(arp_globals.net_phone, packet_get_id(packet));
                 return NULL;
         }
@@ -598 +592 @@
         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_remote(arp_globals.net_phone, packet_get_id(packet));
+                pq_release(arp_globals.net_phone, packet_get_id(packet));
                 return NULL;
         }
@@ -624 +618 @@
         }
 }
+
+#ifdef CONFIG_NETWORKING_modular
+
+#include <il_standalone.h>
 
 /** Default thread for new connections.
@@ -651 +649 @@
                 
                 /* Process the message */
-                int res = il_module_message_standalone(callid, &call, &answer,
-                    &answer_count);
+                int res = il_module_message(callid, &call, &answer, &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -676 +673 @@
         ERROR_DECLARE;
         
+        /* Print the module label */
+        printf("Task %d - %s\n", task_get_id(), NAME);
+        
         /* Start the module */
-        if (ERROR_OCCURRED(il_module_start_standalone(il_client_connection)))
+        if (ERROR_OCCURRED(il_module_start(il_client_connection))) {
+                printf(" - ERROR %i\n", ERROR_CODE);
                 return ERROR_CODE;
+        }
         
         return EOK;
 }
 
+#endif /* CONFIG_NETWORKING_modular */
+
 /** @}
  */