Reland: Replaced the SignalSelectedCandidatePairChanged with a new signal.
|packet_overhead| field is added to rtc::NetworkRoute structure.
In PackTransportInternal:
1. network_route() is added which returns the current network route.
2. debug_name() is removed.
3. transport_name() is moved from DtlsTransportInternal and
IceTransportInternal to PacketTransportInternal.
When the selected candidate pair is changed, the P2PTransportChannel
will fire the SignalNetworkRouteChanged instead of
SignalSelectedCandidatePairChanged to upper layers.
The Rtp/SrtpTransport takes the responsibility of calculating the
transport overhead from the BaseChannel so that the BaseChannel
doesn't need to depend on P2P layer transports.
TBR=pthatcher@webrtc.org
Bug: webrtc:7013
Change-Id: If9928b25a7259544c2d9c42048b53ab24292fc67
Reviewed-on: https://webrtc-review.googlesource.com/22767
Reviewed-by: Zhi Huang <zhihuang@webrtc.org>
Commit-Queue: Zhi Huang <zhihuang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20664}diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 971d32d..20797cc 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -525,6 +525,8 @@
"messagehandler.h",
"messagequeue.cc",
"messagequeue.h",
+ "nethelper.cc",
+ "nethelper.h",
"nethelpers.cc",
"nethelpers.h",
"network.cc",
diff --git a/rtc_base/nethelper.cc b/rtc_base/nethelper.cc
new file mode 100644
index 0000000..e654fe3
--- /dev/null
+++ b/rtc_base/nethelper.cc
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/nethelper.h"
+
+#include "rtc_base/checks.h"
+#include "rtc_base/ipaddress.h"
+
+namespace cricket {
+
+const char UDP_PROTOCOL_NAME[] = "udp";
+const char TCP_PROTOCOL_NAME[] = "tcp";
+const char SSLTCP_PROTOCOL_NAME[] = "ssltcp";
+const char TLS_PROTOCOL_NAME[] = "tls";
+
+int GetIpOverhead(int addr_family) {
+ switch (addr_family) {
+ case AF_INET: // IPv4
+ return 20;
+ case AF_INET6: // IPv6
+ return 40;
+ default:
+ RTC_NOTREACHED() << "Invaild address family.";
+ return 0;
+ }
+}
+
+int GetProtocolOverhead(const std::string& protocol) {
+ if (protocol == TCP_PROTOCOL_NAME || protocol == SSLTCP_PROTOCOL_NAME) {
+ return 20;
+ }
+ return 8;
+}
+
+} // namespace cricket
diff --git a/rtc_base/nethelper.h b/rtc_base/nethelper.h
new file mode 100644
index 0000000..e86d126
--- /dev/null
+++ b/rtc_base/nethelper.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef RTC_BASE_NETHELPER_H_
+#define RTC_BASE_NETHELPER_H_
+
+#include <cstdlib>
+#include <string>
+
+// This header contains helper functions and constants used by different types
+// of transports.
+namespace cricket {
+
+extern const char UDP_PROTOCOL_NAME[];
+extern const char TCP_PROTOCOL_NAME[];
+extern const char SSLTCP_PROTOCOL_NAME[];
+extern const char TLS_PROTOCOL_NAME[];
+
+// Get the network layer overhead per packet based on the IP address family.
+int GetIpOverhead(int addr_family);
+
+// Get the transport layer overhead per packet based on the protocol.
+int GetProtocolOverhead(const std::string& protocol);
+
+} // namespace cricket
+
+#endif // RTC_BASE_NETHELPER_H_
diff --git a/rtc_base/networkroute.h b/rtc_base/networkroute.h
index f245cb9..07cba63 100644
--- a/rtc_base/networkroute.h
+++ b/rtc_base/networkroute.h
@@ -22,14 +22,17 @@
uint16_t local_network_id;
uint16_t remote_network_id;
int last_sent_packet_id; // Last packet id sent on the PREVIOUS route.
+ int packet_overhead; // The overhead in bytes from IP layer and above.
NetworkRoute()
: connected(false),
local_network_id(0),
remote_network_id(0),
- last_sent_packet_id(-1) {}
+ last_sent_packet_id(-1),
+ packet_overhead(0) {}
// The route is connected if the local and remote network ids are provided.
+ // TODO(zhihuang): Remove this and let the caller set the fields explicitly.
NetworkRoute(bool connected,
uint16_t local_net_id,
uint16_t remote_net_id,
@@ -37,9 +40,11 @@
: connected(connected),
local_network_id(local_net_id),
remote_network_id(remote_net_id),
- last_sent_packet_id(last_packet_id) {}
+ last_sent_packet_id(last_packet_id),
+ packet_overhead(0) {}
- // |last_sent_packet_id| does not affect the NetworkRoute comparison.
+ // |last_sent_packet_id| and |packet_overhead| do not affect the NetworkRoute
+ // comparison.
bool operator==(const NetworkRoute& nr) const {
return connected == nr.connected &&
local_network_id == nr.local_network_id &&
