Changeset 8b863a62 in mainline for uspace/srv/net/inetsrv/sroute.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

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);
@@ -91 +89 @@
 }
 
-/** Find address object matching address @a addr.
+/** Find static route object matching address @a addr.
  *
  * @param addr  Address
@@ -97 +95 @@
 inet_sroute_t *inet_sroute_find(inet_addr_t *addr)
 {
-        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);
-
+        ip_ver_t addr_ver = 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;
+                ip_ver_t dest_ver = inet_naddr_get(&sroute->dest, NULL, NULL,
+                    &dest_bits);
+                
+                /* Skip comparison with different address family */
+                if (addr_ver != dest_ver)
+                        continue;
+                
                 /* Look for the most specific route */
-                if (best != NULL && best->dest.bits >= sroute->dest.bits)
+                if ((best != NULL) && (best_bits >= dest_bits))
                         continue;
-
-                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",
+                
+                if (inet_naddr_compare_mask(&sroute->dest, addr)) {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found candidate %p",
                             sroute);
-                        return sroute;
+                        
+                        best = sroute;
+                        best_bits = dest_bits;
                 }
         }
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found");
-        fibril_mutex_unlock(&sroute_list_lock);
-
-        return NULL;
+        
+        if (best == NULL)
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found");
+        
+        fibril_mutex_unlock(&sroute_list_lock);
+        
+        return best;
 }
 
@@ -141 +144 @@
         fibril_mutex_lock(&sroute_list_lock);
 
-        list_foreach(sroute_list, link) {
-                inet_sroute_t *sroute = list_get_instance(link,
-                    inet_sroute_t, sroute_list);
-
+        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
                 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, link) {
-                inet_sroute_t *sroute = list_get_instance(link,
-                    inet_sroute_t, sroute_list);
-
+        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
                 if (sroute->id == id) {
                         fibril_mutex_unlock(&sroute_list_lock);
@@ -201 +198 @@
 
         i = 0;
-        list_foreach(sroute_list, link) {
-                inet_sroute_t *sroute = list_get_instance(link,
-                    inet_sroute_t, sroute_list);
-
+        list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
                 id_list[i++] = sroute->id;
         }