Changeset 3bb5735 in mainline

Timestamp:

2010-11-23T20:50:09Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

442ebbe

Parents:

da9f13f3

git-author:

Radim Vansa <radim.vansa@…> (2010-11-23 20:50:09)

git-committer:

Jakub Jermar <jakub@…> (2010-11-23 20:50:09)

Message:

Cherry pick fixes from changeset lp:~helenos-nicf/helenos/nicf,705.

Original description:
Solved first ping timeout

Cleaned up a little and replaced EBUSY with EAGAIN.

Location:

uspace/srv/net/il

Files:

• arp/arp.c (modified) (6 diffs)
• ip/ip.c (modified) (2 diffs)

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

@@ -516 +516 @@
  * @param[in] protocol  The protocol service.
  * @param[in] target    The target protocol address.
- * @return              The hardware address of the target.
- * @return              NULL if the target parameter is NULL.
- * @return              NULL if the device is not found.
- * @return              NULL if the device packet is too small to send a
- *                      request.
- * @return              NULL if the hardware address is not found in the cache.
- */
-static measured_string_t *
+ * @param[out] translation Where the hardware address of the target is stored.
+ * @return              EOK on success.
+ * @return              EAGAIN if the caller should try again.
+ * @return              Other error codes in case of error.
+ */
+static int
 arp_translate_message(device_id_t device_id, services_t protocol,
-    measured_string_t *target)
+    measured_string_t *target, measured_string_t **translation)
 {
         arp_device_t *device;
@@ -533 +531 @@
         packet_t *packet;
         arp_header_t *header;
-
-        if (!target)
-                return NULL;
+        int rc;
+
+        if (!target || !translation)
+                return EBADMEM;
 
         device = arp_cache_find(&arp_globals.cache, device_id);
         if (!device)
-                return NULL;
+                return ENOENT;
 
         proto = arp_protos_find(&device->protos, protocol);
         if (!proto || (proto->addr->length != target->length))
-                return NULL;
+                return ENOENT;
 
         addr = arp_addr_find(&proto->addresses, target->value, target->length);
-        if (addr)
-                return addr;
+        if (addr) {
+                *translation = addr;
+                return EOK;
+        }
 
         /* ARP packet content size = header + (address + translation) * 2 */
@@ -553 +554 @@
             CONVERT_SIZE(char, uint8_t, device->addr->length));
         if (length > device->packet_dimension.content)
-                return NULL;
+                return ELIMIT;
 
         packet = packet_get_4_remote(arp_globals.net_phone,
@@ -559 +560 @@
             length, device->packet_dimension.suffix);
         if (!packet)
-                return NULL;
+                return ENOMEM;
 
         header = (arp_header_t *) packet_suffix(packet, length);
         if (!header) {
                 pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
-                return NULL;
+                return ENOMEM;
         }
 
@@ -583 +584 @@
         memcpy(((uint8_t *) header) + length, target->value, target->length);
 
-        if (packet_set_addr(packet, (uint8_t *) device->addr->value,
+        rc = packet_set_addr(packet, (uint8_t *) device->addr->value,
             (uint8_t *) device->broadcast_addr->value,
-            CONVERT_SIZE(char, uint8_t, device->addr->length)) != EOK) {
+            CONVERT_SIZE(char, uint8_t, device->addr->length));
+        if (rc != EOK) {
                 pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
-                return NULL;
+                return rc;
         }
 
         nil_send_msg(device->phone, device_id, packet, SERVICE_ARP);
-        return NULL;
+        return EAGAIN;
 }
 
@@ -643 +645 @@
                 
                 fibril_rwlock_read_lock(&arp_globals.lock);
-                translation = arp_translate_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), address);
+                rc = arp_translate_message(IPC_GET_DEVICE(call),
+                    IPC_GET_SERVICE(call), address, &translation);
                 free(address);
                 free(data);
+                if (rc != EOK) {
+                        fibril_rwlock_read_unlock(&arp_globals.lock);
+                        return rc;
+                }
                 if (!translation) {
                         fibril_rwlock_read_unlock(&arp_globals.lock);

uspace/srv/net/il/ip/ip.c

@@ -115 +115 @@
 /** The IP localhost address. */
 #define IPV4_LOCALHOST_ADDRESS  htonl((127 << 24) + 1)
+
+/** How many times can arp_translate_req respond EAGAIN before IP gives up */
+#define ARP_EAGAIN_MAX_COUNT 10
 
 /** IP global data. */
@@ -1008 +1011 @@
                 destination.length = CONVERT_SIZE(dest.s_addr, char, 1);
 
-                rc = arp_translate_req(netif->arp->phone, netif->device_id,
-                    SERVICE_IP, &destination, &translation, &data);
+                /** Try calling translate several times, then give up */
+                int count = 0;
+                do {
+                        rc = arp_translate_req(netif->arp->phone,
+                            netif->device_id, SERVICE_IP, &destination,
+                            &translation, &data);
+                        count++;
+                } while (rc == EAGAIN && count <= ARP_EAGAIN_MAX_COUNT);
                 if (rc != EOK) {
                         pq_release_remote(ip_globals.net_phone,