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

Timestamp:

Jun 26, 2014 10:39:35 AM (10 years ago)

Author:

ming

Message:

Fixed #1774: Unfreed transports upon stack shutdown/restart

File:

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

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

@@ -78 +78 @@
 };
 
+/* Transport list item */
+typedef struct transport
+{
+    PJ_DECL_LIST_MEMBER(struct transport);
+    pjsip_transport *tp;
+} transport;
+
 /*
  * Transport manager.
@@ -98 +105 @@
      */
     pjsip_tx_data    tdata_list;
+    
+    /* List of transports which are NOT stored in the hash table, so
+     * that it can be properly cleaned up when transport manager
+     * is destroyed.
+     */
+    transport        tp_list;
 };
 
@@ -1028 +1041 @@
     hval = 0;
     entry = pj_hash_get(mgr->table, &tp->key, key_len, &hval);
-    if (entry != NULL)
+    if (entry != NULL) {
+        transport *tp_ref;
+        
+        tp_ref = PJ_POOL_ZALLOC_T(((pjsip_transport *)entry)->pool, transport);
+        
+        /*
+         * Add transport to the list before removing it from the hash table.
+         * See ticket #1774 for more details.
+         */
+        tp_ref->tp = (pjsip_transport *)entry;
+        pj_list_push_back(&mgr->tp_list, tp_ref);
         pj_hash_set(NULL, mgr->table, &tp->key, key_len, hval, NULL);
+    }
 
     /* Register new entry */
@@ -1075 +1099 @@
     hval = 0;
     entry = pj_hash_get(mgr->table, &tp->key, key_len, &hval);
-    if (entry == (void*)tp)
+    if (entry == (void*)tp) {
         pj_hash_set(NULL, mgr->table, &tp->key, key_len, hval, NULL);
+    } else {
+        /* If not found in hash table, remove from the tranport list. */
+        transport *tp_iter = mgr->tp_list.next;
+        while (tp_iter != &mgr->tp_list) {
+            if (tp_iter->tp == tp) {
+                pj_list_erase(tp_iter);
+                break;
+            }
+            tp_iter = tp_iter->next;
+        }
+    }
 
     pj_lock_release(mgr->lock);
@@ -1259 +1294 @@
     pj_list_init(&mgr->factory_list);
     pj_list_init(&mgr->tdata_list);
+    pj_list_init(&mgr->tp_list);
 
     mgr->table = pj_hash_create(pool, PJSIP_TPMGR_HTABLE_SIZE);
@@ -1527 +1563 @@
 
     /*
-     * Destroy all transports.
+     * Destroy all transports in the hash table.
      */
     itr = pj_hash_first(mgr->table, &itr_val);
@@ -1543 +1579 @@
     }
 
+    /*
+     * Destroy transports in the list.
+     */
+    if (!pj_list_empty(&mgr->tp_list)) {
+        transport *tp_iter = mgr->tp_list.next;
+        while (tp_iter != &mgr->tp_list) {
+            transport *next = tp_iter->next;
+            destroy_transport(mgr, tp_iter->tp);
+            tp_iter = next;
+        }
+    }
+    
     /*
      * Destroy all factories/listeners.