talk/session/media/srtpfilter.h - Issue 1494373004: Revert "Allow remote fingerprint update during a call"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/session/media/srtpfilter.h

Issue 1494373004: Revert "Allow remote fingerprint update during a call" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: talk/session/media/srtpfilter.h

diff --git a/talk/session/media/srtpfilter.h b/talk/session/media/srtpfilter.h

index 6b941f32fd0aa16113a52ed80ae29d28328bde11..d30cee69c31302bcfae0bd613646b73e06300df9 100644

--- a/talk/session/media/srtpfilter.h

+++ b/talk/session/media/srtpfilter.h

@@ -138,8 +138,6 @@ class SrtpFilter {

// Update the silent threshold (in ms) for signaling errors.

void set_signal_silent_time(uint32_t signal_silent_time_in_ms);

- bool ResetParams();

sigslot::repeater3<uint32_t, Mode, Error> SignalSrtpError;

protected:

@@ -155,6 +153,7 @@ class SrtpFilter {

CryptoParams* selected_params);

bool ApplyParams(const CryptoParams& send_params,

const CryptoParams& recv_params);

+ bool ResetParams();

static bool ParseKeyParams(const std::string& params, uint8_t* key, int len);

private:

« no previous file with comments | « talk/session/media/channel.cc ('k') | webrtc/p2p/base/dtlstransportchannel.h » ('j') | no next file with comments »