Export more IPv6 includes.

src/helper/ipv6-address-helper.h

@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "ns3/ipv6-address.h"
+
 #include "net-device-container.h"
 #include "ipv6-interface-container.h"
 

src/helper/ipv6-interface-container.h

@@ -22,7 +22,9 @@
 #define IPV6_INTERFACE_CONTAINER_H
 
 #include <stdint.h>
+
 #include <vector>
+
 #include "ns3/ipv6.h"
 #include "ns3/ipv6-address.h"
 

src/helper/ipv6-list-routing-helper.cc

@@ -17,10 +17,12 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#include "ipv6-list-routing-helper.h"
+
 #include "ns3/ipv6-list-routing.h"
 #include "ns3/node.h"
 
+#include "ipv6-list-routing-helper.h"
+
 namespace ns3 {
 
 Ipv6ListRoutingHelper::Ipv6ListRoutingHelper ()

src/helper/ipv6-list-routing-helper.h

@@ -20,10 +20,12 @@
 #ifndef IPV6_LIST_ROUTING_HELPER_H
 #define IPV6_LIST_ROUTING_HELPER_H
 
-#include "ipv6-routing-helper.h"
 #include <stdint.h>
+
 #include <list>
 
+#include "ipv6-routing-helper.h"
+
 namespace ns3 {
 
 /**

src/helper/ipv6-routing-helper.h

@@ -17,6 +17,7 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
+
 #ifndef IPV6_ROUTING_HELPER_H
 #define IPV6_ROUTING_HELPER_H
 

src/helper/ipv6-static-routing-helper.cc

@@ -17,6 +17,7 @@
  */
 
 #include <vector>
+
 #include "ns3/log.h"
 #include "ns3/ptr.h"
 #include "ns3/names.h"
@@ -27,6 +28,7 @@
 #include "ns3/assert.h"
 #include "ns3/ipv6-address.h"
 #include "ns3/ipv6-routing-protocol.h"
+
 #include "ipv6-static-routing-helper.h"
 
 NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRoutingHelper");

src/helper/ipv6-static-routing-helper.h

@@ -25,9 +25,10 @@
 #include "ns3/ipv6-address.h"
 #include "ns3/node.h"
 #include "ns3/net-device.h"
-#include "ipv6-routing-helper.h"
+
 #include "node-container.h"
 #include "net-device-container.h"
+#include "ipv6-routing-helper.h"
 
 namespace ns3 {
 

src/helper/ping6-helper.h

@@ -22,11 +22,13 @@
 #define PING6_HELPER_H
 
 #include <stdint.h>
-#include "application-container.h"
-#include "node-container.h"
+
 #include "ns3/object-factory.h"
 #include "ns3/ipv6-address.h"
 
+#include "application-container.h"
+#include "node-container.h"
+
 namespace ns3 {
 
 /**

src/internet-stack/icmpv6-header.cc

@@ -22,9 +22,10 @@
 
 #include "ns3/assert.h"
 #include "ns3/address-utils.h"
-#include "icmpv6-header.h"
 #include "ns3/log.h"
 
+#include "icmpv6-header.h"
+
 namespace ns3
 {
 

src/internet-stack/icmpv6-l4-protocol.cc

@@ -24,16 +24,15 @@
 #include "ns3/assert.h"
 #include "ns3/packet.h"
 #include "ns3/node.h"
+#include "ns3/boolean.h"
 #include "ns3/ipv6-routing-protocol.h"
 #include "ns3/ipv6-route.h"
 
 #include "ipv6-raw-socket-factory-impl.h"
-#include "icmpv6-l4-protocol.h"
-#include "icmpv6-header.h"
 #include "ipv6-l3-protocol.h"
-#include "ipv6-end-point.h"
-
-#include "ns3/ipv6-static-routing-helper.h"
+#include "ipv6-interface.h"
+#include "icmpv6-l4-protocol.h"
+#include "ndisc-cache.h"
 
 namespace ns3
 {

src/internet-stack/icmpv6-l4-protocol.h

@@ -24,15 +24,10 @@
 #define ICMPV6_L4_PROTOCOL_H
 
 #include <list>
+
 #include "ns3/ipv6-address.h"
-#include "ns3/ptr.h"
-#include "ns3/socket.h"
-#include "ns3/buffer.h"
-#include "ns3/boolean.h"
 #include "icmpv6-header.h"
 #include "ipv6-l4-protocol.h"
-#include "ndisc-cache.h"
-#include "ipv6-l3-protocol.h"
 
 namespace ns3
 {
@@ -41,6 +36,7 @@ class NetDevice;
 class Node;
 class Packet;
 class TraceContext;
+class NdiscCache;
 
 /**
  * \class Icmpv6L4Protocol

src/internet-stack/ipv4-raw-socket-factory-impl.cc

@@ -1,3 +1,23 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+
 #include "ipv4-raw-socket-factory-impl.h"
 #include "ipv4-l3-protocol.h"
 #include "ns3/socket.h"

src/internet-stack/ipv4-raw-socket-factory-impl.h

@@ -1,3 +1,23 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+
 #ifndef IPV4_RAW_SOCKET_FACTORY_IMPL_H
 #define IPV4_RAW_SOCKET_FACTORY_IMPL_H
 

src/internet-stack/ipv6-autoconfigured-prefix.cc

@@ -18,11 +18,10 @@
  * Author: Mehdi Benamor <benamor.mehdi@ensi.rnu.tn>
  */
 
-#include <stdlib.h>
 #include "ns3/log.h"
-#include "ns3/packet.h"
 #include "ns3/node.h"
 
+#include "ipv6-l3-protocol.h"
 #include "ipv6-autoconfigured-prefix.h"
 
 NS_LOG_COMPONENT_DEFINE ("Ipv6AutoconfiguredPrefix");

src/internet-stack/ipv6-autoconfigured-prefix.h

@@ -21,14 +21,14 @@
 #ifndef IPV6_AUTOCONFIGURED_PREFIX_H
 #define IPV6_AUTOCONFIGURED_PREFIX_H
 
+#include <stdint.h>
+
 #include <list>
 #include <vector>
 #include <ostream>
 
 #include "ns3/timer.h"
 #include "ns3/ipv6-address.h"
-#include "ipv6-l3-protocol.h"
-#include "ipv6-interface.h"
 
 namespace ns3
 {

src/internet-stack/ipv6-end-point.cc

@@ -18,11 +18,12 @@
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
  */
 
-#include "ipv6-end-point.h"
 #include "ns3/packet.h"
 #include "ns3/log.h"
 #include "ns3/simulator.h"
 
+#include "ipv6-end-point.h"
+
 namespace ns3
 {
 

src/internet-stack/ipv6-end-point.h

@@ -22,6 +22,7 @@
 #define IPV6_END_POINT_H
 
 #include <stdint.h>
+
 #include "ns3/ipv6-address.h"
 #include "ns3/callback.h"
 

src/internet-stack/ipv6-interface.cc

@@ -18,14 +18,16 @@
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
  */
 
+#include "ns3/log.h"
+#include "ns3/node.h"
+#include "ns3/packet.h"
+
 #include "ipv6-interface.h"
 #include "ns3/net-device.h"
 #include "loopback-net-device.h"
-#include "ns3/log.h"
-#include "ns3/node.h"
-#include <ns3/packet.h>
-
+#include "ipv6-l3-protocol.h"
 #include "icmpv6-l4-protocol.h"
+#include "ndisc-cache.h"
 
 namespace ns3
 {

src/internet-stack/ipv6-interface.h

@@ -29,14 +29,13 @@
 #include "ns3/object.h"
 #include "ns3/timer.h"
 
-#include "ndisc-cache.h"
-
 namespace ns3
 {
 
 class NetDevice;
 class Packet;
 class Node;
+class NdiscCache;
 
 /**
  * \class Ipv6Interface

src/internet-stack/ipv6-l3-protocol.cc

@@ -35,6 +35,7 @@
 #include "ipv6-raw-socket-impl.h"
 #include "ipv6-autoconfigured-prefix.h"
 #include "icmpv6-l4-protocol.h"
+#include "ndisc-cache.h"
 
 namespace ns3
 {

src/internet-stack/ipv6-l3-protocol.h

@@ -24,7 +24,6 @@
 #include <list>
 
 #include "ns3/traced-callback.h"
-
 #include "ns3/net-device.h"
 #include "ns3/ipv6.h"
 #include "ns3/ipv6-address.h"

src/internet-stack/ipv6-l4-protocol.cc

@@ -18,9 +18,10 @@
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
  */
 
-#include "ipv6-l4-protocol.h"
 #include "ns3/uinteger.h"
 
+#include "ipv6-l4-protocol.h"
+
 namespace ns3
 {
 

src/internet-stack/ipv6-l4-protocol.h

@@ -22,14 +22,14 @@
 #define IPV6_L4_PROTOCOL_H
 
 #include "ns3/object.h"
-#include "ipv6-interface.h"
+#include "ns3/ipv6-header.h"
 
 namespace ns3
 {
 
 class Packet;
 class Ipv6Address;
-class TraceContext;
+class Ipv6Interface;
 
 /**
  * \class Ipv6L4Protocol

src/internet-stack/ipv6-raw-socket-factory-impl.cc

@@ -1,6 +1,27 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+
+#include "ns3/socket.h"
+
 #include "ipv6-raw-socket-factory-impl.h"
 #include "ipv6-l3-protocol.h"
-#include "ns3/socket.h"
 
 namespace ns3
 {

src/internet-stack/ipv6-raw-socket-factory-impl.h

@@ -1,3 +1,23 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+
 #ifndef IPV6_RAW_SOCKET_FACTORY_IMPL_H
 #define IPV6_RAW_SOCKET_FACTORY_IMPL_H
 

src/internet-stack/ipv6-raw-socket-impl.cc

@@ -27,10 +27,9 @@
 #include "ns3/ipv6-routing-protocol.h"
 
 #include "ipv6-l3-protocol.h"
-
+#include "ipv6-raw-socket-impl.h"
 #include "icmpv6-header.h"
 #include "icmpv6-l4-protocol.h"
-#include "ipv6-raw-socket-impl.h"
 
 namespace ns3
 {

src/internet-stack/ipv6-test.cc

@@ -23,12 +23,14 @@
 #include "ns3/simulator.h"
 #include "ns3/test.h"
 #include "ns3/log.h"
+#include "ns3/boolean.h"
 #include "ns3/inet6-socket-address.h"
 #include "ns3/node.h"
 #include "ns3/csma-net-device.h"
 
-#include "icmpv6-l4-protocol.h"
 #include "ipv6-interface.h"
+#include "ipv6-l3-protocol.h"
+#include "icmpv6-l4-protocol.h"
 
 namespace ns3
 {

src/internet-stack/ndisc-cache.cc

@@ -23,6 +23,7 @@
 #include "ns3/node.h"
 
 #include "ipv6-l3-protocol.h" 
+#include "ipv6-interface.h"
 #include "icmpv6-l4-protocol.h"
 #include "ndisc-cache.h"
 

src/internet-stack/ndisc-cache.h

@@ -33,8 +33,6 @@
 #include "ns3/timer.h"
 #include "ns3/sgi-hashmap.h"
 
-#include "ipv6-interface.h"
-
 namespace ns3
 {
 

src/internet-stack/wscript

@@ -129,6 +129,9 @@ def build(bld):
         'icmpv4-l4-protocol.h',
         'ipv4-l4-protocol.h',
         'arp-cache.h',
+        'icmpv6-l4-protocol.h',
+        'ipv6-l4-protocol.h',
+        'ndisc-cache.h',
        ]
 
     if bld.env['NSC_ENABLED']:

src/node/inet6-socket-address.cc

@@ -18,10 +18,12 @@
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
  */
 
-#include "inet6-socket-address.h"
 #include "ns3/assert.h"
 
-namespace ns3 {
+#include "inet6-socket-address.h"
+
+namespace ns3
+{
 
 Inet6SocketAddress::Inet6SocketAddress (Ipv6Address ipv6, uint16_t port)
   : m_ipv6(ipv6),

src/node/inet6-socket-address.h

@@ -21,9 +21,10 @@
 #ifndef INET6_SOCKET_ADDRESS_H 
 #define INET6_SOCKET_ADDRESS_H
 
+#include <stdint.h>
+
 #include "address.h"
 #include "ipv6-address.h"
-#include <stdint.h>
 
 namespace ns3 {
 

src/node/ipv6-address.cc

@@ -18,14 +18,13 @@
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
  */
 
-#include <string.h>
+#include <iomanip>
 
 #include "ns3/log.h"
-#include "ipv6-address.h"
 #include "ns3/assert.h"
-#include "mac48-address.h"
 
-#include <iomanip>
+#include "mac48-address.h"
+#include "ipv6-address.h"
 
 NS_LOG_COMPONENT_DEFINE ("Ipv6Address");
 

src/node/ipv6-address.h

@@ -26,9 +26,10 @@
 
 #include <ostream>
 
-#include "address.h"
 #include "ns3/attribute-helper.h"
 
+#include "address.h"
+
 namespace ns3 { 
 
 class Ipv6Prefix;

src/node/ipv6-header.cc

@@ -21,6 +21,7 @@
 #include "ns3/assert.h"
 #include "ns3/log.h"
 #include "ns3/header.h"
+
 #include "address-utils.h"
 #include "ipv6-header.h"
 

src/node/ipv6-interface-address.cc

@@ -22,6 +22,7 @@
 
 #include "ns3/log.h"
 #include "ns3/assert.h"
+
 #include "ipv6-interface-address.h"
 
 namespace ns3

src/node/ipv6-raw-socket-factory.cc

@@ -18,9 +18,10 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "ipv6-raw-socket-factory.h"
 #include "ns3/uinteger.h"
 
+#include "ipv6-raw-socket-factory.h"
+
 namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory);

src/node/ipv6-route.cc

@@ -21,7 +21,6 @@
 #include <iostream>
 
 #include "net-device.h"
-
 #include "ipv6-route.h"
 
 namespace ns3

src/node/ipv6-route.h

@@ -26,6 +26,7 @@
 #include <ostream>
 
 #include "ns3/ref-count-base.h"
+
 #include "ipv6-address.h"
 
 namespace ns3

src/node/ipv6-routing-protocol.cc

@@ -19,6 +19,7 @@
 /* taken from src/node/ipv4-routing-protocol.cc and adapted to IPv6 */
 
 #include "ns3/assert.h"
+
 #include "ipv6-route.h"
 #include "ipv6-routing-protocol.h"
 

src/node/ipv6-routing-protocol.h

@@ -25,6 +25,7 @@
 #include "ns3/callback.h"
 #include "ns3/object.h"
 #include "ns3/socket.h"
+
 #include "ipv6-header.h"
 #include "ipv6-interface-address.h"
 #include "ipv6.h"

src/node/ipv6.cc

@@ -23,6 +23,7 @@
 #include "ns3/assert.h" 
 #include "ns3/node.h" 
 #include "ns3/boolean.h"
+
 #include "ipv6.h"
 
 namespace ns3 

src/node/ipv6.h

@@ -24,9 +24,11 @@
 #define IPV6_H
 
 #include <stdint.h>
+
 #include "ns3/object.h"
 #include "ns3/socket.h"
 #include "ns3/callback.h"
+
 #include "ipv6-address.h"
 #include "ipv6-interface-address.h"
 

src/routing/static-routing/ipv6-routing-table-entry.cc

@@ -18,9 +18,10 @@
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
  */
 
-#include "ipv6-routing-table-entry.h"
 #include "ns3/assert.h"
 
+#include "ipv6-routing-table-entry.h"
+
 namespace ns3
 {
 

src/routing/static-routing/ipv6-static-routing.h

@@ -21,9 +21,10 @@
 #ifndef IPV6_STATIC_ROUTING_H
 #define IPV6_STATIC_ROUTING_H
 
-#include <list>
 #include <stdint.h>
 
+#include <list>
+
 #include "ns3/ptr.h"
 #include "ns3/ipv6-address.h"
 #include "ns3/ipv6.h"