Changeset 3d016ac in mainline

Timestamp:

2012-03-07T18:54:08Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0e25780

Parents:

f9d3dd4

Message:

Prototype sending of ARP requests.

Location:

uspace/srv/ethip

Files:

• arp.c (modified) (3 diffs)
• arp.h (modified) (1 diff)
• atrans.c (modified) (3 diffs)
• atrans.h (modified) (1 diff)
• ethip.c (modified) (2 diffs)
• ethip.h (modified) (1 diff)

uspace/srv/ethip/arp.c

@@ -47 +47 @@
 #include "std.h"
 
+/** Time to wait for ARP reply in microseconds */
+#define ARP_REQUEST_TIMEOUT (3 * 1000 * 1000)
+
 static int arp_send_packet(ethip_nic_t *nic, arp_eth_packet_t *packet);
 
@@ -64 +67 @@
         log_msg(LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x",
             packet.opcode, packet.target_proto_addr.ipv4);
-        if (packet.opcode == aop_request) {
-                log_msg(LVL_DEBUG, "ARP request");
 
-                laddr = ethip_nic_addr_find(nic, &packet.target_proto_addr);
-                if (laddr != NULL) {
-                        log_msg(LVL_DEBUG, "Request on my address");
+        laddr = ethip_nic_addr_find(nic, &packet.target_proto_addr);
+        if (laddr != NULL) {
+                log_msg(LVL_DEBUG, "Request/reply to my address");
 
-                        (void) atrans_add(&packet.sender_proto_addr,
-                            &packet.sender_hw_addr);
+                (void) atrans_add(&packet.sender_proto_addr,
+                    &packet.sender_hw_addr);
 
-                        reply.opcode = aop_reply;
-                        reply.sender_hw_addr = nic->mac_addr;
+                if (packet.opcode == aop_request) {
+                        reply.opcode = aop_reply;
+                        reply.sender_hw_addr = nic->mac_addr;
                         reply.sender_proto_addr = laddr->addr;
                         reply.target_hw_addr = packet.sender_hw_addr;
@@ -83 +85 @@
                 }
         }
+}
+
+int arp_translate(ethip_nic_t *nic, iplink_srv_addr_t *src_addr,
+    iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr)
+{
+        int rc;
+        arp_eth_packet_t packet;
+
+        rc = atrans_lookup(ip_addr, mac_addr);
+        if (rc == EOK)
+                return EOK;
+
+        packet.opcode = aop_request;
+        packet.sender_hw_addr = nic->mac_addr;
+        packet.sender_proto_addr = *src_addr;
+        packet.target_hw_addr.addr = MAC48_BROADCAST;
+        packet.target_proto_addr = *ip_addr;
+
+        rc = arp_send_packet(nic, &packet);
+        if (rc != EOK)
+                return rc;
+
+        (void) atrans_wait_timeout(ARP_REQUEST_TIMEOUT);
+
+        return atrans_lookup(ip_addr, mac_addr);
 }
 

uspace/srv/ethip/arp.h

@@ -42 +42 @@
 
 extern void arp_received(ethip_nic_t *, eth_frame_t *);
+extern int arp_translate(ethip_nic_t *, iplink_srv_addr_t *,
+    iplink_srv_addr_t *, mac48_addr_t *);
 
 #endif

uspace/srv/ethip/atrans.c

@@ -47 +47 @@
 static FIBRIL_MUTEX_INITIALIZE(atrans_list_lock);
 static LIST_INITIALIZE(atrans_list);
+static FIBRIL_CONDVAR_INITIALIZE(atrans_cv);
 
 static ethip_atrans_t *atrans_find(iplink_srv_addr_t *ip_addr)
@@ -82 +83 @@
         list_append(&atrans->atrans_list, &atrans_list);
         fibril_mutex_unlock(&atrans_list_lock);
+        fibril_condvar_broadcast(&atrans_cv);
 
         return EOK;
@@ -120 +122 @@
 }
 
+int atrans_wait_timeout(suseconds_t timeout)
+{
+        int rc;
+
+        fibril_mutex_lock(&atrans_list_lock);
+        rc = fibril_condvar_wait_timeout(&atrans_cv, &atrans_list_lock,
+            timeout);
+        fibril_mutex_unlock(&atrans_list_lock);
+
+        return rc;
+}
+
 /** @}
  */

uspace/srv/ethip/atrans.h

@@ -44 +44 @@
 extern int atrans_remove(iplink_srv_addr_t *);
 extern int atrans_lookup(iplink_srv_addr_t *, mac48_addr_t *);
+extern int atrans_wait_timeout(suseconds_t);
 
 #endif

uspace/srv/ethip/ethip.c

@@ -46 +46 @@
 
 #include "arp.h"
-#include "atrans.h"
 #include "ethip.h"
 #include "ethip_nic.h"
@@ -178 +177 @@
         log_msg(LVL_DEBUG, "ethip_send()");
 
-        rc = atrans_lookup(&sdu->ldest, &dest_mac_addr);
+        rc = arp_translate(nic, &sdu->lsrc, &sdu->ldest, &dest_mac_addr);
         if (rc != EOK) {
                 log_msg(LVL_WARN, "Failed to look up IP address 0x%" PRIx32,

uspace/srv/ethip/ethip.h

@@ -43 +43 @@
 #include <loc.h>
 #include <sys/types.h>
+
+#define MAC48_BROADCAST 0xffffffffffff
 
 typedef struct {