Changeset 3020

Timestamp:

Nov 20, 2009 7:48:41 AM (14 years ago)

Author:

nanang

Message:

Ticket #957:

• Fixed compile error of incompatible param type (or bad type conversion) on Symbian 5th ed (and perhaps also on some GCC versions).
• Fixed on_connect_complete() to reset SSL sock state before callback when connection fails (OpenSSL impl).
• Fixed saving remote address before start connecting, so it won't miss remote address info when socket connection establishes immediately (OpenSSL impl).

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ssl_sock_ossl.c (modified) (4 diffs)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (1 diff)

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

@@ -768 +768 @@
     /* Connecting */
     else {
+        /* On failure, reset SSL socket state first, as app may try to 
+         * reconnect in the callback.
+         */
+        if (status != PJ_SUCCESS) {
+            reset_ssl_sock_state(ssock);
+        }
         if (ssock->param.cb.on_connect_complete) {
             pj_bool_t ret;
@@ -773 +779 @@
             if (ret == PJ_FALSE)
                 return PJ_FALSE;
-        }
-        if (status != PJ_SUCCESS) {
-            /* Reset SSL socket state */
-            reset_ssl_sock_state(ssock);
         }
     }
@@ -2078 +2080 @@
         goto on_error;
 
+    /* Save remote address */
+    pj_sockaddr_cp(&ssock->rem_addr, remaddr);
+
     status = pj_activesock_start_connect(ssock->asock, pool, remaddr,
                                          addr_len);
@@ -2098 +2103 @@
      */
 
-    /* Set remote address */
-    pj_sockaddr_cp(&ssock->rem_addr, remaddr);
-
     /* Update SSL state */
     ssock->is_server = PJ_FALSE;

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -885 +885 @@
             {
                 /* Update port only */
-                pj_sockaddr_set_port((pj_sockaddr_t*)&tls->base.local_addr, 
+                pj_sockaddr_set_port(&tls->base.local_addr, 
                                      new_port);
             }