Changeset 4067

Timestamp:

Apr 23, 2012 10:22:49 AM (12 years ago)

Author:

ming

Message:

Re #1417: Fixed error handling if pjsip_timer_init_session() when accepting incoming call and fixed typo in assertion in sip_inv.c

Location:

pjproject/branches/1.x/pjsip/src

Files:

• pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_inv.c

@@ -2160 +2160 @@
 
     default:
-        pj_assert("!Invalid operation!");
+        pj_assert(!"Invalid operation!");
         return PJ_EINVALIDOP;
     }

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

@@ -972 +972 @@
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Session Timer init failed", status);
-        status = pjsip_inv_end_session(inv, PJSIP_SC_INTERNAL_SERVER_ERROR,
-                                       NULL, &response);
-        if (status == PJ_SUCCESS && response)
-            status = pjsip_inv_send_msg(inv, response);
+        pjsip_dlg_respond(dlg, rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, NULL, NULL, NULL);
+        pjsip_inv_terminate(inv, PJSIP_SC_INTERNAL_SERVER_ERROR, PJ_FALSE);
 
         pjsua_media_channel_deinit(call->index);