Changes in uspace/srv/net/inetsrv/inet_link.c [f9b2cb4c:1f97352] in mainline

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (14 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
+#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "inetsrv.h"
@@ -54 +55 @@
 static uint16_t ip_ident = 0;
 
-static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
-static int inet_iplink_change_addr(iplink_t *, addr48_t);
-static inet_link_t *inet_link_get_by_id_locked(sysarg_t);
+static int inet_link_open(service_id_t);
+static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t);
 
 static iplink_ev_ops_t inet_iplink_ev_ops = {
-        .recv = inet_iplink_recv,
-        .change_addr = inet_iplink_change_addr,
+        .recv = inet_iplink_recv
 };
 
-static LIST_INITIALIZE(inet_links);
-static FIBRIL_MUTEX_INITIALIZE(inet_links_lock);
+static LIST_INITIALIZE(inet_link_list);
+static FIBRIL_MUTEX_INITIALIZE(inet_discovery_lock);
 
 static addr128_t link_local_node_ip =
@@ -73 +72 @@
 {
         memcpy(ip_addr, link_local_node_ip, 16);
-
+        
         ip_addr[8] = mac_addr[0] ^ 0x02;
         ip_addr[9] = mac_addr[1];
@@ -82 +81 @@
 }
 
-static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, ip_ver_t ver)
+static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, uint16_t af)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()");
-
+        
         int rc;
         inet_packet_t packet;
-        inet_link_t *ilink;
-
-        ilink = (inet_link_t *)iplink_get_userptr(iplink);
-
-        switch (ver) {
-        case ip_v4:
-                rc = inet_pdu_decode(sdu->data, sdu->size, ilink->svc_id,
-                    &packet);
+        
+        switch (af) {
+        case AF_INET:
+                rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
                 break;
-        case ip_v6:
-                rc = inet_pdu_decode6(sdu->data, sdu->size, ilink->svc_id,
-                    &packet);
+        case AF_INET6:
+                rc = inet_pdu_decode6(sdu->data, sdu->size, &packet);
                 break;
         default:
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid IP version");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid address family");
                 return EINVAL;
         }
-
+        
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "failed decoding PDU");
                 return rc;
         }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_iplink_recv: link_id=%zu", packet.link_id);
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet()");
         rc = inet_recv_packet(&packet);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet -> %d", rc);
         free(packet.data);
-
+        
         return rc;
 }
 
-static int inet_iplink_change_addr(iplink_t *iplink, addr48_t mac)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_change_addr(): "
-            "new addr=%02x:%02x:%02x:%02x:%02x:%02x",
-            mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-
-        list_foreach(inet_links, link_list, inet_link_t, ilink) {
-                if (ilink->sess == iplink->sess)
-                        memcpy(&ilink->mac, mac, sizeof(addr48_t));
-        }
-
+static int inet_link_check_new(void)
+{
+        bool already_known;
+        category_id_t iplink_cat;
+        service_id_t *svcs;
+        size_t count, i;
+        int rc;
+
+        fibril_mutex_lock(&inet_discovery_lock);
+
+        rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'.");
+                fibril_mutex_unlock(&inet_discovery_lock);
+                return ENOENT;
+        }
+
+        rc = loc_category_get_svcs(iplink_cat, &svcs, &count);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting list of IP links.");
+                fibril_mutex_unlock(&inet_discovery_lock);
+                return EIO;
+        }
+
+        for (i = 0; i < count; i++) {
+                already_known = false;
+
+                list_foreach(inet_link_list, ilink_link) {
+                        inet_link_t *ilink = list_get_instance(ilink_link,
+                            inet_link_t, link_list);
+                        if (ilink->svc_id == svcs[i]) {
+                                already_known = true;
+                                break;
+                        }
+                }
+
+                if (!already_known) {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Found IP link '%lu'",
+                            (unsigned long) svcs[i]);
+                        rc = inet_link_open(svcs[i]);
+                        if (rc != EOK)
+                                log_msg(LOG_DEFAULT, LVL_ERROR, "Could not open IP link.");
+                }
+        }
+
+        fibril_mutex_unlock(&inet_discovery_lock);
         return EOK;
 }
@@ -157 +185 @@
 }
 
-int inet_link_open(service_id_t sid)
+static int inet_link_open(service_id_t sid)
 {
         inet_link_t *ilink;
@@ -177 +205 @@
         }
 
-        ilink->sess = loc_service_connect(sid, INTERFACE_IPLINK, 0);
+        ilink->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
         if (ilink->sess == NULL) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting '%s'", ilink->svc_name);
@@ -183 +211 @@
         }
 
