Changeset 4136 for pjproject

Timestamp:

May 22, 2012 4:09:53 AM (13 years ago)

Author:

bennylp

Message:

Re #1514: fixed the incoming call scenario, and changed disconnection code from Precondition Failure to Temporarily Unavailable

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_call.c (modified) (1 diff)
• pjsua_media.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -376 +376 @@
         int title_len;
 
-        call->last_code = PJSIP_SC_PRECONDITION_FAILURE;
+        call->last_code = PJSIP_SC_TEMPORARILY_UNAVAILABLE;
         pj_strcpy2(&call->last_text, "Media init error: ");
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1314 +1314 @@
 
     if (status != PJ_SUCCESS) {
-        if (call->med_ch_info.status == PJ_SUCCESS)
+        if (call->med_ch_info.status == PJ_SUCCESS) {
             call->med_ch_info.status = status;
+            call->med_ch_info.sip_err_code = PJSIP_SC_TEMPORARILY_UNAVAILABLE;
+        }
         pjsua_media_prov_clean_up(call_id);
         goto on_return;
@@ -1343 +1345 @@
                 if (!call_med->tp) {
                     status =
-                        PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE);
+                        PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_TEMPORARILY_UNAVAILABLE);
                 }
             }
@@ -1356 +1358 @@
                 call->med_ch_info.med_idx = mi;
                 call->med_ch_info.state = call_med->tp_st;
-                call->med_ch_info.sip_err_code = PJSIP_SC_NOT_ACCEPTABLE;
+                call->med_ch_info.sip_err_code = PJSIP_SC_TEMPORARILY_UNAVAILABLE;
                 pjsua_media_prov_clean_up(call_id);
                 goto on_return;