|
|
DescriptionRemove global list of SRTP sessions.
Instead save a reference to the SrtpSession inside the srtp_ctx_t.
BUG=webrtc:5133
Committed: https://crrev.com/9cafd972779ed7b25886ab276e0ede7b7a8b76a1
Cr-Commit-Position: refs/heads/master@{#10591}
Patch Set 1 #
Total comments: 2
Patch Set 2 : Added ThreadChecker #Patch Set 3 : Added comment #
Total comments: 2
Patch Set 4 : No need to detach #
Messages
Total messages: 22 (7 generated)
juberti@google.com changed reviewers: + juberti@google.com
lgtm with comment https://codereview.webrtc.org/1416093010/diff/1/talk/session/media/srtpfilter.cc File talk/session/media/srtpfilter.cc (right): https://codereview.webrtc.org/1416093010/diff/1/talk/session/media/srtpfilter... talk/session/media/srtpfilter.cc:782: SrtpSession* session = static_cast<SrtpSession*>(ev->session->user_data); Do we know what thread this gets invoked from? Would be good to document it to ensure proper locking.
Thanks, also added ThreadChecker to ensure methods are being called from correct thread. https://codereview.webrtc.org/1416093010/diff/1/talk/session/media/srtpfilter.cc File talk/session/media/srtpfilter.cc (right): https://codereview.webrtc.org/1416093010/diff/1/talk/session/media/srtpfilter... talk/session/media/srtpfilter.cc:782: SrtpSession* session = static_cast<SrtpSession*>(ev->session->user_data); On 2015/11/10 01:25:59, juberti wrote: > Do we know what thread this gets invoked from? Would be good to document it to > ensure proper locking. Done.
https://codereview.webrtc.org/1416093010/diff/40001/talk/session/media/srtpfi... File talk/session/media/srtpfilter.cc (right): https://codereview.webrtc.org/1416093010/diff/40001/talk/session/media/srtpfi... talk/session/media/srtpfilter.cc:493: thread_checker_.DetachFromThread(); Remind me - is this called on a different thread than the worker thread? If so, add a comment to explain this.
https://codereview.webrtc.org/1416093010/diff/40001/talk/session/media/srtpfi... File talk/session/media/srtpfilter.cc (right): https://codereview.webrtc.org/1416093010/diff/40001/talk/session/media/srtpfi... talk/session/media/srtpfilter.cc:493: thread_checker_.DetachFromThread(); On 2015/11/10 17:20:35, juberti wrote: > Remind me - is this called on a different thread than the worker thread? If so, > add a comment to explain this. You're right, looks like this is always called from the worker thread. No need to detach the ThreadChecker then.
lgtm
The CQ bit was checked by jbauch@webrtc.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1416093010/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1416093010/60001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: presubmit on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/1667)
On 2015/11/10 20:00:59, commit-bot: I haz the power wrote: > Try jobs failed on following builders: > presubmit on tryserver.webrtc (JOB_FAILED, > http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/1667) Justin, could you please confirm from your webrtc.org address, or should I land this manually once the trybots are green?
juberti@webrtc.org changed reviewers: + juberti@webrtc.org
lgtm
The CQ bit was checked by jbauch@webrtc.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1416093010/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1416093010/60001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: android_arm64_rel on tryserver.webrtc (JOB_TIMED_OUT, no build URL)
The CQ bit was checked by jbauch@webrtc.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1416093010/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1416093010/60001
Message was sent while issue was closed.
Committed patchset #4 (id:60001)
Message was sent while issue was closed.
Patchset 4 (id:??) landed as https://crrev.com/9cafd972779ed7b25886ab276e0ede7b7a8b76a1 Cr-Commit-Position: refs/heads/master@{#10591}
Message was sent while issue was closed.
A revert of this CL (patchset #4 id:60001) has been created in https://codereview.webrtc.org/1442863003/ by phoglund@webrtc.org. The reason for reverting is: Unfortunately this breaks an internal downstream project since we have an ancient libsrtp. Reverting until we can figure out how to update our libsrtp.. |