Changeset 852

Timestamp:

Dec 11, 2006 9:32:57 AM (18 years ago)

Author:

bennylp

Message:

More testing with TLS implementation (ticket #3), we can send outgoing request but somehow connection gets closed by server after the request is sent

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tls_ossl.c (modified) (9 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls_ossl.c

@@ -163 +163 @@
 };
 
+static int ssl_print_err_count;
 static int ssl_print_err_cb(const char *str, size_t len, void *u)
 {
@@ -180 +181 @@
         break;
     }
+    ++ssl_print_err_count;
     return len;
 }
@@ -186 +188 @@
 {
     struct err_data e;
+    int count = ssl_print_err_count;
     e.lvl = level; e.snd = sender; e.ttl = title;
     ERR_print_errors_cb(&ssl_print_err_cb, &e);
-    ERR_print_errors_fp(stderr);
+
+    if (count==ssl_print_err_count)
+        ssl_print_err_cb(" ", 1, &e);
 }
 #else
@@ -529 +534 @@
 
         case SSL_ERROR_ZERO_RETURN:
+            PJ_LOG(4,(tls_tp->base.obj_name, "SSL transport shutdodwn by remote"));
             pjsip_transport_shutdown(&tls_tp->base);
             goto done;
@@ -678 +684 @@
 
     /* Initialize local address */
+    tls_tp->base.addr_len = sizeof(tls_tp->base.local_addr);
     status = pj_sock_getsockname(tls_tp->sock, &tls_tp->base.local_addr,
                                  &tls_tp->base.addr_len);
@@ -713 +720 @@
     tls_tp->rdata.pkt_info.src_port = pj_ntohs(rem_addr->sin_port);
 
+    /* Register transport to transport manager */
+    status = pjsip_transport_register(lis->tpmgr, &tls_tp->base);
+    if (status != PJ_SUCCESS) {
+        goto on_error;
+    }
+
     /* Create worker thread to receive packets */
     status = pj_thread_create(pool, "tlsthread", &tls_worker_thread,
                               tls_tp, PJ_THREAD_DEFAULT_STACK_SIZE, 0, 
                               &tls_tp->thread);
-    if (status != PJ_SUCCESS)
-        goto on_error;
+    if (status != PJ_SUCCESS) {
+        pjsip_transport_destroy(&tls_tp->base);
+        return status;
+    }
 
     /* Done */
@@ -855 +870 @@
 static pj_status_t tls_tp_do_shutdown(pjsip_transport *transport)
 {
+    PJ_LOG(4,(transport->obj_name, "TLS transport marked for shutdown.."));
+
     /* Nothing to do for TLS */
     PJ_UNUSED_ARG(transport);
+
     return PJ_SUCCESS;
 }
@@ -866 +884 @@
 {
     struct tls_transport *tls_tp = (struct tls_transport*) transport;
+
+    PJ_LOG(4,(transport->obj_name, "Destroying TLS transport.."));
 
     if (tls_tp->thread) {
@@ -910 +930 @@
     }
 
+    PJ_LOG(4,(THIS_FILE, "TLS transport destroyed"));
     return PJ_SUCCESS;
 }