Changeset f9d3dd4 in mainline

Timestamp:

2012-02-27T21:16:56Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3d016ac

Parents:

1cc8b42

Message:

Translate IP to MAC addresses based on received ARP requests.

Location:

uspace/srv/ethip

Files:

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

uspace/srv/ethip/Makefile

@@ -32 +32 @@
 SOURCES = \
         arp.c \
+        atrans.c \
         ethip.c \
         ethip_nic.c \

uspace/srv/ethip/arp.c

@@ -41 +41 @@
 
 #include "arp.h"
+#include "atrans.h"
 #include "ethip.h"
 #include "ethip_nic.h"
@@ -69 +70 @@
                 if (laddr != NULL) {
                         log_msg(LVL_DEBUG, "Request on my address");
+
+                        (void) atrans_add(&packet.sender_proto_addr,
+                            &packet.sender_hw_addr);
 
                         reply.opcode = aop_reply;

uspace/srv/ethip/ethip.c

@@ -46 +46 @@
 
 #include "arp.h"
+#include "atrans.h"
 #include "ethip.h"
 #include "ethip_nic.h"
@@ -172 +173 @@
         void *data;
         size_t size;
+        mac48_addr_t dest_mac_addr;
         int rc;
 
         log_msg(LVL_DEBUG, "ethip_send()");
 
-        frame.dest.addr = 0xdeeedeeedeee;
+        rc = atrans_lookup(&sdu->ldest, &dest_mac_addr);
+        if (rc != EOK) {
+                log_msg(LVL_WARN, "Failed to look up IP address 0x%" PRIx32,
+                    sdu->ldest.ipv4);
+                return rc;
+        }
+
+        frame.dest      = dest_mac_addr;
         frame.src       = nic->mac_addr;
         frame.etype_len = ETYPE_IP;

uspace/srv/ethip/ethip.h

@@ -109 +109 @@
 } arp_eth_packet_t;
 
+/** Address translation table element */
+typedef struct {
+        link_t atrans_list;
+        iplink_srv_addr_t ip_addr;
+        mac48_addr_t mac_addr;
+} ethip_atrans_t;
+
 extern int ethip_iplink_init(ethip_nic_t *);
 extern int ethip_received(iplink_srv_t *, void *, size_t);