Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
complete TOS patch for NSC code
authorTom Henderson <tomh@tomh.org>
Thu, 22 Nov 2012 07:15:19 -0800
changeset 9146 1bc2026bc8b4
parent 9145 5752b425cdf5
child 9147 e9af93287335
complete TOS patch for NSC code
src/internet/bindings/modulegen__gcc_ILP32.py file | annotate | diff | comparison | revisions
src/internet/bindings/modulegen__gcc_LP64.py file | annotate | diff | comparison | revisions
src/internet/model/nsc-tcp-l4-protocol.cc file | annotate | diff | comparison | revisions
src/internet/model/nsc-tcp-l4-protocol.h file | annotate | diff | comparison | revisions 
--- a/src/internet/bindings/modulegen__gcc_ILP32.py	Tue Nov 20 17:52:39 2012 -0500
+++ b/src/internet/bindings/modulegen__gcc_ILP32.py	Thu Nov 22 07:15:19 2012 -0800
@@ -4678,7 +4678,6 @@
     return
 
 def register_Ns3Int64x64_t_methods(root_module, cls):
-    cls.add_binary_comparison_operator('<=')
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
@@ -4736,6 +4735,7 @@
     cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))
     cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))
     cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('<=')
     cls.add_binary_comparison_operator('==')
     cls.add_binary_comparison_operator('>=')
     ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
@@ -8205,7 +8205,6 @@
     return
 
 def register_Ns3Time_methods(root_module, cls):
-    cls.add_binary_comparison_operator('<=')
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
@@ -8214,6 +8213,7 @@
     cls.add_binary_comparison_operator('>')
     cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
     cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('<=')
     cls.add_binary_comparison_operator('==')
     cls.add_binary_comparison_operator('>=')
     ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
--- a/src/internet/bindings/modulegen__gcc_LP64.py	Tue Nov 20 17:52:39 2012 -0500
+++ b/src/internet/bindings/modulegen__gcc_LP64.py	Thu Nov 22 07:15:19 2012 -0800
@@ -4678,7 +4678,6 @@
     return
 
 def register_Ns3Int64x64_t_methods(root_module, cls):
-    cls.add_binary_comparison_operator('<=')
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
@@ -4736,6 +4735,7 @@
     cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))
     cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))
     cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('<=')
     cls.add_binary_comparison_operator('==')
     cls.add_binary_comparison_operator('>=')
     ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
@@ -8205,7 +8205,6 @@
     return
 
 def register_Ns3Time_methods(root_module, cls):
-    cls.add_binary_comparison_operator('<=')
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
@@ -8214,6 +8213,7 @@
     cls.add_binary_comparison_operator('>')
     cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
     cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('<=')
     cls.add_binary_comparison_operator('==')
     cls.add_binary_comparison_operator('>=')
     ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
--- a/src/internet/model/nsc-tcp-l4-protocol.cc	Tue Nov 20 17:52:39 2012 -0500
+++ b/src/internet/model/nsc-tcp-l4-protocol.cc	Thu Nov 22 07:15:19 2012 -0800
@@ -339,7 +339,7 @@
 }
 
 IpL4Protocol::RxStatus
-NscTcpL4Protocol::Receive(Ptr<Packet>, Ipv6Address&, Ipv6Address&, Ptr<Ipv6Interface>)
+NscTcpL4Protocol::Receive(Ptr<Packet>, Ipv6Header const &, Ptr<Ipv6Interface>)
 {
   return IpL4Protocol::RX_ENDPOINT_UNREACH;
 }
--- a/src/internet/model/nsc-tcp-l4-protocol.h	Tue Nov 20 17:52:39 2012 -0500
+++ b/src/internet/model/nsc-tcp-l4-protocol.h	Thu Nov 22 07:15:19 2012 -0800
@@ -84,8 +84,7 @@
                                             Ipv4Header const &header,
                                             Ptr<Ipv4Interface> incomingInterface);
   virtual IpL4Protocol::RxStatus Receive (Ptr<Packet> p,
-                                                 Ipv6Address &src,
-                                                 Ipv6Address &dst,
+                                                 Ipv6Header const &header,
                                                  Ptr<Ipv6Interface> interface);
 
   // From IpL4Protocol
ns-3.24