Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
446
Issues
446
List
Boards
Labels
Service Desk
Milestones
Merge Requests
71
Merge Requests
71
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
3ba0299a
Commit
3ba0299a
authored
Nov 16, 2012
by
Stephen Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[2475] Put #include directives in correct order
Also fix some issues from the review.
parent
d2551c3b
Changes
71
Hide whitespace changes
Inline
Side-by-side
Showing
71 changed files
with
350 additions
and
268 deletions
+350
-268
src/bin/dhcp4/ctrl_dhcp4_srv.cc
src/bin/dhcp4/ctrl_dhcp4_srv.cc
+4
-5
src/bin/dhcp4/ctrl_dhcp4_srv.h
src/bin/dhcp4/ctrl_dhcp4_srv.h
+2
-2
src/bin/dhcp4/dhcp4_log.cc
src/bin/dhcp4/dhcp4_log.cc
+1
-1
src/bin/dhcp4/dhcp4_log.h
src/bin/dhcp4/dhcp4_log.h
+1
-1
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp4/dhcp4_srv.cc
+4
-4
src/bin/dhcp4/dhcp4_srv.h
src/bin/dhcp4/dhcp4_srv.h
+3
-1
src/bin/dhcp4/main.cc
src/bin/dhcp4/main.cc
+4
-3
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+8
-6
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+9
-7
src/bin/dhcp4/tests/dhcp4_unittests.cc
src/bin/dhcp4/tests/dhcp4_unittests.cc
+2
-2
src/bin/dhcp6/config_parser.h
src/bin/dhcp6/config_parser.h
+5
-4
src/bin/dhcp6/ctrl_dhcp6_srv.cc
src/bin/dhcp6/ctrl_dhcp6_srv.cc
+5
-5
src/bin/dhcp6/ctrl_dhcp6_srv.h
src/bin/dhcp6/ctrl_dhcp6_srv.h
+2
-2
src/bin/dhcp6/dhcp6_log.cc
src/bin/dhcp6/dhcp6_log.cc
+1
-1
src/bin/dhcp6/dhcp6_log.h
src/bin/dhcp6/dhcp6_log.h
+2
-2
src/bin/dhcp6/dhcp6_srv.h
src/bin/dhcp6/dhcp6_srv.h
+2
-3
src/bin/dhcp6/main.cc
src/bin/dhcp6/main.cc
+4
-3
src/bin/dhcp6/tests/config_parser_unittest.cc
src/bin/dhcp6/tests/config_parser_unittest.cc
+1
-1
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+1
-1
src/lib/dhcp/duid.cc
src/lib/dhcp/duid.cc
+6
-4
src/lib/dhcp/duid.h
src/lib/dhcp/duid.h
+2
-0
src/lib/dhcp/iface_mgr.cc
src/lib/dhcp/iface_mgr.cc
+13
-8
src/lib/dhcp/iface_mgr.h
src/lib/dhcp/iface_mgr.h
+7
-5
src/lib/dhcp/iface_mgr_linux.cc
src/lib/dhcp/iface_mgr_linux.cc
+5
-6
src/lib/dhcp/libdhcp++.cc
src/lib/dhcp/libdhcp++.cc
+9
-7
src/lib/dhcp/libdhcp++.h
src/lib/dhcp/libdhcp++.h
+4
-3
src/lib/dhcp/option.cc
src/lib/dhcp/option.cc
+9
-8
src/lib/dhcp/option.h
src/lib/dhcp/option.h
+8
-6
src/lib/dhcp/option4_addrlst.cc
src/lib/dhcp/option4_addrlst.cc
+9
-7
src/lib/dhcp/option4_addrlst.h
src/lib/dhcp/option4_addrlst.h
+11
-9
src/lib/dhcp/option6_addrlst.cc
src/lib/dhcp/option6_addrlst.cc
+9
-8
src/lib/dhcp/option6_addrlst.h
src/lib/dhcp/option6_addrlst.h
+5
-4
src/lib/dhcp/option6_ia.cc
src/lib/dhcp/option6_ia.cc
+6
-6
src/lib/dhcp/option6_ia.h
src/lib/dhcp/option6_ia.h
+5
-4
src/lib/dhcp/option6_iaaddr.cc
src/lib/dhcp/option6_iaaddr.cc
+9
-8
src/lib/dhcp/option6_iaaddr.h
src/lib/dhcp/option6_iaaddr.h
+5
-5
src/lib/dhcp/option6_int.h
src/lib/dhcp/option6_int.h
+3
-3
src/lib/dhcp/option6_int_array.h
src/lib/dhcp/option6_int_array.h
+3
-3
src/lib/dhcp/option_data_types.h
src/lib/dhcp/option_data_types.h
+3
-3
src/lib/dhcp/option_definition.cc
src/lib/dhcp/option_definition.cc
+1
-1
src/lib/dhcp/option_definition.h
src/lib/dhcp/option_definition.h
+8
-7
src/lib/dhcp/pkt4.cc
src/lib/dhcp/pkt4.cc
+4
-3
src/lib/dhcp/pkt4.h
src/lib/dhcp/pkt4.h
+9
-6
src/lib/dhcp/pkt6.cc
src/lib/dhcp/pkt6.cc
+2
-2
src/lib/dhcp/pkt6.h
src/lib/dhcp/pkt6.h
+8
-5
src/lib/dhcp/tests/duid_unittest.cc
src/lib/dhcp/tests/duid_unittest.cc
+9
-5
src/lib/dhcp/tests/iface_mgr_unittest.cc
src/lib/dhcp/tests/iface_mgr_unittest.cc
+11
-9
src/lib/dhcp/tests/libdhcp++_unittest.cc
src/lib/dhcp/tests/libdhcp++_unittest.cc
+10
-7
src/lib/dhcp/tests/option4_addrlst_unittest.cc
src/lib/dhcp/tests/option4_addrlst_unittest.cc
+8
-4
src/lib/dhcp/tests/option6_addrlst_unittest.cc
src/lib/dhcp/tests/option6_addrlst_unittest.cc
+8
-4
src/lib/dhcp/tests/option6_ia_unittest.cc
src/lib/dhcp/tests/option6_ia_unittest.cc
+7
-5
src/lib/dhcp/tests/option6_iaaddr_unittest.cc
src/lib/dhcp/tests/option6_iaaddr_unittest.cc
+7
-5
src/lib/dhcp/tests/option6_int_array_unittest.cc
src/lib/dhcp/tests/option6_int_array_unittest.cc
+2
-1
src/lib/dhcp/tests/option6_int_unittest.cc
src/lib/dhcp/tests/option6_int_unittest.cc
+2
-1
src/lib/dhcp/tests/option_definition_unittest.cc
src/lib/dhcp/tests/option_definition_unittest.cc
+3
-3
src/lib/dhcp/tests/option_unittest.cc
src/lib/dhcp/tests/option_unittest.cc
+9
-7
src/lib/dhcp/tests/pkt4_unittest.cc
src/lib/dhcp/tests/pkt4_unittest.cc
+13
-9
src/lib/dhcp/tests/pkt6_unittest.cc
src/lib/dhcp/tests/pkt6_unittest.cc
+9
-6
src/lib/dhcp/tests/run_unittests.cc
src/lib/dhcp/tests/run_unittests.cc
+2
-1
src/lib/dhcpsrv/alloc_engine.cc
src/lib/dhcpsrv/alloc_engine.cc
+1
-0
src/lib/dhcpsrv/mysql_lease_mgr.h
src/lib/dhcpsrv/mysql_lease_mgr.h
+1
-1
src/lib/dhcpsrv/tests/addr_utilities_unittest.cc
src/lib/dhcpsrv/tests/addr_utilities_unittest.cc
+6
-4
src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
+1
-2
src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
+3
-1
src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc
src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc
+2
-1
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
+2
-1
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+2
-1
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
+3
-2
src/lib/dhcpsrv/tests/pool_unittest.cc
src/lib/dhcpsrv/tests/pool_unittest.cc
+2
-1
src/lib/dhcpsrv/tests/run_unittests.cc
src/lib/dhcpsrv/tests/run_unittests.cc
+1
-1
src/lib/dhcpsrv/tests/triplet_unittest.cc
src/lib/dhcpsrv/tests/triplet_unittest.cc
+2
-1
No files found.
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View file @
3ba0299a
...
...
@@ -14,21 +14,20 @@
#include <config.h>
#include <cassert>
#include <iostream>
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <cc/session.h>
#include <config/ccsession.h>
#include <dhcp/iface_mgr.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <dhcp4/dhcp4_log.h>
#include <dhcp4/spec_config.h>
#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
#include <util/buffer.h>
#include <cassert>
#include <iostream>
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
cc
;
using
namespace
isc
::
config
;
...
...
src/bin/dhcp4/ctrl_dhcp4_srv.h
View file @
3ba0299a
...
...
@@ -15,11 +15,11 @@
#ifndef CTRL_DHCPV4_SRV_H
#define CTRL_DHCPV4_SRV_H
#include <dhcp4/dhcp4_srv.h>
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
#include <
cc/data
.h>
#include <
dhcp4/dhcp4_srv
.h>
namespace
isc
{
namespace
dhcp
{
...
...
src/bin/dhcp4/dhcp4_log.cc
View file @
3ba0299a
...
...
@@ -14,7 +14,7 @@
/// Defines the logger used by the top-level component of b10-dhcp4.
#include
"dhcp4_log.h"
#include
<dhcp4/dhcp4_log.h>
namespace
isc
{
namespace
dhcp
{
...
...
src/bin/dhcp4/dhcp4_log.h
View file @
3ba0299a
...
...
@@ -15,8 +15,8 @@
#ifndef DHCP4_LOG_H
#define DHCP4_LOG_H
#include <log/macros.h>
#include <log/logger_support.h>
#include <log/macros.h>
#include <dhcp4/dhcp4_messages.h>
namespace
isc
{
...
...
src/bin/dhcp4/dhcp4_srv.cc
View file @
3ba0299a
...
...
@@ -12,13 +12,13 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <asiolink/io_address.h>
#include <dhcp/dhcp4.h>
#include <dhcp/pkt4.h>
#include <dhcp/iface_mgr.h>
#include <dhcp4/dhcp4_srv.h>
#include <dhcp4/dhcp4_log.h>
#include <asiolink/io_address.h>
#include <dhcp/option4_addrlst.h>
#include <dhcp/pkt4.h>
#include <dhcp4/dhcp4_log.h>
#include <dhcp4/dhcp4_srv.h>
using
namespace
isc
;
using
namespace
isc
::
asiolink
;
...
...
src/bin/dhcp4/dhcp4_srv.h
View file @
3ba0299a
...
...
@@ -15,10 +15,12 @@
#ifndef DHCPV4_SRV_H
#define DHCPV4_SRV_H
#include <boost/noncopyable.hpp>
#include <dhcp/dhcp4.h>
#include <dhcp/pkt4.h>
#include <dhcp/option.h>
#include <boost/noncopyable.hpp>
#include <iostream>
namespace
isc
{
...
...
src/bin/dhcp4/main.cc
View file @
3ba0299a
...
...
@@ -13,14 +13,15 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#include <iostream>
#include <boost/lexical_cast.hpp>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <dhcp4/dhcp4_log.h>
#include <log/logger_support.h>
#include <boost/lexical_cast.hpp>
#include <iostream>
using
namespace
isc
::
dhcp
;
using
namespace
std
;
...
...
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
View file @
3ba0299a
...
...
@@ -13,16 +13,18 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#include <iostream>
#include <config/ccsession.h>
#include <dhcp/dhcp4.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <gtest/gtest.h>
#include <fstream>
#include <iostream>
#include <sstream>
#include <arpa/inet.h>
#include <gtest/gtest.h>
#include <dhcp/dhcp4.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <config/ccsession.h>
using
namespace
std
;
using
namespace
isc
;
...
...
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
View file @
3ba0299a
...
...
@@ -13,17 +13,19 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#include <iostream>
#include <fstream>
#include <sstream>
#include <arpa/inet.h>
#include <gtest/gtest.h>
#include <asiolink/io_address.h>
#include <dhcp/dhcp4.h>
#include <dhcp4/dhcp4_srv.h>
#include <dhcp/option.h>
#include <asiolink/io_address.h>
#include <dhcp4/dhcp4_srv.h>
#include <gtest/gtest.h>
#include <fstream>
#include <iostream>
#include <arpa/inet.h>
using
namespace
std
;
using
namespace
isc
;
...
...
src/bin/dhcp4/tests/dhcp4_unittests.cc
View file @
3ba0299a
...
...
@@ -12,10 +12,10 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <gtest/gtest.h>
#include <log/logger_support.h>
#include <gtest/gtest.h>
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
src/bin/dhcp6/config_parser.h
View file @
3ba0299a
...
...
@@ -12,13 +12,14 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <string>
#include <exceptions/exceptions.h>
#include <cc/data.h>
#ifndef DHCP6_CONFIG_PARSER_H
#define DHCP6_CONFIG_PARSER_H
#include <cc/data.h>
#include <exceptions/exceptions.h>
#include <string>
namespace
isc
{
namespace
dhcp
{
...
...
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View file @
3ba0299a
...
...
@@ -14,22 +14,22 @@
#include <config.h>
#include <cassert>
#include <iostream>
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <cc/session.h>
#include <config/ccsession.h>
#include <dhcp/iface_mgr.h>
#include <dhcp6/config_parser.h>
#include <dhcp6/ctrl_dhcp6_srv.h>
#include <dhcp6/dhcp6_log.h>
#include <dhcp6/spec_config.h>
#include <dhcp6/config_parser.h>
#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
#include <util/buffer.h>
#include <cassert>
#include <iostream>
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
cc
;
using
namespace
isc
::
config
;
...
...
src/bin/dhcp6/ctrl_dhcp6_srv.h
View file @
3ba0299a
...
...
@@ -15,11 +15,11 @@
#ifndef CTRL_DHCPV6_SRV_H
#define CTRL_DHCPV6_SRV_H
#include <dhcp6/dhcp6_srv.h>
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
#include <
cc/data
.h>
#include <
dhcp6/dhcp6_srv
.h>
namespace
isc
{
namespace
dhcp
{
...
...
src/bin/dhcp6/dhcp6_log.cc
View file @
3ba0299a
...
...
@@ -14,7 +14,7 @@
/// Defines the logger used by the top-level component of b10-dhcp6.
#include
"dhcp6_log.h"
#include
<dhcp6/dhcp6_log.h>
namespace
isc
{
namespace
dhcp
{
...
...
src/bin/dhcp6/dhcp6_log.h
View file @
3ba0299a
...
...
@@ -15,9 +15,9 @@
#ifndef DHCP6_LOG_H
#define DHCP6_LOG_H
#include <log/macros.h>
#include <log/logger_support.h>
#include <dhcp6/dhcp6_messages.h>
#include <log/logger_support.h>
#include <log/macros.h>
namespace
isc
{
namespace
dhcp
{
...
...
src/bin/dhcp6/dhcp6_srv.h
View file @
3ba0299a
...
...
@@ -15,8 +15,6 @@
#ifndef DHCPV6_SRV_H
#define DHCPV6_SRV_H
#include <iostream>
#include <dhcp/dhcp6.h>
#include <dhcp/duid.h>
#include <dhcp/option.h>
...
...
@@ -28,8 +26,9 @@
#include <boost/noncopyable.hpp>
namespace
isc
{
#include <iostream>
namespace
isc
{
namespace
dhcp
{
/// @brief DHCPv6 server service.
///
...
...
src/bin/dhcp6/main.cc
View file @
3ba0299a
...
...
@@ -13,14 +13,15 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#include <iostream>
#include <boost/lexical_cast.hpp>
#include <dhcp6/ctrl_dhcp6_srv.h>
#include <dhcp6/dhcp6_log.h>
#include <log/logger_support.h>
#include <boost/lexical_cast.hpp>
#include <iostream>
using
namespace
isc
::
dhcp
;
using
namespace
std
;
...
...
src/bin/dhcp6/tests/config_parser_unittest.cc
View file @
3ba0299a
...
...
@@ -23,13 +23,13 @@
#include <dhcpsrv/subnet.h>
#include <boost/foreach.hpp>
#include <gtest/gtest.h>
#include <fstream>
#include <iostream>
#include <sstream>
#include <arpa/inet.h>
#include <gtest/gtest.h>
using
namespace
std
;
using
namespace
isc
;
...
...
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
View file @
3ba0299a
...
...
@@ -15,7 +15,6 @@
#include <config.h>
#include <asiolink/io_address.h>
#include <boost/scoped_ptr.hpp>
#include <config/ccsession.h>
#include <dhcp/dhcp6.h>
#include <dhcp/duid.h>
...
...
@@ -32,6 +31,7 @@
#include <util/buffer.h>
#include <util/range_utilities.h>
#include <boost/scoped_ptr.hpp>
#include <gtest/gtest.h>
#include <fstream>
...
...
src/lib/dhcp/duid.cc
View file @
3ba0299a
...
...
@@ -12,13 +12,15 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <dhcp/duid.h>
#include <exceptions/exceptions.h>
#include <stdint.h>
#include <util/io_utilities.h>
#include <dhcp/duid.h>
#include <vector>
#include <sstream>
#include <iomanip>
#include <sstream>
#include <vector>
#include <stdint.h>
namespace
isc
{
namespace
dhcp
{
...
...
src/lib/dhcp/duid.h
View file @
3ba0299a
...
...
@@ -16,7 +16,9 @@
#define DUID_H
#include <asiolink/io_address.h>
#include <vector>
#include <stdint.h>
#include <unistd.h>
...
...
src/lib/dhcp/iface_mgr.cc
View file @
3ba0299a
...
...
@@ -13,22 +13,27 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#include <sstream>
#include <fstream>
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/select.h>
// This must be included before udp_endpoint.h
#include <asio.hpp>
#include <asiolink/io_error.h>
#include <asiolink/udp_endpoint.h>
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
#include <asiolink/udp_endpoint.h>
#include <asiolink/io_error.h>
#include <util/io/pktinfo_utilities.h>
#include <fstream>
#include <sstream>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <string.h>
#include <sys/select.h>
using
namespace
std
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
util
::
io
::
internal
;
...
...
src/lib/dhcp/iface_mgr.h
View file @
3ba0299a
...
...
@@ -15,16 +15,18 @@
#ifndef IFACE_MGR_H
#define IFACE_MGR_H
#include <list>
#include <boost/shared_ptr.hpp>
#include <boost/scoped_array.hpp>
#include <boost/noncopyable.hpp>
#include <asiolink/io_address.h>
#include <dhcp/dhcp6.h>
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
#include <dhcp/pkt4.h>
#include <dhcp/pkt6.h>
#include <boost/noncopyable.hpp>
#include <boost/scoped_array.hpp>
#include <boost/shared_ptr.hpp>
#include <list>
namespace
isc
{
namespace
dhcp
{
...
...
src/lib/dhcp/iface_mgr_linux.cc
View file @
3ba0299a
...
...
@@ -31,18 +31,17 @@
#if defined(OS_LINUX)
#include <asiolink/io_address.h>
#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
#include <util/io/sockaddr_util.h>
#include <boost/array.hpp>
#include <boost/static_assert.hpp>
#include <stdint.h>
#include <net/if.h>
#include <linux/rtnetlink.h>
#include <boost/array.hpp>
#include <boost/static_assert.hpp>
#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
#include <asiolink/io_address.h>
#include <util/io/sockaddr_util.h>
using
namespace
std
;
using
namespace
isc
;
...
...
src/lib/dhcp/libdhcp++.cc
View file @
3ba0299a
...
...
@@ -12,19 +12,21 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <boost/shared_array.hpp>
#include <boost/shared_ptr.hpp>
#include <util/buffer.h>
#include <exceptions/exceptions.h>
#include <dhcp/libdhcp++.h>
#include "config.h"
#include <config.h>
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option.h>
#include <dhcp/option6_ia.h>
#include <dhcp/option6_iaaddr.h>
#include <dhcp/option_definition.h>
#include <dhcp/option6_int_array.h>
#include <dhcp/option_definition.h>
#include <exceptions/exceptions.h>
#include <util/buffer.h>
#include <boost/shared_array.hpp>
#include <boost/shared_ptr.hpp>
using
namespace
std
;
using
namespace
isc
::
dhcp
;
...
...
src/lib/dhcp/libdhcp++.h
View file @
3ba0299a
...
...
@@ -12,12 +12,13 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef LIBDHCP_H
_
#define LIBDHCP_H
_
#ifndef LIBDHCP_H
#define LIBDHCP_H
#include <dhcp/option_definition.h>
#include <dhcp/pkt6.h>
#include <util/buffer.h>
#include <iostream>
namespace
isc
{
...
...
@@ -164,4 +165,4 @@ private:
}
}
#endif
#endif
// LIBDHCP_H
src/lib/dhcp/option.cc
View file @
3ba0299a
...
...
@@ -12,16 +12,17 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <string.h>
#include <stdint.h>
#include <arpa/inet.h>
#include <sstream>
#include <dhcp/libdhcp++.h>
#include <dhcp/option.h>
#include <exceptions/exceptions.h>
#include <util/io_utilities.h>
#include <iomanip>
#include "exceptions/exceptions.h"
#include "util/io_utilities.h"
#include <sstream>
#include "dhcp/option.h"
#include "dhcp/libdhcp++.h"
#include <arpa/inet.h>
#include <stdint.h>
#include <string.h>
using
namespace
std
;
using
namespace
isc
::
util
;
...
...
src/lib/dhcp/option.h
View file @
3ba0299a
...
...
@@ -12,14 +12,16 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef OPTION_H_
#define OPTION_H_
#ifndef OPTION_H
#define OPTION_H
#include <util/buffer.h>
#include <boost/shared_ptr.hpp>
#include <string>
#include <map>
#include <string>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <util/buffer.h>
namespace
isc
{
namespace
dhcp
{
...
...
@@ -329,4 +331,4 @@ protected:
}
// namespace isc::dhcp
}
// namespace isc
#endif
#endif
// OPTION_H
src/lib/dhcp/option4_addrlst.cc
View file @
3ba0299a
...
...
@@ -12,15 +12,17 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <string.h>
#include <stdint.h>
#include <arpa/inet.h>
#include <sstream>
#include <iomanip>
#include <exceptions/exceptions.h>
#include <asiolink/io_address.h>
#include <util/io_utilities.h>
#include <dhcp/option4_addrlst.h>
#include <exceptions/exceptions.h>
#include <util/io_utilities.h>
#include <iomanip>
#include <sstream>
#include <arpa/inet.h>
#include <stdint.h>
#include <string.h>
using
namespace
std
;
using
namespace
isc
::
util
;
...
...
src/lib/dhcp/option4_addrlst.h
View file @
3ba0299a
...
...
@@ -12,17 +12,19 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef OPTION4_ADDRLST_H
_
#define OPTION4_ADDRLST_H
_
#ifndef OPTION4_ADDRLST_H
#define OPTION4_ADDRLST_H
#include <string>
#include <map>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/shared_array.hpp>
#include <asiolink/io_address.h>
#include <util/buffer.h>
#include <dhcp/option.h>
#include <util/buffer.h>
#include <boost/shared_array.hpp>
#include <boost/shared_ptr.hpp>
#include <map>
#include <string>
#include <vector>
namespace
isc
{
namespace
dhcp
{
...
...
@@ -162,4 +164,4 @@ protected:
}
// namespace isc::dhcp
}
// namespace isc