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

Timestamp:

Mar 11, 2008 9:38:05 PM (17 years ago)

Author:

bennylp

Message:

Ticket #479: allow media transport framework to return transport specific info (for example, to know whether SRTP is enabled)

File:

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

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

@@ -2201 +2201 @@
     pj_status_t status;
     int len;
+    pjmedia_transport_info tp_info;
 
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
@@ -2257 +2258 @@
         *p++ = '\n';
         *p = '\0';
+    }
+
+    /* Get SRTP status */
+    pjmedia_transport_get_info(call->med_tp, &tp_info);
+    if (tp_info.specific_info_cnt > 0) {
+        int i;
+        for (i = 0; i < tp_info.specific_info_cnt; ++i) {
+            if (tp_info.spc_info[i].type == PJMEDIA_TRANSPORT_TYPE_SRTP) 
+            {
+                pjmedia_srtp_info *srtp_info = 
+                            (pjmedia_srtp_info*) tp_info.spc_info[i].buffer;
+
+                len = pj_ansi_snprintf(p, end-p, 
+                                       "%s  SRTP status: %s Crypto-suite: %s",
+                                       indent,
+                                       (srtp_info->active?"Active":"Not active"),
+                                       srtp_info->tx_policy.name.ptr);
+                if (len > 0 && len < end-p) {
+                    p += len;
+                    *p++ = '\n';
+                    *p = '\0';
+                }
+                break;
+            }
+        }
     }
 
@@ -2443 +2469 @@
     {
         pjmedia_sdp_session *local_sdp;
-        pjmedia_sock_info si;
-
-        call->med_tp->op->get_info(call->med_tp, &si);
+        pjmedia_transport_info ti;
+
+        pjmedia_transport_get_info(call->med_tp, &ti);
         status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool, 
-                                          1, &si, &local_sdp);
+                                          1, &ti.sock_info, &local_sdp);
         if (status == PJ_SUCCESS) {
             pjsip_create_sdp_body(tdata->pool, local_sdp,
@@ -2552 +2578 @@
     pjmedia_sdp_conn *conn;
     pjmedia_sdp_attr *attr;
-    pjmedia_sock_info skinfo;
+    pjmedia_transport_info tp_info;
     pjmedia_sdp_session *sdp;
 
     /* Get media socket info */
-    pjmedia_transport_get_info(call->med_tp, &skinfo);
+    pjmedia_transport_get_info(call->med_tp, &tp_info);
 
     /* Create new offer */
     status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pjsua_var.pool, 1,
-                                      &skinfo, &sdp);
+                                      &tp_info.sock_info, &sdp);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create local SDP", status);