diff --git a/mongoose.c b/mongoose.c
index c82c07ef427f870534874ac63d4ae2a99a120659..d1473a10f077d8d0dc61182adc7a1b9ac64e125b 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -1918,17 +1918,52 @@ static void call_uri_handler(struct connection *conn) {
}
}
+static void callback_http_client_on_connect(struct connection *conn) {
+ int ok = 1;
+ socklen_t len = sizeof(ok);
+
+ conn->flags &= ~CONN_CONNECTING;
+ if (getsockopt(conn->client_sock, SOL_SOCKET, SO_ERROR, (char *) &ok,
+ &len) == 0 && ok == 0) {
+#ifdef MONGOOSE_USE_SSL
+ if (conn->ssl != NULL) {
+ int res = SSL_connect(conn->ssl), ssl_err = SSL_get_error(conn->ssl, res);
+ //DBG(("%p res %d %d", conn, res, ssl_err));
+ if (res == 1) {
+ conn->flags = CONN_SSL_HANDS_SHAKEN;
+ } else if (res == 0 || ssl_err == 2 || ssl_err == 3) {
+ conn->flags |= CONN_CONNECTING;
+ return; // Call us again
+ } else {
+ ok = 1;
+ }
+ }
+#endif
+ }
+ conn->mg_conn.status_code = ok == 0 ? MG_CONNECT_SUCCESS : MG_CONNECT_FAILURE;
+ if (conn->handler(&conn->mg_conn) || ok != 0) {
+ conn->flags |= CONN_CLOSE;
+ }
+}
+
static void write_to_socket(struct connection *conn) {
struct iobuf *io = &conn->remote_iobuf;
+ int n = 0;
+
+ if (conn->endpoint_type == EP_CLIENT && conn->flags & CONN_CONNECTING) {
+ callback_http_client_on_connect(conn);
+ return;
+ }
+
#ifdef MONGOOSE_USE_SSL
- int n = conn->ssl == NULL ? send(conn->client_sock, io->buf, io->len, 0) :
- SSL_write(conn->ssl, io->buf, io->len);
-#else
- int n = send(conn->client_sock, io->buf, io->len, 0);
+ if (conn->ssl != NULL) {
+ n = SSL_write(conn->ssl, io->buf, io->len);
+ } else
#endif
+ { n = send(conn->client_sock, io->buf, io->len, 0); }
DBG(("%p Written %d of %d(%d): [%.*s ...]",
- conn, n, io->len, io->size, 40, io->buf));
+ conn, n, io->len, io->size, io->len < 40 ? io->len : 40, io->buf));
if (is_error(n)) {
conn->flags |= CONN_CLOSE;
@@ -3508,29 +3543,6 @@ static void process_response(struct connection *conn) {
}
}
-static void callback_http_client_on_connect(struct connection *conn) {
- int ok;
- socklen_t len = sizeof(ok);
-
- conn->flags &= ~CONN_CONNECTING;
- if (getsockopt(conn->client_sock, SOL_SOCKET, SO_ERROR, (char *) &ok,
- &len) == 0 && ok == 0) {
- conn->mg_conn.status_code = MG_CONNECT_SUCCESS;
-#ifdef MONGOOSE_USE_SSL
- if (conn->ssl != NULL) {
- switch (SSL_connect(conn->ssl)) {
- case 1: conn->flags = CONN_SSL_HANDS_SHAKEN; break;
- case 0: conn->flags &= ~CONN_CONNECTING; // Call this function again
- default: ok = 1; break;
- }
- }
-#endif
- }
- if (conn->handler(&conn->mg_conn) || ok != 0) {
- conn->flags |= CONN_CLOSE;
- }
-}
-
static void read_from_socket(struct connection *conn) {
char buf[IOBUF_SIZE];
int n = 0;
@@ -3617,10 +3629,13 @@ int mg_connect(struct mg_server *server, const char *host, int port,
DBG(("%p %s:%d", conn, host, port));
if (connect_ret_val == 0) {
+ callback_http_client_on_connect(conn);
+#if 0
conn->mg_conn.status_code = MG_CONNECT_SUCCESS;
conn->flags &= ~CONN_CONNECTING;
conn->mg_conn.content = conn->local_iobuf.buf;
handler(&conn->mg_conn);
+#endif
}
return 1;
@@ -4080,7 +4095,7 @@ const char *mg_set_option(struct mg_server *server, const char *name,
#endif
#ifdef MONGOOSE_USE_SSL
} else if (ind == SSL_CERTIFICATE) {
- SSL_library_init();
+ //SSL_library_init();
if ((server->ssl_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) {
error_msg = "SSL_CTX_new() failed";
} else if (SSL_CTX_use_certificate_file(server->ssl_ctx, value, 1) == 0 ||
@@ -4140,6 +4155,7 @@ struct mg_server *mg_create_server(void *server_data) {
} while (server->ctl[0] == INVALID_SOCKET);
#ifdef MONGOOSE_USE_SSL
+ SSL_library_init();
server->client_ssl_ctx = SSL_CTX_new(SSLv23_client_method());
#endif
diff --git a/unit_test.c b/unit_test.c
index 5268664c804ee4d157ec7a3e4b11f66944faea9b..f7cda390745e44d92191a2cfb4268ecd99f5b9dc 100644
--- a/unit_test.c
+++ b/unit_test.c
@@ -1,8 +1,9 @@
// Unit test for the mongoose web server.
-// g++ -W -Wall -pedantic -g unit_test.c && ./a.out
+// g++ -W -Wall -pedantic -g unit_test.c -lssl && ./a.out
#ifndef _WIN32
#define MONGOOSE_USE_IPV6
+#define MONGOOSE_USE_SSL
#endif
// USE_* definitions must be made before #include "mongoose.c" !
@@ -514,6 +515,46 @@ static const char *test_parse_multipart(void) {
return NULL;
}
+#ifdef MONGOOSE_USE_SSL
+static int us1(struct mg_connection *conn) {
+ static const char *file_name = "mongoose.h";
+ int file_size;
+
+ if (conn->status_code == MG_CONNECT_SUCCESS) {
+ mg_printf(conn, "GET /%s HTTP/1.0\r\n\r\n", file_name);
+ return 0;
+ } else if (conn->status_code == MG_DOWNLOAD_SUCCESS) {
+ char *file_data = read_file(file_name, &file_size);
+ sprintf((char *) conn->connection_param, "%d",
+ file_size == conn->content_len &&
+ memcmp(file_data, conn->content, file_size) == 0 ? 1 : 0);
+ free(file_data);
+ } else if (conn->status_code == MG_CONNECT_FAILURE) {
+ sprintf((char *) conn->connection_param, "%s", "cf");
+ } else {
+ sprintf((char *) conn->connection_param, "%s", "df");
+ }
+ return 1;
+}
+
+static const char *test_ssl(void) {
+ static const char *ssl_cert = "examples/ssl_cert.pem";
+ char buf1[100] = "";
+ struct mg_server *server = mg_create_server(NULL);
+
+ ASSERT(mg_set_option(server, "listening_port", LISTENING_ADDR) == NULL);
+ ASSERT(mg_set_option(server, "document_root", ".") == NULL);
+ ASSERT(mg_set_option(server, "ssl_certificate", ssl_cert) == NULL);
+
+ ASSERT(mg_connect(server, "127.0.0.1", atoi(HTTP_PORT), 1, us1, buf1) == 1);
+
+ { int i; for (i = 0; i < 50; i++) mg_poll_server(server, 1000); }
+ ASSERT(strcmp(buf1, "1") == 0);
+ mg_destroy_server(&server);
+ return NULL;
+}
+#endif
+
static const char *run_all_tests(void) {
RUN_TEST(test_should_keep_alive);
RUN_TEST(test_match_prefix);
@@ -526,9 +567,12 @@ static const char *run_all_tests(void) {
RUN_TEST(test_mg_parse_header);
RUN_TEST(test_get_var);
RUN_TEST(test_next_option);
- RUN_TEST(test_server);
RUN_TEST(test_parse_multipart);
+ RUN_TEST(test_server);
RUN_TEST(test_mg_connect);
+#ifdef MONGOOSE_USE_SSL
+ RUN_TEST(test_ssl);
+#endif
return NULL;
}