Changes in uspace/srv/net/inetsrv/sroute.c [feeac0d:a1a101d] in mainline

File:

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

uspace/srv/net/inetsrv/sroute.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
+
 #include "sroute.h"
 #include "inetsrv.h"
 #include "inet_link.h"
+#include "inet_util.h"
 
 static FIBRIL_MUTEX_INITIALIZE(sroute_list_lock);
@@ -89 +91 @@
 }
 
-/** Find static route object matching address @a addr.
+/** Find address object matching address @a addr.
  *
  * @param addr  Address
@@ -95 +97 @@
 inet_sroute_t *inet_sroute_find(inet_addr_t *addr)
 {
-        uint16_t addr_af = inet_addr_get(addr, NULL, NULL);
-        
-        inet_sroute_t *best = NULL;
-        uint8_t best_bits = 0;
-        
-        fibril_mutex_lock(&sroute_list_lock);
-        
-        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
-                uint8_t dest_bits;
-                uint16_t dest_af = inet_naddr_get(&sroute->dest, NULL, NULL,
-                    &dest_bits);
-                
-                /* Skip comparison with different address family */
-                if (addr_af != dest_af)
+        uint32_t mask;
+        inet_sroute_t *best;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find(%x)", (unsigned)addr->ipv4);
+
+        fibril_mutex_lock(&sroute_list_lock);
+
+        best = NULL;
+
+        list_foreach(sroute_list, link) {
+                inet_sroute_t *sroute = list_get_instance(link,
+                    inet_sroute_t, sroute_list);
+
+                /* Look for the most specific route */
+                if (best != NULL && best->dest.bits >= sroute->dest.bits)
                         continue;
-                
-                /* Look for the most specific route */
-                if ((best != NULL) && (best_bits >= dest_bits))
-                        continue;
-                
-                if (inet_naddr_compare_mask(&sroute->dest, addr)) {
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found candidate %p",
+
+                mask = inet_netmask(sroute->dest.bits);
+                if ((sroute->dest.ipv4 & mask) == (addr->ipv4 & mask)) {
+                        fibril_mutex_unlock(&sroute_list_lock);
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found %p",
                             sroute);
-                        
-                        best = sroute;
-                        best_bits = dest_bits;
+                        return sroute;
                 }
         }
-        
-        if (best == NULL)
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found");
-        
-        fibril_mutex_unlock(&sroute_list_lock);
-        
-        return best;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found");
+        fibril_mutex_unlock(&sroute_list_lock);
+
+        return NULL;
 }
 
@@ -144 +141 @@
         fibril_mutex_lock(&sroute_list_lock);
 
-        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
+        list_foreach(sroute_list, link) {
+                inet_sroute_t *sroute = list_get_instance(link,
+                    inet_sroute_t, sroute_list);
+
                 if (str_cmp(sroute->name, name) == 0) {
                         fibril_mutex_unlock(&sroute_list_lock);
@@ -170 +170 @@
         fibril_mutex_lock(&sroute_list_lock);
 
-        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
+        list_foreach(sroute_list, link) {
+                inet_sroute_t *sroute = list_get_instance(link,
+                    inet_sroute_t, sroute_list);
+
                 if (sroute->id == id) {
                         fibril_mutex_unlock(&sroute_list_lock);
@@ -198 +201 @@
 
         i = 0;
-        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
+        list_foreach(sroute_list, link) {
+                inet_sroute_t *sroute = list_get_instance(link,
+                    inet_sroute_t, sroute_list);
+
                 id_list[i++] = sroute->id;
         }