Changeset 3110 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c

Timestamp:

Feb 25, 2010 11:58:19 AM (14 years ago)

Author:

nanang

Message:

More ticket #1032:

• Updated transport state notification callback to return void.
• Updated transport state enum to only contain connected and disconnected, no more bitmask value.
• Added direction field to SIP transport.
• Removed remote hostname hash from transport key.
• Updated cert info dump to return -1 when buffer is insufficient.
• Added new error code PJSIP_TLS_ECERTVERIF.
• Updated get_cert_name() in ssl_sock_symbian.c to use heap buffer instead of stack.
• Minors, e.g: added prefix PJ in cipher types, docs.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport.c (modified) (7 diffs)

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

@@ -867 +867 @@
      * Register to hash table (see Trac ticket #42).
      */
-    key_len = sizeof(tp->key.type) + sizeof(tp->key.hname) + tp->addr_len;
+    key_len = sizeof(tp->key.type) + tp->addr_len;
     pj_lock_acquire(mgr->lock);
 
@@ -917 +917 @@
      * Unregister from hash table (see Trac ticket #42).
      */
-    key_len = sizeof(tp->key.type) + sizeof(tp->key.hname) + tp->addr_len;
+    key_len = sizeof(tp->key.type) + tp->addr_len;
     hval = 0;
     entry = pj_hash_get(mgr->table, &tp->key, key_len, &hval);
@@ -1592 +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) + sizeof(key.hname) + addr_len;
+        key_len = sizeof(key.type) + 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*)
@@ -1636 +1614 @@
 
                 pj_bzero(addr, addr_len);
-                key_len = sizeof(key.type) + sizeof(key.hname) + addr_len;
+                key_len = sizeof(key.type) + addr_len;
                 transport = (pjsip_transport*) 
                             pj_hash_get(mgr->table, &key, key_len, NULL);
@@ -1649 +1627 @@
                 addr->addr.sa_family = remote_addr->addr.sa_family;
 
-                key_len = sizeof(key.type) + sizeof(key.hname) + addr_len;
+                key_len = sizeof(key.type) + addr_len;
                 transport = (pjsip_transport*)
                             pj_hash_get(mgr->table, &key, key_len, NULL);
@@ -1669 +1647 @@
         /*
          * Transport not found!
+         * Find factory that can create such transport.
          */
-        if (NULL == factory) {
+        factory = mgr->factory_list.next;
+        while (factory != &mgr->factory_list) {
+            if (factory->type == type)
+                break;
+            factory = factory->next;
+        }
+
+        if (factory == &mgr->factory_list) {
             /* No factory can create the transport! */
             pj_lock_release(mgr->lock);
@@ -1678 +1664 @@
     }
 
-    
     TRACE_((THIS_FILE, "Creating new transport from factory"));