-        rc = iplink_open(ilink->sess, &inet_iplink_ev_ops, ilink, &ilink->iplink);
+        rc = iplink_open(ilink->sess, &inet_iplink_ev_ops, &ilink->iplink);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening IP link '%s'",
@@ -205 +233 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name);
-
-        fibril_mutex_lock(&inet_links_lock);
-
-        if (inet_link_get_by_id_locked(sid) != NULL) {
-                fibril_mutex_unlock(&inet_links_lock);
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Link %zu already open",
-                    sid);
-                rc = EEXIST;
-                goto error;
-        }
-
-        list_append(&ilink->link_list, &inet_links);
-        fibril_mutex_unlock(&inet_links_lock);
+        list_append(&ilink->link_list, &inet_link_list);
 
         inet_addrobj_t *addr = NULL;
         
-        /* XXX FIXME Cannot rely on loopback being the first IP link service!! */
         if (first_link) {
                 addr = inet_addrobj_new();
@@ -227 +242 @@
                 inet_naddr(&addr->naddr, 127, 0, 0, 1, 24);
                 first_link = false;
+        } else {
+                /*
+                 * FIXME
+                 * Setting static IPv4 address for testing purposes:
+                 * 10.0.2.15/24
+                 */
+                addr = inet_addrobj_new();
+                
+                inet_naddr(&addr->naddr, 10, 0, 2, 15, 24);
         }
         
@@ -285 +309 @@
         }
         
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Configured link '%s'.", ilink->svc_name);
         return EOK;
         
@@ -294 +317 @@
         inet_link_delete(ilink);
         return rc;
+}
+
+static void inet_link_cat_change_cb(void)
+{
+        (void) inet_link_check_new();
+}
+
+int inet_link_discovery_start(void)
+{
+        int rc;
+
+        rc = loc_register_cat_change_cb(inet_link_cat_change_cb);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback for IP link "
+                    "discovery (%d).", rc);
+                return rc;
+        }
+
+        return inet_link_check_new();
 }
 
@@ -315 +357 @@
 {
         addr32_t src_v4;
-        ip_ver_t src_ver = inet_addr_get(&dgram->src, &src_v4, NULL);
-        if (src_ver != ip_v4)
+        uint16_t src_af = inet_addr_get(&dgram->src, &src_v4, NULL);
+        if (src_af != AF_INET)
                 return EINVAL;
         
         addr32_t dest_v4;
-        ip_ver_t dest_ver = inet_addr_get(&dgram->dest, &dest_v4, NULL);
-        if (dest_ver != ip_v4)
+        uint16_t dest_af = inet_addr_get(&dgram->dest, &dest_v4, NULL);
+        if (dest_af != AF_INET)
                 return EINVAL;
         
@@ -390 +432 @@
 {
         addr128_t src_v6;
-        ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL, &src_v6);
-        if (src_ver != ip_v6)
+        uint16_t src_af = inet_addr_get(&dgram->src, NULL, &src_v6);
+        if (src_af != AF_INET6)
                 return EINVAL;
         
         addr128_t dest_v6;
-        ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6);
-        if (dest_ver != ip_v6)
+        uint16_t dest_af = inet_addr_get(&dgram->dest, NULL, &dest_v6);
+        if (dest_af != AF_INET6)
                 return EINVAL;
         
@@ -446 +488 @@
 }
 
-static inet_link_t *inet_link_get_by_id_locked(sysarg_t link_id)
-{
-        assert(fibril_mutex_is_locked(&inet_links_lock));
-
-        list_foreach(inet_links, link_list, inet_link_t, ilink) {
-                if (ilink->svc_id == link_id)
+inet_link_t *inet_link_get_by_id(sysarg_t link_id)
+{
+        fibril_mutex_lock(&inet_discovery_lock);
+
+        list_foreach(inet_link_list, elem) {
+                inet_link_t *ilink = list_get_instance(elem, inet_link_t,
+                    link_list);
+
+                if (ilink->svc_id == link_id) {
+                        fibril_mutex_unlock(&inet_discovery_lock);
                         return ilink;
-        }
-
+                }
+        }
+
+        fibril_mutex_unlock(&inet_discovery_lock);
         return NULL;
-}
-
-inet_link_t *inet_link_get_by_id(sysarg_t link_id)
-{
-        inet_link_t *ilink;
-
-        fibril_mutex_lock(&inet_links_lock);
-        ilink = inet_link_get_by_id_locked(link_id);
-        fibril_mutex_unlock(&inet_links_lock);
-
-        return ilink;
-}
-
-/** Get IDs of all links. */
-int inet_link_get_id_list(sysarg_t **rid_list, size_t *rcount)
-{
-        sysarg_t *id_list;
-        size_t count, i;
-
-        fibril_mutex_lock(&inet_links_lock);
-        count = list_count(&inet_links);
-
-        id_list = calloc(count, sizeof(sysarg_t));
-        if (id_list == NULL) {
-                fibril_mutex_unlock(&inet_links_lock);
-                return ENOMEM;
-        }
-
-        i = 0;
-        list_foreach(inet_links, link_list, inet_link_t, ilink) {
-                id_list[i++] = ilink->svc_id;
-        }
-
-        fibril_mutex_unlock(&inet_links_lock);
-
-        *rid_list = id_list;
-        *rcount = count;
-
-        return EOK;
 }