Changeset 59157eb in mainline

Timestamp:

2012-02-02T15:18:46Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f834f90d

Parents:

ecff3d9

Message:

Implement INET_EV_RECV IPC.

Location:

uspace

Files:

• lib/c/generic/inet.c (modified) (2 diffs)
• srv/inet/inet.c (modified) (4 diffs)
• srv/inet/inet.h (added)
• srv/tcp/tcp.c (modified) (2 diffs)

uspace/lib/c/generic/inet.c

@@ -148 +148 @@
 }
 
+static void inet_ev_recv(ipc_callid_t callid, ipc_call_t *call)
+{
+        int rc;
+        inet_dgram_t dgram;
+
+        dgram.src.ipv4 = IPC_GET_ARG1(*call);
+        dgram.dest.ipv4 = IPC_GET_ARG2(*call);
+        dgram.tos = IPC_GET_ARG3(*call);
+
+        rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        rc = inet_ev_ops->recv(&dgram);
+        async_answer_0(callid, rc);
+}
+
 static void inet_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -153 +172 @@
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-                
+
                 if (!IPC_GET_IMETHOD(call)) {
                         /* TODO: Handle hangup */
                         return;
                 }
-                
+
                 switch (IPC_GET_IMETHOD(call)) {
                 case INET_EV_RECV:
-                        async_answer_0(callid, EOK);
+                        inet_ev_recv(callid, &call);
                         break;
                 default:

uspace/srv/inet/inet.c

@@ -47 +47 @@
 #include <sys/types.h>
 
+#include "inet.h"
+
 #define NAME "inet"
-
-/** Inet Client */
-typedef struct {
-        async_sess_t *sess;
-        uint8_t protocol;
-        link_t client_list;
-} inet_client_t;
 
 static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -111 +106 @@
     ipc_call_t *call)
 {
-        uint32_t src_ipv4;
-        uint32_t dest_ipv4;
-        uint8_t tos;
+        inet_dgram_t dgram;
         uint8_t ttl;
         int df;
-        void *data;
-        size_t size;
         int rc;
 
         log_msg(LVL_DEBUG, "inet_send()");
 
-        src_ipv4 = IPC_GET_ARG1(*call);
-        dest_ipv4 = IPC_GET_ARG2(*call);
-        tos = IPC_GET_ARG3(*call);
+        dgram.src.ipv4 = IPC_GET_ARG1(*call);
+        dgram.dest.ipv4 = IPC_GET_ARG2(*call);
+        dgram.tos = IPC_GET_ARG3(*call);
         ttl = IPC_GET_ARG4(*call);
         df = IPC_GET_ARG5(*call);
 
-        (void)src_ipv4;
-        (void)dest_ipv4;
-        (void)tos;
         (void)ttl;
         (void)df;
 
-        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -140 +128 @@
         }
 
-        free(data);
+        free(dgram.data);
         async_answer_0(callid, ENOTSUP);
 }
@@ -223 +211 @@
 }
 
+int inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
+{
+        async_exch_t *exch = async_exchange_begin(client->sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_3(exch, INET_EV_RECV, dgram->src.ipv4,
+            dgram->dest.ipv4, dgram->tos, &answer);
+        int rc = async_data_write_start(exch, dgram->data, dgram->size);
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
+}
+
 int main(int argc, char *argv[])
 {

uspace/srv/tcp/tcp.c

@@ -54 +54 @@
 #define NAME       "tcp"
 
+#define IP_PROTO_TCP 6
+
 static int tcp_inet_ev_recv(inet_dgram_t *dgram);
 static void tcp_received_pdu(tcp_pdu_t *pdu);
@@ -185 +187 @@
         if (0) tcp_test();
 
-        rc = inet_init(42, &tcp_inet_ev_ops);
+        rc = inet_init(IP_PROTO_TCP, &tcp_inet_ev_ops);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed connecting to internet service.");