devif: added dst MAC lookup to UDP queue init

Signed-off-by: Roni Häcki <roni.haecki@inf.ethz.ch>

diff --git a/include/devif/backends/net/ip.h b/include/devif/backends/net/ip.h
index 6c65ba2..eeb1c8a 100644 (file)
--- a/include/devif/backends/net/ip.h
+++ b/include/devif/backends/net/ip.h
@@ -38,12 +38,11 @@ errval_t ip_destroy(struct ip_q* q);
  * @param qid          the id of the hardware queue (used for filters)
  * @param prot         The protocol that is running on top of IP
  * @param dst_ip       Destination IP
- * @param dst_mac      Destination MAC address
  * @param interrupt    Interrupt handler
  * @param poll         If the queue is polled or should use interrupts             
  *
  */
 errval_t ip_create(struct ip_q** q, const char* card_name, uint64_t* qid,
-                   uint8_t prot, uint32_t dst_ip, struct eth_addr dst_mac, 
-                   void(*interrupt)(void*), bool poll);
+                   uint8_t prot, uint32_t dst_ip, void(*interrupt)(void*), 
+                   bool poll);
 #endif /* DEVIF_IP_H_ */

diff --git a/include/devif/backends/net/udp.h b/include/devif/backends/net/udp.h
index 770cedb..0adc215 100644 (file)
--- a/include/devif/backends/net/udp.h
+++ b/include/devif/backends/net/udp.h
@@ -31,15 +31,14 @@ errval_t udp_destroy(struct udp_q* q);
  * @param src_port     UDP source port
  * @param dst_port     UPD destination port
  * @param dst_ip       Destination IP
