Changeset 8b655705 in mainline for uspace/srv/net/il/arp/arp.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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:

Merge mainline changes.

File:

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

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

@@ -45 +45 @@
 #include <task.h>
 #include <adt/measured_strings.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/net.h>
@@ -158 +157 @@
                         
                         arp_clear_addr(&proto->addresses);
-                        arp_addr_destroy(&proto->addresses);
-                }
-        }
-        
-        arp_protos_clear(&device->protos);
+                        arp_addr_destroy(&proto->addresses, free);
+                }
+        }
+        
+        arp_protos_clear(&device->protos, free);
 }
 
@@ -185 +184 @@
         }
         
-        arp_cache_clear(&arp_globals.cache);
+        arp_cache_clear(&arp_globals.cache, free);
         fibril_mutex_unlock(&arp_globals.lock);
         
@@ -213 +212 @@
                 arp_clear_trans(trans);
         
-        arp_addr_exclude(&proto->addresses, address->value, address->length);
+        arp_addr_exclude(&proto->addresses, address->value, address->length, free);
         
         fibril_mutex_unlock(&arp_globals.lock);
@@ -346 +345 @@
                             header->protocol_length, trans);
                         if (rc != EOK) {
-                                /* The generic char map has already freed trans! */
+                                free(trans);
                                 return rc;
                         }
@@ -428 +427 @@
                 case NET_IL_DEVICE_STATE:
                         /* Do nothing - keep the cache */
-                        ipc_answer_0(iid, (sysarg_t) EOK);
+                        async_answer_0(iid, (sysarg_t) EOK);
                         break;
                 
@@ -448 +447 @@
                                 fibril_mutex_unlock(&arp_globals.lock);
                         }
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
@@ -454 +453 @@
                         rc = arp_mtu_changed_message(IPC_GET_DEVICE(*icall),
                             IPC_GET_MTU(*icall));
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
                 default:
-                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
+                        async_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 
@@ -557 +556 @@
                 if (index < 0) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return index;
@@ -570 +569 @@
                 if (device->phone < 0) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return EREFUSED;
@@ -580 +579 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -590 +589 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -602 +601 @@
                         free(device->addr);
                         free(device->addr_data);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -615 +614 @@
                         free(device->broadcast_addr);
                         free(device->broadcast_data);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -747 +746 @@
                         arp_clear_trans(trans);
                         arp_addr_exclude(&proto->addresses, target->value,
-                            target->length);
+                            target->length, free);
                         return EAGAIN;
                 }
@@ -795 +794 @@
             trans);
         if (rc != EOK) {
-                /* The generic char map has already freed trans! */
+                free(trans);
                 return rc;
         }
@@ -808 +807 @@
                 arp_clear_trans(trans);
                 arp_addr_exclude(&proto->addresses, target->value,
-                    target->length);
+                    target->length, free);
                 return ENOENT;
         }