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

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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) (19 diffs)

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

@@ -164 +164 @@
 }
 
-static int arp_clean_cache_req(int arp_phone)
+static int arp_clean_cache_req(void)
 {
         int count;
@@ -190 +190 @@
 }
 
-static int arp_clear_address_req(int arp_phone, device_id_t device_id,
-    services_t protocol, measured_string_t *address)
+static int arp_clear_address_req(device_id_t device_id, services_t protocol,
+    measured_string_t *address)
 {
         fibril_mutex_lock(&arp_globals.lock);
@@ -218 +218 @@
 }
 
-static int arp_clear_device_req(int arp_phone, device_id_t device_id)
+static int arp_clear_device_req(device_id_t device_id)
 {
         fibril_mutex_lock(&arp_globals.lock);
@@ -375 +375 @@
                                 return rc;
                         
-                        nil_send_msg(device->phone, device_id, packet,
+                        nil_send_msg(device->sess, device_id, packet,
                             SERVICE_ARP);
                         return 1;
@@ -416 +416 @@
  * @param[in]     iid   Message identifier.
  * @param[in,out] icall Message parameters.
- *
- */
-static void arp_receiver(ipc_callid_t iid, ipc_call_t *icall)
+ * @param[in]     arg   Local argument.
+ *
+ */
+static void arp_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         packet_t *packet;
@@ -431 +432 @@
                 
                 case NET_IL_RECEIVED:
-                        rc = packet_translate_remote(arp_globals.net_phone, &packet,
+                        rc = packet_translate_remote(arp_globals.net_sess, &packet,
                             IPC_GET_PACKET(*icall));
                         if (rc == EOK) {
@@ -439 +440 @@
                                         rc = arp_receive_message(IPC_GET_DEVICE(*icall), packet);
                                         if (rc != 1) {
-                                                pq_release_remote(arp_globals.net_phone,
+                                                pq_release_remote(arp_globals.net_sess,
                                                     packet_get_id(packet));
                                         }
@@ -564 +565 @@
                 
                 /* Bind */
-                device->phone = nil_bind_service(device->service,
+                device->sess = nil_bind_service(device->service,
                     (sysarg_t) device->device_id, SERVICE_ARP,
                     arp_receiver);
-                if (device->phone < 0) {
+                if (device->sess == NULL) {
                         fibril_mutex_unlock(&arp_globals.lock);
                         arp_protos_destroy(&device->protos, free);
@@ -575 +576 @@
                 
                 /* Get packet dimensions */
-                rc = nil_packet_size_req(device->phone, device_id,
+                rc = nil_packet_size_req(device->sess, device_id,
                     &device->packet_dimension);
                 if (rc != EOK) {
@@ -585 +586 @@
                 
                 /* Get hardware address */
-                rc = nil_get_addr_req(device->phone, device_id, &device->addr,
+                rc = nil_get_addr_req(device->sess, device_id, &device->addr,
                     &device->addr_data);
                 if (rc != EOK) {
@@ -595 +596 @@
                 
                 /* Get broadcast address */
-                rc = nil_get_broadcast_addr_req(device->phone, device_id,
+                rc = nil_get_broadcast_addr_req(device->sess, device_id,
                     &device->broadcast_addr, &device->broadcast_data);
                 if (rc != EOK) {
@@ -627 +628 @@
 }
 
-int il_initialize(int net_phone)
+int il_initialize(async_sess_t *net_sess)
 {
         fibril_mutex_initialize(&arp_globals.lock);
         
         fibril_mutex_lock(&arp_globals.lock);
-        arp_globals.net_phone = net_phone;
+        arp_globals.net_sess = net_sess;
         int rc = arp_cache_initialize(&arp_globals.cache);
         fibril_mutex_unlock(&arp_globals.lock);
@@ -647 +648 @@
                 return ELIMIT;
         
-        packet_t *packet = packet_get_4_remote(arp_globals.net_phone,
+        packet_t *packet = packet_get_4_remote(arp_globals.net_sess,
             device->packet_dimension.addr_len, device->packet_dimension.prefix,
             length, device->packet_dimension.suffix);
@@ -655 +656 @@
         arp_header_t *header = (arp_header_t *) packet_suffix(packet, length);
         if (!header) {
-                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(arp_globals.net_sess, packet_get_id(packet));
                 return ENOMEM;
         }
@@ -680 +681 @@
             (uint8_t *) device->broadcast_addr->value, device->addr->length);
         if (rc != EOK) {
-                pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(arp_globals.net_sess, packet_get_id(packet));
                 return rc;
         }
         
-        nil_send_msg(device->phone, device_id, packet, SERVICE_ARP);
+        nil_send_msg(device->sess, device_id, packet, SERVICE_ARP);
         return EOK;
 }
@@ -845 +846 @@
         
         *count = 0;
+        
+        if (!IPC_GET_IMETHOD(*call))
+                return EOK;
+        
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_PHONE_HUNGUP:
-                return EOK;
-        
         case NET_ARP_DEVICE:
                 rc = measured_strings_receive(&address, &data, 1);
@@ -889 +891 @@
         
         case NET_ARP_CLEAR_DEVICE:
-                return arp_clear_device_req(0, IPC_GET_DEVICE(*call));
+                return arp_clear_device_req(IPC_GET_DEVICE(*call));
         
         case NET_ARP_CLEAR_ADDRESS:
@@ -896 +898 @@
                         return rc;
                 
-                arp_clear_address_req(0, IPC_GET_DEVICE(*call),
+                arp_clear_address_req(IPC_GET_DEVICE(*call),
                     IPC_GET_SERVICE(*call), address);
                 free(address);
@@ -903 +905 @@
         
         case NET_ARP_CLEAN_CACHE:
-                return arp_clean_cache_req(0);
+                return arp_clean_cache_req();
         }