Changeset ceba4bed in mainline for uspace/srv/inet/inet.c

Timestamp:

2012-02-06T17:38:50Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e767dbf

Parents:

bc38578

Message:

Introduce address object. Sketch sending outgoing datagrams to directly
reachable destinations.

File:

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

uspace/srv/inet/inet.c

@@ -47 +47 @@
 #include <sys/types.h>
 
+#include "addrobj.h"
 #include "inet.h"
 #include "inet_link.h"
@@ -85 +86 @@
 }
 
-static void inet_callback_create(inet_client_t *client, ipc_callid_t callid,
-    ipc_call_t *call)
-{
-        log_msg(LVL_DEBUG, "inet_callback_create()");
+static void inet_callback_create_srv(inet_client_t *client, ipc_callid_t callid,
+    ipc_call_t *call)
+{
+        log_msg(LVL_DEBUG, "inet_callback_create_srv()");
 
         async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
@@ -100 +101 @@
 }
 
-static void inet_get_srcaddr(inet_client_t *client, ipc_callid_t callid,
-    ipc_call_t *call)
-{
-        log_msg(LVL_DEBUG, "inet_get_srcaddr()");
+static int inet_send(inet_client_t *client, inet_dgram_t *dgram,
+    uint8_t ttl, int df)
+{
+        inet_addrobj_t *addr;
+
+        addr = inet_addrobj_find(&dgram->dest);
+        if (addr != NULL) {
+                /* Destination is directly accessible */
+                return inet_addrobj_send_dgram(addr, dgram, ttl, df);
+        }
+
+        /* TODO: Gateways */
+        log_msg(LVL_DEBUG, "inet_send: No route to destination.");
+        return ENOENT;
+}
+
+static void inet_get_srcaddr_srv(inet_client_t *client, ipc_callid_t callid,
+    ipc_call_t *call)
+{
+        log_msg(LVL_DEBUG, "inet_get_srcaddr_srv()");
 
         async_answer_0(callid, ENOTSUP);
 }
 
-static void inet_send(inet_client_t *client, ipc_callid_t callid,
+static void inet_send_srv(inet_client_t *client, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -116 +133 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inet_send()");
+        log_msg(LVL_DEBUG, "inet_send_srv()");
 
         dgram.src.ipv4 = IPC_GET_ARG1(*call);
@@ -124 +141 @@
         df = IPC_GET_ARG5(*call);
 
-        (void)ttl;
-        (void)df;
-
         rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
         if (rc != EOK) {
@@ -133 +147 @@
         }
 
+        rc = inet_send(client, &dgram, ttl, df);
+
         free(dgram.data);
-        async_answer_0(callid, ENOTSUP);
-}
-
-static void inet_set_proto(inet_client_t *client, ipc_callid_t callid,
+        async_answer_0(callid, rc);
+}
+
+static void inet_set_proto_srv(inet_client_t *client, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -143 +159 @@
 
         proto = IPC_GET_ARG1(*call);
-        log_msg(LVL_DEBUG, "inet_set_proto(%lu)", (unsigned long) proto);
+        log_msg(LVL_DEBUG, "inet_set_proto_srv(%lu)", (unsigned long) proto);
 
         if (proto > UINT8_MAX) {
@@ -197 +213 @@
                 switch (method) {
                 case INET_CALLBACK_CREATE:
-                        inet_callback_create(&client, callid, &call);
+                        inet_callback_create_srv(&client, callid, &call);
                         break;
                 case INET_GET_SRCADDR:
-                        inet_get_srcaddr(&client, callid, &call);
+                        inet_get_srcaddr_srv(&client, callid, &call);
                         break;
                 case INET_SEND:
-                        inet_send(&client, callid, &call);
+                        inet_send_srv(&client, callid, &call);
                         break;
                 case INET_SET_PROTO:
-                        inet_set_proto(&client, callid, &call);
+                        inet_set_proto_srv(&client, callid, &call);
                         break;
                 default: