Changeset 3106 for pjproject/trunk/pjsip/src/pjsip/sip_transport.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.c (modified) (11 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -90 +90 @@
     void           (*on_rx_msg)(pjsip_endpoint*, pj_status_t, pjsip_rx_data*);
     pj_status_t    (*on_tx_msg)(pjsip_endpoint*, pjsip_tx_data*);
+    pjsip_tp_state_callback *tp_state_cb;
+    void *tp_state_user_data;
 };
 
@@ -865 +867 @@
      * Register to hash table (see Trac ticket #42).
      */
-    key_len = sizeof(tp->key.type) + tp->addr_len;
+    key_len = sizeof(tp->key.type) + sizeof(tp->key.hname) + tp->addr_len;
     pj_lock_acquire(mgr->lock);
 
@@ -915 +917 @@
      * Unregister from hash table (see Trac ticket #42).
      */
-    key_len = sizeof(tp->key.type) + tp->addr_len;
+    key_len = sizeof(tp->key.type) + sizeof(tp->key.hname) + tp->addr_len;
     hval = 0;
     entry = pj_hash_get(mgr->table, &tp->key, key_len, &hval);
@@ -1503 +1505 @@
                                                   pjsip_transport **tp)
 {
+    return pjsip_tpmgr_acquire_transport2(mgr, type, remote, addr_len, sel,
+                                          NULL, tp);
+}
+
+/*
+ * pjsip_tpmgr_acquire_transport2()
+ *
+ * Get transport suitable to communicate to remote. Create a new one
+ * if necessary.
+ */
+PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr,
+                                                   pjsip_transport_type_e type,
+                                                   const pj_sockaddr_t *remote,
+                                                   int addr_len,
+                                                   const pjsip_tpselector *sel,
+                                                   pjsip_tx_data *tdata,
+                                                   pjsip_transport **tp)
+{
     pjsip_tpfactory *factory;
     pj_status_t status;
@@ -1572 +1592 @@
         pjsip_transport *transport;
 
+        /*
+         * Find factory that can create such transport.
+         */
+        factory = mgr->factory_list.next;
+        while (factory != &mgr->factory_list) {
+            if (factory->type == type)
+                break;
+            factory = factory->next;
+        }
+        if (factory == &mgr->factory_list)
+            factory = NULL;
+
         pj_bzero(&key, sizeof(key));
-        key_len = sizeof(key.type) + addr_len;
+        key_len = sizeof(key.type) + sizeof(key.hname) + addr_len;
 
         /* First try to get exact destination. */
         key.type = type;
         pj_memcpy(&key.rem_addr, remote, addr_len);
+        if (factory && factory->create_transport2 && 
+            tdata && tdata->dest_info.name.slen)
+        {
+            /* Only include hostname hash in the key when the factory support
+             * create_transport2() and tdata is supplied.
+             */
+            key.hname = pj_hash_calc_tolower(0, 
+                                    (char*)tdata->dest_info.name.ptr,
+                                    &tdata->dest_info.name);
+        }
 
         transport = (pjsip_transport*)
                     pj_hash_get(mgr->table, &key, key_len, NULL);
+
         if (transport == NULL) {
             unsigned flag = pjsip_transport_get_flag_from_type(type);
             const pj_sockaddr *remote_addr = (const pj_sockaddr*)remote;
+
 
             /* Ignore address for loop transports. */
@@ -1592 +1636 @@
 
                 pj_bzero(addr, addr_len);
-                key_len = sizeof(key.type) + addr_len;
+                key_len = sizeof(key.type) + sizeof(key.hname) + addr_len;
                 transport = (pjsip_transport*) 
                             pj_hash_get(mgr->table, &key, key_len, NULL);
@@ -1605 +1649 @@
                 addr->addr.sa_family = remote_addr->addr.sa_family;
 
-                key_len = sizeof(key.type) + addr_len;
+                key_len = sizeof(key.type) + sizeof(key.hname) + addr_len;
                 transport = (pjsip_transport*)
                             pj_hash_get(mgr->table, &key, key_len, NULL);
@@ -1625 +1669 @@
         /*
          * Transport not found!
-         * Find factory that can create such transport.
          */
-        factory = mgr->factory_list.next;
-        while (factory != &mgr->factory_list) {
-            if (factory->type == type)
-                break;
-            factory = factory->next;
-        }
-
-        if (factory == &mgr->factory_list) {
+        if (NULL == factory) {
             /* No factory can create the transport! */
             pj_lock_release(mgr->lock);
@@ -1640 +1676 @@
             return PJSIP_EUNSUPTRANSPORT;
         }
-
     }
 
@@ -1647 +1682 @@
 
     /* Request factory to create transport. */
-    status = factory->create_transport(factory, mgr, mgr->endpt,
-                                       (const pj_sockaddr*) remote, addr_len,
-                                       tp);
+    if (factory->create_transport2) {
+        status = factory->create_transport2(factory, mgr, mgr->endpt,
+                                            (const pj_sockaddr*) remote, 
+                                            addr_len, tdata, tp);
+    } else {
+        status = factory->create_transport(factory, mgr, mgr->endpt,
+                                           (const pj_sockaddr*) remote, 
+                                           addr_len, tp);
+    }
     if (status == PJ_SUCCESS) {
         PJ_ASSERT_ON_FAIL(tp!=NULL, 
@@ -1712 +1753 @@
 }
 
+PJ_DEF(pj_status_t) pjsip_tpmgr_set_status_cb(pjsip_tpmgr *mgr,
+                                              pjsip_tp_state_callback *cb)
+{
+    PJ_ASSERT_RETURN(mgr, PJ_EINVAL);
+
+    mgr->tp_state_cb = cb;
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pjsip_tp_state_callback*) pjsip_tpmgr_get_status_cb(
+                                              const pjsip_tpmgr *mgr)
+{
+    PJ_ASSERT_RETURN(mgr, NULL);
+
+    return mgr->tp_state_cb;
+}