Skip to content

Commit 9698dbc

Browse files
andrei-pavelRazvan Becheriu
andrei-pavel
authored and
Razvan Becheriu
committed
[#3605] Include what you use on src/bin/dhcp*/dhcp*_srv.cc
1 parent a18fa75 commit 9698dbc

File tree

2 files changed

+129
-46
lines changed

2 files changed

+129
-46
lines changed

‎src/bin/dhcp4/dhcp4_srv.cc

+64-22
Original file line numberDiff line numberDiff line change
@@ -7,71 +7,113 @@
77
#include <config.h>
88
#include <kea_version.h>
99

10+
#include <asiolink/addr_utilities.h>
11+
#include <asiolink/io_address.h>
12+
#include <asiolink/io_service.h>
1013
#include <asiolink/io_service_mgr.h>
14+
#include <cc/data.h>
1115
#include <config/http_command_mgr.h>
16+
#include <cryptolink/cryptolink.h>
17+
#include <dhcp/classify.h>
1218
#include <dhcp/dhcp4.h>
19+
#include <dhcp/docsis3_option_defs.h>
1320
#include <dhcp/duid.h>
1421
#include <dhcp/hwaddr.h>
1522
#include <dhcp/iface_mgr.h>
1623
#include <dhcp/libdhcp++.h>
24+
#include <dhcp/option.h>
1725
#include <dhcp/option4_addrlst.h>
26+
#include <dhcp/option4_client_fqdn.h>
1827
#include <dhcp/option_custom.h>
28+
#include <dhcp/option_data_types.h>
29+
#include <dhcp/option_definition.h>
1930
#include <dhcp/option_int.h>
2031
#include <dhcp/option_int_array.h>
32+
#include <dhcp/option_string.h>
2133
#include <dhcp/option_vendor.h>
2234
#include <dhcp/option_vendor_class.h>
23-
#include <dhcp/option_string.h>
35+
#include <dhcp/pkt.h>
2436
#include <dhcp/pkt4.h>
2537
#include <dhcp/pkt4o6.h>
26-
#include <dhcp/pkt6.h>
27-
#include <dhcp/docsis3_option_defs.h>
38+
#include <dhcp/socket_info.h>
39+
#include <dhcp/std_option_defs.h>
2840
#include <dhcp4/client_handler.h>
29-
#include <dhcp4/dhcp4to6_ipc.h>
3041
#include <dhcp4/dhcp4_log.h>
3142
#include <dhcp4/dhcp4_srv.h>
32-
#include <asiolink/addr_utilities.h>
33-
#include <dhcpsrv/cfgmgr.h>
43+
#include <dhcp4/dhcp4to6_ipc.h>
44+
#include <dhcp_ddns/ncr_io.h>
45+
#include <dhcp_ddns/ncr_msg.h>
46+
#include <dhcpsrv/alloc_engine.h>
47+
#include <dhcpsrv/callout_handle_store.h>
48+
#include <dhcpsrv/cb_ctl_dhcp4.h>
49+
#include <dhcpsrv/cfg_expiration.h>
50+
#include <dhcpsrv/cfg_globals.h>
3451
#include <dhcpsrv/cfg_host_operations.h>
3552
#include <dhcpsrv/cfg_iface.h>
53+
#include <dhcpsrv/cfg_option.h>
3654
#include <dhcpsrv/cfg_shared_networks.h>
3755
#include <dhcpsrv/cfg_subnets4.h>
56+
#include <dhcpsrv/cfgmgr.h>
57+
#include <dhcpsrv/client_class_def.h>
58+
#include <dhcpsrv/d2_client_cfg.h>
59+
#include <dhcpsrv/d2_client_mgr.h>
3860
#include <dhcpsrv/dhcpsrv_exceptions.h>
61+
#include <dhcpsrv/host.h>
3962
#include <dhcpsrv/host_data_source_factory.h>
4063
#include <dhcpsrv/host_mgr.h>
41-
#include <dhcpsrv/lease_mgr.h>
64+
#include <dhcpsrv/lease.h>
4265
#include <dhcpsrv/lease_mgr_factory.h>
4366
#include <dhcpsrv/ncr_generator.h>
67+
#include <dhcpsrv/network_state.h>
4468
#include <dhcpsrv/packet_fuzzer.h>
69+
#include <dhcpsrv/pool.h>
4570
#include <dhcpsrv/resource_handler.h>
4671
#include <dhcpsrv/shared_network.h>
72+
#include <dhcpsrv/srv_config.h>
4773
#include <dhcpsrv/subnet.h>
74+
#include <dhcpsrv/subnet_id.h>
4875
#include <dhcpsrv/subnet_selector.h>
4976
#include <dhcpsrv/utils.h>
5077
#include <eval/evaluate.h>
51-
#include <eval/eval_messages.h>
78+
#include <eval/token.h>
79+
#include <exceptions/exceptions.h>
5280
#include <hooks/callout_handle.h>
5381
#include <hooks/hooks_log.h>
5482
#include <hooks/hooks_manager.h>
55-
#include <stats/stats_mgr.h>
56-
#include <util/encode/encode.h>
57-
#include <util/str.h>
58-
#include <log/interprocess/interprocess_sync_file.h>
83+
#include <hooks/parking_lots.h>
84+
#include <hooks/server_hooks.h>
85+
#include <log/log_dbglevels.h>
86+
#include <log/log_formatter.h>
5987
#include <log/logger.h>
60-
#include <cryptolink/cryptolink.h>
61-
#include <process/cfgrpt/config_report.h>
88+
#include <log/macros.h>
89+
#include <stats/stats_mgr.h>
90+
#include <util/multi_threading_mgr.h>
91+
#include <util/optional.h>
92+
#include <util/readwrite_mutex.h>
93+
#include <util/thread_pool.h>
94+
#include <util/triplet.h>
95+
96+
#include <algorithm>
97+
#include <cmath>
98+
#include <cstdint>
99+
#include <cstdlib>
100+
#include <exception>
101+
#include <functional>
102+
#include <list>
103+
#include <map>
104+
#include <memory>
105+
#include <set>
106+
#include <sstream>
107+
#include <string>
108+
#include <tuple>
109+
#include <utility>
110+
#include <vector>
62111

63-
#include <boost/algorithm/string.hpp>
64112
#include <boost/foreach.hpp>
65-
#include <boost/range/adaptor/reversed.hpp>
66113
#include <boost/pointer_cast.hpp>
114+
#include <boost/range/adaptor/reversed.hpp>
67115
#include <boost/shared_ptr.hpp>
68116

69-
70-
#include <functional>
71-
#include <iomanip>
72-
#include <set>
73-
#include <cstdlib>
74-
75117
using namespace isc;
76118
using namespace isc::asiolink;
77119
using namespace isc::cryptolink;

‎src/bin/dhcp6/dhcp6_srv.cc

+65-24
Original file line numberDiff line numberDiff line change
@@ -8,72 +8,113 @@
88
#include <kea_version.h>
99

1010
#include <asiolink/io_address.h>
11+
#include <asiolink/io_service.h>
1112
#include <asiolink/io_service_mgr.h>
13+
#include <cc/data.h>
1214
#include <config/http_command_mgr.h>
13-
#include <dhcp_ddns/ncr_msg.h>
15+
#include <cryptolink/cryptolink.h>
16+
#include <dhcp/classify.h>
1417
#include <dhcp/dhcp6.h>
1518
#include <dhcp/docsis3_option_defs.h>
1619
#include <dhcp/duid.h>
1720
#include <dhcp/duid_factory.h>
21+
#include <dhcp/hwaddr.h>
1822
#include <dhcp/iface_mgr.h>
1923
#include <dhcp/libdhcp++.h>
20-
#include <dhcp/option6_addrlst.h>
24+
#include <dhcp/opaque_data_tuple.h>
25+
#include <dhcp/option.h>
2126
#include <dhcp/option6_client_fqdn.h>
2227
#include <dhcp/option6_ia.h>
2328
#include <dhcp/option6_iaaddr.h>
2429
#include <dhcp/option6_iaprefix.h>
2530
#include <dhcp/option6_status_code.h>
26-
#include <dhcp/option6_pdexclude.h>
27-
#include <dhcp/option_custom.h>
31+
#include <dhcp/option_int_array.h>
2832
#include <dhcp/option_vendor.h>
2933
#include <dhcp/option_vendor_class.h>
30-
#include <dhcp/option_int_array.h>
34+
#include <dhcp/pkt.h>
3135
#include <dhcp/pkt6.h>
36+
#include <dhcp/std_option_defs.h>
3237
#include <dhcp6/client_handler.h>
33-
#include <dhcp6/dhcp6to4_ipc.h>
3438
#include <dhcp6/dhcp6_log.h>
3539
#include <dhcp6/dhcp6_srv.h>
40+
#include <dhcp6/dhcp6to4_ipc.h>
41+
#include <dhcp_ddns/ncr_io.h>
42+
#include <dhcp_ddns/ncr_msg.h>
43+
#include <dhcpsrv/alloc_engine.h>
44+
#include <dhcpsrv/callout_handle_store.h>
45+
#include <dhcpsrv/cb_ctl_dhcp6.h>
46+
#include <dhcpsrv/cfg_expiration.h>
47+
#include <dhcpsrv/cfg_globals.h>
3648
#include <dhcpsrv/cfg_host_operations.h>
49+
#include <dhcpsrv/cfg_mac_source.h>
50+
#include <dhcpsrv/cfg_option.h>
51+
#include <dhcpsrv/cfg_shared_networks.h>
52+
#include <dhcpsrv/cfg_rsoo.h>
53+
#include <dhcpsrv/cfg_subnets6.h>
3754
#include <dhcpsrv/cfgmgr.h>
55+
#include <dhcpsrv/client_class_def.h>
56+
#include <dhcpsrv/d2_client_cfg.h>
57+
#include <dhcpsrv/d2_client_mgr.h>
58+
#include <dhcpsrv/host.h>
3859
#include <dhcpsrv/host_data_source_factory.h>
3960
#include <dhcpsrv/host_mgr.h>
40-
#include <dhcpsrv/lease_mgr.h>
61+
#include <dhcpsrv/lease.h>
4162
#include <dhcpsrv/lease_mgr_factory.h>
4263
#include <dhcpsrv/ncr_generator.h>
64+
#include <dhcpsrv/network_state.h>
4365
#include <dhcpsrv/packet_fuzzer.h>
66+
#include <dhcpsrv/pool.h>
67+
#include <dhcpsrv/resource_handler.h>
68+
#include <dhcpsrv/shared_network.h>
69+
#include <dhcpsrv/srv_config.h>
4470
#include <dhcpsrv/subnet.h>
71+
#include <dhcpsrv/subnet_id.h>
4572
#include <dhcpsrv/subnet_selector.h>
4673
#include <dhcpsrv/utils.h>
4774
#include <eval/evaluate.h>
48-
#include <eval/eval_messages.h>
75+
#include <eval/token.h>
4976
#include <exceptions/exceptions.h>
5077
#include <hooks/callout_handle.h>
5178
#include <hooks/hooks_log.h>
5279
#include <hooks/hooks_manager.h>
80+
#include <hooks/parking_lots.h>
81+
#include <hooks/server_hooks.h>
82+
#include <log/log_dbglevels.h>
83+
#include <log/log_formatter.h>
84+
#include <log/logger.h>
85+
#include <log/macros.h>
5386
#include <stats/stats_mgr.h>
54-
#include <util/encode/encode.h>
87+
#include <util/buffer.h>
88+
#include <util/multi_threading_mgr.h>
89+
#include <util/optional.h>
5590
#include <util/pointer_util.h>
56-
#include <util/range_utilities.h>
57-
#include <log/interprocess/interprocess_sync_file.h>
58-
#include <log/logger.h>
59-
#include <cryptolink/cryptolink.h>
60-
#include <process/cfgrpt/config_report.h>
61-
62-
#include <boost/tokenizer.hpp>
63-
#include <boost/foreach.hpp>
64-
#include <boost/algorithm/string/erase.hpp>
65-
#include <boost/algorithm/string/join.hpp>
66-
#include <boost/algorithm/string/split.hpp>
91+
#include <util/readwrite_mutex.h>
92+
#include <util/thread_pool.h>
93+
#include <util/triplet.h>
6794

6895
#include <algorithm>
96+
#include <cmath>
97+
#include <cstdint>
98+
#include <cstdlib>
99+
#include <exception>
69100
#include <functional>
70-
#include <stdlib.h>
71-
#include <time.h>
72101
#include <iomanip>
73-
#include <fstream>
74-
#include <sstream>
102+
#include <limits>
103+
#include <list>
75104
#include <map>
105+
#include <memory>
76106
#include <set>
107+
#include <sstream>
108+
#include <string>
109+
#include <tuple>
110+
#include <utility>
111+
#include <vector>
112+
113+
#include <boost/algorithm/string/erase.hpp>
114+
#include <boost/algorithm/string/join.hpp>
115+
#include <boost/algorithm/string/split.hpp>
116+
#include <boost/foreach.hpp>
117+
#include <boost/tokenizer.hpp>
77118

78119
using namespace isc;
79120
using namespace isc::asiolink;

0 commit comments

Comments
 (0)