Changeset a2e3ee6 in mainline for uspace/srv/net/ethip/ethip_nic.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_nic.c (modified) (5 diffs)

uspace/srv/net/ethip/ethip_nic.c

@@ -121 +121 @@
 }
 
-static ethip_link_addr_t *ethip_nic_addr_new(iplink_srv_addr_t *addr)
+static ethip_link_addr_t *ethip_nic_addr_new(uint32_t addr)
 {
         ethip_link_addr_t *laddr = calloc(1, sizeof(ethip_link_addr_t));
-
         if (laddr == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating NIC address structure. "
@@ -130 +129 @@
                 return NULL;
         }
-
+        
         link_initialize(&laddr->addr_list);
-        laddr->addr.ipv4 = addr->ipv4;
+        laddr->addr = addr;
+        
         return laddr;
 }
@@ -335 +335 @@
 }
 
-int ethip_nic_addr_add(ethip_nic_t *nic, iplink_srv_addr_t *addr)
-{
-        ethip_link_addr_t *laddr;
-
+int ethip_nic_addr_add(ethip_nic_t *nic, uint32_t addr)
+{
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()");
-        laddr = ethip_nic_addr_new(addr);
+        
+        ethip_link_addr_t *laddr = ethip_nic_addr_new(addr);
         if (laddr == NULL)
                 return ENOMEM;
-
+        
         list_append(&laddr->addr_list, &nic->addr_list);
         return EOK;
 }
 
-int ethip_nic_addr_remove(ethip_nic_t *nic, iplink_srv_addr_t *addr)
-{
-        ethip_link_addr_t *laddr;
-
+int ethip_nic_addr_remove(ethip_nic_t *nic, uint32_t addr)
+{
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()");
-
-        laddr = ethip_nic_addr_find(nic, addr);
+        
+        ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, addr);
         if (laddr == NULL)
                 return ENOENT;
-
+        
         list_remove(&laddr->addr_list);
         ethip_link_addr_delete(laddr);
@@ -364 +361 @@
 
 ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *nic,
-    iplink_srv_addr_t *addr)
+    uint32_t addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()");
@@ -372 +369 @@
                     ethip_link_addr_t, addr_list);
 
-                if (addr->ipv4 == laddr->addr.ipv4)
+                if (addr == laddr->addr)
                         return laddr;
         }