Changeset 2885

Timestamp:

Aug 17, 2009 9:06:31 AM (15 years ago)

Author:

nanang

Message:

Misc fix (ticket #915):

• Removed self detach() in destroy() in transport SRTP.
• Added few more assertion checks in transport SRTP.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (10 diffs)

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

@@ -333 +333 @@
     unsigned i;
 
+    pj_assert(opt);
+
     pj_bzero(opt, sizeof(pjmedia_srtp_setting));
     opt->close_member_tp = PJ_TRUE;
@@ -358 +360 @@
     unsigned i;
 
-    PJ_ASSERT_RETURN(endpt && p_tp, PJ_EINVAL);
+    PJ_ASSERT_RETURN(endpt && tp && p_tp, PJ_EINVAL);
 
     /* Check crypto availability */
@@ -459 +461 @@
     int              au_rx_idx = 0;
     int              crypto_suites_cnt;
+
+    PJ_ASSERT_RETURN(tp && tx && rx, PJ_EINVAL);
 
     if (srtp->session_inited) {
@@ -586 +590 @@
     err_status_t err;
 
+    PJ_ASSERT_RETURN(srtp, PJ_EINVAL);
+
     if (!p_srtp->session_inited)
         return PJ_SUCCESS;
@@ -659 +665 @@
     pj_status_t status;
 
+    PJ_ASSERT_RETURN(tp && rem_addr && addr_len, PJ_EINVAL);
+
     /* Save the callbacks */
     srtp->rtp_cb = rtp_cb;
@@ -779 +787 @@
 {
     transport_srtp *srtp = (transport_srtp *) tp;
+    
+    PJ_ASSERT_RETURN(tp, PJ_EINVAL);
 
     return pjmedia_transport_simulate_lost(srtp->member_tp, dir, pct_lost);
@@ -788 +798 @@
     pj_status_t status;
 
+    PJ_ASSERT_RETURN(tp, PJ_EINVAL);
+
     pj_lock_acquire(srtp->mutex);
 
-    pjmedia_transport_detach(tp, NULL);
-    
     if (srtp->setting.close_member_tp && srtp->member_tp) {
         pjmedia_transport_close(srtp->member_tp);
@@ -1087 +1097 @@
 
         pjmedia_sdp_media *m_rem;
-        
+
         m_rem = sdp_remote->media[media_index];
 
@@ -1490 +1500 @@
     pj_status_t status;
 
+    PJ_ASSERT_RETURN(tp, PJ_EINVAL);
+
     status = pjmedia_transport_media_stop(srtp->member_tp);
     if (status != PJ_SUCCESS)
@@ -1510 +1522 @@
         return PJ_SUCCESS;
 
-    PJ_ASSERT_RETURN(*pkt_len>0, PJ_EINVAL);
+    PJ_ASSERT_RETURN(tp && pkt && (*pkt_len>0), PJ_EINVAL);
     PJ_ASSERT_RETURN(srtp->session_inited, PJ_EINVALIDOP);