Changeset 4448

Timestamp:

Mar 21, 2013 11:38:05 AM (12 years ago)

Author:

bennylp

Message:

More on re #1646: added flag to prevent another transmit data from being transmitted while we are waiting for the previous one to be flushed from transport queue

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (3 diffs)

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

@@ -1921 +1921 @@
     pjsip_transaction *tsx = (pjsip_transaction*) token;
 
+    /* In other circumstances, locking tsx->grp_lock AFTER transport mutex
+     * will introduce deadlock if another thread is currently sending a
+     * SIP message to the transport. But this should be safe as there should
+     * be no way this callback could be called while another thread is
+     * sending a message.
+     */
+    pj_grp_lock_acquire(tsx->grp_lock);
+    tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT);
+    pj_grp_lock_release(tsx->grp_lock);
+
     if (sent < 0) {
         pj_time_val delay = {0, 0};
         char errmsg[PJ_ERR_MSG_SIZE];
-        pj_str_t err;
-
-        err = pj_strerror(-sent, errmsg, sizeof(errmsg));
+
+        pj_strerror(-sent, errmsg, sizeof(errmsg));
 
         PJ_LOG(2,(tsx->obj_name, "Transport failed to send %s! Err=%d (%s)",
@@ -2002 +2011 @@
          */
         pj_grp_lock_add_ref(tsx->grp_lock);
+        tsx->transport_flag |= TSX_HAS_PENDING_TRANSPORT;
 
         status = pjsip_transport_send( tsx->transport, tdata, &tsx->addr,
@@ -2010 +2020 @@
         else {
             /* Operation completes immediately */
+            tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT);
             pj_grp_lock_dec_ref(tsx->grp_lock);
         }