Changeset 2986 for pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c

Timestamp:

Nov 4, 2009 5:08:32 PM (14 years ago)

Author:

nanang

Message:

Ticket #957:

• Applied workaround solution for getting local address problem with getsockname on win IOCP by using parent local address instead.
• Fixed SSL socket not to return PJ_FALSE in active socket accept callback, to keep accepting connections.
• Applied workaround solution for OpenSSL error mapping, as OpenSSL error codes are big numbers that won't fit pj_status_t.
• Minor updates, e.g: using pj_perror(), removing some logs, OpenSSL error print callback.
• Minor updates on SSL unit test, e.g: start_read() before start sending, additional ioqueue poll to cleanup sockets, add timeout feature to https client test.

File:

• pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c (modified) (19 diffs)

pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c

@@ -151 +151 @@
     }
 
+    /* Start reading data */
+    read_buf[0] = st->read_buf;
+    status = pj_ssl_sock_start_read2(ssock, st->pool, sizeof(st->read_buf), (void**)read_buf, 0);
+    if (status != PJ_SUCCESS) {
+        app_perror("...ERROR pj_ssl_sock_start_read2()", status);
+        goto on_return;
+    }
+
     /* Start sending data */
     while (st->sent < st->send_str_len) {
@@ -169 +177 @@
     }
 
-    /* Start reading data */
-    read_buf[0] = st->read_buf;
-    status = pj_ssl_sock_start_read2(ssock, st->pool, sizeof(st->read_buf), (void**)read_buf, 0);
-    if (status != PJ_SUCCESS  && status != PJ_EPENDING) {
-        app_perror("...ERROR pj_ssl_sock_start_read2()", status);
-        goto on_return;
-    }
-
 on_return:
     st->err = status;
@@ -196 +196 @@
 {
     struct test_state *parent_st = (struct test_state*) 
-                            pj_ssl_sock_get_user_data(ssock);
+                                   pj_ssl_sock_get_user_data(ssock);
     struct test_state *st;
     void *read_buf[1];
@@ -237 +237 @@
             dump_cert_info(".......", &info.remote_cert_info);
         }
+    }
+
+    /* Start reading data */
+    read_buf[0] = st->read_buf;
+    status = pj_ssl_sock_start_read2(newsock, st->pool, sizeof(st->read_buf), (void**)read_buf, 0);
+    if (status != PJ_SUCCESS) {
+        app_perror("...ERROR pj_ssl_sock_start_read2()", status);
+        goto on_return;
     }
 
@@ -255 +263 @@
         else
             break;
-    }
-
-    /* Start reading data */
-    read_buf[0] = st->read_buf;
-    status = pj_ssl_sock_start_read2(newsock, st->pool, sizeof(st->read_buf), (void**)read_buf, 0);
-    if (status != PJ_SUCCESS  && status != PJ_EPENDING) {
-        app_perror("...ERROR pj_ssl_sock_start_read2()", status);
-        goto on_return;
     }
 
@@ -422 +422 @@
 #define HTTP_SERVER_PORT        443
 
-static int https_client_test(void)
+static int https_client_test(unsigned ms_timeout)
 {
     pj_pool_t *pool = NULL;
     pj_ioqueue_t *ioqueue = NULL;
+    pj_timer_heap_t *timer = NULL;
     pj_ssl_sock_t *ssock = NULL;
     pj_ssl_sock_param param;
@@ -436 +437 @@
 
     status = pj_ioqueue_create(pool, 4, &ioqueue);
+    if (status != PJ_SUCCESS) {
+        goto on_return;
+    }
+
+    status = pj_timer_heap_create(pool, 4, &timer);
     if (status != PJ_SUCCESS) {
         goto on_return;
@@ -452 +458 @@
     param.user_data = &state;
     param.server_name = pj_str((char*)HTTP_SERVER_ADDR);
+    param.timer_heap = timer;
+    param.timeout.sec = 0;
+    param.timeout.msec = ms_timeout;
+    pj_time_val_normalize(&param.timeout);
 
     status = pj_ssl_sock_create(pool, &param, &ssock);
@@ -476 +486 @@
         pj_time_val delay = {0, 100};
         pj_ioqueue_poll(ioqueue, &delay);
+        pj_timer_heap_poll(timer, &delay);
 #endif
     }
@@ -492 +503 @@
     if (ioqueue)
         pj_ioqueue_destroy(ioqueue);
+    if (timer)
+        pj_timer_heap_destroy(timer);
     if (pool)
         pj_pool_release(pool);
@@ -633 +646 @@
     }
 
