Don't restart retransmit timer when transport is pending (IP change s…

…cenario) (#4037)

pjsip/src/pjsip/sip_transaction.c

@@ -2369,6 +2369,8 @@ static void tsx_tp_state_callback( pjsip_transport *tp,
 
         tsx = (pjsip_transaction*)info->user_data;
 
+        tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT);
+
         /* Post the event for later processing, to avoid deadlock.
          * See https://github.com/pjsip/pjproject/issues/1646
          */
@@ -2692,6 +2694,13 @@ static pj_status_t tsx_retransmit( pjsip_transaction *tsx, int resched)
         return status;
     }
 
+    /* Cancel retransmission timer if transport is pending. */
+    if (resched && (tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT))
+    {
+        tsx_cancel_timer( tsx, &tsx->retransmit_timer );
+        tsx->transport_flag |= TSX_HAS_PENDING_RESCHED;
+    }
+
     return PJ_SUCCESS;
 }