diff -r 4ab96eb6171d model/linux-socket-fd.cc
--- a/model/linux-socket-fd.cc Thu Mar 29 13:58:26 2012 +0900
+++ b/model/linux-socket-fd.cc Fri Apr 06 15:16:09 2012 +0900
@@ -215,4 +215,10 @@
return m_factory->Poll (m_socket, ptable);
}
+int
+LinuxSocketFd::Ftruncate (off_t length)
+{
+ return -1;
+}
+
} // namespace ns3
diff -r 4ab96eb6171d model/linux-socket-fd.h
--- a/model/linux-socket-fd.h Thu Mar 29 13:58:26 2012 +0900
+++ b/model/linux-socket-fd.h Fri Apr 06 15:16:09 2012 +0900
@@ -49,6 +49,7 @@
virtual int Gettime (struct itimerspec *cur_value) const;
virtual bool HangupReceived (void) const;
+ virtual int Ftruncate(off_t);
virtual int Poll (PollTable* ptable);
diff -r 4ab96eb6171d model/ns3-socket-fd-factory.cc
--- a/model/ns3-socket-fd-factory.cc Thu Mar 29 13:58:26 2012 +0900
+++ b/model/ns3-socket-fd-factory.cc Fri Apr 06 15:16:09 2012 +0900
@@ -140,6 +140,20 @@
break;
}
}
+ else if (domain == PF_INET6)
+ {
+ switch (type) {
+ case SOCK_RAW: {
+ TypeId tid = TypeId::LookupByName ("ns3::Ipv6RawSocketFactory");
+ Ptr<SocketFactory> factory = GetObject<SocketFactory> (tid);
+ sock = factory->CreateSocket ();
+ sock->SetAttribute ("Protocol", UintegerValue (protocol));
+ socket = new UnixDatagramSocketFd (sock);
+ } break;
+ default:
+ break;
+ }
+ }
else
{
// NS_FATAL_ERROR ("unsupported domain");
diff -r 4ab96eb6171d model/unix-socket-fd.cc
--- a/model/unix-socket-fd.cc Thu Mar 29 13:58:26 2012 +0900
+++ b/model/unix-socket-fd.cc Fri Apr 06 15:16:09 2012 +0900
@@ -33,6 +33,7 @@
#include "ns3/boolean.h"
#include "ns3/simulator.h"
#include "ns3/netlink-socket-address.h"
+#include <linux/netlink.h>
#include <fcntl.h>
#include <errno.h>
#include <linux/icmp.h> // need ICMP_FILTER
diff -r 4ab96eb6171d wscript
--- a/wscript Thu Mar 29 13:58:26 2012 +0900
+++ b/wscript Fri Apr 06 15:16:09 2012 +0900
@@ -240,17 +240,10 @@
target='bin/dce-iperf',
source=['example/dce-iperf.cc', 'example/ccnx/misc-tools.cc'])
- module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'point-to-point-layout'],
- target='bin/dce-zebra-simple',
- source=['example/dce-zebra-simple.cc'])
-
module.add_example(needed = ['core', 'internet', 'dce' ],
target='bin/dce-bash-simple',
source=['example/bash/dce-bash-simple.cc'])
- 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'])
def build_dce_kernel_examples(module):
module.add_example(needed = ['core', 'network', 'dce'],
@@ -261,33 +254,6 @@
target='bin/dce-linux',
source=['example/dce-linux.cc'])
- module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point'],
- target='bin/dce-quagga-ospfd',
- source=['example/dce-quagga-ospfd.cc'])
-
- module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'visualizer', 'topology-read'],
- target='bin/dce-quagga-bgpd-caida',
- source=['example/dce-quagga-bgpd-caida.cc'])
-
- module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point'],
- target='bin/dce-quagga-bgpd',
- source=['example/dce-quagga-bgpd.cc'])
-
- module.add_example(needed = ['core', 'internet', 'dce', 'csma', 'mobility', 'wifi', 'visualizer'],
- target='bin/dce-mip6d',
- source=['example/dce-mip6d.cc'])
-
- module.add_example(needed = ['core', 'internet', 'dce', 'csma', 'mobility', 'wifi', 'visualizer'],
- target='bin/dce-dsmip6d',
- source=['example/dce-dsmip6d.cc'])
-
- module.add_example(needed = ['core', 'internet', 'dce', 'csma', 'mobility', 'wifi', 'visualizer', 'topology-read'],
- target='bin/dce-fga',
- source=['example/dce-fga.cc'])
-
- module.add_example(needed = ['core', 'internet', 'dce', 'csma', 'mobility', 'wifi', 'visualizer', 'topology-read'],
- target='bin/dce-fga-crawdad',
- source=['example/dce-fga-crawdad.cc'])
def build(bld):
build_netlink(bld)
@@ -374,8 +340,6 @@
'helper/ipv4-dce-routing-helper.cc',
'helper/dce-manager-helper.cc',
'helper/dce-application-helper.cc',
- 'helper/quagga-helper.cc',
- 'helper/mip6d-helper.cc',
]
module_headers = [
'model/dce-manager.h',
@@ -385,10 +349,9 @@
'model/loader-factory.h',
'model/dce-application.h',
'model/ipv4-dce-routing.h',
+ 'helper/ipv4-dce-routing-helper.h',
'helper/dce-manager-helper.h',
'helper/dce-application-helper.h',
- 'helper/quagga-helper.h',
- 'helper/mip6d-helper.h',
]
module_source = module_source + kernel_source
module_headers = module_headers + kernel_headers