zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes socket addresses from PacketInfo struct.

Browse Source 
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}
This commit is contained in:
Sebastian Jansson
2018-10-11 19:59:36 +02:00
committed by Commit Bot
parent 20ad2544b4
commit 0d399a855b
4 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
p2p/base/p2ptransportchannel_unittest.cc
View File

@ -699,7 +699,6 @@ class P2PTransportChannelTestBase : public testing::Test,
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) {

4
rtc_base/asyncpacketsocket.cc
View File

@ -40,10 +40,6 @@ void CopySocketInformationToPacketInfo(size_t packet_size_bytes,
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

1
rtc_base/asyncudpsocket.cc
View File

@ -74,7 +74,6 @@ int AsyncUDPSocket::SendTo(const void* pv,
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;

2
rtc_base/socket.h
View File

@ -154,8 +154,6 @@ struct PacketInfo {
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 {