| Index: webrtc/p2p/base/relayport.h
|
| diff --git a/webrtc/p2p/base/relayport.h b/webrtc/p2p/base/relayport.h
|
| index 4b74b91ade67ac62a74e4bc1c6e8ef715fe0db1a..402736c34dbc1747f7992bca521c1256dfc7a68d 100644
|
| --- a/webrtc/p2p/base/relayport.h
|
| +++ b/webrtc/p2p/base/relayport.h
|
| @@ -29,7 +29,7 @@ class RelayConnection;
|
| // is created. The RelayEntry will try to reach the remote destination
|
| // by connecting to all available server addresses in a pre defined
|
| // order with a small delay in between. When a connection is
|
| -// successful all other connection attemts are aborted.
|
| +// successful all other connection attempts are aborted.
|
| class RelayPort : public Port {
|
| public:
|
| typedef std::pair<rtc::Socket::Option, int> OptionValue;
|
| @@ -46,7 +46,7 @@ class RelayPort : public Port {
|
| return new RelayPort(thread, factory, network, ip, min_port, max_port,
|
| username, password);
|
| }
|
| - virtual ~RelayPort();
|
| + ~RelayPort() override;
|
|
|
| void AddServerAddress(const ProtocolAddress& addr);
|
| void AddExternalAddress(const ProtocolAddress& addr);
|
| @@ -54,13 +54,13 @@ class RelayPort : public Port {
|
| const std::vector<OptionValue>& options() const { return options_; }
|
| bool HasMagicCookie(const char* data, size_t size);
|
|
|
| - virtual void PrepareAddress();
|
| - virtual Connection* CreateConnection(const Candidate& address,
|
| - CandidateOrigin origin);
|
| - virtual int SetOption(rtc::Socket::Option opt, int value);
|
| - virtual int GetOption(rtc::Socket::Option opt, int* value);
|
| - virtual int GetError();
|
| - virtual bool SupportsProtocol(const std::string& protocol) const {
|
| + void PrepareAddress() override;
|
| + Connection* CreateConnection(const Candidate& address,
|
| + CandidateOrigin origin) override;
|
| + int SetOption(rtc::Socket::Option opt, int value) override;
|
| + int GetOption(rtc::Socket::Option opt, int* value) override;
|
| + int GetError() override;
|
| + bool SupportsProtocol(const std::string& protocol) const override {
|
| // Relay port may create both TCP and UDP connections.
|
| return true;
|
| }
|
| @@ -85,10 +85,11 @@ class RelayPort : public Port {
|
|
|
| void SetReady();
|
|
|
| - virtual int SendTo(const void* data, size_t size,
|
| - const rtc::SocketAddress& addr,
|
| - const rtc::PacketOptions& options,
|
| - bool payload);
|
| + int SendTo(const void* data,
|
| + size_t size,
|
| + const rtc::SocketAddress& addr,
|
| + const rtc::PacketOptions& options,
|
| + bool payload) override;
|
|
|
| // Dispatches the given packet to the port or connection as appropriate.
|
| void OnReadPacket(const char* data, size_t size,
|
| @@ -96,6 +97,11 @@ class RelayPort : public Port {
|
| ProtocolType proto,
|
| const rtc::PacketTime& packet_time);
|
|
|
| + // The OnSentPacket callback is left empty here since they are handled by
|
| + // RelayEntry.
|
| + void OnSentPacket(rtc::AsyncPacketSocket* socket,
|
| + const rtc::SentPacket& sent_packet) override {}
|
| +
|
| private:
|
| friend class RelayEntry;
|
|
|
|
|