spdy: continue - previous one and rename tls to openssl

9 files changed, 52 insertions, 82 deletions

diff --git a/src/microspdy/Makefile.am b/src/microspdy/Makefile.am
index 7d3c3d2b..11837717 100644
--- a/src/microspdy/Makefile.am
+++ b/src/microspdy/Makefile.am
@@ -16,7 +16,7 @@ lib_LTLIBRARIES = \
 
 libmicrospdy_la_SOURCES = \
   io.h \
-  tls.h tls.c \
+  io_openssl.h io_openssl.c \
   structures.h structures.c \
   internal.h internal.c \
   daemon.h daemon.c \
diff --git a/src/microspdy/applicationlayer.c b/src/microspdy/applicationlayer.c
index 8abeb57b..8bf9c67e 100644
--- a/src/microspdy/applicationlayer.c
+++ b/src/microspdy/applicationlayer.c
@@ -239,7 +239,7 @@ SPDY_init ()
                 "Buffer size is less than max supported frame size!");
         SPDYF_ASSERT(SPDY_MAX_SUPPORTED_FRAME_SIZE >= 32,
                 "Max supported frame size must be bigger than the minimal value!");
-        SPDYF_tls_global_init();
+        SPDYF_openssl_global_init();
         return SPDY_YES;
 }
 
@@ -248,8 +248,8 @@ void
 SPDY_deinit ()
 {
         //currently nothing to be freed/deinited
-        //SPDYF_tls_global_deinit doesn't do anything now
-        //SPDYF_tls_global_deinit();
+        //SPDYF_openssl_global_deinit doesn't do anything now
+        //SPDYF_openssl_global_deinit();
 }
 
 
diff --git a/src/microspdy/daemon.c b/src/microspdy/daemon.c
index 4c59c2cc..ee7165ad 100644
--- a/src/microspdy/daemon.c
+++ b/src/microspdy/daemon.c
@@ -26,7 +26,7 @@
 #include "structures.h"
 #include "internal.h"
 #include "session.h"
-#include "tls.h"
+#include "io.h"
 
 
 /**
@@ -191,8 +191,8 @@ SPDYF_start_daemon_va (uint16_t port,
         memset (daemon, 0, sizeof (struct SPDY_Daemon));
         daemon->socket_fd = -1;
         daemon->port = port;
-  daemon->fio_init = &SPDYF_tls_init;
-  daemon->fio_deinit = &SPDYF_tls_deinit;
+  daemon->fio_init = &SPDYF_openssl_init;
+  daemon->fio_deinit = &SPDYF_openssl_deinit;
         if (NULL == (daemon->certfile = strdup (certfile)))
         {
                 SPDYF_DEBUG("str");
diff --git a/src/microspdy/internal.h b/src/microspdy/internal.h
index becde9d5..7b07728c 100644
--- a/src/microspdy/internal.h
+++ b/src/microspdy/internal.h
@@ -27,7 +27,6 @@
 
 #include "platform.h"
 #include "microspdy.h"
-#include "tls.h"
 
 /* size of read buffers for each connection
  * must be at least the size of SPDY_MAX_SUPPORTED_FRAME_SIZE */
diff --git a/src/microspdy/io.h b/src/microspdy/io.h
index b1be69e6..19910d47 100644
--- a/src/microspdy/io.h
+++ b/src/microspdy/io.h
@@ -26,6 +26,7 @@
 #define IO_H
 
 #include "platform.h"
