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

Timestamp:

Mar 5, 2006 11:54:02 AM (18 years ago)

Author:

bennylp

Message:

Added complexity and quality argument, and terminate dialog properly on failures

File:

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

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

@@ -38 +38 @@
 {
     pj_str_t dest_uri;
-    pjsip_dialog *dlg;
+    pjsip_dialog *dlg = NULL;
     pjmedia_sdp_session *offer;
-    pjsip_inv_session *inv;
+    pjsip_inv_session *inv = NULL;
     int call_index = -1;
     pjsip_tx_data *tdata;
@@ -142 +142 @@
 
 on_error:
-    PJ_TODO(DESTROY_DIALOG_ON_FAIL);
+    if (inv != NULL) {
+        pjsip_inv_terminate(inv, PJSIP_SC_OK, PJ_FALSE);
+    } else {
+        pjsip_dlg_terminate(dlg);
+    }
+
     if (call_index != -1) {
         pjsua.calls[call_index].inv = NULL;
@@ -160 +165 @@
     pjsip_tx_data *response = NULL;
     unsigned options = 0;
-    pjsip_inv_session *inv;
+    pjsip_inv_session *inv = NULL;
     int acc_index;
     int call_index = -1;
@@ -261 +266 @@
 
         pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL);
-
-        // TODO: Need to delete dialog
+        pjsip_dlg_terminate(dlg);
         return PJ_TRUE;
     }
@@ -287 +291 @@
 
         pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL);
-
-        // TODO: Need to delete dialog
+        pjsip_inv_terminate(inv, 500, PJ_FALSE);
 
     } else {
@@ -723 +726 @@
 }
 
+/* Disconnect call */
+static void call_disconnect(pjsip_inv_session *inv,
+                            int st_code)
+{
+    pjsip_tx_data *tdata;
+    pj_status_t status;
+
+    status = pjsip_inv_end_session(inv, st_code, NULL, &tdata);
+    if (status == PJ_SUCCESS)
+        status = pjsip_inv_send_msg(inv, tdata, NULL);
+
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to disconnect call", status);
+    }
+}
 
 /*
@@ -744 +762 @@
 
         pjsua_perror(THIS_FILE, "SDP negotiation has failed", status);
+
+        /* Disconnect call if this is not a re-INVITE */
+        if (inv->state != PJSIP_INV_STATE_CONFIRMED) {
+            call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
+        }
         return;
 
@@ -763 +786 @@
                      "Unable to retrieve currently active local SDP", 
                      status);
+        call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
         return;
     }
@@ -772 +796 @@
                      "Unable to retrieve currently active remote SDP", 
                      status);
+        call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
         return;
     }
@@ -789 +814 @@
         pjsua_perror(THIS_FILE, "Unable to create media session", 
                      status);
+        call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
         return;
     }
@@ -818 +844 @@
         pjmedia_session_destroy(call->session);
         call->session = NULL;
+        call_disconnect(inv, PJSIP_SC_INTERNAL_SERVER_ERROR);
         return;
     }
@@ -910 +937 @@
  * Hangup call.
  */
-void pjsua_call_hangup(int call_index, int code)
+void pjsua_call_hangup(int call_index)
 {
     pjsua_call *call;
+    int code;
     pj_status_t status;
     pjsip_tx_data *tdata;
@@ -923 +951 @@
         return;
     }
+
+    if (call->inv->state == PJSIP_INV_STATE_CONFIRMED)
+        code = PJSIP_SC_OK;
+    else if (call->inv->role == PJSIP_ROLE_UAS)
+        code = PJSIP_SC_DECLINE;
+    else
+        code = PJSIP_SC_REQUEST_TERMINATED;
 
     status = pjsip_inv_end_session(call->inv, code, NULL, &tdata);
@@ -1190 +1225 @@
  * Terminate all calls.
  */
-void pjsua_call_hangup_all()
+void pjsua_call_hangup_all(void)
 {
     int i;
@@ -1196 +1231 @@
     for (i=0; i<pjsua.max_calls; ++i) {
         pjsip_tx_data *tdata;
+        int st_code;
         pjsua_call *call;
 
@@ -1203 +1239 @@
         call = &pjsua.calls[i];
 
-        if (pjsip_inv_end_session(call->inv, 410, NULL, &tdata)==0) {
+        if (call->inv->state == PJSIP_INV_STATE_CONFIRMED) {
+            st_code = 200;
+        } else {
+            st_code = PJSIP_SC_GONE;
+        }
+
+        if (pjsip_inv_end_session(call->inv, st_code, NULL, &tdata)==0) {
             if (tdata)
                 pjsip_inv_send_msg(call->inv, tdata, NULL);