Index: webrtc/p2p/base/stunport.h |
diff --git a/webrtc/p2p/base/stunport.h b/webrtc/p2p/base/stunport.h |
index 82be6fae2ae6714ac5c2c6269d42474fe2ae24e6..eceac43fa62a93eb11e65f9bf1d68b878c6cd6e3 100644 |
--- a/webrtc/p2p/base/stunport.h |
+++ b/webrtc/p2p/base/stunport.h |
@@ -71,7 +71,7 @@ class UDPPort : public Port { |
return port; |
} |
- virtual ~UDPPort(); |
+ ~UDPPort() override; |
rtc::SocketAddress GetLocalAddress() const { |
return socket_->GetLocalAddress(); |
@@ -80,28 +80,29 @@ class UDPPort : public Port { |
const ServerAddresses& server_addresses() const { |
return server_addresses_; |
} |
- void |
- set_server_addresses(const ServerAddresses& addresses) { |
+ void set_server_addresses(const ServerAddresses& addresses) { |
server_addresses_ = addresses; |
} |
- virtual void PrepareAddress(); |
+ void PrepareAddress() override; |
- 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(); |
+ Connection* CreateConnection(const Candidate& address, |
+ CandidateOrigin origin, |
+ const IceConfig& config) override; |
+ int SetOption(rtc::Socket::Option opt, int value) override; |
+ int GetOption(rtc::Socket::Option opt, int* value) override; |
+ int GetError() override; |
- virtual bool HandleIncomingPacket( |
- rtc::AsyncPacketSocket* socket, const char* data, size_t size, |
- const rtc::SocketAddress& remote_addr, |
- const rtc::PacketTime& packet_time) { |
+ bool HandleIncomingPacket(rtc::AsyncPacketSocket* socket, |
+ const char* data, |
+ size_t size, |
+ const rtc::SocketAddress& remote_addr, |
+ const rtc::PacketTime& packet_time) override { |
// All packets given to UDP port will be consumed. |
OnReadPacket(socket, data, size, remote_addr, packet_time); |
return true; |
} |
- virtual bool SupportsProtocol(const std::string& protocol) const { |
+ bool SupportsProtocol(const std::string& protocol) const override { |
return protocol == UDP_PROTOCOL_NAME; |
} |
@@ -145,12 +146,13 @@ class UDPPort : public Port { |
bool Init(); |
- 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; |
- virtual void UpdateNetworkCost(); |
+ void UpdateNetworkCost() override; |
void OnLocalAddressReady(rtc::AsyncPacketSocket* socket, |
const rtc::SocketAddress& address); |
@@ -160,7 +162,7 @@ class UDPPort : public Port { |
const rtc::PacketTime& packet_time); |
void OnSentPacket(rtc::AsyncPacketSocket* socket, |
- const rtc::SentPacket& sent_packet); |
+ const rtc::SentPacket& sent_packet) override; |
void OnReadyToSend(rtc::AsyncPacketSocket* socket); |
@@ -276,11 +278,9 @@ class StunPort : public UDPPort { |
return port; |
} |
- virtual ~StunPort() {} |
+ ~StunPort() override {} |
- virtual void PrepareAddress() { |
- SendStunBindingRequests(); |
- } |
+ void PrepareAddress() override { SendStunBindingRequests(); } |
protected: |
StunPort(rtc::Thread* thread, |