Changeset 1709 for pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Jan 18, 2008 6:49:29 PM (16 years ago)

Author:

bennylp

Message:

More ticket #452: SRTP creation/destruction, added use_srtp and srtp_secure_signaling in pjsua_account_config, updated pjsua

File:

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

pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_media.c

@@ -536 +536 @@
         }
 
-        if (pjsua_var.media_cfg.enable_srtp) {
-            pjmedia_transport *tp;
-            unsigned srtp_options = 0;
-
-            status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
-                                                  &skinfo, 0, &tp);
-            status = pjmedia_transport_srtp_create(pjsua_var.med_endpt, tp,
-                                                   srtp_options, 
-                                                   &pjsua_var.calls[i].med_tp);
-        } else {
-            status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
-                                                  &skinfo, 0,
-                                                  &pjsua_var.calls[i].med_tp);
-        }
+        status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
+                                              &skinfo, 0,
+                                              &pjsua_var.calls[i].med_tp);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to create media transport",
@@ -757 +746 @@
 
 pj_status_t pjsua_media_channel_init(pjsua_call_id call_id,
-                                     pjsip_role_e role)
+                                     pjsip_role_e role,
+                                     int security_level)
 {
     pjsua_call *call = &pjsua_var.calls[call_id];
-
-    if (pjsua_var.media_cfg.enable_ice) {
-        pj_ice_sess_role ice_role;
-        pj_status_t status;
-
-        ice_role = (role==PJSIP_ROLE_UAC ? PJ_ICE_SESS_ROLE_CONTROLLING : 
-                                           PJ_ICE_SESS_ROLE_CONTROLLED);
-
-        /* Restart ICE */
-        pjmedia_transport_media_stop(call->med_tp);
-
-        status = pjmedia_ice_init_ice(call->med_tp, ice_role, NULL, NULL);
-        if (status != PJ_SUCCESS)
-            return status;
-    }
-
-    return PJ_SUCCESS;
-}
-
-pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id, 
-                                           pj_pool_t *pool,
-                                           const pjmedia_sdp_session *rem_sdp,
-                                           pjmedia_sdp_session **p_sdp)
-{
-    pjmedia_sdp_session *sdp;
-    pjmedia_sock_info skinfo;
-    pjsua_call *call = &pjsua_var.calls[call_id];
-    pj_status_t status;
+    pjsua_acc *acc = &pjsua_var.acc[call->acc_id];
+    pjmedia_srtp_use use_srtp;
+
+    PJ_UNUSED_ARG(role);
 
     /* Return error if media transport has not been created yet
@@ -796 +762 @@
     }
 
+    /* Stop media transport (for good measure!) */
+    pjmedia_transport_media_stop(call->med_tp);
+    
+    /* See if we need to use SRTP */
+    use_srtp = acc->cfg.use_srtp;
+    if (use_srtp != PJMEDIA_SRTP_DISABLED) {
+        pj_status_t status;
+        pjmedia_transport *srtp;
+
+        if (security_level < acc->cfg.srtp_secure_signaling) {
+            return PJSIP_ESESSIONINSECURE;
+        }
+
+        /* Create SRTP */
+        status = pjmedia_transport_srtp_create(pjsua_var.med_endpt, 
+                                               call->med_tp,
+                                               NULL, &srtp);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        /* Set SRTP as current media transport */
+        call->med_tp = srtp;
+    }
+
+    return PJ_SUCCESS;
+}
+
+pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id, 
+                                           pj_pool_t *pool,
+                                           const pjmedia_sdp_session *rem_sdp,
+                                           pjmedia_sdp_session **p_sdp)
+{
+    enum { MAX_MEDIA = 1, MEDIA_IDX = 0 };
+    pjmedia_sdp_session *sdp;
+    pjmedia_sock_info skinfo;
+    pjsua_call *call = &pjsua_var.calls[call_id];
+    pj_status_t status;
+
+    /* Return error if media transport has not been created yet
+     * (e.g. application is starting)
+     */
+    if (call->med_tp == NULL) {
+        return PJ_EBUSY;
+    }
+
     /* Get media socket info */
     pjmedia_transport_get_info(call->med_tp, &skinfo);
 
     /* Create SDP */
-    status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pool, 1,
+    status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pool, MAX_MEDIA,
                                       &skinfo, &sdp);
     if (status != PJ_SUCCESS)
@@ -829 +840 @@
     }
 
-    //if (pjsua_var.media_cfg.enable_ice) {
-        //status = pjmedia_transport_media_create(call->med_tp, pool, sdp, NULL);
-        status = pjmedia_transport_media_create(call->med_tp, pool, 
-                                                sdp, rem_sdp);
-        if (status != PJ_SUCCESS)
-            goto on_error;
-    //}
+    /* Give the SDP to media transport */
+    status = pjmedia_transport_media_create(call->med_tp, pool, 
+                                            sdp, rem_sdp, MEDIA_IDX);
+    if (status != PJ_SUCCESS)
+        goto on_error;
 
     *p_sdp = sdp;
@@ -874 +883 @@
     stop_media_session(call_id);
 
-    //if (pjsua_var.media_cfg.enable_ice) {
-        pjmedia_transport_media_stop(call->med_tp);
-    //}
-
+    pjmedia_transport_media_stop(call->med_tp);
+
+    if (call->med_tp != call->med_orig) {
+        pjmedia_transport_close(call->med_tp);
+        call->med_tp = call->med_orig;
+    }
     return PJ_SUCCESS;
 }
@@ -962 +973 @@
         call->media_dir = PJMEDIA_DIR_NONE;
 
-        /* Shutdown ICE session */
-        //if (pjsua_var.media_cfg.enable_ice) {
-            pjmedia_transport_media_stop(call->med_tp);
-        //}
+        /* Shutdown transport's session */
+        pjmedia_transport_media_stop(call->med_tp);
 
         /* No need because we need keepalive? */
 
     } else {
-        /* Start ICE */
-        //if (pjsua_var.media_cfg.enable_ice) {
-            status = pjmedia_transport_media_start(call->med_tp, 
-                                                   call->inv->pool,
-                                                   local_sdp, remote_sdp, 0);
-            if (status != PJ_SUCCESS)
-                return status;
-        //}
+        /* Start media transport */
+        status = pjmedia_transport_media_start(call->med_tp, 
+                                               call->inv->pool,
+                                               local_sdp, remote_sdp, 0);
+        if (status != PJ_SUCCESS)
+            return status;
 
         /* Override ptime, if this option is specified. */