commit 1cf6f8101ae9db517332783e99c98e14ff4c47e1
author Peter Thatcher <pthatcher@chromium.org> Fri May 15 10:40:45 2015 -0700
committer Peter Thatcher <pthatcher@chromium.org> Fri May 15 17:40:34 2015 +0000
tree 42c457ec09af2fdbb35c752b9e5ba8c073abdce4
parent 37931c4b851919e55b17ef571118d696317d0aa3

Add logging for sending and receiving STUN binding requests and TURN requests and responses.

BUG=
R=guoweis@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/46189004

Cr-Commit-Position: refs/heads/master@{#9195}

webrtc/p2p/base/stunrequest.cc

diff --git a/webrtc/p2p/base/stunrequest.cc b/webrtc/p2p/base/stunrequest.cc
index 1f124ee..e3f21df 100644
--- a/webrtc/p2p/base/stunrequest.cc
+++ b/webrtc/p2p/base/stunrequest.cc
@@ -14,6 +14,7 @@
 #include "webrtc/base/common.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/base/stringencode.h"
 
 namespace cricket {
 
@@ -76,8 +77,11 @@
 
 bool StunRequestManager::CheckResponse(StunMessage* msg) {
   RequestMap::iterator iter = requests_.find(msg->transaction_id());
-  if (iter == requests_.end())
+  if (iter == requests_.end()) {
+    LOG(LS_WARNING) << "Ignoring STUN response for unknown request "
+                    << rtc::hex_encode(msg->transaction_id());
     return false;
+  }
 
   StunRequest* request = iter->second;
   if (msg->type() == GetStunSuccessResponseType(request->type())) {
@@ -106,15 +110,20 @@
   id.append(data + kStunTransactionIdOffset, kStunTransactionIdLength);
 
   RequestMap::iterator iter = requests_.find(id);
-  if (iter == requests_.end())
+  if (iter == requests_.end()) {
+    LOG(LS_WARNING) << "Ignoring STUN response for unknown request "
+                    << rtc::hex_encode(id);
     return false;
+  }
 
   // Parse the STUN message and continue processing as usual.
 
   rtc::ByteBuffer buf(data, size);
   rtc::scoped_ptr<StunMessage> response(iter->second->msg_->CreateNew());
-  if (!response->Read(&buf))
+  if (!response->Read(&buf)) {
+    LOG(LS_WARNING) << "Failed to read STUN response " << rtc::hex_encode(id);
     return false;
+  }
 
   return CheckResponse(response.get());
 }
@@ -188,16 +197,21 @@
   msg_->Write(&buf);
   manager_->SignalSendPacket(buf.Data(), buf.Length(), this);
 
-  int delay = GetNextDelay();
-  manager_->thread_->PostDelayed(delay, this, MSG_STUN_SEND, NULL);
+  OnSent();
+  manager_->thread_->PostDelayed(resend_delay(), this, MSG_STUN_SEND, NULL);
 }
 
-int StunRequest::GetNextDelay() {
-  int delay = DELAY_UNIT * std::min(1 << count_, DELAY_MAX_FACTOR);
+void StunRequest::OnSent() {
   count_ += 1;
   if (count_ == MAX_SENDS)
     timeout_ = true;
-  return delay;
+}
+
+int StunRequest::resend_delay() {
+  if (count_ == 0) {
+    return 0;
+  }
+  return DELAY_UNIT * std::min(1 << (count_-1), DELAY_MAX_FACTOR);
 }
 
 }  // namespace cricket