+#include "io_openssl.h"
 
 
 /**
diff --git a/src/microspdy/tls.c b/src/microspdy/io_openssl.c
index 57fd357d..c750fb72 100644
--- a/src/microspdy/tls.c
+++ b/src/microspdy/io_openssl.c
@@ -17,7 +17,7 @@
 */
 
 /**
- * @file tls.c
+ * @file io_openssl.c
  * @brief  TLS handling using libssl. The current code assumes that
  *                      blocking I/O is in use.
  * @author Andrey Uzunov
@@ -26,7 +26,7 @@
 #include "platform.h"
 #include "internal.h"
 #include "session.h"
-#include "tls.h"
+#include "io_openssl.h"
 
 
 /**
@@ -53,7 +53,7 @@ spdyf_next_protos_advertised_cb (SSL *ssl, const unsigned char **out, unsigned i
 
 
 void
-SPDYF_tls_global_init()
+SPDYF_openssl_global_init()
 {
         //error strings are now not used by the lib
     //SSL_load_error_strings();
@@ -65,7 +65,7 @@ SPDYF_tls_global_init()
 
 
 void
-SPDYF_tls_global_deinit()
+SPDYF_openssl_global_deinit()
 {
         //if SSL_load_error_strings was called
     //ERR_free_strings();
@@ -75,7 +75,7 @@ SPDYF_tls_global_deinit()
 
 
 int
-SPDYF_tls_init(struct SPDY_Daemon *daemon)
+SPDYF_openssl_init(struct SPDY_Daemon *daemon)
 {
     //create ssl context. TLSv1 used
     if(NULL == (daemon->io_context = SSL_CTX_new(TLSv1_server_method())))
@@ -117,14 +117,14 @@ SPDYF_tls_init(struct SPDY_Daemon *daemon)
 
 
 void
-SPDYF_tls_deinit(struct SPDY_Daemon *daemon)
+SPDYF_openssl_deinit(struct SPDY_Daemon *daemon)
 {
     SSL_CTX_free(daemon->io_context);
 }
 
 
 int
-SPDYF_tls_new_session(struct SPDY_Session *session)
+SPDYF_openssl_new_session(struct SPDY_Session *session)
 {
         int ret;
         
@@ -160,7 +160,7 @@ SPDYF_tls_new_session(struct SPDY_Session *session)
 
 
 void
-SPDYF_tls_close_session(struct SPDY_Session *session)
+SPDYF_openssl_close_session(struct SPDY_Session *session)
 {
         //SSL_shutdown sends TLS "close notify" as in TLS standard.
         //The function may fail as it waits for the other party to also close
@@ -174,7 +174,7 @@ SPDYF_tls_close_session(struct SPDY_Session *session)
 
 
 int
-SPDYF_tls_recv(struct SPDY_Session *session,
+SPDYF_openssl_recv(struct SPDY_Session *session,
                                 void * buffer,
                                 size_t size)
 {
@@ -193,14 +193,14 @@ SPDYF_tls_recv(struct SPDY_Session *session,
                                 
                         case SSL_ERROR_WANT_READ:
                         case SSL_ERROR_WANT_WRITE:
-                                return SPDY_TLS_ERROR_AGAIN;
+                                return SPDY_IO_ERROR_AGAIN;
                                 
                         case SSL_ERROR_SYSCALL:
                                 if(EINTR == errno)
-                                        return SPDY_TLS_ERROR_AGAIN;
+                                        return SPDY_IO_ERROR_AGAIN;
                                 
                         default:
-                                return SPDY_TLS_ERROR_ERROR;
+                                return SPDY_IO_ERROR_ERROR;
                 }
         }
 
@@ -209,7 +209,7 @@ SPDYF_tls_recv(struct SPDY_Session *session,
 
 
 int
-SPDYF_tls_send(struct SPDY_Session *session,
+SPDYF_openssl_send(struct SPDY_Session *session,
                                 const void * buffer,
                                 size_t size)
 {
@@ -229,14 +229,14 @@ SPDYF_tls_send(struct SPDY_Session *session,
                                 
                         case SSL_ERROR_WANT_READ:
                         case SSL_ERROR_WANT_WRITE:
-                                return SPDY_TLS_ERROR_AGAIN;
+                                return SPDY_IO_ERROR_AGAIN;
                                 
                         case SSL_ERROR_SYSCALL:
                                 if(EINTR == errno)
-                                        return SPDY_TLS_ERROR_AGAIN;
+                                        return SPDY_IO_ERROR_AGAIN;
                                 
                         default:
-                                return SPDY_TLS_ERROR_ERROR;
+                                return SPDY_IO_ERROR_ERROR;
                 }
         }
         
@@ -245,7 +245,7 @@ SPDYF_tls_send(struct SPDY_Session *session,
 
 
 int
-SPDYF_tls_is_pending(struct SPDY_Session *session)
+SPDYF_openssl_is_pending(struct SPDY_Session *session)
 {
         /* From openssl docs:
          * BUGS
diff --git a/src/microspdy/tls.h b/src/microspdy/io_openssl.h
index 932d93b9..a4829736 100644
--- a/src/microspdy/tls.h
+++ b/src/microspdy/io_openssl.h
@@ -17,58 +17,29 @@
 */
 
 /**
- * @file tls.h
+ * @file io_openssl.h
  * @brief  TLS handling. openssl with NPN is used, but as long as the
  *                      functions conform to this interface file, other libraries
  *                      can be used.
  * @author Andrey Uzunov
  */
 
