From b81978e289e29857d9abdf5b479c3fd38dc55e70 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 19 Dec 2017 09:25:43 +0100
Subject: [PATCH] make ns3 not segfault anymore. Now it timeouts

---
 examples/msg/network-ns3/3links-timer_d.xml |  8 --------
 src/surf/network_ns3.cpp                    | 12 ++++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/examples/msg/network-ns3/3links-timer_d.xml b/examples/msg/network-ns3/3links-timer_d.xml
index cc0e18aa5f..f58f3bd21b 100644
--- a/examples/msg/network-ns3/3links-timer_d.xml
+++ b/examples/msg/network-ns3/3links-timer_d.xml
@@ -33,12 +33,4 @@
   <actor host="Lovelace" function="worker">
     <argument value="4"/>
   </actor>
-  <actor host="Lovelace" function="timer">
-    <argument value="0"/>
-    <argument value=".1"/>
-  </actor>
-  <actor host="Lovelace" function="timer" start_time="2.0">
-    <argument value="0"/>
-    <argument value=".1"/>
-  </actor>
 </platform>
diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 85aab98915..c6a2fda4a1 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -393,7 +393,7 @@ void ns3_initialize(const char* TcpProtocol){
     return;
   }
 
-  xbt_die("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
+  xbt_die("The ns3/TcpModel must be: NewReno or Reno or Tahoe");
 }
 
 void ns3_add_cluster(const char* id, double bw, double lat) {
@@ -410,7 +410,7 @@ void ns3_add_cluster(const char* id, double bw, double lat) {
 
   xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes");
   ns3::CsmaHelper csma;
-  csma.SetDeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));// NS3 takes bps, but we provide Bps
+  csma.SetChannelAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw * 8))); // NS3 takes bps, but we provide Bps
   csma.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
   ns3::NetDeviceContainer devices = csma.Install(Nodes);
   XBT_DEBUG("Create CSMA");
@@ -450,14 +450,10 @@ void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) {
   ns3::Ptr<ns3::Node> b = nodes.Get(dstNum);
 
   XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, bw, lat);
-  pointToPoint.SetDeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));// NS3 takes bps, but we provide Bps
+  pointToPoint.SetChannelAttribute("DataRate",
+                                   ns3::DataRateValue(ns3::DataRate(bw * 8))); // NS3 takes bps, but we provide Bps
   pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
 
-  std::string filename = simgrid::xbt::string_printf("link-%d-%d.tr", srcNum, dstNum);
-  ns3::AsciiTraceHelper ascii;
-  pointToPoint.EnableAsciiAll(ascii.CreateFileStream(filename));
-  pointToPoint.EnablePcapAll ("tcp-bulk-send", false);
-
   ns3::NetDeviceContainer netA;
   netA.Add(pointToPoint.Install (a, b));
 
-- 
2.20.1