From afeae4240dd6a3bcda2bcdbe94cdf0e3a6278c8a Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Wed, 16 Sep 2009 18:56:29 +0200 Subject: [PATCH] Export more IPv6 includes. --- src/helper/ipv6-address-helper.h | 1 + src/helper/ipv6-interface-container.h | 2 ++ src/helper/ipv6-list-routing-helper.cc | 4 +++- src/helper/ipv6-list-routing-helper.h | 4 +++- src/helper/ipv6-routing-helper.h | 1 + src/helper/ipv6-static-routing-helper.cc | 2 ++ src/helper/ipv6-static-routing-helper.h | 3 ++- src/helper/ping6-helper.h | 6 +++-- src/internet-stack/icmpv6-header.cc | 3 ++- src/internet-stack/icmpv6-l4-protocol.cc | 9 ++++---- src/internet-stack/icmpv6-l4-protocol.h | 8 ++----- .../ipv4-raw-socket-factory-impl.cc | 20 ++++++++++++++++ .../ipv4-raw-socket-factory-impl.h | 20 ++++++++++++++++ .../ipv6-autoconfigured-prefix.cc | 3 +-- .../ipv6-autoconfigured-prefix.h | 4 ++-- src/internet-stack/ipv6-end-point.cc | 3 ++- src/internet-stack/ipv6-end-point.h | 1 + src/internet-stack/ipv6-interface.cc | 10 ++++---- src/internet-stack/ipv6-interface.h | 3 +-- src/internet-stack/ipv6-l3-protocol.cc | 1 + src/internet-stack/ipv6-l3-protocol.h | 1 - src/internet-stack/ipv6-l4-protocol.cc | 3 ++- src/internet-stack/ipv6-l4-protocol.h | 4 ++-- .../ipv6-raw-socket-factory-impl.cc | 23 ++++++++++++++++++- .../ipv6-raw-socket-factory-impl.h | 20 ++++++++++++++++ src/internet-stack/ipv6-raw-socket-impl.cc | 3 +-- src/internet-stack/ipv6-test.cc | 4 +++- src/internet-stack/ndisc-cache.cc | 1 + src/internet-stack/ndisc-cache.h | 2 -- src/internet-stack/wscript | 3 +++ src/node/inet6-socket-address.cc | 6 +++-- src/node/inet6-socket-address.h | 3 ++- src/node/ipv6-address.cc | 7 +++--- src/node/ipv6-address.h | 3 ++- src/node/ipv6-header.cc | 1 + src/node/ipv6-interface-address.cc | 1 + src/node/ipv6-raw-socket-factory.cc | 3 ++- src/node/ipv6-route.cc | 1 - src/node/ipv6-route.h | 1 + src/node/ipv6-routing-protocol.cc | 1 + src/node/ipv6-routing-protocol.h | 1 + src/node/ipv6.cc | 1 + src/node/ipv6.h | 2 ++ .../ipv6-routing-table-entry.cc | 3 ++- .../static-routing/ipv6-static-routing.h | 3 ++- 45 files changed, 159 insertions(+), 50 deletions(-) diff --git a/src/helper/ipv6-address-helper.h b/src/helper/ipv6-address-helper.h index 5f0c147db..f52788efa 100644 --- a/src/helper/ipv6-address-helper.h +++ b/src/helper/ipv6-address-helper.h @@ -24,6 +24,7 @@ #include #include "ns3/ipv6-address.h" + #include "net-device-container.h" #include "ipv6-interface-container.h" diff --git a/src/helper/ipv6-interface-container.h b/src/helper/ipv6-interface-container.h index 875aeae8a..2330722fd 100644 --- a/src/helper/ipv6-interface-container.h +++ b/src/helper/ipv6-interface-container.h @@ -22,7 +22,9 @@ #define IPV6_INTERFACE_CONTAINER_H #include + #include + #include "ns3/ipv6.h" #include "ns3/ipv6-address.h" diff --git a/src/helper/ipv6-list-routing-helper.cc b/src/helper/ipv6-list-routing-helper.cc index c62d20d58..006b63954 100644 --- a/src/helper/ipv6-list-routing-helper.cc +++ b/src/helper/ipv6-list-routing-helper.cc @@ -17,10 +17,12 @@ * * Author: Mathieu Lacage */ -#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 () diff --git a/src/helper/ipv6-list-routing-helper.h b/src/helper/ipv6-list-routing-helper.h index 5eda5d9e3..81fd725eb 100644 --- a/src/helper/ipv6-list-routing-helper.h +++ b/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 + #include +#include "ipv6-routing-helper.h" + namespace ns3 { /** diff --git a/src/helper/ipv6-routing-helper.h b/src/helper/ipv6-routing-helper.h index 2341928f4..23857c1af 100644 --- a/src/helper/ipv6-routing-helper.h +++ b/src/helper/ipv6-routing-helper.h @@ -17,6 +17,7 @@ * * Author: Mathieu Lacage */ + #ifndef IPV6_ROUTING_HELPER_H #define IPV6_ROUTING_HELPER_H diff --git a/src/helper/ipv6-static-routing-helper.cc b/src/helper/ipv6-static-routing-helper.cc index 278217691..793e2b993 100644 --- a/src/helper/ipv6-static-routing-helper.cc +++ b/src/helper/ipv6-static-routing-helper.cc @@ -17,6 +17,7 @@ */ #include + #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"); diff --git a/src/helper/ipv6-static-routing-helper.h b/src/helper/ipv6-static-routing-helper.h index 6b43fe494..5f63290c0 100644 --- a/src/helper/ipv6-static-routing-helper.h +++ b/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 { diff --git a/src/helper/ping6-helper.h b/src/helper/ping6-helper.h index e1365fbd7..c1911b916 100644 --- a/src/helper/ping6-helper.h +++ b/src/helper/ping6-helper.h @@ -22,11 +22,13 @@ #define PING6_HELPER_H #include -#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 { /** diff --git a/src/internet-stack/icmpv6-header.cc b/src/internet-stack/icmpv6-header.cc index b7e8d76d8..86ddfe0f1 100644 --- a/src/internet-stack/icmpv6-header.cc +++ b/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 { diff --git a/src/internet-stack/icmpv6-l4-protocol.cc b/src/internet-stack/icmpv6-l4-protocol.cc index 8ea3ee0f6..ee035c252 100644 --- a/src/internet-stack/icmpv6-l4-protocol.cc +++ b/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 { diff --git a/src/internet-stack/icmpv6-l4-protocol.h b/src/internet-stack/icmpv6-l4-protocol.h index d7a13b1a5..c1fb1ceab 100644 --- a/src/internet-stack/icmpv6-l4-protocol.h +++ b/src/internet-stack/icmpv6-l4-protocol.h @@ -24,15 +24,10 @@ #define ICMPV6_L4_PROTOCOL_H #include + #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 diff --git a/src/internet-stack/ipv4-raw-socket-factory-impl.cc b/src/internet-stack/ipv4-raw-socket-factory-impl.cc index 244ce7ee1..e3ea9476a 100644 --- a/src/internet-stack/ipv4-raw-socket-factory-impl.cc +++ b/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 + */ + #include "ipv4-raw-socket-factory-impl.h" #include "ipv4-l3-protocol.h" #include "ns3/socket.h" diff --git a/src/internet-stack/ipv4-raw-socket-factory-impl.h b/src/internet-stack/ipv4-raw-socket-factory-impl.h index 89f526258..d89d1412c 100644 --- a/src/internet-stack/ipv4-raw-socket-factory-impl.h +++ b/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 + */ + #ifndef IPV4_RAW_SOCKET_FACTORY_IMPL_H #define IPV4_RAW_SOCKET_FACTORY_IMPL_H diff --git a/src/internet-stack/ipv6-autoconfigured-prefix.cc b/src/internet-stack/ipv6-autoconfigured-prefix.cc index 7782a40c0..7bbe16405 100644 --- a/src/internet-stack/ipv6-autoconfigured-prefix.cc +++ b/src/internet-stack/ipv6-autoconfigured-prefix.cc @@ -18,11 +18,10 @@ * Author: Mehdi Benamor */ -#include #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"); diff --git a/src/internet-stack/ipv6-autoconfigured-prefix.h b/src/internet-stack/ipv6-autoconfigured-prefix.h index 05576e75d..2277935d1 100644 --- a/src/internet-stack/ipv6-autoconfigured-prefix.h +++ b/src/internet-stack/ipv6-autoconfigured-prefix.h @@ -21,14 +21,14 @@ #ifndef IPV6_AUTOCONFIGURED_PREFIX_H #define IPV6_AUTOCONFIGURED_PREFIX_H +#include + #include #include #include #include "ns3/timer.h" #include "ns3/ipv6-address.h" -#include "ipv6-l3-protocol.h" -#include "ipv6-interface.h" namespace ns3 { diff --git a/src/internet-stack/ipv6-end-point.cc b/src/internet-stack/ipv6-end-point.cc index 54d77c0ed..aed517411 100644 --- a/src/internet-stack/ipv6-end-point.cc +++ b/src/internet-stack/ipv6-end-point.cc @@ -18,11 +18,12 @@ * Author: Sebastien Vincent */ -#include "ipv6-end-point.h" #include "ns3/packet.h" #include "ns3/log.h" #include "ns3/simulator.h" +#include "ipv6-end-point.h" + namespace ns3 { diff --git a/src/internet-stack/ipv6-end-point.h b/src/internet-stack/ipv6-end-point.h index 98de8d4eb..148d8ab15 100644 --- a/src/internet-stack/ipv6-end-point.h +++ b/src/internet-stack/ipv6-end-point.h @@ -22,6 +22,7 @@ #define IPV6_END_POINT_H #include + #include "ns3/ipv6-address.h" #include "ns3/callback.h" diff --git a/src/internet-stack/ipv6-interface.cc b/src/internet-stack/ipv6-interface.cc index 34d0cb82e..712b33d10 100644 --- a/src/internet-stack/ipv6-interface.cc +++ b/src/internet-stack/ipv6-interface.cc @@ -18,14 +18,16 @@ * Author: Sebastien Vincent */ +#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 - +#include "ipv6-l3-protocol.h" #include "icmpv6-l4-protocol.h" +#include "ndisc-cache.h" namespace ns3 { diff --git a/src/internet-stack/ipv6-interface.h b/src/internet-stack/ipv6-interface.h index ee93ef845..e1a73ee3d 100644 --- a/src/internet-stack/ipv6-interface.h +++ b/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 diff --git a/src/internet-stack/ipv6-l3-protocol.cc b/src/internet-stack/ipv6-l3-protocol.cc index 7be86e33d..b4d9ad772 100644 --- a/src/internet-stack/ipv6-l3-protocol.cc +++ b/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 { diff --git a/src/internet-stack/ipv6-l3-protocol.h b/src/internet-stack/ipv6-l3-protocol.h index 17852e648..8d7e6e029 100644 --- a/src/internet-stack/ipv6-l3-protocol.h +++ b/src/internet-stack/ipv6-l3-protocol.h @@ -24,7 +24,6 @@ #include #include "ns3/traced-callback.h" - #include "ns3/net-device.h" #include "ns3/ipv6.h" #include "ns3/ipv6-address.h" diff --git a/src/internet-stack/ipv6-l4-protocol.cc b/src/internet-stack/ipv6-l4-protocol.cc index 91a421316..430166e77 100644 --- a/src/internet-stack/ipv6-l4-protocol.cc +++ b/src/internet-stack/ipv6-l4-protocol.cc @@ -18,9 +18,10 @@ * Author: Sebastien Vincent */ -#include "ipv6-l4-protocol.h" #include "ns3/uinteger.h" +#include "ipv6-l4-protocol.h" + namespace ns3 { diff --git a/src/internet-stack/ipv6-l4-protocol.h b/src/internet-stack/ipv6-l4-protocol.h index f743a139a..6f9f1bcc7 100644 --- a/src/internet-stack/ipv6-l4-protocol.h +++ b/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 diff --git a/src/internet-stack/ipv6-raw-socket-factory-impl.cc b/src/internet-stack/ipv6-raw-socket-factory-impl.cc index b880fb779..086a48603 100644 --- a/src/internet-stack/ipv6-raw-socket-factory-impl.cc +++ b/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 + */ + +#include "ns3/socket.h" + #include "ipv6-raw-socket-factory-impl.h" #include "ipv6-l3-protocol.h" -#include "ns3/socket.h" namespace ns3 { diff --git a/src/internet-stack/ipv6-raw-socket-factory-impl.h b/src/internet-stack/ipv6-raw-socket-factory-impl.h index 0fc03901d..91d53ed35 100644 --- a/src/internet-stack/ipv6-raw-socket-factory-impl.h +++ b/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 + */ + #ifndef IPV6_RAW_SOCKET_FACTORY_IMPL_H #define IPV6_RAW_SOCKET_FACTORY_IMPL_H diff --git a/src/internet-stack/ipv6-raw-socket-impl.cc b/src/internet-stack/ipv6-raw-socket-impl.cc index 19ee54aa3..137a7caef 100644 --- a/src/internet-stack/ipv6-raw-socket-impl.cc +++ b/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 { diff --git a/src/internet-stack/ipv6-test.cc b/src/internet-stack/ipv6-test.cc index 55e320ca6..57b5fe289 100644 --- a/src/internet-stack/ipv6-test.cc +++ b/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 { diff --git a/src/internet-stack/ndisc-cache.cc b/src/internet-stack/ndisc-cache.cc index db3405be9..0fc16d9c1 100644 --- a/src/internet-stack/ndisc-cache.cc +++ b/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" diff --git a/src/internet-stack/ndisc-cache.h b/src/internet-stack/ndisc-cache.h index 5c7c049dd..00387ade1 100644 --- a/src/internet-stack/ndisc-cache.h +++ b/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 { diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript index 1513c0bb3..b46151590 100644 --- a/src/internet-stack/wscript +++ b/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']: diff --git a/src/node/inet6-socket-address.cc b/src/node/inet6-socket-address.cc index f15d64dd4..59fdb705e 100644 --- a/src/node/inet6-socket-address.cc +++ b/src/node/inet6-socket-address.cc @@ -18,10 +18,12 @@ * Author: Sebastien Vincent */ -#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), diff --git a/src/node/inet6-socket-address.h b/src/node/inet6-socket-address.h index 3ebd41f70..0e022486b 100644 --- a/src/node/inet6-socket-address.h +++ b/src/node/inet6-socket-address.h @@ -21,9 +21,10 @@ #ifndef INET6_SOCKET_ADDRESS_H #define INET6_SOCKET_ADDRESS_H +#include + #include "address.h" #include "ipv6-address.h" -#include namespace ns3 { diff --git a/src/node/ipv6-address.cc b/src/node/ipv6-address.cc index 818cb3a16..b2c10209d 100644 --- a/src/node/ipv6-address.cc +++ b/src/node/ipv6-address.cc @@ -18,14 +18,13 @@ * Author: Sebastien Vincent */ -#include +#include #include "ns3/log.h" -#include "ipv6-address.h" #include "ns3/assert.h" -#include "mac48-address.h" -#include +#include "mac48-address.h" +#include "ipv6-address.h" NS_LOG_COMPONENT_DEFINE ("Ipv6Address"); diff --git a/src/node/ipv6-address.h b/src/node/ipv6-address.h index 1adf8b0e2..4b6f40274 100644 --- a/src/node/ipv6-address.h +++ b/src/node/ipv6-address.h @@ -26,9 +26,10 @@ #include -#include "address.h" #include "ns3/attribute-helper.h" +#include "address.h" + namespace ns3 { class Ipv6Prefix; diff --git a/src/node/ipv6-header.cc b/src/node/ipv6-header.cc index 886243d7f..2cf251b62 100644 --- a/src/node/ipv6-header.cc +++ b/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" diff --git a/src/node/ipv6-interface-address.cc b/src/node/ipv6-interface-address.cc index ee2cc45d8..90393a50b 100644 --- a/src/node/ipv6-interface-address.cc +++ b/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 diff --git a/src/node/ipv6-raw-socket-factory.cc b/src/node/ipv6-raw-socket-factory.cc index c15caf12f..529ba6088 100644 --- a/src/node/ipv6-raw-socket-factory.cc +++ b/src/node/ipv6-raw-socket-factory.cc @@ -18,9 +18,10 @@ * Author: Mathieu Lacage */ -#include "ipv6-raw-socket-factory.h" #include "ns3/uinteger.h" +#include "ipv6-raw-socket-factory.h" + namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory); diff --git a/src/node/ipv6-route.cc b/src/node/ipv6-route.cc index 8ce5fc57c..573d63452 100644 --- a/src/node/ipv6-route.cc +++ b/src/node/ipv6-route.cc @@ -21,7 +21,6 @@ #include #include "net-device.h" - #include "ipv6-route.h" namespace ns3 diff --git a/src/node/ipv6-route.h b/src/node/ipv6-route.h index 1269f1c22..7cf18807d 100644 --- a/src/node/ipv6-route.h +++ b/src/node/ipv6-route.h @@ -26,6 +26,7 @@ #include #include "ns3/ref-count-base.h" + #include "ipv6-address.h" namespace ns3 diff --git a/src/node/ipv6-routing-protocol.cc b/src/node/ipv6-routing-protocol.cc index 539b3b76b..fa33d406f 100644 --- a/src/node/ipv6-routing-protocol.cc +++ b/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" diff --git a/src/node/ipv6-routing-protocol.h b/src/node/ipv6-routing-protocol.h index 34b7627f6..6040adbdd 100644 --- a/src/node/ipv6-routing-protocol.h +++ b/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" diff --git a/src/node/ipv6.cc b/src/node/ipv6.cc index c21ef2383..b8d7266c3 100644 --- a/src/node/ipv6.cc +++ b/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 diff --git a/src/node/ipv6.h b/src/node/ipv6.h index 495bf4379..b345c6c9a 100644 --- a/src/node/ipv6.h +++ b/src/node/ipv6.h @@ -24,9 +24,11 @@ #define IPV6_H #include + #include "ns3/object.h" #include "ns3/socket.h" #include "ns3/callback.h" + #include "ipv6-address.h" #include "ipv6-interface-address.h" diff --git a/src/routing/static-routing/ipv6-routing-table-entry.cc b/src/routing/static-routing/ipv6-routing-table-entry.cc index a5c8381b4..c003021c9 100644 --- a/src/routing/static-routing/ipv6-routing-table-entry.cc +++ b/src/routing/static-routing/ipv6-routing-table-entry.cc @@ -18,9 +18,10 @@ * Author: Sebastien Vincent */ -#include "ipv6-routing-table-entry.h" #include "ns3/assert.h" +#include "ipv6-routing-table-entry.h" + namespace ns3 { diff --git a/src/routing/static-routing/ipv6-static-routing.h b/src/routing/static-routing/ipv6-static-routing.h index 363b14012..a54ce307c 100644 --- a/src/routing/static-routing/ipv6-static-routing.h +++ b/src/routing/static-routing/ipv6-static-routing.h @@ -21,9 +21,10 @@ #ifndef IPV6_STATIC_ROUTING_H #define IPV6_STATIC_ROUTING_H -#include #include +#include + #include "ns3/ptr.h" #include "ns3/ipv6-address.h" #include "ns3/ipv6.h"