Changeset 3106 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

Timestamp:

Feb 24, 2010 5:43:34 AM (14 years ago)

Author:

nanang

Message:

Ticket #1032:

• Initial version of server domain name verification:
  • Updated SSL certificate info, especially identities info
  • Updated verification mechanism as in the specifications in ticket desc.
  • Added server domain name info in pjsip_tx_data.
  • Added alternative API for acquiring transport and creating transport of transport factory to include pjsip_tx_data param.
  • Server identity match criteria:
    • full host name match
    • wild card not accepted
    • if identity is URI, it must be SIP/SIPS URI
• Initial version of transport state notifications:
  • Added new API to set transport state callback in PJSIP and PJSUA.
  • Defined states: connected/disconnected, accepted/rejected, verification errors.
• Minors:
  • Updated SSL socket test: dump verification result, test of requiring client cert, and few minors.
  • Updated test cert to include subjectAltName extensions.
  • Added SSL certificate dump function.
  • Updated max number of socket async operations in Symbian sample apps (RSocketServ::Connect()) to 32 (was default 8).

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c (modified) (10 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -166 +166 @@
     host_port->port = pj_sockaddr_get_port(addr);
 }
+
+
+static void tcp_init_shutdown(struct tcp_transport *tcp, pj_status_t status)
+{
+    pjsip_tp_state_callback *state_cb;
+
+    if (tcp->close_reason == PJ_SUCCESS)
+        tcp->close_reason = status;
+
+    if (tcp->base.is_shutdown)
+        return;
+
+    /* Notify application of transport disconnected state */
+    state_cb = pjsip_tpmgr_get_status_cb(tcp->base.tpmgr);
+    if (state_cb) {
+        pjsip_transport_state_info state_info;
+
+        pj_bzero(&state_info, sizeof(state_info));
+        state_info.status = tcp->close_reason;
+        (*state_cb)(&tcp->base, PJSIP_TP_STATE_DISCONNECTED, &state_info);
+    }
+
+    /* We can not destroy the transport since high level objects may
+     * still keep reference to this transport. So we can only 
+     * instruct transport manager to gracefully start the shutdown
+     * procedure for this transport.
+     */
+    pjsip_transport_shutdown(&tcp->base);
+}
+
 
 /*
@@ -922 +952 @@
     struct tcp_transport *tcp;
     char addr[PJ_INET6_ADDRSTRLEN+10];
+    pjsip_tp_state_callback *state_cb;
     pj_status_t status;
 
@@ -967 +998 @@
                 pj_gettimeofday(&tcp->last_activity);
             }
+
+            /* Notify application of transport state accepted */
+            state_cb = pjsip_tpmgr_get_status_cb(tcp->base.tpmgr);
+            if (state_cb) {
+                pjsip_transport_state_info state_info;
+            
+                pj_bzero(&state_info, sizeof(state_info));
+                (*state_cb)(&tcp->base, PJSIP_TP_STATE_ACCEPTED, &state_info);
+            }
         }
     }
@@ -1014 +1054 @@
         status = (bytes_sent == 0) ? PJ_RETURN_OS_ERROR(OSERR_ENOTCONN) :
                                      -bytes_sent;
-        if (tcp->close_reason==PJ_SUCCESS) tcp->close_reason = status;
-        pjsip_transport_shutdown(&tcp->base);
+
+        tcp_init_shutdown(tcp, status);
 
         return PJ_FALSE;
@@ -1110 +1150 @@
                 if (status == PJ_SUCCESS) 
                     status = PJ_RETURN_OS_ERROR(OSERR_ENOTCONN);
-                if (tcp->close_reason==PJ_SUCCESS) tcp->close_reason = status;
-                pjsip_transport_shutdown(&tcp->base);
+
+                tcp_init_shutdown(tcp, status);
             }
         }
@@ -1200 +1240 @@
         PJ_LOG(4,(tcp->base.obj_name, "TCP connection closed"));
         
-        /* We can not destroy the transport since high level objects may
-         * still keep reference to this transport. So we can only 
-         * instruct transport manager to gracefully start the shutdown
-         * procedure for this transport.
-         */
-        if (tcp->close_reason==PJ_SUCCESS) 
-            tcp->close_reason = status;
-        pjsip_transport_shutdown(&tcp->base);
+        tcp_init_shutdown(tcp, status);
 
         return PJ_FALSE;
@@ -1229 +1262 @@
     pj_sockaddr_in addr;
     int addrlen;
+
+    pjsip_tp_state_callback *state_cb;
 
     tcp = (struct tcp_transport*) pj_activesock_get_user_data(asock);
@@ -1253 +1288 @@
         }
 
-        /* We can not destroy the transport since high level objects may
-         * still keep reference to this transport. So we can only 
-         * instruct transport manager to gracefully start the shutdown
-         * procedure for this transport.
-         */
-        if (tcp->close_reason==PJ_SUCCESS) tcp->close_reason = status;
-        pjsip_transport_shutdown(&tcp->base);
-        return PJ_FALSE;
+        tcp_init_shutdown(tcp, status);
     }
 
@@ -1294 +1322 @@
     status = tcp_start_read(tcp);
     if (status != PJ_SUCCESS) {
-        /* We can not destroy the transport since high level objects may
-         * still keep reference to this transport. So we can only 
-         * instruct transport manager to gracefully start the shutdown
-         * procedure for this transport.
-         */
-        if (tcp->close_reason==PJ_SUCCESS) tcp->close_reason = status;
-        pjsip_transport_shutdown(&tcp->base);
+        tcp_init_shutdown(tcp, status);
         return PJ_FALSE;
+    }
+
+    /* Notify application of transport state connected */
+    state_cb = pjsip_tpmgr_get_status_cb(tcp->base.tpmgr);
+    if (state_cb) {
+        pjsip_transport_state_info state_info;
+    
+        pj_bzero(&state_info, sizeof(state_info));
+        (*state_cb)(&tcp->base, PJSIP_TP_STATE_CONNECTED, &state_info);
     }
 
@@ -1359 +1390 @@
         tcp_perror(tcp->base.obj_name, 
                    "Error sending keep-alive packet", status);
-        pjsip_transport_shutdown(&tcp->base);
+        tcp_init_shutdown(tcp, status);
         return;
     }