Changeset 5978 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

May 6, 2019 10:55:35 AM (5 years ago)

Author:

ming

Message:

Fixed #2196: Assertion due to unset sip error code when media initialization fails during incoming call

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (8 diffs)

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

@@ -1232 +1232 @@
 
         if (status != PJ_SUCCESS) {
-            err_code = PJSIP_SC_NOT_ACCEPTABLE_HERE;
+            err_code = PJSIP_SC_INTERNAL_SERVER_ERROR;
             pjsua_perror(THIS_FILE, "Error creating SDP answer", status);
         }
@@ -1241 +1241 @@
 
         if (status != PJ_SUCCESS) {
+            err_code = *sip_err_code;
             pjsua_perror(THIS_FILE, "Error creating SDP answer", status);
         } else {
             status = pjsip_inv_set_local_sdp(call->inv, answer);
             if (status != PJ_SUCCESS) {
+                err_code = PJSIP_SC_NOT_ACCEPTABLE_HERE;                
                 pjsua_perror(THIS_FILE, "Error setting local SDP", status);
-                err_code = PJSIP_SC_NOT_ACCEPTABLE_HERE;                
             }
         }
@@ -1268 +1269 @@
                 err_code = (*response)->msg->line.status.code;
             else
-                err_code = PJSIP_ERRNO_TO_SIP_STATUS(status);
-        }
-    }
-    if (sip_err_code)
-        *sip_err_code = err_code;
+                err_code = PJSIP_SC_NOT_ACCEPTABLE_HERE;                
+        }
+    }
+
+    if (sip_err_code && status != PJ_SUCCESS)
+        *sip_err_code = err_code? err_code:PJSIP_ERRNO_TO_SIP_STATUS(status);
 
     return status;
@@ -1293 +1295 @@
     PJSUA_LOCK();
 
-    if (sip_err_code)
-        *sip_err_code = err_code;
-
     /* Increment the dialog's lock to prevent it to be destroyed prematurely,
      * such as in case of transport error.
@@ -1322 +1321 @@
 on_return:
     if (status != PJ_SUCCESS) {
+        if (err_code == 0)
+            err_code = PJSIP_ERRNO_TO_SIP_STATUS(status);
+
+        if (sip_err_code)
+            *sip_err_code = err_code;
+
         /* If the callback is called from pjsua_call_on_incoming(), the
          * invite's state is PJSIP_INV_STATE_NULL, so the invite session
@@ -1359 +1364 @@
     
     pjsip_dlg_dec_lock(dlg);
-
-    if (sip_err_code)
-        *sip_err_code = err_code;
 
     if (tdata)
@@ -1805 +1807 @@
             if (response) {
                 pjsip_dlg_send_response(dlg, call->inv->invite_tsx, response);
-
             } else {
                 pjsip_dlg_respond(dlg, rdata, sip_err_code, NULL, NULL, NULL);
@@ -2490 +2491 @@
             pjsip_tx_data *tdata;
             pj_status_t status_;
+
+            if (sip_err_code == 0)
+                sip_err_code = PJSIP_ERRNO_TO_SIP_STATUS(status);
 
             status_ = pjsip_inv_end_session(call->inv, sip_err_code, NULL,