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

Timestamp:

Jun 3, 2017 9:22:34 AM (7 years ago)

Author:

nanang

Message:

Re #2018: Initial version of DTLS-SRTP implementation.

File:

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

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

@@ -1275 +1275 @@
         const pjmedia_sdp_media *m = sdp->media[i];
         const pjmedia_sdp_conn *c;
+        static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 };
 
         /* Skip different media */
@@ -1285 +1286 @@
 
         /* Supported transports */
-        if (pj_stricmp2(&m->desc.transport, "RTP/SAVP")==0) {
+        if (pj_stristr(&m->desc.transport, &ID_RTP_SAVP)) {
             switch (use_srtp) {
             case PJMEDIA_SRTP_MANDATORY:
@@ -1494 +1495 @@
 }
 
+
+/* This callback is called when SRTP negotiation completes */
+static void on_srtp_nego_complete(pjmedia_transport *tp, 
+                                  pj_status_t result)
+{
+    pjsua_call_media *call_med = (pjsua_call_media*)tp->user_data;
+    pjsua_call *call;
+
+    if (!call_med)
+        return;
+
+    call = call_med->call;
+    PJ_PERROR(4,(THIS_FILE, result,
+                 "Call %d: Media %d: SRTP negotiation completes",
+                 call->index, call_med->idx));
+
+    if (result != PJ_SUCCESS) {
+        call_med->state = PJSUA_CALL_MEDIA_ERROR;
+        call_med->dir = PJMEDIA_DIR_NONE;
+        if (call && pjsua_var.ua_cfg.cb.on_call_media_state) {
+            /* Defer the callback to a timer */
+            pjsua_schedule_timer2(&ice_failed_nego_cb,
+                                  (void*)(pj_ssize_t)call->index, 1);
+        }
+    }
+}
+
+
 /* Callback to resume pjsua_call_media_init() after media transport
  * creation is completed.
@@ -1547 +1576 @@
         pjmedia_srtp_setting_default(&srtp_opt);
         srtp_opt.close_member_tp = PJ_TRUE;
+        srtp_opt.cb.on_srtp_nego_complete = &on_srtp_nego_complete;
+        srtp_opt.user_data = call_med;
 
         /* If media session has been ever established, let's use remote's