Changeset fab2746 in mainline for uspace/srv/net/udp/udp_type.h

Timestamp:

2015-04-08T21:25:30Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99ea91b2

Parents:

ba0eac5

Message:

New transport layer API. Only UDP implemented.

File:

• uspace/srv/net/udp/udp_type.h (modified) (4 diffs)

uspace/srv/net/udp/udp_type.h

@@ -36 +36 @@
 #define UDP_TYPE_H
 
+#include <async.h>
 #include <fibril.h>
 #include <fibril_synch.h>
 #include <ipc/loc.h>
-#include <socket_core.h>
 #include <sys/types.h>
 #include <inet/addr.h>
@@ -99 +99 @@
 
 typedef struct {
-        async_sess_t *sess;
-        socket_cores_t sockets;
-} udp_client_t;
+        void (*recv_msg)(void *, udp_sockpair_t *, udp_msg_t *);
+} udp_assoc_cb_t;
 
 /** UDP association
@@ -131 +130 @@
         /** Receive queue CV. Broadcast when new datagram is inserted */
         fibril_condvar_t rcv_queue_cv;
+
+        udp_assoc_cb_t *cb;
+        void *cb_arg;
 } udp_assoc_t;
 
 typedef struct {
 } udp_assoc_status_t;
-
-typedef struct udp_sockdata {
-        /** Lock */
-        fibril_mutex_t lock;
-        /** Socket core */
-        socket_core_t *sock_core;
-        /** Client */
-        udp_client_t *client;
-        /** Connection */
-        udp_assoc_t *assoc;
-        /** User-configured IP link */
-        service_id_t iplink;
-        /** Receiving fibril */
-        fid_t recv_fibril;
-        uint8_t recv_buffer[UDP_FRAGMENT_SIZE];
-        size_t recv_buffer_used;
-        udp_sock_t recv_fsock;
-        fibril_mutex_t recv_buffer_lock;
-        fibril_condvar_t recv_buffer_cv;
-        udp_error_t recv_error;
-} udp_sockdata_t;
 
 typedef struct {
@@ -166 +147 @@
 } udp_rcv_queue_entry_t;
 
+typedef struct udp_cassoc {
+        /** Association */
+        udp_assoc_t *assoc;
+        /** Association ID for the client */
+        sysarg_t id;
+        /** Client */
+        struct udp_client *client;
+        link_t lclient;
+} udp_cassoc_t;
+
+typedef struct {
+        /** Link to receive queue */
+        link_t link;
+        /** Socket pair */
+        udp_sockpair_t sp;
+        /** Message */
+        udp_msg_t *msg;
+        /** Client association */
+        udp_cassoc_t *cassoc;
+} udp_crcv_queue_entry_t;
+
+typedef struct udp_client {
+        /** Client callback session */
+        async_sess_t *sess;
+        /** Client assocations */
+        list_t cassoc; /* of udp_cassoc_t */
+        /** Client receive queue */
+        list_t crcv_queue;
+} udp_client_t;
+
 #endif