Changeset 1860 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Mar 11, 2008 9:38:05 PM (14 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/pjmedia/src/pjmedia/transport_srtp.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -126 +126 @@
  */
 static pj_status_t transport_get_info (pjmedia_transport *tp,
-                                       pjmedia_sock_info *info);
+                                       pjmedia_transport_info *info);
 static pj_status_t transport_attach   (pjmedia_transport *tp,
                                        void *user_data,
@@ -552 +552 @@
 
 static pj_status_t transport_get_info(pjmedia_transport *tp,
-                                      pjmedia_sock_info *info)
+                                      pjmedia_transport_info *info)
 {
     transport_srtp *srtp = (transport_srtp*) tp;
-
-    /* put SRTP info as well? */
-    return pjmedia_transport_get_info(srtp->real_tp, info);
+    pjmedia_srtp_info srtp_info;
+    int spc_info_idx;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(tp && info, PJ_EINVAL);
+    PJ_ASSERT_RETURN(info->specific_info_cnt <
+                     PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXCNT, PJ_ETOOMANY);
+    PJ_ASSERT_RETURN(sizeof(pjmedia_srtp_info) <=
+                     PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE, PJ_ENOMEM);
+
+    status = pjmedia_transport_get_info(srtp->real_tp, info);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    srtp_info.active = srtp->session_inited;
+    srtp_info.rx_policy = srtp->rx_policy;
+    srtp_info.tx_policy = srtp->tx_policy;
+
+    spc_info_idx = info->specific_info_cnt++;
+    info->spc_info[spc_info_idx].type = PJMEDIA_TRANSPORT_TYPE_SRTP;
+    info->spc_info[spc_info_idx].cbsize = sizeof(srtp_info);
+    pj_memcpy(&info->spc_info[spc_info_idx].buffer, &srtp_info, 
+              sizeof(srtp_info));
+
+    return PJ_SUCCESS;
 }