Changeset 866 for pjproject/trunk

Timestamp:

Dec 26, 2006 3:56:29 AM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #42: duplicate hash entry when TCP/TLS connection is created while previous one is shutting down

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport.c (modified) (4 diffs)
• sip_transport_tcp.c (modified) (2 diffs)

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

@@ -639 +639 @@
 {
     int key_len;
+    pj_uint32_t hval;
+    void *entry;
 
     /* Init. */
@@ -647 +649 @@
 
     /* 
-     * Register to hash table.
+     * Register to hash table (see Trac ticket #42).
      */
     key_len = sizeof(tp->key.type) + tp->addr_len;
     pj_lock_acquire(mgr->lock);
-    pj_hash_set(tp->pool, mgr->table, &tp->key, key_len, 0, tp);
+
+    /* If entry already occupied, unregister previous entry */
+    hval = 0;
+    entry = pj_hash_get(mgr->table, &tp->key, key_len, &hval);
+    if (entry != NULL)
+        pj_hash_set(NULL, mgr->table, &tp->key, key_len, hval, NULL);
+
+    /* Register new entry */
+    pj_hash_set(tp->pool, mgr->table, &tp->key, key_len, hval, tp);
+
     pj_lock_release(mgr->lock);
 
@@ -668 +679 @@
 {
     int key_len;
+    pj_uint32_t hval;
+    void *entry;
 
     TRACE_((THIS_FILE, "Transport %s is being destroyed", tp->obj_name));
@@ -684 +697 @@
 
     /*
-     * Unregister from hash table.
+     * Unregister from hash table (see Trac ticket #42).
      */
     key_len = sizeof(tp->key.type) + tp->addr_len;
-    pj_assert(pj_hash_get(mgr->table, &tp->key, key_len, NULL) != NULL);
-    pj_hash_set(tp->pool, mgr->table, &tp->key, key_len, 0, NULL);
+    hval = 0;
+    entry = pj_hash_get(mgr->table, &tp->key, key_len, &hval);
+    if (entry == (void*)tp)
+        pj_hash_set(NULL, mgr->table, &tp->key, key_len, hval, NULL);
 
     pj_lock_release(mgr->lock);

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

@@ -1222 +1222 @@
 
             /* Socket error. */
+            PJ_LOG(4,(tcp->base.obj_name, "TCP connection reset"));
 
             /* We can not destroy the transport since high level objects may
@@ -1263 +1264 @@
         } else {
             /* Socket error */
+            PJ_LOG(4,(tcp->base.obj_name, "TCP connection reset"));
 
             /* We can not destroy the transport since high level objects may