Changes in uspace/srv/net/ethip/ethip_nic.c [695b6ff:3e6a98c5] in mainline

File:

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

uspace/srv/net/ethip/ethip_nic.c

@@ -45 +45 @@
 #include <device/nic.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
-#include <mem.h>
+
 #include "ethip.h"
 #include "ethip_nic.h"
@@ -84 +83 @@
                 already_known = false;
 
-                list_foreach(ethip_nic_list, link, ethip_nic_t, nic) {
+                list_foreach(ethip_nic_list, nic_link) {
+                        ethip_nic_t *nic = list_get_instance(nic_link,
+                            ethip_nic_t, nic_list);
                         if (nic->svc_id == svcs[i]) {
                                 already_known = true;
@@ -107 +108 @@
 {
         ethip_nic_t *nic = calloc(1, sizeof(ethip_nic_t));
+
         if (nic == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating NIC structure. "
@@ -112 +114 @@
                 return NULL;
         }
-        
-        link_initialize(&nic->link);
+
+        link_initialize(&nic->nic_list);
         list_initialize(&nic->addr_list);
-        
+
         return nic;
 }
 
-static ethip_link_addr_t *ethip_nic_addr_new(inet_addr_t *addr)
+static ethip_link_addr_t *ethip_nic_addr_new(iplink_srv_addr_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. "
@@ -127 +130 @@
                 return NULL;
         }
-        
-        link_initialize(&laddr->link);
-        laddr->addr = *addr;
-        
+
+        link_initialize(&laddr->addr_list);
+        laddr->addr.ipv4 = addr->ipv4;
         return laddr;
 }
@@ -138 +140 @@
         if (nic->svc_name != NULL)
                 free(nic->svc_name);
-        
         free(nic);
 }
@@ -179 +180 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened NIC '%s'", nic->svc_name);
-        list_append(&nic->link, &ethip_nic_list);
+        list_append(&nic->nic_list, &ethip_nic_list);
         in_list = true;
 
@@ -192 +193 @@
                 goto error;
         }
-        
-        addr48(nic_address.address, nic->mac_addr);
+
+        mac48_decode(nic_address.address, &nic->mac_addr);
 
         rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE);
@@ -202 +203 @@
         }
 
-        rc = nic_broadcast_set_mode(nic->sess, NIC_BROADCAST_ACCEPTED);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Error enabling "
-                    "reception of broadcast frames on '%s'.", nic->svc_name);
-                goto error;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Initialized IP link service,");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Initialized IP link service, MAC = 0x%" PRIx64,
+            nic->mac_addr.addr);
 
         return EOK;
@@ -215 +210 @@
 error:
         if (in_list)
-                list_remove(&nic->link);
-        
+                list_remove(&nic->nic_list);
         if (nic->sess != NULL)
                 async_hangup(nic->sess);
-        
         ethip_nic_delete(nic);
         return rc;
@@ -318 +311 @@
             (unsigned) iplink_sid);
 
-        list_foreach(ethip_nic_list, link, ethip_nic_t, nic) {
+        list_foreach(ethip_nic_list, link) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - element");
+                ethip_nic_t *nic = list_get_instance(link, ethip_nic_t,
+                    nic_list);
+
                 if (nic->iplink_sid == iplink_sid) {
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - found %p", nic);
@@ -339 +335 @@
 }
 
-/** Setup accepted multicast addresses
- *
- * Currently the set of accepted multicast addresses is
- * determined only based on IPv6 addresses.
- *
- */
-static int ethip_nic_setup_multicast(ethip_nic_t *nic)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_setup_multicast()");
-        
-        /* Count the number of multicast addresses */
-        
-        size_t count = 0;
-        
-        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
-                uint16_t af = inet_addr_get(&laddr->addr, NULL, NULL);
-                if (af == AF_INET6)
-                        count++;
-        }
-        
-        if (count == 0)
-                return nic_multicast_set_mode(nic->sess, NIC_MULTICAST_BLOCKED,
-                    NULL, 0);
-        
-        nic_address_t *mac_list = calloc(count, sizeof(nic_address_t));
-        if (mac_list == NULL)
-                return ENOMEM;
-        
-        /* Create the multicast MAC list */
-        
-        size_t i = 0;
-        
-        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
-                addr128_t v6;
-                uint16_t af = inet_addr_get(&laddr->addr, NULL, &v6);
-                if (af != AF_INET6)
-                        continue;
-                
-                assert(i < count);
-                
-                addr48_t mac;
-                addr48_solicited_node(v6, mac);
-                
-                /* Avoid duplicate addresses in the list */
-                
-                bool found = false;
-                
-                for (size_t j = 0; j < i; j++) {
-                        if (addr48_compare(mac_list[j].address, mac)) {
-                                found = true;
-                                break;
-                        }
-                }
-                
-                if (!found) {
-                        addr48(mac, mac_list[i].address);
-                        i++;
-                } else
-                        count--;
-        }
-        
-        /* Setup the multicast MAC list */
-        
-        int rc = nic_multicast_set_mode(nic->sess, NIC_MULTICAST_LIST,
-            mac_list, count);
-        
-        free(mac_list);
-        return rc;
-}
-
-int ethip_nic_addr_add(ethip_nic_t *nic, inet_addr_t *addr)
-{
+int ethip_nic_addr_add(ethip_nic_t *nic, iplink_srv_addr_t *addr)
+{
+        ethip_link_addr_t *laddr;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()");
-        
-        ethip_link_addr_t *laddr = ethip_nic_addr_new(addr);
+        laddr = ethip_nic_addr_new(addr);
         if (laddr == NULL)
                 return ENOMEM;
-        
-        list_append(&laddr->link, &nic->addr_list);
-        
-        return ethip_nic_setup_multicast(nic);
-}
-
-int ethip_nic_addr_remove(ethip_nic_t *nic, inet_addr_t *addr)
-{
+
+        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;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()");
-        
-        ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, addr);
+
+        laddr = ethip_nic_addr_find(nic, addr);
         if (laddr == NULL)
                 return ENOENT;
-        
-        list_remove(&laddr->link);
+
+        list_remove(&laddr->addr_list);
         ethip_link_addr_delete(laddr);
-        
-        return ethip_nic_setup_multicast(nic);
+        return EOK;
 }
 
 ethip_link_addr_t *ethip_nic_addr_find(ethip_nic_t *nic,
-    inet_addr_t *addr)
+    iplink_srv_addr_t *addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()");
-        
-        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
-                if (inet_addr_compare(addr, &laddr->addr))
+
+        list_foreach(nic->addr_list, link) {
+                ethip_link_addr_t *laddr = list_get_instance(link,
+                    ethip_link_addr_t, addr_list);
+
+                if (addr->ipv4 == laddr->addr.ipv4)
                         return laddr;
         }
-        
+
         return NULL;
 }