Changeset 4c53333 in mainline for uspace/srv/net/inetsrv/sroute.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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 (moved) (moved from uspace/srv/net/inet/sroute.c ) (5 diffs)

uspace/srv/net/inetsrv/sroute.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
-
 #include "sroute.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inet_link.h"
-#include "inet_util.h"
 
 static FIBRIL_MUTEX_INITIALIZE(sroute_list_lock);
@@ -57 +55 @@
 
         if (sroute == NULL) {
-                log_msg(LVL_ERROR, "Failed allocating static route object. "
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating static route object. "
                     "Out of memory.");
                 return NULL;
@@ -97 +95 @@
 inet_sroute_t *inet_sroute_find(inet_addr_t *addr)
 {
-        uint32_t mask;
-        inet_sroute_t *best;
-
-        log_msg(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);
-
+        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, link) {
+                inet_sroute_t *sroute = list_get_instance(link,
+                    inet_sroute_t, sroute_list);
+                
+                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)
+                        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)) {
+                
+                if (inet_naddr_compare_mask(&sroute->dest, addr)) {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found candidate %p",
+                            sroute);
+                        
+                        best = sroute;
+                        best_bits = dest_bits;
+                }
+        }
+        
+        if (best == NULL)
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found");
+        
+        fibril_mutex_unlock(&sroute_list_lock);
+        
+        return best;
+}
+
+/** Find static route with a specific name.
+ *
+ * @param name  Address object name
+ * @return      Address object
+ */
+inet_sroute_t *inet_sroute_find_by_name(const char *name)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name('%s')",
+            name);
+
+        fibril_mutex_lock(&sroute_list_lock);
+
+        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);
-                        log_msg(LVL_DEBUG, "inet_sroute_find: found %p",
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name: found %p",
                             sroute);
                         return sroute;
@@ -123 +159 @@
         }
 
-        log_msg(LVL_DEBUG, "inet_sroute_find: Not found");
-        fibril_mutex_unlock(&sroute_list_lock);
-
-        return NULL;
-}
-
-/** Find static route with a specific name.
- *
- * @param name  Address object name
- * @return      Address object
- */
-inet_sroute_t *inet_sroute_find_by_name(const char *name)
-{
-        log_msg(LVL_DEBUG, "inet_sroute_find_by_name('%s')",
-            name);
-
-        fibril_mutex_lock(&sroute_list_lock);
-
-        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);
-                        log_msg(LVL_DEBUG, "inet_sroute_find_by_name: found %p",
-                            sroute);
-                        return sroute;
-                }
-        }
-
-        log_msg(LVL_DEBUG, "inet_sroute_find_by_name: Not found");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name: Not found");
         fibril_mutex_unlock(&sroute_list_lock);
 
@@ -166 +172 @@
 inet_sroute_t *inet_sroute_get_by_id(sysarg_t id)
 {
-        log_msg(LVL_DEBUG, "inet_sroute_get_by_id(%zu)", (size_t)id);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_get_by_id(%zu)", (size_t)id);
 
         fibril_mutex_lock(&sroute_list_lock);