aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJonas Oreland <jonaso@webrtc.org>2020-03-20 16:11:56 +0100
committerCommit Bot <commit-bot@chromium.org>2020-03-20 16:55:38 +0000
commit71fda3613c1e5de4c4435cb98af6a2796a339dc7 (patch)
tree8fde1163f5048e30e0e7f880c19f9312ea704e8b /test
parent5b139d6f9bde6f3df79aa80a7e2ba7a17a8a8a2a (diff)
downloadwebrtc-71fda3613c1e5de4c4435cb98af6a2796a339dc7.tar.gz
Extend NetworkRoute with more info about local/remote endpoints
This patch extends the NetworkRoute struct with more information about local/remote endpoints. It adds - adapter type - adapter id - relay (previously it was "only" network_id) The patch leaves the {local/remote}_network_id fields around and populated since downstream projects depend on them. They will be removed once they have migrated. OWNER: srte@ call/ test/ OWNER: asapersson@ video/ OWNER: hta@ p2p/ pc/ rtc_base/ BUG: webrtc:11434 Change-Id: I9bcec385b40d707db385fef40b2c7a315dd35dd0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170628 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Jonas Oreland <jonaso@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30848}
Diffstat (limited to 'test')
-rw-r--r--test/scenario/network_node.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/scenario/network_node.cc b/test/scenario/network_node.cc
index c874add643..aa576dcf53 100644
--- a/test/scenario/network_node.cc
+++ b/test/scenario/network_node.cc
@@ -111,10 +111,10 @@ void NetworkNodeTransport::Connect(EmulatedEndpoint* endpoint,
rtc::NetworkRoute route;
route.connected = true;
// We assume that the address will be unique in the lower bytes.
- route.local_network_id = static_cast<uint16_t>(
- receiver_address.ipaddr().v4AddressAsHostOrderInteger());
- route.remote_network_id = static_cast<uint16_t>(
- receiver_address.ipaddr().v4AddressAsHostOrderInteger());
+ route.local = rtc::RouteEndpoint::CreateWithNetworkId(static_cast<uint16_t>(
+ receiver_address.ipaddr().v4AddressAsHostOrderInteger()));
+ route.remote = rtc::RouteEndpoint::CreateWithNetworkId(static_cast<uint16_t>(
+ receiver_address.ipaddr().v4AddressAsHostOrderInteger()));
route.packet_overhead = packet_overhead.bytes() +
receiver_address.ipaddr().overhead() +
cricket::kUdpHeaderSize;