Index: uspace/srv/ethip/Makefile =================================================================== --- uspace/srv/ethip/Makefile (revision 1cc8b424862f4775586f9c159c55435151abadac) +++ uspace/srv/ethip/Makefile (revision f9d3dd42a7fa78eec449a5bdb934e3fbe205b4f8) @@ -32,4 +32,5 @@ SOURCES = \ arp.c \ + atrans.c \ ethip.c \ ethip_nic.c \ Index: uspace/srv/ethip/arp.c =================================================================== --- uspace/srv/ethip/arp.c (revision 1cc8b424862f4775586f9c159c55435151abadac) +++ uspace/srv/ethip/arp.c (revision f9d3dd42a7fa78eec449a5bdb934e3fbe205b4f8) @@ -41,4 +41,5 @@ #include "arp.h" +#include "atrans.h" #include "ethip.h" #include "ethip_nic.h" @@ -69,4 +70,7 @@ 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; Index: uspace/srv/ethip/atrans.c =================================================================== --- uspace/srv/ethip/atrans.c (revision f9d3dd42a7fa78eec449a5bdb934e3fbe205b4f8) +++ uspace/srv/ethip/atrans.c (revision f9d3dd42a7fa78eec449a5bdb934e3fbe205b4f8) @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup inet + * @{ + */ +/** + * @file + * @brief + */ + +#include +#include +#include +#include +#include + +#include "atrans.h" +#include "ethip.h" + +/** Address translation list (of ethip_atrans_t) */ +static FIBRIL_MUTEX_INITIALIZE(atrans_list_lock); +static LIST_INITIALIZE(atrans_list); + +static ethip_atrans_t *atrans_find(iplink_srv_addr_t *ip_addr) +{ + list_foreach(atrans_list, link) { + ethip_atrans_t *atrans = list_get_instance(link, + ethip_atrans_t, atrans_list); + + if (atrans->ip_addr.ipv4 == ip_addr->ipv4) + return atrans; + } + + return NULL; +} + +int atrans_add(iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr) +{ + ethip_atrans_t *atrans; + ethip_atrans_t *prev; + + atrans = calloc(1, sizeof(ethip_atrans_t)); + if (atrans == NULL) + return ENOMEM; + + atrans->ip_addr = *ip_addr; + atrans->mac_addr = *mac_addr; + + fibril_mutex_lock(&atrans_list_lock); + prev = atrans_find(ip_addr); + if (prev != NULL) { + list_remove(&prev->atrans_list); + free(prev); + } + + list_append(&atrans->atrans_list, &atrans_list); + fibril_mutex_unlock(&atrans_list_lock); + + return EOK; +} + +int atrans_remove(iplink_srv_addr_t *ip_addr) +{ + ethip_atrans_t *atrans; + + fibril_mutex_lock(&atrans_list_lock); + atrans = atrans_find(ip_addr); + if (atrans == NULL) { + fibril_mutex_unlock(&atrans_list_lock); + return ENOENT; + } + + list_remove(&atrans->atrans_list); + fibril_mutex_unlock(&atrans_list_lock); + free(atrans); + + return EOK; +} + +int atrans_lookup(iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr) +{ + ethip_atrans_t *atrans; + + fibril_mutex_lock(&atrans_list_lock); + atrans = atrans_find(ip_addr); + if (atrans == NULL) { + fibril_mutex_unlock(&atrans_list_lock); + return ENOENT; + } + + fibril_mutex_unlock(&atrans_list_lock); + *mac_addr = atrans->mac_addr; + return EOK; +} + +/** @} + */ Index: uspace/srv/ethip/atrans.h =================================================================== --- uspace/srv/ethip/atrans.h (revision f9d3dd42a7fa78eec449a5bdb934e3fbe205b4f8) +++ uspace/srv/ethip/atrans.h (revision f9d3dd42a7fa78eec449a5bdb934e3fbe205b4f8) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup inet + * @{ + */ +/** + * @file + * @brief + */ + +#ifndef ATRANS_H_ +#define ATRANS_H_ + +#include +#include "ethip.h" + +extern int atrans_add(iplink_srv_addr_t *, mac48_addr_t *); +extern int atrans_remove(iplink_srv_addr_t *); +extern int atrans_lookup(iplink_srv_addr_t *, mac48_addr_t *); + +#endif + +/** @} + */ Index: uspace/srv/ethip/ethip.c =================================================================== --- uspace/srv/ethip/ethip.c (revision 1cc8b424862f4775586f9c159c55435151abadac) +++ uspace/srv/ethip/ethip.c (revision f9d3dd42a7fa78eec449a5bdb934e3fbe205b4f8) @@ -46,4 +46,5 @@ #include "arp.h" +#include "atrans.h" #include "ethip.h" #include "ethip_nic.h" @@ -172,9 +173,17 @@ 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; Index: uspace/srv/ethip/ethip.h =================================================================== --- uspace/srv/ethip/ethip.h (revision 1cc8b424862f4775586f9c159c55435151abadac) +++ uspace/srv/ethip/ethip.h (revision f9d3dd42a7fa78eec449a5bdb934e3fbe205b4f8) @@ -109,4 +109,11 @@ } 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);