Changeset 8bf672d in mainline for uspace/srv/inet/inet.c

Timestamp:

2012-03-30T17:42:11Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

66a272f8

Parents:

3b3c689

Message:

Static route configuration.

File:

• uspace/srv/inet/inet.c (modified) (3 diffs)

uspace/srv/inet/inet.c

@@ -54 +54 @@
 #include "inetping.h"
 #include "inet_link.h"
+#include "sroute.h"
 
 #define NAME "inet"
@@ -120 +121 @@
 }
 
+static int inet_find_dir(inet_addr_t *src, inet_addr_t *dest, uint8_t tos,
+    inet_dir_t *dir)
+{
+        inet_sroute_t *sr;
+
+        /* XXX Handle case where source address is specified */
+        (void) src;
+
+        dir->aobj = inet_addrobj_find(dest, iaf_net);
+        if (dir->aobj != NULL) {
+                dir->ldest = *dest;
+                dir->dtype = dt_direct;
+        } else {
+                /* No direct path, try using a static route */
+                sr = inet_sroute_find(dest);
+                if (sr != NULL) {
+                        dir->aobj = inet_addrobj_find(&sr->router, iaf_net);
+                        dir->ldest = sr->router;
+                        dir->dtype = dt_router;
+                }
+        }
+
+        if (dir->aobj == NULL) {
+                log_msg(LVL_DEBUG, "inet_send: No route to destination.");
+                return ENOENT;
+        }
+
+        return EOK;
+}
+
 int inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
     int df)
 {
-        inet_addrobj_t *addr;
-
-        addr = inet_addrobj_find(&dgram->dest, iaf_net);
-        if (addr != NULL) {
-                /* Destination is directly accessible */
-                return inet_addrobj_send_dgram(addr, dgram, proto, ttl, df);
-        }
-
-        /* TODO: Gateways */
-        log_msg(LVL_DEBUG, "inet_send: No route to destination.");
-        return ENOENT;
+        inet_dir_t dir;
+        int rc;
+
+        rc = inet_find_dir(&dgram->src, &dgram->dest, dgram->tos, &dir);
+        if (rc != EOK)
+                return rc;
+
+        return inet_addrobj_send_dgram(dir.aobj, &dir.ldest, dgram,
+            proto, ttl, df);
 }
 
@@ -144 +173 @@
 int inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
 {
-        inet_addrobj_t *addr;
-
-        addr = inet_addrobj_find(remote, iaf_net);
-        if (addr != NULL) {
-                /* Destination is directly accessible */
-                local->ipv4 = addr->naddr.ipv4;
-                return EOK;
-        }
-
-        return ENOENT;
+        inet_dir_t dir;
+        int rc;
+
+        rc = inet_find_dir(NULL, remote, tos, &dir);
+        if (rc != EOK)
+                return rc;
+
+        /* XXX dt_local? */
+
+        /* Take source address from the address object */
+        local->ipv4 = dir.aobj->naddr.ipv4;
+        return EOK;
 }