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

Timestamp:

Jan 18, 2006 11:34:15 PM (18 years ago)

Author:

bennylp

Message:

Complete tsx layer selftest, implemented authentication framework

File:

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

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

@@ -270 +270 @@
     len_required = 9 +                      /* CSeq number */
                    rdata->msg_info.from->tag.slen +   /* From tag. */
-                   rdata->msg_info.call_id.slen +    /* Call-ID */
+                   rdata->msg_info.cid->id.slen +    /* Call-ID */
                    host->slen +             /* Via host. */
                    9 +                      /* Via port. */
@@ -300 +300 @@
 
     /* Add Call-ID. */
-    len = rdata->msg_info.call_id.slen;
-    pj_memcpy( p, rdata->msg_info.call_id.ptr, len );
+    len = rdata->msg_info.cid->id.slen;
+    pj_memcpy( p, rdata->msg_info.cid->id.ptr, len );
     p += len;
     *p++ = SEPARATOR;
@@ -1590 +1590 @@
     ++tsx->retransmit_count;
 
-    status = tsx_send_msg( tsx, tsx->last_tx);
-    if (status != PJ_SUCCESS)
-        return status;
-    
-    /* Restart timer T1. */
+    /* Restart timer T1 first before sending the message to ensure that
+     * retransmission timer is not engaged when loop transport is used.
+     */
     if (resched) {
+        pj_assert(tsx->state != PJSIP_TSX_STATE_CONFIRMED);
         if (tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) {
             tsx->transport_flag |= TSX_HAS_PENDING_RESCHED;
@@ -1601 +1600 @@
             tsx_resched_retransmission(tsx);
         }
+    }
+
+    status = tsx_send_msg( tsx, tsx->last_tx);
+    if (status != PJ_SUCCESS) {
+        return status;
     }