Changeset 1702 for pjproject/branches/users/nanang/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Jan 18, 2008 12:30:18 PM (16 years ago)

Author:

bennylp

Message:

Ticket #452: changed SRTP API with new specification from test doc

File:

• pjproject/branches/users/nanang/pjmedia/src/pjmedia/transport_srtp.c (modified) (10 diffs)

pjproject/branches/users/nanang/pjmedia/src/pjmedia/transport_srtp.c

@@ -78 +78 @@
     unsigned             options;   /**< Transport options.        */
 
+    pjmedia_srtp_setting setting;
     /* SRTP policy */
     pj_bool_t            session_inited;
@@ -83 +84 @@
     char                 tx_key[MAX_KEY_LEN];
     char                 rx_key[MAX_KEY_LEN];
-    pjmedia_srtp_stream_policy tx_policy;
-    pjmedia_srtp_stream_policy rx_policy;
+    pjmedia_srtp_stream_crypto tx_policy;
+    pjmedia_srtp_stream_crypto rx_policy;
 
     /* libSRTP contexts */
@@ -245 +246 @@
  * Initialize and start SRTP session with the given parameters.
  */
-PJ_DEF(pj_status_t) pjmedia_transport_srtp_init_session(
+PJ_DEF(pj_status_t) pjmedia_transport_srtp_start(
                            pjmedia_transport *srtp, 
-                           const pjmedia_srtp_stream_policy *policy_tx,
-                           const pjmedia_srtp_stream_policy *policy_rx)
+                           const pjmedia_srtp_stream_crypto *policy_tx,
+                           const pjmedia_srtp_stream_crypto *policy_rx)
 {
     transport_srtp  *p_srtp = (transport_srtp*) srtp;
@@ -344 +345 @@
  * Stop SRTP session.
  */
-PJ_DEF(pj_status_t) pjmedia_transport_srtp_deinit_session(
-                                            pjmedia_transport *srtp)
+PJ_DEF(pj_status_t) pjmedia_transport_srtp_stop(pjmedia_transport *srtp)
 {
     transport_srtp *p_srtp = (transport_srtp*) srtp;
@@ -367 +367 @@
 }
 
-PJ_DEF(pjmedia_transport *) pjmedia_transport_srtp_get_real_transport(
-                                    pjmedia_transport *tp)
+PJ_DEF(pjmedia_transport *) pjmedia_transport_srtp_get_member(
+                                                pjmedia_transport *tp)
 {
     transport_srtp *srtp = (transport_srtp*) tp;
@@ -506 +506 @@
     pjmedia_transport_detach(tp, NULL);
     
-    if (srtp->options && PJMEDIA_SRTP_AUTO_CLOSE_UNDERLYING_TRANSPORT) {
+    if (srtp->setting.close_member_tp) {
         pjmedia_transport_close(srtp->real_tp);
     }
 
-    status = pjmedia_transport_srtp_deinit_session(tp);
+    status = pjmedia_transport_srtp_stop(tp);
 
     pj_pool_release(srtp->pool);
@@ -692 +692 @@
 static pj_status_t parse_attr_crypto(pj_pool_t *pool,
                                      const pjmedia_sdp_attr *attr,
-                                     pjmedia_srtp_stream_policy *policy,
+                                     pjmedia_srtp_stream_crypto *policy,
                                      int *tag)
 {
@@ -749 +749 @@
     pjmedia_sdp_media *media_local  = sdp_local->media[media_index];
     pjmedia_sdp_attr *attr;
-    pjmedia_srtp_stream_policy policy_remote;
-    pjmedia_srtp_stream_policy policy_local;
+    pjmedia_srtp_stream_crypto policy_remote;
+    pjmedia_srtp_stream_crypto policy_local;
     pj_status_t status;
     unsigned cs_cnt = sizeof(crypto_suites)/sizeof(crypto_suites[0]);
@@ -970 +970 @@
 
     /* Got policy_local & policy_remote, let's initalize the SRTP */
-    status = pjmedia_transport_srtp_init_session(tp, 
-                                                 &policy_local, &policy_remote);
+    status = pjmedia_transport_srtp_start(tp, &policy_local, &policy_remote);
     if (status != PJ_SUCCESS)
         return status;
@@ -985 +984 @@
     pj_status_t status;
 
-    status = pjmedia_transport_srtp_deinit_session(tp);
+    status = pjmedia_transport_srtp_stop(tp);
     if (status != PJ_SUCCESS)
         PJ_LOG(4, (THIS_FILE, "Failed deinit session."));