Changeset a2e3ee6 in mainline for uspace/srv/net/ethip/ethip.c

Timestamp:

2013-06-20T16:45:58Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

File:

• uspace/srv/net/ethip/ethip.c (modified) (4 diffs)

uspace/srv/net/ethip/ethip.c

@@ -57 +57 @@
 static int ethip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu);
 static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static int ethip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr);
-static int ethip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr);
+static int ethip_addr_add(iplink_srv_t *srv, uint32_t addr);
+static int ethip_addr_remove(iplink_srv_t *srv, uint32_t addr);
 
 static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -175 +175 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send()");
 
-        rc = arp_translate(nic, &sdu->lsrc, &sdu->ldest, &dest_mac_addr);
+        rc = arp_translate(nic, sdu->lsrc, sdu->ldest, &dest_mac_addr);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IP address 0x%" PRIx32,
-                    sdu->ldest.ipv4);
+                    sdu->ldest);
                 return rc;
         }
@@ -221 +221 @@
         case ETYPE_IP:
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - construct SDU");
-                sdu.lsrc.ipv4 = 0;
-                sdu.ldest.ipv4 = 0;
+                sdu.lsrc = 0;
+                sdu.ldest = 0;
                 sdu.data = frame.data;
                 sdu.size = frame.size;
@@ -244 +244 @@
 }
 
-static int ethip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr)
-{
+static int ethip_addr_add(iplink_srv_t *srv, uint32_t addr)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_addr_add(0x%" PRIx32 ")", addr);
+        
+        ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
+        
+        return ethip_nic_addr_add(nic, addr);
+}
+
+static int ethip_addr_remove(iplink_srv_t *srv, uint32_t addr)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_addr_remove(0x%" PRIx32 ")", addr);
+        
         ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_addr_add(0x%" PRIx32 ")", addr->ipv4);
-        return ethip_nic_addr_add(nic, addr);
-}
-
-static int ethip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr)
-{
-        ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_addr_remove(0x%" PRIx32 ")", addr->ipv4);
+        
         return ethip_nic_addr_add(nic, addr);
 }