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

Timestamp:

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

Author:

bennylp

Message:

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

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (6 diffs)

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

@@ -747 +747 @@
 pj_status_t pjsua_media_channel_init(pjsua_call_id call_id,
                                      pjsip_role_e role,
-                                     int security_level)
+                                     int security_level,
+                                     int *sip_err_code)
 {
     pjsua_call *call = &pjsua_var.calls[call_id];
@@ -774 +775 @@
     if (acc->cfg.use_srtp != PJMEDIA_SRTP_DISABLED) {
         if (security_level < acc->cfg.srtp_secure_signaling) {
+            if (sip_err_code)
+                *sip_err_code = PJSIP_SC_NOT_ACCEPTABLE;
             return PJSIP_ESESSIONINSECURE;
         }
@@ -785 +788 @@
                                            call->med_tp,
                                            &srtp_opt, &srtp);
-    if (status != PJ_SUCCESS)
-        return status;
+    if (status != PJ_SUCCESS) {
+        if (sip_err_code)
+            *sip_err_code = PJSIP_SC_INTERNAL_SERVER_ERROR;
+        return status;
+    }
 
     /* Set SRTP as current media transport */
@@ -802 +808 @@
                                            pj_pool_t *pool,
                                            const pjmedia_sdp_session *rem_sdp,
-                                           pjmedia_sdp_session **p_sdp)
+                                           pjmedia_sdp_session **p_sdp,
+                                           int *sip_status_code)
 {
     enum { MAX_MEDIA = 1, MEDIA_IDX = 0 };
@@ -823 +830 @@
     status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pool, MAX_MEDIA,
                                       &skinfo, &sdp);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        if (sip_status_code) *sip_status_code = 500;
         goto on_error;
+    }
 
     /* Add NAT info in the SDP */
@@ -853 +862 @@
     status = pjmedia_transport_media_create(call->med_tp, pool, 
                                             sdp, rem_sdp, MEDIA_IDX);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        if (sip_status_code) *sip_status_code = PJSIP_SC_NOT_ACCEPTABLE;
         goto on_error;
+    }
 
     *p_sdp = sdp;