Changeset 2989 for pjproject

Timestamp:

Nov 6, 2009 8:01:59 AM (14 years ago)

Author:

nanang

Message:

Ticket #957: Workaround fix for SSL socket specific related to ticket #985.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (10 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -37 +37 @@
 #define THIS_FILE               "ssl_sock_ossl.c"
 
+/* Workaround for ticket #985 */
+#define DELAYED_CLOSE_TIMEOUT   200
+
 /* 
  * Include OpenSSL headers 
@@ -63 +66 @@
     SSL_STATE_HANDSHAKING,
     SSL_STATE_ESTABLISHED
+};
+
+/*
+ * Internal timer types.
+ */
+enum timer_id
+{
+    TIMER_NONE,
+    TIMER_HANDSHAKE_TIMEOUT,
+    TIMER_CLOSE
 };
 
@@ -139 +152 @@
     enum ssl_state        ssl_state;
     pj_ioqueue_op_key_t   handshake_op_key;
-    pj_timer_entry        handshake_timer;
+    pj_timer_entry        timer;
 
     pj_sock_t             sock;
@@ -696 +709 @@
 {
     /* Cancel handshake timer */
-    if (ssock->param.timer_heap)
-        pj_timer_heap_cancel(ssock->param.timer_heap, &ssock->handshake_timer);
+    if (ssock->timer.id == TIMER_HANDSHAKE_TIMEOUT) {
+        pj_timer_heap_cancel(ssock->param.timer_heap, &ssock->timer);
+        ssock->timer.id = TIMER_NONE;
+    }
 
     /* Update certificates info on successful handshake */
@@ -717 +732 @@
                       errmsg));
 
-            pj_ssl_sock_close(ssock);
+            /* Workaround for ticket #985 */
+#if defined(PJ_WIN32) && PJ_WIN32!=0
+            if (ssock->param.timer_heap) {
+                pj_time_val interval = {0, DELAYED_CLOSE_TIMEOUT};
+
+                reset_ssl_sock_state(ssock);
+
+                ssock->timer.id = TIMER_CLOSE;
+                pj_time_val_normalize(&interval);
+                if (pj_timer_heap_schedule(ssock->param.timer_heap, 
+                                           &ssock->timer, &interval) != 0)
+                {
+                    ssock->timer.id = TIMER_NONE;
+                    pj_ssl_sock_close(ssock);
+                }
+            } else 
+#endif  /* PJ_WIN32 */
+            {
+                pj_ssl_sock_close(ssock);
+            }
             return PJ_FALSE;
         }
@@ -875 +909 @@
 
 
-static void handshake_timeout_cb(pj_timer_heap_t *th,
-                                 struct pj_timer_entry *te)
+static void on_timer(pj_timer_heap_t *th, struct pj_timer_entry *te)
 {
     pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)te->user_data;
+    int timer_id = te->id;
+
+    te->id = TIMER_NONE;
 
     PJ_UNUSED_ARG(th);
 
-    PJ_LOG(1,(ssock->pool->obj_name, "SSL handshake timeout after %d.%ds",
-              ssock->param.timeout.sec, ssock->param.timeout.msec));
-
-    on_handshake_complete(ssock, PJ_ETIMEDOUT);
+    switch (timer_id) {
+    case TIMER_HANDSHAKE_TIMEOUT:
+        PJ_LOG(1,(ssock->pool->obj_name, "SSL handshake timeout after %d.%ds",
+                  ssock->param.timeout.sec, ssock->param.timeout.msec));
+
+        on_handshake_complete(ssock, PJ_ETIMEDOUT);
+        break;
+    case TIMER_CLOSE:
+        pj_ssl_sock_close(ssock);
+        break;
+    default:
+        pj_assert(!"Unknown timer");
+        break;
+    }
 }
 
@@ -1253 +1299 @@
         ssock->param.timeout.msec != 0))
     {
-        pj_timer_entry_init(&ssock->handshake_timer, 0, ssock, 
-                            &handshake_timeout_cb);
-        pj_timer_heap_schedule(ssock->param.timer_heap, &ssock->handshake_timer,
-                               &ssock->param.timeout);
+        pj_assert(ssock->timer.id == TIMER_NONE);
+        ssock->timer.id = TIMER_HANDSHAKE_TIMEOUT;
+        status = pj_timer_heap_schedule(ssock->param.timer_heap, 
+                                        &ssock->timer,
+                                        &ssock->param.timeout);
+        if (status != PJ_SUCCESS)
+            ssock->timer.id = TIMER_NONE;
     }
 
@@ -1348 +1397 @@
         ssock->param.timeout.msec != 0))
     {
-        pj_timer_entry_init(&ssock->handshake_timer, 0, ssock, 
-                            &handshake_timeout_cb);
-        pj_timer_heap_schedule(ssock->param.timer_heap,
-                               &ssock->handshake_timer,
-                               &ssock->param.timeout);
+        pj_assert(ssock->timer.id == TIMER_NONE);
+        ssock->timer.id = TIMER_HANDSHAKE_TIMEOUT;
+        status = pj_timer_heap_schedule(ssock->param.timer_heap,
+                                        &ssock->timer,
+                                        &ssock->param.timeout);
+        if (status != PJ_SUCCESS)
+            ssock->timer.id = TIMER_NONE;
     }
 
@@ -1487 +1538 @@
     pj_list_init(&ssock->write_pending);
     pj_list_init(&ssock->write_pending_empty);
+    pj_timer_entry_init(&ssock->timer, 0, ssock, &on_timer);
 
     /* Create secure socket mutex */
@@ -1526 +1578 @@
 
     PJ_ASSERT_RETURN(ssock, PJ_EINVAL);
+
+    if (!ssock->pool)
+        return PJ_SUCCESS;
+
+    if (ssock->timer.id != TIMER_NONE) {
+        pj_timer_heap_cancel(ssock->param.timer_heap, &ssock->timer);
+        ssock->timer.id = TIMER_NONE;
+    }
 
     reset_ssl_sock_state(ssock);