-#ifndef TLS_H
-#define TLS_H
+#ifndef IO_OPENSSL_H
+#define IO_OPENSSL_H
 
 #include "platform.h"
+#include "io.h"
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/rand.h>
 
-/* macros used in other files instead of types.
- * useful in case of changing openssl to something else */
-//#define SPDYF_TLS_SESSION_CONTEXT SSL
-//#define SPDYF_TLS_DAEMON_CONTEXT SSL_CTX
-
-
-/**
- * Used for return code when reading and writing to the TLS socket.
- */
-enum SPDY_TLS_ERROR
-{
-        /**
-         * The connection was closed by the other party.
-         */
-        SPDY_TLS_ERROR_CLOSED = 0,
-        
-        /**
-         * Any kind of error ocurred. The session has to be closed.
-         */
-        SPDY_TLS_ERROR_ERROR = -2,
-        
-        /**
-         * The function had to return without processing any data. The whole
-         * cycle of events has to be called again (SPDY_run) as something
-         * either has to be written or read or the the syscall was
-         * interrupted by a signal.
-         */
-        SPDY_TLS_ERROR_AGAIN = -3,
-};
-
 
 /**
  * Global initializing of openssl. Must be called only once in the program.
  *
  */
 void
-SPDYF_tls_global_init();
+SPDYF_openssl_global_init();
 
 
 /**
@@ -77,7 +48,7 @@ SPDYF_tls_global_init();
  *
  */
 void
-SPDYF_tls_global_deinit();
+SPDYF_openssl_global_deinit();
 
 
 /**
@@ -89,7 +60,7 @@ SPDYF_tls_global_deinit();
  * @return SPDY_YES on success or SPDY_NO on error
  */
 int
-SPDYF_tls_init(struct SPDY_Daemon *daemon);
+SPDYF_openssl_init(struct SPDY_Daemon *daemon);
 
 
 /**
@@ -99,7 +70,7 @@ SPDYF_tls_init(struct SPDY_Daemon *daemon);
  * @param daemon SPDY_Daemon which is being stopped
  */
 void
-SPDYF_tls_deinit(struct SPDY_Daemon *daemon);
+SPDYF_openssl_deinit(struct SPDY_Daemon *daemon);
 
 
 /**
@@ -110,7 +81,7 @@ SPDYF_tls_deinit(struct SPDY_Daemon *daemon);
  * @return SPDY_NO if some openssl funcs fail. SPDY_YES otherwise
  */
 int
-SPDYF_tls_new_session(struct SPDY_Session *session);
+SPDYF_openssl_new_session(struct SPDY_Session *session);
 
 
 /**
@@ -120,7 +91,7 @@ SPDYF_tls_new_session(struct SPDY_Session *session);
  * @param session SPDY_Session whose socket is used by openssl
  */
 void
-SPDYF_tls_close_session(struct SPDY_Session *session);
+SPDYF_openssl_close_session(struct SPDY_Session *session);
 
 
 /**
@@ -132,10 +103,10 @@ SPDYF_tls_close_session(struct SPDY_Session *session);
  * @param size of the buffer
  * @return number of bytes (at most size) read from the TLS connection
  *         0 if the other party has closed the connection
- *         SPDY_TLS_ERROR code on error
+ *         SPDY_IO_ERROR code on error
  */
 int
