talk/session/media/channel.h - Issue 1416673006: Convert internal representation of Srtp cryptos from string to int.

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

Issue 1416673006: Convert internal representation of Srtp cryptos from string to int. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Add back an old function name to prevent build break in chromium. Created 5 years, 2 months 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/channel.h

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

index 603115cee7f58a06a37cbaff94cd5cd56c1837c3..1c26005275591db7915714a6b9be1e8c68db2c8a 100644

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

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

@@ -236,7 +236,7 @@ class BaseChannel

// |rtcp_channel| indicates whether to set up the RTP or RTCP filter.

bool SetupDtlsSrtp(bool rtcp_channel);

// Set the DTLS-SRTP cipher policy on this channel as appropriate.

- bool SetDtlsSrtpCiphers(TransportChannel *tc, bool rtcp);

+ bool SetDtlsSrtpCryptoSuites(TransportChannel* tc, bool rtcp);

virtual void ChangeState() = 0;

@@ -283,8 +283,7 @@ class BaseChannel

// Handled in derived classes

// Get the SRTP ciphers to use for RTP media

- virtual void GetSrtpCryptoSuiteNames(

- std::vector<std::string>* ciphers) const = 0;

+ virtual void GetSrtpCryptoSuites(std::vector<int>* ciphers) const = 0;

pthatcher1 2015/11/11 19:59:40 Should we use an enum instead of an int?

guoweis_webrtc 2015/11/17 01:21:15 just like SSL, the integer is well defined and we

virtual void OnConnectionMonitorUpdate(ConnectionMonitor* monitor,

const std::vector<ConnectionInfo>& infos) = 0;

@@ -407,7 +406,7 @@ class VoiceChannel : public BaseChannel {

bool GetStats_w(VoiceMediaInfo* stats);

virtual void OnMessage(rtc::Message* pmsg);

- virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;

+ virtual void GetSrtpCryptoSuites(std::vector<int>* ciphers) const;

pthatcher1 2015/11/11 19:59:40 Shouldn't the variable name be crypto_suites? Her

guoweis_webrtc 2015/11/17 01:21:15 Done.

virtual void OnConnectionMonitorUpdate(

ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);

virtual void OnMediaMonitorUpdate(

@@ -497,7 +496,7 @@ class VideoChannel : public BaseChannel {

bool GetStats_w(VideoMediaInfo* stats);

virtual void OnMessage(rtc::Message* pmsg);

- virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;

+ virtual void GetSrtpCryptoSuites(std::vector<int>* ciphers) const;

virtual void OnConnectionMonitorUpdate(

ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);

virtual void OnMediaMonitorUpdate(

@@ -614,7 +613,7 @@ class DataChannel : public BaseChannel {

virtual bool WantsPacket(bool rtcp, rtc::Buffer* packet);

virtual void OnMessage(rtc::Message* pmsg);

- virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;

+ virtual void GetSrtpCryptoSuites(std::vector<int>* ciphers) const;

virtual void OnConnectionMonitorUpdate(

ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);

virtual void OnMediaMonitorUpdate(

« talk/app/webrtc/webrtcsession.cc ('K') | « talk/media/base/cryptoparams.h ('k') | talk/session/media/channel.cc » ('j') | talk/session/media/channel.cc » ('J')