Changeset 1365 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Jun 12, 2007 3:29:52 PM (17 years ago)

Author:

bennylp

Message:

Removed assertion when sending re-INVITE while another INVITE transaction is in progress (thanks Frank Niessen)

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -322 +322 @@
     {
 
-        inv_send_ack(inv, rdata);
+        //inv_send_ack(inv, rdata);
         return PJ_TRUE;
 
@@ -1587 +1587 @@
 
     /* Must NOT have a pending INVITE transaction */
-    PJ_ASSERT_RETURN(inv->invite_tsx==NULL, PJ_EINVALIDOP);
+    if (inv->invite_tsx!=NULL)
+        return PJ_EINVALIDOP;
 
 
@@ -2508 +2509 @@
 
             /* Send ACK */
-            inv_send_ack(inv, e->body.tsx_state.src.rdata);
+            //inv_send_ack(inv, e->body.tsx_state.src.rdata);
 
         } else if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&