Changeset 2361

Timestamp:

Oct 31, 2008 5:54:14 PM (16 years ago)

Author:

bennylp

Message:

Ticket #673: rollback r2360, and implement new fix for Race condition may cause crash in SRTP transport ticket

File:

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

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

@@ -647 +647 @@
     pj_status_t status;
 
-    /* Attach itself to transport */
-    status = pjmedia_transport_attach(srtp->member_tp, srtp, rem_addr, rem_rtcp,
-                                      addr_len, &srtp_rtp_cb, &srtp_rtcp_cb);
-    if (status != PJ_SUCCESS)
-        return status;
-
     /* Save the callbacks */
     srtp->rtp_cb = rtp_cb;
@@ -658 +652 @@
     srtp->user_data = user_data;
 
-    return status;
+    /* Attach itself to transport */
+    status = pjmedia_transport_attach(srtp->member_tp, srtp, rem_addr, 
+                                      rem_rtcp, addr_len, &srtp_rtp_cb,
+                                      &srtp_rtcp_cb);
+    if (status != PJ_SUCCESS) {
+        srtp->rtp_cb = NULL;
+        srtp->rtcp_cb = NULL;
+        srtp->user_data = NULL;
+        return status;
+    }
+
+    return PJ_SUCCESS;
 }
 
@@ -799 +804 @@
 
     if (srtp->bypass_srtp) {
-        /* Callback may be NULL if we receive stray packets (or when packet
-         * is received while we're being detached/re-attached).
-         */
-        if (srtp->rtp_cb) {
-            srtp->rtp_cb(srtp->user_data, pkt, size);
-        }
+        srtp->rtp_cb(srtp->user_data, pkt, size);
         return;
     }
@@ -864 +864 @@
 
     if (srtp->bypass_srtp) {
-        /* Callback may be NULL if we receive stray packets (or when packet
-         * is received while we're being detached/re-attached).
-         */
         srtp->rtcp_cb(srtp->user_data, pkt, size);
         return;