Changeset 977fcea in mainline for uspace/srv/net/il/arp/arp.c

Timestamp:

2011-01-14T10:11:11Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f9dd44d

Parents:

0bd2879 (diff), 6610565b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

development branch merge

File:

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

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

@@ -457 +457 @@
         uint8_t *des_proto;
         int rc;
-
+        
         length = packet_get_data_length(packet);
         if (length <= sizeof(arp_header_t))
@@ -482 +482 @@
         des_hw = src_proto + header->protocol_length;
         des_proto = des_hw + header->hardware_length;
-        trans = arp_addr_find(&proto->addresses, (char *) src_proto,
+        trans = arp_addr_find(&proto->addresses, src_proto,
             header->protocol_length);
         /* Exists? */
@@ -493 +493 @@
         if (proto->addr->length != header->protocol_length)
                 return EINVAL;
-        if (!str_lcmp(proto->addr->value, (char *) des_proto,
-            proto->addr->length)) {
+        
+        if (!bcmp(proto->addr->value, des_proto, proto->addr->length)) {
                 /* Not already updated? */
                 if (!trans) {
@@ -502 +502 @@
                         trans->hw_addr = NULL;
                         fibril_condvar_initialize(&trans->cv);
-                        rc = arp_addr_add(&proto->addresses, (char *) src_proto,
+                        rc = arp_addr_add(&proto->addresses, src_proto,
                             header->protocol_length, trans);
                         if (rc != EOK) {
@@ -510 +510 @@
                 }
                 if (!trans->hw_addr) {
-                        trans->hw_addr = measured_string_create_bulk(
-                            (char *) src_hw, header->hardware_length);
+                        trans->hw_addr = measured_string_create_bulk(src_hw,
+                            header->hardware_length);
                         if (!trans->hw_addr)
                                 return ENOMEM;
-
+                        
                         /* Notify the fibrils that wait for the translation. */
                         fibril_condvar_broadcast(&trans->cv);
@@ -677 +677 @@
 int
 arp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *answer_count)
 {
         measured_string_t *address;
         measured_string_t *translation;
-        char *data;
+        uint8_t *data;
         packet_t *packet;
         packet_t *next;
@@ -696 +696 @@
                         return rc;
                 
-                rc = arp_device_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), ARP_GET_NETIF(call), address);
+                rc = arp_device_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), ARP_GET_NETIF(*call), address);
                 if (rc != EOK) {
                         free(address);
@@ -710 +710 @@
                 
                 fibril_mutex_lock(&arp_globals.lock);
-                rc = arp_translate_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), address, &translation);
+                rc = arp_translate_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), address, &translation);
                 free(address);
                 free(data);
@@ -727 +727 @@
 
         case NET_ARP_CLEAR_DEVICE:
-                return arp_clear_device_req(0, IPC_GET_DEVICE(call));
+                return arp_clear_device_req(0, IPC_GET_DEVICE(*call));
 
         case NET_ARP_CLEAR_ADDRESS:
@@ -734 +734 @@
                         return rc;
                 
-                arp_clear_address_req(0, IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), address);
+                arp_clear_address_req(0, IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), address);
                 free(address);
                 free(data);
@@ -748 +748 @@
         
         case NET_IL_RECEIVED:
+                
                 rc = packet_translate_remote(arp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
@@ -756 +757 @@
                 do {
                         next = pq_detach(packet);
-                        rc = arp_receive_message(IPC_GET_DEVICE(call), packet);
+                        rc = arp_receive_message(IPC_GET_DEVICE(*call), packet);
                         if (rc != 1) {
                                 pq_release_remote(arp_globals.net_phone,
@@ -768 +769 @@
         
         case NET_IL_MTU_CHANGED:
-                return arp_mtu_changed_message(IPC_GET_DEVICE(call),
-                    IPC_GET_MTU(call));
+                return arp_mtu_changed_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_MTU(*call));
         }
         
@@ -790 +791 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t count;
                 
                 /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -801 +802 @@
                 /* Process the message */
                 int res = il_module_message_standalone(callid, &call, &answer,
-                    &answer_count);
+                    &count);
                 
                 /*
@@ -812 +813 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }