commit 4ea53b356d0f304ec6e910bbf5d697f080389c8b
author Qingsi Wang <qingsi@google.com> Tue Apr 17 01:22:31 2018
committer Commit Bot <commit-bot@chromium.org> Tue Apr 17 18:34:14 2018
tree d1ebab2376db15bbbd94179c937bae91e1265c3c
parent 0676f224f8f46cabd7eebf2172e7fccccc676f00

Prevent warning logs when signaling stats from connectionless sockets.

Signaling per-packet stats invokes GetRemoteAddress and a warning log is
output for each signal in SendTo for UDP sockets. This creates noise in
the debug log.

Bug: webrtc:9103
Change-Id: Ibf4667cf196aef971452f745bef3c02fb1dbf3d4
Reviewed-on: https://webrtc-review.googlesource.com/70364
Commit-Queue: Qingsi Wang <qingsi@google.com>
Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22911}

rtc_base/asyncpacketsocket.cc

diff --git a/rtc_base/asyncpacketsocket.cc b/rtc_base/asyncpacketsocket.cc
index 104e511..e1b1eae 100644
--- a/rtc_base/asyncpacketsocket.cc
+++ b/rtc_base/asyncpacketsocket.cc
@@ -30,10 +30,13 @@
 
 void CopySocketInformationToPacketInfo(size_t packet_size_bytes,
                                        const AsyncPacketSocket& socket_from,
+                                       bool is_connectionless,
                                        rtc::PacketInfo* info) {
   info->packet_size_bytes = packet_size_bytes;
   info->local_socket_address = socket_from.GetLocalAddress();
-  info->remote_socket_address = socket_from.GetRemoteAddress();
+  if (!is_connectionless) {
+    info->remote_socket_address = socket_from.GetRemoteAddress();
+  }
 }
 
 };  // namespace rtc

rtc_base/asyncpacketsocket.h

diff --git a/rtc_base/asyncpacketsocket.h b/rtc_base/asyncpacketsocket.h
index 6ae0525..2ffacfe 100644
--- a/rtc_base/asyncpacketsocket.h
+++ b/rtc_base/asyncpacketsocket.h
@@ -145,6 +145,7 @@
 
 void CopySocketInformationToPacketInfo(size_t packet_size_bytes,
                                        const AsyncPacketSocket& socket_from,
+                                       bool is_connectionless,
                                        rtc::PacketInfo* info);
 
 }  // namespace rtc

rtc_base/asynctcpsocket.cc

diff --git a/rtc_base/asynctcpsocket.cc b/rtc_base/asynctcpsocket.cc
index 0e35841..058d945 100644
--- a/rtc_base/asynctcpsocket.cc
+++ b/rtc_base/asynctcpsocket.cc
@@ -299,7 +299,7 @@
 
   rtc::SentPacket sent_packet(options.packet_id, rtc::TimeMillis(),
                               options.info_signaled_after_sent);
-  CopySocketInformationToPacketInfo(cb, *this, &sent_packet.info);
+  CopySocketInformationToPacketInfo(cb, *this, false, &sent_packet.info);
   SignalSentPacket(this, sent_packet);
 
   // We claim to have sent the whole thing, even if we only sent partial

rtc_base/asyncudpsocket.cc

diff --git a/rtc_base/asyncudpsocket.cc b/rtc_base/asyncudpsocket.cc
index c874ee6..d8e60b9 100644
--- a/rtc_base/asyncudpsocket.cc
+++ b/rtc_base/asyncudpsocket.cc
@@ -62,7 +62,7 @@
                          const rtc::PacketOptions& options) {
   rtc::SentPacket sent_packet(options.packet_id, rtc::TimeMillis(),
                               options.info_signaled_after_sent);
-  CopySocketInformationToPacketInfo(cb, *this, &sent_packet.info);
+  CopySocketInformationToPacketInfo(cb, *this, false, &sent_packet.info);
   int ret = socket_->Send(pv, cb);
   SignalSentPacket(this, sent_packet);
   return ret;
@@ -73,7 +73,7 @@
                            const rtc::PacketOptions& options) {
   rtc::SentPacket sent_packet(options.packet_id, rtc::TimeMillis(),
                               options.info_signaled_after_sent);
-  CopySocketInformationToPacketInfo(cb, *this, &sent_packet.info);
+  CopySocketInformationToPacketInfo(cb, *this, true, &sent_packet.info);
   sent_packet.info.remote_socket_address = addr;
   int ret = socket_->SendTo(pv, cb, addr);
   SignalSentPacket(this, sent_packet);