From 4c4acc74b17e6559789dbef29d7f12a059eb675e Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Sat, 16 Apr 2016 13:58:17 +0200 Subject: [PATCH] bug 2374: The TapFdNetDeviceHelper does not seem to work in ns-3.25. (fix by Tommaso Pecorella) --- src/fd-net-device/examples/fd-tap-ping.cc | 5 ++++- src/fd-net-device/helper/tap-fd-net-device-helper.cc | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/fd-net-device/examples/fd-tap-ping.cc b/src/fd-net-device/examples/fd-tap-ping.cc index a449b1a83..d43bdc794 100644 --- a/src/fd-net-device/examples/fd-tap-ping.cc +++ b/src/fd-net-device/examples/fd-tap-ping.cc @@ -64,7 +64,10 @@ // # chown root.root build/src/fd-net-device/ns3-dev-tap-device-creator // # sudo chmod 4755 build/src/fd-net-device/ns3-dev-tap-device-creator // - +// 4) The example can be executed as follows using waf: +// +// ./waf --run fd-tap-ping --command-template="%s --tapNetwork= --tapMask=" +// #include "ns3/abort.h" #include "ns3/core-module.h" diff --git a/src/fd-net-device/helper/tap-fd-net-device-helper.cc b/src/fd-net-device/helper/tap-fd-net-device-helper.cc index fab4b839a..55e9dc5a7 100644 --- a/src/fd-net-device/helper/tap-fd-net-device-helper.cc +++ b/src/fd-net-device/helper/tap-fd-net-device-helper.cc @@ -64,9 +64,9 @@ TapFdNetDeviceHelper::TapFdNetDeviceHelper () { m_deviceName = ""; m_modePi = false; - m_tapIp4 = ""; - m_tapMask4 = ""; - m_tapIp6 = ""; + m_tapIp4 = Ipv4Address::GetZero (); + m_tapMask4 = Ipv4Mask::GetZero (); + m_tapIp6 = Ipv6Address::GetZero (); m_tapPrefix6 = 64; m_tapMac = Mac48Address::Allocate (); } @@ -227,19 +227,19 @@ TapFdNetDeviceHelper::CreateFileDescriptor (void) const ossMac << "-m" << m_tapMac; std::ostringstream ossIp4; - if (m_tapIp4 != "") + if (m_tapIp4 != Ipv4Address::GetZero ()) { ossIp4 << "-i" << m_tapIp4; } std::ostringstream ossIp6; - if (m_tapIp6 != "") + if (m_tapIp6 != Ipv6Address::GetZero ()) { ossIp6 << "-I" << m_tapIp6; } std::ostringstream ossNetmask4; - if (m_tapMask4 != "" ) + if (m_tapMask4 != Ipv4Mask::GetZero () ) { ossNetmask4 << "-n" << m_tapMask4; }