Changes in uspace/srv/net/inetsrv/addrobj.c [5a324d99:a1a101d] in mainline

File:

• uspace/srv/net/inetsrv/addrobj.c (modified) (6 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
+
 #include "addrobj.h"
 #include "inetsrv.h"
 #include "inet_link.h"
-#include "ndp.h"
+#include "inet_util.h"
 
 static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *, inet_link_t *);
@@ -105 +106 @@
 /** Find address object matching address @a addr.
  *
- * @param addr Address
- * @oaram find iaf_net to find network (using mask),
- *             iaf_addr to find local address (exact match)
- *
+ * @param addr  Address
+ * @oaram find  iaf_net to find network (using mask),
+ *              iaf_addr to find local address (exact match)
  */
 inet_addrobj_t *inet_addrobj_find(inet_addr_t *addr, inet_addrobj_find_t find)
 {
-        fibril_mutex_lock(&addr_list_lock);
-        
-        list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) {
-                switch (find) {
-                case iaf_net:
-                        if (inet_naddr_compare_mask(&naddr->naddr, addr)) {
-                                fibril_mutex_unlock(&addr_list_lock);
-                                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
-                                    naddr);
-                                return naddr;
-                        }
-                        break;
-                case iaf_addr:
-                        if (inet_naddr_compare(&naddr->naddr, addr)) {
-                                fibril_mutex_unlock(&addr_list_lock);
-                                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
-                                    naddr);
-                                return naddr;
-                        }
-                        break;
+        uint32_t mask;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find(%x)", (unsigned)addr->ipv4);
+
+        fibril_mutex_lock(&addr_list_lock);
+
+        list_foreach(addr_list, link) {
+                inet_addrobj_t *naddr = list_get_instance(link,
+                    inet_addrobj_t, addr_list);
+
+                mask = inet_netmask(naddr->naddr.bits);
+                if ((naddr->naddr.ipv4 & mask) == (addr->ipv4 & mask)) {
+                        fibril_mutex_unlock(&addr_list_lock);
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
+                            naddr);
+                        return naddr;
                 }
         }
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: Not found");
         fibril_mutex_unlock(&addr_list_lock);
-        
+
         return NULL;
 }
@@ -154 +150 @@
             name, ilink->svc_name);
 
-        list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) {
+        list_foreach(addr_list, link) {
+                inet_addrobj_t *naddr = list_get_instance(link,
+                    inet_addrobj_t, addr_list);
+
                 if (naddr->ilink == ilink && str_cmp(naddr->name, name) == 0) {
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p",
@@ -199 +198 @@
         fibril_mutex_lock(&addr_list_lock);
 
-        list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) {
+        list_foreach(addr_list, link) {
+                inet_addrobj_t *naddr = list_get_instance(link,
+                    inet_addrobj_t, addr_list);
+
                 if (naddr->id == id) {
                         fibril_mutex_unlock(&addr_list_lock);
@@ -216 +218 @@
 {
         inet_addr_t lsrc_addr;
-        inet_naddr_addr(&addr->naddr, &lsrc_addr);
-
-        addr32_t lsrc_v4;
-        addr128_t lsrc_v6;
-        ip_ver_t lsrc_ver = inet_addr_get(&lsrc_addr, &lsrc_v4, &lsrc_v6);
-
-        addr32_t ldest_v4;
-        addr128_t ldest_v6;
-        ip_ver_t ldest_ver = inet_addr_get(ldest, &ldest_v4, &ldest_v6);
-
-        if (lsrc_ver != ldest_ver)
-                return EINVAL;
-
-        int rc;
-        addr48_t ldest_mac;
-
-        switch (ldest_ver) {
-        case ip_v4:
-                return inet_link_send_dgram(addr->ilink, lsrc_v4, ldest_v4,
-                    dgram, proto, ttl, df);
-        case ip_v6:
-                /*
-                 * Translate local destination IPv6 address.
-                 */
-                rc = ndp_translate(lsrc_v6, ldest_v6, ldest_mac, addr->ilink);
-                if (rc != EOK)
-                        return rc;
-
-                return inet_link_send_dgram6(addr->ilink, ldest_mac, dgram,
-                    proto, ttl, df);
-        default:
-                assert(false);
-                break;
-        }
-
-        return ENOTSUP;
+        inet_addr_t *ldest_addr;
+
+        lsrc_addr.ipv4 = addr->naddr.ipv4;
+        ldest_addr = &dgram->dest;
+
+        return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest_addr, dgram,
+            proto, ttl, df);
 }
 
@@ -270 +243 @@
 
         i = 0;
-        list_foreach(addr_list, addr_list, inet_addrobj_t, addr) {
+        list_foreach(addr_list, link) {
+                inet_addrobj_t *addr = list_get_instance(link,
+                    inet_addrobj_t, addr_list);
+
                 id_list[i++] = addr->id;
         }