Changeset 2724 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

May 29, 2009 1:04:03 PM (15 years ago)

Author:

bennylp

Message:

Integration of Sipit24 branch, many tickets involved:

• #793: AMR encoder should regard 'mode-set' param specified by remote decoder.
• #831: Automatically switch to TCP transport when sending large request
• #832: Support for outbound proxy setting without using Route header
• #849: Modify conference audio switch behavior in connecting ports.
• #850: Remove 'Require=replaces' param in 'Refer-To' header (in call transfer with replaces).
• #851: Support for regular nomination in ICE
• #852: --ip-addr support for IPv6 for media transport in pjsua
• #854: Adding SOFTWARE attribute in all outgoing requests may cause compatibility problem with older STUN server (thanks Alexei Kuznetsov for the report)
• #855: Bug in digit map frequencies for DTMF digits (thanks FCCH for the report)
• #856: Put back the ICE candidate priority values according to the default values in the draft-mmusic-ice
• #857: Support for ICE keep-alive with Binding indication
• #858: Do not authenticate STUN 438 response
• #859: AMR-WB format param in the SDP is not negotiated correctly.
• #867: Return error instead of asserting when PJSUA-LIB fails to open log file

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (1 diff)

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

@@ -1726 +1726 @@
                       pjsip_tx_data_get_info(send_state->tdata), -sent,
                       pj_strerror(-sent, errmsg, sizeof(errmsg)).ptr));
+
+            /* Reset retransmission count */
+            tsx->retransmit_count = 0;
+
+            /* And reset timeout timer */
+            if (tsx->timeout_timer.id) {
+                pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer);
+                tsx->timeout_timer.id = TIMER_INACTIVE;
+
+                tsx->timeout_timer.id = TIMER_ACTIVE;
+                pjsip_endpt_schedule_timer( tsx->endpt, &tsx->timeout_timer, 
+                                            &timeout_timer_val);
+            }
         }
     }