From a6817528bc237970bca4d0351195151552f01db6 Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Thu, 21 Sep 2017 20:48:57 -0700 Subject: [PATCH] Use absolute include paths Fixes #250 --- include/tins/address_range.h | 6 +- include/tins/arp.h | 10 +-- include/tins/bootp.h | 10 +-- include/tins/crypto.h | 6 +- include/tins/cxxstd.h | 2 +- include/tins/detail/address_helpers.h | 2 +- include/tins/detail/pdu_helpers.h | 6 +- include/tins/detail/smart_ptr.h | 2 +- include/tins/detail/type_traits.h | 2 +- include/tins/dhcp.h | 8 +- include/tins/dhcpv6.h | 12 +-- include/tins/dns.h | 6 +- include/tins/dot11.h | 18 ++--- include/tins/dot11/dot11_assoc.h | 6 +- include/tins/dot11/dot11_auth.h | 6 +- include/tins/dot11/dot11_base.h | 16 ++-- include/tins/dot11/dot11_beacon.h | 6 +- include/tins/dot11/dot11_control.h | 6 +- include/tins/dot11/dot11_data.h | 6 +- include/tins/dot11/dot11_mgmt.h | 6 +- include/tins/dot11/dot11_probe.h | 6 +- include/tins/dot1q.h | 8 +- include/tins/dot3.h | 10 +-- include/tins/eapol.h | 8 +- include/tins/endianness.h | 2 +- include/tins/ethernetII.h | 10 +-- include/tins/handshake_capturer.h | 8 +- include/tins/hw_address.h | 4 +- include/tins/icmp.h | 10 +-- include/tins/icmp_extension.h | 6 +- include/tins/icmpv6.h | 20 ++--- include/tins/ieee802_3.h | 2 +- include/tins/internals.h | 12 +-- include/tins/ip.h | 14 ++-- include/tins/ip_address.h | 4 +- include/tins/ip_reassembler.h | 8 +- include/tins/ipsec.h | 8 +- include/tins/ipv6.h | 14 ++-- include/tins/ipv6_address.h | 4 +- include/tins/llc.h | 6 +- include/tins/loopback.h | 4 +- include/tins/macros.h | 2 +- include/tins/memory_helpers.h | 4 +- include/tins/mpls.h | 8 +- include/tins/network_interface.h | 8 +- include/tins/offline_packet_filter.h | 4 +- include/tins/packet.h | 6 +- include/tins/packet_sender.h | 8 +- include/tins/packet_writer.h | 8 +- include/tins/pdu.h | 6 +- include/tins/pdu_allocator.h | 2 +- include/tins/pdu_cacher.h | 4 +- include/tins/pdu_option.h | 4 +- include/tins/pktap.h | 4 +- include/tins/ppi.h | 8 +- include/tins/pppoe.h | 12 +-- include/tins/radiotap.h | 10 +-- include/tins/rawpdu.h | 6 +- include/tins/rsn_information.h | 6 +- include/tins/sll.h | 8 +- include/tins/snap.h | 8 +- include/tins/sniffer.h | 12 +-- include/tins/stp.h | 10 +-- include/tins/tcp.h | 12 +-- include/tins/tcp_ip/ack_tracker.h | 4 +- include/tins/tcp_ip/data_tracker.h | 4 +- include/tins/tcp_ip/flow.h | 8 +- include/tins/tcp_ip/stream.h | 10 +-- include/tins/tcp_ip/stream_follower.h | 6 +- include/tins/tcp_ip/stream_identifier.h | 2 +- include/tins/tcp_stream.h | 12 +-- include/tins/timestamp.h | 4 +- include/tins/tins.h | 90 +++++++++++----------- include/tins/udp.h | 6 +- include/tins/utils.h | 14 ++-- include/tins/utils/checksum_utils.h | 2 +- include/tins/utils/frequency_utils.h | 2 +- include/tins/utils/pdu_utils.h | 6 +- include/tins/utils/radiotap_parser.h | 6 +- include/tins/utils/radiotap_writer.h | 2 +- include/tins/utils/resolve_utils.h | 2 +- include/tins/utils/routing_utils.h | 6 +- src/CMakeLists.txt | 2 +- src/address_range.cpp | 6 +- src/arp.cpp | 12 +-- src/bootp.cpp | 6 +- src/crypto.cpp | 16 ++-- src/detail/address_helpers.cpp | 8 +- src/detail/icmp_extension_helpers.cpp | 8 +- src/detail/pdu_helpers.cpp | 44 +++++------ src/detail/sequence_number_helpers.cpp | 2 +- src/dhcp.cpp | 8 +- src/dhcpv6.cpp | 6 +- src/dns.cpp | 12 +-- src/dot11/dot11_assoc.cpp | 4 +- src/dot11/dot11_auth.cpp | 4 +- src/dot11/dot11_base.cpp | 12 +-- src/dot11/dot11_beacon.cpp | 4 +- src/dot11/dot11_control.cpp | 4 +- src/dot11/dot11_data.cpp | 8 +- src/dot11/dot11_mgmt.cpp | 6 +- src/dot11/dot11_probe.cpp | 4 +- src/dot1q.cpp | 8 +- src/dot3.cpp | 12 +-- src/eapol.cpp | 8 +- src/ethernetII.cpp | 18 ++--- src/handshake_capturer.cpp | 4 +- src/hw_address.cpp | 4 +- src/icmp.cpp | 12 +-- src/icmp_extension.cpp | 10 +-- src/icmpv6.cpp | 16 ++-- src/ip.cpp | 22 +++--- src/ip_address.cpp | 8 +- src/ip_reassembler.cpp | 8 +- src/ipsec.cpp | 8 +- src/ipv6.cpp | 16 ++-- src/ipv6_address.cpp | 8 +- src/llc.cpp | 10 +-- src/loopback.cpp | 16 ++-- src/memory_helpers.cpp | 8 +- src/mpls.cpp | 12 +-- src/network_interface.cpp | 10 +-- src/offline_packet_filter.cpp | 6 +- src/packet_sender.cpp | 20 ++--- src/packet_writer.cpp | 8 +- src/pdu.cpp | 4 +- src/pdu_iterator.cpp | 6 +- src/pdu_option.cpp | 14 ++-- src/pktap.cpp | 10 +-- src/ppi.cpp | 20 ++--- src/pppoe.cpp | 8 +- src/radiotap.cpp | 20 ++--- src/rawpdu.cpp | 4 +- src/rsn_information.cpp | 12 +-- src/sll.cpp | 8 +- src/snap.cpp | 10 +-- src/sniffer.cpp | 26 +++---- src/stp.cpp | 6 +- src/tcp.cpp | 16 ++-- src/tcp_ip/ack_tracker.cpp | 6 +- src/tcp_ip/data_tracker.cpp | 4 +- src/tcp_ip/flow.cpp | 20 ++--- src/tcp_ip/stream.cpp | 19 +++-- src/tcp_ip/stream_follower.cpp | 19 +++-- src/tcp_ip/stream_identifier.cpp | 16 ++-- src/tcp_stream.cpp | 4 +- src/timestamp.cpp | 2 +- src/udp.cpp | 16 ++-- src/utils/checksum_utils.cpp | 10 +-- src/utils/frequency_utils.cpp | 2 +- src/utils/pdu_utils.cpp | 2 +- src/utils/radiotap_parser.cpp | 4 +- src/utils/radiotap_writer.cpp | 6 +- src/utils/resolve_utils.cpp | 20 ++--- src/utils/routing_utils.cpp | 6 +- tests/include/tests/dot11.h | 2 +- tests/include/tests/dot11_control.h | 2 +- tests/include/tests/dot11_data.h | 2 +- tests/include/tests/dot11_mgmt.h | 2 +- tests/src/CMakeLists.txt | 2 +- tests/src/address_range_test.cpp | 6 +- tests/src/allocators_test.cpp | 14 ++-- tests/src/arp_test.cpp | 4 +- tests/src/dhcp_test.cpp | 10 +-- tests/src/dhcpv6_test.cpp | 2 +- tests/src/dns_test.cpp | 4 +- tests/src/dot11/ack_test.cpp | 4 +- tests/src/dot11/assoc_request_test.cpp | 4 +- tests/src/dot11/assoc_response_test.cpp | 4 +- tests/src/dot11/authentication_test.cpp | 4 +- tests/src/dot11/beacon_test.cpp | 6 +- tests/src/dot11/block_ack_request_test.cpp | 4 +- tests/src/dot11/cf_end_ack_test.cpp | 4 +- tests/src/dot11/cf_end_test.cpp | 4 +- tests/src/dot11/data_test.cpp | 4 +- tests/src/dot11/deauthentication_test.cpp | 4 +- tests/src/dot11/disassoc_test.cpp | 4 +- tests/src/dot11/dot11_test.cpp | 2 +- tests/src/dot11/probe_request_test.cpp | 4 +- tests/src/dot11/probe_response_test.cpp | 4 +- tests/src/dot11/ps_poll_test.cpp | 4 +- tests/src/dot11/reassoc_request_test.cpp | 4 +- tests/src/dot11/reassoc_response_test.cpp | 4 +- tests/src/dot11/rts_test.cpp | 4 +- tests/src/dot1q_test.cpp | 12 +-- tests/src/ethernet_test.cpp | 12 +-- tests/src/hw_address_test.cpp | 2 +- tests/src/icmp_extension_test.cpp | 4 +- tests/src/icmp_test.cpp | 10 +-- tests/src/icmpv6_test.cpp | 12 +-- tests/src/ip_address_test.cpp | 2 +- tests/src/ip_reassembler_test.cpp | 10 +-- tests/src/ip_test.cpp | 16 ++-- tests/src/ipsec_test.cpp | 6 +- tests/src/ipv6_address_test.cpp | 2 +- tests/src/ipv6_test.cpp | 16 ++-- tests/src/llc_test.cpp | 2 +- tests/src/loopback_test.cpp | 8 +- tests/src/matches_response_test.cpp | 12 +-- tests/src/mpls_test.cpp | 10 +-- tests/src/network_interface_test.cpp | 4 +- tests/src/offline_packet_filter_test.cpp | 18 ++--- tests/src/pdu_iterator_test.cpp | 8 +- tests/src/pdu_test.cpp | 12 +-- tests/src/pktap_test.cpp | 2 +- tests/src/ppi_test.cpp | 8 +- tests/src/pppoe_test.cpp | 6 +- tests/src/radiotap_test.cpp | 18 ++--- tests/src/rc4_eapol_test.cpp | 2 +- tests/src/rsn_eapol_test.cpp | 8 +- tests/src/sll_test.cpp | 8 +- tests/src/snap_test.cpp | 2 +- tests/src/stp_test.cpp | 6 +- tests/src/tcp_ip_test.cpp | 24 +++--- tests/src/tcp_stream_test.cpp | 6 +- tests/src/tcp_test.cpp | 6 +- tests/src/udp_test.cpp | 6 +- tests/src/utils_test.cpp | 8 +- tests/src/wep_decrypt_test.cpp | 8 +- tests/src/wpa2_decrypt_test.cpp | 14 ++-- 220 files changed, 917 insertions(+), 919 deletions(-) diff --git a/include/tins/address_range.h b/include/tins/address_range.h index 2093637..269e865 100644 --- a/include/tins/address_range.h +++ b/include/tins/address_range.h @@ -31,9 +31,9 @@ #define TINS_ADDRESS_RANGE #include -#include "endianness.h" -#include "exceptions.h" -#include "detail/address_helpers.h" +#include +#include +#include namespace Tins { /** diff --git a/include/tins/arp.h b/include/tins/arp.h index 4fdf53b..f46783d 100644 --- a/include/tins/arp.h +++ b/include/tins/arp.h @@ -31,11 +31,11 @@ #ifndef TINS_ARP_H #define TINS_ARP_H -#include "macros.h" -#include "pdu.h" -#include "endianness.h" -#include "hw_address.h" -#include "ip_address.h" +#include +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/bootp.h b/include/tins/bootp.h index eaf3f1c..47f7332 100644 --- a/include/tins/bootp.h +++ b/include/tins/bootp.h @@ -32,11 +32,11 @@ #include #include -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "ip_address.h" -#include "hw_address.h" +#include +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/crypto.h b/include/tins/crypto.h index fd9c299..a6040ce 100644 --- a/include/tins/crypto.h +++ b/include/tins/crypto.h @@ -27,7 +27,7 @@ * */ -#include "config.h" +#include #if !defined(TINS_CRYPTO_H) && defined(TINS_HAVE_DOT11) #define TINS_CRYPTO_H @@ -38,8 +38,8 @@ #ifdef TINS_HAVE_WPA2_CALLBACKS #include #endif // TINS_HAVE_WPA2_CALLBACKS -#include "macros.h" -#include "handshake_capturer.h" +#include +#include namespace Tins { diff --git a/include/tins/cxxstd.h b/include/tins/cxxstd.h index d191c54..f88f255 100644 --- a/include/tins/cxxstd.h +++ b/include/tins/cxxstd.h @@ -30,7 +30,7 @@ #ifndef TINS_CXXSTD_H #define TINS_CXXSTD_H -#include "config.h" +#include #ifdef __GXX_EXPERIMENTAL_CXX0X__ #define TINS_CXXSTD_GCC_FIX 1 diff --git a/include/tins/detail/address_helpers.h b/include/tins/detail/address_helpers.h index 587bba8..c653d4a 100644 --- a/include/tins/detail/address_helpers.h +++ b/include/tins/detail/address_helpers.h @@ -30,7 +30,7 @@ #ifndef TINS_ADDRESS_HELPERS_H #define TINS_ADDRESS_HELPERS_H -#include "../hw_address.h" +#include /** * \cond diff --git a/include/tins/detail/pdu_helpers.h b/include/tins/detail/pdu_helpers.h index 83d9b67..d790019 100644 --- a/include/tins/detail/pdu_helpers.h +++ b/include/tins/detail/pdu_helpers.h @@ -30,9 +30,9 @@ #ifndef TINS_PDU_HELPERS_H #define TINS_PDU_HELPERS_H -#include "../constants.h" -#include "../config.h" -#include "../pdu.h" +#include +#include +#include /** * \cond diff --git a/include/tins/detail/smart_ptr.h b/include/tins/detail/smart_ptr.h index 48b07d8..f825cbb 100644 --- a/include/tins/detail/smart_ptr.h +++ b/include/tins/detail/smart_ptr.h @@ -31,7 +31,7 @@ #define TINS_SMART_PTR_H #include -#include "../cxxstd.h" +#include namespace Tins { namespace Internals { diff --git a/include/tins/detail/type_traits.h b/include/tins/detail/type_traits.h index 6c2c21a..be3fdeb 100644 --- a/include/tins/detail/type_traits.h +++ b/include/tins/detail/type_traits.h @@ -31,7 +31,7 @@ #define TINS_TYPE_TRAITS_H #include -#include "../cxxstd.h" +#include #if TINS_IS_CXX11 #include #include diff --git a/include/tins/dhcp.h b/include/tins/dhcp.h index d0dc07d..877d1b8 100644 --- a/include/tins/dhcp.h +++ b/include/tins/dhcp.h @@ -32,10 +32,10 @@ #include #include -#include "bootp.h" -#include "macros.h" -#include "pdu_option.h" -#include "cxxstd.h" +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/dhcpv6.h b/include/tins/dhcpv6.h index 8433fc4..1493b8f 100644 --- a/include/tins/dhcpv6.h +++ b/include/tins/dhcpv6.h @@ -31,12 +31,12 @@ #define TINS_DHCPV6_H #include -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "small_uint.h" -#include "ipv6_address.h" -#include "pdu_option.h" +#include +#include +#include +#include +#include +#include namespace Tins { namespace Memory { diff --git a/include/tins/dns.h b/include/tins/dns.h index ef93eaa..727007e 100644 --- a/include/tins/dns.h +++ b/include/tins/dns.h @@ -35,9 +35,9 @@ #include #include #include -#include "macros.h" -#include "pdu.h" -#include "endianness.h" +#include +#include +#include // Undefining some macros that conflict with some symbols here. // Eventually, the conflicting names will be removed, but until then diff --git a/include/tins/dot11.h b/include/tins/dot11.h index 1dcb03a..89f2a6a 100644 --- a/include/tins/dot11.h +++ b/include/tins/dot11.h @@ -27,18 +27,18 @@ * */ -#include "config.h" +#include #if !defined(TINS_DOT_11) && defined(TINS_HAVE_DOT11) #define TINS_DOT_11 -#include "dot11/dot11_base.h" -#include "dot11/dot11_data.h" -#include "dot11/dot11_mgmt.h" -#include "dot11/dot11_beacon.h" -#include "dot11/dot11_assoc.h" -#include "dot11/dot11_auth.h" -#include "dot11/dot11_probe.h" -#include "dot11/dot11_control.h" +#include +#include +#include +#include +#include +#include +#include +#include #endif // TINS_DOT_11 diff --git a/include/tins/dot11/dot11_assoc.h b/include/tins/dot11/dot11_assoc.h index 3cbdf73..de785c9 100644 --- a/include/tins/dot11/dot11_assoc.h +++ b/include/tins/dot11/dot11_assoc.h @@ -27,13 +27,13 @@ * */ -#include "../config.h" +#include #if !defined(TINS_DOT11_DOT11_ASSOC_H) && defined(TINS_HAVE_DOT11) #define TINS_DOT11_DOT11_ASSOC_H -#include "../dot11/dot11_mgmt.h" -#include "../macros.h" +#include +#include namespace Tins { /** diff --git a/include/tins/dot11/dot11_auth.h b/include/tins/dot11/dot11_auth.h index fe4cb6d..2d8bd4c 100644 --- a/include/tins/dot11/dot11_auth.h +++ b/include/tins/dot11/dot11_auth.h @@ -27,13 +27,13 @@ * */ -#include "../config.h" +#include #if !defined(TINS_DOT11_DOT11_AUTH_H) && defined(TINS_HAVE_DOT11) #define TINS_DOT11_DOT11_AUTH_H -#include "../dot11/dot11_mgmt.h" -#include "../macros.h" +#include +#include namespace Tins { /** diff --git a/include/tins/dot11/dot11_base.h b/include/tins/dot11/dot11_base.h index 760d5e5..0886dc2 100644 --- a/include/tins/dot11/dot11_base.h +++ b/include/tins/dot11/dot11_base.h @@ -27,18 +27,18 @@ * */ -#include "../config.h" +#include #if !defined(TINS_DOT11_DOT11_H) && defined(TINS_HAVE_DOT11) #define TINS_DOT11_DOT11_H -#include "../pdu.h" -#include "../pdu_option.h" -#include "../small_uint.h" -#include "../hw_address.h" -#include "../endianness.h" -#include "../cxxstd.h" -#include "../macros.h" +#include +#include +#include +#include +#include +#include +#include namespace Tins { namespace Memory { diff --git a/include/tins/dot11/dot11_beacon.h b/include/tins/dot11/dot11_beacon.h index 5c59c54..8497180 100644 --- a/include/tins/dot11/dot11_beacon.h +++ b/include/tins/dot11/dot11_beacon.h @@ -27,13 +27,13 @@ * */ -#include "../config.h" +#include #if !defined(TINS_DOT11_DOT11_BEACON_H) && defined(TINS_HAVE_DOT11) #define TINS_DOT11_DOT11_BEACON_H -#include "../dot11/dot11_mgmt.h" -#include "../macros.h" +#include +#include namespace Tins { diff --git a/include/tins/dot11/dot11_control.h b/include/tins/dot11/dot11_control.h index e5abb61..38af98e 100644 --- a/include/tins/dot11/dot11_control.h +++ b/include/tins/dot11/dot11_control.h @@ -27,14 +27,14 @@ * */ -#include "../config.h" +#include #if !defined(TINS_DOT11_DOT11_CONTROL_H) && defined(TINS_HAVE_DOT11) #define TINS_DOT11_DOT11_CONTROL_H -#include "../dot11/dot11_base.h" -#include "../macros.h" +#include +#include namespace Tins { /** diff --git a/include/tins/dot11/dot11_data.h b/include/tins/dot11/dot11_data.h index 0c1bd37..8c8c5d3 100644 --- a/include/tins/dot11/dot11_data.h +++ b/include/tins/dot11/dot11_data.h @@ -27,13 +27,13 @@ * */ -#include "../config.h" +#include #if !defined(TINS_DOT11_DOT11_DATA_H) && defined(TINS_HAVE_DOT11) #define TINS_DOT11_DOT11_DATA_H -#include "../dot11/dot11_base.h" -#include "../macros.h" +#include +#include namespace Tins { diff --git a/include/tins/dot11/dot11_mgmt.h b/include/tins/dot11/dot11_mgmt.h index e7dda2b..7367bd4 100644 --- a/include/tins/dot11/dot11_mgmt.h +++ b/include/tins/dot11/dot11_mgmt.h @@ -27,7 +27,7 @@ * */ -#include "../config.h" +#include #if !defined(TINS_DOT11_DOT11_MGMT_H) && defined(TINS_HAVE_DOT11) @@ -35,8 +35,8 @@ #include #include -#include "../dot11/dot11_base.h" -#include "../macros.h" +#include +#include namespace Tins { /** diff --git a/include/tins/dot11/dot11_probe.h b/include/tins/dot11/dot11_probe.h index eccd5f7..25a119e 100644 --- a/include/tins/dot11/dot11_probe.h +++ b/include/tins/dot11/dot11_probe.h @@ -27,14 +27,14 @@ * */ -#include "../config.h" +#include #if !defined(TINS_DOT11_DOT11_PROBE_H) && defined(TINS_HAVE_DOT11) #define TINS_DOT11_DOT11_PROBE_H -#include "../dot11/dot11_mgmt.h" -#include "../macros.h" +#include +#include namespace Tins { /** diff --git a/include/tins/dot1q.h b/include/tins/dot1q.h index b25b877..ec85c8f 100644 --- a/include/tins/dot1q.h +++ b/include/tins/dot1q.h @@ -30,10 +30,10 @@ #ifndef TINS_DOT1Q_H #define TINS_DOT1Q_H -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "small_uint.h" +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/dot3.h b/include/tins/dot3.h index 019a1de..00f3215 100644 --- a/include/tins/dot3.h +++ b/include/tins/dot3.h @@ -31,11 +31,11 @@ #define TINS_DOT3_H #include -#include "macros.h" -#include "pdu.h" -#include "config.h" -#include "endianness.h" -#include "hw_address.h" +#include +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/eapol.h b/include/tins/eapol.h index afe8ae3..2fd3aac 100644 --- a/include/tins/eapol.h +++ b/include/tins/eapol.h @@ -31,10 +31,10 @@ #define TINS_EAPOL_H #include -#include "pdu.h" -#include "macros.h" -#include "small_uint.h" -#include "endianness.h" +#include +#include +#include +#include namespace Tins { namespace Memory { diff --git a/include/tins/endianness.h b/include/tins/endianness.h index 9303e81..a006a46 100644 --- a/include/tins/endianness.h +++ b/include/tins/endianness.h @@ -31,7 +31,7 @@ #define TINS_ENDIANNESS_H #include -#include "macros.h" +#include #if defined(__APPLE__) #include diff --git a/include/tins/ethernetII.h b/include/tins/ethernetII.h index bbf3aca..02d8e3f 100644 --- a/include/tins/ethernetII.h +++ b/include/tins/ethernetII.h @@ -31,11 +31,11 @@ #define TINS_ETHERNET_II_H #include -#include "macros.h" -#include "pdu.h" -#include "config.h" -#include "endianness.h" -#include "hw_address.h" +#include +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/handshake_capturer.h b/include/tins/handshake_capturer.h index 113cb7c..968416c 100644 --- a/include/tins/handshake_capturer.h +++ b/include/tins/handshake_capturer.h @@ -27,7 +27,7 @@ * */ -#include "config.h" +#include #if !defined(TINS_HANDSHAKE_CAPTURER_H) && defined(TINS_HAVE_DOT11) #define TINS_HANDSHAKE_CAPTURER_H @@ -35,9 +35,9 @@ #include #include #include -#include "hw_address.h" -#include "macros.h" -#include "eapol.h" +#include +#include +#include namespace Tins { diff --git a/include/tins/hw_address.h b/include/tins/hw_address.h index 1562f29..240e7df 100644 --- a/include/tins/hw_address.h +++ b/include/tins/hw_address.h @@ -34,8 +34,8 @@ #include #include #include -#include "cxxstd.h" -#include "macros.h" +#include +#include #if TINS_IS_CXX11 // std::hash #include diff --git a/include/tins/icmp.h b/include/tins/icmp.h index 135e3c4..de46a7a 100644 --- a/include/tins/icmp.h +++ b/include/tins/icmp.h @@ -42,11 +42,11 @@ #endif // TIMESTAMP_REPLY #endif // _WIN32 -#include "macros.h" -#include "pdu.h" -#include "endianness.h" -#include "ip_address.h" -#include "icmp_extension.h" +#include +#include +#include +#include +#include namespace Tins { namespace Memory { diff --git a/include/tins/icmp_extension.h b/include/tins/icmp_extension.h index 63327aa..56dffde 100644 --- a/include/tins/icmp_extension.h +++ b/include/tins/icmp_extension.h @@ -32,9 +32,9 @@ #include #include -#include "macros.h" -#include "small_uint.h" -#include "endianness.h" +#include +#include +#include namespace Tins { diff --git a/include/tins/icmpv6.h b/include/tins/icmpv6.h index 040eeb7..c3b13f5 100644 --- a/include/tins/icmpv6.h +++ b/include/tins/icmpv6.h @@ -31,16 +31,16 @@ #define TINS_ICMPV6_H #include -#include "macros.h" -#include "pdu.h" -#include "ipv6_address.h" -#include "pdu_option.h" -#include "endianness.h" -#include "small_uint.h" -#include "hw_address.h" -#include "small_uint.h" -#include "icmp_extension.h" -#include "cxxstd.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Tins { namespace Memory { diff --git a/include/tins/ieee802_3.h b/include/tins/ieee802_3.h index 18f69a1..92439bf 100644 --- a/include/tins/ieee802_3.h +++ b/include/tins/ieee802_3.h @@ -30,7 +30,7 @@ #ifndef TINS_IEEE802_3_H #define TINS_IEEE802_3_H -#include "dot3.h" +#include namespace Tins { typedef Dot3 IEEE802_3; diff --git a/include/tins/internals.h b/include/tins/internals.h index e44d30c..f68b9fe 100644 --- a/include/tins/internals.h +++ b/include/tins/internals.h @@ -30,11 +30,11 @@ #ifndef TINS_INTERNALS_H #define TINS_INTERNALS_H -#include "detail/type_traits.h" -#include "detail/address_helpers.h" -#include "detail/icmp_extension_helpers.h" -#include "detail/smart_ptr.h" -#include "detail/pdu_helpers.h" -#include "detail/sequence_number_helpers.h" +#include +#include +#include +#include +#include +#include #endif diff --git a/include/tins/ip.h b/include/tins/ip.h index 6da8390..6d608ac 100644 --- a/include/tins/ip.h +++ b/include/tins/ip.h @@ -30,13 +30,13 @@ #ifndef TINS_IP_H #define TINS_IP_H -#include "pdu.h" -#include "small_uint.h" -#include "endianness.h" -#include "ip_address.h" -#include "pdu_option.h" -#include "macros.h" -#include "cxxstd.h" +#include +#include +#include +#include +#include +#include +#include namespace Tins { namespace Memory { diff --git a/include/tins/ip_address.h b/include/tins/ip_address.h index 8b9b249..b0058fb 100644 --- a/include/tins/ip_address.h +++ b/include/tins/ip_address.h @@ -33,8 +33,8 @@ #include #include #include -#include "cxxstd.h" -#include "macros.h" +#include +#include #include namespace Tins { diff --git a/include/tins/ip_reassembler.h b/include/tins/ip_reassembler.h index 1fc9c77..bdb994a 100644 --- a/include/tins/ip_reassembler.h +++ b/include/tins/ip_reassembler.h @@ -32,10 +32,10 @@ #include #include -#include "pdu.h" -#include "macros.h" -#include "ip_address.h" -#include "ip.h" +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/ipsec.h b/include/tins/ipsec.h index 198b7ea..dae8d19 100644 --- a/include/tins/ipsec.h +++ b/include/tins/ipsec.h @@ -30,10 +30,10 @@ #ifndef TINS_IPSEC_H #define TINS_IPSEC_H -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "small_uint.h" +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h index e3a33bd..2e2283a 100644 --- a/include/tins/ipv6.h +++ b/include/tins/ipv6.h @@ -30,13 +30,13 @@ #ifndef TINS_IPV6_h #define TINS_IPV6_h -#include "macros.h" -#include "cxxstd.h" -#include "pdu.h" -#include "endianness.h" -#include "small_uint.h" -#include "pdu_option.h" -#include "ipv6_address.h" +#include +#include +#include +#include +#include +#include +#include namespace Tins { namespace Memory { diff --git a/include/tins/ipv6_address.h b/include/tins/ipv6_address.h index aad0136..32670cf 100644 --- a/include/tins/ipv6_address.h +++ b/include/tins/ipv6_address.h @@ -33,8 +33,8 @@ #include #include #include -#include "cxxstd.h" -#include "macros.h" +#include +#include #include namespace Tins { diff --git a/include/tins/llc.h b/include/tins/llc.h index 2f67c31..5399ebd 100644 --- a/include/tins/llc.h +++ b/include/tins/llc.h @@ -32,9 +32,9 @@ #include #include -#include "macros.h" -#include "pdu.h" -#include "endianness.h" +#include +#include +#include namespace Tins { diff --git a/include/tins/loopback.h b/include/tins/loopback.h index 125dba2..39646b0 100644 --- a/include/tins/loopback.h +++ b/include/tins/loopback.h @@ -30,8 +30,8 @@ #ifndef TINS_LOOPBACK_H #define TINS_LOOPBACK_H -#include "pdu.h" -#include "macros.h" +#include +#include namespace Tins { diff --git a/include/tins/macros.h b/include/tins/macros.h index c3da983..168048a 100644 --- a/include/tins/macros.h +++ b/include/tins/macros.h @@ -34,7 +34,7 @@ #include #endif -#include "config.h" +#include // Check if this is Visual Studio #ifdef _MSC_VER diff --git a/include/tins/memory_helpers.h b/include/tins/memory_helpers.h index a07ad43..d52c76c 100644 --- a/include/tins/memory_helpers.h +++ b/include/tins/memory_helpers.h @@ -33,8 +33,8 @@ #include #include #include -#include "exceptions.h" -#include "endianness.h" +#include +#include namespace Tins { diff --git a/include/tins/mpls.h b/include/tins/mpls.h index 404d1fc..d13dafc 100644 --- a/include/tins/mpls.h +++ b/include/tins/mpls.h @@ -30,10 +30,10 @@ #ifndef TINS_MPLS_H #define TINS_MPLS_H -#include "pdu.h" -#include "endianness.h" -#include "macros.h" -#include "small_uint.h" +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/network_interface.h b/include/tins/network_interface.h index 896d60a..678ad4d 100644 --- a/include/tins/network_interface.h +++ b/include/tins/network_interface.h @@ -33,10 +33,10 @@ #include #include #include -#include "macros.h" -#include "hw_address.h" -#include "ip_address.h" -#include "ipv6_address.h" +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/offline_packet_filter.h b/include/tins/offline_packet_filter.h index 3a76c56..efbf385 100644 --- a/include/tins/offline_packet_filter.h +++ b/include/tins/offline_packet_filter.h @@ -32,11 +32,11 @@ #include #include -#include "macros.h" +#include #ifdef TINS_HAVE_PCAP -#include "data_link_type.h" +#include namespace Tins { diff --git a/include/tins/packet.h b/include/tins/packet.h index 01fc862..6ea01fe 100644 --- a/include/tins/packet.h +++ b/include/tins/packet.h @@ -30,9 +30,9 @@ #ifndef TINS_PACKET_H #define TINS_PACKET_H -#include "cxxstd.h" -#include "pdu.h" -#include "timestamp.h" +#include +#include +#include /** * \namespace Tins diff --git a/include/tins/packet_sender.h b/include/tins/packet_sender.h index eb6b09c..afbf3ab 100644 --- a/include/tins/packet_sender.h +++ b/include/tins/packet_sender.h @@ -35,13 +35,13 @@ #include #include #include -#include "config.h" +#include #ifdef TINS_HAVE_PACKET_SENDER_PCAP_SENDPACKET #include #endif // TINS_HAVE_PACKET_SENDER_PCAP_SENDPACKET -#include "network_interface.h" -#include "macros.h" -#include "cxxstd.h" +#include +#include +#include struct timeval; struct sockaddr; diff --git a/include/tins/packet_writer.h b/include/tins/packet_writer.h index 07fa53e..eec04fc 100644 --- a/include/tins/packet_writer.h +++ b/include/tins/packet_writer.h @@ -31,13 +31,13 @@ #define TINS_PACKET_WRITER_H #include -#include "macros.h" -#include "cxxstd.h" -#include "utils/pdu_utils.h" +#include +#include +#include #ifdef TINS_HAVE_PCAP #include -#include "data_link_type.h" +#include struct timeval; diff --git a/include/tins/pdu.h b/include/tins/pdu.h index 6fad174..6f6d5c0 100644 --- a/include/tins/pdu.h +++ b/include/tins/pdu.h @@ -33,9 +33,9 @@ #include #include -#include "macros.h" -#include "cxxstd.h" -#include "exceptions.h" +#include +#include +#include /** \brief The Tins namespace. */ diff --git a/include/tins/pdu_allocator.h b/include/tins/pdu_allocator.h index 30b9f33..99a0bad 100644 --- a/include/tins/pdu_allocator.h +++ b/include/tins/pdu_allocator.h @@ -31,7 +31,7 @@ #define TINS_PDU_ALLOCATOR_H #include -#include "pdu.h" +#include namespace Tins { /** diff --git a/include/tins/pdu_cacher.h b/include/tins/pdu_cacher.h index ab37d45..8e04f1b 100644 --- a/include/tins/pdu_cacher.h +++ b/include/tins/pdu_cacher.h @@ -31,8 +31,8 @@ #define TINS_PDU_CACHER_H #include -#include "pdu.h" -#include "macros.h" +#include +#include namespace Tins { /** diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h index e866128..762b45f 100644 --- a/include/tins/pdu_option.h +++ b/include/tins/pdu_option.h @@ -34,8 +34,8 @@ #include #include #include -#include "exceptions.h" -#include "detail/type_traits.h" +#include +#include namespace Tins { diff --git a/include/tins/pktap.h b/include/tins/pktap.h index ce88f84..9c888a6 100644 --- a/include/tins/pktap.h +++ b/include/tins/pktap.h @@ -30,8 +30,8 @@ #ifndef TINS_PKTAP_H #define TINS_PKTAP_H -#include "pdu.h" -#include "macros.h" +#include +#include // This class is only available if pcap is enabled #ifdef TINS_HAVE_PCAP diff --git a/include/tins/ppi.h b/include/tins/ppi.h index b24d8cf..eaac4e6 100644 --- a/include/tins/ppi.h +++ b/include/tins/ppi.h @@ -30,10 +30,10 @@ #ifndef TINS_PPI_H #define TINS_PPI_H -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "small_uint.h" +#include +#include +#include +#include #ifdef TINS_HAVE_PCAP diff --git a/include/tins/pppoe.h b/include/tins/pppoe.h index 77abfd4..d99f98c 100644 --- a/include/tins/pppoe.h +++ b/include/tins/pppoe.h @@ -32,12 +32,12 @@ #include #include -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "small_uint.h" -#include "pdu_option.h" -#include "cxxstd.h" +#include +#include +#include +#include +#include +#include namespace Tins { /** diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h index 17dac80..0a38cfa 100644 --- a/include/tins/radiotap.h +++ b/include/tins/radiotap.h @@ -27,15 +27,15 @@ * */ -#include "config.h" +#include #if !defined(TINS_RADIOTAP_H) && defined(TINS_HAVE_DOT11) #define TINS_RADIOTAP_H -#include "macros.h" -#include "pdu.h" -#include "endianness.h" -#include "pdu_option.h" +#include +#include +#include +#include namespace Tins { class PacketSender; diff --git a/include/tins/rawpdu.h b/include/tins/rawpdu.h index 056d412..1bdc7b0 100644 --- a/include/tins/rawpdu.h +++ b/include/tins/rawpdu.h @@ -32,9 +32,9 @@ #include #include -#include "pdu.h" -#include "macros.h" -#include "cxxstd.h" +#include +#include +#include namespace Tins { diff --git a/include/tins/rsn_information.h b/include/tins/rsn_information.h index b0f186c..f866a40 100644 --- a/include/tins/rsn_information.h +++ b/include/tins/rsn_information.h @@ -27,15 +27,15 @@ * */ -#include "config.h" +#include #if !defined(TINS_RSN_INFORMATION) && defined(TINS_HAVE_DOT11) #define TINS_RSN_INFORMATION #include #include -#include "macros.h" -#include "endianness.h" +#include +#include namespace Tins{ class Dot11; diff --git a/include/tins/sll.h b/include/tins/sll.h index 5a802bd..cf5b84c 100644 --- a/include/tins/sll.h +++ b/include/tins/sll.h @@ -31,10 +31,10 @@ #define TINS_SLL_H #include -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "hw_address.h" +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/snap.h b/include/tins/snap.h index 41efafa..2556ad2 100644 --- a/include/tins/snap.h +++ b/include/tins/snap.h @@ -31,10 +31,10 @@ #define TINS_SNAP_H #include -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "small_uint.h" +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/sniffer.h b/include/tins/sniffer.h index cf9cae6..a8b2891 100644 --- a/include/tins/sniffer.h +++ b/include/tins/sniffer.h @@ -34,12 +34,12 @@ #include #include #include -#include "pdu.h" -#include "packet.h" -#include "cxxstd.h" -#include "macros.h" -#include "exceptions.h" -#include "detail/type_traits.h" +#include +#include +#include +#include +#include +#include #ifdef TINS_HAVE_PCAP diff --git a/include/tins/stp.h b/include/tins/stp.h index 29c0711..f19b3d3 100644 --- a/include/tins/stp.h +++ b/include/tins/stp.h @@ -30,11 +30,11 @@ #ifndef TINS_STP_H #define TINS_STP_H -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "hw_address.h" -#include "small_uint.h" +#include +#include +#include +#include +#include namespace Tins { /** diff --git a/include/tins/tcp.h b/include/tins/tcp.h index 9ba2019..a8f04ea 100644 --- a/include/tins/tcp.h +++ b/include/tins/tcp.h @@ -33,12 +33,12 @@ #include #include #include -#include "pdu.h" -#include "macros.h" -#include "endianness.h" -#include "small_uint.h" -#include "pdu_option.h" -#include "cxxstd.h" +#include +#include +#include +#include +#include +#include namespace Tins { namespace Memory { diff --git a/include/tins/tcp_ip/ack_tracker.h b/include/tins/tcp_ip/ack_tracker.h index 69700f5..f299078 100644 --- a/include/tins/tcp_ip/ack_tracker.h +++ b/include/tins/tcp_ip/ack_tracker.h @@ -30,13 +30,13 @@ #ifndef TINS_TCP_IP_ACK_TRACKER_H #define TINS_TCP_IP_ACK_TRACKER_H -#include "../config.h" +#include #ifdef TINS_HAVE_ACK_TRACKER #include #include -#include "../macros.h" +#include namespace Tins { diff --git a/include/tins/tcp_ip/data_tracker.h b/include/tins/tcp_ip/data_tracker.h index 461c2cd..84175d3 100644 --- a/include/tins/tcp_ip/data_tracker.h +++ b/include/tins/tcp_ip/data_tracker.h @@ -33,8 +33,8 @@ #include #include #include -#include "../config.h" -#include "../macros.h" +#include +#include #ifdef TINS_HAVE_TCPIP diff --git a/include/tins/tcp_ip/flow.h b/include/tins/tcp_ip/flow.h index 9d250c3..0a7de3a 100644 --- a/include/tins/tcp_ip/flow.h +++ b/include/tins/tcp_ip/flow.h @@ -30,16 +30,16 @@ #ifndef TINS_TCP_IP_FLOW_H #define TINS_TCP_IP_FLOW_H -#include "../config.h" +#include #ifdef TINS_HAVE_TCPIP #include #include #include -#include "../macros.h" -#include "ack_tracker.h" -#include "data_tracker.h" +#include +#include +#include namespace Tins { diff --git a/include/tins/tcp_ip/stream.h b/include/tins/tcp_ip/stream.h index ea86de8..3cd10d8 100644 --- a/include/tins/tcp_ip/stream.h +++ b/include/tins/tcp_ip/stream.h @@ -30,7 +30,7 @@ #ifndef TINS_TCP_IP_STREAM_H #define TINS_TCP_IP_STREAM_H -#include "../config.h" +#include #ifdef TINS_HAVE_TCPIP @@ -40,10 +40,10 @@ #include #include #include -#include "../macros.h" -#include "../hw_address.h" -#include "../config.h" -#include "flow.h" +#include +#include +#include +#include #ifdef TINS_HAVE_TCP_STREAM_CUSTOM_DATA #include #endif diff --git a/include/tins/tcp_ip/stream_follower.h b/include/tins/tcp_ip/stream_follower.h index 3940412..e6b7a1d 100644 --- a/include/tins/tcp_ip/stream_follower.h +++ b/include/tins/tcp_ip/stream_follower.h @@ -30,13 +30,13 @@ #ifndef TINS_TCP_IP_STREAM_FOLLOWER_H #define TINS_TCP_IP_STREAM_FOLLOWER_H -#include "../config.h" +#include #ifdef TINS_HAVE_TCPIP #include -#include "stream.h" -#include "stream_identifier.h" +#include +#include namespace Tins { diff --git a/include/tins/tcp_ip/stream_identifier.h b/include/tins/tcp_ip/stream_identifier.h index 9f6c019..d84ed4a 100644 --- a/include/tins/tcp_ip/stream_identifier.h +++ b/include/tins/tcp_ip/stream_identifier.h @@ -30,7 +30,7 @@ #ifndef TINS_TCP_IP_STREAM_ID_H #define TINS_TCP_IP_STREAM_ID_H -#include "../config.h" +#include #ifdef TINS_HAVE_TCPIP diff --git a/include/tins/tcp_stream.h b/include/tins/tcp_stream.h index eff9fcc..6c5fb56 100644 --- a/include/tins/tcp_stream.h +++ b/include/tins/tcp_stream.h @@ -35,15 +35,15 @@ #include #include #include -#include "macros.h" -#include "tcp.h" -#include "ip.h" -#include "ip_address.h" -#include "utils/pdu_utils.h" +#include +#include +#include +#include +#include #ifdef TINS_HAVE_PCAP -#include "sniffer.h" +#include namespace Tins { class Sniffer; diff --git a/include/tins/timestamp.h b/include/tins/timestamp.h index 503dc15..fd37bb7 100644 --- a/include/tins/timestamp.h +++ b/include/tins/timestamp.h @@ -31,8 +31,8 @@ #define TINS_TIMESTAMP_H #include -#include "macros.h" -#include "cxxstd.h" +#include +#include #if TINS_IS_CXX11 #include #endif diff --git a/include/tins/tins.h b/include/tins/tins.h index 55a5efd..86b2789 100644 --- a/include/tins/tins.h +++ b/include/tins/tins.h @@ -30,50 +30,50 @@ #ifndef TINS_TINS_H #define TINS_TINS_H -#include "dns.h" -#include "arp.h" -#include "bootp.h" -#include "dhcp.h" -#include "eapol.h" -#include "ethernetII.h" -#include "ieee802_3.h" -#include "llc.h" -#include "icmp.h" -#include "icmpv6.h" -#include "dot11.h" -#include "dot1q.h" -#include "dot3.h" -#include "ip.h" -#include "ipv6.h" -#include "mpls.h" -#include "packet_sender.h" -#include "packet_writer.h" -#include "pdu.h" -#include "radiotap.h" -#include "rawpdu.h" -#include "snap.h" -#include "sniffer.h" -#include "tcp.h" -#include "udp.h" -#include "utils.h" -#include "tcp_stream.h" -#include "crypto.h" -#include "pdu_cacher.h" -#include "rsn_information.h" -#include "ipv6_address.h" -#include "ip_address.h" -#include "packet.h" -#include "timestamp.h" -#include "sll.h" -#include "dhcpv6.h" -#include "pppoe.h" -#include "stp.h" -#include "handshake_capturer.h" -#include "address_range.h" -#include "pdu_allocator.h" -#include "ipsec.h" -#include "ip_reassembler.h" -#include "ppi.h" -#include "pdu_iterator.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif // TINS_TINS_H diff --git a/include/tins/udp.h b/include/tins/udp.h index c50245b..16fab30 100644 --- a/include/tins/udp.h +++ b/include/tins/udp.h @@ -30,9 +30,9 @@ #ifndef TINS_UDP_H #define TINS_UDP_H -#include "macros.h" -#include "pdu.h" -#include "endianness.h" +#include +#include +#include namespace Tins { diff --git a/include/tins/utils.h b/include/tins/utils.h index a680966..86d1070 100644 --- a/include/tins/utils.h +++ b/include/tins/utils.h @@ -30,13 +30,13 @@ #ifndef TINS_UTILS_H #define TINS_UTILS_H -#include "utils/checksum_utils.h" -#include "utils/frequency_utils.h" -#include "utils/routing_utils.h" -#include "utils/resolve_utils.h" -#include "utils/pdu_utils.h" -#include "utils/radiotap_parser.h" -#include "utils/radiotap_writer.h" +#include +#include +#include +#include +#include +#include +#include namespace Tins { diff --git a/include/tins/utils/checksum_utils.h b/include/tins/utils/checksum_utils.h index 1c4b407..9c669b7 100644 --- a/include/tins/utils/checksum_utils.h +++ b/include/tins/utils/checksum_utils.h @@ -31,7 +31,7 @@ #define TINS_CHECKSUM_UTILS_H #include -#include "../macros.h" +#include namespace Tins { diff --git a/include/tins/utils/frequency_utils.h b/include/tins/utils/frequency_utils.h index dfc34d5..99c02c2 100644 --- a/include/tins/utils/frequency_utils.h +++ b/include/tins/utils/frequency_utils.h @@ -31,7 +31,7 @@ #define TINS_FREQUENCY_UTILS_H #include -#include "../macros.h" +#include namespace Tins { namespace Utils { diff --git a/include/tins/utils/pdu_utils.h b/include/tins/utils/pdu_utils.h index 2e91217..c1b90a0 100644 --- a/include/tins/utils/pdu_utils.h +++ b/include/tins/utils/pdu_utils.h @@ -30,9 +30,9 @@ #ifndef TINS_PDU_UTILS_H #define TINS_PDU_UTILS_H -#include "../macros.h" -#include "../pdu.h" -#include "../detail/type_traits.h" +#include +#include +#include namespace Tins { namespace Utils { diff --git a/include/tins/utils/radiotap_parser.h b/include/tins/utils/radiotap_parser.h index 44e2744..1f87a17 100644 --- a/include/tins/utils/radiotap_parser.h +++ b/include/tins/utils/radiotap_parser.h @@ -31,9 +31,9 @@ #define TINS_RADIOTAP_PARSER_H #include -#include "../macros.h" -#include "../radiotap.h" -#include "../pdu_option.h" +#include +#include +#include namespace Tins { namespace Utils { diff --git a/include/tins/utils/radiotap_writer.h b/include/tins/utils/radiotap_writer.h index 7d08326..8b70e00 100644 --- a/include/tins/utils/radiotap_writer.h +++ b/include/tins/utils/radiotap_writer.h @@ -32,7 +32,7 @@ #include #include -#include "../radiotap.h" +#include namespace Tins { namespace Utils { diff --git a/include/tins/utils/resolve_utils.h b/include/tins/utils/resolve_utils.h index b3c45d8..8d9cf43 100644 --- a/include/tins/utils/resolve_utils.h +++ b/include/tins/utils/resolve_utils.h @@ -31,7 +31,7 @@ #define TINS_RESOLVE_UTILS_H #include -#include "../macros.h" +#include namespace Tins { diff --git a/include/tins/utils/routing_utils.h b/include/tins/utils/routing_utils.h index a162841..199f363 100644 --- a/include/tins/utils/routing_utils.h +++ b/include/tins/utils/routing_utils.h @@ -32,9 +32,9 @@ #include #include -#include "../macros.h" -#include "../ip_address.h" -#include "../ipv6_address.h" +#include +#include +#include // Fix for Windows interface define on combaseapi.h #undef interface diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 07b0540..5718cee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(LIBTINS_INCLUDE_DIR ../include/tins/) +SET(LIBTINS_INCLUDE_DIR ../include/) IF(HAVE_PCAP_IMMEDIATE_MODE) ADD_DEFINITIONS("-DHAVE_PCAP_IMMEDIATE_MODE=1") diff --git a/src/address_range.cpp b/src/address_range.cpp index a016ed9..e03d062 100644 --- a/src/address_range.cpp +++ b/src/address_range.cpp @@ -27,9 +27,9 @@ * */ -#include "address_range.h" -#include "ip_address.h" -#include "ipv6_address.h" +#include +#include +#include using std::logic_error; diff --git a/src/arp.cpp b/src/arp.cpp index 06eb32d..63b4937 100644 --- a/src/arp.cpp +++ b/src/arp.cpp @@ -28,12 +28,12 @@ */ #include -#include "arp.h" -#include "ethernetII.h" -#include "rawpdu.h" -#include "constants.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/bootp.cpp b/src/bootp.cpp index 2543bf2..343a6b7 100644 --- a/src/bootp.cpp +++ b/src/bootp.cpp @@ -28,9 +28,9 @@ */ #include -#include "bootp.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include using std::copy; diff --git a/src/crypto.cpp b/src/crypto.cpp index 6cf076a..cf33530 100644 --- a/src/crypto.cpp +++ b/src/crypto.cpp @@ -27,7 +27,7 @@ * */ -#include "crypto.h" +#include #ifdef TINS_HAVE_DOT11 @@ -37,13 +37,13 @@ #include #include #endif // TINS_HAVE_WPA2_DECRYPTION -#include "snap.h" -#include "rawpdu.h" -#include "dot11/dot11_data.h" -#include "dot11/dot11_beacon.h" -#include "exceptions.h" -#include "utils/checksum_utils.h" -#include "detail/type_traits.h" +#include +#include +#include +#include +#include +#include +#include using std::string; using std::vector; diff --git a/src/detail/address_helpers.cpp b/src/detail/address_helpers.cpp index 2d58011..811d596 100644 --- a/src/detail/address_helpers.cpp +++ b/src/detail/address_helpers.cpp @@ -27,10 +27,10 @@ * */ -#include "ip_address.h" -#include "ipv6_address.h" -#include "endianness.h" -#include "detail/address_helpers.h" +#include +#include +#include +#include using Tins::IPv4Address; using Tins::IPv6Address; diff --git a/src/detail/icmp_extension_helpers.cpp b/src/detail/icmp_extension_helpers.cpp index a2eea40..2293a2d 100644 --- a/src/detail/icmp_extension_helpers.cpp +++ b/src/detail/icmp_extension_helpers.cpp @@ -27,10 +27,10 @@ * */ -#include "detail/icmp_extension_helpers.h" -#include "memory_helpers.h" -#include "pdu.h" -#include "icmp_extension.h" +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; diff --git a/src/detail/pdu_helpers.cpp b/src/detail/pdu_helpers.cpp index ea15ee5..1b94595 100644 --- a/src/detail/pdu_helpers.cpp +++ b/src/detail/pdu_helpers.cpp @@ -27,31 +27,31 @@ * */ -#include "detail/pdu_helpers.h" +#include #ifdef TINS_HAVE_PCAP #include #endif // TINS_HAVE_PCAP -#include "ip.h" -#include "ethernetII.h" -#include "ieee802_3.h" -#include "radiotap.h" -#include "dot11/dot11_base.h" -#include "ipv6.h" -#include "tcp.h" -#include "udp.h" -#include "ipsec.h" -#include "icmp.h" -#include "loopback.h" -#include "sll.h" -#include "ppi.h" -#include "icmpv6.h" -#include "mpls.h" -#include "arp.h" -#include "eapol.h" -#include "rawpdu.h" -#include "dot1q.h" -#include "pppoe.h" -#include "pdu_allocator.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Tins { namespace Internals { diff --git a/src/detail/sequence_number_helpers.cpp b/src/detail/sequence_number_helpers.cpp index 7c8acec..b7c4d22 100644 --- a/src/detail/sequence_number_helpers.cpp +++ b/src/detail/sequence_number_helpers.cpp @@ -27,7 +27,7 @@ * */ -#include "detail/sequence_number_helpers.h" +#include namespace Tins { namespace Internals { diff --git a/src/dhcp.cpp b/src/dhcp.cpp index 7d70436..f513099 100644 --- a/src/dhcp.cpp +++ b/src/dhcp.cpp @@ -28,10 +28,10 @@ */ #include -#include "endianness.h" -#include "dhcp.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include +#include using std::string; using std::vector; diff --git a/src/dhcpv6.cpp b/src/dhcpv6.cpp index 4107920..196e851 100644 --- a/src/dhcpv6.cpp +++ b/src/dhcpv6.cpp @@ -28,9 +28,9 @@ */ #include -#include "dhcpv6.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include using std::vector; using std::memcpy; diff --git a/src/dns.cpp b/src/dns.cpp index d36c87a..46712e7 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -29,12 +29,12 @@ #include #include -#include "dns.h" -#include "ip_address.h" -#include "ipv6_address.h" -#include "exceptions.h" -#include "endianness.h" -#include "memory_helpers.h" +#include +#include +#include +#include +#include +#include using std::string; using std::memcpy; diff --git a/src/dot11/dot11_assoc.cpp b/src/dot11/dot11_assoc.cpp index 23edbd2..48da516 100644 --- a/src/dot11/dot11_assoc.cpp +++ b/src/dot11/dot11_assoc.cpp @@ -27,11 +27,11 @@ * */ -#include "dot11/dot11_assoc.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "memory_helpers.h" +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/dot11/dot11_auth.cpp b/src/dot11/dot11_auth.cpp index d8af8ce..a67817e 100644 --- a/src/dot11/dot11_auth.cpp +++ b/src/dot11/dot11_auth.cpp @@ -27,11 +27,11 @@ * */ -#include "dot11/dot11_auth.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "memory_helpers.h" +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp index 5ab1a77..cc89338 100644 --- a/src/dot11/dot11_base.cpp +++ b/src/dot11/dot11_base.cpp @@ -27,13 +27,13 @@ * */ -#include "dot11/dot11_base.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "macros.h" -#include "exceptions.h" +#include +#include #ifndef _WIN32 #if defined(__FreeBSD_kernel__) || defined(BSD) || defined(__APPLE__) @@ -45,9 +45,9 @@ #include #include #endif -#include "dot11.h" -#include "packet_sender.h" -#include "memory_helpers.h" +#include +#include +#include using std::vector; diff --git a/src/dot11/dot11_beacon.cpp b/src/dot11/dot11_beacon.cpp index 0c742f8..602c524 100644 --- a/src/dot11/dot11_beacon.cpp +++ b/src/dot11/dot11_beacon.cpp @@ -27,11 +27,11 @@ * */ -#include "dot11/dot11_beacon.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "memory_helpers.h" +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/dot11/dot11_control.cpp b/src/dot11/dot11_control.cpp index 0625520..eb2d1b9 100644 --- a/src/dot11/dot11_control.cpp +++ b/src/dot11/dot11_control.cpp @@ -27,10 +27,10 @@ * */ -#include "dot11/dot11_control.h" +#include #ifdef TINS_HAVE_DOT11 -#include "memory_helpers.h" +#include using std::copy; diff --git a/src/dot11/dot11_data.cpp b/src/dot11/dot11_data.cpp index d346a6d..775f926 100644 --- a/src/dot11/dot11_data.cpp +++ b/src/dot11/dot11_data.cpp @@ -27,13 +27,13 @@ * */ -#include "dot11/dot11_data.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "rawpdu.h" -#include "snap.h" -#include "memory_helpers.h" +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/dot11/dot11_mgmt.cpp b/src/dot11/dot11_mgmt.cpp index 2b98bac..0579f7d 100644 --- a/src/dot11/dot11_mgmt.cpp +++ b/src/dot11/dot11_mgmt.cpp @@ -27,13 +27,13 @@ * */ -#include "dot11/dot11_mgmt.h" +#include #ifdef TINS_HAVE_DOT11 #include #include -#include "rsn_information.h" -#include "memory_helpers.h" +#include +#include using std::string; using std::copy; diff --git a/src/dot11/dot11_probe.cpp b/src/dot11/dot11_probe.cpp index dd06f06..f7fc032 100644 --- a/src/dot11/dot11_probe.cpp +++ b/src/dot11/dot11_probe.cpp @@ -27,12 +27,12 @@ * */ -#include "dot11/dot11_probe.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "memory_helpers.h" +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/dot1q.cpp b/src/dot1q.cpp index fde47a0..c5522a6 100644 --- a/src/dot1q.cpp +++ b/src/dot1q.cpp @@ -28,10 +28,10 @@ */ #include -#include "dot1q.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/dot3.cpp b/src/dot3.cpp index 686893f..a0b247e 100644 --- a/src/dot3.cpp +++ b/src/dot3.cpp @@ -28,7 +28,7 @@ */ #include -#include "macros.h" +#include #ifndef _WIN32 #if defined(BSD) || defined(__FreeBSD_kernel__) #include @@ -38,11 +38,11 @@ #include #include #endif -#include "dot3.h" -#include "packet_sender.h" -#include "llc.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include +#include +#include using std::copy; using std::equal; diff --git a/src/eapol.cpp b/src/eapol.cpp index af6d0e6..7d8aa05 100644 --- a/src/eapol.cpp +++ b/src/eapol.cpp @@ -28,10 +28,10 @@ */ #include -#include "eapol.h" -#include "exceptions.h" -#include "rawpdu.h" -#include "memory_helpers.h" +#include +#include +#include +#include using std::memset; using std::memcpy; diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp index e09a36a..61f9686 100644 --- a/src/ethernetII.cpp +++ b/src/ethernetII.cpp @@ -28,7 +28,7 @@ */ #include -#include "macros.h" +#include #ifndef _WIN32 #if defined(BSD) || defined(__FreeBSD_kernel__) #include @@ -38,14 +38,14 @@ #include #include #endif -#include "ethernetII.h" -#include "config.h" -#include "packet_sender.h" -#include "pppoe.h" -#include "constants.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/handshake_capturer.cpp b/src/handshake_capturer.cpp index 86aa726..384f74e 100644 --- a/src/handshake_capturer.cpp +++ b/src/handshake_capturer.cpp @@ -27,12 +27,12 @@ * */ -#include "handshake_capturer.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "dot11/dot11_data.h" +#include using std::max_element; using std::max; diff --git a/src/hw_address.cpp b/src/hw_address.cpp index e373b4f..ce59d9a 100644 --- a/src/hw_address.cpp +++ b/src/hw_address.cpp @@ -30,8 +30,8 @@ #include #include #include -#include "hw_address.h" -#include "exceptions.h" +#include +#include using std::string; using std::ostream; diff --git a/src/icmp.cpp b/src/icmp.cpp index 11c9878..e942034 100644 --- a/src/icmp.cpp +++ b/src/icmp.cpp @@ -31,12 +31,12 @@ #ifndef _WIN32 #include #endif -#include "rawpdu.h" -#include "exceptions.h" -#include "icmp.h" -#include "memory_helpers.h" -#include "detail/icmp_extension_helpers.h" -#include "utils/checksum_utils.h" +#include +#include +#include +#include +#include +#include using std::memset; diff --git a/src/icmp_extension.cpp b/src/icmp_extension.cpp index 66b6f89..480fa34 100644 --- a/src/icmp_extension.cpp +++ b/src/icmp_extension.cpp @@ -28,11 +28,11 @@ */ #include -#include "icmp_extension.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "mpls.h" -#include "utils/checksum_utils.h" +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp index c9aff12..9e2e50a 100644 --- a/src/icmpv6.cpp +++ b/src/icmpv6.cpp @@ -28,14 +28,14 @@ */ #include -#include "icmpv6.h" -#include "ipv6.h" -#include "rawpdu.h" -#include "constants.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "detail/icmp_extension_helpers.h" -#include "utils/checksum_utils.h" +#include +#include +#include +#include +#include +#include +#include +#include using std::memset; using std::vector; diff --git a/src/ip.cpp b/src/ip.cpp index 2380126..7ba6ffd 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -35,17 +35,17 @@ #else #include #endif -#include "ip.h" -#include "rawpdu.h" -#include "packet_sender.h" -#include "constants.h" -#include "network_interface.h" -#include "exceptions.h" -#include "pdu_allocator.h" -#include "memory_helpers.h" -#include "utils/checksum_utils.h" -#include "detail/pdu_helpers.h" -#include "pdu_allocator.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using std::memcmp; using std::vector; diff --git a/src/ip_address.cpp b/src/ip_address.cpp index cca9af4..b5c2b23 100644 --- a/src/ip_address.cpp +++ b/src/ip_address.cpp @@ -39,10 +39,10 @@ #endif // TINS_IS_CXX11 #include #include -#include "ip_address.h" -#include "endianness.h" -#include "address_range.h" -#include "exceptions.h" +#include +#include +#include +#include using std::string; diff --git a/src/ip_reassembler.cpp b/src/ip_reassembler.cpp index 41a808f..cdbc039 100644 --- a/src/ip_reassembler.cpp +++ b/src/ip_reassembler.cpp @@ -27,10 +27,10 @@ * */ -#include "ip.h" -#include "constants.h" -#include "ip_reassembler.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include using std::make_pair; diff --git a/src/ipsec.cpp b/src/ipsec.cpp index e925c2e..7f69c3f 100644 --- a/src/ipsec.cpp +++ b/src/ipsec.cpp @@ -28,10 +28,10 @@ */ #include -#include "ipsec.h" -#include "rawpdu.h" -#include "memory_helpers.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include using std::memcpy; using std::copy; diff --git a/src/ipv6.cpp b/src/ipv6.cpp index 281433b..c81b843 100644 --- a/src/ipv6.cpp +++ b/src/ipv6.cpp @@ -34,14 +34,14 @@ #else #include #endif -#include "ipv6.h" -#include "constants.h" -#include "packet_sender.h" -#include "rawpdu.h" -#include "exceptions.h" -#include "pdu_allocator.h" -#include "memory_helpers.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include +#include +#include +#include +#include using std::vector; diff --git a/src/ipv6_address.cpp b/src/ipv6_address.cpp index 36e12c2..b28ba4f 100644 --- a/src/ipv6_address.cpp +++ b/src/ipv6_address.cpp @@ -27,7 +27,7 @@ * */ -#include "macros.h" +#include #ifndef _WIN32 #include #ifdef BSD @@ -44,9 +44,9 @@ #include #include #include -#include "ipv6_address.h" -#include "address_range.h" -#include "exceptions.h" +#include +#include +#include using std::memset; using std::memcpy; diff --git a/src/llc.cpp b/src/llc.cpp index 2391053..bcb2703 100644 --- a/src/llc.cpp +++ b/src/llc.cpp @@ -28,11 +28,11 @@ */ #include -#include "llc.h" -#include "stp.h" -#include "rawpdu.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/loopback.cpp b/src/loopback.cpp index 64c8af5..0c0b4d6 100644 --- a/src/loopback.cpp +++ b/src/loopback.cpp @@ -38,14 +38,14 @@ #include #endif #include -#include "loopback.h" -#include "packet_sender.h" -#include "ip.h" -#include "ipv6.h" -#include "llc.h" -#include "rawpdu.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include +#include +#include +#include +#include +#include #if !defined(PF_LLC) // compilation fix, nasty but at least works on BSD diff --git a/src/memory_helpers.cpp b/src/memory_helpers.cpp index a547e1f..d609a56 100644 --- a/src/memory_helpers.cpp +++ b/src/memory_helpers.cpp @@ -27,10 +27,10 @@ * */ -#include "memory_helpers.h" -#include "ip_address.h" -#include "ipv6_address.h" -#include "hw_address.h" +#include +#include +#include +#include using std::vector; diff --git a/src/mpls.cpp b/src/mpls.cpp index d982b33..58e341c 100644 --- a/src/mpls.cpp +++ b/src/mpls.cpp @@ -27,12 +27,12 @@ * */ -#include "mpls.h" -#include "ip.h" -#include "ipv6.h" -#include "rawpdu.h" -#include "memory_helpers.h" -#include "icmp_extension.h" +#include +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/network_interface.cpp b/src/network_interface.cpp index 6dcf707..6ab5220 100644 --- a/src/network_interface.cpp +++ b/src/network_interface.cpp @@ -31,7 +31,7 @@ #include #include #include -#include "macros.h" +#include #ifndef _WIN32 #include #if defined(BSD) || defined(__FreeBSD_kernel__) @@ -49,10 +49,10 @@ #include #undef interface #endif -#include "network_interface.h" -#include "endianness.h" -#include "exceptions.h" -#include "utils/routing_utils.h" +#include +#include +#include +#include using std::string; using std::wstring; diff --git a/src/offline_packet_filter.cpp b/src/offline_packet_filter.cpp index 7cd39b2..a0fb462 100644 --- a/src/offline_packet_filter.cpp +++ b/src/offline_packet_filter.cpp @@ -28,9 +28,9 @@ */ #include -#include "offline_packet_filter.h" -#include "pdu.h" -#include "exceptions.h" +#include +#include +#include using std::string; diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp index 2a9e320..349084e 100644 --- a/src/packet_sender.cpp +++ b/src/packet_sender.cpp @@ -27,7 +27,7 @@ * */ -#include "packet_sender.h" +#include #ifndef _WIN32 #include #include @@ -55,16 +55,16 @@ #include #include #include -#include "pdu.h" -#include "macros.h" +#include +#include // PDUs required by PacketSender::send(PDU&, NetworkInterface) -#include "ethernetII.h" -#include "radiotap.h" -#include "dot11/dot11_base.h" -#include "radiotap.h" -#include "ieee802_3.h" -#include "cxxstd.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include +#include +#include +#include #if TINS_IS_CXX11 #include #endif // TINS_IS_CXX11 diff --git a/src/packet_writer.cpp b/src/packet_writer.cpp index b33d9b1..613f070 100644 --- a/src/packet_writer.cpp +++ b/src/packet_writer.cpp @@ -31,10 +31,10 @@ #include #endif #include -#include "packet_writer.h" -#include "packet.h" -#include "pdu.h" -#include "exceptions.h" +#include +#include +#include +#include using std::string; diff --git a/src/pdu.cpp b/src/pdu.cpp index 5884b64..8328ece 100644 --- a/src/pdu.cpp +++ b/src/pdu.cpp @@ -27,8 +27,8 @@ * */ -#include "pdu.h" -#include "packet_sender.h" +#include +#include using std::swap; using std::vector; diff --git a/src/pdu_iterator.cpp b/src/pdu_iterator.cpp index 357c6ff..55cfa00 100644 --- a/src/pdu_iterator.cpp +++ b/src/pdu_iterator.cpp @@ -27,9 +27,9 @@ * */ -#include "pdu_iterator.h" -#include "pdu.h" -#include "packet.h" +#include +#include +#include namespace Tins { diff --git a/src/pdu_option.cpp b/src/pdu_option.cpp index c8fda05..ae2554a 100644 --- a/src/pdu_option.cpp +++ b/src/pdu_option.cpp @@ -28,13 +28,13 @@ */ #include -#include "pdu.h" -#include "ip_address.h" -#include "ipv6_address.h" -#include "hw_address.h" -#include "endianness.h" -#include "pdu_option.h" -#include "memory_helpers.h" +#include +#include +#include +#include +#include +#include +#include using std::vector; using std::pair; diff --git a/src/pktap.cpp b/src/pktap.cpp index c58b8a5..40edd9a 100644 --- a/src/pktap.cpp +++ b/src/pktap.cpp @@ -28,11 +28,11 @@ */ #include -#include "exceptions.h" -#include "pktap.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; diff --git a/src/ppi.cpp b/src/ppi.cpp index 047cf60..fbab922 100644 --- a/src/ppi.cpp +++ b/src/ppi.cpp @@ -29,16 +29,16 @@ #include #include -#include "dot11/dot11_base.h" -#include "dot3.h" -#include "ethernetII.h" -#include "radiotap.h" -#include "loopback.h" -#include "sll.h" -#include "ppi.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; diff --git a/src/pppoe.cpp b/src/pppoe.cpp index 36eccd0..3541663 100644 --- a/src/pppoe.cpp +++ b/src/pppoe.cpp @@ -28,10 +28,10 @@ */ #include -#include "pppoe.h" -#include "rawpdu.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include +#include using std::string; using std::vector; diff --git a/src/radiotap.cpp b/src/radiotap.cpp index 777e99f..009c2eb 100644 --- a/src/radiotap.cpp +++ b/src/radiotap.cpp @@ -27,12 +27,12 @@ * */ -#include "radiotap.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "macros.h" +#include #ifndef _WIN32 #if defined(BSD) || defined(__FreeBSD_kernel__) #include @@ -42,14 +42,14 @@ #endif #include #endif -#include "dot11/dot11_base.h" -#include "packet_sender.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "utils/checksum_utils.h" -#include "utils/frequency_utils.h" -#include "utils/radiotap_parser.h" -#include "utils/radiotap_writer.h" +#include +#include +#include +#include +#include +#include +#include +#include using std::memcpy; diff --git a/src/rawpdu.cpp b/src/rawpdu.cpp index 2c4d516..9b1655f 100644 --- a/src/rawpdu.cpp +++ b/src/rawpdu.cpp @@ -27,8 +27,8 @@ * */ -#include "rawpdu.h" -#include "memory_helpers.h" +#include +#include using Tins::Memory::OutputMemoryStream; diff --git a/src/rsn_information.cpp b/src/rsn_information.cpp index f88d9cb..93fa1a8 100644 --- a/src/rsn_information.cpp +++ b/src/rsn_information.cpp @@ -27,15 +27,15 @@ * */ -#include "rsn_information.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "exceptions.h" -#include "pdu.h" -#include "pdu_option.h" -#include "memory_helpers.h" -#include "dot11/dot11_base.h" +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/sll.cpp b/src/sll.cpp index ec7f6a8..135986d 100644 --- a/src/sll.cpp +++ b/src/sll.cpp @@ -28,10 +28,10 @@ */ #include -#include "sll.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/snap.cpp b/src/snap.cpp index 644ea6f..c23930d 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -32,11 +32,11 @@ #include #include #endif -#include "snap.h" -#include "constants.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/sniffer.cpp b/src/sniffer.cpp index be0ec82..e511f34 100644 --- a/src/sniffer.cpp +++ b/src/sniffer.cpp @@ -33,19 +33,19 @@ #define TINS_PREFIX_INTERFACE(x) (x) #endif // _WIN32 -#include "sniffer.h" -#include "dot11/dot11_base.h" -#include "ethernetII.h" -#include "radiotap.h" -#include "loopback.h" -#include "rawpdu.h" -#include "dot3.h" -#include "pktap.h" -#include "sll.h" -#include "ppi.h" -#include "ip.h" -#include "ipv6.h" -#include "detail/pdu_helpers.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using std::string; diff --git a/src/stp.cpp b/src/stp.cpp index 3956368..094451f 100644 --- a/src/stp.cpp +++ b/src/stp.cpp @@ -28,9 +28,9 @@ */ #include -#include "stp.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/tcp.cpp b/src/tcp.cpp index 2906302..67628d5 100644 --- a/src/tcp.cpp +++ b/src/tcp.cpp @@ -28,14 +28,14 @@ */ #include -#include "tcp.h" -#include "ip.h" -#include "ipv6.h" -#include "constants.h" -#include "rawpdu.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "utils/checksum_utils.h" +#include +#include +#include +#include +#include +#include +#include +#include using std::vector; using std::pair; diff --git a/src/tcp_ip/ack_tracker.cpp b/src/tcp_ip/ack_tracker.cpp index a4129d2..df5b0f3 100644 --- a/src/tcp_ip/ack_tracker.cpp +++ b/src/tcp_ip/ack_tracker.cpp @@ -27,13 +27,13 @@ * */ -#include "tcp_ip/ack_tracker.h" +#include #ifdef TINS_HAVE_ACK_TRACKER #include -#include "tcp.h" -#include "detail/sequence_number_helpers.h" +#include +#include using std::vector; using std::numeric_limits; diff --git a/src/tcp_ip/data_tracker.cpp b/src/tcp_ip/data_tracker.cpp index 0987513..ba03e01 100644 --- a/src/tcp_ip/data_tracker.cpp +++ b/src/tcp_ip/data_tracker.cpp @@ -27,11 +27,11 @@ * */ -#include "tcp_ip/data_tracker.h" +#include #ifdef TINS_HAVE_TCPIP -#include "detail/sequence_number_helpers.h" +#include using std::move; diff --git a/src/tcp_ip/flow.cpp b/src/tcp_ip/flow.cpp index 7a6a888..de4fdba 100644 --- a/src/tcp_ip/flow.cpp +++ b/src/tcp_ip/flow.cpp @@ -27,20 +27,20 @@ * */ -#include "tcp_ip/flow.h" +#include #ifdef TINS_HAVE_TCPIP #include -#include "ip_address.h" -#include "ipv6_address.h" -#include "tcp.h" -#include "ip.h" -#include "ipv6.h" -#include "rawpdu.h" -#include "detail/sequence_number_helpers.h" -#include "exceptions.h" -#include "memory_helpers.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using std::make_pair; using std::bind; diff --git a/src/tcp_ip/stream.cpp b/src/tcp_ip/stream.cpp index 2fb2ff0..48e7cfc 100644 --- a/src/tcp_ip/stream.cpp +++ b/src/tcp_ip/stream.cpp @@ -27,20 +27,19 @@ * */ -#include "tcp_ip/stream.h" +#include #ifdef TINS_HAVE_TCPIP #include -#include "memory.h" -#include "ip_address.h" -#include "ipv6_address.h" -#include "tcp.h" -#include "ip.h" -#include "ipv6.h" -#include "ethernetII.h" -#include "rawpdu.h" -#include "exceptions.h" +#include +#include +#include +#include +#include +#include +#include +#include using std::make_pair; using std::bind; diff --git a/src/tcp_ip/stream_follower.cpp b/src/tcp_ip/stream_follower.cpp index d0250ac..b683219 100644 --- a/src/tcp_ip/stream_follower.cpp +++ b/src/tcp_ip/stream_follower.cpp @@ -27,20 +27,19 @@ * */ -#include "tcp_ip/stream_follower.h" +#include #ifdef TINS_HAVE_TCPIP #include -#include "memory.h" -#include "ip_address.h" -#include "ipv6_address.h" -#include "tcp.h" -#include "ip.h" -#include "ipv6.h" -#include "rawpdu.h" -#include "packet.h" -#include "exceptions.h" +#include +#include +#include +#include +#include +#include +#include +#include using std::make_pair; using std::bind; diff --git a/src/tcp_ip/stream_identifier.cpp b/src/tcp_ip/stream_identifier.cpp index baeba6d..7693330 100644 --- a/src/tcp_ip/stream_identifier.cpp +++ b/src/tcp_ip/stream_identifier.cpp @@ -27,19 +27,19 @@ * */ -#include "tcp_ip/stream_identifier.h" +#include #ifdef TINS_HAVE_TCPIP #include #include -#include "memory_helpers.h" -#include "tcp.h" -#include "udp.h" -#include "ip.h" -#include "ipv6.h" -#include "exceptions.h" -#include "tcp_ip/stream.h" +#include +#include +#include +#include +#include +#include +#include using std::swap; using std::tie; diff --git a/src/tcp_stream.cpp b/src/tcp_stream.cpp index cddcabf..ec5905f 100644 --- a/src/tcp_stream.cpp +++ b/src/tcp_stream.cpp @@ -28,8 +28,8 @@ */ #include -#include "rawpdu.h" -#include "tcp_stream.h" +#include +#include using std::numeric_limits; using std::make_pair; diff --git a/src/timestamp.cpp b/src/timestamp.cpp index f69d3a0..262b15a 100644 --- a/src/timestamp.cpp +++ b/src/timestamp.cpp @@ -33,7 +33,7 @@ #else #include #endif -#include "timestamp.h" +#include namespace Tins { diff --git a/src/udp.cpp b/src/udp.cpp index ed0ffb4..b068e4c 100644 --- a/src/udp.cpp +++ b/src/udp.cpp @@ -28,14 +28,14 @@ */ #include -#include "udp.h" -#include "constants.h" -#include "ip.h" -#include "ipv6.h" -#include "rawpdu.h" -#include "exceptions.h" -#include "memory_helpers.h" -#include "utils/checksum_utils.h" +#include +#include +#include +#include +#include +#include +#include +#include using Tins::Memory::InputMemoryStream; using Tins::Memory::OutputMemoryStream; diff --git a/src/utils/checksum_utils.cpp b/src/utils/checksum_utils.cpp index 3038ec0..5677263 100644 --- a/src/utils/checksum_utils.cpp +++ b/src/utils/checksum_utils.cpp @@ -27,12 +27,12 @@ * */ -#include "utils/checksum_utils.h" +#include #include -#include "ip_address.h" -#include "ipv6_address.h" -#include "endianness.h" -#include "memory_helpers.h" +#include +#include +#include +#include using std::memcpy; diff --git a/src/utils/frequency_utils.cpp b/src/utils/frequency_utils.cpp index 9c27d06..05f1e3f 100644 --- a/src/utils/frequency_utils.cpp +++ b/src/utils/frequency_utils.cpp @@ -27,7 +27,7 @@ * */ -#include "utils/frequency_utils.h" +#include namespace Tins { namespace Utils { diff --git a/src/utils/pdu_utils.cpp b/src/utils/pdu_utils.cpp index a268539..7a89eba 100644 --- a/src/utils/pdu_utils.cpp +++ b/src/utils/pdu_utils.cpp @@ -27,7 +27,7 @@ * */ -#include "utils/pdu_utils.h" +#include using std::string; diff --git a/src/utils/radiotap_parser.cpp b/src/utils/radiotap_parser.cpp index 0caa0ab..3c033e0 100644 --- a/src/utils/radiotap_parser.cpp +++ b/src/utils/radiotap_parser.cpp @@ -28,8 +28,8 @@ */ #include -#include "utils/radiotap_parser.h" -#include "exceptions.h" +#include +#include using std::vector; diff --git a/src/utils/radiotap_writer.cpp b/src/utils/radiotap_writer.cpp index 0608db8..1e3871a 100644 --- a/src/utils/radiotap_writer.cpp +++ b/src/utils/radiotap_writer.cpp @@ -28,9 +28,9 @@ */ #include -#include "utils/radiotap_writer.h" -#include "utils/radiotap_parser.h" -#include "exceptions.h" +#include +#include +#include using std::vector; diff --git a/src/utils/resolve_utils.cpp b/src/utils/resolve_utils.cpp index b620c12..1be8fce 100644 --- a/src/utils/resolve_utils.cpp +++ b/src/utils/resolve_utils.cpp @@ -27,7 +27,7 @@ * */ -#include "utils/resolve_utils.h" +#include #ifndef _WIN32 #if defined(BSD) || defined(__FreeBSD_kernel__) #include @@ -48,15 +48,15 @@ #include #undef interface #endif -#include "exceptions.h" -#include "ip_address.h" -#include "ipv6_address.h" -#include "hw_address.h" -#include "ethernetII.h" -#include "arp.h" -#include "packet_sender.h" -#include "network_interface.h" -#include "detail/smart_ptr.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using std::string; diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp index 35860ae..a233bca 100644 --- a/src/utils/routing_utils.cpp +++ b/src/utils/routing_utils.cpp @@ -27,7 +27,7 @@ * */ -#include "utils/routing_utils.h" +#include #ifndef _WIN32 #if defined(BSD) || defined(__FreeBSD_kernel__) #include @@ -55,8 +55,8 @@ #endif #include #include -#include "network_interface.h" -#include "exceptions.h" +#include +#include using std::vector; using std::string; diff --git a/tests/include/tests/dot11.h b/tests/include/tests/dot11.h index affb369..967b605 100644 --- a/tests/include/tests/dot11.h +++ b/tests/include/tests/dot11.h @@ -1,7 +1,7 @@ #ifndef TINS_DOT11_TEST #define TINS_DOT11_TEST -#include "dot11/dot11_base.h" +#include using Tins::Dot11; diff --git a/tests/include/tests/dot11_control.h b/tests/include/tests/dot11_control.h index 808677c..9f2a527 100644 --- a/tests/include/tests/dot11_control.h +++ b/tests/include/tests/dot11_control.h @@ -1,8 +1,8 @@ #ifndef TINS_TEST_DOT11_CONTROL_H #define TINS_TEST_DOT11_CONTROL_H +#include #include "tests/dot11.h" -#include "dot11/dot11_control.h" using Tins::Dot11ControlTA; diff --git a/tests/include/tests/dot11_data.h b/tests/include/tests/dot11_data.h index 3c0d430..7c250de 100644 --- a/tests/include/tests/dot11_data.h +++ b/tests/include/tests/dot11_data.h @@ -1,8 +1,8 @@ #ifndef TINS_TEST_DOT11_DATA_H #define TINS_TEST_DOT11_DATA_H +#include #include "tests/dot11.h" -#include "dot11/dot11_data.h" using Tins::Dot11Data; diff --git a/tests/include/tests/dot11_mgmt.h b/tests/include/tests/dot11_mgmt.h index bdf5bf4..e4f9bac 100644 --- a/tests/include/tests/dot11_mgmt.h +++ b/tests/include/tests/dot11_mgmt.h @@ -1,8 +1,8 @@ #ifndef TINS_DOT11_MGMT_TEST_H #define TINS_DOT11_MGMT_TEST_H +#include #include "tests/dot11.h" -#include "dot11/dot11_mgmt.h" using Tins::Dot11ManagementFrame; diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt index d35244c..78f5ca1 100644 --- a/tests/src/CMakeLists.txt +++ b/tests/src/CMakeLists.txt @@ -1,6 +1,6 @@ # Use libtins' include directories + test include directories INCLUDE_DIRECTORIES( - ${PROJECT_SOURCE_DIR}/include/tins/ + ${PROJECT_SOURCE_DIR}/include/ ../include/ ${GOOGLETEST_INCLUDE} ${PCAP_INCLUDE_DIR} diff --git a/tests/src/address_range_test.cpp b/tests/src/address_range_test.cpp index 195d1dd..234f55c 100644 --- a/tests/src/address_range_test.cpp +++ b/tests/src/address_range_test.cpp @@ -3,9 +3,9 @@ #include #include #include -#include "address_range.h" -#include "ip_address.h" -#include "ipv6_address.h" +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/allocators_test.cpp b/tests/src/allocators_test.cpp index b50a9d3..c17e783 100644 --- a/tests/src/allocators_test.cpp +++ b/tests/src/allocators_test.cpp @@ -2,13 +2,13 @@ #include #include #include -#include "pdu_allocator.h" -#include "ethernetII.h" -#include "snap.h" -#include "sll.h" -#include "dot1q.h" -#include "ip.h" -#include "ipv6.h" +#include +#include +#include +#include +#include +#include +#include using namespace Tins; diff --git a/tests/src/arp_test.cpp b/tests/src/arp_test.cpp index 09a25d9..7053727 100644 --- a/tests/src/arp_test.cpp +++ b/tests/src/arp_test.cpp @@ -3,8 +3,8 @@ #include #include #include -#include "arp.h" -#include "ip_address.h" +#include +#include using namespace std; diff --git a/tests/src/dhcp_test.cpp b/tests/src/dhcp_test.cpp index 2fee7a8..14b4a56 100644 --- a/tests/src/dhcp_test.cpp +++ b/tests/src/dhcp_test.cpp @@ -4,11 +4,11 @@ #include #include #include -#include "dhcp.h" -#include "utils.h" -#include "ethernetII.h" -#include "hw_address.h" -#include "ip_address.h" +#include +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/dhcpv6_test.cpp b/tests/src/dhcpv6_test.cpp index 4885e6f..b7319e2 100644 --- a/tests/src/dhcpv6_test.cpp +++ b/tests/src/dhcpv6_test.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "dhcpv6.h" +#include using namespace Tins; diff --git a/tests/src/dns_test.cpp b/tests/src/dns_test.cpp index c4d9dab..02217bc 100644 --- a/tests/src/dns_test.cpp +++ b/tests/src/dns_test.cpp @@ -1,7 +1,7 @@ #include #include -#include "dns.h" -#include "ipv6_address.h" +#include +#include using namespace Tins; diff --git a/tests/src/dot11/ack_test.cpp b/tests/src/dot11/ack_test.cpp index e85f9f5..fb8f14c 100644 --- a/tests/src/dot11/ack_test.cpp +++ b/tests/src/dot11/ack_test.cpp @@ -1,9 +1,9 @@ -#include "dot11/dot11_control.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/assoc_request_test.cpp b/tests/src/dot11/assoc_request_test.cpp index bfca902..d094954 100644 --- a/tests/src/dot11/assoc_request_test.cpp +++ b/tests/src/dot11/assoc_request_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_assoc.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/assoc_response_test.cpp b/tests/src/dot11/assoc_response_test.cpp index 28eaa82..076180d 100644 --- a/tests/src/dot11/assoc_response_test.cpp +++ b/tests/src/dot11/assoc_response_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_assoc.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/authentication_test.cpp b/tests/src/dot11/authentication_test.cpp index 718e140..cfed9f4 100644 --- a/tests/src/dot11/authentication_test.cpp +++ b/tests/src/dot11/authentication_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_auth.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/beacon_test.cpp b/tests/src/dot11/beacon_test.cpp index 76fc7d2..ceba09d 100644 --- a/tests/src/dot11/beacon_test.cpp +++ b/tests/src/dot11/beacon_test.cpp @@ -1,11 +1,11 @@ -#include "dot11/dot11_beacon.h" +#include #ifdef TINS_HAVE_DOT11 #include -#include "rsn_information.h" +#include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/block_ack_request_test.cpp b/tests/src/dot11/block_ack_request_test.cpp index 02a8470..f153939 100644 --- a/tests/src/dot11/block_ack_request_test.cpp +++ b/tests/src/dot11/block_ack_request_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_control.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/cf_end_ack_test.cpp b/tests/src/dot11/cf_end_ack_test.cpp index d0a282c..7033a77 100644 --- a/tests/src/dot11/cf_end_ack_test.cpp +++ b/tests/src/dot11/cf_end_ack_test.cpp @@ -1,10 +1,10 @@ -#include "config.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_control.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/cf_end_test.cpp b/tests/src/dot11/cf_end_test.cpp index 2172840..509df82 100644 --- a/tests/src/dot11/cf_end_test.cpp +++ b/tests/src/dot11/cf_end_test.cpp @@ -1,10 +1,10 @@ -#include "config.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_control.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/data_test.cpp b/tests/src/dot11/data_test.cpp index 8866df9..7239877 100644 --- a/tests/src/dot11/data_test.cpp +++ b/tests/src/dot11/data_test.cpp @@ -1,10 +1,10 @@ -#include "config.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_data.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/deauthentication_test.cpp b/tests/src/dot11/deauthentication_test.cpp index 4452899..9da39e1 100644 --- a/tests/src/dot11/deauthentication_test.cpp +++ b/tests/src/dot11/deauthentication_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_auth.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/disassoc_test.cpp b/tests/src/dot11/disassoc_test.cpp index 0867809..7894685 100644 --- a/tests/src/dot11/disassoc_test.cpp +++ b/tests/src/dot11/disassoc_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_assoc.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/dot11_test.cpp b/tests/src/dot11/dot11_test.cpp index 6fd9a25..27d7ce5 100644 --- a/tests/src/dot11/dot11_test.cpp +++ b/tests/src/dot11/dot11_test.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include #ifdef TINS_HAVE_DOT11 diff --git a/tests/src/dot11/probe_request_test.cpp b/tests/src/dot11/probe_request_test.cpp index b620794..98475f8 100644 --- a/tests/src/dot11/probe_request_test.cpp +++ b/tests/src/dot11/probe_request_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_probe.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/probe_response_test.cpp b/tests/src/dot11/probe_response_test.cpp index 2d8a705..ee6bfc1 100644 --- a/tests/src/dot11/probe_response_test.cpp +++ b/tests/src/dot11/probe_response_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_probe.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/ps_poll_test.cpp b/tests/src/dot11/ps_poll_test.cpp index eaff858..44f0752 100644 --- a/tests/src/dot11/ps_poll_test.cpp +++ b/tests/src/dot11/ps_poll_test.cpp @@ -1,10 +1,10 @@ -#include "config.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_control.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/reassoc_request_test.cpp b/tests/src/dot11/reassoc_request_test.cpp index 1a9ea11..202a5c3 100644 --- a/tests/src/dot11/reassoc_request_test.cpp +++ b/tests/src/dot11/reassoc_request_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_assoc.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/reassoc_response_test.cpp b/tests/src/dot11/reassoc_response_test.cpp index 2c55896..7ac0e1d 100644 --- a/tests/src/dot11/reassoc_response_test.cpp +++ b/tests/src/dot11/reassoc_response_test.cpp @@ -1,10 +1,10 @@ -#include "dot11/dot11_assoc.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_mgmt.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot11/rts_test.cpp b/tests/src/dot11/rts_test.cpp index 741a4a8..d60fedf 100644 --- a/tests/src/dot11/rts_test.cpp +++ b/tests/src/dot11/rts_test.cpp @@ -1,10 +1,10 @@ -#include "config.h" +#include #ifdef TINS_HAVE_DOT11 #include +#include #include "tests/dot11_control.h" -#include "detail/smart_ptr.h" using namespace std; using namespace Tins; diff --git a/tests/src/dot1q_test.cpp b/tests/src/dot1q_test.cpp index ae8e519..3075bce 100644 --- a/tests/src/dot1q_test.cpp +++ b/tests/src/dot1q_test.cpp @@ -2,12 +2,12 @@ #include #include #include -#include "dot1q.h" -#include "arp.h" -#include "ip.h" -#include "tcp.h" -#include "rawpdu.h" -#include "ethernetII.h" +#include +#include +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/ethernet_test.cpp b/tests/src/ethernet_test.cpp index 56267e8..4b0682b 100644 --- a/tests/src/ethernet_test.cpp +++ b/tests/src/ethernet_test.cpp @@ -1,11 +1,11 @@ #include #include -#include "ethernetII.h" -#include "macros.h" -#include "ipv6.h" -#include "ip.h" -#include "tcp.h" -#include "rawpdu.h" +#include +#include +#include +#include +#include +#include using namespace Tins; diff --git a/tests/src/hw_address_test.cpp b/tests/src/hw_address_test.cpp index 9f356b0..86b82cd 100644 --- a/tests/src/hw_address_test.cpp +++ b/tests/src/hw_address_test.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "hw_address.h" +#include using namespace Tins; diff --git a/tests/src/icmp_extension_test.cpp b/tests/src/icmp_extension_test.cpp index e0f235d..c7ace84 100644 --- a/tests/src/icmp_extension_test.cpp +++ b/tests/src/icmp_extension_test.cpp @@ -1,6 +1,6 @@ #include -#include "icmp_extension.h" -#include "mpls.h" +#include +#include using Tins::ICMPExtension; using Tins::ICMPExtensionsStructure; diff --git a/tests/src/icmp_test.cpp b/tests/src/icmp_test.cpp index a49cdc8..9feb6ff 100644 --- a/tests/src/icmp_test.cpp +++ b/tests/src/icmp_test.cpp @@ -2,11 +2,11 @@ #include #include #include -#include "icmp.h" -#include "ip.h" -#include "ethernetII.h" -#include "mpls.h" -#include "rawpdu.h" +#include +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/icmpv6_test.cpp b/tests/src/icmpv6_test.cpp index 9305ac6..7046f98 100644 --- a/tests/src/icmpv6_test.cpp +++ b/tests/src/icmpv6_test.cpp @@ -2,12 +2,12 @@ #include #include #include -#include "icmpv6.h" -#include "ethernetII.h" -#include "ip.h" -#include "tcp.h" -#include "rawpdu.h" -#include "hw_address.h" +#include +#include +#include +#include +#include +#include using namespace Tins; diff --git a/tests/src/ip_address_test.cpp b/tests/src/ip_address_test.cpp index 8bbc920..32a6a62 100644 --- a/tests/src/ip_address_test.cpp +++ b/tests/src/ip_address_test.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "ip_address.h" +#include using namespace Tins; diff --git a/tests/src/ip_reassembler_test.cpp b/tests/src/ip_reassembler_test.cpp index ed00cf2..97a6bcb 100644 --- a/tests/src/ip_reassembler_test.cpp +++ b/tests/src/ip_reassembler_test.cpp @@ -2,11 +2,11 @@ #include #include #include -#include "ip_reassembler.h" -#include "ethernetII.h" -#include "udp.h" -#include "ip.h" -#include "rawpdu.h" +#include +#include +#include +#include +#include using std::vector; using std::pair; diff --git a/tests/src/ip_test.cpp b/tests/src/ip_test.cpp index bbe4e75..3b3f5bc 100644 --- a/tests/src/ip_test.cpp +++ b/tests/src/ip_test.cpp @@ -2,14 +2,14 @@ #include #include #include -#include "ip.h" -#include "tcp.h" -#include "udp.h" -#include "icmp.h" -#include "icmp_extension.h" -#include "rawpdu.h" -#include "ip_address.h" -#include "ethernetII.h" +#include +#include +#include +#include +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/ipsec_test.cpp b/tests/src/ipsec_test.cpp index 42071a4..197ec7c 100644 --- a/tests/src/ipsec_test.cpp +++ b/tests/src/ipsec_test.cpp @@ -1,8 +1,8 @@ #include #include -#include "ipsec.h" -#include "ethernetII.h" -#include "rawpdu.h" +#include +#include +#include using namespace Tins; diff --git a/tests/src/ipv6_address_test.cpp b/tests/src/ipv6_address_test.cpp index 7556101..ff90341 100644 --- a/tests/src/ipv6_address_test.cpp +++ b/tests/src/ipv6_address_test.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "ipv6_address.h" +#include using namespace Tins; diff --git a/tests/src/ipv6_test.cpp b/tests/src/ipv6_test.cpp index d8aecff..021bfdf 100644 --- a/tests/src/ipv6_test.cpp +++ b/tests/src/ipv6_test.cpp @@ -2,14 +2,14 @@ #include #include #include -#include "ipv6.h" -#include "tcp.h" -#include "udp.h" -#include "icmp.h" -#include "icmpv6.h" -#include "rawpdu.h" -#include "ethernetII.h" -#include "ipv6_address.h" +#include +#include +#include +#include +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/llc_test.cpp b/tests/src/llc_test.cpp index 1671034..97faff6 100644 --- a/tests/src/llc_test.cpp +++ b/tests/src/llc_test.cpp @@ -3,7 +3,7 @@ #include #include -#include "llc.h" +#include using namespace Tins; using namespace std; diff --git a/tests/src/loopback_test.cpp b/tests/src/loopback_test.cpp index 2c9f29f..85288c6 100644 --- a/tests/src/loopback_test.cpp +++ b/tests/src/loopback_test.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "macros.h" +#include #ifndef _WIN32 #include #ifdef BSD @@ -11,9 +11,9 @@ #include #endif #endif -#include "loopback.h" -#include "ip.h" -#include "tcp.h" +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/matches_response_test.cpp b/tests/src/matches_response_test.cpp index 8264885..afd1e4b 100644 --- a/tests/src/matches_response_test.cpp +++ b/tests/src/matches_response_test.cpp @@ -1,11 +1,11 @@ #include #include -#include "ethernetII.h" -#include "rawpdu.h" -#include "udp.h" -#include "dhcp.h" -#include "dhcpv6.h" -#include "ip.h" +#include +#include +#include +#include +#include +#include using namespace Tins; diff --git a/tests/src/mpls_test.cpp b/tests/src/mpls_test.cpp index a1e7662..8fd5dac 100644 --- a/tests/src/mpls_test.cpp +++ b/tests/src/mpls_test.cpp @@ -3,11 +3,11 @@ #include #include #include -#include "mpls.h" -#include "ip.h" -#include "udp.h" -#include "rawpdu.h" -#include "ethernetII.h" +#include +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/network_interface_test.cpp b/tests/src/network_interface_test.cpp index c3c708d..ee0f21f 100644 --- a/tests/src/network_interface_test.cpp +++ b/tests/src/network_interface_test.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "network_interface.h" -#include "macros.h" +#include +#include using namespace Tins; using namespace std; diff --git a/tests/src/offline_packet_filter_test.cpp b/tests/src/offline_packet_filter_test.cpp index 25c6938..29e0481 100644 --- a/tests/src/offline_packet_filter_test.cpp +++ b/tests/src/offline_packet_filter_test.cpp @@ -2,15 +2,15 @@ #include #include #include -#include "offline_packet_filter.h" -#include "ip.h" -#include "tcp.h" -#include "ethernetII.h" -#include "dot3.h" -#include "sll.h" -#include "llc.h" -#include "udp.h" -#include "rawpdu.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace Tins; diff --git a/tests/src/pdu_iterator_test.cpp b/tests/src/pdu_iterator_test.cpp index 22fa529..fda5ae0 100644 --- a/tests/src/pdu_iterator_test.cpp +++ b/tests/src/pdu_iterator_test.cpp @@ -1,10 +1,10 @@ #include #include #include -#include "ip.h" -#include "tcp.h" -#include "rawpdu.h" -#include "pdu_iterator.h" +#include +#include +#include +#include using std::distance; using std::map; diff --git a/tests/src/pdu_test.cpp b/tests/src/pdu_test.cpp index 209f982..483dc3e 100644 --- a/tests/src/pdu_test.cpp +++ b/tests/src/pdu_test.cpp @@ -2,12 +2,12 @@ #include #include #include -#include "ip.h" -#include "tcp.h" -#include "udp.h" -#include "rawpdu.h" -#include "pdu.h" -#include "packet.h" +#include +#include +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/pktap_test.cpp b/tests/src/pktap_test.cpp index aa5146c..e040ed6 100644 --- a/tests/src/pktap_test.cpp +++ b/tests/src/pktap_test.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "pktap.h" +#include using namespace std; using namespace Tins; diff --git a/tests/src/ppi_test.cpp b/tests/src/ppi_test.cpp index 1eceed5..0af5d3f 100644 --- a/tests/src/ppi_test.cpp +++ b/tests/src/ppi_test.cpp @@ -1,5 +1,5 @@ -#include "dot11/dot11_data.h" -#include "dot11/dot11_beacon.h" +#include +#include #ifdef TINS_HAVE_DOT11 @@ -7,8 +7,8 @@ #include #include #include -#include "ppi.h" -#include "udp.h" +#include +#include using namespace Tins; diff --git a/tests/src/pppoe_test.cpp b/tests/src/pppoe_test.cpp index 53258b4..b9da673 100644 --- a/tests/src/pppoe_test.cpp +++ b/tests/src/pppoe_test.cpp @@ -2,9 +2,9 @@ #include #include #include -#include "pppoe.h" -#include "ethernetII.h" -#include "rawpdu.h" +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/radiotap_test.cpp b/tests/src/radiotap_test.cpp index f4dbc8f..c3c7f0c 100644 --- a/tests/src/radiotap_test.cpp +++ b/tests/src/radiotap_test.cpp @@ -1,4 +1,4 @@ -#include "radiotap.h" +#include #ifdef TINS_HAVE_DOT11 @@ -6,14 +6,14 @@ #include #include #include -#include "dot11/dot11_data.h" -#include "dot11/dot11_beacon.h" -#include "arp.h" -#include "snap.h" -#include "eapol.h" -#include "utils.h" -#include "utils/radiotap_parser.h" -#include "utils/radiotap_writer.h" +#include +#include +#include +#include +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/rc4_eapol_test.cpp b/tests/src/rc4_eapol_test.cpp index 7f6fabf..61a2e47 100644 --- a/tests/src/rc4_eapol_test.cpp +++ b/tests/src/rc4_eapol_test.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "eapol.h" +#include using namespace std; using namespace Tins; diff --git a/tests/src/rsn_eapol_test.cpp b/tests/src/rsn_eapol_test.cpp index 705492f..afe1c44 100644 --- a/tests/src/rsn_eapol_test.cpp +++ b/tests/src/rsn_eapol_test.cpp @@ -2,10 +2,10 @@ #include #include #include -#include "eapol.h" -#include "snap.h" -#include "ethernetII.h" -#include "rsn_information.h" +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/sll_test.cpp b/tests/src/sll_test.cpp index 80538c2..a7f76e4 100644 --- a/tests/src/sll_test.cpp +++ b/tests/src/sll_test.cpp @@ -2,10 +2,10 @@ #include #include #include -#include "sll.h" -#include "hw_address.h" -#include "constants.h" -#include "ip.h" +#include +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/snap_test.cpp b/tests/src/snap_test.cpp index 17e4d89..5a17af1 100644 --- a/tests/src/snap_test.cpp +++ b/tests/src/snap_test.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "snap.h" +#include using namespace std; using namespace Tins; diff --git a/tests/src/stp_test.cpp b/tests/src/stp_test.cpp index 539f1d2..ea47322 100644 --- a/tests/src/stp_test.cpp +++ b/tests/src/stp_test.cpp @@ -2,9 +2,9 @@ #include #include #include -#include "stp.h" -#include "dot3.h" -#include "llc.h" +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/tcp_ip_test.cpp b/tests/src/tcp_ip_test.cpp index 896b0a0..e3c3477 100644 --- a/tests/src/tcp_ip_test.cpp +++ b/tests/src/tcp_ip_test.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #ifdef TINS_HAVE_TCPIP @@ -8,18 +8,18 @@ #include #include #include -#include "tcp_ip/stream_follower.h" -#include "tcp.h" -#include "ip.h" -#include "ip_address.h" -#include "ipv6_address.h" -#include "exceptions.h" -#include "ethernetII.h" -#include "rawpdu.h" -#include "packet.h" -#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef TINS_HAVE_ACK_TRACKER - #include "tcp_ip/ack_tracker.h" + #include #endif // TINS_HAVE_ACK_TRACKER using namespace std; diff --git a/tests/src/tcp_stream_test.cpp b/tests/src/tcp_stream_test.cpp index 9933acd..a4a0f4e 100644 --- a/tests/src/tcp_stream_test.cpp +++ b/tests/src/tcp_stream_test.cpp @@ -2,9 +2,9 @@ #include #include #include -#include "tcp_stream.h" -#include "tcp.h" -#include "ethernetII.h" +#include +#include +#include using namespace Tins; diff --git a/tests/src/tcp_test.cpp b/tests/src/tcp_test.cpp index a7ed226..17ff227 100644 --- a/tests/src/tcp_test.cpp +++ b/tests/src/tcp_test.cpp @@ -3,9 +3,9 @@ #include #include #include -#include "tcp.h" -#include "ip.h" -#include "ethernetII.h" +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/udp_test.cpp b/tests/src/udp_test.cpp index 4c7ca45..bd48fa8 100644 --- a/tests/src/udp_test.cpp +++ b/tests/src/udp_test.cpp @@ -1,9 +1,9 @@ #include #include #include -#include "udp.h" -#include "ip.h" -#include "ethernetII.h" +#include +#include +#include using namespace std; using namespace Tins; diff --git a/tests/src/utils_test.cpp b/tests/src/utils_test.cpp index ac0381f..1a00b34 100644 --- a/tests/src/utils_test.cpp +++ b/tests/src/utils_test.cpp @@ -1,10 +1,10 @@ #include #include #include -#include "utils.h" -#include "endianness.h" -#include "ip_address.h" -#include "ipv6_address.h" +#include +#include +#include +#include using namespace Tins; diff --git a/tests/src/wep_decrypt_test.cpp b/tests/src/wep_decrypt_test.cpp index 7918dcc..b2d153e 100644 --- a/tests/src/wep_decrypt_test.cpp +++ b/tests/src/wep_decrypt_test.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include #ifdef TINS_HAVE_DOT11 @@ -6,9 +6,9 @@ #include #include #include -#include "crypto.h" -#include "arp.h" -#include "dot11/dot11_data.h" +#include +#include +#include using namespace Tins; diff --git a/tests/src/wpa2_decrypt_test.cpp b/tests/src/wpa2_decrypt_test.cpp index f9db787..b587579 100644 --- a/tests/src/wpa2_decrypt_test.cpp +++ b/tests/src/wpa2_decrypt_test.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include #if defined(TINS_HAVE_DOT11) && defined(TINS_HAVE_WPA2_DECRYPTION) @@ -6,12 +6,12 @@ #include #include #include -#include "crypto.h" -#include "radiotap.h" -#include "dot11/dot11_data.h" -#include "udp.h" -#include "tcp.h" -#include "arp.h" +#include +#include +#include +#include +#include +#include using namespace Tins;