Changeset 02a09ed in mainline for uspace/srv/net/ethip/ethip_nic.c

Timestamp:

2013-06-28T20:20:03Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

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

uspace/srv/net/ethip/ethip_nic.c

@@ -121 +121 @@
 }
 
-static ethip_link_addr_t *ethip_nic_addr_new(uint32_t addr)
+static ethip_link_addr_t *ethip_nic_addr_new(inet_addr_t *addr)
 {
         ethip_link_addr_t *laddr = calloc(1, sizeof(ethip_link_addr_t));
@@ -131 +131 @@
         
         link_initialize(&laddr->addr_list);
-        laddr->addr = addr;
+        laddr->addr = *addr;
         
         return laddr;
@@ -193 +193 @@
                 goto error;
         }
-
-        mac48_decode(nic_address.address, &nic->mac_addr);
+        
+        addr48(nic_address.address, nic->mac_addr);
 
         rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE);
@@ -203 +203 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Initialized IP link service, MAC = 0x%" PRIx64,
-            nic->mac_addr.addr);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Initialized IP link service,");
 
         return EOK;
@@ -335 +334 @@
 }
 
-int ethip_nic_addr_add(ethip_nic_t *nic, uint32_t addr)
+int ethip_nic_addr_add(ethip_nic_t *nic, inet_addr_t *addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()");
@@ -347 +346 @@
 }
 
-int ethip_nic_addr_remove(ethip_nic_t *nic, uint32_t addr)
+int ethip_nic_addr_remove(ethip_nic_t *nic, inet_addr_t *addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()");
@@ -361 +360 @@
 
 ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *nic,
-    uint32_t addr)
+    inet_addr_t *addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()");
@@ -369 +368 @@
                     ethip_link_addr_t, addr_list);
                 
-                if (addr == laddr->addr)
+                if (inet_addr_compare(addr, &laddr->addr))
                         return laddr;
         }