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

Timestamp:

Jun 26, 2008 1:24:10 PM (16 years ago)

Author:

bennylp

Message:

Do no disconnect invite session if authentication fails for requests within dialog. Also clears up inv->invite_tsx if re-INVITE fails with authentication error, otherwise it will not be able to send further re-INVITEs

File:

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

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

@@ -2354 +2354 @@
         if (status != PJ_SUCCESS) {
             
-            /* Does not have proper credentials. 
-             * End the session anyway.
+            /* Somehow failed. Probably it's not a good idea to terminate
+             * the session since this is just a request within dialog. And
+             * even if we terminate we should send BYE.
              */
+            /*
             inv_set_cause(inv, PJSIP_SC_OK, NULL);
             inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+            */
             
         } else {
@@ -2579 +2582 @@
         pj_status_t status;
 
+        if (tsx->method.id == PJSIP_INVITE_METHOD)
+            inv->invite_tsx = NULL;
+
         status = pjsip_auth_clt_reinit_req( &inv->dlg->auth_sess, 
                                             e->body.tsx_state.src.rdata,
@@ -2584 +2590 @@
     
         if (status != PJ_SUCCESS) {
-            /* Does not have proper credentials. End the session. */
+            /* Somehow failed. Probably it's not a good idea to terminate
+             * the session since this is just a request within dialog. And
+             * even if we terminate we should send BYE.
+             */
+            /*
             inv_set_cause(inv, PJSIP_SC_OK, NULL);
             inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+            */
             
         } else {
             /* Re-send request. */
-            if (tsx->method.id == PJSIP_INVITE_METHOD)
-                inv->invite_tsx = NULL;
-
             status = pjsip_inv_send_msg(inv, tdata);
         }