+    /* Clean up sockets */
+    {
+        pj_time_val delay = {0, 100};
+        while (pj_ioqueue_poll(ioqueue, &delay) > 0);
+    }
+
     if (state_serv.err || state_cli.err) {
         if (state_serv.err != PJ_SUCCESS)
@@ -683 +702 @@
     st->err = status;
 
+    if (st->err != PJ_SUCCESS || st->done) {
+        pj_activesock_close(asock);
+        if (!st->is_server)
+            clients_num--;
+        return PJ_FALSE;
+    }
+
     return PJ_TRUE;
 }
@@ -694 +720 @@
 
     if (status == PJ_SUCCESS) {
-        status = pj_activesock_start_read(asock, st->pool, 1, 0);
+        void *read_buf[1];
+
+        /* Start reading data */
+        read_buf[0] = st->read_buf;
+        status = pj_activesock_start_read2(asock, st->pool, sizeof(st->read_buf), (void**)read_buf, 0);
+        if (status != PJ_SUCCESS) {
+            app_perror("...ERROR pj_ssl_sock_start_read2()", status);
+        }
     }
 
     st->err = status;
+
+    if (st->err != PJ_SUCCESS) {
+        pj_activesock_close(asock);
+        if (!st->is_server)
+            clients_num--;
+        return PJ_FALSE;
+    }
 
     return PJ_TRUE;
@@ -846 +886 @@
     if (ssock_serv)
         pj_ssl_sock_close(ssock_serv);
-    if (asock_cli)
+    if (asock_cli && !state_cli.err && !state_cli.done)
         pj_activesock_close(asock_cli);
     if (timer)
@@ -859 +899 @@
 
 
+/* Test will perform multiple clients trying to connect to single server.
+ * Once SSL connection established, echo test will be performed.
+ */
 static int perf_test(unsigned clients, unsigned ms_handshake_timeout)
 {
@@ -1023 +1066 @@
     }
 
+    /* Clean up sockets */
+    {
+        pj_time_val delay = {0, 500};
+        while (pj_ioqueue_poll(ioqueue, &delay) > 0);
+    }
+
     if (state_serv.err != PJ_SUCCESS) {
         status = state_serv.err;
@@ -1078 +1127 @@
         return ret;
 
-    // Disable this test as requiring internet connection.
-#if 0
     PJ_LOG(3,("", "..https client test"));
-    ret = https_client_test();
-    if (ret != 0)
-        return ret;
-#endif
+    ret = https_client_test(30000);
+    // Ignore test result as internet connection may not be available.
+    //if (ret != 0)
+        //return ret;
+
+#ifndef PJ_SYMBIAN
 
     PJ_LOG(3,("", "..echo test w/ TLSv1 and TLS_RSA_WITH_DES_CBC_SHA cipher"));
@@ -1110 +1159 @@
         return PJ_EBUG;
 
-    PJ_LOG(3,("", "..client non-SSL timeout in 5 secs"));
+    PJ_LOG(3,("", "..client non-SSL (handshake timeout 5 secs)"));
     ret = client_non_ssl(5000);
     if (ret != 0)
@@ -1119 +1168 @@
     if (ret != 0)
         return ret;
+
+#endif
 
     return 0;