Changes in uspace/srv/net/ethip/ethip_nic.c [02a09ed:f9b2cb4c] in mainline

File:

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

uspace/srv/net/ethip/ethip_nic.c

@@ -43 +43 @@
 #include <io/log.h>
 #include <loc.h>
-#include <device/nic.h>
+#include <nic_iface.h>
 #include <stdlib.h>
-
+#include <mem.h>
 #include "ethip.h"
 #include "ethip_nic.h"
@@ -83 +83 @@
                 already_known = false;
 
-                list_foreach(ethip_nic_list, nic_link) {
-                        ethip_nic_t *nic = list_get_instance(nic_link,
-                            ethip_nic_t, nic_list);
+                list_foreach(ethip_nic_list, link, ethip_nic_t, nic) {
                         if (nic->svc_id == svcs[i]) {
                                 already_known = true;
@@ -108 +106 @@
 {
         ethip_nic_t *nic = calloc(1, sizeof(ethip_nic_t));
-
         if (nic == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating NIC structure. "
@@ -114 +111 @@
                 return NULL;
         }
-
-        link_initialize(&nic->nic_list);
+        
+        link_initialize(&nic->link);
         list_initialize(&nic->addr_list);
-
+        
         return nic;
 }
@@ -130 +127 @@
         }
         
-        link_initialize(&laddr->addr_list);
+        link_initialize(&laddr->link);
         laddr->addr = *addr;
         
@@ -140 +137 @@
         if (nic->svc_name != NULL)
                 free(nic->svc_name);
+        
         free(nic);
 }
@@ -164 +162 @@
         }
         
-        nic->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
+        nic->sess = loc_service_connect(sid, INTERFACE_DDF, 0);
         if (nic->sess == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting '%s'", nic->svc_name);
@@ -180 +178 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened NIC '%s'", nic->svc_name);
-        list_append(&nic->nic_list, &ethip_nic_list);
+        list_append(&nic->link, &ethip_nic_list);
         in_list = true;
 
@@ -203 +201 @@
         }
 
+        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,");
 
@@ -209 +214 @@
 error:
         if (in_list)
-                list_remove(&nic->nic_list);
+                list_remove(&nic->link);
+        
         if (nic->sess != NULL)
                 async_hangup(nic->sess);
+        
         ethip_nic_delete(nic);
         return rc;
@@ -224 +231 @@
     ipc_call_t *call)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_changed()");
-        async_answer_0(callid, ENOTSUP);
+        uint8_t *addr;
+        size_t size;
+        int rc;
+
+        rc = async_data_write_accept((void **)&addr, false, 0, 0, 0, &size);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "data_write_accept() failed");
+                return;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_changed(): "
+            "new addr=%02x:%02x:%02x:%02x:%02x:%02x",
+            addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+
+        memcpy(&nic->mac_addr, addr, sizeof(nic->mac_addr));
+
+        rc = iplink_ev_change_addr(&nic->iplink, &nic->mac_addr);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "iplink_ev_change_addr() failed");
+                return;
+        }
+
+        free(addr);
+        async_answer_0(callid, EOK);
 }
 
@@ -288 +317 @@
                         break;
                 default:
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "unknown IPC method: %" PRIun, IPC_GET_IMETHOD(call));
                         async_answer_0(callid, ENOTSUP);
                 }
@@ -310 +340 @@
             (unsigned) iplink_sid);
 
-        list_foreach(ethip_nic_list, link) {
+        list_foreach(ethip_nic_list, link, ethip_nic_t, nic) {
                 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);
@@ -334 +361 @@
 }
 
+/** 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) {
+                ip_ver_t ver = inet_addr_get(&laddr->addr, NULL, NULL);
+                if (ver == ip_v6)
+                        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;
+                ip_ver_t ver = inet_addr_get(&laddr->addr, NULL, &v6);
+                if (ver != ip_v6)
+                        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)
 {
@@ -342 +439 @@
                 return ENOMEM;
         
-        list_append(&laddr->addr_list, &nic->addr_list);
-        return EOK;
+        list_append(&laddr->link, &nic->addr_list);
+        
+        return ethip_nic_setup_multicast(nic);
 }
 
@@ -354 +452 @@
                 return ENOENT;
         
-        list_remove(&laddr->addr_list);
+        list_remove(&laddr->link);
         ethip_link_addr_delete(laddr);
-        return EOK;
+        
+        return ethip_nic_setup_multicast(nic);
 }
 
@@ -364 +463 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()");
         
-        list_foreach(nic->addr_list, link) {
-                ethip_link_addr_t *laddr = list_get_instance(link,
-                    ethip_link_addr_t, addr_list);
-                
+        list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
                 if (inet_addr_compare(addr, &laddr->addr))
                         return laddr;