commit 4cd433ed5f2cc0c4d4097bc79a3ca2d6daa9bc43
author Artem Titov <titovartem@webrtc.org> Mon Apr 01 11:01:16 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Apr 01 10:04:41 2019 +0000
tree 9c2bc4dd5bdb85f46605c82b1056fea4a67efe35
parent 359fe33163d6373a4c1ae2c059f2571c0b952074

Switch routing from dest endpoint id to dest ip in network emulation layer

Bug: webrtc:10138
Change-Id: I8659777820ec7244c1435d71504b0c01fb438192
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130103
Reviewed-by: Yves Gerey <yvesg@google.com>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27386}

test/scenario/network_node.h

diff --git a/test/scenario/network_node.h b/test/scenario/network_node.h
index bdaf2fe..71b7de9 100644
--- a/test/scenario/network_node.h
+++ b/test/scenario/network_node.h
@@ -75,7 +75,7 @@
   bool SendRtcp(const uint8_t* packet, size_t length) override;
 
   void Connect(EmulatedNetworkNode* send_node,
-               uint64_t receiver_id,
+               rtc::IPAddress receiver_ip,
                DataSize packet_overhead);
 
   DataSize packet_overhead() {
@@ -87,8 +87,10 @@
   rtc::CriticalSection crit_sect_;
   Clock* const sender_clock_;
   Call* const sender_call_;
+  // Store local address here for consistency with receiver address.
+  const rtc::SocketAddress local_address_;
   EmulatedNetworkNode* send_net_ RTC_GUARDED_BY(crit_sect_) = nullptr;
-  uint64_t receiver_id_ RTC_GUARDED_BY(crit_sect_) = 0;
+  rtc::SocketAddress receiver_address_ RTC_GUARDED_BY(crit_sect_);
   DataSize packet_overhead_ RTC_GUARDED_BY(crit_sect_) = DataSize::Zero();
 };
 
@@ -103,12 +105,12 @@
  private:
   friend class Scenario;
   CrossTrafficSource(EmulatedNetworkReceiverInterface* target,
-                     uint64_t receiver_id,
+                     rtc::IPAddress receiver_ip,
                      CrossTrafficConfig config);
   void Process(Timestamp at_time, TimeDelta delta);
 
   EmulatedNetworkReceiverInterface* const target_;
-  const uint64_t receiver_id_;
+  const rtc::SocketAddress receiver_address_;
   CrossTrafficConfig config_;
   webrtc::Random random_;