Changeset 5909 for pjproject

Timestamp:

Nov 21, 2018 8:22:34 AM (6 years ago)

Author:

riza

Message:

Close #2161: Avoid deadlock triggered by incoming message when transport is being shutdown.

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_transaction.c (modified) (1 diff)
• pjsip/sip_transport.c (modified) (1 diff)
• pjsua-lib/pjsua_acc.c (modified) (2 diffs)
• pjsua-lib/pjsua_core.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -2389 +2389 @@
 
     if (tsx->transport) {
-        pjsip_transport_remove_state_listener(tsx->transport, 
-                                               tsx->tp_st_key, tsx);
+        if (tsx->tp_st_key) {
+            pjsip_transport_remove_state_listener(tsx->transport,
+                                                  tsx->tp_st_key, tsx);
+        }
         pjsip_transport_dec_ref( tsx->transport );
         tsx->transport = NULL;

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

@@ -2440 +2440 @@
     PJ_ASSERT_RETURN(tp && cb && key, PJ_EINVAL);
 
+    if (tp->is_shutdown) {
+        *key = NULL;
+        return PJ_EINVALIDOP;
+    }
+
     pj_lock_acquire(tp->lock);
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -3915 +3915 @@
     unsigned i = 0;
 
+    PJSUA_LOCK();
     if (acc->cfg.ip_change_cfg.hangup_calls || 
         acc->cfg.ip_change_cfg.reinvite_flags)
@@ -3984 +3985 @@
     }    
     acc->ip_change_op = PJSUA_IP_CHANGE_OP_NULL;
+    PJSUA_UNLOCK();
     return status;
 }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -3547 +3547 @@
     pj_bool_t acc_done[PJSUA_MAX_ACC];
 
+    PJSUA_LOCK();
     /* Reset ip_change_active flag. */
     for (; i < (int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
@@ -3661 +3662 @@
         }
     }
+    PJSUA_UNLOCK();
     return status;
 }
@@ -3773 +3775 @@
     
     if (param->restart_listener) {
+        PJSUA_LOCK();
         /* Restart listener/transport, handle_ip_change_on_acc() will
          * be called after listener restart is completed successfully.
@@ -3786 +3789 @@
             }
         }
+        PJSUA_UNLOCK();
     } else {
         status = handle_ip_change_on_acc();