| Index: webrtc/p2p/base/turnport.h
|
| diff --git a/webrtc/p2p/base/turnport.h b/webrtc/p2p/base/turnport.h
|
| index 6e528aaf69a2f2191c6b6474cd5c0da4e6bfc6ab..17d2d45181930bcc1ce9bb8ba8a75b0cf03225d4 100644
|
| --- a/webrtc/p2p/base/turnport.h
|
| +++ b/webrtc/p2p/base/turnport.h
|
| @@ -38,9 +38,7 @@
|
| STATE_CONNECTING, // Initial state, cannot send any packets.
|
| STATE_CONNECTED, // Socket connected, ready to send stun requests.
|
| STATE_READY, // Received allocate success, can send any packets.
|
| - STATE_RECEIVEONLY, // Had REFRESH_REQUEST error, cannot send any packets.
|
| - STATE_DISCONNECTED, // TCP connection died, cannot send/receive any
|
| - // packets.
|
| + STATE_DISCONNECTED, // TCP connection died, cannot send any packets.
|
| };
|
| static TurnPort* Create(rtc::Thread* thread,
|
| rtc::PacketSocketFactory* factory,
|
| @@ -204,8 +202,7 @@
|
| }
|
| }
|
|
|
| - void OnRefreshError();
|
| - void HandleRefreshError();
|
| + void OnTurnRefreshError();
|
| bool SetAlternateServer(const rtc::SocketAddress& address);
|
| void ResolveTurnAddress(const rtc::SocketAddress& address);
|
| void OnResolveResult(rtc::AsyncResolverInterface* resolver);
|
| @@ -248,9 +245,9 @@
|
| void ScheduleEntryDestruction(TurnEntry* entry);
|
| void CancelEntryDestruction(TurnEntry* entry);
|
|
|
| - // Marks the connection with remote address |address| failed and
|
| - // pruned (a.k.a. write-timed-out). Returns true if a connection is found.
|
| - bool FailAndPruneConnection(const rtc::SocketAddress& address);
|
| + // Destroys the connection with remote address |address|. Returns true if
|
| + // a connection is found and destroyed.
|
| + bool DestroyConnection(const rtc::SocketAddress& address);
|
|
|
| ProtocolAddress server_address_;
|
| RelayCredentials credentials_;
|
|
|