modulize-quagga-mip6.patch
author Hajime Tazaki <tazaki@nict.go.jp>
Wed, 11 Apr 2012 12:41:12 +0900
changeset 19 f86f5b19833f
parent 12 9819db4db001
permissions -rw-r--r--
for umip update
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     1
diff -r 4ab96eb6171d model/linux-socket-fd.cc
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     2
--- a/model/linux-socket-fd.cc	Thu Mar 29 13:58:26 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     3
+++ b/model/linux-socket-fd.cc	Fri Apr 06 15:16:09 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     4
@@ -215,4 +215,10 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     5
   return m_factory->Poll (m_socket, ptable);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     6
 }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     7
 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     8
+int
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     9
+LinuxSocketFd::Ftruncate (off_t length)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    10
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    11
+  return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    12
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    13
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    14
 } // namespace ns3
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    15
diff -r 4ab96eb6171d model/linux-socket-fd.h
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    16
--- a/model/linux-socket-fd.h	Thu Mar 29 13:58:26 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    17
+++ b/model/linux-socket-fd.h	Fri Apr 06 15:16:09 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    18
@@ -49,6 +49,7 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    19
   virtual int Gettime (struct itimerspec *cur_value) const;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    20
 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    21
   virtual bool HangupReceived (void) const;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    22
+  virtual int Ftruncate(off_t);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    23
 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    24
   virtual int Poll (PollTable* ptable);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    25
 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    26
diff -r 4ab96eb6171d model/ns3-socket-fd-factory.cc
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    27
--- a/model/ns3-socket-fd-factory.cc	Thu Mar 29 13:58:26 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    28
+++ b/model/ns3-socket-fd-factory.cc	Fri Apr 06 15:16:09 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    29
@@ -140,6 +140,20 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    30
           break;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    31
         }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    32
     }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    33
+  else if (domain == PF_INET6)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    34
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    35
+      switch (type) {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    36
+        case SOCK_RAW: {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    37
+        TypeId tid = TypeId::LookupByName ("ns3::Ipv6RawSocketFactory");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    38
+        Ptr<SocketFactory> factory = GetObject<SocketFactory> (tid);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    39
+        sock = factory->CreateSocket ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    40
+        sock->SetAttribute ("Protocol", UintegerValue (protocol));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    41
+        socket = new UnixDatagramSocketFd (sock);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    42
+          } break;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    43
+      default:
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    44
+        break;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    45
+      }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    46
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    47
   else
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    48
     {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    49
       //      NS_FATAL_ERROR ("unsupported domain");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    50
diff -r 4ab96eb6171d model/unix-socket-fd.cc
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    51
--- a/model/unix-socket-fd.cc	Thu Mar 29 13:58:26 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    52
+++ b/model/unix-socket-fd.cc	Fri Apr 06 15:16:09 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    53
@@ -33,6 +33,7 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    54
 #include "ns3/boolean.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    55
 #include "ns3/simulator.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    56
 #include "ns3/netlink-socket-address.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    57
+#include <linux/netlink.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    58
 #include <fcntl.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    59
 #include <errno.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    60
 #include <linux/icmp.h> // need ICMP_FILTER
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    61
diff -r 4ab96eb6171d wscript
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    62
--- a/wscript	Thu Mar 29 13:58:26 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    63
+++ b/wscript	Fri Apr 06 15:16:09 2012 +0900
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    64
@@ -240,17 +240,10 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    65
                        target='bin/dce-iperf',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    66
                        source=['example/dce-iperf.cc', 'example/ccnx/misc-tools.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    67
     
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    68
-    module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'point-to-point-layout'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    69
-                       target='bin/dce-zebra-simple',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    70
-                       source=['example/dce-zebra-simple.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    71
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    72
     module.add_example(needed = ['core', 'internet', 'dce' ], 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    73
                        target='bin/dce-bash-simple',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    74
                        source=['example/bash/dce-bash-simple.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    75
                                                 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    76
-    module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'applications', 'topology-read', 'visualizer'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    77
-                       target='bin/dce-quagga-ospfd-rocketfuel',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    78
-                       source=['example/dce-quagga-ospfd-rocketfuel.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    79
 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    80
 def build_dce_kernel_examples(module):
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    81
     module.add_example(needed = ['core', 'network', 'dce'], 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    82
@@ -261,33 +254,6 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    83
                        target='bin/dce-linux',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    84
                        source=['example/dce-linux.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    85
 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    86
-    module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    87
-                       target='bin/dce-quagga-ospfd',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    88
-                       source=['example/dce-quagga-ospfd.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    89
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    90
-    module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'visualizer', 'topology-read'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    91
-                       target='bin/dce-quagga-bgpd-caida',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    92
-                       source=['example/dce-quagga-bgpd-caida.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    93
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    94
-    module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    95
-                       target='bin/dce-quagga-bgpd',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    96
-                       source=['example/dce-quagga-bgpd.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    97
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    98
-    module.add_example(needed = ['core', 'internet', 'dce', 'csma', 'mobility', 'wifi', 'visualizer'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    99
-                       target='bin/dce-mip6d',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   100
-                       source=['example/dce-mip6d.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   101
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   102
-    module.add_example(needed = ['core', 'internet', 'dce', 'csma', 'mobility', 'wifi', 'visualizer'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   103
-                       target='bin/dce-dsmip6d',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   104
-                       source=['example/dce-dsmip6d.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   105
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   106
-    module.add_example(needed = ['core', 'internet', 'dce', 'csma', 'mobility', 'wifi', 'visualizer', 'topology-read'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   107
-                       target='bin/dce-fga',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   108
-                       source=['example/dce-fga.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   109
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   110
-    module.add_example(needed = ['core', 'internet', 'dce', 'csma', 'mobility', 'wifi', 'visualizer', 'topology-read'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   111
-                       target='bin/dce-fga-crawdad',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   112
-                       source=['example/dce-fga-crawdad.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   113
 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   114
 def build(bld):
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   115
     build_netlink(bld)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   116
@@ -374,8 +340,6 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   117
         'helper/ipv4-dce-routing-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   118
         'helper/dce-manager-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   119
         'helper/dce-application-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   120
-        'helper/quagga-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   121
-        'helper/mip6d-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   122
         ]
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   123
     module_headers = [
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   124
         'model/dce-manager.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   125
@@ -385,10 +349,9 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   126
         'model/loader-factory.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   127
         'model/dce-application.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   128
         'model/ipv4-dce-routing.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   129
+        'helper/ipv4-dce-routing-helper.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   130
         'helper/dce-manager-helper.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   131
         'helper/dce-application-helper.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   132
-        'helper/quagga-helper.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   133
-        'helper/mip6d-helper.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   134
         ]
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   135
     module_source = module_source + kernel_source
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   136
     module_headers = module_headers + kernel_headers