3 files changed, 16 insertions, 11 deletions
diff --git a/libtransport/src/io_modules/forwarder/forwarder.cc b/libtransport/src/io_modules/forwarder/forwarder.cc
index bfe4dd5de..d5f0b589e 100644
--- a/libtransport/src/io_modules/forwarder/forwarder.cc
+++ b/libtransport/src/io_modules/forwarder/forwarder.cc
@@ -161,19 +161,24 @@ void Forwarder::onPacketReceived(Connector *connector,
   // Forward packet to local connectors
 }
 
-void Forwarder::send(Packet &packet) {
+void Forwarder::send(Packet &packet, Connector::Id connector_id) {
   // TODo Here a nice PIT/CS / FIB would be required:)
   // For now let's just forward the packet on the remote connector we get
-  if (remote_connectors_.begin() == remote_connectors_.end()) {
-    return;
+  for (auto &c : remote_connectors_) {
+    auto remote_endpoint = c.second->getRemoteEndpoint();
+    DLOG_IF(INFO, VLOG_IS_ON(3))
+        << "Sending packet to: " << remote_endpoint.getAddress() << ":"
+        << remote_endpoint.getPort();
+    c.second->send(packet);
   }
 
-  auto remote_endpoint =
-      remote_connectors_.begin()->second->getRemoteEndpoint();
-  DLOG_IF(INFO, VLOG_IS_ON(3))
-      << "Sending packet to: " << remote_endpoint.getAddress() << ":"
-      << remote_endpoint.getPort();
-  remote_connectors_.begin()->second->send(packet);
+  for (auto &c : local_connectors_) {
+    if (c.first != connector_id) {
+      DLOG_IF(INFO, VLOG_IS_ON(3))
+          << "Sending packet to local connector " << c.first << std::endl;
+      c.second->receive({packet.shared_from_this()});
+    }
+  }
 }
 
 void Forwarder::onPacketSent(Connector *connector, const std::error_code &ec) {}
diff --git a/libtransport/src/io_modules/forwarder/forwarder.h b/libtransport/src/io_modules/forwarder/forwarder.h
index 9ad989fcd..1022bf81b 100644
--- a/libtransport/src/io_modules/forwarder/forwarder.h
+++ b/libtransport/src/io_modules/forwarder/forwarder.h
@@ -54,7 +54,7 @@ class Forwarder {
 
   Connector::Ptr getConnector(Connector::Id id);
 
-  void send(Packet &packet);
+  void send(Packet &packet, Connector::Id id);
 
   void stop();
 
diff --git a/libtransport/src/io_modules/forwarder/forwarder_module.cc b/libtransport/src/io_modules/forwarder/forwarder_module.cc
index 77d2b5e6a..ca9466f01 100644
--- a/libtransport/src/io_modules/forwarder/forwarder_module.cc
+++ b/libtransport/src/io_modules/forwarder/forwarder_module.cc
@@ -34,7 +34,7 @@ bool ForwarderModule::isConnected() { return true; }
 
 void ForwarderModule::send(Packet &packet) {
   IoModule::send(packet);
-  forwarder_.send(packet);
+  forwarder_.send(packet, connector_id_);
   DLOG_IF(INFO, VLOG_IS_ON(3))
       << "Sending from " << connector_id_ << " to " << 1 - connector_id_;
 }