-SPDYF_tls_recv(struct SPDY_Session *session,
+SPDYF_openssl_recv(struct SPDY_Session *session,
                                 void * buffer,
                                 size_t size);
 
@@ -150,10 +121,10 @@ SPDYF_tls_recv(struct SPDY_Session *session,
  * @return number of bytes (at most size) from the buffer that has been
  *                      written to the TLS connection
  *         0 if the other party has closed the connection
- *         SPDY_TLS_ERROR code on error
+ *         SPDY_IO_ERROR code on error
  */
 int
-SPDYF_tls_send(struct SPDY_Session *session,
+SPDYF_openssl_send(struct SPDY_Session *session,
                                 const void * buffer,
                                 size_t size);
 
@@ -166,6 +137,6 @@ SPDYF_tls_send(struct SPDY_Session *session,
  * @return SPDY_YES if data is pending or SPDY_NO otherwise
  */
 int
-SPDYF_tls_is_pending(struct SPDY_Session *session);
+SPDYF_openssl_is_pending(struct SPDY_Session *session);
 
 #endif
diff --git a/src/microspdy/session.c b/src/microspdy/session.c
index 5bd68d19..4056e20e 100644
--- a/src/microspdy/session.c
+++ b/src/microspdy/session.c
@@ -28,8 +28,8 @@
 #include "internal.h"
 #include "session.h"
 #include "compression.h"
-#include "tls.h"
 #include "stream.h"
+#include "io.h"
 
 
 /**
@@ -826,7 +826,7 @@ SPDYF_session_read (struct SPDY_Session *session)
                                         
         switch(bytes_read)
         {
-                case SPDY_TLS_ERROR_CLOSED:
+                case SPDY_IO_ERROR_CLOSED:
                         //The TLS connection was closed by the other party, clean 
                         //or not
                         shutdown (session->socket_fd, SHUT_RD);
@@ -834,7 +834,7 @@ SPDYF_session_read (struct SPDY_Session *session)
                         session->status = SPDY_SESSION_STATUS_CLOSING;
                         return SPDY_YES;
                         
-                case SPDY_TLS_ERROR_ERROR:
+                case SPDY_IO_ERROR_ERROR:
                         //any kind of error in the TLS subsystem
                         //try to prepare GOAWAY frame
                         SPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_INTERNAL_ERROR, false);
@@ -842,7 +842,7 @@ SPDYF_session_read (struct SPDY_Session *session)
                         session->status = SPDY_SESSION_STATUS_FLUSHING;
                         return SPDY_YES;
                         
-                case SPDY_TLS_ERROR_AGAIN:
+                case SPDY_IO_ERROR_AGAIN:
                         //read or write should be called again; leave it for the
                         //next time
                         return SPDY_NO;
@@ -958,7 +958,7 @@ SPDYF_session_write (struct SPDY_Session *session, bool only_one_frame)
                         
                 switch(bytes_written)
                 {
-                        case SPDY_TLS_ERROR_CLOSED:
+                        case SPDY_IO_ERROR_CLOSED:
                                 //The TLS connection was closed by the other party, clean 
                                 //or not
                                 shutdown (session->socket_fd, SHUT_RD);
@@ -966,13 +966,13 @@ SPDYF_session_write (struct SPDY_Session *session, bool only_one_frame)
                                 session->status = SPDY_SESSION_STATUS_CLOSING;
                                 return SPDY_YES;
                                 
-                        case SPDY_TLS_ERROR_ERROR:
+                        case SPDY_IO_ERROR_ERROR:
                                 //any kind of error in the TLS subsystem
                                 //forbid more writing
                                 session->status = SPDY_SESSION_STATUS_CLOSING;
                                 return SPDY_YES;
                                 
-                        case SPDY_TLS_ERROR_AGAIN:
+                        case SPDY_IO_ERROR_AGAIN:
                                 //read or write should be called again; leave it for the
                                 //next time; return from the function as we do not now
                                 //whether reading or writing is needed
@@ -1306,11 +1306,11 @@ SPDYF_session_accept(struct SPDY_Daemon *daemon)
         session->daemon = daemon;
         session->socket_fd = new_socket_fd;
     
-  session->fio_new_session = &SPDYF_tls_new_session;
-  session->fio_close_session = &SPDYF_tls_close_session;
-  session->fio_is_pending = &SPDYF_tls_is_pending;
-  session->fio_recv = &SPDYF_tls_recv;
-  session->fio_send = &SPDYF_tls_send;
+  session->fio_new_session = &SPDYF_openssl_new_session;
+  session->fio_close_session = &SPDYF_openssl_close_session;
+  session->fio_is_pending = &SPDYF_openssl_is_pending;
+  session->fio_recv = &SPDYF_openssl_recv;
+  session->fio_send = &SPDYF_openssl_send;
         
         //init TLS context, handshake will be done
         if(SPDY_YES != session->fio_new_session(session))
diff --git a/src/microspdy/structures.h b/src/microspdy/structures.h
index 529bc929..a53e12a9 100644
--- a/src/microspdy/structures.h
+++ b/src/microspdy/structures.h
@@ -28,7 +28,6 @@
 
 #include "platform.h"
 #include "microspdy.h"
-#include "tls.h"
 #include "io.h"