--- a/111117-thehajime-dce-pre.patch Fri Feb 10 12:41:42 2012 +0900
+++ b/111117-thehajime-dce-pre.patch Tue Mar 06 14:45:03 2012 +0900
@@ -1,6 +1,6 @@
-diff -r 57629e6afe4b model/libc-ns3.h
---- a/model/libc-ns3.h Fri Dec 02 08:23:38 2011 +0100
-+++ b/model/libc-ns3.h Mon Dec 05 14:34:20 2011 +0900
+diff -r 310a7c5bd5de model/libc-ns3.h
+--- a/model/libc-ns3.h Wed Feb 22 10:38:31 2012 +0100
++++ b/model/libc-ns3.h Tue Mar 06 14:41:32 2012 +0900
@@ -412,7 +412,7 @@
DCE (ftruncate)
@@ -19,50 +19,9 @@
DCE (getpwuid)
DCE (endpwent)
-diff -r 57629e6afe4b model/linux-socket-fd.cc
---- a/model/linux-socket-fd.cc Fri Dec 02 08:23:38 2011 +0100
-+++ b/model/linux-socket-fd.cc Mon Dec 05 14:34:20 2011 +0900
-@@ -213,5 +213,15 @@
- {
- return m_factory->Poll (m_socket, ptable);
- }
-+int
-+LinuxSocketFd::Ftruncate (off_t length)
-+{
-+ Thread *current = Current ();
-+ NS_ASSERT (current != 0);
-+ NS_LOG_FUNCTION (this << current << length);
-+
-+ current->err = EINVAL;
-+ return -1;
-+}
-
- } // namespace ns3
-diff -r 57629e6afe4b model/linux-socket-fd.h
---- a/model/linux-socket-fd.h Fri Dec 02 08:23:38 2011 +0100
-+++ b/model/linux-socket-fd.h Mon Dec 05 14:34:20 2011 +0900
-@@ -47,6 +47,7 @@
- const struct itimerspec *new_value,
- struct itimerspec *old_value);
- virtual int Gettime (struct itimerspec *cur_value) const;
-+ virtual int Ftruncate (off_t length);
-
- virtual bool HangupReceived (void) const;
-
-diff -r 57629e6afe4b model/unix-socket-fd.cc
---- a/model/unix-socket-fd.cc Fri Dec 02 08:23:38 2011 +0100
-+++ b/model/unix-socket-fd.cc Mon Dec 05 14:34:20 2011 +0900
-@@ -42,6 +42,7 @@
- #include <net/ethernet.h>
- #include <linux/if_arp.h>
- #include <poll.h>
-+#include <linux/netlink.h>
-
- NS_LOG_COMPONENT_DEFINE ("UnixSocketFd");
-
-diff -r 57629e6afe4b utils/setenv.zsh
+diff -r 310a7c5bd5de utils/setenv.zsh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/utils/setenv.zsh Mon Dec 05 14:34:20 2011 +0900
++++ b/utils/setenv.zsh Tue Mar 06 14:41:32 2012 +0900
@@ -0,0 +1,16 @@
+#!/bin/zsh
+#set -x
--- a/dlm-loader-fix.patch Fri Feb 10 12:41:42 2012 +0900
+++ b/dlm-loader-fix.patch Tue Mar 06 14:45:03 2012 +0900
@@ -1,6 +1,6 @@
-diff -r a7dc817d0a9a model/dlm-loader-factory.cc
---- a/model/dlm-loader-factory.cc Mon Dec 05 14:41:50 2011 +0900
-+++ b/model/dlm-loader-factory.cc Wed Dec 07 21:39:33 2011 +0900
+diff -r ce272071b2f2 model/dlm-loader-factory.cc
+--- a/model/dlm-loader-factory.cc Tue Mar 06 14:43:16 2012 +0900
++++ b/model/dlm-loader-factory.cc Tue Mar 06 14:43:38 2012 +0900
@@ -3,6 +3,7 @@
#include "ns3/fatal-error.h"
#include <list>
@@ -120,15 +120,15 @@
m_loaded.push_back (module);
return module;
}
-diff -r a7dc817d0a9a wscript
---- a/wscript Mon Dec 05 14:41:50 2011 +0900
-+++ b/wscript Wed Dec 07 21:39:33 2011 +0900
-@@ -36,6 +36,8 @@
- conf.check(header_name='dirent.h', define_name='HAVE_DIRENT_H', mandatory=False)
+diff -r ce272071b2f2 wscript
+--- a/wscript Tue Mar 06 14:43:16 2012 +0900
++++ b/wscript Tue Mar 06 14:43:38 2012 +0900
+@@ -37,6 +37,8 @@
+ conf.env.prepend_value('LINKFLAGS', '-Wl,--no-as-needed')
conf.env.append_value('LINKFLAGS', '-pthread')
+ conf.env.append_value('LINKFLAGS', '-Wl,--dynamic-linker=' +
+ os.path.abspath ('../build/lib/ldso'))
conf.check (lib='dl', mandatory = True)
-
- vg_h = conf.check(header_name='valgrind/valgrind.h', mandatory=False)
+ conf.check_cc(fragment='int main() {__get_cpu_features();}\n', msg='Checking for glibc get_cpu_features', define_name='HAVE_GETCPUFEATURES', mandatory=False)
+
--- a/floating_groupd.patch Fri Feb 10 12:41:42 2012 +0900
+++ b/floating_groupd.patch Tue Mar 06 14:45:03 2012 +0900
@@ -1,14 +1,17 @@
-diff -r 60f675ff7f1f .hgignore
---- a/.hgignore Wed Dec 07 21:39:33 2011 +0900
-+++ b/.hgignore Fri Jan 20 13:38:16 2012 +0900
-@@ -8,3 +8,4 @@
+diff -r a8547fc0f167 .hgignore
+--- a/.hgignore Tue Mar 06 14:43:38 2012 +0900
++++ b/.hgignore Tue Mar 06 14:44:17 2012 +0900
+@@ -8,6 +8,7 @@
^files-
^.waf-
^.lock-
+pcap
-diff -r 60f675ff7f1f 3967.weights.intra
+ ^ccnx-0.4.2
+ ^doc/build
+ ^NetAnim
+diff -r a8547fc0f167 3967.weights.intra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/3967.weights.intra Fri Jan 20 13:38:16 2012 +0900
++++ b/3967.weights.intra Tue Mar 06 14:44:17 2012 +0900
@@ -0,0 +1,294 @@
+San+Jose,+CA471 Santa+Clara,+CA444 4.5
+San+Jose,+CA471 Santa+Clara,+CA389 4
@@ -304,9 +307,9 @@
+Oak+Brook,+IL301 Oak+Brook,+IL309 2.5
+Oak+Brook,+IL301 Oak+Brook,+IL300 2.5
+Oak+Brook,+IL301 Oak+Brook,+IL310 3.5
-diff -r 60f675ff7f1f example/dce-fga-crawdad.cc
+diff -r a8547fc0f167 example/dce-fga-crawdad.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/example/dce-fga-crawdad.cc Fri Jan 20 13:38:16 2012 +0900
++++ b/example/dce-fga-crawdad.cc Tue Mar 06 14:44:17 2012 +0900
@@ -0,0 +1,233 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+#include "ns3/core-module.h"
@@ -541,9 +544,9 @@
+
+ return 0;
+}
-diff -r 60f675ff7f1f example/dce-fga.cc
+diff -r a8547fc0f167 example/dce-fga.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/example/dce-fga.cc Fri Jan 20 13:38:16 2012 +0900
++++ b/example/dce-fga.cc Tue Mar 06 14:44:17 2012 +0900
@@ -0,0 +1,829 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+#include "ns3/network-module.h"
@@ -1374,9 +1377,9 @@
+
+ return 0;
+}
-diff -r 60f675ff7f1f example/dce-mip6d.cc
---- a/example/dce-mip6d.cc Wed Dec 07 21:39:33 2011 +0900
-+++ b/example/dce-mip6d.cc Fri Jan 20 13:38:16 2012 +0900
+diff -r a8547fc0f167 example/dce-mip6d.cc
+--- a/example/dce-mip6d.cc Tue Mar 06 14:43:38 2012 +0900
++++ b/example/dce-mip6d.cc Tue Mar 06 14:44:17 2012 +0900
@@ -139,7 +139,7 @@
NetDeviceContainer cn_devices = csma.Install (NodeContainer (ar.Get (0), cn.Get (0)));
@@ -1386,18 +1389,18 @@
processManager.SetNetworkStack("ns3::LinuxSocketFdFactory",
"Library", StringValue ("libnet-next-2.6.so"));
processManager.Install (mr);
-diff -r 60f675ff7f1f exec_sudo.sh
+diff -r a8547fc0f167 exec_sudo.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/exec_sudo.sh Fri Jan 20 13:38:16 2012 +0900
++++ b/exec_sudo.sh Tue Mar 06 14:44:17 2012 +0900
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ulimit -c unlimited
+. utils/setenv.sh
+$1
-diff -r 60f675ff7f1f helper/mip6d-helper.cc
---- a/helper/mip6d-helper.cc Wed Dec 07 21:39:33 2011 +0900
-+++ b/helper/mip6d-helper.cc Fri Jan 20 13:38:16 2012 +0900
+diff -r a8547fc0f167 helper/mip6d-helper.cc
+--- a/helper/mip6d-helper.cc Tue Mar 06 14:43:38 2012 +0900
++++ b/helper/mip6d-helper.cc Tue Mar 06 14:44:17 2012 +0900
@@ -92,6 +92,7 @@
@@ -1429,9 +1432,9 @@
process.ParseArguments ("-c /etc/mip6d.conf -d 10");
process.SetStackSize (1<<16);
apps.Add (process.Install (node));
-diff -r 60f675ff7f1f helper/mip6d-helper.h
---- a/helper/mip6d-helper.h Wed Dec 07 21:39:33 2011 +0900
-+++ b/helper/mip6d-helper.h Fri Jan 20 13:38:16 2012 +0900
+diff -r a8547fc0f167 helper/mip6d-helper.h
+--- a/helper/mip6d-helper.h Tue Mar 06 14:43:38 2012 +0900
++++ b/helper/mip6d-helper.h Tue Mar 06 14:44:17 2012 +0900
@@ -98,8 +98,10 @@
// Common
void EnableDebug (NodeContainer nodes);
@@ -1443,9 +1446,9 @@
/**
* \internal
*/
-diff -r 60f675ff7f1f helper/quagga-helper.cc
---- a/helper/quagga-helper.cc Wed Dec 07 21:39:33 2011 +0900
-+++ b/helper/quagga-helper.cc Fri Jan 20 13:38:16 2012 +0900
+diff -r a8547fc0f167 helper/quagga-helper.cc
+--- a/helper/quagga-helper.cc Tue Mar 06 14:43:38 2012 +0900
++++ b/helper/quagga-helper.cc Tue Mar 06 14:44:17 2012 +0900
@@ -42,7 +42,9 @@
QuaggaConfig ()
: m_tdpenable (false),
@@ -1581,10 +1584,10 @@
node->AddApplication (apps.Get (0));
Ptr<OspfConfig> ospf_conf = node->GetObject<OspfConfig>();
-diff -r 60f675ff7f1f helper/quagga-helper.h
---- a/helper/quagga-helper.h Wed Dec 07 21:39:33 2011 +0900
-+++ b/helper/quagga-helper.h Fri Jan 20 13:38:16 2012 +0900
-@@ -82,11 +82,13 @@
+diff -r a8547fc0f167 helper/quagga-helper.h
+--- a/helper/quagga-helper.h Tue Mar 06 14:43:38 2012 +0900
++++ b/helper/quagga-helper.h Tue Mar 06 14:44:17 2012 +0900
+@@ -81,11 +81,13 @@
void EnableOspf (NodeContainer nodes);
void EnableOspfDebug (NodeContainer nodes);
void EnableTdpNina (NodeContainer nodes);
@@ -1598,10 +1601,10 @@
void EnableBgp (NodeContainer nodes);
uint32_t GetAsn (Ptr<Node> node);
void BgpAddNeighbor (Ptr<Node> node, std::string n, uint32_t asn);
-diff -r 60f675ff7f1f model/linux-socket-fd-factory.cc
---- a/model/linux-socket-fd-factory.cc Wed Dec 07 21:39:33 2011 +0900
-+++ b/model/linux-socket-fd-factory.cc Fri Jan 20 13:38:16 2012 +0900
-@@ -524,7 +524,7 @@
+diff -r a8547fc0f167 model/linux-socket-fd-factory.cc
+--- a/model/linux-socket-fd-factory.cc Tue Mar 06 14:43:38 2012 +0900
++++ b/model/linux-socket-fd-factory.cc Tue Mar 06 14:44:17 2012 +0900
+@@ -534,7 +534,7 @@
this));
Set (".net.ipv4.conf.all.forwarding", "1");
Set (".net.ipv4.conf.all.log_martians", "1");
@@ -1610,9 +1613,9 @@
Set (".net.ipv6.conf.all.proxy_ndp", "1");
while (!m_earlySysfs.empty ())
-diff -r 60f675ff7f1f test/test-pipe.cc
---- a/test/test-pipe.cc Wed Dec 07 21:39:33 2011 +0900
-+++ b/test/test-pipe.cc Fri Jan 20 13:38:16 2012 +0900
+diff -r a8547fc0f167 test/test-pipe.cc
+--- a/test/test-pipe.cc Tue Mar 06 14:43:38 2012 +0900
++++ b/test/test-pipe.cc Tue Mar 06 14:44:17 2012 +0900
@@ -354,7 +354,7 @@
@@ -1622,21 +1625,9 @@
{
test1 ();
test2 ();
-diff -r 60f675ff7f1f utils/setenv.sh
---- a/utils/setenv.sh Wed Dec 07 21:39:33 2011 +0900
-+++ b/utils/setenv.sh Fri Jan 20 13:38:16 2012 +0900
-@@ -4,7 +4,7 @@
- BASE=$PWD
- LD_LIBRARY_PATH="$BASE/ns-3-dce/build/lib:$BASE/build/lib:$BASE/build/bin:$BASE/ns-3-dce/build/bin:.:$LD_LIBRARY_PATH"
- PKG_CONFIG_PATH="$BASE/build/lib/pkgconfig"
--PATH="$PATH:$BASE/build/bin"
-+PATH="$BASE/build/bin:$BASE/build/sbin:/home/tazaki/hgworks/ns-3-dce-thehajime/build/bin:/home/tazaki/hgworks/ns-3-dce-thehajime/build/sbin:$PATH"
- export LD_LIBRARY_PATH PKG_CONFIG_PATH PATH
- cd $BASE/ns-3-dce
-
-diff -r 60f675ff7f1f utils/setenv.zsh
---- a/utils/setenv.zsh Wed Dec 07 21:39:33 2011 +0900
-+++ b/utils/setenv.zsh Fri Jan 20 13:38:16 2012 +0900
+diff -r a8547fc0f167 utils/setenv.zsh
+--- a/utils/setenv.zsh Tue Mar 06 14:43:38 2012 +0900
++++ b/utils/setenv.zsh Tue Mar 06 14:44:17 2012 +0900
@@ -5,7 +5,7 @@
BASE=$PWD
LD_LIBRARY_PATH="$BASE/ns-3-dce/build/lib:$BASE/build/lib:$BASE/build/bin:$BASE/ns-3-dce/build/bin:."
@@ -1646,10 +1637,10 @@
PYTHONPATH=$BASE/ns-3-dev/build/debug/bindings/python:$BASE/ns-3-dev/src/visualizer:$BASE/pybindgen-0.15.0.795:$BASE/build/lib/python2.6/site-packages/
export LD_LIBRARY_PATH PKG_CONFIG_PATH PATH PYTHONPATH
cd $BASE/ns-3-dce
-diff -r 60f675ff7f1f wscript
---- a/wscript Wed Dec 07 21:39:33 2011 +0900
-+++ b/wscript Fri Jan 20 13:38:16 2012 +0900
-@@ -278,6 +278,14 @@
+diff -r a8547fc0f167 wscript
+--- a/wscript Tue Mar 06 14:43:38 2012 +0900
++++ b/wscript Tue Mar 06 14:44:17 2012 +0900
+@@ -295,6 +295,14 @@
target='bin/dce-dsmip6d',
source=['example/dce-dsmip6d.cc'])
--- a/mpitest.patch Fri Feb 10 12:41:42 2012 +0900
+++ b/mpitest.patch Tue Mar 06 14:45:03 2012 +0900
@@ -1,6 +1,6 @@
-diff -r 1ec7e9b54818 example/dce-quagga-ospfd-rocketfuel.cc
---- a/example/dce-quagga-ospfd-rocketfuel.cc Fri Jan 20 13:38:16 2012 +0900
-+++ b/example/dce-quagga-ospfd-rocketfuel.cc Tue Jan 24 16:33:26 2012 +0900
+diff -r a4ff82e43ebd example/dce-quagga-ospfd-rocketfuel.cc
+--- a/example/dce-quagga-ospfd-rocketfuel.cc Tue Mar 06 14:44:17 2012 +0900
++++ b/example/dce-quagga-ospfd-rocketfuel.cc Tue Mar 06 14:44:38 2012 +0900
@@ -13,15 +13,18 @@
#include <sys/resource.h>
@@ -46,9 +46,9 @@
quagga.Install (nodes.Get (i));
}
}
-diff -r 1ec7e9b54818 helper/quagga-helper.cc
---- a/helper/quagga-helper.cc Fri Jan 20 13:38:16 2012 +0900
-+++ b/helper/quagga-helper.cc Tue Jan 24 16:33:26 2012 +0900
+diff -r a4ff82e43ebd helper/quagga-helper.cc
+--- a/helper/quagga-helper.cc Tue Mar 06 14:44:17 2012 +0900
++++ b/helper/quagga-helper.cc Tue Mar 06 14:44:38 2012 +0900
@@ -829,9 +829,9 @@
process.SetBinary ("ospfd");
@@ -61,9 +61,9 @@
node->AddApplication (apps.Get (1));
}
-diff -r 1ec7e9b54818 utils/setenv.zsh
---- a/utils/setenv.zsh Fri Jan 20 13:38:16 2012 +0900
-+++ b/utils/setenv.zsh Tue Jan 24 16:33:26 2012 +0900
+diff -r a4ff82e43ebd utils/setenv.zsh
+--- a/utils/setenv.zsh Tue Mar 06 14:44:17 2012 +0900
++++ b/utils/setenv.zsh Tue Mar 06 14:44:38 2012 +0900
@@ -3,7 +3,7 @@
# Set environnement for ns3 dce
cd `dirname ${BASH_SOURCE:-$0}`/../..
@@ -73,15 +73,15 @@
PKG_CONFIG_PATH="$BASE/build/lib/pkgconfig"
PATH="$BASE/build/bin:$BASE/build/sbin:/home/tazaki/hgworks/ns-3-dce-thehajime/build/bin:/home/tazaki/hgworks/ns-3-dce-thehajime/build/sbin:$PATH"
PYTHONPATH=$BASE/ns-3-dev/build/debug/bindings/python:$BASE/ns-3-dev/src/visualizer:$BASE/pybindgen-0.15.0.795:$BASE/build/lib/python2.6/site-packages/
-diff -r 1ec7e9b54818 wscript
---- a/wscript Fri Jan 20 13:38:16 2012 +0900
-+++ b/wscript Tue Jan 24 16:33:26 2012 +0900
-@@ -248,7 +248,7 @@
- target='bin/dce-bash-simple',
- source=['example/bash/dce-bash-simple.cc'])
+diff -r a4ff82e43ebd wscript
+--- a/wscript Tue Mar 06 14:44:17 2012 +0900
++++ b/wscript Tue Mar 06 14:44:38 2012 +0900
+@@ -266,7 +266,7 @@
+ # source=['example/dce-cout-bug.cc'])
+
- module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'applications', 'topology-read'],
+ module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'applications', 'topology-read', 'visualizer'],
target='bin/dce-quagga-ospfd-rocketfuel',
source=['example/dce-quagga-ospfd-rocketfuel.cc'])
-
+
--- a/ospfd_support.patch Fri Feb 10 12:41:42 2012 +0900
+++ b/ospfd_support.patch Tue Mar 06 14:45:03 2012 +0900
@@ -1,8 +1,8 @@
quagga ospfd with ns-3-linux support
-diff -r 29b4d04c736b example/3967.weights.intra
+diff -r d6f6af932a9b example/3967.weights.intra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/example/3967.weights.intra Mon Dec 05 11:30:34 2011 +0900
++++ b/example/3967.weights.intra Tue Mar 06 14:42:21 2012 +0900
@@ -0,0 +1,294 @@
+San+Jose,+CA471 Santa+Clara,+CA444 4.5
+San+Jose,+CA471 Santa+Clara,+CA389 4
@@ -298,9 +298,9 @@
+Oak+Brook,+IL301 Oak+Brook,+IL309 2.5
+Oak+Brook,+IL301 Oak+Brook,+IL300 2.5
+Oak+Brook,+IL301 Oak+Brook,+IL310 3.5
-diff -r 29b4d04c736b example/dce-quagga-ospfd-rocketfuel.cc
+diff -r d6f6af932a9b example/dce-quagga-ospfd-rocketfuel.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/example/dce-quagga-ospfd-rocketfuel.cc Mon Dec 05 11:30:34 2011 +0900
++++ b/example/dce-quagga-ospfd-rocketfuel.cc Tue Mar 06 14:42:21 2012 +0900
@@ -0,0 +1,214 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+
@@ -516,9 +516,9 @@
+
+ return 0;
+}
-diff -r 29b4d04c736b example/dce-quagga-ospfd.cc
+diff -r d6f6af932a9b example/dce-quagga-ospfd.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/example/dce-quagga-ospfd.cc Mon Dec 05 11:30:34 2011 +0900
++++ b/example/dce-quagga-ospfd.cc Tue Mar 06 14:42:21 2012 +0900
@@ -0,0 +1,145 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+
@@ -665,9 +665,9 @@
+
+ return 0;
+}
-diff -r 29b4d04c736b helper/quagga-helper.cc
---- a/helper/quagga-helper.cc Mon Dec 05 11:29:12 2011 +0900
-+++ b/helper/quagga-helper.cc Mon Dec 05 11:30:34 2011 +0900
+diff -r d6f6af932a9b helper/quagga-helper.cc
+--- a/helper/quagga-helper.cc Tue Mar 06 14:41:32 2012 +0900
++++ b/helper/quagga-helper.cc Tue Mar 06 14:42:21 2012 +0900
@@ -341,11 +341,6 @@
Ptr<QuaggaConfig> zebra_conf = node->GetObject<QuaggaConfig>();
Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
@@ -692,10 +692,10 @@
std::ofstream conf;
conf.open (conf_file.str ().c_str ());
conf << *zebra_conf;
-diff -r 29b4d04c736b model/linux-socket-fd-factory.cc
---- a/model/linux-socket-fd-factory.cc Mon Dec 05 11:29:12 2011 +0900
-+++ b/model/linux-socket-fd-factory.cc Mon Dec 05 11:30:34 2011 +0900
-@@ -253,6 +253,7 @@
+diff -r d6f6af932a9b model/linux-socket-fd-factory.cc
+--- a/model/linux-socket-fd-factory.cc Tue Mar 06 14:41:32 2012 +0900
++++ b/model/linux-socket-fd-factory.cc Tue Mar 06 14:42:21 2012 +0900
+@@ -254,6 +254,7 @@
{
LinuxSocketFdFactory *self = (LinuxSocketFdFactory *)kernel;
TaskManager *manager = TaskManager::Current ();
@@ -703,7 +703,7 @@
Task *other = (Task *)self->m_exported->task_get_private (task);
bool isBlocked = other->IsBlocked ();
manager->Wakeup (other);
-@@ -402,6 +403,10 @@
+@@ -403,6 +404,10 @@
{
flags |= SIM_DEV_BROADCAST;
}
@@ -714,9 +714,9 @@
struct SimDevice *dev = m_exported->dev_create (PeekPointer (device), (enum SimDevFlags)flags);
Ptr<LinuxDeviceStateListener> listener = Create <LinuxDeviceStateListener> (device, this);
-diff -r 29b4d04c736b model/utils.cc
---- a/model/utils.cc Mon Dec 05 11:29:12 2011 +0900
-+++ b/model/utils.cc Mon Dec 05 11:30:34 2011 +0900
+diff -r d6f6af932a9b model/utils.cc
+--- a/model/utils.cc Tue Mar 06 14:41:32 2012 +0900
++++ b/model/utils.cc Tue Mar 06 14:42:21 2012 +0900
@@ -191,6 +191,11 @@
void UtilsDoSignal (void)
{
@@ -729,9 +729,9 @@
// we try to check if we
// have pending signals and we deliver them if we have any.
for (std::vector<SignalHandler>::iterator i = current->process->signalHandlers.begin ();
-diff -r 29b4d04c736b test/test-bug-multi-select.cc
+diff -r d6f6af932a9b test/test-bug-multi-select.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/test/test-bug-multi-select.cc Mon Dec 05 11:30:34 2011 +0900
++++ b/test/test-bug-multi-select.cc Tue Mar 06 14:42:21 2012 +0900
@@ -0,0 +1,199 @@
+#include <stdio.h>
+#include <sys/select.h>
@@ -932,9 +932,9 @@
+
+ return 0;
+}
-diff -r 29b4d04c736b test/test-socket.cc
+diff -r d6f6af932a9b test/test-socket.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/test/test-socket.cc Mon Dec 05 11:30:34 2011 +0900
++++ b/test/test-socket.cc Tue Mar 06 14:42:21 2012 +0900
@@ -0,0 +1,395 @@
+#define _GNU_SOURCE 1
+#include <sys/types.h>
@@ -1331,9 +1331,9 @@
+ test_netlink ();
+ return 0;
+}
-diff -r 29b4d04c736b test/wscript
---- a/test/wscript Mon Dec 05 11:29:12 2011 +0900
-+++ b/test/wscript Mon Dec 05 11:30:34 2011 +0900
+diff -r d6f6af932a9b test/wscript
+--- a/test/wscript Tue Mar 06 14:41:32 2012 +0900
++++ b/test/wscript Tue Mar 06 14:42:21 2012 +0900
@@ -31,6 +31,8 @@
new_test(bld, 'test-netdb', '')
new_test(bld, 'test-env', '')
@@ -1343,9 +1343,9 @@
new_test(bld, 'test-timer-fd', '')
new_test(bld, 'test-stdlib', '')
new_test(bld, 'test-select', 'PTHREAD')
-diff -r 29b4d04c736b wscript
---- a/wscript Mon Dec 05 11:29:12 2011 +0900
-+++ b/wscript Mon Dec 05 11:30:34 2011 +0900
+diff -r d6f6af932a9b wscript
+--- a/wscript Tue Mar 06 14:41:32 2012 +0900
++++ b/wscript Tue Mar 06 14:42:21 2012 +0900
@@ -26,6 +26,7 @@
ns3waf.check_modules(conf, ['point-to-point', 'tap-bridge', 'netanim'], mandatory = False)
ns3waf.check_modules(conf, ['wifi', 'point-to-point', 'csma', 'mobility'], mandatory = False)
@@ -1354,19 +1354,19 @@
conf.check_tool('compiler_cc')
conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H', mandatory=False)
conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H', mandatory=False)
-@@ -233,6 +234,11 @@
- module.add_example(needed = ['core', 'internet', 'dce' ],
- target='bin/dce-bash-simple',
- source=['example/bash/dce-bash-simple.cc'])
+@@ -250,6 +251,11 @@
+ # module.add_example(needed = ['core', 'dce', ],
+ # target='bin/dce-cout-bug',
+ # source=['example/dce-cout-bug.cc'])
++
+
+ module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'applications', 'topology-read'],
+ target='bin/dce-quagga-ospfd-rocketfuel',
+ source=['example/dce-quagga-ospfd-rocketfuel.cc'])
-+
-
+
def build_dce_kernel_examples(module):
module.add_example(needed = ['core', 'network', 'dce'],
-@@ -243,6 +249,9 @@
+@@ -260,6 +266,9 @@
target='bin/dce-linux',
source=['example/dce-linux.cc'])
--- a/umip_mip6d_support.patch Fri Feb 10 12:41:42 2012 +0900
+++ b/umip_mip6d_support.patch Tue Mar 06 14:45:03 2012 +0900
@@ -1,8 +1,8 @@
support umip(mip6d) with ns-3-linux for NEMO/MIP6
-diff -r 930cebf77f44 example/dce-mip6d.cc
+diff -r 98074ba3d68d example/dce-mip6d.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/example/dce-mip6d.cc Mon Dec 05 11:36:21 2011 +0900
++++ b/example/dce-mip6d.cc Tue Mar 06 14:43:12 2012 +0900
@@ -0,0 +1,293 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+
@@ -297,9 +297,9 @@
+
+ return 0;
+}
-diff -r 930cebf77f44 helper/mip6d-helper.cc
+diff -r 98074ba3d68d helper/mip6d-helper.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/helper/mip6d-helper.cc Mon Dec 05 11:36:21 2011 +0900
++++ b/helper/mip6d-helper.cc Tue Mar 06 14:43:12 2012 +0900
@@ -0,0 +1,392 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
@@ -693,9 +693,9 @@
+}
+
+} // namespace ns3
-diff -r 930cebf77f44 helper/mip6d-helper.h
+diff -r 98074ba3d68d helper/mip6d-helper.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/helper/mip6d-helper.h Mon Dec 05 11:36:21 2011 +0900
++++ b/helper/mip6d-helper.h Tue Mar 06 14:43:12 2012 +0900
@@ -0,0 +1,111 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
@@ -808,9 +808,9 @@
+} // namespace ns3
+
+#endif /* MIP6D_HELPER_H */
-diff -r 930cebf77f44 helper/quagga-helper.cc
---- a/helper/quagga-helper.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/helper/quagga-helper.cc Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d helper/quagga-helper.cc
+--- a/helper/quagga-helper.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/helper/quagga-helper.cc Tue Mar 06 14:43:12 2012 +0900
@@ -44,7 +44,7 @@
m_zebradebug (false),
m_usemanualconf (false)
@@ -864,10 +864,10 @@
conf << " no ipv6 nd suppress-ra" << std::endl;
conf << "!" << std::endl;
}
-diff -r 930cebf77f44 helper/quagga-helper.h
---- a/helper/quagga-helper.h Mon Dec 05 11:31:06 2011 +0900
-+++ b/helper/quagga-helper.h Mon Dec 05 11:36:21 2011 +0900
-@@ -83,7 +83,7 @@
+diff -r 98074ba3d68d helper/quagga-helper.h
+--- a/helper/quagga-helper.h Tue Mar 06 14:42:24 2012 +0900
++++ b/helper/quagga-helper.h Tue Mar 06 14:43:12 2012 +0900
+@@ -82,7 +82,7 @@
void EnableOspfDebug (NodeContainer nodes);
void EnableTdpNina (NodeContainer nodes);
void EnableZebraDebug (NodeContainer nodes);
@@ -876,9 +876,9 @@
void EnableEgressIF (Ptr<Node> node, const char *ifname);
void EnableHomeAgentFlag (Ptr<Node> node, const char *ifname);
void UseManualConfig (NodeContainer nodes);
-diff -r 930cebf77f44 model/dce-fd.cc
---- a/model/dce-fd.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/dce-fd.cc Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/dce-fd.cc
+--- a/model/dce-fd.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/dce-fd.cc Tue Mar 06 14:43:12 2012 +0900
@@ -345,11 +345,14 @@
Ptr<SocketFdFactory> factory = 0;
@@ -903,10 +903,10 @@
socket->IncFdCount ();
current->process->openFiles[fd] = new FileUsage (fd, socket);
-diff -r 930cebf77f44 model/dce-manager.cc
---- a/model/dce-manager.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/dce-manager.cc Mon Dec 05 11:36:21 2011 +0900
-@@ -1055,6 +1055,22 @@
+diff -r 98074ba3d68d model/dce-manager.cc
+--- a/model/dce-manager.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/dce-manager.cc Tue Mar 06 14:43:12 2012 +0900
+@@ -1096,6 +1096,22 @@
libpthread_setup = (void (*)(const struct Libc *))(symbol);
libpthread_setup (libc);
@@ -929,9 +929,9 @@
// finally, call into 'main'.
h = ld->Load (filename, RTLD_GLOBAL);
-diff -r 930cebf77f44 model/dce-signal.cc
---- a/model/dce-signal.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/dce-signal.cc Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/dce-signal.cc
+--- a/model/dce-signal.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/dce-signal.cc Tue Mar 06 14:43:12 2012 +0900
@@ -3,6 +3,7 @@
#include "process.h"
#include "ns3/log.h"
@@ -959,9 +959,9 @@
int dce_sigprocmask(int how, const sigset_t *set, sigset_t *oldset)
{
Thread *current = Current ();
-diff -r 930cebf77f44 model/dce-signal.h
---- a/model/dce-signal.h Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/dce-signal.h Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/dce-signal.h
+--- a/model/dce-signal.h Tue Mar 06 14:42:24 2012 +0900
++++ b/model/dce-signal.h Tue Mar 06 14:43:12 2012 +0900
@@ -17,6 +17,7 @@
int dce_pthread_kill (pthread_t thread, int sig);
void dce_abort ();
@@ -970,9 +970,9 @@
#ifdef __cplusplus
}
-diff -r 930cebf77f44 model/dce-time.cc
---- a/model/dce-time.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/dce-time.cc Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/dce-time.cc
+--- a/model/dce-time.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/dce-time.cc Tue Mar 06 14:43:12 2012 +0900
@@ -54,3 +54,12 @@
return asctime_r (tm, Current ()->process->asctime_result);
@@ -986,9 +986,9 @@
+ *tp = UtilsTimeToTimespec (UtilsSimulationTimeToTime (Now ()));
+ return 0;
+}
-diff -r 930cebf77f44 model/dce-time.h
---- a/model/dce-time.h Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/dce-time.h Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/dce-time.h
+--- a/model/dce-time.h Tue Mar 06 14:42:24 2012 +0900
++++ b/model/dce-time.h Tue Mar 06 14:43:12 2012 +0900
@@ -13,6 +13,7 @@
struct tm *dce_localtime(const time_t *timep);
char *dce_ctime(const time_t *timep);
@@ -997,10 +997,10 @@
#ifdef __cplusplus
}
-diff -r 930cebf77f44 model/dce.cc
---- a/model/dce.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/dce.cc Mon Dec 05 11:36:21 2011 +0900
-@@ -20,6 +20,8 @@
+diff -r 98074ba3d68d model/dce.cc
+--- a/model/dce.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/dce.cc Tue Mar 06 14:43:12 2012 +0900
+@@ -22,6 +22,8 @@
#include <getopt.h>
#include <limits.h>
#include <fcntl.h>
@@ -1009,8 +1009,8 @@
#include "dce-random.h"
#include "net/dce-if.h"
#include "ns3/node.h"
-@@ -638,6 +640,43 @@
-
+@@ -639,6 +641,43 @@
+ }
unsigned dce_if_nametoindex (const char *ifname)
{
+ struct ifreq ifr;
@@ -1053,7 +1053,7 @@
int index = 0;
Ptr<Node> node = Current ()->process->manager->GetObject<Node> ();
Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
-@@ -653,6 +692,7 @@
+@@ -654,6 +693,7 @@
}
return 0;
}
@@ -1061,9 +1061,9 @@
pid_t dce_fork (void)
{
Thread *thread = Current ();
-diff -r 930cebf77f44 model/elf-cache.cc
---- a/model/elf-cache.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/elf-cache.cc Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/elf-cache.cc
+--- a/model/elf-cache.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/elf-cache.cc Tue Mar 06 14:43:12 2012 +0900
@@ -26,6 +26,9 @@
overriden.from = "libpthread.so.0";
overriden.to = "libpthread-ns3.so";
@@ -1074,9 +1074,9 @@
}
std::string
-diff -r 930cebf77f44 model/libc-ns3.h
---- a/model/libc-ns3.h Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/libc-ns3.h Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/libc-ns3.h
+--- a/model/libc-ns3.h Tue Mar 06 14:42:24 2012 +0900
++++ b/model/libc-ns3.h Tue Mar 06 14:43:12 2012 +0900
@@ -223,6 +223,7 @@
NATIVE (inet_lnaof)
NATIVE (inet_netof)
@@ -1091,7 +1091,7 @@
NATIVE (sigismember)
+DCE (sigwait)
DCE_WITH_ALIAS2(strtol, __strtol_internal)
- DCE (strtoll)
+ DCET (long long int, strtoll)
DCE (strtoul)
@@ -343,6 +345,13 @@
DCE (pthread_cond_wait)
@@ -1126,18 +1126,18 @@
// setjmp.h
NATIVE (__sigsetjmp)
-diff -r 930cebf77f44 model/librt-ns3.version
+diff -r 98074ba3d68d model/librt-ns3.version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/model/librt-ns3.version Mon Dec 05 11:36:21 2011 +0900
++++ b/model/librt-ns3.version Tue Mar 06 14:43:12 2012 +0900
@@ -0,0 +1,4 @@
+NS3 {
+global:
+ librt_setup;
+};
-diff -r 930cebf77f44 model/linux-socket-fd-factory.cc
---- a/model/linux-socket-fd-factory.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/linux-socket-fd-factory.cc Mon Dec 05 11:36:21 2011 +0900
-@@ -524,6 +524,8 @@
+diff -r 98074ba3d68d model/linux-socket-fd-factory.cc
+--- a/model/linux-socket-fd-factory.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/linux-socket-fd-factory.cc Tue Mar 06 14:43:12 2012 +0900
+@@ -534,6 +534,8 @@
this));
Set (".net.ipv4.conf.all.forwarding", "1");
Set (".net.ipv4.conf.all.log_martians", "1");
@@ -1146,9 +1146,9 @@
while (!m_earlySysfs.empty ())
{
-diff -r 930cebf77f44 model/linux-socket-fd.cc
---- a/model/linux-socket-fd.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/linux-socket-fd.cc Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/linux-socket-fd.cc
+--- a/model/linux-socket-fd.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/linux-socket-fd.cc Tue Mar 06 14:43:12 2012 +0900
@@ -177,6 +177,7 @@
return 0;
break;
@@ -1157,9 +1157,9 @@
//XXX commands missing
NS_FATAL_ERROR ("fcntl not implemented on socket");
return -1;
-diff -r 930cebf77f44 model/net/dce-if.h
---- a/model/net/dce-if.h Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/net/dce-if.h Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/net/dce-if.h
+--- a/model/net/dce-if.h Tue Mar 06 14:42:24 2012 +0900
++++ b/model/net/dce-if.h Tue Mar 06 14:43:12 2012 +0900
@@ -7,6 +7,7 @@
#endif
@@ -1168,9 +1168,9 @@
#ifdef __cplusplus
-diff -r 930cebf77f44 model/ns3-socket-fd-factory.cc
---- a/model/ns3-socket-fd-factory.cc Mon Dec 05 11:31:06 2011 +0900
-+++ b/model/ns3-socket-fd-factory.cc Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d model/ns3-socket-fd-factory.cc
+--- a/model/ns3-socket-fd-factory.cc Tue Mar 06 14:42:24 2012 +0900
++++ b/model/ns3-socket-fd-factory.cc Tue Mar 06 14:43:12 2012 +0900
@@ -142,7 +142,8 @@
}
else
@@ -1181,9 +1181,9 @@
}
return socket;
-diff -r 930cebf77f44 wscript
---- a/wscript Mon Dec 05 11:31:06 2011 +0900
-+++ b/wscript Mon Dec 05 11:36:21 2011 +0900
+diff -r 98074ba3d68d wscript
+--- a/wscript Tue Mar 06 14:42:24 2012 +0900
++++ b/wscript Tue Mar 06 14:43:12 2012 +0900
@@ -26,7 +26,7 @@
ns3waf.check_modules(conf, ['point-to-point', 'tap-bridge', 'netanim'], mandatory = False)
ns3waf.check_modules(conf, ['wifi', 'point-to-point', 'csma', 'mobility'], mandatory = False)
@@ -1193,7 +1193,7 @@
conf.check_tool('compiler_cc')
conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H', mandatory=False)
conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H', mandatory=False)
-@@ -65,6 +65,17 @@
+@@ -71,6 +71,17 @@
conf.end_msg(libpthread, True)
conf.env['LIBPTHREAD_FILE'] = libpthread
@@ -1211,7 +1211,7 @@
conf.find_program('readversiondef', var='READVERSIONDEF', mandatory=True)
if Options.options.kernel_stack is not None and os.path.isdir(Options.options.kernel_stack):
-@@ -257,6 +268,10 @@
+@@ -274,6 +285,10 @@
target='bin/dce-quagga-bgpd',
source=['example/dce-quagga-bgpd.cc'])
@@ -1222,23 +1222,26 @@
def build(bld):
build_netlink(bld)
-@@ -343,6 +358,7 @@
+@@ -361,7 +376,9 @@
'helper/dce-manager-helper.cc',
'helper/dce-application-helper.cc',
'helper/quagga-helper.cc',
+- 'helper/ccn-client-helper.cc'
++ 'helper/ccn-client-helper.cc',
+ 'helper/mip6d-helper.cc',
++
]
module_headers = [
'model/dce-manager.h',
-@@ -355,6 +371,7 @@
- 'helper/dce-manager-helper.h',
+@@ -375,6 +392,7 @@
'helper/dce-application-helper.h',
'helper/quagga-helper.h',
+ 'helper/ccn-client-helper.h',
+ 'helper/mip6d-helper.h',
]
module_source = module_source + kernel_source
module_headers = module_headers + kernel_headers
-@@ -384,6 +401,11 @@
+@@ -404,6 +422,11 @@
rule='%s %s | cat ${SRC[0].abspath()} - > ${TGT}' %
(bld.env['READVERSIONDEF'], bld.env['LIBPTHREAD_FILE']))
@@ -1250,7 +1253,7 @@
bld.add_group('dce_use_version_files')
# The very small libc used to replace the glibc
-@@ -403,3 +425,13 @@
+@@ -423,3 +446,13 @@
linkflags=['-nostdlib', '-lc',
'-Wl,--version-script=' + os.path.join('model', 'libpthread.version'),
'-Wl,-soname=libpthread.so.0'])