- * @param dst_mac      Destination MAC address
  * @param interrupt    Interrupt handler
  * @param poll         If the queue is polled or should use interrupts             
  *
  */
 errval_t udp_create(struct udp_q** q, const char* card_name, 
                     uint16_t src_port, uint16_t dst_port,
-                    uint32_t dst_ip, struct eth_addr dst_mac,
-                    void(*interrupt)(void*), bool poll);
+                    uint32_t dst_ip, void(*interrupt)(void*), 
+                    bool poll);
 /*
  * @brief  Writes into a buffer so that we still have space to add the headers
  *

diff --git a/lib/devif/backends/net/ip/devif_backend_ip.c b/lib/devif/backends/net/ip/devif_backend_ip.c
index e76d8e3..7c5db2b 100644 (file)
--- a/lib/devif/backends/net/ip/devif_backend_ip.c
+++ b/lib/devif/backends/net/ip/devif_backend_ip.c
@@ -22,6 +22,7 @@
 #include <net/net_queue.h>
 #include <net/net_filter.h>
 #include <net/dhcp.h>
+#include <net/arp.h>
 #include "../../../queue_interface_internal.h"
 #include "../headers.h"
 
@@ -225,8 +226,7 @@ static errval_t ip_dequeue(struct devq* q, regionid_t* rid, genoffset_t* offset,
  *
  */
 errval_t ip_create(struct ip_q** q, const char* card_name, uint64_t* qid,
-                   uint8_t prot, uint32_t dst_ip,
-                   struct eth_addr dst_mac, inthandler_t interrupt, bool poll)
+                   uint8_t prot, uint32_t dst_ip, inthandler_t interrupt, bool poll)
 {
     errval_t err;
     struct ip_q* que;
@@ -257,9 +257,15 @@ errval_t ip_create(struct ip_q** q, const char* card_name, uint64_t* qid,
         return err;
     }
 
+    uint64_t mac;
+    err = arp_service_get_mac(htonl(dst_ip), &mac);
+    if (err_is_fail(err)) {
+        return err;
+    }
+
     // fill in header that is reused for each packet
     // Ethernet
-    memcpy(&(que->header.eth.dest.addr), &dst_mac, ETH_HWADDR_LEN);
+    memcpy(&(que->header.eth.dest.addr), &mac, ETH_HWADDR_LEN);
     memcpy(&(que->header.eth.src.addr), &src_mac, ETH_HWADDR_LEN);
     que->header.eth.type = htons(ETHTYPE_IP);
 

diff --git a/lib/devif/backends/net/udp/devif_backend_udp.c b/lib/devif/backends/net/udp/devif_backend_udp.c
index 1cc8181..68f7a93 100644 (file)
--- a/lib/devif/backends/net/udp/devif_backend_udp.c
+++ b/lib/devif/backends/net/udp/devif_backend_udp.c
@@ -210,8 +210,7 @@ static errval_t udp_dequeue(struct devq* q, regionid_t* rid, genoffset_t* offset
  */
 errval_t udp_create(struct udp_q** q, const char* card_name, 
                     uint16_t src_port, uint16_t dst_port,
-                    uint32_t dst_ip, struct eth_addr dst_mac,
-                    void(*interrupt)(void*), bool poll)
+                    uint32_t dst_ip, void(*interrupt)(void*), bool poll)
 {
     errval_t err;
     struct udp_q* que;
@@ -227,7 +226,7 @@ errval_t udp_create(struct udp_q** q, const char* card_name,
     // init other queue
     uint64_t qid;
     err = ip_create((struct ip_q**) &que->q, card_name, &qid, UDP_PROT, dst_ip, 
-                    dst_mac, interrupt, poll);
+                    interrupt, poll);
     if (err_is_fail(err)) {
         return err;
     }

diff --git a/usr/tests/devif/client.c b/usr/tests/devif/client.c
index 17a7cf1..c818446 100644 (file)
--- a/usr/tests/devif/client.c
+++ b/usr/tests/devif/client.c
@@ -52,17 +52,6 @@ static void event_cb(void* q)
     return;
 }
 
-static void convert_mac(uint64_t int_mac, struct eth_addr* mac)
-{
-    // Also convert to network byte order
-    mac->addr[5] = int_mac & 0xFF;
-    mac->addr[4] = (int_mac & 0xFF00) >> 8;
-    mac->addr[3] = (int_mac & 0xFF0000) >> 16;
-    mac->addr[2] = (int_mac & 0xFF000000) >> 24;
-    mac->addr[1] = (int_mac & 0xFF00000000) >> 32;
-    mac->addr[0] = (int_mac & 0xFF0000000000) >> 40;
-}
-
 int main(int argc, char *argv[])
 {
     if (argc > 6) {
@@ -98,12 +87,8 @@ int main(int argc, char *argv[])
 
     phys_rx = id.base;
 
-    struct eth_addr dst_mac;
-    
-    convert_mac(mac_dst, &dst_mac);
-
     err = udp_create((struct udp_q**) &udp_q, cardname, port_src, port_dst,
-                     ip_dst, dst_mac, event_cb, true);
+                     ip_dst, event_cb, true);
     if (err_is_fail(err)) {
         USER_PANIC("Queue creation failed \n");
     }

diff --git a/usr/tests/devif/echo.c b/usr/tests/devif/echo.c
index f5783cf..f96d428 100644 (file)
--- a/usr/tests/devif/echo.c
+++ b/usr/tests/devif/echo.c
@@ -64,17 +64,6 @@ static uint64_t tsc_per_ms;
 
 static bool use_irq = false;
 
-static void convert_mac(uint64_t int_mac, struct eth_addr* mac)
-{
-    // Also convert to network byte order
-    mac->addr[5] = int_mac & 0xFF;
-    mac->addr[4] = (int_mac & 0xFF00) >> 8;
-    mac->addr[3] = (int_mac & 0xFF0000) >> 16;
-    mac->addr[2] = (int_mac & 0xFF000000) >> 24;
-    mac->addr[1] = (int_mac & 0xFF00000000) >> 32;
-    mac->addr[0] = (int_mac & 0xFF0000000000) >> 40;
-}
-
 static void event_cb(void* queue)
 {
     struct devq* q = (struct devq*) udp_q;
@@ -212,12 +201,8 @@ int main(int argc, char *argv[])
 
     phys_rx = id.base;
 
-    struct eth_addr dst_mac;
-    
-    convert_mac(mac_dst, &dst_mac);
-
     err = udp_create((struct udp_q**) &udp_q, cardname, port_src, port_dst,
-                     ip_dst, dst_mac, event_cb, true);
+                     ip_dst, event_cb, true);
     if (err_is_fail(err)) {
         USER_PANIC("Queue creation failed \n");
     }

diff --git a/usr/tests/devif/udp_queue.c b/usr/tests/devif/udp_queue.c
index 1cb4870..5ec373b 100644 (file)
--- a/usr/tests/devif/udp_queue.c
+++ b/usr/tests/devif/udp_queue.c
@@ -33,7 +33,6 @@ static uint32_t ip_dst;
 static uint64_t mac_dst;
 static uint16_t port_src;
 static uint16_t port_dst;
-static struct eth_addr dst_mac;
 
 static struct capref memory_rx;
 static struct capref memory_tx;
@@ -113,28 +112,14 @@ static void event_cb(void* queue)
     }
 }
 
-static void convert_mac(uint64_t int_mac, struct eth_addr* mac)
-{
-    // Also convert to network byte order
-    mac->addr[5] = int_mac & 0xFF;
-    mac->addr[4] = (int_mac & 0xFF00) >> 8;
-    mac->addr[3] = (int_mac & 0xFF0000) >> 16;
-    mac->addr[2] = (int_mac & 0xFF000000) >> 24;
-    mac->addr[1] = (int_mac & 0xFF00000000) >> 32;
-    mac->addr[0] = (int_mac & 0xFF0000000000) >> 40;
-}
-
 static void test_udp(void)
 {
     errval_t err;
     struct devq* q;
-
-    convert_mac(mac_dst, &dst_mac);
-
    
     // create queue with interrupts
     udp_create(&udp_q, cardname, port_src, port_dst, 
-               ip_dst, dst_mac, event_cb, !use_interrupts);
+               ip_dst, event_cb, !use_interrupts);
 
     q = (struct devq*) udp_q;