commit 0d399a855b836c58b0297a9db49356b087863f22
author Sebastian Jansson <srte@webrtc.org> Thu Oct 11 17:59:36 2018
committer Commit Bot <commit-bot@chromium.org> Thu Oct 11 18:26:52 2018
tree a2320047fcf7bad9b8855e3aee87ee0a408f02de
parent 20ad2544b423d2cab523889fc126fa6e851ea844

Removes socket addresses from PacketInfo struct.

These are not used and removing them makes an upcoming CL moving
the PacketInfo struct much simpler.

Bug: webrtc:9586
Change-Id: I23acb93d9e15f6664e2fa93de744f156546dcbd0
Reviewed-on: https://webrtc-review.googlesource.com/c/105004
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25127}

p2p/base/p2ptransportchannel_unittest.cc

diff --git a/p2p/base/p2ptransportchannel_unittest.cc b/p2p/base/p2ptransportchannel_unittest.cc
index 9b0bcb2..3cf0711 100644
--- a/p2p/base/p2ptransportchannel_unittest.cc
+++ b/p2p/base/p2ptransportchannel_unittest.cc
@@ -699,7 +699,6 @@
     EXPECT_NE(info.packet_type, rtc::PacketType::kUnknown);
     EXPECT_NE(info.protocol, rtc::PacketInfoProtocolType::kUnknown);
     EXPECT_TRUE(info.network_id.has_value());
-    EXPECT_FALSE(info.local_socket_address.IsNil());
   }
 
   void OnReadyToSend(rtc::PacketTransportInternal* transport) {

rtc_base/asyncpacketsocket.cc

diff --git a/rtc_base/asyncpacketsocket.cc b/rtc_base/asyncpacketsocket.cc
index 2360e82..7e0cc8f 100644
--- a/rtc_base/asyncpacketsocket.cc
+++ b/rtc_base/asyncpacketsocket.cc
@@ -40,10 +40,6 @@
   if (family != 0) {
     info->ip_overhead_bytes = cricket::GetIpOverhead(family);
   }
-  info->local_socket_address = socket_from.GetLocalAddress();
-  if (!is_connectionless) {
-    info->remote_socket_address = socket_from.GetRemoteAddress();
-  }
 }
 
 };  // namespace rtc

rtc_base/asyncudpsocket.cc

diff --git a/rtc_base/asyncudpsocket.cc b/rtc_base/asyncudpsocket.cc
index ba5fa88..9cd9e14 100644
--- a/rtc_base/asyncudpsocket.cc
+++ b/rtc_base/asyncudpsocket.cc
@@ -74,7 +74,6 @@
   rtc::SentPacket sent_packet(options.packet_id, rtc::TimeMillis(),
                               options.info_signaled_after_sent);
   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);
   return ret;

rtc_base/socket.h

diff --git a/rtc_base/socket.h b/rtc_base/socket.h
index b634555..1cf0861 100644
--- a/rtc_base/socket.h
+++ b/rtc_base/socket.h
@@ -154,8 +154,6 @@
   size_t packet_size_bytes = 0;
   size_t turn_overhead_bytes = 0;
   size_t ip_overhead_bytes = 0;
-  SocketAddress local_socket_address;
-  SocketAddress remote_socket_address;
 };
 
 struct SentPacket {