From 6992d4e0de4cd92a70bfa755dd2dcfc1f2bb16ff Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 25 Mar 2016 12:11:38 +0100
Subject: [PATCH] inline a function in NS3

---
 src/surf/network_ns3.cpp | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 475ad6a9ff..d559716f3b 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -65,11 +65,19 @@ static void simgrid_ns3_add_host(simgrid::s4u::Host& host)
   host.extension_set(NS3_EXTENSION_ID, ns3host);
 }
 
-static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
+static void simgrid_ns3_add_netcard(simgrid::surf::NetCard* netcard)
 {
-  const char* router_id = router->name();
-  XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
-  xbt_lib_set(as_router_lib, router_id, NS3_ASR_LEVEL, ns3_add_router(router_id) );
+  const char* id = netcard->name();
+
+  ns3_node_t ns3netcard  = xbt_new0(s_ns3_node_t,1);
+  XBT_DEBUG("Interface ns3 add netcard[%d] '%s'",number_of_nodes,id);
+  ns3::Ptr<ns3::Node> node =  ns3::CreateObject<ns3::Node> (0);
+  stack.Install(node);
+  nodes.Add(node);
+  ns3netcard->node_num = number_of_nodes++;
+
+
+  xbt_lib_set(as_router_lib, id, NS3_ASR_LEVEL, ns3netcard );
 }
 
 #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
@@ -221,7 +229,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
 
   routing_model_create(NULL);
   simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
-  simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router);
+  simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_netcard);
   simgrid::surf::on_link.connect(netlink_parse_init);
   simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
   simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes
@@ -475,18 +483,6 @@ void * ns3_add_host_cluster(const char * id)
   return host;
 }
 
-void * ns3_add_router(const char * id)
-{
-  ns3_node_t router  = xbt_new0(s_ns3_node_t,1);
-  XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id);
-  ns3::Ptr<ns3::Node> node =  ns3::CreateObject<ns3::Node> (0);
-  stack.Install(node);
-  nodes.Add(node);
-  router->node_num = number_of_nodes;
-  number_of_nodes++;
-  return router;
-}
-
 void ns3_add_cluster(char * bw,char * lat,const char *id)
 {
 
-- 
2.20.1