Chromium Code Reviews| Index: webrtc/p2p/base/turnport.cc |
| diff --git a/webrtc/p2p/base/turnport.cc b/webrtc/p2p/base/turnport.cc |
| index 9ecc75ea2867c01c7e73122fc74bceff97c3385d..0c7d278c3ee84b9947c808f6bc9ad86df265f940 100644 |
| --- a/webrtc/p2p/base/turnport.cc |
| +++ b/webrtc/p2p/base/turnport.cc |
| @@ -927,14 +927,15 @@ void TurnPort::SendRequest(StunRequest* req, int delay) { |
| void TurnPort::AddRequestAuthInfo(StunMessage* msg) { |
| // If we've gotten the necessary data from the server, add it to our request. |
| - VERIFY(!hash_.empty()); |
| + RTC_DCHECK(!hash_.empty()); |
| msg->AddAttribute(new StunByteStringAttribute( |
| STUN_ATTR_USERNAME, credentials_.username)); |
| msg->AddAttribute(new StunByteStringAttribute( |
| STUN_ATTR_REALM, realm_)); |
| msg->AddAttribute(new StunByteStringAttribute( |
| STUN_ATTR_NONCE, nonce_)); |
| - VERIFY(msg->AddMessageIntegrity(hash())); |
| + bool res = msg->AddMessageIntegrity(hash()); |
| + RTC_DCHECK(res); |
| } |
| int TurnPort::Send(const void* data, size_t len, |
| @@ -943,8 +944,9 @@ int TurnPort::Send(const void* data, size_t len, |
| } |
| void TurnPort::UpdateHash() { |
| - VERIFY(ComputeStunCredentialHash(credentials_.username, realm_, |
| - credentials_.password, &hash_)); |
| + bool res = ComputeStunCredentialHash(credentials_.username, realm_, |
| + credentials_.password, &hash_); |
| + RTC_DCHECK(res); |
| } |
| bool TurnPort::UpdateNonce(StunMessage* response) { |
| @@ -1475,7 +1477,8 @@ int TurnEntry::Send(const void* data, size_t size, bool payload, |
| STUN_ATTR_XOR_PEER_ADDRESS, ext_addr_)); |
| msg.AddAttribute(new StunByteStringAttribute( |
| STUN_ATTR_DATA, data, size)); |
| - VERIFY(msg.Write(&buf)); |
| + bool res = msg.Write(&buf); |
| + RTC_DCHECK (res); |
|
kwiberg-webrtc
2017/02/07 09:39:49
Spurious space again. Doesn't clang-format fix the
nisse-webrtc
2017/02/07 10:48:16
I'll run git cl format for the next patchset. I of
|
| // If we're sending real data, request a channel bind that we can use later. |
| if (state_ == STATE_UNBOUND && payload) { |