| Index: webrtc/p2p/base/turnport.h
|
| diff --git a/webrtc/p2p/base/turnport.h b/webrtc/p2p/base/turnport.h
|
| index 17d2d45181930bcc1ce9bb8ba8a75b0cf03225d4..dcf02c2bf236afc10d524d9f820f92ddce41679b 100644
|
| --- a/webrtc/p2p/base/turnport.h
|
| +++ b/webrtc/p2p/base/turnport.h
|
| @@ -71,7 +71,7 @@ class TurnPort : public Port {
|
| server_priority, origin);
|
| }
|
|
|
| - virtual ~TurnPort();
|
| + ~TurnPort() override;
|
|
|
| const ProtocolAddress& server_address() const { return server_address_; }
|
| // Returns an empty address if the local address has not been assigned.
|
| @@ -83,30 +83,34 @@ class TurnPort : public Port {
|
| }
|
| const RelayCredentials& credentials() const { return credentials_; }
|
|
|
| - virtual void PrepareAddress();
|
| - virtual Connection* CreateConnection(
|
| - const Candidate& c, PortInterface::CandidateOrigin origin);
|
| - virtual int SendTo(const void* data, size_t size,
|
| - const rtc::SocketAddress& addr,
|
| - const rtc::PacketOptions& options,
|
| - bool payload);
|
| - virtual int SetOption(rtc::Socket::Option opt, int value);
|
| - virtual int GetOption(rtc::Socket::Option opt, int* value);
|
| - virtual int GetError();
|
| -
|
| - virtual bool HandleIncomingPacket(rtc::AsyncPacketSocket* socket,
|
| - const char* data, size_t size,
|
| - const rtc::SocketAddress& remote_addr,
|
| - const rtc::PacketTime& packet_time);
|
| - virtual void OnReadPacket(rtc::AsyncPacketSocket* socket,
|
| - const char* data, size_t size,
|
| + void PrepareAddress() override;
|
| + Connection* CreateConnection(const Candidate& c,
|
| + PortInterface::CandidateOrigin origin,
|
| + const IceConfig& config) override;
|
| + int SendTo(const void* data,
|
| + size_t size,
|
| + const rtc::SocketAddress& addr,
|
| + const rtc::PacketOptions& options,
|
| + bool payload) override;
|
| + int SetOption(rtc::Socket::Option opt, int value) override;
|
| + int GetOption(rtc::Socket::Option opt, int* value) override;
|
| + int GetError() override;
|
| +
|
| + bool HandleIncomingPacket(rtc::AsyncPacketSocket* socket,
|
| + const char* data,
|
| + size_t size,
|
| const rtc::SocketAddress& remote_addr,
|
| - const rtc::PacketTime& packet_time);
|
| -
|
| - virtual void OnSentPacket(rtc::AsyncPacketSocket* socket,
|
| - const rtc::SentPacket& sent_packet);
|
| - virtual void OnReadyToSend(rtc::AsyncPacketSocket* socket);
|
| - virtual bool SupportsProtocol(const std::string& protocol) const {
|
| + const rtc::PacketTime& packet_time) override;
|
| + void OnReadPacket(rtc::AsyncPacketSocket* socket,
|
| + const char* data,
|
| + size_t size,
|
| + const rtc::SocketAddress& remote_addr,
|
| + const rtc::PacketTime& packet_time);
|
| +
|
| + void OnSentPacket(rtc::AsyncPacketSocket* socket,
|
| + const rtc::SentPacket& sent_packet) override;
|
| + void OnReadyToSend(rtc::AsyncPacketSocket* socket);
|
| + bool SupportsProtocol(const std::string& protocol) const override {
|
| // Turn port only connects to UDP candidates.
|
| return protocol == UDP_PROTOCOL_NAME;
|
| }
|
| @@ -189,8 +193,8 @@ class TurnPort : public Port {
|
| typedef std::map<rtc::Socket::Option, int> SocketOptionsMap;
|
| typedef std::set<rtc::SocketAddress> AttemptedServerSet;
|
|
|
| - virtual void OnMessage(rtc::Message* pmsg);
|
| - virtual void HandleConnectionDestroyed(Connection* conn);
|
| + void OnMessage(rtc::Message* pmsg) override;
|
| + void HandleConnectionDestroyed(Connection* conn) override;
|
|
|
| bool CreateTurnClientSocket();
|
|
|
|
|