Changeset 836dd794 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2010-03-07T20:17:17Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

31c80a5

Parents:

936835e

Message:

• local delivery fix (bug #198)

File:

• uspace/srv/net/il/ip/ip.c (modified) (4 diffs)

uspace/srv/net/il/ip/ip.c

@@ -696 +696 @@
                         return ip_release_and_return(packet, EAFNOSUPPORT);
         }
+        netif = NULL;
+        route = NULL;
         fibril_rwlock_read_lock(&ip_globals.netifs_lock);
         // device specified?
@@ -704 +706 @@
                         route = &ip_globals.gateway;
                 }
-        }else{
+        }
+        if(! route){
                 route = ip_find_route(*dest);
                 netif = route ? route->netif : NULL;
@@ -726 +729 @@
                 }
         }
-        if(route->address.s_addr == dest->s_addr){
+        // if the local host is the destination
+        if((route->address.s_addr == dest->s_addr)
+                && (dest->s_addr != IPV4_LOCALHOST_ADDRESS)){
                 // find the loopback device to deliver
                 dest->s_addr = IPV4_LOCALHOST_ADDRESS;
@@ -1581 +1586 @@
         fibril_rwlock_read_lock(&ip_globals.lock);
         route = ip_find_route(*dest);
+        // if the local host is the destination
+        if(route && (route->address.s_addr == dest->s_addr)
+                && (dest->s_addr != IPV4_LOCALHOST_ADDRESS)){
+                // find the loopback device to deliver
+                dest->s_addr = IPV4_LOCALHOST_ADDRESS;
+                route = ip_find_route(*dest);
+        }
         if(!(route && route->netif)){
                 fibril_rwlock_read_unlock(&ip_globals.lock);