1 files changed, 40 insertions, 4 deletions

diff --git a/src/microspdy/structures.h b/src/microspdy/structures.h
index 603449f1..529bc929 100644
--- a/src/microspdy/structures.h
+++ b/src/microspdy/structures.h
@@ -29,6 +29,7 @@
 #include "platform.h"
 #include "microspdy.h"
 #include "tls.h"
+#include "io.h"
 
 
 /**
@@ -617,10 +618,10 @@ struct SPDY_Session
         struct SPDYF_Stream *streams_tail;
 
         /**
-         * Unique TLS context for the session. Initialized on each creation
+         * Unique IO context for the session. Initialized on each creation
          * (actually when the TCP connection is established).
          */
-        SPDYF_TLS_SESSION_CONTEXT *tls_context;
+        void *io_context;
         
         /**
          * Head of doubly-linked list of the responses.
@@ -659,6 +660,31 @@ struct SPDY_Session
         void *user_cls;
 
         /**
+         * Function to initialize the IO context for a new session.
+         */
+        SPDYF_IONewSession fio_new_session;
+
+        /**
+         * Function to deinitialize the IO context for a session.
+         */
+        SPDYF_IOCloseSession fio_close_session;
+
+        /**
+         * Function to read data from socket.
+         */
+        SPDYF_IORecv fio_recv;
+
+        /**
+         * Function to write data to socket.
+         */
+        SPDYF_IOSend fio_send;
+
+        /**
+         * Function to check for pending data in IO buffers.
+         */
+        SPDYF_IOIsPending fio_is_pending;
+
+        /**
          * Number of bytes that the lib must ignore immediately after they 
          * are read from the TLS socket without adding them to the read buf.
          * This is needed, for instance, when receiving frame bigger than
@@ -805,9 +831,9 @@ struct SPDY_Daemon
         struct SPDY_Session *cleanup_tail;
 
         /**
-         * Unique TLS context for the daemon. Initialized on daemon start.
+         * Unique IO context for the daemon. Initialized on daemon start.
          */
-        SPDYF_TLS_DAEMON_CONTEXT *tls_context;
+        void *io_context;
 
         /**
          * Certificate file of the server. File path is kept here.
@@ -864,6 +890,16 @@ struct SPDY_Daemon
         void *fcls;
 
         /**
+         * Function to initialize the IO context for the daemon.
+         */
+        SPDYF_IOInit fio_init;
+
+        /**
+         * Function to deinitialize the IO context for the daemon.
+         */
+        SPDYF_IODeinit fio_deinit;
+
+        /**
          * After how many seconds of inactivity should
          * connections time out? Zero for no timeout.
          */