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

Timestamp:

Jan 24, 2008 7:20:54 PM (16 years ago)

Author:

bennylp

Message:

Return 406/Not Acceptable if SRTP negotiation failed instead of 500

File:

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

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

@@ -402 +402 @@
     /* Init media channel */
     status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC, 
-                                      get_secure_level(dest_uri));
+                                      get_secure_level(dest_uri), NULL);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Error initializing media channel", status);
@@ -412 +412 @@
     offer = NULL;
 #else
-    status = pjsua_media_channel_create_sdp(call->index, dlg->pool, NULL, &offer);
+    status = pjsua_media_channel_create_sdp(call->index, dlg->pool, NULL, 
+                                            &offer, NULL);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "pjmedia unable to create SDP", status);
@@ -559 +560 @@
     pjsua_call *call;
     int call_id = -1;
-    int secure_level;
+    int secure_level, sip_err_code;
     pjmedia_sdp_session *offer, *answer;
     pj_status_t status;
@@ -692 +693 @@
     /* Init media channel */
     status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS, 
-                                      secure_level);
-    if (status != PJ_SUCCESS) {
-        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
+                                      secure_level, &sip_err_code);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error initializing media channel", status);
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
+                                      sip_err_code, NULL,
                                       NULL, NULL);
         PJSUA_UNLOCK();
@@ -719 +722 @@
     /* Get media capability from media endpoint: */
     status = pjsua_media_channel_create_sdp(call->index, rdata->tp_info.pool, 
-                                            offer, &answer);
-    if (status != PJ_SUCCESS) {
-        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
+                                            offer, &answer, &sip_err_code);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error creating SDP answer", status);
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
+                                      sip_err_code, NULL,
                                       NULL, NULL);
         pjsua_media_channel_deinit(call->index);
@@ -1425 +1430 @@
     /* Init media channel */
     status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC,
-                                      get_secure_level(&dlg->remote.info_str));
+                                      get_secure_level(&dlg->remote.info_str),
+                                      NULL);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Error initializing media channel", status);
@@ -1436 +1442 @@
     PJ_TODO(create_active_inactive_sdp_based_on_unhold_arg);
     status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
-                                            NULL, &sdp);
+                                            NULL, &sdp, NULL);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
@@ -1495 +1501 @@
     /* Init media channel */
     status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC,
-                                      get_secure_level(&dlg->remote.info_str));
+                                      get_secure_level(&dlg->remote.info_str),
+                                      NULL);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Error initializing media channel", status);
@@ -1504 +1511 @@
     /* Create SDP */
     status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
-                                            NULL, &sdp);
+                                            NULL, &sdp, NULL);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
@@ -2624 +2631 @@
         secure_level = get_secure_level(&call->inv->dlg->remote.info_str);
         status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS,
-                                          secure_level);
+                                          secure_level, NULL);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Error initializing media channel", status);
@@ -2632 +2639 @@
 
         status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
-                                                offer, &answer);
+                                                offer, &answer, NULL);
     }
 
@@ -2680 +2687 @@
         secure_level = get_secure_level(&call->inv->dlg->remote.info_str);
         status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC,
-                                          secure_level);
+                                          secure_level, NULL);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Error initializing media channel", status);
@@ -2688 +2695 @@
 
         status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
-                                                NULL, offer);
+                                                NULL, offer, NULL);
     }