Add CHANGES for v4.5

This patch adds a new PDU class to support VXLAN. Several VXLAN-related
tests have also been added.

Signed-off-by: James Raphael Tiovalen <jamestiotio@gmail.com>

.github/workflows/tests.yaml

@@ -0,0 +1,28 @@
+name: Tests
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  Ubuntu-Tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install libpcap
+        run: sudo apt-get install -y libpcap-dev
+
+      - name: Initialize submodules
+        run: git submodule init && git submodule update
+
+      - name: Initialize build system
+        run: mkdir build && cd build && cmake ..
+
+      - name: Build tests
+        run: cmake --build build --target tests
+
+      - name: Run tests
+        run: ctest build

.gitignore

@@ -0,0 +1,2 @@
+build/**
+include/tins/config.h

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "googletest"]
+	path = googletest
+    url = https://github.com/google/googletest.git
+    ignore = dirty

.travis.yml

@@ -0,0 +1,27 @@
+language: cpp
+
+sudo: false
+
+compiler:
+  - gcc
+  - clang
+
+os:
+  - linux
+  - osx
+
+addons:
+  apt:
+    packages:
+    - libpcap-dev
+    - libssl-dev
+    - libboost-all-dev
+
+before_script:
+  - mkdir build
+  - cd build
+  - cmake .. -DLIBTINS_ENABLE_CXX11=1
+  - make tests
+
+script:
+  - ctest -V

AUTHORS

@@ -1,9 +0,0 @@
-# Below is a list of people and organizations that have contributed source
-# code to libtins. Names are listed using the following format:
-#
-# Name/Organization <email address>
-
-Matias Fontanini <matias.fontanini@gmail.com>
-Santiago Alessandri <san.lt.ss@gmail.com>
-Bruno Nery <brunonery@brunonery.com>
-Piotr Haber <piotr.haber@sens.us>

CHANGES

@@ -1,258 +0,0 @@
-v3.1 - Sun Aug 24 21:39:43 ART 2014
-
-- Fixed ICMPv6 checksum error on serialization.
-
-- Fixed empty domain name encoding on DNS.
-
-- Changed the build system to CMake.
-
-v3.0 - Thu Aug  7 21:39:09 ART 2014
-
-- Timestamps can now be constructed from std::chrono::duration.
-
-- Packets can now be constructed from a PDU pointer and take ownership
-of it.
-
-- All protocols now set the next layer protocol flag, regardless if 
-it was already set. This was not done in some protocols, 
-like EthernetII, and as a consequence if the network layer protocol
-was replaced by other, the packet would be serialized incorrectly.
-
-- Fixed invalid parsing of some unknown DNS records.
-
-- Fixed unaligned memory accesses that were not supported under
-ARMv4 and ARMv5.
-
-- Added BaseSniffer::set_extract_raw_pdus.
-
-- Reduced minimum automake version to 1.11.
-
-- Added Utils::to_string(PDU::PDUType).
-
-- Fixed error compilations on Windows.
-
-- Fixed ICMPv6 checksum calculation.
-
-- Added method in IP and TCP to emplace an option (C++11 only).
-
-- Added small option optimization to PDUOption.
-
-- Fixed error compilation on RSNInformation.
-
-- Renamed ICMP::check to ICMP::checksum.
-
-- Added Sniffer support to set interface to promiscuous mode.
-
-- TCPStreamFollower now handles overlapping fragments correctly.
-
-- Fixed bugs in TCPStreamFollower which didn't allow it to follow
-stream correctly.
-
-- TCPStreamFollower now doesn't clear its state after every call to
-TCPStreamFollower::follow_streams.
-
-- Added IPv6 flag check to pdu_flag_to_ip_type.
-
-- Added DHCP::hostname to extract the hostname options.
-
-- Removed extra qualifier on SessionKeys::decrypt_unicast which 
-produced compilation errors on some platforms.
-
-- PacketSender::send now uses PDU::matches_flag to match specific
-PDU types.
-
-- Removed 'no newline at end of file' warnings.
-
-- Fixed bug when calling BIOCIMMEDIATE on *BSD.
-
-- Fixed bug on PacketSender::send_recv which didn't work under *BSD.
-
-- Fixed bug triggered by not including the string header.
-
-v2.0 - Thu Jan 23 11:09:38 ART 2014 
-
-- DNSResourceRecord was removed. Now DNS records are added using 
-DNS::Resource.
-
-- tins.h now includes ppi.h.
-
-- Done significant improvements in the speed of DNS parsing.
-
-- Added PDUOption<>::to<> which converts a PDUOption to a specific type.
-
-- Layer 3 packets sent using PacketSender::send_recv for which the 
-answer is a different PDU type.
-
-- ICMP::gateway now uses IPv4Address.
-
-- Added support for ICMP address mask request/reply.
-
-- Fixed bug in PacketSender when using send_recv and a layer 2 PDU. The 
-interface in which the packet was sent was not the default_interface 
-set when the sender was constructed.
-
-- IP packets sent using PacketSender::send_recv now match ICMP 
-responses.
-
-- Added support for ICMP timestamp request/reply packets. 
-ICMP::matches_response now works with these types of packets as well.
-
-- Added support for reassembling of fragmented IP packets via the
-IPv4Reassembler class.
-
-- Fragmented IP packet's inner_pdu PDUs are not decoded now.
-
-- Added 1000ms as the default read timeout used when calling 
-pcap_open_live. Added BaseSniffer::set_timeout to modify this parameter.
-
-- Added the --disable-dot11 configure switch.
-
-- Added support for IPSec.
-
-- Fixed bug triggered when ifaddrs::ifa_addr was null in 
-NetworkInterface::addresses.
-
-- Added another overload of Utils::route_entries which returns the
-result either than storing it in a parameter.
-
-- Added ARP monitor, WPS detector, DNS queries sniffer and DNS spoofer 
-examples.
-
-- Added another Sniffer constructor which doesn't expect the maximum
-capture size.
-
-- Added tins_cast as a replacement for dynamic_cast on PDUs.
-
-v1.2 - Mon oct  7 23:33:49 ART 2013
-
-- Added BaseSniffer::begin and BaseSniffer::end.
-
-- BaseSniffer::next_packet uses pcap_loop instead of pcap_next, which
-doesn't work well on some linux distributions.
-
-- Added PPI PDU class.
-
-- Fixed a bug in EthernetII triggered when the size of the whole frame 
-was lower than 60 bytes.
-
-- Added AddressRange class and IPv4Address, IPv6Address and 
-HWAddress<>::operator/.
-
-- Added is_broadcast, is_multicast and is_unicast to IPv4, IPv6
-and HWAddress.
-
-- Added is_private and is_loopback methods to IPv4 and IPv6 addresses.
-
-- Done some optimizations on TCP's constructor from buffer.
-
-- Added helper functions to Dot11Data to retrieve the source, 
-destination and BSSID addresses.
-
-- Fixed bugs in DNS triggered when parsing MX and unknown records.
-
-- BaseSniffer::next_packet now iterates until a valid packet is found.
-
-- TCP::get_flag is now const.
-
-- The --disable-wpa2 now works as expected.
-
-v1.1 - Wed Jun  5 09:03:37 ART 2013
-
-- Implemented std::hash specialization for IPv4, IPv6 and HWAddress<>
-types.
-
-- Added a RSNHandshakeCapturer class.
-
-- Added WPA2Decrypter class.
-
-- IEEE 802.11 frames are not parsed if the RadioTap FAILED_FCS flag 
-is on.
-
-- RadioTap now calculates its size everytime it's serialized.
-
-- Splitted the dot11.h and dot11.cpp files into several files to
-speed up compilation times.
-
-- Added HWAddress<>::is_broadcast and HWAddress::operator[].
-
-- Fixed a bug triggered when parsing Dot11QoSData frames.
-
-v1.0 - Tue Apr 23 20:40:57 ART 2013
-
-- Link layer protocol PDUs now don't hold a NetworkInterface. This led
-to changes in their constructors.
-
-- Removed the obsolete PDU* parameter taken by several classes' 
-constructors.
-
-- IP now sets the sender's address automatically when no link layer
-PDU is used.
-
-- IP, TCP and UDP now calculate the checksum everytime they're 
-serialized.
-
-- Added PDU::rfind_pdu.
-
-- Defined several exception types.
-
-- Implemented matches_response on several protocols.
-
-- PacketSender is now movable.
-
-- Added an overload of add_option that takes an rvalue-reference in IP, 
-TCP, DHCP, ICMPv6 and Dot11.
-
-- Added support for GNU/kFreeBSD.
-
-- Removed several deprecated methods, such as PDU::clone_packet.
-
-- Added PacketSender::send(PDU&, NetworkInterface).
-
-- Normalized the TLV options naming conventions in all of the classes
-that used them.
-
-- Added support for Dot1Q, STP, PPPoE protocols.
-
-- Made some important optimizations on PDUOption<>'s constructors.
-
-- Added Utils::resolve_domain and Utils::resolve_domain6
-
-v0.3 - Thu Jan 31 16:47:27 ART 2013
-
-- Added IPv6, ICMPv6 and DHCPv6 classes.
-
-- Added support for Loopback interfaces and the Linux Crooked Capture
-pseudo protocol.
-
-- Added support for IPv6 records in DNS.
-
-- Added Packet/RefPacket class.
-
-- Added support for FreeBSD, OSX and Windows.
-
-- Added C++11 move semantics to several classes.
-
-- Done a complete rewrite of the build system; it now uses libtool.
-
-- Fixed several bugs in DNS.
-
-
-v0.2 - Sat Oct 20 11:26:40 2012
-
-- Added support for big endian architectures. 
-
-- Simplified several interfaces.
-
-- Added IPv4Address and HWAddress class to simplify handling IP and hardware addresses.
-
-- Added NetworkInterface class to abstract network interfaces.
-
-- Added TCPStreamFollower class to follow TCP streams on the fly.
-
-- Added WEPDecrypter class to decrypt WEP-encrypted 802.11 data frames on the fly.
-
-- Added several new PDUs: Loopback, IEEE802_3, LLC, DNS.
-
-- Added support for reading and writing pcap files.
-
-- Moved to BSD-2 license.

CHANGES.md

@@ -0,0 +1,809 @@
+##### v4.5 - Sun Aug 20 04:46:53 PM UTC 2023
+
+- Add VXLAN support (#501)
+
+- Add `FileSniffer` constructor taking a `FILE*` (#499).
+
+- Remove use of deprecated `std::iterator` (#481).
+
+- Add missing `algorithm` header include (#497).
+
+- Validate high order two bits of first dns label octet (#494).
+
+- Use `CMAKE_INSTALL_LIBDIR` in `CONF_CMAKE_INSTALL_DIR` (#472).
+
+- Ignore IPv6 packets with payload after one with no Next Header (#500).
+
+- Fix unqualified `std::move` call warnings on clang (#488).
+
+- Fix incorrect IP address range calculation when using /0 prefix (#484) (#486).
+
+- Fall back to system GTest if available (#473).
+
+- Fix compilation issue on android (#471).
+
+- Fix DNS parser reading garbage on misreported packet size (#468).
+
+- Fix DNS parser misinterpreting bad label size (#466).
+
+##### v4.4 - Thu Feb 17 14:41:59 UTC 2022
+
+- Add RFC8335 extended echo types to `ICMP` and `ICMPv6` (#426)
+
+- Handle loops in DNS name decompression (#444)
+
+- Fix Windows' `interface` macro colliding with uses of that identifier in the code (#458)
+
+- Sending IPv6 packets to a link-scope destination address now uses the right interface index (#448)
+
+- Fix incorrect endian being used for ICMP's `gateway` and `address_mask` (#437)
+
+- Socket in `PacketSender::open_l3_socket` is now closed if `setsockopt` fails (#433)
+
+- Fix various incorrect doxygen documentation comments (#439).
+
+- Fix infinite loop when querying the routing table in \*BSD (#427)
+
+##### v4.3 - Fri Sep 18 03:08:33 UTC 2020
+
+- Assign a PDUType to `Dot11ControlTA` (#420)
+
+- Don't consider IPv6 ESP header a normal extension header (#374)
+
+- Don't include non-existing headers when installed without libpcap (#382)
+
+- Add `IPv6Address::is_local_unicast` (#369)
+
+- Fix memory leak in `PacketWriter` (#343)
+
+- Fix memory leaks in `OfflinePacketFilter` (#343)
+
+- Fix detection of new TCP stream (#335)
+
+- Introduce `TCP::has_flags` (#334)
+
+- Fix padding calculations in RadioTapWriter (#333)
+
+##### v4.2 - Fri Mar  8 04:15:13 UTC 2019
+
+- Updated location of installed CMake files in unix systems (#331)
+
+- Fix check to detect cross compilation (#330)
+
+- Allow getting a PDU's advertised size and use it in `PacketWriter` (#324)
+
+- Install DLLs in right directory (#326)
+
+- Add missing Dot11 tagged option types (#305)
+
+- Add support for DLT_RAW (#313)
+
+- Fix potential invalid memory accesses when parsing RadioTap (#322)
+
+##### v4.1 - Tue Dec 11 02:08:48 UTC 2018
+
+- Fix serialization for QinQ (#316)
+
+- Added base class access specifier for socket_close_error (#306)
+
+- Rewrote hw_address_to_string to not require a stringstream (#299)
+
+- Make RadioTapParser::skip_to_field check for end of buffer (#296)
+
+- Ensure local include directory comes before system. (#293)
+
+- Calculate IP option sizes properly (#288)
+
+- Add parsing of well known IPv6 extension headers (#287)
+
+- Add missing operators to address classes (#275)
+
+- Add version macros in config.h
+
+- Don't assume IPv6 uses ICMPv6 underneath
+
+- Allow users to specify library install dir
+
+- Use Sleep windows function passing milliseconds as parameter
+
+- Implement IPv6::recv_response
+
+- Don't use nullptr in non C++11 code
+
+- Ignore (possibly malformed) options after EOL (#281)
+
+- Don't include dot11.h in tins.h if it is not configured in the library (#277)
+
+- Fix memory leak in PDU's move assignment operator
+
+- Append padding to IPv6 options
+
+##### v4.0 - Mon Dec  4 00:04:30 UTC 2017
+
+- Add parent PDU to each PDU.
+
+- Removed parent PDU parameter on `PDU::write_serialization`.
+
+- Split `utils.h` into multiple files under the `utils` directory.
+
+- Split `internals.h` into multiple files under the `detail` directory.
+
+- Improve compilation times by removing useless include directives.
+
+- Refactor `PDUOption` conversions so that heavy headers are not included in source file.
+
+- Use `std::vector` instead of `std::list` in `TCP`, `IP`, `IPv6`, `DHCP`, `DHCPv6`, `DNS`, `LLC`, `Dot11` and `PPPoE`.
+
+- Improve performance on `IP`, `IPv6` and `TCP` by compiting option sizes during serialization.
+
+- Minor performance improvements in `DNS`.
+
+- Fix `IPv6` next header handling. Now each one contains its own type and the next type is only set during serialization for ease of use.
+
+- Refactor `RadioTap` parsing and serialization using a generic parser/writer.
+
+- Add `BaseSniffer::set_pcap_sniffing_method` to specify whether `pcap_loop` or `pcap_dispatch` should be used when sniffing.
+
+- Use `IFF_POINTOPOINT` on BSD when getting broadcast address for an interface.
+
+- Added cipher and akm suites from 802.11-2016.
+
+- Add IPv6 layer parsing on `Loopback` packets.
+
+- Allow serializing `Loopback` on Windows.
+
+- Use the right flag on `Loopback` for `IPv6`.
+
+- Use the first fragment as a base when reassembling `IP` packets in `IPv4Reassembler`.
+
+- Restructure CMake files removing useless `CMakeLists.txt` in `include` paths.
+
+- Add getter/setter for "more data" field in `Dot11Base`.
+
+- Implemented matching for ND protocol related ICMPv6 messages.
+
+- Ensure TCP::OptionTypes has 8-bit range.
+
+- Add header files into CMake sources so IDE can pick them up.
+
+- Add MPLS "experimental" field.
+
+- Fix dhcpv6::duid_type constructor from duid_ll.
+
+##### v3.5 - Sat Apr  1 09:11:58 PDT 2017
+
+- Added Utils::route6_entries
+
+- Allow masking IPv4/6 and hardware addresses via `operator&`
+
+- Add IPv4Address::from_prefix_length
+
+- Move `stream_id` into a new file and rename it `StreamIdentifier`
+
+- Allow disabling TCPIP classes
+
+- Properly handle out of order SACKs on `AckTracker`
+
+- Move TCP data tracking into a separate class
+
+- Allow constructing `StreamIdentifier` from a `Stream`
+
+- Allow configuring pcap timestamp precision
+
+- Allow building libtins using MinGW
+
+- Allow including libtins using `add_subdirectory` via CMake
+
+- Allow setting customer user data to each TCP stream
+
+- Allow skipping data forward in TCP streams
+
+- Allow attaching to already existing TCP streams
+
+- Fix: AddressRange masks first address as well
+
+- Fix: Add TINS_API to `IPv4Address::operator<<`, `DataTracker` and `AckTracker`
+
+- Fix: Don't always set `key_t` to 0 on `RSNEAPOL`
+
+- Fix: Handle MLDv1 properly on ICMP
+
+- Fix: Make Utils::resolve_hwaddress work on Windows
+
+- Fix: Interface was sometimes considered down when it was up (BSD/Linux)
+
+- Fix: Don't set `Dot1Q`'s payload type if next protocol type is unknown
+
+- Fix: Use recvfrom on BSD/OSX when capturing layer 3 packets
+
+- Fix: Make `Timestamp::current_time` work on Windows
+
+- Fix: Forward `NetworkInterface` argument when calling `PacketSender::send_l2`
+
+- Fix: `Timestamp` overflow issue
+
+- Fix: boost's include directories variable incorrectly used on build system
+
+- Fix: Configuring auto cleanup of `Stream`'s server data not working
+
+- Fix: Set `EthernetII` payload type to `UNKNOWN` if there's no inner PDU
+
+- Fix: Set payload type to 0 if there's no inner PDU in `IP`, `Dot1Q` and `IPv6`
+
+- Fix: Buffer length check issues on `Dot11QosData`
+
+- Fix: Use AF_INET6 flag when opening L3 IPv6 socket
+
+- Fix: Check expecter size properly on `DNS::extract_metadata`
+
+- Fix: several unused parameter warnings
+
+- Fix: CCMP decryption issue when `Dot11QoSData` has a TID != 0
+
+##### v3.4 - Wed Mar  9 20:24:54 PST 2016
+
+- Check the secure bit on HandshakeCapturer to detect 2nd packet
+
+- Add info members directly into NetworkInterface
+
+- Add IPv6 addresses to NetworkInterface::Info
+
+- Make *MemoryStream use size_t rather than uint32_t
+
+- Add WPA2Decrypter callback interface
+
+- Set MACOSX_RPATH to ON
+
+- Don't fail configuration if openssl is missing
+
+- Build layer 5 as RawPDU if IPv6 has fragment header
+
+- Fix examples so they build on gcc 4.6
+
+- Fix flag value for sniffer's immediate mode
+
+- Fix IP fragment reassemble when packet has flags DF+MF
+
+- Add extract_metadata to main PDU classes
+
+- Fix examples to make them work on Windows
+
+- Use timercmp/sub and std::chrono to subtract timevals on PacketSender
+
+- Build examples against local libtins build
+
+- Add uninstall target
+
+- Prefix HAVE_ config.h macros with TINS_
+
+- Use compiler intrinsics to swap bytes
+
+- Use C++11 mode by default
+
+- Add missing TINS_API to PDU classes.
+
+- Extend/fix ICMPv6 enum values and unify naming
+
+- Return an empty string for dot11 ssid, if ssid is present but empty
+
+- Implement new TCP stream follower mechanism
+
+- Use ExternalProject_Add rather than including the gtest directory
+
+- Fix invalid endian on IP fragment offset on OSX
+
+##### v3.3 - Sun Jan 31 21:06:04 PST 2016
+
+- Add TCP connection close example
+
+- Move implementations on utils.h to utils.cpp
+
+- Add ICMPv6 Multicast Listener Query Messages support
+
+- Add ICMPv6 Multicast Listener Report Message support
+
+- Make DNS::Query and DNS::Resource lowercase and deprecate the old names
+
+- Change DNS::query/resource::type to query_type and deprecate old name
+
+- Add DNS Start Of Authority parsing and serialization
+
+- Parse and serialize MX preference field correctly
+
+- Add NetworkInterface::friendly_name to get Windows friendly names
+
+- Mask 16 bits on random number generated on traceroute example
+
+- Fix TCP sequence number addition/subtraction when wrapping around
+
+- Use 802.1ad protocol flag when seralizing stacked Dot1Q
+
+- Code cleanup and use same syntax on the entire project
+
+- Correctly serialize PPPoE session packets
+
+- Fix IPv6 extension headers parsing/serialization
+
+- Include examples before src to avoid duplicate tins target issue
+
+- Add MPLS PDU and hook it up with ICMP extensions
+
+- Set UDP checksum to 0xffff if it's 0
+
+- Don't define TINS_STATIC in config.h
+
+- Fix invalid RSNEAPOL parsing issue
+
+- Remove special clang on OSX case when building gtest
+
+- Update pseudoheader_checksum signature
+
+- Fix overall checksum calculation
+
+- Set ICMP payload length without padding if no extensions are present
+
+- Export classes on Windows shared lib builds
+
+- Use google/googletest submodule and update to HEAD
+
+- Remove unused cassert header inclusions
+
+- Add input/output memory stream classes port PDU classes to use them
+
+- Add extensions for ICMP/ICMPv6
+
+- Fix RSNInformation issues on big endian architectures
+
+- Add IP::fragment_offset and IP::flags
+
+- Don't set Ethernet type if inner PDU type is unknown
+
+- Don't run IP source address overwrite tests on OSX
+
+- Always calculate IP/IPv6 checksum
+
+- Fix invalid constant value on PPPoE
+
+- Define default constructor for PKTAP
+
+- Guard 802.11 parsing code on PPI around HAVE_DOT11
+
+- Fix parsing of Dot11 packets encapsulated on PPI having FCS-at-end
+
+- Fix DataLinkType typo on doxygen docs
+
+- Update docs on sniff_loop handle persistency
+
+- Use uint32_t for DNS resource TTL setter
+
+- Erase streams when they're reassembed on IPv4Reassembler
+
+- Make all exceptions derive from exception_base
+
+- Add remove_option member to IP, TCP, Dot11, ICMPv6, DHCP and DHCPv6
+
+- Allow HW addresses to be 00:00:00:00:00 on NetworkInterface::info
+
+- Increment option size when adding a new DHCPv6 option
+
+- Use NOMINMAX on examples
+
+- Add metric field to RouteEntry
+
+- Allow setting immediate mode on Sniffer
+
+- Use one flags field for all flags on SnifferConfiguration
+
+- Add ICMP responses example
+
+- Add interfaces_info example
+
+- Fix bug on SessionKeys::SessionKeys
+
+- Fix compilation errors on android platform
+
+- Fix example compilation on Windows
+
+- Add PacketWriter::write overload that takes a Packet
+
+- Use different IP addresses on IP tests depending on OS
+
+- Allow retrieving keys on WPA2Decrypter
+
+- Add NetworkInterface::is_up and NetworkInterface::info
+
+- Add NetworkInterface::Info::is_up
+
+- Fix compilation warnings on Windows x64
+
+- Fix FindPCAP.cmake to find winpcap on x64
+
+- Fix more tests warnings triggered on Windows
+
+- Fix tests compilation warnings on Windows
+
+- Fix error on VC triggered by pcap redefining the "inline" keyword
+
+- Soften DNS parsing rules
+
+- Replace WIN32 macro with _WIN32
+
+- Fix IPv6Address::to_string on Windows
+
+- Fix DNS issues triggered on VC
+
+- Add google test as git submodule
+
+- Perserve IP protocol when using RawPDU
+
+- Use pcap_sendpacket by default to send packets on Windows
+
+- Don't allow receiving l2 packets on windows
+
+- Added RadioTap channel map type
+
+- Made rsn_information() a const member function to make Dot11ManagementFrame
+immutable
+
+- Ensure HAVE_CXX11 is checked when defining TINS_IS_CXX11
+
+- Use one integer field for all flags on TCP
+
+- Fix invalid DNS IPv4 address parsing on big endian arch
+
+- Don't compile WPA2 test if LIBTINS_ENABLE_WPA2=0
+
+- Add Dot11 radio measurement name corresponding to IEEE 802.11-2012
+
+-------------------------------------------------------------------------------
+
+##### v3.2 - Fri Mar 20 22:12:23 PST 2015
+
+- Added include guard for config.h.
+
+- The functor used on BaseSniffer::sniff_loop can now take a Packet.
+
+- Added mcs, tx_flags, ext and data_retries options to RadioTap.
+
+- Fixed big endian representation of RadioTap header.
+
+- RadioTap's dbm_signal and dbm_noise are now signed.
+
+- RadioTap now throws if an option is not present when getting
+its value.
+
+- TKIP decryption now works correctly on packets from AP to STA.
+
+- Added support for PKTAP header.
+
+- Fixed endian issue on IPv4Address::ip_to_int on Windows.
+
+- Fixed IP parsing when total length is 0 due to TCP segmentation offload.
+
+- Re-added support for pkg-config.
+
+- TCPStreamFollower now calls PDU::find_pdu instead of PDU::rfind_pdu.
+
+- Fixed assertion throw caused by DNS parsing on Windows on debug mode.
+
+- Added throw on BSD when trying to send_recv L3 packets.
+
+- Added Loopback::matches_response.
+
+- Removed obsolete autotools files.
+
+- Fixed exception thrown when an interface didn't have an IP address
+on NetworkInterface.
+
+- Added NetworkInterface::is_loopback.
+
+- Moved all headers to the directory include/tins.
+
+- Fixed compilation warning on TCPStramFollower due to signed to unsigned
+conversion on integral constant.
+
+- BaseSniffer::get_pcap_handle is now public.
+
+- PPPoE session packets are now parsed correctly.
+
+- Fixed invalid Loopback protocol detection on FreeBSD/OSX.
+
+- Fixed OSX IP packet sending issue.
+
+- Added useful constructors to RawPDU.
+
+- Fixed compilation errors on FreeBSD.
+
+- Improved documentation on several classes.
+
+- Fixed parsing bug when allocating IP over IP packets.
+
+- Fixed Windows network interface naming.
+
+- Utils::network_interface returns pcap compatible names on Windows.
+
+- NetworkInterface::name now works on Windows.
+
+- Added documentation generation through the build system.
+
+- Added SnifferConfiguration class.
+
+- Fixed bug on Dot3 serialization.
+
+- Added OfflinePacketFilter class.
+
+- Renamed NOEXCEPT macro to TINS_NOEXCEPT.
+
+- Added DataLinkType class.
+
+- IPv4Address now uses inet_pton when constructing from string.
+
+-------------------------------------------------------------------------------
+
+##### v3.1 - Sun Aug 24 21:39:43 ART 2014
+
+- Fixed ICMPv6 checksum error on serialization.
+
+- Fixed empty domain name encoding on DNS.
+
+- Changed the build system to CMake.
+
+-------------------------------------------------------------------------------
+
+##### v3.0 - Thu Aug  7 21:39:09 ART 2014
+
+- Timestamps can now be constructed from std::chrono::duration.
+
+- Packets can now be constructed from a PDU pointer and take ownership
+of it.
+
+- All protocols now set the next layer protocol flag, regardless if
+it was already set. This was not done in some protocols,
+like EthernetII, and as a consequence if the network layer protocol
+was replaced by other, the packet would be serialized incorrectly.
+
+- Fixed invalid parsing of some unknown DNS records.
+
+- Fixed unaligned memory accesses that were not supported under
+ARMv4 and ARMv5.
+
+- Added BaseSniffer::set_extract_raw_pdus.
+
+- Reduced minimum automake version to 1.11.
+
+- Added Utils::to_string(PDU::PDUType).
+
+- Fixed error compilations on Windows.
+
+- Fixed ICMPv6 checksum calculation.
+
+- Added method in IP and TCP to emplace an option (C++11 only).
+
+- Added small option optimization to PDUOption.
+
+- Fixed error compilation on RSNInformation.
+
+- Renamed ICMP::check to ICMP::checksum.
+
+- Added Sniffer support to set interface to promiscuous mode.
+
+- TCPStreamFollower now handles overlapping fragments correctly.
+
+- Fixed bugs in TCPStreamFollower which didn't allow it to follow
+stream correctly.
+
+- TCPStreamFollower now doesn't clear its state after every call to
+TCPStreamFollower::follow_streams.
+
+- Added IPv6 flag check to pdu_flag_to_ip_type.
+
+- Added DHCP::hostname to extract the hostname options.
+
+- Removed extra qualifier on SessionKeys::decrypt_unicast which
+produced compilation errors on some platforms.
+
+- PacketSender::send now uses PDU::matches_flag to match specific
+PDU types.
+
+- Removed 'no newline at end of file' warnings.
+
+- Fixed bug when calling BIOCIMMEDIATE on *BSD.
+
+- Fixed bug on PacketSender::send_recv which didn't work under *BSD.
+
+- Fixed bug triggered by not including the string header.
+
+-------------------------------------------------------------------------------
+
+##### v2.0 - Thu Jan 23 11:09:38 ART 2014
+
+- DNSResourceRecord was removed. Now DNS records are added using
+DNS::Resource.
+
+- tins.h now includes ppi.h.
+
+- Done significant improvements in the speed of DNS parsing.
+
+- Added PDUOption<>::to<> which converts a PDUOption to a specific type.
+
+- Layer 3 packets sent using PacketSender::send_recv for which the
+answer is a different PDU type.
+
+- ICMP::gateway now uses IPv4Address.
+
+- Added support for ICMP address mask request/reply.
+
+- Fixed bug in PacketSender when using send_recv and a layer 2 PDU. The
+interface in which the packet was sent was not the default_interface
+set when the sender was constructed.
+
+- IP packets sent using PacketSender::send_recv now match ICMP
+responses.
+
+- Added support for ICMP timestamp request/reply packets.
+ICMP::matches_response now works with these types of packets as well.
+
+- Added support for reassembling of fragmented IP packets via the
+IPv4Reassembler class.
+
+- Fragmented IP packet's inner_pdu PDUs are not decoded now.
+
+- Added 1000ms as the default read timeout used when calling
+pcap_open_live. Added BaseSniffer::set_timeout to modify this parameter.
+
+- Added the --disable-dot11 configure switch.
+
+- Added support for IPSec.
+
+- Fixed bug triggered when ifaddrs::ifa_addr was null in
+NetworkInterface::addresses.
+
+- Added another overload of Utils::route_entries which returns the
+result either than storing it in a parameter.
+
+- Added ARP monitor, WPS detector, DNS queries sniffer and DNS spoofer
+examples.
+
+- Added another Sniffer constructor which doesn't expect the maximum
+capture size.
+
+- Added tins_cast as a replacement for dynamic_cast on PDUs.
+
+-------------------------------------------------------------------------------
+
+##### v1.2 - Mon oct  7 23:33:49 ART 2013
+
+- Added BaseSniffer::begin and BaseSniffer::end.
+
+- BaseSniffer::next_packet uses pcap_loop instead of pcap_next, which
+doesn't work well on some linux distributions.
+
+- Added PPI PDU class.
+
+- Fixed a bug in EthernetII triggered when the size of the whole frame
+was lower than 60 bytes.
+
+- Added AddressRange class and IPv4Address, IPv6Address and
+HWAddress<>::operator/.
+
+- Added is_broadcast, is_multicast and is_unicast to IPv4, IPv6
+and HWAddress.
+
+- Added is_private and is_loopback methods to IPv4 and IPv6 addresses.
+
+- Done some optimizations on TCP's constructor from buffer.
+
+- Added helper functions to Dot11Data to retrieve the source,
+destination and BSSID addresses.
+
+- Fixed bugs in DNS triggered when parsing MX and unknown records.
+
+- BaseSniffer::next_packet now iterates until a valid packet is found.
+
+- TCP::get_flag is now const.
+
+- The --disable-wpa2 now works as expected.
+
+v1.1 - Wed Jun  5 09:03:37 ART 2013
+
+- Implemented std::hash specialization for IPv4, IPv6 and HWAddress<>
+types.
+
+- Added a RSNHandshakeCapturer class.
+
+- Added WPA2Decrypter class.
+
+- IEEE 802.11 frames are not parsed if the RadioTap FAILED_FCS flag
+is on.
+
+- RadioTap now calculates its size everytime it's serialized.
+
+- Splitted the dot11.h and dot11.cpp files into several files to
+speed up compilation times.
+
+- Added HWAddress<>::is_broadcast and HWAddress::operator[].
+
+- Fixed a bug triggered when parsing Dot11QoSData frames.
+
+v1.0 - Tue Apr 23 20:40:57 ART 2013
+
+- Link layer protocol PDUs now don't hold a NetworkInterface. This led
+to changes in their constructors.
+
+- Removed the obsolete PDU* parameter taken by several classes'
+constructors.
+
+- IP now sets the sender's address automatically when no link layer
+PDU is used.
+
+- IP, TCP and UDP now calculate the checksum everytime they're
+serialized.
+
+- Added PDU::rfind_pdu.
+
+- Defined several exception types.
+
+- Implemented matches_response on several protocols.
+
+- PacketSender is now movable.
+
+- Added an overload of add_option that takes an rvalue-reference in IP,
+TCP, DHCP, ICMPv6 and Dot11.
+
+- Added support for GNU/kFreeBSD.
+
+- Removed several deprecated methods, such as PDU::clone_packet.
+
+- Added PacketSender::send(PDU&, NetworkInterface).
+
+- Normalized the TLV options naming conventions in all of the classes
+that used them.
+
+- Added support for Dot1Q, STP, PPPoE protocols.
+
+- Made some important optimizations on PDUOption<>'s constructors.
+
+- Added Utils::resolve_domain and Utils::resolve_domain6
+
+-------------------------------------------------------------------------------
+
+##### v0.3 - Thu Jan 31 16:47:27 ART 2013
+
+- Added IPv6, ICMPv6 and DHCPv6 classes.
+
+- Added support for Loopback interfaces and the Linux Crooked Capture
+pseudo protocol.
+
+- Added support for IPv6 records in DNS.
+
+- Added Packet/RefPacket class.
+
+- Added support for FreeBSD, OSX and Windows.
+
+- Added C++11 move semantics to several classes.
+
+- Done a complete rewrite of the build system; it now uses libtool.
+
+- Fixed several bugs in DNS.
+
+-------------------------------------------------------------------------------
+
+##### v0.2 - Sat Oct 20 11:26:40 2012
+
+- Added support for big endian architectures.
+
+- Simplified several interfaces.
+
+- Added IPv4Address and HWAddress class to simplify handling IP and hardware addresses.
+
+- Added NetworkInterface class to abstract network interfaces.
+
+- Added TCPStreamFollower class to follow TCP streams on the fly.
+
+- Added WEPDecrypter class to decrypt WEP-encrypted 802.11 data frames on the fly.
+
+- Added several new PDUs: Loopback, IEEE802_3, LLC, DNS.
+
+- Added support for reading and writing pcap files.
+
+- Moved to BSD-2 license.

CMakeLists.txt

@@ -1,22 +1,39 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.1)
 PROJECT(libtins)
 
+OPTION(LIBTINS_BUILD_EXAMPLES "Build examples" ON)
+OPTION(LIBTINS_BUILD_TESTS "Build tests" ON)
+
 # Compile in release mode by default
 IF(NOT CMAKE_BUILD_TYPE)
     MESSAGE(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
-    SET(CMAKE_BUILD_TYPE RelWithDebInfo) 
+    SET(CMAKE_BUILD_TYPE RelWithDebInfo)
 ELSE(NOT CMAKE_BUILD_TYPE)
     MESSAGE(STATUS "Using specified '${CMAKE_BUILD_TYPE}' build type.")
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-# Default compilation settings
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+# Compilation flags.
+IF(MSVC)
+    # Don't always use Wall, since VC's /Wall is ridiculously verbose.
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
+    # Disable VC secure checks, since these are not really issues.
+    ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS=1")
+    ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS=1")
+    ADD_DEFINITIONS("-DNOGDI=1")
+ELSE()
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+ENDIF()
+
+IF(APPLE)
+    # This is set to ON as of policy CMP0042
+    SET(CMAKE_MACOSX_RPATH ON)
+ENDIF()
 
 # Build output checks
 OPTION(LIBTINS_BUILD_SHARED "Build libtins as a shared library." ON)
 IF(LIBTINS_BUILD_SHARED)
     MESSAGE(
-        STATUS 
+        STATUS
         "Build will generate a shared library. "
         "Use LIBTINS_BUILD_SHARED=0 to perform a static build"
     )
@@ -24,18 +41,26 @@ IF(LIBTINS_BUILD_SHARED)
 ELSE(LIBTINS_BUILD_SHARED)
     MESSAGE(STATUS "Build will generate a static library.")
     SET(LIBTINS_TYPE STATIC)
+    ADD_DEFINITIONS("-DTINS_STATIC=1")
 ENDIF(LIBTINS_BUILD_SHARED)
 
 # The version number.
-SET(LIBTINS_VERSION_MAJOR 3)
-SET(LIBTINS_VERSION_MINOR 1)
-SET(LIBTINS_CPP_VERSION "${LIBTINS_VERSION_MAJOR}.${LIBTINS_VERSION_MINOR}")
+SET(TINS_VERSION_MAJOR 4)
+SET(TINS_VERSION_MINOR 5)
+SET(TINS_VERSION_PATCH 0)
+SET(LIBTINS_VERSION "${TINS_VERSION_MAJOR}.${TINS_VERSION_MINOR}")
 
 # Required Packages
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
+
+# Allow disabling packet capture mechanism
+OPTION(LIBTINS_ENABLE_PCAP "Enable capturing packets via libpcap" ON)
 
 # Look for libpcap
-FIND_PACKAGE(PCAP REQUIRED)
+IF(LIBTINS_ENABLE_PCAP)
+    FIND_PACKAGE(PCAP REQUIRED)
+    SET(TINS_HAVE_PCAP ON)
+ENDIF()
 
 # Set some Windows specific flags
 IF(WIN32)
@@ -43,58 +68,260 @@ IF(WIN32)
     SET(LIBTINS_OS_LIBS Ws2_32.lib Iphlpapi.lib)
 
     # Add the NOMINMAX macro to avoid Windows' min and max macros.
-    # While compiling on windows, for some reason, WIN32 is not defined,
-    # maybe we could fix this later, but it's OK for now.
-    ADD_DEFINITIONS(-DNOMINMAX -DWIN32)
+    ADD_DEFINITIONS(-DNOMINMAX)
+
+    # MinWG need some extra definitions to compile properly (WIN32 for PCAP and WIN32_WINNT version for ws2tcpip.h)
+    IF(MINGW)
+        ADD_DEFINITIONS(-DWIN32)
+        MACRO(get_WIN32_WINNT version)
+        IF (WIN32 AND CMAKE_SYSTEM_VERSION)
+            SET(ver ${CMAKE_SYSTEM_VERSION})
+            STRING(REPLACE "." "" ver ${ver})
+            STRING(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
+            SET(${version} "0x${ver}")
+        ENDIF()
+        ENDMACRO()
+        get_WIN32_WINNT(ver)
+        ADD_DEFINITIONS(-D_WIN32_WINNT=${ver})
+    ENDIF(MINGW)
+
 ENDIF(WIN32)
 
+INCLUDE(ExternalProject)
+
+# *******************
 # Compilation options
-OPTION(LIBTINS_ENABLE_CXX11 "Compile libtins with c++11 features" OFF)
+# *******************
+
+# Always check for C++ features
+INCLUDE(CheckCXXFeatures)
+
+IF(HAS_GCC_BUILTIN_SWAP)
+    SET(TINS_HAVE_GCC_BUILTIN_SWAP ON)
+ENDIF()
+
+# C++11 support
+OPTION(LIBTINS_ENABLE_CXX11 "Compile libtins with c++11 features" ON)
 IF(LIBTINS_ENABLE_CXX11)
-    SET(HAVE_CXX11 ON)
-    INCLUDE(CheckCXX11Features)
-    IF(HAS_CXX11_NULLPTR AND HAS_CXX11_RVALUE_REFERENCES)
+    # We only use declval and decltype on gcc/clang as VC fails to build that code,
+    # at least on VC2013
+    IF(HAS_CXX11_RVALUE_REFERENCES AND HAS_CXX11_FUNCTIONAL AND HAS_CXX11_CHRONO AND
+       HAS_CXX11_NOEXCEPT AND ((HAS_CXX11_DECLVAL AND HAS_CXX11_DECLTYPE) OR MSVC))
+        SET(TINS_HAVE_CXX11 ON)
         MESSAGE(STATUS "Enabling C++11 features")
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}")
-    ELSE(HAS_CXX11_NULLPTR AND HAS_CXX11_RVALUE_REFERENCES)
-        MESSAGE(FATAL_ERROR "C++11 features requested but the compiler does not support them.")
-    ENDIF(HAS_CXX11_NULLPTR AND HAS_CXX11_RVALUE_REFERENCES)
+    ELSE()
+        MESSAGE(WARNING "The compiler doesn't support the necessary C++11 features. "
+                        "Disabling C++11 on this build")
+    ENDIF()
 ELSE(LIBTINS_ENABLE_CXX11)
     MESSAGE(
-        WARNING 
+        WARNING
         "Disabling C++11 features. Use LIBTINS_ENABLE_CXX11=1 to enable them. "
         "Unless you are using an old compiler, you should enable this option, "
         "as it increases the library's performance")
 ENDIF(LIBTINS_ENABLE_CXX11)
 
+# IEEE 802.11 and WPA2 decryption support
 OPTION(LIBTINS_ENABLE_DOT11 "Compile libtins with IEEE 802.11 support" ON)
 OPTION(LIBTINS_ENABLE_WPA2 "Compile libtins with WPA2 decryption features (requires OpenSSL)" ON)
 IF(LIBTINS_ENABLE_DOT11)
-    SET(HAVE_DOT11 ON)
+    SET(TINS_HAVE_DOT11 ON)
     MESSAGE(STATUS "Enabling IEEE 802.11 support.")
     IF(LIBTINS_ENABLE_WPA2)
-        FIND_PACKAGE(OpenSSL REQUIRED)
-        SET(HAVE_WPA2_DECRYPTION ON)
-        MESSAGE(STATUS "Enabling WPA2 decryption support.")
+        FIND_PACKAGE(OpenSSL)
+        IF(OPENSSL_FOUND)
+            SET(TINS_HAVE_WPA2_DECRYPTION ON)
+            MESSAGE(STATUS "Enabling WPA2 decryption support.")
+        ELSE()
+            MESSAGE(WARNING "Disabling WPA2 decryption support since OpenSSL was not found")
+            # Default this to empty strings
+            SET(OPENSSL_INCLUDE_DIR "")
+            SET(OPENSSL_LIBRARIES "")
+        ENDIF()
     ELSE(LIBTINS_ENABLE_WPA2)
         MESSAGE(STATUS "Disabling WPA2 decryption support.")
     ENDIF(LIBTINS_ENABLE_WPA2)
 ENDIF(LIBTINS_ENABLE_DOT11)
 
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+# Optionally enable TCPIP classes (on by default)
+OPTION(LIBTINS_ENABLE_TCPIP "Enable TCPIP classes" ON)
+IF(LIBTINS_ENABLE_TCPIP AND TINS_HAVE_CXX11)
+    SET(TINS_HAVE_TCPIP ON)
+    MESSAGE(STATUS "Enabling TCPIP classes")
+ELSE()
+    SET(TINS_HAVE_TCPIP OFF)
+    MESSAGE(STATUS "Disabling TCPIP classes")
+ENDIF()
 
-# Congiguration file
+# Search for libboost
+FIND_PACKAGE(Boost)
+
+# Optionally enable the ACK tracker (on by default)
+OPTION(LIBTINS_ENABLE_ACK_TRACKER "Enable TCP ACK tracking support" ON)
+IF(LIBTINS_ENABLE_ACK_TRACKER AND TINS_HAVE_CXX11)
+    IF (Boost_FOUND)
+        MESSAGE(STATUS "Enabling TCP ACK tracking support.")
+        INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+        SET(TINS_HAVE_ACK_TRACKER ON)
+    ELSE()
+        MESSAGE(WARNING "Disabling ACK tracking support as boost.icl was not found")
+        SET(TINS_HAVE_ACK_TRACKER OFF)
+    ENDIF()
+ELSE()
+    SET(TINS_HAVE_ACK_TRACKER OFF)
+    MESSAGE(STATUS "Disabling ACK tracking support")
+ENDIF()
+
+# Optionally enable the TCP stream custom data (on by default)
+OPTION(LIBTINS_ENABLE_TCP_STREAM_CUSTOM_DATA "Enable TCP stream custom data support" ON)
+IF(LIBTINS_ENABLE_TCP_STREAM_CUSTOM_DATA AND TINS_HAVE_CXX11)
+    IF (Boost_FOUND)
+        MESSAGE(STATUS "Enabling TCP stream custom data support.")
+        INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+        SET(TINS_HAVE_TCP_STREAM_CUSTOM_DATA ON)
+    ELSE()
+        MESSAGE(WARNING "Disabling TCP stream custom data support as boost.any was not found")
+        SET(TINS_HAVE_TCP_STREAM_CUSTOM_DATA OFF)
+    ENDIF()
+ELSE()
+    SET(TINS_HAVE_TCP_STREAM_CUSTOM_DATA OFF)
+    MESSAGE(STATUS "Disabling TCP stream custom data support")
+ENDIF()
+
+OPTION(LIBTINS_ENABLE_WPA2_CALLBACKS "Enable WPA2 callback interface" ON)
+IF(LIBTINS_ENABLE_WPA2_CALLBACKS AND TINS_HAVE_WPA2_DECRYPTION AND TINS_HAVE_CXX11)
+    SET(STATUS "Enabling WPA2 callback interface")
+    SET(TINS_HAVE_WPA2_CALLBACKS ON)
+ENDIF()
+
+# Use pcap_sendpacket to send l2 packets rather than raw sockets
+IF(WIN32)
+    SET(USE_PCAP_SENDPACKET_DEFAULT ON)
+ELSE(WIN32)
+    SET(USE_PCAP_SENDPACKET_DEFAULT OFF)
+ENDIF(WIN32)
+
+OPTION(LIBTINS_USE_PCAP_SENDPACKET "Use pcap_sendpacket to send l2 packets"
+        ${USE_PCAP_SENDPACKET_DEFAULT})
+IF(LIBTINS_ENABLE_PCAP AND LIBTINS_USE_PCAP_SENDPACKET)
+    SET(TINS_HAVE_PACKET_SENDER_PCAP_SENDPACKET ON)
+    MESSAGE(STATUS "Using pcap_sendpacket to send l2 packets.")
+ENDIF()
+
+# Add a target to generate API documentation using Doxygen
+FIND_PACKAGE(Doxygen QUIET)
+IF(DOXYGEN_FOUND)
+    CONFIGURE_FILE(
+        ${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in
+        ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+        @ONLY
+    )
+    ADD_CUSTOM_TARGET(
+        docs
+        ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMENT "Generating API documentation with Doxygen" VERBATIM
+    )
+ENDIF(DOXYGEN_FOUND)
+
+# Configuration file
 CONFIGURE_FILE(
-  "${PROJECT_SOURCE_DIR}/include/config.h.in"
-  "${PROJECT_SOURCE_DIR}/include/config.h"
+  "${PROJECT_SOURCE_DIR}/include/tins/config.h.in"
+  "${PROJECT_SOURCE_DIR}/include/tins/config.h"
 )
 
-ENABLE_TESTING()
-ADD_SUBDIRECTORY(include)
+IF (NOT CMAKE_INSTALL_LIBDIR)
+    SET(CMAKE_INSTALL_LIBDIR lib)
+ENDIF()
+IF (NOT CMAKE_INSTALL_BINDIR)
+    SET(CMAKE_INSTALL_BINDIR bin)
+ENDIF()
+# The library output directory
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+# Support for pkg-config
+SET(pkgconfig_prefix      ${CMAKE_INSTALL_PREFIX})
+SET(pkgconfig_exec_prefix ${CMAKE_INSTALL_PREFIX})
+SET(pkgconfig_libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+SET(pkgconfig_version     ${LIBTINS_VERSION})
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libtins.pc.in
+                ${CMAKE_CURRENT_BINARY_DIR}/libtins.pc @ONLY)
+
+INSTALL(
+    FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/libtins.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)
+
+# Confiugure the uninstall script
+CONFIGURE_FILE(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+    IMMEDIATE @ONLY
+)
+
+# Add uninstall target
+ADD_CUSTOM_TARGET(uninstall
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+
+# ******************
+# Add subdirectories
+# ******************
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(tests)
-ADD_SUBDIRECTORY(examples)
+
+IF(LIBTINS_BUILD_EXAMPLES)
+    IF(LIBTINS_ENABLE_PCAP)
+        ADD_SUBDIRECTORY(examples)
+    ELSE()
+        MESSAGE(STATUS "Not building examples as pcap support is disabled")
+    ENDIF()
+ENDIF()
+
+IF(LIBTINS_BUILD_TESTS)
+    # Only include googletest if the git submodule has been fetched
+    IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/googletest/CMakeLists.txt")
+        # Enable tests and add the test directory
+        MESSAGE(STATUS "Tests have been enabled")
+        SET(GOOGLETEST_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/googletest)
+        SET(GOOGLETEST_INCLUDE ${GOOGLETEST_ROOT}/googletest/include)
+        SET(GOOGLETEST_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest)
+        SET(GOOGLETEST_LIBRARY ${GOOGLETEST_BINARY_DIR}/googletest)
+
+        ExternalProject_Add(
+            googletest
+            DOWNLOAD_COMMAND ""
+            SOURCE_DIR ${GOOGLETEST_ROOT}
+            BINARY_DIR ${GOOGLETEST_BINARY_DIR}
+            CMAKE_CACHE_ARGS "-DBUILD_GTEST:bool=ON" "-DBUILD_GMOCK:bool=OFF"
+                            "-Dgtest_force_shared_crt:bool=ON"
+                            "-DCMAKE_CXX_COMPILER:path=${CMAKE_CXX_COMPILER}"
+            INSTALL_COMMAND ""
+        )
+        # Make sure we build googletest before anything else
+        ADD_DEPENDENCIES(tins googletest)
+        ENABLE_TESTING()
+        ADD_SUBDIRECTORY(tests)
+    ELSE()
+        FIND_PACKAGE(GTest QUIET)
+        IF(${GTest_FOUND})
+            ENABLE_TESTING()
+            ADD_SUBDIRECTORY(tests)
+        ELSE()
+            MESSAGE(STATUS "googletest git submodule is absent. Run `git submodule init && git submodule update` to get it")
+        ENDIF()
+    ENDIF()
+ENDIF()
+
+# **********************************
+# CMake project configuration export
+# **********************************
+
+if(UNIX)
+    set(CONF_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/libtins")
+else()
+    set(CONF_CMAKE_INSTALL_DIR CMake)
+endif()
 
 # Add all targets to the build-tree export set
 EXPORT(
@@ -110,25 +337,25 @@ EXPORT(PACKAGE libtins)
 # for the build tree
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include")
 CONFIGURE_FILE(
-    libtinsConfig.cmake.in
+    cmake/libtinsConfig.cmake.in
     "${PROJECT_BINARY_DIR}/libtinsConfig.cmake" @ONLY
 )
 CONFIGURE_FILE(
-    libtinsConfigVersion.cmake.in
+    cmake/libtinsConfigVersion.cmake.in
     "${PROJECT_BINARY_DIR}/libtinsConfigVersion.cmake" @ONLY
 )
 # Install the libtinsConfig.cmake and libtinsConfigVersion.cmake
 INSTALL(
     FILES
     "${PROJECT_BINARY_DIR}/libtinsConfig.cmake"
-   "${PROJECT_BINARY_DIR}/libtinsConfigVersion.cmake"
-   DESTINATION CMake
-   COMPONENT dev
+    "${PROJECT_BINARY_DIR}/libtinsConfigVersion.cmake"
+    DESTINATION ${CONF_CMAKE_INSTALL_DIR}
+    COMPONENT dev
 )
 
 # Install the export set for use with the install-tree
 INSTALL(
     EXPORT libtinsTargets
-    DESTINATION CMake
+    DESTINATION ${CONF_CMAKE_INSTALL_DIR}
     COMPONENT dev
 )

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing
+
+Bug reports and enhancements to the library are really valued and appreciated!
+
+# Bug reports
+
+If you find a bug, please report it! Bugs on the library are taken seriously 
+and a patch for them is usually pushed on the same day. 
+
+When reporting a bug, please make sure to indicate the platform (e.g. GNU/Linux, Windows, OSX)
+in which you came across the issue, as this is essential to finding the cause.
+
+## Packet parsing bugs
+
+If you find a bug related to packet parsing (e.g. a field on a packet contains an 
+invalid value), please try to provide a pcap file that contains the packet that
+was incorrectly parsed. Doing this will make it very simple to find the issue, plus
+you will be asked to provide this file anyway, so this just makes things
+easier.
+
+# Pull requests
+
+Pull requests are very welcomed. When doing a pull request please:
+
+* Notice that your code will be compiled and tests will be run automatically by the travis and 
+appveyor CI tools. If your code has issues on any of the tested platforms (GNU/Linux, Windows
+and OSX), please fix it or otherwise the PR won't be merged. 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014, Matias Fontanini
+Copyright (c) 2012-2017, Matias Fontanini
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile.am

@@ -1,131 +0,0 @@
-AUTOMAKE_OPTIONS=subdir-objects 1.11
-ACLOCAL_AMFLAGS=${ACLOCAL_FLAGS} -I m4
-
-# pkg-config stuff
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libtins.pc
-
-lib_LTLIBRARIES=libtins.la
-
-libtins_la_LDFLAGS = -version-info @LIBTINS_VERSION@
-
-AM_CXXFLAGS = -Wall -pedantic -I@LIBTINS_INCLUDE_DIR@
-
-libtins_la_SOURCES=src/arp.cpp \
-                    src/bootp.cpp \
-                    src/handshake_capturer.cpp \
-                    src/stp.cpp \
-                    src/pppoe.cpp \
-                    src/crypto.cpp \
-                    src/dhcp.cpp \
-                    src/dhcpv6.cpp \
-                    src/dns.cpp \
-                    src/dot3.cpp \
-                    src/dot1q.cpp \
-                    src/eapol.cpp \
-                    src/ethernetII.cpp \
-                    src/icmp.cpp \
-                    src/icmpv6.cpp \
-                    src/internals.cpp \
-                    src/ip_reassembler.cpp \
-                    src/ip.cpp \
-                    src/ip_address.cpp \
-                    src/ipv6.cpp \
-                    src/ipv6_address.cpp \
-                    src/ipsec.cpp \
-                    src/llc.cpp \
-                    src/loopback.cpp \
-                    src/network_interface.cpp \
-                    src/packet_sender.cpp \
-                    src/packet_writer.cpp \
-                    src/ppi.cpp \
-                    src/pdu.cpp \
-                    src/radiotap.cpp \
-                    src/address_range.cpp \
-                    src/rawpdu.cpp \
-                    src/rsn_information.cpp \
-                    src/sll.cpp \
-                    src/snap.cpp \
-                    src/sniffer.cpp \
-                    src/tcp.cpp \
-                    src/tcp_stream.cpp \
-                    src/udp.cpp \
-                    src/utils.cpp \
-                    src/dot11/dot11_base.cpp \
-                    src/dot11/dot11_data.cpp \
-                    src/dot11/dot11_mgmt.cpp \
-                    src/dot11/dot11_beacon.cpp \
-                    src/dot11/dot11_assoc.cpp \
-                    src/dot11/dot11_auth.cpp \
-                    src/dot11/dot11_probe.cpp \
-                    src/dot11/dot11_control.cpp
-
-libtinsdir = $(includedir)/tins
-
-libtins_HEADERS = include/internals.h \
-							include/dhcpv6.h \
-							include/dot11.h \
-							include/dot1q.h \
-							include/dot3.h \
-							include/small_uint.h \
-							include/ip.h \
-							include/ipsec.h \
-							include/eapol.h \
-							include/tcp_stream.h \
-							include/pppoe.h \
-							include/handshake_capturer.h \
-							include/ipv6.h \
-							include/icmpv6.h \
-							include/ieee802_3.h \
-							include/endianness.h \
-							include/rsn_information.h \
-							include/loopback.h \
-							include/ethernetII.h \
-							include/crypto.h \
-							include/packet.h \
-							include/llc.h \
-							include/ip_reassembler.h \
-							include/icmp.h \
-							include/hw_address.h \
-							include/packet_writer.h \
-							include/macros.h \
-							include/arp.h \
-							include/ip_address.h \
-							include/pdu.h \
-							include/packet_sender.h \
-							include/bootp.h \
-							include/network_interface.h \
-							include/sll.h \
-							include/ppi.h \
-							include/radiotap.h \
-							include/dns.h \
-							include/rawpdu.h \
-							include/sniffer.h \
-							include/snap.h \
-							include/pdu_cacher.h \
-							include/dhcp.h \
-							include/timestamp.h \
-							include/tcp.h \
-							include/pdu_option.h \
-							include/tins.h \
-							include/udp.h \
-							include/ipv6_address.h  \
-							include/constants.h \
-							include/utils.h \
-							include/cxxstd.h \
-							include/stp.h \
-							include/exceptions.h \
-							include/config.h \
-							include/address_range.h \
-							include/pdu_allocator.h
-
-libtins_dot11_HEADERS =  include/dot11/dot11_base.h \
-						include/dot11/dot11_beacon.h \
-						include/dot11/dot11_data.h \
-						include/dot11/dot11_mgmt.h \
-						include/dot11/dot11_assoc.h \
-						include/dot11/dot11_auth.h \
-						include/dot11/dot11_probe.h \
-						include/dot11/dot11_control.h
-
-libtins_dot11dir  	  =     $(includedir)/tins/dot11/

README

@@ -1,73 +0,0 @@
-------------------------------------------------------------------------
-       libtins v3.0
-------------------------------------------------------------------------
-
-
--------------------------------- About ---------------------------------
-
-libtins is a high-level, multiplatform C++ network packet sniffing and 
-crafting library.
-
-Its main purpose is to provide the C++ developer an easy, efficient, 
-platform and endianess-independent way to create tools which need to 
-send, receive and manipulate specially crafted packets. 
-
-In order to read tutorials, examples and checkout some benchmarks of the
-library, please visit:
-
-http://libtins.github.io/
-
-------------------------------- Compiling ------------------------------
-
-libtins depends on libpcap and openssl, although the latter is not 
-necessary if some features of the library are disabled.
-
-In order to compile, execute:
-
-./configure
-make
-
-Note that by default, only the shared object is compiled. If you would
-like to generate a static library file as well, run:
-
-./configure --enable-static
-
-The generated static/shared library files will be located in the .libs
-directory.
-
-libtins is noticeable faster if you enable C++11 support. Therefore, if
-your compiler supports this standard, then you should enable it. In 
-order to do so, use the --enable-c++11 switch:
-
-./configure --enable-c++11
-
-If you want to disable WPA2 decryption support, which will remove 
-openssl as a dependency for compilation, use the --disable-wpa2 switch:
-
-./configure --disable-wpa2
-
-If you want to disable IEEE 802.11 support(this will also disable 
-RadioTap and WPA2 decryption), which will reduce the size of the 
-resulting library in around 20%, use the --disable-dot11 switch:
-
-./configure --disable-dot11
-
------------------------------- Installing-------------------------------
-
-Once you're done, if you want to install the header files and the 
-shared object, execute as root:
-
-make install
-
-This will install the shared object typically in /usr/local/lib. Note
-that you might have to update ldconfig's cache before using it, so 
-in order to invalidate it, you should run(as root):
-
-ldconfig
-
------------------------------- Examples --------------------------------
-
-You might want to have a look at the examples located  in the "examples"
-directory. The same samples can be found online at:
-
-http://libtins.github.io/examples/

README.md

@@ -1,5 +1,7 @@
-libtins
-=======
+# libtins
+
+[![Build status](https://travis-ci.org/mfontanini/libtins.svg?branch=master)](https://travis-ci.org/mfontanini/libtins) 
+[![Build status](https://ci.appveyor.com/api/projects/status/33n8ib68nx3tptib/branch/master?svg=true)](https://ci.appveyor.com/project/mfontanini/libtins/branch/master)
 
 libtins is a high-level, multiplatform C++ network packet sniffing and 
 crafting library. 
@@ -34,6 +36,7 @@ cmake ../
 make
 ```
 
+### Static/shared build
 Note that by default, only the shared object is compiled. If you would
 like to generate a static library file, run:
 
@@ -44,7 +47,9 @@ cmake ../ -DLIBTINS_BUILD_SHARED=0
 The generated static/shared library files will be located in the 
 _build/lib_ directory.
 
-libtins is noticeable faster if you enable _C++11_ support. Therefore, 
+### C++11 support
+
+libtins is noticeably faster if you enable _C++11_ support. Therefore, 
 if your compiler supports this standard, then you should enable it. 
 In order to do so, use the _LIBTINS_ENABLE_CXX11_ switch:
 
@@ -52,6 +57,22 @@ In order to do so, use the _LIBTINS_ENABLE_CXX11_ switch:
 cmake ../ -DLIBTINS_ENABLE_CXX11=1
 ```
 
+### TCP ACK tracker
+
+The TCP ACK tracker feature requires the boost.icl library (header only).
+This feature is enabled by default but will be disabled if the boost
+headers are not found. You can disable this feature by using:
+
+```Shell
+cmake ../ -DLIBTINS_ENABLE_ACK_TRACKER=0
+```
+
+If your boost installation is on some non-standard path, use 
+the parameters shown on the
+[CMake FindBoost help](https://cmake.org/cmake/help/v3.0/module/FindBoost.html)
+
+### WPA2 decryption
+
 If you want to disable _WPA2_ decryption support, which will remove 
 openssl as a dependency for compilation, use the 
 _LIBTINS_ENABLE_WPA2_ switch:
@@ -60,6 +81,8 @@ _LIBTINS_ENABLE_WPA2_ switch:
 cmake ../ -DLIBTINS_ENABLE_WPA2=0
 ```
 
+### IEEE 802.11 support
+
 If you want to disable IEEE 802.11 support(this will also disable 
 RadioTap and WPA2 decryption), which will reduce the size of the 
 resulting library in around 20%, use the _LIBTINS_ENABLE_DOT11_ switch:
@@ -85,9 +108,40 @@ in order to invalidate it, you should run(as root):
 ldconfig
 ```
 
+## Running tests ##
+
+You may want to run the unit tests on your system so you make sure
+everything works. In order to do so, you need to follow these steps:
+
+```Shell
+# This will fetch the googletest submodule, needed for tests
+git submodule init
+git submodule update
+
+mkdir build
+cd build
+
+# Use any options you want
+cmake .. 
+
+# Compile tests
+make tests
+
+# Run them
+make test
+```
+
+If you find that any tests fail, please create an ticket in the
+issue tracker indicating the platform and architecture you're using.
+
 ## Examples ##
 
 You might want to have a look at the examples located  in the "examples"
 directory. The same samples can be found online at:
 
 http://libtins.github.io/examples/
+
+## Contributing ##
+
+If you want to report a bug or make a pull request, please have a look at 
+the [contributing](CONTRIBUTING.md) file before doing so.

cmake/Modules/CheckCXXFeatures.cmake

@@ -10,6 +10,7 @@
 #  HAS_CXX11_CONSTEXPR          - constexpr keyword
 #  HAS_CXX11_CSTDINT_H          - cstdint header
 #  HAS_CXX11_DECLTYPE           - decltype keyword
+#  HAS_CXX11_DECLVAL            - declval feature
 #  HAS_CXX11_FUNC               - __func__ preprocessor constant
 #  HAS_CXX11_INITIALIZER_LIST   - initializer list
 #  HAS_CXX11_LAMBDA             - lambdas
@@ -68,24 +69,24 @@ endif ()
 
 function(cxx11_check_feature FEATURE_NAME RESULT_VAR)
     if (NOT DEFINED ${RESULT_VAR})
-        set(_bindir "${CMAKE_CURRENT_BINARY_DIR}/cxx11_${FEATURE_NAME}")
+        set(_bindir "${CMAKE_CURRENT_BINARY_DIR}/cxx_${FEATURE_NAME}")
 
-        set(_SRCFILE_BASE ${CMAKE_CURRENT_LIST_DIR}/CheckCXX11Features/cxx11-test-${FEATURE_NAME})
+        set(_SRCFILE_BASE ${CMAKE_CURRENT_LIST_DIR}/CheckCXXFeatures/cxx-test-${FEATURE_NAME})
         set(_LOG_NAME "\"${FEATURE_NAME}\"")
-        message(STATUS "Checking C++11 support for ${_LOG_NAME}")
+        message(STATUS "Checking C++ support for ${_LOG_NAME}")
 
         set(_SRCFILE "${_SRCFILE_BASE}.cpp")
         set(_SRCFILE_FAIL "${_SRCFILE_BASE}_fail.cpp")
         set(_SRCFILE_FAIL_COMPILE "${_SRCFILE_BASE}_fail_compile.cpp")
 
-        if (CROSS_COMPILING)
+        if (CMAKE_CROSSCOMPILING)
             try_compile(${RESULT_VAR} "${_bindir}" "${_SRCFILE}"
                         COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}")
             if (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL})
                 try_compile(${RESULT_VAR} "${_bindir}_fail" "${_SRCFILE_FAIL}"
                             COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}")
             endif (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL})
-        else (CROSS_COMPILING)
+        else (CMAKE_CROSSCOMPILING)
             try_run(_RUN_RESULT_VAR _COMPILE_RESULT_VAR
                     "${_bindir}" "${_SRCFILE}"
                     COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}")
@@ -104,7 +105,7 @@ function(cxx11_check_feature FEATURE_NAME RESULT_VAR)
                     set(${RESULT_VAR} FALSE)
                 endif (_COMPILE_RESULT_VAR AND _RUN_RESULT_VAR)
             endif (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL})
-        endif (CROSS_COMPILING)
+        endif (CMAKE_CROSSCOMPILING)
         if (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL_COMPILE})
             try_compile(_TMP_RESULT "${_bindir}_fail_compile" "${_SRCFILE_FAIL_COMPILE}"
                         COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}")
@@ -116,27 +117,19 @@ function(cxx11_check_feature FEATURE_NAME RESULT_VAR)
         endif (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL_COMPILE})
 
         if (${RESULT_VAR})
-            message(STATUS "Checking C++11 support for ${_LOG_NAME}: works")
+            message(STATUS "Checking C++ support for ${_LOG_NAME}: works")
         else (${RESULT_VAR})
-            message(STATUS "Checking C++11 support for ${_LOG_NAME}: not supported")
+            message(STATUS "Checking C++ support for ${_LOG_NAME}: not supported")
         endif (${RESULT_VAR})
-        set(${RESULT_VAR} ${${RESULT_VAR}} CACHE INTERNAL "C++11 support for ${_LOG_NAME}")
+        set(${RESULT_VAR} ${${RESULT_VAR}} CACHE INTERNAL "C++ support for ${_LOG_NAME}")
     endif (NOT DEFINED ${RESULT_VAR})
 endfunction(cxx11_check_feature)
 
-cxx11_check_feature("__func__" HAS_CXX11_FUNC)
-cxx11_check_feature("auto" HAS_CXX11_AUTO)
-cxx11_check_feature("auto_ret_type" HAS_CXX11_AUTO_RET_TYPE)
-cxx11_check_feature("class_override_final" HAS_CXX11_CLASS_OVERRIDE)
-cxx11_check_feature("constexpr" HAS_CXX11_CONSTEXPR)
-cxx11_check_feature("cstdint" HAS_CXX11_CSTDINT_H)
 cxx11_check_feature("decltype" HAS_CXX11_DECLTYPE)
+cxx11_check_feature("declval" HAS_CXX11_DECLVAL)
 cxx11_check_feature("initializer_list" HAS_CXX11_INITIALIZER_LIST)
-cxx11_check_feature("lambda" HAS_CXX11_LAMBDA)
-cxx11_check_feature("long_long" HAS_CXX11_LONG_LONG)
-cxx11_check_feature("nullptr" HAS_CXX11_NULLPTR)
-cxx11_check_feature("regex" HAS_CXX11_LIB_REGEX)
 cxx11_check_feature("rvalue-references" HAS_CXX11_RVALUE_REFERENCES)
-cxx11_check_feature("sizeof_member" HAS_CXX11_SIZEOF_MEMBER)
-cxx11_check_feature("static_assert" HAS_CXX11_STATIC_ASSERT)
-cxx11_check_feature("variadic_templates" HAS_CXX11_VARIADIC_TEMPLATES)
+cxx11_check_feature("functional" HAS_CXX11_FUNCTIONAL)
+cxx11_check_feature("chrono" HAS_CXX11_CHRONO)
+cxx11_check_feature("noexcept" HAS_CXX11_NOEXCEPT)
+cxx11_check_feature("builtin-swap" HAS_GCC_BUILTIN_SWAP)

cmake/Modules/CheckCXXFeatures/cxx-test-builtin-swap.cpp

@@ -0,0 +1,8 @@
+#include <stdint.h>
+
+int main() {
+    uint16_t u16 = __builtin_bswap16(0x9812U);
+    uint32_t u32 = __builtin_bswap32(0x9812ad81U);
+    uint64_t u64 = __builtin_bswap64(0x9812ad81f61a890dU);
+    return (u16 > 0 && u32 > 0 && u64 > 0) ? 0 : 1;
+}

cmake/Modules/CheckCXXFeatures/cxx-test-chrono.cpp

@@ -0,0 +1,9 @@
+#include <chrono>
+
+using namespace std::chrono;
+
+int main() {
+    system_clock::time_point tp = system_clock::now();
+    milliseconds ms = duration_cast<milliseconds>(tp.time_since_epoch());
+    return (ms.count() > 0) ? 0 : 1;
+}

cmake/Modules/CheckCXXFeatures/cxx-test-declval.cpp

@@ -0,0 +1,19 @@
+// Example code taken from http://en.cppreference.com/w/cpp/utility/declval
+
+#include <utility>
+#include <iostream>
+ 
+struct Default { int foo() const { return 1; } };
+ 
+struct NonDefault
+{
+    NonDefault(const NonDefault&) { }
+    int foo() const { return 1; }
+};
+ 
+int main()
+{
+    decltype(Default().foo()) n1 = 1;                   // type of n1 is int
+    decltype(std::declval<NonDefault>().foo()) n2 = n1; // type of n2 is int
+    return (n1 == 1 && n2 == 1) ? 0 : 1;
+}

cmake/Modules/CheckCXXFeatures/cxx-test-functional.cpp

@@ -0,0 +1,11 @@
+#include <functional>
+
+int add(int x, int y) {
+    return x + y;
+}
+
+int main() {
+    std::function<int(int, int)> func;
+    func = std::bind(&add, std::placeholders::_1, std::placeholders::_2);
+    return (func(2, 2) == 4) ? 0 : 1;
+}

cmake/Modules/CheckCXXFeatures/cxx-test-noexcept.cpp

@@ -0,0 +1,7 @@
+int foo() noexcept {
+    return 0;
+}
+
+int main() {
+    return foo();
+}

cmake/Modules/FindPCAP.cmake

@@ -18,6 +18,7 @@
 #  PCAP_LIBRARY              The libpcap library (possibly includes a thread
 #                            library e.g. required by pf_ring's libpcap)
 #  HAVE_PF_RING              If a found version of libpcap supports PF_RING
+#  HAVE_PCAP_IMMEDIATE_MODE  If the version of libpcap found supports immediate mode
 
 find_path(PCAP_ROOT_DIR
     NAMES include/pcap.h
@@ -28,9 +29,17 @@ find_path(PCAP_INCLUDE_DIR
     HINTS ${PCAP_ROOT_DIR}/include
 )
 
+set (HINT_DIR ${PCAP_ROOT_DIR}/lib)
+
+# On x64 windows, we should look also for the .lib at /lib/x64/
+# as this is the default path for the WinPcap developer's pack
+if (${CMAKE_SIZEOF_VOID_P} EQUAL 8 AND WIN32)
+    set (HINT_DIR ${PCAP_ROOT_DIR}/lib/x64/ ${HINT_DIR})
+endif ()
+
 find_library(PCAP_LIBRARY
     NAMES pcap wpcap
-    HINTS ${PCAP_ROOT_DIR}/lib
+    HINTS ${HINT_DIR}
 )
 
 include(FindPackageHandleStandardArgs)
@@ -65,6 +74,8 @@ endif (NOT PCAP_LINKS_SOLO)
 include(CheckFunctionExists)
 set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LIBRARY})
 check_function_exists(pcap_get_pfring_id HAVE_PF_RING)
+check_function_exists(pcap_set_immediate_mode HAVE_PCAP_IMMEDIATE_MODE)
+check_function_exists(pcap_set_tstamp_precision HAVE_PCAP_TIMESTAMP_PRECISION)
 set(CMAKE_REQUIRED_LIBRARIES)
 
 mark_as_advanced(

cmake/appveyor.yml

@@ -0,0 +1,53 @@
+version: 1.0.{build}
+configuration:
+- debug
+- release
+platform: 
+- Win32
+- x64
+environment:
+  matrix:
+    - compiler: vs2013
+    - compiler: vs2015
+  BOOST_ROOT: C:/Libraries/boost
+clone_depth: 1
+install:
+- git clone https://github.com/mfontanini/winpcap-installer.git
+- cd winpcap-installer
+- winpcap-boundary-meter-4.1.3.exe /S
+- cd ..
+- appveyor DownloadFile http://www.winpcap.org/install/bin/WpdPack_4_1_2.zip
+- 7z x .\WpdPack_4_1_2.zip -oc:\
+- git submodule init
+- git submodule update
+before_build:
+- mkdir build
+- cd build
+- if "%compiler%"=="vs2013" (set VS_VERSION=12) else (set VS_VERSION=14)
+- set VS=Visual Studio %VS_VERSION%
+- if "%platform%"=="Win32" (set GENERATOR="%VS%" & set ARCH_BITS=32)
+- if "%platform%"=="x64" (set GENERATOR="%VS% Win64" & set ARCH_BITS=64)
+- set BOOST_LIBRARYDIR=C:\Libraries\boost\lib%ARCH_BITS%-msvc-%VS_VERSION%.0
+- cmake .. -G %GENERATOR% -DPCAP_ROOT_DIR=c:\WpdPack -DLIBTINS_BUILD_SHARED=0 -DLIBTINS_ENABLE_WPA2=0 -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBoost_USE_STATIC_LIBS="ON"
+build:
+  project: C:/projects/libtins/build/libtins.sln
+  verbosity: minimal
+after_build:
+- mkdir install\libtins\include
+- mkdir install\libtins\lib
+- cd install\libtins
+- copy C:\projects\libtins\build\lib\%Configuration%\tins.lib lib
+- xcopy C:\projects\libtins\include include /s /e
+- del include\CMakeLists.txt
+- del include\tins\CMakeLists.txt
+- del include\tins\config.h.in
+- del include\tins\dot11\CMakeLists.txt
+- cd ..\
+- 7z a libtins-%compiler%-%platform%-%Configuration%.zip libtins
+test_script:
+- cd c:\projects\libtins\build
+- ctest -C %Configuration% -V
+deploy_script:
+- ps: Push-AppveyorArtifact "install\libtins-$env:Compiler-$env:Platform-$env:Configuration.zip"
+skip_commits:
+  message: /Update documentation.*/

cmake/cmake_uninstall.cmake.in

@@ -0,0 +1,23 @@
+# Taken from https://cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
+
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    exec_program(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif(NOT "${rm_retval}" STREQUAL 0)
+  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)

compile

@@ -1 +0,0 @@
-/usr/share/automake-1.14/compile

configure.ac

@@ -1,85 +0,0 @@
-AC_INIT([libtins], [3.0], [matias.fontanini@gmail.com], [libtins], [http://libtins.sourceforge.net])
-AC_CANONICAL_SYSTEM
-AC_CONFIG_HEADER(include/config.h)
-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-extra-portability foreign])
-LT_INIT([disable-static])
-AC_CONFIG_MACRO_DIR([m4])
-AM_MAINTAINER_MODE([disable])
-
-AC_PROG_CXX
-AC_LANG(C++)
-
-AC_PROG_LIBTOOL
-
-# Check that libpcap exists
-
-AC_ARG_WITH([pcap-include-path],
-  [AS_HELP_STRING([--with-pcap-include-path],
-    [location of the libpcap headers, defaults to /usr/include/pcap])],
-  [CXXFLAGS="$CXXFLAGS -I$withval"; CPPFLAGS="-I$withval"])
-
-AC_ARG_WITH([pcap-lib-path],
-  [AS_HELP_STRING([--with-pcap-lib-path], [location of the libpcap libraries])],
-  [LIBS="$LIBS -L$withval"])
-
-AC_CHECK_LIB(pcap, pcap_loop, [], [AC_MSG_ERROR([pcap library is missing!])])
-
-old_cppflags=$CPPFLAGS
-CPPFLAGS=""
-
-# Headers
-
-LIBTINS_INCLUDE_DIR="include"
-AC_CHECK_HEADERS([pcap.h], [], [AC_MSG_ERROR([libpcap headers are missing!])])
-
-CPPFLAGS=$old_cppflags
-
-# Options
-
-wpa2_msg="WPA2 decryption(which requires openssl) can be disabled using the --disable-wpa2 flag."
-
-AC_ARG_ENABLE(
-    c++11, 
-    [  --enable-c++11          enable C++11 features], 
-    [AX_CXX_COMPILE_STDCXX_11(noext)]
-)
-
-AC_ARG_ENABLE(
-    dot11, 
-    [  --disable-dot11         disable IEEE 802.11 support], 
-    [],
-    [
-        AC_DEFINE([HAVE_DOT11], 1, Have IEEE 802.11 support)
-
-        # Only allow enabling WPA2 if Dot11 is enabled.
-        AC_ARG_ENABLE(
-            wpa2, 
-            [  --disable-wpa2          disable WPA2 decryption features], 
-            [],
-            [
-                AC_CHECK_HEADERS(
-                    [openssl/evp.h openssl/hmac.h openssl/aes.h], 
-                    [], 
-                    [AC_MSG_ERROR([openssl headers are missing! $wpa2_msg ])]
-                    AC_DEFINE([HAVE_WPA2_DECRYPTION], 0, Have WPA2 decryption library)
-                )
-                AC_CHECK_LIB(
-                    crypto, 
-                    PKCS5_PBKDF2_HMAC_SHA1, 
-                    [], 
-                    [AC_MSG_ERROR([openssl library is missing! $wpa2_msg ])]
-                )
-                AC_DEFINE([HAVE_WPA2_DECRYPTION], 1, Have WPA2 decryption library)
-            ]
-        )
-    ]
-)
-
-# Substitute options
-
-AC_SUBST(CXXFLAGS)
-AC_SUBST(LIBS)
-AC_SUBST(LIBTINS_INCLUDE_DIR)
-AC_SUBST([LIBTINS_VERSION], [3:0:0])
-AC_CONFIG_FILES([Makefile libtins.pc])
-AC_OUTPUT

depcomp

@@ -1,708 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2012-03-27.16; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
-  object      Object file output by 'PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-# A tabulation character.
-tab='	'
-# A newline character.
-nl='
-'
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-   gccflag=-qmakedep=gcc,-MF
-   depmode=gcc
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' "$nl" < "$tmpdepfile" |
-## Some versions of gcc put a space before the ':'.  On the theory
-## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like '#:fec' to the end of the
-    # dependency line.
-    tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr "$nl" ' ' >> "$depfile"
-    echo >> "$depfile"
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-xlc)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts '$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-  # However on
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\':
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # will emit a similar output, but also prepend the continuation lines
-  # with horizontal tabulation characters.
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form 'foo.o: dependent.h',
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-    < "$tmpdepfile" > "$depfile"
-  sed '
-    s/[ '"$tab"'][ '"$tab"']*/ /g
-    s/^ *//
-    s/ *\\*$//
-    s/^[^:]*: *//
-    /^$/d
-    /:$/d
-    s/$/ :/
-  ' < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add 'dependent.h:' lines.
-    sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in 'foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/'"$tab"'/
-  G
-  p
-}' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for ':'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' "$nl" < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

docs/Doxyfile.in

@@ -31,14 +31,14 @@ PROJECT_NAME           = libtins
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.2
+PROJECT_NUMBER         = @LIBTINS_VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ../docs/
+OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/docs/
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -581,7 +581,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = include src
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/include @CMAKE_CURRENT_SOURCE_DIR@/src @CMAKE_CURRENT_SOURCE_DIR@/docs/mainpage.dox
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -1365,7 +1365,9 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
-PREDEFINED             =
+PREDEFINED             = "TINS_IS_CXX11=1" \
+                         "TINS_HAVE_WPA2_CALLBACKS=1" \
+                         "TINS_HAVE_DOT11=1"
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.

docs/mainpage.dox

@@ -0,0 +1,29 @@
+/** 
+ * \mainpage Documentation
+ *
+ * \section intro_sec Introduction
+ *
+ * <i>libtins</i> is a high-level, multiplatform <i>C++</i> network packet 
+ * sniffing and crafting library.
+ * 
+ * Its main purpose is to provide the <i>C++</i> developer an easy, efficient, 
+ * platform and endianess-independent way to create tools which need to 
+ * send, receive and manipulate network packets.
+ *
+ * \section install_sec Installation
+ * 
+ * Please visit the <a href="http://libtins.github.io/download/">downloads
+ * section</a> in order to see the installation instructions.
+ *
+ * \section tutorials_sec Tutorials
+ *
+ * If you want to learn about how the library works, please visit the
+ * <a href="http://libtins.github.io/tutorial/">tutorials</a> section.
+ *
+ * \section examples_sec Examples
+ *
+ * Make sure to visit the <a href="http://libtins.github.io/examples/">
+ * examples</a> section to see some short but illustrative examples on how 
+ * to send and sniff packets using <i>libtins</i>.
+ *
+ */

examples/CMakeLists.txt

@@ -1,56 +1,81 @@
-FIND_PACKAGE(libtins QUIET)
 FIND_PACKAGE(Threads QUIET)
+FIND_PACKAGE(Boost COMPONENTS regex)
 
-IF(libtins_FOUND)
-    SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples)
-    INCLUDE_DIRECTORIES(${LIBTINS_INCLUDE_DIRS})
-    LINK_LIBRARIES(${LIBTINS_LIBRARIES})
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include
+    ${PCAP_INCLUDE_DIR}
+)
+LINK_LIBRARIES(tins)
 
-    IF(HAVE_CXX11)
-        SET(LIBTINS_CXX11_EXAMPLES
-            arpmonitor
-            dns_queries
-            dns_spoof
-            dns_stats
-            wps_detect
-        )
-    ELSE(HAVE_CXX11)
-        MESSAGE(WARNING "Disabling some examples since C++11 support is disabled.")
-    ENDIF(HAVE_CXX11)
-
-    ADD_CUSTOM_TARGET(
-        examples DEPENDS
-        arpspoofing
-        ${LIBTINS_CXX11_EXAMPLES}
-        beacon_display
-        portscan
+IF(TINS_HAVE_CXX11)
+    SET(LIBTINS_CXX11_EXAMPLES
+        arpmonitor
+        dns_queries
+        dns_spoof
+        dns_stats
+        stream_dump
+        icmp_responses
+        interfaces_info
+        tcp_connection_close
         traceroute
+        wps_detect
     )
+    IF(Boost_REGEX_FOUND)
+        SET(LIBTINS_CXX11_EXAMPLES ${LIBTINS_CXX11_EXAMPLES} http_requests)
+    ELSE()
+        MESSAGE(WARNING "Disabling HTTP requests example since boost.regex was not found")
+    ENDIF()
+ELSE(TINS_HAVE_CXX11)
+    MESSAGE(WARNING "Disabling some examples since C++11 support is disabled.")
+ENDIF(TINS_HAVE_CXX11)
 
-    ADD_EXECUTABLE(arpspoofing EXCLUDE_FROM_ALL arpspoofing.cpp)
-    IF(HAVE_CXX11)
-        ADD_EXECUTABLE(arpmonitor EXCLUDE_FROM_ALL arpmonitor.cpp)
-        ADD_EXECUTABLE(dns_queries EXCLUDE_FROM_ALL dns_queries.cpp)
-        ADD_EXECUTABLE(dns_spoof EXCLUDE_FROM_ALL dns_spoof.cpp)
-        ADD_EXECUTABLE(dns_stats EXCLUDE_FROM_ALL dns_stats.cpp)
-        ADD_EXECUTABLE(wps_detect EXCLUDE_FROM_ALL wps_detect.cpp)
-    ENDIF(HAVE_CXX11)
+ADD_CUSTOM_TARGET(
+    examples DEPENDS
+    arpspoofing
+    ${LIBTINS_CXX11_EXAMPLES}
+    beacon_display
+    portscan
+    route_table
+    defragmenter
+)
 
-    ADD_EXECUTABLE(beacon_display EXCLUDE_FROM_ALL beacon_display.cpp)
+# Make sure we first build libtins
+ADD_DEPENDENCIES(examples tins)
 
-    if(THREADS_FOUND)
-        ADD_EXECUTABLE(portscan EXCLUDE_FROM_ALL portscan.cpp)
+ADD_EXECUTABLE(arpspoofing EXCLUDE_FROM_ALL arpspoofing.cpp)
+ADD_EXECUTABLE(route_table EXCLUDE_FROM_ALL route_table.cpp)
+ADD_EXECUTABLE(defragmenter EXCLUDE_FROM_ALL defragmenter.cpp)
+IF(TINS_HAVE_CXX11)
+    ADD_EXECUTABLE(arpmonitor EXCLUDE_FROM_ALL arpmonitor.cpp)
+    ADD_EXECUTABLE(dns_queries EXCLUDE_FROM_ALL dns_queries.cpp)
+    ADD_EXECUTABLE(dns_spoof EXCLUDE_FROM_ALL dns_spoof.cpp)
+    ADD_EXECUTABLE(stream_dump EXCLUDE_FROM_ALL stream_dump.cpp)
+    ADD_EXECUTABLE(icmp_responses EXCLUDE_FROM_ALL icmp_responses.cpp)
+    ADD_EXECUTABLE(interfaces_info EXCLUDE_FROM_ALL interfaces_info.cpp)
+    ADD_EXECUTABLE(tcp_connection_close EXCLUDE_FROM_ALL tcp_connection_close.cpp)
+    ADD_EXECUTABLE(wps_detect EXCLUDE_FROM_ALL wps_detect.cpp)
+    IF (Boost_REGEX_FOUND)
+        ADD_EXECUTABLE(http_requests EXCLUDE_FROM_ALL http_requests.cpp)
+        TARGET_LINK_LIBRARIES(http_requests ${Boost_LIBRARIES})
+    ENDIF()
+ENDIF(TINS_HAVE_CXX11)
+
+ADD_EXECUTABLE(beacon_display EXCLUDE_FROM_ALL beacon_display.cpp)
+
+if(THREADS_FOUND)
+    IF(TINS_HAVE_CXX11)
         ADD_EXECUTABLE(traceroute EXCLUDE_FROM_ALL traceroute.cpp)
-        
-        TARGET_LINK_LIBRARIES(portscan ${CMAKE_THREAD_LIBS_INIT})
+        ADD_EXECUTABLE(dns_stats EXCLUDE_FROM_ALL dns_stats.cpp)
         TARGET_LINK_LIBRARIES(traceroute ${CMAKE_THREAD_LIBS_INIT})
-    ELSE(THREADS_FOUND)
-        MESSAGE(WARNING "Disabling portscan and traceroute examples since pthreads library was not found.")
-    ENDIF(THREADS_FOUND)
-ELSE(libtins_FOUND)
-    MESSAGE(
-        WARNING 
-        "Disabling examples since libtins is not installed. "
-        "Run cmake again once it is installed in order to compile them."
-    )
-ENDIF(libtins_FOUND)
+        TARGET_LINK_LIBRARIES(dns_stats ${CMAKE_THREAD_LIBS_INIT})
+    ENDIF(TINS_HAVE_CXX11)
+    IF(WIN32)
+        MESSAGE(WARNING "Disabling portscan example since it doesn't compile on Windows.")
+    ELSE()
+        ADD_EXECUTABLE(portscan EXCLUDE_FROM_ALL portscan.cpp)
+        TARGET_LINK_LIBRARIES(portscan ${CMAKE_THREAD_LIBS_INIT})
+    ENDIF()
+ELSE()
+    MESSAGE(WARNING "Disabling portscan and traceroute examples since pthreads library was not found.")
+ENDIF()

examples/Makefile.in

@@ -1,43 +0,0 @@
-CXX=@CXX@
-CXXFLAGS=-Wall @CXXFLAGS@
-LDFLAGS=-ltins
-EXECUTABLES=arpspoofing arpmonitor portscan traceroute beacon_display dns_queries dns_spoof dns_stats wps_detect
-
-all: $(EXECUTABLES)
-
-compile: $(OBJECTS)
-
-recompile: clean all
-
-arpspoofing: 
-	$(CXX) arpspoofing.cpp -o arpspoofing $(CXXFLAGS) $(LDFLAGS)
-
-arpmonitor: 
-	$(CXX) arpmonitor.cpp -o arpmonitor -std=c++0x $(CXXFLAGS) $(LDFLAGS)
-
-dns_queries: 
-	$(CXX) dns_queries.cpp -o dns_queries -std=c++0x  $(CXXFLAGS) $(LDFLAGS)
-
-dns_spoof: 
-	$(CXX) dns_spoof.cpp -o dns_spoof -std=c++0x  $(CXXFLAGS) $(LDFLAGS)
-
-dns_stats: 
-	$(CXX) dns_stats.cpp -o dns_stats -std=c++0x $(CXXFLAGS) $(LDFLAGS) -lpthread 
-
-beacon_display: 
-	$(CXX) beacon_display.cpp -o beacon_display $(CXXFLAGS) $(LDFLAGS) 	
-	
-wps_detect: 
-	$(CXX) wps_detect.cpp -o wps_detect -std=c++0x  $(CXXFLAGS) $(LDFLAGS)
-
-portscan:
-	$(CXX) portscan.cpp -o portscan $(CXXFLAGS) $(LDFLAGS) -lpthread
-	
-traceroute: 
-	$(CXX) traceroute.cpp -o traceroute -std=c++0x $(CXXFLAGS) $(LDFLAGS) -lpthread
-
-.cpp.o:
-	$(CXX) $(CXXFLAGS) $(INCLUDE) $< -o $@
-
-clean:
-	rm $(OBJECTS) $(EXECUTABLES)

examples/arpmonitor.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,21 +32,25 @@
 #include <iostream>
 #include <functional>
 
+using std::cout;
+using std::endl;
+using std::map;
+using std::bind;
+
 using namespace Tins;
 
 class arp_monitor {
 public:
-    void run(Sniffer &sniffer);
+    void run(Sniffer& sniffer);
 private:
-    bool callback(const PDU &pdu);
+    bool callback(const PDU& pdu);
 
-    std::map<IPv4Address, HWAddress<6>> addresses;
+    map<IPv4Address, HWAddress<6>> addresses;
 };
 
-void arp_monitor::run(Sniffer &sniffer)
-{
+void arp_monitor::run(Sniffer& sniffer) {
     sniffer.sniff_loop(
-        std::bind(
+        bind(
             &arp_monitor::callback,
             this,
             std::placeholders::_1
@@ -54,43 +58,50 @@ void arp_monitor::run(Sniffer &sniffer)
     );
 }
 
-bool arp_monitor::callback(const PDU &pdu)
-{
+bool arp_monitor::callback(const PDU& pdu) {
     // Retrieve the ARP layer
-    const ARP &arp = pdu.rfind_pdu<ARP>();
+    const ARP& arp = pdu.rfind_pdu<ARP>();
     // Is it an ARP reply?
-    if(arp.opcode() == ARP::REPLY) {
+    if (arp.opcode() == ARP::REPLY) {
         // Let's check if there's already an entry for this address
         auto iter = addresses.find(arp.sender_ip_addr());
-        if(iter == addresses.end()) {
+        if (iter == addresses.end()) {
             // We haven't seen this address. Save it.
             addresses.insert({ arp.sender_ip_addr(), arp.sender_hw_addr()});
-            std::cout << "[INFO] " << arp.sender_ip_addr() << " is at "
-                      << arp.sender_hw_addr() << std::endl;
+            cout << "[INFO] " << arp.sender_ip_addr() << " is at "
+                 << arp.sender_hw_addr() << std::endl;
         }
         else {
             // We've seen this address. If it's not the same HW address, inform it
-            if(arp.sender_hw_addr() != iter->second) {
-                std::cout << "[WARNING] " << arp.sender_ip_addr() << " is at " 
-                          << iter->second << " but also at " << arp.sender_hw_addr() 
-                          << std::endl;
+            if (arp.sender_hw_addr() != iter->second) {
+                cout << "[WARNING] " << arp.sender_ip_addr() << " is at " 
+                     << iter->second << " but also at " << arp.sender_hw_addr() 
+                     << endl;
             }
         }
     }
     return true;
 }
 
-int main(int argc, char *argv[]) 
-{
+int main(int argc, char* argv[]) {
     if(argc != 2) {
-        std::cout << "Usage: " << *argv << " <interface>\n";
+        cout << "Usage: " <<* argv << " <interface>" << endl;
         return 1;
     }
     arp_monitor monitor;
-    // Sniff on the provided interface in promiscuous mode
-    Sniffer sniffer(argv[1], Sniffer::PROMISC);
-    
-    // Only capture arp packets
-    sniffer.set_filter("arp");
-    monitor.run(sniffer);
+    // Sniffer configuration
+    SnifferConfiguration config;
+    config.set_promisc_mode(true);
+    config.set_filter("arp");
+
+    try {
+        // Sniff on the provided interface in promiscuous mode
+        Sniffer sniffer(argv[1], config);
+        
+        // Only capture arp packets
+        monitor.run(sniffer);
+    }
+    catch (std::exception& ex) {
+        std::cerr << "Error: " << ex.what() << std::endl;
+    }
 }

examples/arpspoofing.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,20 +32,29 @@
 #include <string>
 #include <stdexcept>
 #include <cstdlib>
-#include <unistd.h>
+#ifdef _WIN32
+    #define WIN32_LEAN_AND_MEAN
+    #include <windows.h>
+#else
+    #include <unistd.h>
+#endif // _WIN32
 #include <tins/arp.h>
 #include <tins/network_interface.h>
 #include <tins/utils.h>
 #include <tins/ethernetII.h>
 #include <tins/packet_sender.h>
 
-using namespace std;
+using std::cout;
+using std::runtime_error;
+using std::endl;
+
 using namespace Tins;
 
 
-void do_arp_spoofing(NetworkInterface iface, IPv4Address gw, IPv4Address victim, 
-  const NetworkInterface::Info &info) 
-{
+void do_arp_spoofing(NetworkInterface iface, 
+                     IPv4Address gw,
+                     IPv4Address victim, 
+                     const NetworkInterface::Info& info) {
     PacketSender sender;
     EthernetII::address_type gw_hw, victim_hw;
     
@@ -74,17 +83,23 @@ void do_arp_spoofing(NetworkInterface iface, IPv4Address gw, IPv4Address victim,
      * performed by any routers. */
     EthernetII to_gw = EthernetII(gw_hw, info.hw_addr) / gw_arp;
     EthernetII to_victim = EthernetII(victim_hw, info.hw_addr) / victim_arp;
-    while(true) {
+    while (true) {
         // Just send them once every 5 seconds.
         sender.send(to_gw, iface);
         sender.send(to_victim, iface);
-        sleep(5);
+        #ifdef _WIN32
+            Sleep(5000);
+        #else
+            sleep(5);
+        #endif
     }
 }
 
-int main(int argc, char *argv[]) {
-    if(argc != 3 && cout << "Usage: " << *argv << " <Gateway> <Victim>\n")
+int main(int argc, char* argv[]) {
+    if (argc != 3) {
+        cout << "Usage: " <<* argv << " <Gateway> <Victim>" << endl;
         return 1;
+    }
     IPv4Address gw, victim;
     EthernetII::address_type own_hw;
     try {
@@ -92,7 +107,7 @@ int main(int argc, char *argv[]) {
         gw     = argv[1];
         victim = argv[2];
     }
-    catch(...) {
+    catch (...) {
         cout << "Invalid ip found...\n";
         return 2;
     }
@@ -106,15 +121,15 @@ int main(int argc, char *argv[]) {
         // Find the interface hardware and ip address.
         info = iface.addresses();
     }
-    catch(std::runtime_error &ex) {
+    catch (runtime_error& ex) {
         cout << ex.what() << endl;
         return 3;
     }
     try {
         do_arp_spoofing(iface, gw, victim, info);
     }
-    catch(std::runtime_error &ex) {
-        std::cout << "Runtime error: " << ex.what() << std::endl;
+    catch (runtime_error& ex) {
+        cout << "Runtime error: " << ex.what() << endl;
         return 7;
     }
 }

examples/beacon_display.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,47 +32,57 @@
 #include <string>
 #include <tins/tins.h>
  
+using std::set;
+using std::cout;
+using std::endl;
+using std::string;
+using std::runtime_error;
+
 using namespace Tins;
  
 class BeaconSniffer {
 public:
-    void run(const std::string &iface);
+    void run(const string& iface);
 private:
     typedef Dot11::address_type address_type;
-    typedef std::set<address_type> ssids_type;
+    typedef set<address_type> ssids_type;
  
-    bool callback(PDU &pdu);
+    bool callback(PDU& pdu);
      
     ssids_type ssids;
 };
  
-void BeaconSniffer::run(const std::string &iface) {
-    Sniffer sniffer(iface, Sniffer::PROMISC, "type mgt subtype beacon", true);
+void BeaconSniffer::run(const std::string& iface) {
+    SnifferConfiguration config;
+    config.set_promisc_mode(true);
+    config.set_filter("type mgt subtype beacon");
+    config.set_rfmon(true);
+    Sniffer sniffer(iface, config);
     sniffer.sniff_loop(make_sniffer_handler(this, &BeaconSniffer::callback));
 }
  
-bool BeaconSniffer::callback(PDU &pdu) {
+bool BeaconSniffer::callback(PDU& pdu) {
     // Get the Dot11 layer
-    const Dot11Beacon &beacon = pdu.rfind_pdu<Dot11Beacon>();
+    const Dot11Beacon& beacon = pdu.rfind_pdu<Dot11Beacon>();
     // All beacons must have from_ds == to_ds == 0
-    if(!beacon.from_ds() && !beacon.to_ds()) {
+    if (!beacon.from_ds() && !beacon.to_ds()) {
         // Get the AP address
         address_type addr = beacon.addr2();
         // Look it up in our set
         ssids_type::iterator it = ssids.find(addr);
-        if(it == ssids.end()) {
+        if (it == ssids.end()) {
             // First time we encounter this BSSID.
             try {
                 /* If no ssid option is set, then Dot11::ssid will throw 
                  * a std::runtime_error.
                  */
-                std::string ssid = beacon.ssid();
+                string ssid = beacon.ssid();
                 // Save it so we don't show it again.
                 ssids.insert(addr);
                 // Display the tuple "address - ssid".
-                std::cout << addr << " - " << ssid << std::endl;
+                cout << addr << " - " << ssid << endl;
             }
-            catch(std::runtime_error&) {
+            catch (runtime_error&) {
                 // No ssid, just ignore it.
             }
         }
@@ -81,10 +91,11 @@ bool BeaconSniffer::callback(PDU &pdu) {
 }
  
 int main(int argc, char* argv[]) {
-    // By default, sniff wlan0
-    std::string interface = "wlan0";
-    if(argc == 2)
-        interface = argv[1];
+    if (argc != 2) {
+        cout << "Usage: " <<* argv << " <interface>" << endl;
+        return 1;
+    }
+    string interface = argv[1];
     BeaconSniffer sniffer;
     sniffer.run(interface);
 }

examples/configure.ac

@@ -1,17 +0,0 @@
-AC_INIT(myconfig, 0.1)
-
-AC_PROG_CXX()
-AC_LANG(C++)
-
-saved_libs="${LIBS}"
-LIBS="${LIBS} -ltins"
-AC_MSG_CHECKING(libtins)
-AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <tins/dns.h>], 
-    [Tins::DNS dummy])],
-    [echo done],
-    [echo error; echo *** libtins is not installed. Aborting... ***; exit 1])
-LIBS="${saved_libs}"
-
-AC_CHECK_HEADERS([tins/tins.h], , [echo "*** Error: libtins' headers are absent ***"; exit 1;])
-
-AC_OUTPUT(Makefile)

examples/defragmenter.cpp

@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <iostream>
+#include <string>
+#include <stdexcept>
+#include "tins/ip.h"
+#include "tins/ip_reassembler.h"
+#include "tins/sniffer.h"
+#include "tins/packet_writer.h"
+
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::string;
+using std::exception;
+
+using Tins::IPv4Reassembler;
+using Tins::IP;
+using Tins::Packet;
+using Tins::FileSniffer;
+using Tins::PacketWriter;
+using Tins::DataLinkType;
+
+// This example reads packets from a pcap file and writes them to a new file.
+// If any IPv4 fragmented packets are found in the input file, then they will
+// be reassembled before writing them, so instead of the individual fragments
+// it will write the whole packet.
+
+class Defragmenter {
+public:
+    // Construct the sniffer and the packet writer using the sniffer's
+    // data link type
+    Defragmenter(const string& input_file, const string& output_file)
+    : sniffer_(input_file),
+      writer_(output_file, (PacketWriter::LinkType)sniffer_.link_type()),
+      total_reassembled_(0) {
+
+    }
+
+    void run() {
+        Packet packet;
+        // Read packets and keep going until there's no more packets to read
+        while (packet = sniffer_.next_packet()) {
+            // Try to reassemble the packet
+            IPv4Reassembler::PacketStatus status = reassembler_.process(*packet.pdu());
+
+            // If we did reassemble it, increase this counter
+            if (status == IPv4Reassembler::REASSEMBLED) {
+                total_reassembled_++;
+            }
+
+            // Regardless, we'll write it into the output file unless it's fragmented
+            // (and not yet reassembled) 
+            if (status != IPv4Reassembler::FRAGMENTED) {
+                writer_.write(packet);
+            }
+        }
+    }
+
+    uint64_t total_packets_reassembled() const {
+        return total_reassembled_;
+    }
+private:
+    FileSniffer sniffer_;
+    IPv4Reassembler reassembler_;
+    PacketWriter writer_;
+    uint64_t total_reassembled_;
+};
+
+int main(int argc, char* argv[]) {
+    if (argc != 3) {
+        cout << "Usage: " << argv[0] << " <input-file> <output-file>" << endl;
+        return 1;
+    }
+    try {
+        // Build the defragmented
+        Defragmenter defragmenter(argv[1], argv[2]);
+        cout << "Processing " << argv[1] << endl;
+        cout << "Writing results to " << argv[2] << endl;
+
+        // Run!
+        defragmenter.run();
+        cout << "Done" << endl;
+        cout << "Reassembled: " << defragmenter.total_packets_reassembled() 
+             << " packet(s)" << endl;
+    }
+    catch (exception& ex) {
+        cerr << "Error: " << ex.what() << endl;
+    }
+}
+

examples/dns_queries.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,10 +30,12 @@
 #include <tins/tins.h>
 #include <iostream>
 
+using std::cout;
+using std::endl;
+
 using namespace Tins;
 
-bool callback(const PDU &pdu) 
-{
+bool callback(const PDU& pdu) {
     // The packet probably looks like this:
     //
     // EthernetII / IP / UDP / RawPDU
@@ -43,22 +45,23 @@ bool callback(const PDU &pdu)
     DNS dns = pdu.rfind_pdu<RawPDU>().to<DNS>();
     
     // Retrieve the queries and print the domain name:
-    for(const auto &query : dns.queries()) 
-        std::cout << query.dname() << std::endl;
+    for (const auto& query : dns.queries()) {
+        cout << query.dname() << std::endl;
+    }
     return true;
 }
 
-int main(int argc, char *argv[]) 
-{
+int main(int argc, char* argv[]) {
     if(argc != 2) {
-        std::cout << "Usage: " << *argv << " <interface>" << std::endl;
+        cout << "Usage: " <<* argv << " <interface>" << endl;
         return 1;
     }
-    // Sniff on the provided interface in promiscuos mode
-    Sniffer sniffer(argv[1], Sniffer::PROMISC);
-    
+    // Sniff on the provided interface in promiscuous mode
+    SnifferConfiguration config;
+    config.set_promisc_mode(true);
     // Only capture udp packets sent to port 53
-    sniffer.set_filter("udp and dst port 53");
+    config.set_filter("udp and dst port 53");
+    Sniffer sniffer(argv[1], config);
     
     // Start the capture
     sniffer.sniff_loop(callback);

examples/dns_spoof.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,12 +30,14 @@
 #include <tins/tins.h>
 #include <iostream>
 
+using std::cout;
+using std::endl;
+
 using namespace Tins;
 
 PacketSender sender;
 
-bool callback(const PDU &pdu) 
-{
+bool callback(const PDU& pdu) {
     // The packet probably looks like this:
     //
     // EthernetII / IP / UDP / RawPDU
@@ -48,13 +50,13 @@ bool callback(const PDU &pdu)
     DNS dns = udp.rfind_pdu<RawPDU>().to<DNS>();
 
     // Is it a DNS query?
-    if(dns.type() == DNS::QUERY) {
+    if (dns.type() == DNS::QUERY) {
         // Let's see if there's any query for an "A" record.
-        for(const auto &query : dns.queries()) {
-            if(query.type() == DNS::A) {
+        for (const auto& query : dns.queries()) {
+            if (query.query_type() == DNS::A) {
                 // Here's one! Let's add an answer.
                 dns.add_answer(
-                    DNS::Resource(
+                    DNS::resource(
                         query.dname(), 
                         "127.0.0.1",
                         DNS::A, 
@@ -66,16 +68,16 @@ bool callback(const PDU &pdu)
             }
         }
         // Have we added some answers?
-        if(dns.answers_count() > 0) {
+        if (dns.answers_count() > 0) {
             // It's a response now
             dns.type(DNS::RESPONSE);
             // Recursion is available(just in case)
             dns.recursion_available(1);
             // Build our packet
             auto pkt = EthernetII(eth.src_addr(), eth.dst_addr()) /
-                        IP(ip.src_addr(), ip.dst_addr()) /
-                        UDP(udp.sport(), udp.dport()) /
-                        dns;
+                       IP(ip.src_addr(), ip.dst_addr()) /
+                       UDP(udp.sport(), udp.dport()) /
+                       dns;
             // Send it!
             sender.send(pkt);
         }
@@ -83,17 +85,19 @@ bool callback(const PDU &pdu)
     return true;
 }
 
-int main(int argc, char *argv[]) 
-{
+int main(int argc, char* argv[]) {
     if(argc != 2) {
-        std::cout << "Usage: " << *argv << " <interface>" << std::endl;
+        cout << "Usage: " <<* argv << " <interface>" << endl;
         return 1;
     }
-    // Sniff on the provided interface in promiscuos mode
-    Sniffer sniffer(argv[1], Sniffer::PROMISC);
-    
+    // Sniff on the provided interface in promiscuous mode
+    SnifferConfiguration config;
+    config.set_promisc_mode(true);
+    // Use immediate mode so we get the packets as fast as we can
+    config.set_immediate_mode(true);
     // Only capture udp packets sent to port 53
-    sniffer.set_filter("udp and dst port 53");
+    config.set_filter("udp and dst port 53");
+    Sniffer sniffer(argv[1], config);
     
     // All packets will be sent through the provided interface
     sender.default_interface(argv[1]);

examples/dns_stats.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,6 +27,13 @@
  *
  */
 
+#ifdef _WIN32
+    #define NOMINMAX
+#endif // _WIN32
+
+// Fix for gcc 4.6
+#define _GLIBCXX_USE_NANOSLEEP
+
 #include <iostream>
 #include <mutex>
 #include <chrono>
@@ -35,6 +42,25 @@
 #include <algorithm>
 #include <tins/tins.h>
 
+using std::cout;
+using std::endl;
+using std::thread;
+using std::string;
+using std::bind;
+using std::map;
+using std::mutex;
+using std::max;
+using std::min;
+using std::exception;
+using std::lock_guard;
+using std::tuple;
+using std::make_tuple;
+using std::this_thread::sleep_for;
+using std::chrono::seconds;
+using std::chrono::milliseconds;
+using std::chrono::duration_cast;
+using std::chrono::system_clock;
+
 using namespace Tins;
 
 // Holds the DNS response time statistics. The response time is 
@@ -42,8 +68,8 @@ using namespace Tins;
 template<typename Duration>
 class statistics {
 public:
-    using duration_type = Duration;
-    using locker_type = std::lock_guard<std::mutex>;
+    typedef Duration duration_type;
+    typedef lock_guard<mutex> locker_type;
     
     struct information {
         duration_type average, worst;
@@ -51,65 +77,63 @@ public:
     };
     
     statistics()
-    : m_duration(), m_worst(duration_type::min()), m_count()
-    {
+    : m_duration(), m_worst(duration_type::min()), m_count() {
         
     }
     
-    void add_response_time(const duration_type& duration)
-    {
+    void add_response_time(const duration_type& duration) {
         locker_type _(m_lock);
         m_duration += duration;
         m_count++;
-        m_worst = std::max(m_worst, duration);
+        m_worst = max(m_worst, duration);
     }
     
-    information get_information() const 
-    {
+    information get_information() const {
         locker_type _(m_lock);
-        if(m_count == 0)
+        if(m_count == 0) {
             return { };
-        else 
+        }
+        else {
             return { m_duration / m_count, m_worst, m_count };
+        }
     };
 private:
     duration_type m_duration, m_worst;
     size_t m_count;
-    mutable std::mutex m_lock;
+    mutable mutex m_lock;
 };
 
 // Sniffs and tracks DNS queries. When a matching DNS response is found,
 // the response time is added to a statistics object.
 //
-// This class performs *no cleanup* on data associated with queries that
+// This class performs* no cleanup* on data associated with queries that
 // weren't answered.
 class dns_monitor {
 public:
     // The response times are measured in milliseconds
-    using duration_type = std::chrono::milliseconds;
+    typedef milliseconds duration_type;
     // The statistics type used.
-    using statistics_type = statistics<duration_type>;
+    typedef statistics<duration_type> statistics_type;
     
     void run(BaseSniffer& sniffer);
     const statistics_type& stats() const {
         return m_stats;
     }
 private:
-    using packet_info = std::tuple<IPv4Address, IPv4Address, uint16_t>;
-    using clock_type = std::chrono::steady_clock;
-    using time_point_type = std::chrono::time_point<clock_type>;
+    typedef tuple<IPv4Address, IPv4Address, uint16_t> packet_info;
+    typedef system_clock clock_type;
+    typedef clock_type::time_point time_point_type;
 
     bool callback(const PDU& pdu);
     static packet_info make_packet_info(const PDU& pdu, const DNS& dns);
     
     statistics_type m_stats;    
-    std::map<packet_info, time_point_type> m_packet_info;
+    map<packet_info, time_point_type> m_packet_info;
 };
 
-void dns_monitor::run(BaseSniffer& sniffer)
-{
+void dns_monitor::run(BaseSniffer& sniffer) {
     sniffer.sniff_loop(
-        std::bind(
+        bind(
             &dns_monitor::callback, 
             this, 
             std::placeholders::_1
@@ -117,13 +141,12 @@ void dns_monitor::run(BaseSniffer& sniffer)
     );
 }
 
-bool dns_monitor::callback(const PDU& pdu)
-{
+bool dns_monitor::callback(const PDU& pdu) {
     auto now = clock_type::now();
     auto dns = pdu.rfind_pdu<RawPDU>().to<DNS>();
     auto info = make_packet_info(pdu, dns);
     // If it's a query, add the sniff time to our map.
-    if(dns.type() == DNS::QUERY) {
+    if (dns.type() == DNS::QUERY) {
         m_packet_info.insert(
             std::make_pair(info, now)
         );
@@ -131,11 +154,11 @@ bool dns_monitor::callback(const PDU& pdu)
     else {
         // It's a response, we need to find the query in our map.
         auto iter = m_packet_info.find(info);
-        if(iter != m_packet_info.end()) {
+        if (iter != m_packet_info.end()) {
             // We found the query, let's add the response time to the
             // statistics object.
             m_stats.add_response_time(
-                std::chrono::duration_cast<duration_type>(now - iter->second)
+                duration_cast<duration_type>(now - iter->second)
             );
             // Forget about the query.
             m_packet_info.erase(iter);
@@ -148,42 +171,48 @@ bool dns_monitor::callback(const PDU& pdu)
 // hold the same DNS id as belonging to the same query. 
 // 
 // This function retrieves a tuple (addr, addr, id) that will achieve it.
-auto dns_monitor::make_packet_info(const PDU& pdu, const DNS& dns) -> packet_info
-{
+auto dns_monitor::make_packet_info(const PDU& pdu, const DNS& dns) -> packet_info {
     const auto& ip = pdu.rfind_pdu<IP>();
-    return std::make_tuple( 
+    return make_tuple( 
         // smallest address first
-        std::min(ip.src_addr(), ip.dst_addr()),
+        min(ip.src_addr(), ip.dst_addr()),
         // largest address second
-        std::max(ip.src_addr(), ip.dst_addr()),
+        max(ip.src_addr(), ip.dst_addr()),
         dns.id()
     );
 }
 
-int main(int argc, char *argv[]) {
-    if(argc != 2) {
-        std::cout << "Usage: " << *argv << " <interface>\n";
-        return 1;
+int main(int argc, char* argv[]) {
+    string iface;
+    if (argc == 2) {
+        // Use the provided interface
+        iface = argv[1];
+    }
+    else {
+        // Use the default interface
+        iface = NetworkInterface::default_interface().name();
     }
     try {
-        Sniffer sniffer(argv[1], Sniffer::PROMISC);
-        sniffer.set_filter("udp and port 53");
+        SnifferConfiguration config;
+        config.set_promisc_mode(true);
+        config.set_filter("udp and port 53");
+        Sniffer sniffer(iface, config);
         dns_monitor monitor;
-        std::thread thread(
+        thread thread(
             [&]() {
                 monitor.run(sniffer);
             }
         );
-        while(true) {
+        while (true) {
             auto info = monitor.stats().get_information();
-            std::cout << "\rAverage " << info.average.count() 
-                        << "ms. Worst: " << info.worst.count() << "ms. Count: "
-                        << info.count;
-            std::cout.flush();
-            std::this_thread::sleep_for(std::chrono::seconds(1));
+            cout << "\rAverage " << info.average.count() 
+                << "ms. Worst: " << info.worst.count() << "ms. Count: "
+                << info.count << "   ";
+            cout.flush();
+            sleep_for(seconds(1));
         }
     }
-    catch(std::exception& ex) {
-        std::cout << "[-] Error: " << ex.what() << std::endl;
+    catch (exception& ex) {
+        cout << "[-] Error: " << ex.what() << endl;
     }
 }

examples/http_requests.cpp

@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <string>
+#include <iostream>
+#include <stdexcept>
+#include <boost/regex.hpp>
+#include "tins/tcp_ip/stream_follower.h"
+#include "tins/sniffer.h"
+
+using std::string;
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::exception;
+
+using boost::regex;
+using boost::match_results;
+
+using Tins::PDU;
+using Tins::Sniffer;
+using Tins::SnifferConfiguration;
+using Tins::TCPIP::Stream;
+using Tins::TCPIP::StreamFollower;
+
+// This example captures and follows TCP streams seen on port 80. It will
+// wait until both the client and server send data and then apply a regex
+// to both payloads, extrating some information and printing it.
+
+// Don't buffer more than 3kb of data in either request/response
+const size_t MAX_PAYLOAD = 3 * 1024;
+// The regex to be applied on the request. This will extract the HTTP
+// method being used, the request's path and the Host header value.
+regex request_regex("([\\w]+) ([^ ]+).+\r\nHost: ([\\d\\w\\.-]+)\r\n");
+// The regex to be applied on the response. This finds the response code.
+regex response_regex("HTTP/[^ ]+ ([\\d]+)");
+
+void on_server_data(Stream& stream) {
+    match_results<Stream::payload_type::const_iterator> client_match;
+    match_results<Stream::payload_type::const_iterator> server_match;
+    const Stream::payload_type& client_payload = stream.client_payload();
+    const Stream::payload_type& server_payload = stream.server_payload();
+    // Run the regexes on client/server payloads
+    bool valid = regex_search(server_payload.begin(), server_payload.end(),
+                              server_match, response_regex) &&
+                 regex_search(client_payload.begin(), client_payload.end(),
+                              client_match, request_regex);
+    // If we matched both the client and the server regexes
+    if (valid) {
+        // Extract all fields
+        string method = string(client_match[1].first, client_match[1].second);
+        string url = string(client_match[2].first, client_match[2].second);
+        string host = string(client_match[3].first, client_match[3].second);
+        string response_code = string(server_match[1].first, server_match[1].second);
+        // Now print them
+        cout << method << " http://" << host << url << " -> " << response_code << endl;
+
+        // Once we've seen the first request on this stream, ignore it
+        stream.ignore_client_data();
+        stream.ignore_server_data();
+    }
+    
+    // Just in case the server returns invalid data, stop at 3kb
+    if (stream.server_payload().size() > MAX_PAYLOAD) {
+        stream.ignore_server_data();
+    }
+}
+
+void on_client_data(Stream& stream) {
+    // Don't hold more than 3kb of data from the client's flow
+    if (stream.client_payload().size() > MAX_PAYLOAD) {
+        stream.ignore_client_data();
+    }
+}
+
+void on_new_connection(Stream& stream) {
+    stream.client_data_callback(&on_client_data);
+    stream.server_data_callback(&on_server_data);
+    // Don't automatically cleanup the stream's data, as we'll manage
+    // the buffer ourselves and let it grow until we see a full request
+    // and response
+    stream.auto_cleanup_payloads(false);
+}
+
+int main(int argc, char* argv[]) {
+    if (argc != 2) {
+        cout << "Usage: " << argv[0] << " <interface>" << endl;
+        return 1;
+    }
+
+    try {
+        // Construct the sniffer configuration object
+        SnifferConfiguration config;
+        // Get packets as quickly as possible
+        config.set_immediate_mode(true);
+        // Only capture TCP traffic sent from/to port 80
+        config.set_filter("tcp port 80");
+        // Construct the sniffer we'll use
+        Sniffer sniffer(argv[1], config);
+
+        cout << "Starting capture on interface " << argv[1] << endl;
+
+        // Now construct the stream follower
+        StreamFollower follower;
+        // We just need to specify the callback to be executed when a new 
+        // stream is captured. In this stream, you should define which callbacks
+        // will be executed whenever new data is sent on that stream 
+        // (see on_new_connection)
+        follower.new_stream_callback(&on_new_connection);
+        // Now start capturing. Every time there's a new packet, call 
+        // follower.process_packet
+        sniffer.sniff_loop([&](PDU& packet) {
+            follower.process_packet(packet);
+            return true;
+        });
+    }
+    catch (exception& ex) {
+        cerr << "Error: " << ex.what() << endl;
+        return 1;
+    }
+}

examples/icmp_responses.cpp

@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2015, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <iostream>
+#include <stdexcept>
+#include <string>
+#include <functional>
+#include <tins/tins.h>
+
+using std::cout;
+using std::endl;
+using std::bind;
+using std::string;
+using std::runtime_error;
+using std::exception;
+
+using namespace Tins;
+
+// This class captured packets on an interface, using the specified filter
+// and will respond with ICMP error packets whenever a packet is captured.
+// The response mechanism is pretty naive as it generates a packet which
+// has swapped HW and IP addresses (dst as src, src as dst).
+class ICMPResponder {
+public:
+    // Use the given interface and ICMP type/code on responses
+    ICMPResponder(string iface, int type, int code) 
+    : m_iface(iface), m_sender(iface), m_type(type), m_code(code) {
+
+    }
+
+    // Run using the given filter
+    void run(const string& filter) {
+        // Initialize the configuration
+        SnifferConfiguration config;
+        // Use promiscuous mode
+        config.set_promisc_mode(true);
+        // Use this packet filter
+        config.set_filter(filter);
+        // Use immediate mode (we don't want to buffer packets, we want the mright away).
+        config.set_immediate_mode(true);
+
+        // Now create the Sniffer
+        Sniffer sniffer(m_iface, config);
+        if (sniffer.link_type() != DLT_EN10MB) {
+            throw runtime_error("Ethernet interfaces only supported");
+        }
+        // Start the sniffing! For each packet, ICMPReponder::callback will be called
+        sniffer.sniff_loop(bind(&ICMPResponder::callback, this, std::placeholders::_1));
+    }
+private:
+    // Extracts the payload to be used over the ICMP layer in the response.
+    // This will be the entire IP header + 8 bytes of the next header.
+    RawPDU extract_icmp_payload(IP& pdu) {
+        PDU::serialization_type buffer = pdu.serialize();
+        // Use whole IP + 8 bytes of next header.
+        size_t end_index = pdu.header_size() + 8;
+        return RawPDU(buffer.begin(), buffer.begin() + end_index);
+    }
+
+    // Generates an ICMP response given a packet.
+    EthernetII generate_response(PDU& pdu) {
+        // Find Ethernet and IP headers.
+        EthernetII& received_eth = pdu.rfind_pdu<EthernetII>();
+        IP& received_ip = pdu.rfind_pdu<IP>();
+
+        // Create an Ethernet response, flipping the addresses
+        EthernetII output(received_eth.src_addr(), received_eth.dst_addr());
+        // Append an IP PDU, again flipping addresses.
+        //output /= IP(received_ip.src_addr(), received_ip.dst_addr());
+        output /= IP(received_ip.src_addr(), "8.8.8.8");
+
+        // Now generate the ICMP layer using the type and code provided.
+        ICMP icmp;
+        icmp.type(static_cast<ICMP::Flags>(m_type));
+        icmp.code(m_code);
+        // Append the ICMP layer to our packet
+        output /= icmp;
+        // Extract the payload to be used over ICMP.
+        output /= extract_icmp_payload(received_ip);
+        return output;
+    }
+
+    // Packet capture callback
+    bool callback(PDU& pdu) {
+        // Generate a response for this packet
+        EthernetII response = generate_response(pdu);
+        // Send this packet!
+        m_sender.send(response);
+        return true;
+    }
+
+    string m_iface;
+    PacketSender m_sender;
+    int m_type;
+    int m_code;
+};
+
+int main(int argc, char* argv[]) {
+    const int type = 3;
+    const int code = 0;
+    if (argc < 3) {
+        cout << "Usage: " << argv[0] << " <interface> <pcap_filter>" << endl;
+        return 1;
+    }
+    string iface = argv[1];
+    string filter = argv[2];
+    try {
+        ICMPResponder responder(iface, type, code);
+        responder.run(filter);
+    }
+    catch (exception& ex) {
+        cout << "Error: " << ex.what() << endl;
+    }
+}

examples/interfaces_info.cpp

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2015, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <string>
+#include <iostream>
+#include <sstream>
+#include <tins/network_interface.h>
+
+using std::cout;
+using std::wcout;
+using std::endl;
+using std::string;
+using std::ostringstream;
+
+using namespace Tins;
+
+int main() {
+    // Get all interfaces and iterate over them.
+    for (const NetworkInterface& iface : NetworkInterface::all()) {
+        // Get the name of this interface
+        string name = iface.name();
+
+        // "stringify" the status of the interface
+        string status = iface.is_up() ? "up" : "down";
+        
+        // Get this interface's information (addresses).
+        NetworkInterface::Info info = iface.info();
+        
+        // Now print all of this info.
+        cout << name;
+
+        #ifdef _WIN32
+        // If this is running on Windows, also print the friendly name
+        wcout << " (" << iface.friendly_name() << ")";
+        #endif // _WIN32
+        cout << ": " << endl;
+
+        string ipv6_string;
+        if (info.ipv6_addrs.empty()) {
+            ipv6_string = "(none)";
+        }
+        else {
+            ostringstream oss;
+            for (size_t i = 0; i < info.ipv6_addrs.size(); ++i) {
+                const NetworkInterface::IPv6Prefix& prefix = info.ipv6_addrs[i];
+                if (i > 0) {
+                    oss << ", ";
+                }
+                oss << prefix.address << "/" << prefix.prefix_length;
+            }
+            ipv6_string = oss.str();
+        }
+        cout << "   HW address:     " << info.hw_addr << endl
+             << "   IP address:     " << info.ip_addr << endl
+             << "   IPv6 addresses: " << ipv6_string << endl
+             << "   Netmask:        " << info.netmask << endl
+             << "   Broadcast:      " << info.bcast_addr << endl 
+             << "   Iface index:    " << iface.id() << endl
+             << "   Status:         " << "interface " << status << endl << endl;
+    }
+}

examples/portscan.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,7 @@
 #include <iostream>
 #include <iomanip>
 #include <vector>
+#include <set>
 #include <string>
 #include <cstdlib>
 #include <pthread.h>
@@ -43,48 +44,114 @@
 #include <tins/utils.h>
 #include <tins/packet_sender.h>
 
+using std::cout;
+using std::endl;
+using std::vector;
+using std::pair;
+using std::setw;
+using std::string;
+using std::set;
+using std::runtime_error;
 
-using namespace std;
 using namespace Tins;
 
-typedef std::pair<Sniffer*, std::string> sniffer_data;
+typedef pair<Sniffer*, string> sniffer_data;
 
+class Scanner {
+public:
+    Scanner(const NetworkInterface& interface, 
+            const IPv4Address& address, 
+            const vector<string>& ports);
+    
+    void run();
+private:
+    void send_syns(const NetworkInterface& iface, IPv4Address dest_ip);
+    bool callback(PDU& pdu);
+    static void* thread_proc(void* param);
+    void launch_sniffer();
+    
+    NetworkInterface iface;
+    IPv4Address host_to_scan;
+    set<uint16_t> ports_to_scan;
+    Sniffer sniffer;
+};
+
+Scanner::Scanner(const NetworkInterface& interface, 
+                 const IPv4Address& address, 
+                 const vector<string>& ports)
+: iface(interface), host_to_scan(address), sniffer(interface.name()) {
+    sniffer.set_filter(
+        "tcp and ip src " + address.to_string() + " and tcp[tcpflags] & (tcp-rst|tcp-syn) != 0"
+    );
+    for (size_t i = 0; i < ports.size(); ++i) {
+        ports_to_scan.insert(atoi(ports[i].c_str()));
+    }
+}
+
+void* Scanner::thread_proc(void* param) {
+    Scanner* data = (Scanner*)param;
+    data->launch_sniffer();
+    return 0;
+}
+
+void Scanner::launch_sniffer() {
+    sniffer.sniff_loop(make_sniffer_handler(this, &Scanner::callback));
+}
 
 /* Our scan handler. This will receive SYNs and RSTs and inform us
  * the scanned port's status.
  */
-bool handler(PDU &pdu) {
-    const TCP &tcp = pdu.rfind_pdu<TCP>();
-    // Ok, it's a TCP PDU. Is RST flag on? Then port is closed.
-    if(tcp.get_flag(TCP::RST)) {
-        // This indicates we should stop sniffing.
-        if(tcp.get_flag(TCP::SYN))
-            return false;
-        cout << "Port: " << setw(5) << tcp.sport() << " closed\n";
+bool Scanner::callback(PDU& pdu) {
+    // Find the layers we want.
+    const IP& ip = pdu.rfind_pdu<IP>();
+    const TCP& tcp = pdu.rfind_pdu<TCP>();
+    // Check if the host that we're scanning sent this packet and
+    // the source port is one of those that we scanned.
+    if(ip.src_addr() == host_to_scan && ports_to_scan.count(tcp.sport()) == 1) {
+        // Ok, it's a TCP PDU. Is RST flag on? Then port is closed.
+        if(tcp.get_flag(TCP::RST)) {
+            // This indicates we should stop sniffing.
+            if(tcp.get_flag(TCP::SYN))
+                return false;
+            cout << "Port: " << setw(5) << tcp.sport() << " closed\n";
+        }
+        // Is SYN flag on? Then port is open!
+        else if(tcp.has_flags(TCP::SYN | TCP::ACK)) {
+            cout << "Port: " << setw(5) << tcp.sport() << " open\n";
+        }
     }
-    // Is SYN flag on? Then port is open!
-    else if(tcp.flags() == (TCP::SYN | TCP::ACK))
-        cout << "Port: " << setw(5) << tcp.sport() << " open\n";
     return true;
 }
 
+void Scanner::run() {
+    pthread_t thread;
+    // Launch our sniff thread.
+    pthread_create(&thread, 0, &Scanner::thread_proc, this); 
+    // Start sending SYNs to port.
+    send_syns(iface, host_to_scan);
+
+    // Wait for our sniffer.
+    void* dummy;
+    pthread_join(thread, &dummy);
+}
+
 // Send syns to the given ip address, using the destination ports provided.
-void send_syns(const NetworkInterface &iface, IPv4Address dest_ip, const vector<string> &ips) {
+void Scanner::send_syns(const NetworkInterface& iface, IPv4Address dest_ip) {
     // Retrieve the addresses.
     NetworkInterface::Info info = iface.addresses();
     PacketSender sender;
     // Allocate the IP PDU
     IP ip = IP(dest_ip, info.ip_addr) / TCP();
     // Get the reference to the TCP PDU
-    TCP &tcp = ip.rfind_pdu<TCP>();
+    TCP& tcp = ip.rfind_pdu<TCP>();
     // Set the SYN flag on.
     tcp.set_flag(TCP::SYN, 1);
     // Just some random port. 
     tcp.sport(1337);
     cout << "Sending SYNs..." << endl;
-    for(vector<string>::const_iterator it = ips.begin(); it != ips.end(); ++it) {
+    for (set<uint16_t>::const_iterator it = ports_to_scan.begin(); it != ports_to_scan.end(); ++it) {
         // Set the new port and send the packet!
-        tcp.dport(atoi(it->c_str()));
+        tcp.dport(*it);
         sender.send(ip);
     }
     // Wait 1 second.
@@ -93,6 +160,7 @@ void send_syns(const NetworkInterface &iface, IPv4Address dest_ip, const vector<
      * by our function, which will in turn return false.  
      */
     tcp.set_flag(TCP::RST, 1);
+    tcp.sport(*ports_to_scan.begin());
     // Pretend we're the scanned host...
     ip.src_addr(dest_ip);
     // We use an ethernet pdu, otherwise the kernel will drop it.
@@ -100,47 +168,28 @@ void send_syns(const NetworkInterface &iface, IPv4Address dest_ip, const vector<
     sender.send(eth, iface);
 }
 
-void *thread_proc(void *param) {
-    // IP address is our parameter.
-    sniffer_data *data = (sniffer_data*)param;
-    Sniffer *sniffer = data->first;
-    sniffer->set_filter("tcp and ip src " + data->second + " and tcp[tcpflags] & (tcp-rst|tcp-syn) != 0");
-    // Sniff loop. Only sniff TCP PDUs comming from the given IP and have either RST or SYN flag on.
-    sniffer->sniff_loop(handler);
-    return 0;
-}
-
-void scan(int argc, char *argv[]) {
+void scan(int argc, char* argv[]) {
     IPv4Address ip(argv[1]);
     // Resolve the interface which will be our gateway
     NetworkInterface iface(ip);
     cout << "Sniffing on interface: " << iface.name() << endl;
-
-    // 300 bytes are enough to receive SYNs and RSTs.
-    Sniffer sniffer(iface.name(), 300);
-    sniffer_data data(&sniffer, argv[1]);
-    pthread_t thread;
-    // Launch our sniff thread.
-    pthread_create(&thread, 0, thread_proc, &data); 
     
     // Consume arguments
     argv += 2;
     argc -= 2;
-    // Start sending SYNs to port.
-    send_syns(iface, ip, vector<string>(argv, argv + (argc)));
-    
-    // Wait for our sniffer.
-    void *dummy;
-    pthread_join(thread, &dummy);
+    Scanner scanner(iface, ip, vector<string>(argv, argv + (argc)));
+    scanner.run();
 }
 
-int main(int argc, char *argv[]) {
-    if(argc < 3 && cout << "Usage: " << *argv << " <IPADDR> <port1> [port2] [port3]\n")
+int main(int argc, char* argv[]) {
+    if (argc < 3) {
+        cout << "Usage: " <<* argv << " <IPADDR> <port1> [port2] [port3]" << endl;
         return 1;
+    }
     try {
         scan(argc, argv);
     }
-    catch(std::runtime_error &ex) {
+    catch(runtime_error& ex) {
         cout << "Error - " << ex.what() << endl;
     }
 }

examples/route_table.cpp

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2015, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <iostream>
+#include <iomanip>
+#include <vector>
+#include <tins/tins.h>
+
+using std::cout;
+using std::endl;
+using std::setw;
+using std::vector;
+
+using namespace Tins;
+
+int main() {
+    vector<Utils::RouteEntry> v4_entries = Utils::route_entries();
+    cout << "IPv4 route table entries: " << endl
+         << "========================= " << endl;
+    for (size_t i = 0; i < v4_entries.size(); ++i) {
+        cout << "Entry " << setw(2) << i << ": " << endl
+             << "Interface:   " << v4_entries[i].interface << endl
+             << "Destination: " << v4_entries[i].destination << endl
+             << "Gateway:     " << v4_entries[i].gateway << endl
+             << "Genmask:     " << v4_entries[i].mask << endl
+             << "Metric:      " << v4_entries[i].metric << endl << endl;
+    }
+
+    vector<Utils::Route6Entry> v6_entries = Utils::route6_entries();
+    if (!v6_entries.empty()) {
+        cout << endl
+             << "IPv6 route table entries: " << endl
+             << "========================= " << endl;
+        for (size_t i = 0; i < v6_entries.size(); ++i) {
+            cout << "Entry " << setw(2) << i << ": " << endl
+                 << "Interface:   " << v6_entries[i].interface << endl
+                 << "Destination: " << v6_entries[i].destination << endl
+                 << "Gateway:     " << v6_entries[i].gateway << endl
+                 << "Genmask:     " << v6_entries[i].mask << endl
+                 << "Metric:      " << v6_entries[i].metric << endl << endl;
+        }
+    }
+}

examples/stream_dump.cpp

@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <iostream>
+#include <sstream>
+#include "tins/tcp_ip/stream_follower.h"
+#include "tins/sniffer.h"
+#include "tins/packet.h"
+#include "tins/ip_address.h"
+#include "tins/ipv6_address.h"
+
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::bind;
+using std::string;
+using std::to_string;
+using std::ostringstream;
+using std::exception;
+
+using Tins::Sniffer;
+using Tins::SnifferConfiguration;
+using Tins::PDU;
+using Tins::TCPIP::StreamFollower;
+using Tins::TCPIP::Stream;
+
+// This example takes an interface and a port as an argument and
+// it listens for TCP streams on the given interface and port.
+// It will reassemble TCP streams and show the traffic sent by
+// both the client and the server.
+
+// Convert the client endpoint to a readable string
+string client_endpoint(const Stream& stream) {
+    ostringstream output;
+    // Use the IPv4 or IPv6 address depending on which protocol the 
+    // connection uses
+    if (stream.is_v6()) {
+        output << stream.client_addr_v6();
+    }
+    else {
+        output << stream.client_addr_v4();
+    }
+    output << ":" << stream.client_port();
+    return output.str();
+}
+
+// Convert the server endpoint to a readable string
+string server_endpoint(const Stream& stream) {
+    ostringstream output;
+    if (stream.is_v6()) {
+        output << stream.server_addr_v6();
+    }
+    else {
+        output << stream.server_addr_v4();
+    }
+    output << ":" << stream.server_port();
+    return output.str();
+}
+
+// Concat both endpoints to get a readable stream identifier
+string stream_identifier(const Stream& stream) {
+    ostringstream output;
+    output << client_endpoint(stream) << " - " << server_endpoint(stream);
+    return output.str();
+}
+
+// Whenever there's new client data on the stream, this callback is executed.
+void on_client_data(Stream& stream) {
+    // Construct a string out of the contents of the client's payload
+    string data(stream.client_payload().begin(), stream.client_payload().end());
+
+    // Now print it, prepending some information about the stream
+    cout << client_endpoint(stream) << " >> " 
+         << server_endpoint(stream) << ": " << endl << data << endl;
+}
+
+// Whenever there's new server data on the stream, this callback is executed.
+// This does the same thing as on_client_data
+void on_server_data(Stream& stream) {
+    string data(stream.server_payload().begin(), stream.server_payload().end());
+    cout << server_endpoint(stream) << " >> " 
+         << client_endpoint(stream) << ": " << endl << data << endl;
+}
+
+// When a connection is closed, this callback is executed.
+void on_connection_closed(Stream& stream) {
+    cout << "[+] Connection closed: " << stream_identifier(stream) << endl;
+}
+
+// When a new connection is captured, this callback will be executed.
+void on_new_connection(Stream& stream) {
+    if (stream.is_partial_stream()) {
+        // We found a partial stream. This means this connection/stream had
+        // been established before we started capturing traffic.
+        //
+        // In this case, we need to allow for the stream to catch up, as we
+        // may have just captured an out of order packet and if we keep waiting
+        // for the holes to be filled, we may end up waiting forever.
+        //
+        // Calling enable_recovery_mode will skip out of order packets that
+        // fall withing the range of the given window size.
+        // See Stream::enable_recover_mode for more information
+        cout << "[+] New connection " << stream_identifier(stream) << endl;
+
+        // Enable recovery mode using a window of 10kb
+        stream.enable_recovery_mode(10 * 1024);
+    }
+    else {
+        // Print some information about the new connection
+        cout << "[+] New connection " << stream_identifier(stream) << endl;
+    }
+
+    // Now configure the callbacks on it.
+    // First, we want on_client_data to be called every time there's new client data
+    stream.client_data_callback(&on_client_data);
+
+    // Same thing for server data, but calling on_server_data
+    stream.server_data_callback(&on_server_data);
+
+    // When the connection is closed, call on_connection_closed
+    stream.stream_closed_callback(&on_connection_closed);
+}
+
+int main(int argc, char* argv[]) {
+    if (argc != 3) {
+        cout << "Usage: " << argv[0] << " <interface> <port>" << endl;
+        return 1;
+    }
+
+    try {
+        // Construct the sniffer configuration object
+        SnifferConfiguration config;
+
+        // Only capture TCP traffic sent from/to the given port
+        config.set_filter("tcp port " + to_string(stoi(string(argv[2]))));
+
+        // Construct the sniffer we'll use
+        Sniffer sniffer(argv[1], config);
+
+        cout << "Starting capture on interface " << argv[1] << endl;
+
+        // Now construct the stream follower
+        StreamFollower follower;
+
+        // We just need to specify the callback to be executed when a new 
+        // stream is captured. In this stream, you should define which callbacks
+        // will be executed whenever new data is sent on that stream 
+        // (see on_new_connection)
+        follower.new_stream_callback(&on_new_connection);
+
+        // Allow following partial TCP streams (e.g. streams that were
+        // open before the sniffer started running)
+        follower.follow_partial_streams(true);
+
+        // Now start capturing. Every time there's a new packet, call 
+        // follower.process_packet
+        sniffer.sniff_loop([&](PDU& packet) {
+            follower.process_packet(packet);
+            return true;
+        });
+    }
+    catch (exception& ex) {
+        cerr << "Error: " << ex.what() << endl;
+        return 1;
+    }
+}

examples/tcp_connection_close.cpp

@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2017, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <iostream>
+#include <string>
+#include <functional>
+#include <tins/tins.h>
+
+using std::string;
+using std::bind;
+using std::cout;
+using std::endl;
+using std::exception;
+
+using namespace Tins;
+
+// This example will capture TCP packets and send packet that will reset
+// the connection when it captures a packet with the SYN and ACK flags on.
+class tcp_connection_closer {
+public:
+    tcp_connection_closer() {
+
+    }
+
+    void run(const string& interface) {
+        using std::placeholders::_1;
+        // Make the PacketSender use this interface by default
+        sender_.default_interface(interface);
+
+        // Create the sniffer configuration
+        SnifferConfiguration config;
+        config.set_filter("tcp");
+        // We want to get the packets as fast as possible
+        config.set_immediate_mode(true);
+        // Create the sniffer and start the capture
+        Sniffer sniffer(interface, config);
+        sniffer.sniff_loop(bind(&tcp_connection_closer::callback, this, _1));
+    }
+private:
+    bool callback(const PDU& pdu) {
+        const EthernetII& eth = pdu.rfind_pdu<EthernetII>();
+        const IP& ip = pdu.rfind_pdu<IP>();
+        const TCP& tcp = pdu.rfind_pdu<TCP>();
+        // We'll only close a connection when seeing a SYN|ACK
+        if (tcp.has_flags(TCP::SYN | TCP::ACK)) {
+            // Create an ethernet header flipping the addresses
+            EthernetII packet(eth.src_addr(), eth.dst_addr());
+            // Do the same for IP
+            packet /= IP(ip.src_addr(), ip.dst_addr());
+            // Flip TCP ports
+            TCP response_tcp(tcp.sport(), tcp.dport());
+            // Set RST|ACK flags
+            response_tcp.flags(TCP::RST | TCP::ACK);
+            // Use the right sequence and ack numbers
+            response_tcp.seq(tcp.ack_seq());
+            response_tcp.ack_seq(tcp.seq());
+            // Add this PDU to the packet we'll send
+            packet /= response_tcp;
+            // Send it!
+            sender_.send(packet);
+        }
+        return true;
+    }
+
+    PacketSender sender_;
+};
+
+int main(int argc, char* argv[]) {
+    if (argc != 2) {
+        cout << "Usage: " << *argv << " <interface>" << endl;
+        return 1;
+    }
+    try {
+        tcp_connection_closer closer;
+        closer.run(argv[1]);
+    }
+    catch (exception& ex) {
+        cout << "[-] Error: " << ex.what() << endl;
+        return 1;
+    }
+}

examples/traceroute.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,15 +27,45 @@
  *
  */
  
+#ifdef _WIN32
+    #define NOMINMAX
+#endif // _WIN32
+
+// Fix for gcc 4.6
+#define _GLIBCXX_USE_NANOSLEEP
+
 #include <iostream>
+#include <iomanip>
 #include <chrono>
 #include <thread>
 #include <cstdint>
+#include <random>
 #include <map>
+#include <algorithm>
 #include <atomic>
+#include <limits>
 #include <mutex>
 #include <tins/tins.h>
 
+using std::cout;
+using std::endl;
+using std::move;
+using std::map;
+using std::min;
+using std::setw;
+using std::atomic;
+using std::runtime_error;
+using std::string;
+using std::to_string;
+using std::thread;
+using std::this_thread::sleep_for;
+using std::lock_guard;
+using std::mutex;
+using std::random_device;
+using std::numeric_limits;
+using std::bind;
+using std::chrono::milliseconds;
+
 using namespace Tins;
 
 class Traceroute {
@@ -43,18 +73,21 @@ public:
     typedef std::map<uint16_t, IPv4Address> result_type;
 
     Traceroute(NetworkInterface interface, IPv4Address address) 
-      : iface(interface), addr(address) { }
+    : iface(interface), addr(address), lowest_dest_ttl(numeric_limits<int>::max()) { 
+        sequence = random_device()() & 0xffff;
+    }
     
     result_type trace() {
+        SnifferConfiguration config;
+        config.set_promisc_mode(false);
         // ICMPs that aren't sent from us.
-        Sniffer sniffer(
-            iface.name(), 500, false, 
-            "ip proto \\icmp and not src host " + iface.addresses().ip_addr.to_string()
-        );
+        config.set_filter(
+            "ip proto \\icmp and not src host " + iface.addresses().ip_addr.to_string());
+        Sniffer sniffer(iface.name(), config);
         
         PacketSender sender;
         // Create our handler
-        auto handler = std::bind(
+        auto handler = bind(
             &Traceroute::sniff_callback, 
             this, 
             std::placeholders::_1
@@ -62,90 +95,117 @@ public:
         // We're running
         running = true;
         // Start the sniff thread
-        std::thread sniff_thread(
-            &Sniffer::sniff_loop<decltype(handler)>, 
-            &sniffer, 
-            handler,
-            0
+        thread sniff_thread(
+            [&]() {
+                sniffer.sniff_loop(handler);
+            }
         );
         send_packets(sender);
         sniff_thread.join();
+        // If the final hop responded, add its address at the appropriate ttl
+        if (lowest_dest_ttl != numeric_limits<int>::max()) {
+            results[lowest_dest_ttl] = addr;
+        }
         // Clear our results and return what we've found
-        return std::move(results);
+        return move(results);
     }
 private:
-    typedef std::map<uint16_t, size_t> ttl_map;
+    typedef map<uint16_t, size_t> ttl_map;
 
-    void send_packets(PacketSender &sender) {
+    void send_packets(PacketSender& sender) {
         // ICMPs are icmp-requests by default
         IP ip = IP(addr, iface.addresses().ip_addr) / ICMP();
-        // We'll find at most 10 hops.
+        ICMP& icmp = ip.rfind_pdu<ICMP>();
+        icmp.sequence(sequence);
+        // We'll find at most 20 hops.
         
-        for(auto i = 1; i <= 10; ++i) {
-            // Set this "unique" id
-            ip.id(i);
+        for (auto i = 1; i <= 20; ++i) {
+            // Set this ICMP id
+            icmp.id(i);
             // Set the time-to-live option
             ip.ttl(i);
             
             // Critical section
             {
-                std::lock_guard<std::mutex> _(lock);
+                lock_guard<mutex> _(lock);
                 ttls[i] = i;
             }
             
             sender.send(ip);
-            // Give him a little time
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            // Give it a little time
+            sleep_for(milliseconds(100));
         }
         running = false;
         sender.send(ip);
     }
 
-    bool sniff_callback(PDU &pdu) {
-        const IP &ip = pdu.rfind_pdu<IP>();
-        ttl_map::const_iterator iter;
-        // Fetch the IP PDU attached to the ICMP response
-        const IP inner_ip = pdu.rfind_pdu<RawPDU>().to<IP>();
-        // Critical section
-        {
-            std::lock_guard<std::mutex> _(lock);
-            iter = ttls.find(inner_ip.id());
-        } 
+    bool sniff_callback(PDU& pdu) {
+        // Find IP and ICMP PDUs
+        const IP& ip = pdu.rfind_pdu<IP>();
+        const ICMP& icmp = pdu.rfind_pdu<ICMP>();
+        // Check if this is an ICMP TTL exceeded error response
+        if (icmp.type() == ICMP::TIME_EXCEEDED) {
+            // Fetch the IP PDU attached to the ICMP response
+            const IP inner_ip = pdu.rfind_pdu<RawPDU>().to<IP>();
+            // Now get the ICMP layer
+            const ICMP& inner_icmp = inner_ip.rfind_pdu<ICMP>();
+            // Make sure this is one of our packets.
+            if (inner_icmp.sequence() == sequence) {
+                ttl_map::const_iterator iter;
 
-        // It's an actual response
-        if(iter != ttls.end()) {
-            // Store it
-            results[inner_ip.id()] = ip.src_addr();
+                // Critical section
+                {
+                    std::lock_guard<std::mutex> _(lock);
+                    iter = ttls.find(inner_icmp.id());
+                } 
+
+                // It's an actual response
+                if(iter != ttls.end()) {
+                    // Store it
+                    results[inner_icmp.id()] = ip.src_addr();
+                }
+            }
+        }
+        // Otherwise, this could be the final hop making an echo response
+        else if (icmp.type() == ICMP::ECHO_REPLY && icmp.sequence() == sequence && 
+                ip.src_addr() == addr) {
+            // Keep the lowest ttl seen for the destination.
+            lowest_dest_ttl = min(lowest_dest_ttl, static_cast<int>(icmp.id()));
         }
         return running;
     }
 
     NetworkInterface iface;
     IPv4Address addr;
-    std::atomic<bool> running;
+    atomic<bool> running;
     ttl_map ttls;
     result_type results;
-    std::mutex lock;
+    mutex lock;
+    uint16_t sequence;
+    int lowest_dest_ttl;
 };
 
 int main(int argc, char* argv[]) {
-    if(argc <= 1 && std::cout << "Usage: " << *argv << " <IP_ADDRESS>\n") 
+    if (argc <= 1) { 
+        cout << "Usage: " <<* argv << " <ip_address>" << endl;
         return 1;
+    }
     try {
-        IPv4Address addr((std::string(argv[1])));
+        IPv4Address addr = string(argv[1]);
         Traceroute tracer(addr, addr);
         auto results = tracer.trace();
-        if(results.empty())
-            std::cout << "No hops found" << std::endl;
+        if (results.empty()) {
+            cout << "No hops found" << endl;
+        }
         else {
-            std::cout << "Results: " << std::endl;
-            for(const auto &entry : results) {
-                std::cout << entry.first << " - " << entry.second << std::endl;
+            cout << "Results: " << endl;
+            for(const auto& entry : results) {
+                cout << setw(2) << entry.first << " - " << entry.second << endl;
             }
         }
     }
-    catch(std::runtime_error &ex) {
-        std::cout << "Error - " << ex.what() << std::endl;
+    catch (runtime_error& ex) {
+        cout << "Error - " << ex.what() << endl;
         return 2;
     }
 }

examples/wps_detect.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Matias Fontanini
+ * Copyright (c) 2017, Matias Fontanini
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,11 +41,11 @@ std::set<HWAddress<6>> addrs;
 const HWAddress<3> expected_oui("00:50:F2");
 
 bool handler(const PDU& pdu) {
-    const Dot11Beacon &beacon = pdu.rfind_pdu<Dot11Beacon>();
+    const Dot11Beacon& beacon = pdu.rfind_pdu<Dot11Beacon>();
     // Only process it once
     if(addrs.insert(beacon.addr3()).second) {
         // Iterate the tagged options
-        for(const auto &opt : beacon.options()) {
+        for(const auto& opt : beacon.options()) {
             // Is this a vendor-specific tag?
             if(opt.option() == Dot11::VENDOR_SPECIFIC) {
                 // Make sure there's enough size for the OUI + identifier
@@ -63,12 +63,16 @@ bool handler(const PDU& pdu) {
     return true;
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
     if(argc != 2) {
-        std::cout << "Usage: " << *argv << " <DEVICE>\n";
+        std::cout << "Usage: " <<* argv << " <DEVICE>\n";
         return 1;
     }
     // Only sniff beacons
-    Sniffer sniffer(argv[1], 2000, true, "wlan type mgt subtype beacon");
+    SnifferConfiguration config;
+    config.set_snap_len(2000);
+    config.set_promisc_mode(true);
+    config.set_filter("wlan type mgt subtype beacon");
+    Sniffer sniffer(argv[1], config);
     sniffer.sniff_loop(handler);
 }

include/CMakeLists.txt

@@ -1,7 +0,0 @@
-FILE(GLOB INCLUDE_FILES "*.h")
-INSTALL(
-    FILES ${INCLUDE_FILES} 
-    DESTINATION include/tins
-    COMPONENT Headers
-)
-ADD_SUBDIRECTORY(dot11)

include/arp.h

@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-
-#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"
-
-namespace Tins {
-    class NetworkInterface;
-    class EthernetII;
-
-    /**
-     * \brief Class that represents an ARP PDU.
-     *
-     */
-    class ARP : public PDU {
-    public:
-        /**
-         * The type of the hardware address.
-         */
-        typedef HWAddress<6> hwaddress_type;
-        
-        /**
-         * The type of the IP address.
-         */
-        typedef IPv4Address ipaddress_type;
-    
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::ARP;
-    
-        /**
-         * \brief Enum which indicates the type of ARP packet.
-         */
-        enum Flags {
-            REQUEST = 0x0001,
-            REPLY   = 0x0002
-        };
-
-        /**
-         * \brief Constructs an ARP object using the provided addresses.
-         * 
-         * ARP requests and replies can be constructed easily using
-         * ARP::make_arp_request/reply static member functions.
-         * 
-         * \sa ARP::make_arp_request
-         * \sa ARP::make_arp_reply
-         * 
-         * \param target_ip The target IP address.
-         * \param sender_ip The sender IP address.
-         * \param target_hw The target hardware address.
-         * \param sender_hw The sender hardware address.
-         */
-        ARP(ipaddress_type target_ip = ipaddress_type(), 
-            ipaddress_type sender_ip = ipaddress_type(), 
-            const hwaddress_type &target_hw = hwaddress_type(), 
-            const hwaddress_type &sender_hw = hwaddress_type());
-
-        /**
-         * \brief Constructs an ARP object from a buffer.
-         * 
-         * If there is not enough size for an ARP header in the buffer,
-         * a malformed_packet exception is thrown. 
-         * 
-         * If the buffer is bigger than the size of the ARP header, 
-         * then the extra data is stored in a RawPDU.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        ARP(const uint8_t *buffer, uint32_t total_sz);
-
-        /* Getters */
-        /**
-         * \brief Getter for the sender's hardware address.
-         *
-         * \return The sender hardware address.
-         */
-        hwaddress_type sender_hw_addr() const { return _arp.ar_sha; }
-
-        /**
-         * \brief Getter for the sender's IP address.
-         *
-         * \return The sender IP address.
-         */
-        ipaddress_type sender_ip_addr() const { return ipaddress_type(_arp.ar_sip); }
-
-        /**
-         * \brief Getter for the target's hardware address.
-         *
-         * \return The target hardware address.
-         */
-        hwaddress_type target_hw_addr() const { return _arp.ar_tha; }
-
-        /**
-         * \brief Getter for the target's IP address.
-         *
-         * \return The target IP address.
-         */
-        ipaddress_type target_ip_addr() const { return ipaddress_type(_arp.ar_tip); }
-
-        /**
-         * \brief Getter for the hardware address format field.
-         *
-         * \return The hardware address format.
-         */
-        uint16_t hw_addr_format() const { return Endian::be_to_host(_arp.ar_hrd); }
-
-        /**
-         * \brief Getter for the protocol address format field.
-         *
-         * \return The protocol address format.
-         */
-        uint16_t prot_addr_format() const { return Endian::be_to_host(_arp.ar_pro); }
-
-        /**
-         * \brief Getter for the hardware address length field.
-         *
-         * \return The hardware address length.
-         */
-        uint8_t hw_addr_length() const { return _arp.ar_hln; }
-
-        /**
-         * \brief Getter for the protocol address length field.
-         *
-         * \return The protocol address length.
-         */
-        uint8_t prot_addr_length() const { return _arp.ar_pln; }
-
-        /**
-         * \brief Getter for the ARP opcode field.
-         *
-         * \return The ARP opcode.
-         */
-        uint16_t opcode() const { return Endian::be_to_host(_arp.ar_op); }
-
-        /** 
-         * \brief Getter for the header size.
-         * \return Returns the ARP header size.
-         * \sa PDU::header_size
-         */
-        uint32_t header_size() const;
-        /* Setters */
-
-        /**
-         * \brief Setter for the sender's hardware address.
-         *
-         * \param new_snd_hw_addr The new sender hardware address.
-         */
-        void sender_hw_addr(const hwaddress_type &new_snd_hw_addr);
-
-        /**
-         * \brief Setter for the sender's IP address.
-         *
-         * \param new_snd_ip_addr The new sender IP address.
-         */
-        void sender_ip_addr(ipaddress_type new_snd_ip_addr);
-
-        /**
-         * \brief Setter for the target's hardware address.
-         *
-         * \param new_tgt_hw_addr The new target hardware address.
-         */
-        void target_hw_addr(const hwaddress_type &new_tgt_hw_addr);
-
-        /**
-         * \brief Setter for the target's IP address.
-         *
-         * \param new_tgt_ip_addr The new target IP address.
-         */
-        void target_ip_addr(ipaddress_type new_tgt_ip_addr);
-
-        /**
-         * \brief Setter for the hardware address format field.
-         *
-         * \param new_hw_addr_fmt The new hardware address format.
-         */
-        void hw_addr_format(uint16_t new_hw_addr_fmt);
-
-        /**
-         * \brief Setter for the protocol address format field.
-         *
-         * \param new_prot_addr_fmt The new protocol address format.
-         */
-        void prot_addr_format(uint16_t new_prot_addr_fmt);
-
-        /**
-         * \brief Setter for the hardware address length field.
-         *
-         * \param new_hw_addr_len The new hardware address length.
-         */
-        void hw_addr_length(uint8_t new_hw_addr_len);
-
-        /**
-         * \brief Setter for the protocol address length field.
-         *
-         * \param new_prot_addr_len The new protocol address length.
-         */
-        void prot_addr_length(uint8_t new_prot_addr_len);
-
-        /**
-         * \brief Setter for the ARP opcode field.
-         *
-         * \param new_opcode Flag enum value of the ARP opcode to set.
-         */
-        void opcode(Flags new_opcode);
-
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return pdu_flag; }
-
-        /**
-         * \brief Creates an ARP Request within an EthernetII PDU.
-         *
-         * Creates an ARP Request PDU and embeds it inside an EthernetII
-         * PDU.
-         *
-         * \param target The target's IP address.
-         * \param sender The sender's IP address.
-         * \param hw_snd The sender's hardware address.
-         * \return EthernetII object containing the ARP Request.
-         */
-        static EthernetII make_arp_request(ipaddress_type target, 
-          ipaddress_type sender, const hwaddress_type &hw_snd = hwaddress_type());
-
-        /**
-         * \brief Creates an ARP Reply within an EthernetII PDU.
-         *
-         * Creates an ARP Reply PDU and embeds it inside an EthernetII 
-         * PDU.
-         *
-         * \param target The target's IP address.
-         * \param sender The sender's IP address.
-         * \param hw_tgt The target's hardware address.
-         * \param hw_snd The sender's hardware address.
-         * \return EthetnetII containing the ARP Replay.
-         */
-        static EthernetII make_arp_reply(ipaddress_type target, 
-          ipaddress_type sender, const hwaddress_type &hw_tgt = hwaddress_type(), 
-          const hwaddress_type &hw_snd = hwaddress_type());
-
-        /** 
-         * \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * \sa PDU::matches_response
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        bool matches_response(const uint8_t *ptr, uint32_t total_sz) const;
-        
-        /**
-         * \sa PDU::clone
-         */
-        ARP *clone() const {
-            return new ARP(*this);
-        }
-    private:
-        TINS_BEGIN_PACK
-        struct arphdr {
-            uint16_t ar_hrd;	/* format of hardware address	*/
-            uint16_t ar_pro;	/* format of protocol address	*/
-            uint8_t	ar_hln;		/* length of hardware address	*/
-            uint8_t	ar_pln;		/* length of protocol address	*/
-            uint16_t ar_op;		/* ARP opcode (command)		*/
-
-            /* sender hardware address	*/
-            uint8_t ar_sha[hwaddress_type::address_size];	
-            /* sender IP address		*/
-            uint32_t ar_sip;	
-            /* target hardware address	*/
-            uint8_t ar_tha[hwaddress_type::address_size];	
-            /* target IP address		*/
-            uint32_t ar_tip;
-        } TINS_END_PACK;
-
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-
-        arphdr _arp;
-    };
-}
-#endif //TINS_ARP_H

include/bootp.h

@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_BOOTP_H
-#define TINS_BOOTP_H
-
-#include <stdint.h>
-#include <algorithm>
-#include <vector>
-#include "pdu.h"
-#include "macros.h"
-#include "endianness.h"
-#include "ip_address.h"
-#include "hw_address.h"
-
-
-namespace Tins {
-
-    /**
-     * \brief Class representing a BootP packet.
-     */
-    class BootP : public PDU {
-    public:
-        /**
-         * The type of the IP addresses.
-         */
-        typedef IPv4Address ipaddress_type;
-        
-        /**
-         * The type of the chaddr field.
-         */
-        typedef HWAddress<16> chaddr_type;
-        
-        /**
-         * The type of the vend field.
-         */
-        typedef std::vector<uint8_t> vend_type;
-        
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::BOOTP;
-    
-        /**
-         * \brief Enum which contains the different opcodes BootP messages.
-         */
-        enum OpCodes {
-            BOOTREQUEST = 1,
-            BOOTREPLY = 2
-        };
-
-        /**
-         * \brief Creates an instance of BootP.
-         *
-         * This sets the size of the vend field to 64, as the BootP RFC
-         * states.
-         */
-        BootP();
-
-        /**
-         * \brief Constructs a BootP object from a buffer .
-         * 
-         * If there's not enough size for a BootP header, then a 
-         * malformed_packet exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         * \param vend_field_size The vend field size to allocate.
-         * Subclasses might use 0 to provide their own interpretation of this field.
-         */
-        BootP(const uint8_t *buffer, uint32_t total_sz, uint32_t vend_field_size = 64);
-
-        /* Getters */
-
-        /** 
-         * \brief Getter for the opcode field.
-         * \return The opcode field for this BootP PDU.
-         */
-        uint8_t opcode() const { return _bootp.opcode; }
-
-        /** 
-         * \brief Getter for the htype field.
-         * \return The htype field for this BootP PDU.
-         */
-        uint8_t htype() const { return _bootp.htype; }
-
-        /** 
-         * \brief Getter for the hlen field.
-         * \return The hlen field for this BootP PDU.
-         */
-        uint8_t hlen() const { return _bootp.hlen; }
-
-        /** 
-         * \brief Getter for the hops field.
-         * \return The hops field for this BootP PDU.
-         */
-        uint8_t hops() const { return _bootp.hops; }
-
-        /** 
-         * \brief Getter for the xid field.
-         * \return The xid field for this BootP PDU.
-         */
-        uint32_t xid() const { return Endian::be_to_host(_bootp.xid); }
-
-        /** 
-         * \brief Getter for the secs field.
-         * \return The secs field for this BootP PDU.
-         */
-        uint16_t secs() const { return Endian::be_to_host(_bootp.secs); }
-
-        /** \brief Getter for the padding field.
-         * \return The padding field for this BootP PDU.
-         */
-        uint16_t padding() const { return Endian::be_to_host(_bootp.padding); }
-
-        /** 
-         * \brief Getter for the ciaddr field.
-         * \return The ciaddr field for this BootP PDU.
-         */
-        ipaddress_type ciaddr() const { return ipaddress_type(_bootp.ciaddr); }
-
-        /** 
-         * \brief Getter for the yiaddr field.
-         * \return The yiaddr field for this BootP PDU.
-         */
-        ipaddress_type yiaddr() const { return ipaddress_type(_bootp.yiaddr); }
-
-        /** 
-         * \brief Getter for the siaddr field.
-         * \return The siaddr field for this BootP PDU.
-         */
-        ipaddress_type siaddr() const { return ipaddress_type(_bootp.siaddr); }
-
-        /** 
-         * \brief Getter for the giaddr field.
-         * \return The giaddr field for this BootP PDU.
-         */
-        ipaddress_type giaddr() const { return ipaddress_type(_bootp.giaddr); }
-
-        /** 
-         * \brief Getter for the chaddr field.
-         * \return The chddr field for this BootP PDU.
-         */
-        chaddr_type chaddr() const { return _bootp.chaddr; }
-
-        /** 
-         * \brief Getter for the sname field.
-         * \return The sname field for this BootP PDU.
-         */
-        const uint8_t *sname() const { return _bootp.sname; }
-
-        /** 
-         * \brief Getter for the file field.
-         * \return The file field for this BootP PDU.
-         */
-        const uint8_t *file() const { return _bootp.file; }
-
-        /** 
-         * \brief Getter for the vend field.
-         * \return The vend field for this BootP PDU.
-         */
-        const vend_type &vend() const { return _vend; }
-
-        /** 
-         * \brief Getter for the header size.
-         * \return Returns the BOOTP header size.
-         * \sa PDU::header_size
-         */
-        uint32_t header_size() const;
-        /* Setters */
-
-        /** 
-         * \brief Setter for the opcode field.
-         * \param new_opcode The opcode to be set.
-         */
-        void opcode(uint8_t new_opcode);
-
-        /** 
-         * \brief Setter for the htype field.
-         * \param new_htype The htype to be set.
-         */
-        void htype(uint8_t new_htype);
-
-        /** 
-         * \brief Setter for the hlen field.
-         * \param new_hlen The hlen to be set.
-         */
-        void hlen(uint8_t new_hlen);
-
-        /** 
-         * \brief Setter for the hops field.
-         * \param new_hops The hops to be set.
-         */
-        void hops(uint8_t new_hops);
-
-        /** 
-         * \brief Setter for the xid field.
-         * \param new_xid The xid to be set.
-         */
-        void xid(uint32_t new_xid);
-
-        /** 
-         * \brief Setter for the secs field.
-         * \param new_secs The secs to be set.
-         */
-        void secs(uint16_t new_secs);
-
-        /** 
-         * \brief Setter for the padding field.
-         * \param new_padding The padding to be set.
-         */
-        void padding(uint16_t new_padding);
-
-        /** 
-         * \brief Setter for the ciaddr field.
-         * \param new_ciaddr The ciaddr to be set.
-         */
-        void ciaddr(ipaddress_type new_ciaddr);
-
-        /** 
-         * \brief Setter for the yiaddr field.
-         * \param new_yiaddr The yiaddr to be set.
-         */
-        void yiaddr(ipaddress_type new_yiaddr);
-
-        /** 
-         * \brief Setter for the siaddr field.
-         * \param new_siaddr The siaddr to be set.
-         */
-        void siaddr(ipaddress_type new_siaddr);
-
-        /** 
-         * \brief Setter for the giaddr field.
-         * \param new_giaddr The giaddr to be set.
-         */
-        void giaddr(ipaddress_type new_giaddr);
-
-        /** 
-         * \brief Setter for the chaddr field.
-         * The new_chaddr pointer must be at least BOOTP::hlen() bytes long.
-         * \param new_chaddr The chaddr to be set.
-         */
-        template<size_t n>
-        void chaddr(const HWAddress<n> &new_chaddr) {
-            // Copy the new addr
-            uint8_t *end = std::copy(
-                new_chaddr.begin(), 
-                new_chaddr.begin() + std::min(n, sizeof(_bootp.chaddr)), 
-                _bootp.chaddr
-            );
-            // Fill what's left with zeros
-            if(end < _bootp.chaddr + chaddr_type::address_size)
-                std::fill(end, _bootp.chaddr + chaddr_type::address_size, 0);
-        }
-
-        /** 
-         * \brief Setter for the sname field.
-         * \param new_sname The sname to be set.
-         */
-        void sname(const uint8_t *new_sname);
-
-        /** 
-         * \brief Setter for the file field.
-         * \param new_file The file to be set.
-         */
-        void file(const uint8_t *new_file);
-
-        /** 
-         * \brief Setter for the vend field.
-         * \param new_vend The vend to be set.
-         */
-        void vend(const vend_type &new_vend);
-
-        /**
-         * \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * This returns true if the xid field is equal.
-         * 
-         * \sa PDU::matches_response
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        bool matches_response(const uint8_t *ptr, uint32_t total_sz) const;
-
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return pdu_flag; }
-
-        /**
-         * \sa PDU::clone
-         */
-        BootP *clone() const {
-            return new BootP(*this);
-        }
-    protected:
-        /** 
-         * \brief Getter for the vend field.
-         * 
-         * This getter can be used by subclasses to avoid copying the
-         * vend field around.
-         * 
-         * \return The vend field for this BootP PDU.
-         */
-        vend_type &vend() { return _vend; }
-
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-    private:
-        /**
-         * Struct that represents the Bootp datagram.
-         */
-        TINS_BEGIN_PACK
-        struct bootphdr {
-            uint8_t opcode;
-            uint8_t htype;
-            uint8_t hlen;
-            uint8_t hops;
-            uint32_t xid;
-            uint16_t secs;
-            uint16_t padding;
-            uint32_t ciaddr;
-            uint32_t yiaddr;
-            uint32_t siaddr;
-            uint32_t giaddr;
-            uint8_t chaddr[16];
-            uint8_t sname[64];
-            uint8_t file[128];
-        } TINS_END_PACK;
-
-        bootphdr _bootp;
-        vend_type _vend;
-    };
-}
-
-#endif // TINS_BOOTP_H

include/config.h.in

@@ -1,9 +0,0 @@
-
-/* Define if the compiler supports basic C++11 syntax */
-#cmakedefine HAVE_CXX11
-
-/* Have IEEE 802.11 support */
-#cmakedefine HAVE_DOT11
-
-/* Have WPA2 decryption library */
-#cmakedefine HAVE_WPA2_DECRYPTION

include/constants.h

@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_CONSTANTS_H
-#define TINS_CONSTANTS_H
-
-namespace Tins {
-    /**
-     * \brief Constants used in protocols.
-     */
-    namespace Constants {
-        /** \cond */
-        struct IP {
-        /** \endcond */
-            enum e {
-                PROTO_IP = 0,        /* Dummy protocol for TCP.  */
-                PROTO_HOPOPTS = 0,   /* IPv6 Hop-by-Hop options.  */
-                PROTO_ICMP = 1,	     /* Internet Control Message Protocol.  */
-                PROTO_IGMP = 2,	     /* Internet Group Management Protocol. */
-                PROTO_IPIP = 4,	     /* IPIP tunnels (older KA9Q tunnels use 94).  */
-                PROTO_TCP = 6,	     /* Transmission Control Protocol.  */
-                PROTO_EGP = 8,	     /* Exterior Gateway Protocol.  */
-                PROTO_PUP = 12,	     /* PUP protocol.  */
-                PROTO_UDP = 17,	     /* User Datagram Protocol.  */
-                PROTO_IDP = 22,	     /* XNS IDP protocol.  */
-                PROTO_TP = 29,	     /* SO Transport Protocol Class 4.  */
-                PROTO_DCCP = 33,	 /* Datagram Congestion Control Protocol.  */
-                PROTO_IPV6 = 41,     /* IPv6 header.  */
-                PROTO_ROUTING = 43,  /* IPv6 routing header.  */
-                PROTO_FRAGMENT = 44, /* IPv6 fragmentation header.  */
-                PROTO_RSVP = 46,	 /* Reservation Protocol.  */
-                PROTO_GRE = 47,	     /* General Routing Encapsulation.  */
-                PROTO_ESP = 50,      /* encapsulating security payload.  */
-                PROTO_AH = 51,       /* authentication header.  */
-                PROTO_ICMPV6 = 58,   /* ICMPv6.  */
-                PROTO_NONE = 59,     /* IPv6 no next header.  */
-                PROTO_DSTOPTS = 60,  /* IPv6 destination options.  */
-                PROTO_MTP = 92,	     /* Multicast Transport Protocol.  */
-                PROTO_ENCAP = 98,	 /* Encapsulation Header.  */
-                PROTO_PIM = 103,	 /* Protocol Independent Multicast.  */
-                PROTO_COMP = 108,	 /* Compression Header Protocol.  */
-                PROTO_SCTP = 132,	 /* Stream Control Transmission Protocol.  */
-                PROTO_UDPLITE = 136, /* UDP-Lite protocol.  */
-                PROTO_RAW = 255	     /* Raw IP packets.  */
-            };
-        };
-        
-        struct Ethernet {
-            enum e {
-                UNKNOWN = 0,
-                //~ PUP = 0x0200,     /* Xerox PUP */
-                SPRITE = 0x0500,  /* Sprite */
-                IP = 0x0800,      /* IP */
-                ARP = 0x0806,     /* Address resolution */
-                REVARP = 0x8035,  /* Reverse ARP */
-                AT = 0x809B,      /* AppleTalk protocol */
-                AARP = 0x80F3,    /* AppleTalk ARP */
-                VLAN = 0x8100,    /* IEEE 802.1Q VLAN tagging */
-                IPX = 0x8137,	  /* IPX */
-                IPV6 = 0x86dd,    /* IP protocol version 6 */
-                PPPOED = 0x8863, /* PPPoE Discovery */
-                EAPOL = 0x888e,   /* EAPOL */
-                LOOPBACK = 0x9000 /* used to test interfaces */
-            };
-        };
-        
-        struct ARP {
-            enum e {
-                NETROM = 0,		    /* From KA9Q: NET/ROM pseudo. */
-                ETHER = 1,		    /* Ethernet 10/100Mbps.  */
-                EETHER = 2,		    /* Experimental Ethernet.  */
-                AX25 = 3,		    /* AX.25 Level 2.  */
-                PRONET = 4,		    /* PROnet token ring.  */
-                CHAOS = 5,		    /* Chaosnet.  */
-                IEEE802 = 6,        /* IEEE 802.2 Ethernet/TR/TB.  */
-                ARCNET = 7,		    /* ARCnet.  */
-                APPLETLK = 8,		/* APPLEtalk.  */
-                DLCI = 15,		    /* Frame Relay DLCI.  */
-                ATM	= 19,		    /* ATM.  */
-                METRICOM = 23,		/* Metricom STRIP (new IANA id).  */
-                IEEE1394 = 24,		/* IEEE 1394 IPv4 - RFC 2734.  */
-                EUI64 = 27,		    /* EUI-64.  */
-                INFINIBAND = 32,    /* InfiniBand.  */
-                SLIP = 256,
-                CSLIP = 257,
-                SLIP6 = 258,
-                CSLIP6 = 259,
-                RSRVD = 260,		/* Notional KISS type.  */
-                ADAPT = 264,
-                ROSE	= 270,
-                X25	= 271,		    /* CCITT X.25.  */
-                HWX25 = 272,		/* Boards with X.25 in firmware.  */
-                PPP	= 512,
-                CISCO = 513,		/* Cisco HDLC.  */
-                HDLC	= CISCO,
-                LAPB	= 516,		/* LAPB.  */
-                DDCMP = 517,		/* Digital's DDCMP.  */
-                RAWHDLC = 518,		/* Raw HDLC.  */
-                TUNNEL = 768,		/* IPIP tunnel.  */
-                TUNNEL6 = 769,		/* IPIP6 tunnel.  */
-                FRAD = 770,         /* Frame Relay Access Device.  */
-                SKIP = 771,		    /* SKIP vif.  */
-                LOOPBACK = 772,		/* Loopback device.  */
-                LOCALTLK = 773,		/* Localtalk device.  */
-                FDDI = 774,		    /* Fiber Distributed Data Interface. */
-                BIF = 775,          /* AP1000 BIF.  */
-                SIT = 776,		    /* sit0 device - IPv6-in-IPv4.  */
-                IPDDP = 777,		/* IP-in-DDP tunnel.  */
-                IPGRE = 778,		/* GRE over IP.  */
-                PIMREG = 779,		/* PIMSM register interface.  */
-                HIPPI = 780,		/* High Performance Parallel I'face. */
-                ASH = 781,		    /* (Nexus Electronics) Ash.  */
-                ECONET = 782,		/* Acorn Econet.  */
-                IRDA = 783,		    /* Linux-IrDA.  */
-                FCPP = 784,		    /* Point to point fibrechanel.  */
-                FCAL = 785,		    /* Fibrechanel arbitrated loop.  */
-                FCPL = 786,		    /* Fibrechanel public loop.  */
-                FCFABRIC = 787,		/* Fibrechanel fabric.  */
-                IEEE802_TR = 800,	/* Magic type ident for TR.  */
-                IEEE80211 = 801,	/* IEEE 802.11.  */
-                IEEE80211_PRISM = 802,	/* IEEE 802.11 + Prism2 header.  */
-                IEEE80211_RADIOTAP = 803,	/* IEEE 802.11 + radiotap header.  */
-                IEEE802154 = 804, /* IEEE 802.15.4 header.  */
-                IEEE802154_PHY = 805, /* IEEE 802.15.4 PHY header.  */
-                VOID_TYPE = 0xFFFF,	     /* Void type, nothing is known.  */
-                NONE = 0xFFFE	      /* Zero header length.  */  
-            };
-        };
-    }
-}
-
-
-#endif // TINS_CONSTANTS_H

include/crypto.h

@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "config.h"
-
-#if !defined(TINS_CRYPTO_H) && defined(HAVE_DOT11)
-#define TINS_CRYPTO_H
-
-#include <map>
-#include <string>
-#include <algorithm>
-#include <vector>
-#include "utils.h"
-#include "snap.h"
-#include "rawpdu.h"
-#include "handshake_capturer.h"
-
-namespace Tins {
-class PDU;
-class Dot11;
-class Dot11Data;
-
-namespace Crypto {
-    /**
-     * \cond
-     */
-    struct RC4Key;
-    #ifdef HAVE_WPA2_DECRYPTION
-    namespace WPA2 {
-        class invalid_handshake : public std::exception {
-        public:
-            const char *what() const throw() {
-                return "invalid handshake";
-            }
-        };
-        class SessionKeys {
-        public:
-            typedef Internals::byte_array<80> ptk_type;
-            typedef Internals::byte_array<32> pmk_type;
-            
-            SessionKeys();
-            SessionKeys(const RSNHandshake &hs, const pmk_type &pmk);
-            SNAP *decrypt_unicast(const Dot11Data &dot11, RawPDU &raw) const;
-        private:
-            SNAP *ccmp_decrypt_unicast(const Dot11Data &dot11, RawPDU &raw) const;
-            SNAP *tkip_decrypt_unicast(const Dot11Data &dot11, RawPDU &raw) const;
-            RC4Key generate_rc4_key(const Dot11Data &dot11, const RawPDU &raw) const;
-
-            ptk_type ptk;
-            bool is_ccmp;
-        };
-            
-        class SupplicantData {
-        public:
-            typedef HWAddress<6> address_type;
-            typedef SessionKeys::pmk_type pmk_type;
-            
-            SupplicantData(const std::string &psk, const std::string &ssid);
-            
-            const pmk_type &pmk() const;
-        private:
-            pmk_type pmk_;
-        };
-    }
-    #endif // HAVE_WPA2_DECRYPTION
-    /**
-     * \endcond
-     */
-
-    /**
-     * \brief RC4 Key abstraction.
-     */
-    struct RC4Key {
-        static const size_t data_size = 256;
-
-        /**
-         * \brief Initializes the key using the provided iterator range.
-         * 
-         * \param start The start of the range.
-         * \param end The end of the range.
-         */
-        template<typename ForwardIterator>
-        RC4Key(ForwardIterator start, ForwardIterator end);
-
-        /**
-         * The actual key data.
-         */
-        uint8_t data[data_size];
-    };
-
-    /**
-     * \brief Decrypts WEP-encrypted traffic.
-     */
-    class WEPDecrypter {
-    public:
-        typedef HWAddress<6> address_type;
-    
-        /**
-         * \brief Constructs a WEPDecrypter object.
-         */
-        WEPDecrypter();
-        
-        /**
-         * \brief Adds a decryption password.
-         * 
-         * \param addr The access point's BSSID.
-         * \param password The password which will be used to decrypt
-         * packets sent from and to the AP identifier by the BSSID addr.
-         */
-        void add_password(const address_type &addr, const std::string &password);
-        
-        /**
-         * \brief Removes a decryption password
-         * 
-         * \param addr The BSSID of the access point.
-         */
-        void remove_password(const address_type &addr);
-        
-        /**
-         * \brief Decrypts the provided PDU.
-         * 
-         * A Dot11Data PDU is looked up inside the provided PDU chain.
-         * If no such PDU exists or there is no password associated
-         * with the Dot11 packet's BSSID, then the PDU is left intact. 
-         * 
-         * Otherwise, the packet is decrypted using the given password. 
-         * If the CRC found after decrypting is invalid, false is 
-         * returned.
-         * 
-         * \return false if no decryption was performed or decryption 
-         * failed, true otherwise.
-         */
-        bool decrypt(PDU &pdu);
-    private:
-        typedef std::map<address_type, std::string> passwords_type;
-    
-        PDU *decrypt(RawPDU &raw, const std::string &password);
-    
-        passwords_type passwords;
-        std::vector<uint8_t> key_buffer;
-    };
-
-    #ifdef HAVE_WPA2_DECRYPTION
-    /**
-     * \brief Decrypts WPA2-encrypted traffic.
-     *
-     * This class takes valid PSK and SSID tuples, captures client handshakes,
-     * and decrypts their traffic afterwards.
-     */
-    class WPA2Decrypter {
-    public:
-        /*
-         * \brief The type used to store Dot11 addresses.
-         */
-        typedef HWAddress<6> address_type;
-        
-        /**
-         * \brief Adds an access points's information.
-         *
-         * This associates an SSID with a PSK, and allows the decryption of
-         * any BSSIDs that broadcast the same SSID. 
-         * 
-         * The decrypter will inspect beacon frames, looking for SSID tags 
-         * that contain the given SSID.
-         *
-         * Note that using this overload, the decryption of data frames and
-         * handshake capturing will be disabled until any access point 
-         * broadcasts the provided SSID(this shouldn't take long at all). 
-         * If this is not the desired behaviour, then you should check out
-         * the ovther add_ap_data overload.
-         * 
-         * \param psk The PSK associated with the SSID.
-         * \param ssid The network's SSID.
-         */
-        void add_ap_data(const std::string &psk, const std::string &ssid);
-
-        /**
-         * \brief Adds a access points's information, including its BSSID.
-         *
-         * This overload can be used if the BSSID associated with this SSID is 
-         * known beforehand. The addr parameter indicates which specific BSSID 
-         * is associated to the SSID. 
-         * 
-         * Note that if any other access point broadcasts the provided SSID, 
-         * it will be taken into account as well.
-         * 
-         * \param psk The PSK associated with this SSID.
-         * \param ssid The network's SSID.
-         * \param addr The access point's BSSID.
-         */
-        void add_ap_data(const std::string &psk, const std::string &ssid, const address_type &addr);
-        
-        /**
-         * \brief Decrypts the provided PDU.
-         * 
-         * A Dot11Data PDU is looked up inside the provided PDU chain.
-         * If no such PDU exists or no PSK was associated with the SSID
-         * broadcasted by the Dot11 packet's BSSID, or no EAPOL handshake 
-         * was captured for the client involved in the communication, 
-         * then the PDU is left intact. 
-         * 
-         * Otherwise, the packet is decrypted using the generated PTK. 
-         * If the resulting MIC is invalid, then the packet is left intact.
-         * 
-         * \return false if no decryption was performed, or the decryption 
-         * failed, true otherwise.
-         */
-        bool decrypt(PDU &pdu);
-    private:
-        typedef std::map<std::string, WPA2::SupplicantData> pmks_map;
-        typedef std::map<address_type, WPA2::SupplicantData> bssids_map;
-        typedef std::pair<address_type, address_type> addr_pair;
-        typedef std::map<addr_pair, WPA2::SessionKeys> keys_map;
-        
-        void try_add_keys(const Dot11Data &dot11, const RSNHandshake &hs);
-        addr_pair make_addr_pair(const address_type &addr1, const address_type &addr2) {
-            return (addr1 < addr2) ? 
-                std::make_pair(addr1, addr2) :
-                std::make_pair(addr2, addr1);
-        }
-        addr_pair extract_addr_pair(const Dot11Data &dot11);
-        addr_pair extract_addr_pair_dst(const Dot11Data &dot11);
-        bssids_map::const_iterator find_ap(const Dot11Data &dot11);
-        void add_access_point(const std::string &ssid, const address_type &addr);
-
-        RSNHandshakeCapturer capturer;
-        pmks_map pmks;
-        bssids_map aps;
-        keys_map keys;
-    };
-    #endif // HAVE_WPA2_DECRYPTION
-
-    /**
-     * \brief Pluggable decrypter object which can be used to decrypt
-     * data on sniffing sessions.
-     * 
-     * This class holds a decrypter object and a functor, and implements
-     * a suitable operator() to be used on BaseSniffer::sniff_loop, which
-     * decrypts packets and forwards them to the given functor.
-     */
-    template<typename Functor, typename Decrypter>
-    class DecrypterProxy {
-    public:
-        /**
-         * The type of the functor object.
-         */
-        typedef Functor functor_type;
-    
-        /**
-         * The type of the decrypter object.
-         */
-        typedef Decrypter decrypter_type;
-        
-        /**
-         * \brief Constructs an object from a functor and a decrypter.
-         * \param func The functor to be used to forward decrypted 
-         * packets.
-         * \param decrypter The decrypter which will be used to decrypt
-         * packets
-         */
-        DecrypterProxy(const functor_type &func, 
-          const decrypter_type &decr = decrypter_type());
-        
-        /**
-         * \brief Retrieves a reference to the decrypter object.
-         */
-        decrypter_type &decrypter();
-        
-        /**
-         * \brief Retrieves a const reference to the decrypter object.
-         */
-        const decrypter_type &decrypter() const;
-        
-        /**
-         * \brief The operator() which decrypts packets and forwards
-         * them to the functor.
-         */
-        bool operator() (PDU &pdu);
-    private:
-        Functor functor_;
-        decrypter_type decrypter_;
-    };
-
-    /**
-     * \brief Performs RC4 encription/decryption of the given byte range,
-     * using the provided key.
-     * 
-     * The decrypted range will be copied to the OutputIterator provided.
-     * 
-     * \param start The beginning of the range.
-     * \param start The end of the range.
-     * \param key The key to be used.
-     * \param output The iterator in which to write the output.
-     */
-    template<typename ForwardIterator, typename OutputIterator>
-    void rc4(ForwardIterator start, ForwardIterator end, RC4Key &key, OutputIterator output);
-    
-    /**
-     * \brief Wrapper function to create a DecrypterProxy using a 
-     * WEPDecrypter as the Decrypter template parameter.
-     * 
-     * \param functor The functor to be forwarded to the DecrypterProxy
-     * constructor.
-     */
-    template<typename Functor>
-    DecrypterProxy<Functor, WEPDecrypter> make_wep_decrypter_proxy(const Functor &functor);
-
-    #ifdef HAVE_WPA2_DECRYPTION
-    /**
-     * \brief Wrapper function to create a DecrypterProxy using a 
-     * WPA2Decrypter as the Decrypter template parameter.
-     * 
-     * \param functor The functor to be forwarded to the DecrypterProxy
-     * constructor.
-     */
-    template<typename Functor>
-    DecrypterProxy<Functor, WPA2Decrypter> make_wpa2_decrypter_proxy(const Functor &functor) {
-        return DecrypterProxy<Functor, WPA2Decrypter>(functor);
-    }
-    #endif // HAVE_WPA2_DECRYPTION
-    
-    // Implementation section
-    
-    // DecrypterProxy
-    
-    template<typename Functor, typename Decrypter>
-    DecrypterProxy<Functor, Decrypter>::DecrypterProxy(
-      const functor_type &func, const decrypter_type& decr) 
-    : functor_(func), decrypter_(decr)
-    {
-        
-    }
-
-    template<typename Functor, typename Decrypter>
-    typename DecrypterProxy<Functor, Decrypter>::decrypter_type &
-      DecrypterProxy<Functor, Decrypter>::decrypter() 
-    {
-        return decrypter_;
-    }
-
-    template<typename Functor, typename Decrypter>
-    const typename DecrypterProxy<Functor, Decrypter>::decrypter_type &
-      DecrypterProxy<Functor, Decrypter>::decrypter() const 
-    {
-        return decrypter_;
-    }
-
-    template<typename Functor, typename Decrypter>
-    bool DecrypterProxy<Functor, Decrypter>::operator() (PDU &pdu) 
-    {
-        return decrypter_.decrypt(pdu) ? functor_(pdu) : true;
-    }
-    
-    template<typename Functor>
-    DecrypterProxy<Functor, WEPDecrypter> make_wep_decrypter_proxy(const Functor &functor)
-    {
-        return DecrypterProxy<Functor, WEPDecrypter>(functor);
-    }
-
-    // RC4 stuff
-    
-    template<typename ForwardIterator>
-    RC4Key::RC4Key(ForwardIterator start, ForwardIterator end) {
-        for(size_t i = 0; i < data_size; ++i)
-            data[i] = i;
-        size_t j = 0;
-        ForwardIterator iter = start;
-        for(size_t i = 0; i < data_size; ++i) {
-            j = (j + data[i] + *iter++) % 256;
-            if(iter == end)
-                iter = start;
-            std::swap(data[i], data[j]);
-        }
-    }
-    
-    template<typename ForwardIterator, typename OutputIterator>
-    void rc4(ForwardIterator start, ForwardIterator end, RC4Key &key, OutputIterator output) {
-        size_t i = 0, j = 0;
-        while(start != end) {
-            i = (i + 1) % RC4Key::data_size;
-            j = (j + key.data[i]) % RC4Key::data_size;
-            std::swap(key.data[i], key.data[j]);
-            *output++ = *start++ ^ key.data[(key.data[i] + key.data[j]) % RC4Key::data_size];
-        }
-    }
-}
-}
-
-#endif // TINS_CRYPTO_H

include/dhcp.h

@@ -1,492 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_DHCP_H
-#define TINS_DHCP_H
-
-
-#include <list>
-#include <vector>
-#include <string>
-#include "bootp.h"
-#include "pdu_option.h"
-#include "cxxstd.h"
-
-namespace Tins {
-    /** 
-     * \brief Class that represents the DHCP PDU.
-     *
-     * When adding options, the "End" option is not added automatically. 
-     *
-     * \sa DHCP::end
-     */
-    class DHCP : public BootP {
-    public:
-        /**
-         * This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::DHCP;
-    
-        /** 
-         * DHCP flags.
-         */
-        enum Flags {
-            DISCOVER = 1,
-            OFFER    = 2,
-            REQUEST	 = 3,
-            DECLINE  = 4,
-            ACK      = 5,
-            NAK      = 6,
-            RELEASE	 = 7,
-            INFORM   = 8
-        };
-        
-        /** 
-         * \brief DHCP options enum.
-         */
-        enum OptionTypes {
-            PAD,
-            SUBNET_MASK,
-            TIME_OFFSET,
-            ROUTERS,
-            TIME_SERVERS,
-            NAME_SERVERS,
-            DOMAIN_NAME_SERVERS,
-            LOG_SERVERS,
-            COOKIE_SERVERS,
-            LPR_SERVERS,
-            IMPRESS_SERVERS,
-            RESOURCE_LOCATION_SERVERS,
-            HOST_NAME,
-            BOOT_SIZE,
-            MERIT_DUMP,
-            DOMAIN_NAME,
-            SWAP_SERVER,
-            ROOT_PATH,
-            EXTENSIONS_PATH,
-            IP_FORWARDING,
-            NON_LOCAL_SOURCE_ROUTING,
-            POLICY_FILTER,
-            MAX_DGRAM_REASSEMBLY,
-            DEFAULT_IP_TTL,
-            PATH_MTU_AGING_TIMEOUT,
-            PATH_MTU_PLATEAU_TABLE,
-            INTERFACE_MTU,
-            ALL_SUBNETS_LOCAL,
-            BROADCAST_ADDRESS,
-            PERFORM_MASK_DISCOVERY,
-            MASK_SUPPLIER,
-            ROUTER_DISCOVERY,
-            ROUTER_SOLICITATION_ADDRESS,
-            STATIC_ROUTES,
-            TRAILER_ENCAPSULATION,
-            ARP_CACHE_TIMEOUT,
-            IEEE802_3_ENCAPSULATION,
-            DEFAULT_TCP_TTL,
-            TCP_KEEPALIVE_INTERVAL,
-            TCP_KEEPALIVE_GARBAGE,
-            NIS_DOMAIN,
-            NIS_SERVERS,
-            NTP_SERVERS,
-            VENDOR_ENCAPSULATED_OPTIONS,
-            NETBIOS_NAME_SERVERS,
-            NETBIOS_DD_SERVER,
-            NETBIOS_NODE_TYPE,
-            NETBIOS_SCOPE,
-            FONT_SERVERS,
-            X_DISPLAY_MANAGER,
-            DHCP_REQUESTED_ADDRESS,
-            DHCP_LEASE_TIME,
-            DHCP_OPTION_OVERLOAD,
-            DHCP_MESSAGE_TYPE,
-            DHCP_SERVER_IDENTIFIER,
-            DHCP_PARAMETER_REQUEST_LIST,
-            DHCP_MESSAGE,
-            DHCP_MAX_MESSAGE_SIZE,
-            DHCP_RENEWAL_TIME,
-            DHCP_REBINDING_TIME,
-            VENDOR_CLASS_IDENTIFIER,
-            DHCP_CLIENT_IDENTIFIER,
-            NWIP_DOMAIN_NAME,
-            NWIP_SUBOPTIONS,
-            USER_CLASS = 77,
-            FQDN = 81,
-            DHCP_AGENT_OPTIONS = 82,
-            SUBNET_SELECTION = 118,
-            AUTHENTICATE = 210,
-            END	= 255
-        };
-        
-        /**
-         * The DHCP option type.
-         */
-        typedef PDUOption<uint8_t, DHCP> option;
-        
-        /**
-         * The type used to store the DHCP options.
-         */
-        typedef std::list<option> options_type;
-        
-        /** 
-         * \brief Creates an instance of DHCP.
-         * 
-         * This sets the hwtype and hlen fields to match the ethernet
-         * type and length.
-         */
-        DHCP();
-        
-        /**
-         * \brief Constructs a DHCP object from a buffer.
-         * 
-         * If there is not enough size for a BootP header, or any of
-         * the TLV options contains an invalid size field, then a
-         * malformed_packet exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        DHCP(const uint8_t *buffer, uint32_t total_sz);
-        
-        /** 
-         * \brief Adds a new option to this DHCP PDU.
-         * \param opt The option to be added.
-         */
-        void add_option(const option &opt);
-        
-        #if TINS_IS_CXX11
-            /** 
-             * \brief Adds a new option to this DHCP PDU.
-             * 
-             * The option is move-constructed.
-             * 
-             * \param opt The option to be added.
-             */
-            void add_option(option &&opt) {
-                internal_add_option(opt);
-                _options.push_back(std::move(opt));
-            }
-        #endif 
-    
-        /**
-         * \brief Searchs for an option that matchs the given flag.
-         * \param opt_flag The flag to be searched.
-         * \return A pointer to the option, or 0 if it was not found.
-         */
-        const option *search_option(OptionTypes opt) const;
-        
-        /** 
-         * \brief Adds a type option to the option list.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param type The type of this DHCP PDU.
-         */
-        void type(Flags type);
-        
-        /** 
-         * \brief Adds an end option to the option list.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * The END option is not added automatically. You should explicitly
-         * add it at the end of the DHCP options for the PDU to be
-         * standard-compliant.
-         */
-        void end();
-        
-        /** 
-         * \brief Adds a server identifier option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param ip The server's IP address.
-         */
-        void server_identifier(ipaddress_type ip);
-        
-        /** 
-         * \brief Adds an IP address lease time option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param time The lease time.
-         */
-        void lease_time(uint32_t time);
-        
-        /** 
-         * \brief Adds a lease renewal time option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param time The lease renew time.
-         */
-        void renewal_time(uint32_t time);
-        
-        /** 
-         * \brief Adds a rebind time option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param time The lease rebind time.
-         */
-        void rebind_time(uint32_t time);
-        
-        /**
-         * \brief Adds a subnet mask option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param mask The subnet mask.
-         */
-        void subnet_mask(ipaddress_type mask);
-        
-        /** 
-         * \brief Adds a routers option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param routers A list of ip addresses.
-         */
-        void routers(const std::vector<ipaddress_type> &routers);
-        
-        /** 
-         * \brief Adds a domain name servers option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param dns A list of ip addresses.
-         */
-        void domain_name_servers(const std::vector<ipaddress_type> &dns);
-        
-        /** 
-         * \brief Adds a broadcast address option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param addr The broadcast address.
-         */
-        void broadcast(ipaddress_type addr);
-        
-        /** 
-         * \brief Adds a requested address option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param addr The requested address.
-         */
-        void requested_ip(ipaddress_type addr);
-        
-        /** 
-         * \brief Adds a domain name option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param name The domain name.
-         */
-        void domain_name(const std::string &name);
-
-        /** 
-         * \brief Adds a hostname option.
-         * 
-         * The new option is appended at the end of the list.
-         * 
-         * \param name The hostname.
-         */
-        void hostname(const std::string &name);
-        
-        // Option getters
-        
-        /**
-         * \brief Searchs for a type option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return uint8_t containing the type option.
-         */
-        uint8_t type() const;
-        
-        /**
-         * \brief Searchs for a server identifier option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return ipaddress_type Containing the server identifier.
-         */
-        ipaddress_type server_identifier() const;
-        
-        /**
-         * \brief Searchs for a lease time option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return uint32_t Containing the lease time.
-         */
-        uint32_t lease_time() const;
-                
-        /**
-         * \brief Searchs for a lease renewal time option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return uint32_t Containing the renewal time.
-         */
-        uint32_t renewal_time() const;
-        
-        /**
-         * \brief Searchs for a rebind time option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return uint32_t Containing the rebind time.
-         */
-        uint32_t rebind_time() const;
-        
-        /**
-         * \brief Searchs for a subnet mask option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return ipaddress_type Containing the subnet mask.
-         */
-        ipaddress_type subnet_mask() const;
-        
-        /**
-         * \brief Searchs for a routers option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return std::vector<ipaddress_type> Containing the routers 
-         * option data.
-         */
-        std::vector<ipaddress_type> routers() const;
-        
-        /**
-         * \brief Searchs for a dns option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return std::list<ipaddress_type> Contanining the DNS servers
-         * provided.
-         */
-        std::vector<ipaddress_type> domain_name_servers() const; 
-        
-        /**
-         * \brief Searchs for a broadcast option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return ipaddress_type Containing the broadcast address.
-         */
-        ipaddress_type broadcast() const;
-        
-        /**
-         * \brief Searchs for a requested option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return ipaddress_type Containing the requested IP address.
-         */
-        ipaddress_type requested_ip() const;
-        
-        /**
-         * \brief Searchs for a domain name option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return std::string Containing the domain name.
-         */
-        std::string domain_name() const;
-
-        /**
-         * \brief Searchs for a hostname option.
-         * 
-         * If the option is not found, an option_not_found exception
-         * is thrown.
-         * 
-         * \return std::string Containing the hostname.
-         */
-        std::string hostname() const;
-        
-        /** 
-         * \brief Getter for the options list.
-         * \return The option list.
-         */
-        const options_type options() const { return _options; }
-        
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return pdu_flag; }
-        
-        /** 
-         * \brief Getter for the header size.
-         * \return Returns the BOOTP header size.
-         * \sa PDU::header_size
-         */ 
-        uint32_t header_size() const;
-        
-        /**
-         * \sa PDU::clone
-         */
-        DHCP *clone() const {
-            return new DHCP(*this);
-        }
-    private:
-        static const uint32_t MAX_DHCP_SIZE;
-      
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-
-        template<class T> 
-        T search_and_convert(OptionTypes opt) const {
-            const option *option = search_option(opt);
-            if(!option)
-                throw option_not_found();
-            return option->to<T>();
-        }
-        
-        void internal_add_option(const option &opt);
-        serialization_type serialize_list(const std::vector<ipaddress_type> &ip_list);
-        
-        options_type _options;
-        uint32_t _size;
-    };
-}
-
-#endif // TINS_DHCP_H

include/dns.h

@@ -1,672 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_DNS_H
-#define TINS_DNS_H
-
-#include <stdint.h>
-#include <list>
-#include <vector>
-#include <cstring>
-#include <string>
-#include <map>
-#include "macros.h"
-#include "pdu.h"
-#include "endianness.h"
-
-namespace Tins {
-    class IPv4Address;
-    class IPv6Address;
-    
-    /**
-     * \class DNS
-     * \brief Represents a DNS PDU.
-     */
-    class DNS : public PDU {
-    public:
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::DNS;
-        
-        /**
-         * The DNS type.
-         */
-        enum QRType {
-            QUERY = 0,
-            RESPONSE = 1
-        };
-        
-        /**
-         * \brief Query types enum.
-         */
-        enum QueryType {
-            A = 1,
-            NS,
-            MD,
-            MF,
-            CNAME,
-            SOA,
-            MB,
-            MG,
-            MR,
-            NULL_R,
-            WKS,
-            PTR,
-            HINFO,
-            MINFO,
-            MX,
-            TXT,
-            RP,
-            AFSDB,
-            X25,
-            ISDN,
-            RT,
-            NSAP,
-            NSAP_PTR,
-            SIG,
-            KEY,
-            PX,
-            GPOS,
-            AAAA,
-            LOC,
-            NXT,
-            EID,
-            NIMLOC,
-            SRV,
-            ATMA,
-            NAPTR,
-            KX,
-            CERT,
-            A6,
-            DNAM,
-            SINK,
-            OPT,
-            APL,
-            DS,
-            SSHFP,
-            IPSECKEY,
-            RRSIG,
-            NSEC,
-            DNSKEY,
-            DHCID,
-            NSEC3,
-            NSEC3PARAM
-        };
-        
-        enum QueryClass {
-            IN = 1,
-            CH = 3,
-            HS = 4,
-            ANY = 255
-        };
-        
-        /**
-         * \brief Struct that represent DNS queries.
-         */
-        class Query {
-        public:
-            /**
-             * \brief Constructs a DNS query.
-             * 
-             * \param nm The name of the domain being resolved.
-             * \param tp The query type.
-             * \param cl The query class.
-             */
-            Query(const std::string &nm, QueryType tp, QueryClass cl) 
-            : name_(nm), type_(tp), qclass_(cl) {}
-            
-            /**
-             * \brief Default constructs this Query.
-             */
-            Query() : type_(), qclass_() {}
-            
-            /**
-             * \brief Setter for the name field.
-             * 
-             * \param nm The name to be set.
-             */
-            void dname(const std::string &nm) {
-                name_ = nm;
-            }
-            
-            /**
-             * \brief Setter for the query type field.
-             * 
-             * \param tp The query type to be set.
-             */
-            void type(QueryType tp) {
-                type_ = tp;
-            }
-            
-            /**
-             * \brief Setter for the query class field.
-             * 
-             * \param cl The query class to be set.
-             */
-            void query_class(QueryClass cl) {
-                qclass_ = cl;
-            }
-            
-            /**
-             * \brief Getter for the name field.
-             */
-            const std::string &dname() const { return name_; }
-            
-            /**
-             * \brief Getter for the query type field.
-             */
-            QueryType type() const { return type_; }
-            
-            /**
-             * \brief Getter for the query class field.
-             */
-            QueryClass query_class() const { return qclass_; }
-        private:
-            std::string name_;
-            QueryType type_;
-            QueryClass qclass_;
-        };
-        
-        /**
-         * \brief Struct that represent DNS resource records.
-         */
-        class Resource {
-        public:
-            /**
-             * Constructs a Resource object.
-             *
-             * \param dname The domain name for which this records 
-             * provides an answer.
-             * \param data The resource's payload.
-             * \param type The type of this record.
-             * \param rclass The class of this record.
-             * \param ttl The time-to-live of this record.
-             */
-            Resource(const std::string &dname, const std::string &data, 
-              uint16_t type, uint16_t rclass, uint32_t ttl) 
-            : dname_(dname), data_(data), type_(type), qclass_(rclass), ttl_(ttl) {}
-            
-            Resource() : type_(), qclass_(), ttl_() {}
-            
-            /**
-             * \brief Getter for the domain name field.
-             * 
-             * This returns the domain name for which this record 
-             * provides an answer.
-             */
-            const std::string &dname() const { return dname_; }
-            
-            /**
-             * Getter for the data field. 
-             */
-            const std::string &data() const { return data_; }
-            
-            /**
-             * Getter for the query type field.
-             */
-            uint16_t type() const { return type_; }
-            
-            /**
-             * Getter for the query class field.
-             */
-            uint16_t query_class() const { return qclass_; }
-            
-            /**
-             * Getter for the type field.
-             */
-            uint32_t ttl() const { return ttl_; }
-
-            /**
-             * Setter for the domain name field.
-             */
-            void dname(const std::string &data) {
-                dname_ = data;
-            }
-
-            /**
-             * \brief Setter for the data field.
-             *
-             * The data will be encoded properly by the DNS class before
-             * being added to this packet. That means that if the type is
-             * A or AAAA, it will be properly encoded as an IPv4 or
-             * IPv6 address. 
-             * 
-             * The same happens for records that contain domain names,
-             * such as NS or CNAME. This data will be encoded using 
-             * DNS domain name encoding.
-             */
-            void data(const std::string &data) {
-                data_ = data;
-            }
-
-            /**
-             * Setter for the type field.
-             */
-            void type(uint16_t data) {
-                type_ = data;
-            }
-
-            /**
-             * Setter for the class field.
-             */
-            void query_class(uint16_t data) {
-                qclass_ = data;
-            }
-
-            /**
-             * Setter for the time-to-live field.
-             */
-            void ttl(uint16_t data) {
-                ttl_ = data;
-            }
-        private:
-            std::string dname_, data_;
-            uint16_t type_, qclass_;
-            uint32_t ttl_;
-        };
-        
-        typedef std::list<Query> queries_type;
-        typedef std::list<Resource> resources_type;
-        typedef IPv4Address address_type;
-        typedef IPv6Address address_v6_type;
-        
-        /**
-         * \brief Default constructor.
-         * 
-         * This constructor initializes every field to 0.
-         */
-        DNS();
-        
-        /**
-         * \brief Constructs a DNS object from a buffer.
-         * 
-         * If there's not enough size for the DNS header, or any of the
-         * records are malformed, a malformed_packet is be thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be 
-         * constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        DNS(const uint8_t *buffer, uint32_t total_sz);
-        
-        // Getters
-        
-        /**
-         * \brief Setter for the id field.
-         * 
-         * \return uint16_t containing the value of the id field.
-         */
-        uint16_t id() const { return Endian::be_to_host(dns.id); }
-        
-        /**
-         * \brief Setter for the query response field.
-         * 
-         * \return QRType containing the value of the query response
-         * field.
-         */
-        QRType type() const { return static_cast<QRType>(dns.qr); }
-        
-        /**
-         * \brief Setter for the opcode field.
-         * 
-         * \return uint8_t containing the value of the opcode field.
-         */
-        uint8_t opcode() const { return dns.opcode; }
-        
-        /**
-         * \brief Setter for the authoritative answer field.
-         * 
-         * \return uint8_t containing the value of the authoritative 
-         * answer field.
-         */
-        uint8_t authoritative_answer() const { return dns.aa; }
-        
-        /**
-         * \brief Setter for the truncated field.
-         * 
-         * \return uint8_t containing the value of the truncated field.
-         */
-        uint8_t truncated() const { return dns.tc; }
-        
-        /**
-         * \brief Setter for the recursion desired field.
-         * 
-         * \return uint8_t containing the value of the recursion
-         * desired field.
-         */
-        uint8_t recursion_desired() const { return dns.rd; }
-        
-        /**
-         * \brief Setter for the recursion available field.
-         * 
-         * \return uint8_t containing the value of the recursion
-         * available field.
-         */
-        uint8_t recursion_available() const { return dns.ra; }
-        
-        /**
-         * \brief Setter for the z desired field.
-         * 
-         * \return uint8_t containing the value of the z field.
-         */
-        uint8_t z() const { return dns.z; }
-        
-        /**
-         * \brief Setter for the authenticated data field.
-         * 
-         * \return uint8_t containing the value of the authenticated
-         * data field.
-         */
-        uint8_t authenticated_data() const { return dns.ad; }
-        
-        /**
-         * \brief Setter for the checking disabled field.
-         * 
-         * \return uint8_t containing the value of the checking 
-         * disabled field.
-         */
-        uint8_t checking_disabled() const { return dns.cd; }
-        
-        /**
-         * \brief Setter for the rcode field.
-         * 
-         * \return uint8_t containing the value of the rcode field.
-         */
-        uint8_t rcode() const { return dns.rcode; }
-        
-        /**
-         * \brief Setter for the questions field.
-         * 
-         * \return uint16_t containing the value of the questions field.
-         */
-        uint16_t questions_count() const { return Endian::be_to_host(dns.questions); }
-        
-        /**
-         * \brief Setter for the answers field.
-         * 
-         * \return uint16_t containing the value of the answers field.
-         */
-        uint16_t answers_count() const { return Endian::be_to_host(dns.answers); }
-        
-        /**
-         * \brief Setter for the authority field.
-         * 
-         * \return uint16_t containing the value of the authority field.
-         */
-        uint16_t authority_count() const { return Endian::be_to_host(dns.authority); }
-        
-        /**
-         * \brief Setter for the additional field.
-         * 
-         * \return uint16_t containing the value of the additional field.
-         */
-        uint16_t additional_count() const { return Endian::be_to_host(dns.additional); }
-
-        /**
-         * \brief Getter for the PDU's type.
-         *
-         * \return Returns the PDUType corresponding to the PDU.
-         */
-        PDUType pdu_type() const { return PDU::DNS; }
-        
-        /** 
-         * \brief The header's size
-         */
-        uint32_t header_size() const;
-
-        // Setters
-         
-        /**
-         * \brief Setter for the id field.
-         * 
-         * \param new_id The new id to be set.
-         */
-        void id(uint16_t new_id);
-        
-        /**
-         * \brief Setter for the query response field.
-         * 
-         * \param new_qr The new qr to be set.
-         */
-        void type(QRType new_qr);
-        
-        /**
-         * \brief Setter for the opcode field.
-         * 
-         * \param new_opcode The new opcode to be set.
-         */
-        void opcode(uint8_t new_opcode);
-        
-        /**
-         * \brief Setter for the authoritative answer field.
-         * 
-         * \param new_aa The new authoritative answer field value to 
-         * be set.
-         */
-        void authoritative_answer(uint8_t new_aa);
-        
-        /**
-         * \brief Setter for the truncated field.
-         * 
-         * \param new_tc The new truncated field value to 
-         * be set.
-         */
-        void truncated(uint8_t new_tc);
-        
-        /**
-         * \brief Setter for the recursion desired field.
-         * 
-         * \param new_rd The new recursion desired value to 
-         * be set.
-         */
-        void recursion_desired(uint8_t new_rd);
-        
-        /**
-         * \brief Setter for the recursion available field.
-         * 
-         * \param new_ra The new recursion available value to 
-         * be set.
-         */
-        void recursion_available(uint8_t new_ra);
-        
-        /**
-         * \brief Setter for the z(reserved) field.
-         * 
-         * \param new_z The new z value to be set.
-         */
-        void z(uint8_t new_z);
-        
-        /**
-         * \brief Setter for the authenticated data field.
-         * 
-         * \param new_ad The new authenticated data value to 
-         * be set.
-         */
-        void authenticated_data(uint8_t new_ad);
-        
-        /**
-         * \brief Setter for the checking disabled field.
-         * 
-         * \param new_z The new checking disabled value to be set.
-         */
-        void checking_disabled(uint8_t new_cd);
-        
-        /**
-         * \brief Setter for the rcode field.
-         * 
-         * \param new_rcode The new rcode value to be set.
-         */
-        void rcode(uint8_t new_rcode);
-        
-        // Methods
-        
-        /**
-         * \brief Add a query to perform.
-         * 
-         * \param query The query to be added.
-         */
-        void add_query(const Query &query);
-        
-        /**
-         * \brief Add an answer resource record.
-         * 
-         * \param resource The resource to be added.
-         */
-        void add_answer(const Resource &resource);
-
-        /**
-         * \brief Add an authority resource record.
-         * 
-         * \param resource The resource to be added.
-         */
-        void add_authority(const Resource &resource);
-        
-        /**
-         * \brief Add an additional resource record.
-         * 
-         * \param resource The resource to be added.
-         */
-        void add_additional(const Resource &resource);
-        
-        /**
-         * \brief Getter for this PDU's DNS queries.
-         * 
-         * \return The query records in this PDU.
-         */
-        queries_type queries() const;
-        
-        /**
-         * \brief Getter for this PDU's DNS answers
-         * 
-         * \return The answer records in this PDU.
-         */
-        resources_type answers() const;
-
-        /**
-         * \brief Getter for this PDU's DNS authority records.
-         * 
-         * \return The authority records in this PDU.
-         */
-        resources_type authority() const;
-
-        /**
-         * \brief Getter for this PDU's DNS additional records.
-         * 
-         * \return The additional records in this PDU.
-         */
-        resources_type additional() const;
-        
-        /**
-         * \brief Encodes a domain name.
-         *
-         * This processes the input domain name and returns the encoded 
-         * version. Each label in the original domain name will be 
-         * prefixed with a byte that indicates the label's length. 
-         * The null-terminator byte <b>will</b> be included in the encoded
-         * string. No compression is performed.
-         *
-         * For example, given the input "www.example.com", the output would
-         * be "\x03www\x07example\x03com\x00".
-         * 
-         * \param domain_name The domain name to encode.
-         * \return The encoded domain name.
-         */
-        static std::string encode_domain_name(const std::string &domain_name);
-
-        /** 
-         * \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * \sa PDU::matches_response
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        bool matches_response(const uint8_t *ptr, uint32_t total_sz) const;
-        
-        /**
-         * \sa PDU::clone
-         */
-        DNS *clone() const {
-            return new DNS(*this);
-        }
-    private:
-        TINS_BEGIN_PACK
-        struct dnshdr {
-            uint16_t id;
-            #if TINS_IS_LITTLE_ENDIAN
-                uint16_t 
-                    rd:1,
-                    tc:1,
-                    aa:1,
-                    opcode:4,
-                    qr:1,
-                    rcode:4,
-                    cd:1,
-                    ad:1,
-                    z:1,
-                    ra:1;
-            #elif TINS_IS_BIG_ENDIAN
-                uint16_t 
-                    qr:1,
-                    opcode:4,
-                    aa:1,
-                    tc:1,
-                    rd:1,
-                    ra:1,
-                    z:1,
-                    ad:1,
-                    cd:1,
-                    rcode:4;
-            #endif
-            uint16_t questions, answers,
-                     authority, additional;
-        } TINS_END_PACK;
-        
-        typedef std::list<Query> QueriesType;
-        typedef std::vector<std::pair<uint32_t*, uint32_t> > sections_type;
-        
-        const uint8_t* compose_name(const uint8_t *ptr, char *out_ptr) const;
-        void convert_records(const uint8_t *ptr, const uint8_t *end, resources_type &res) const;
-        const uint8_t* find_section_end(const uint8_t *ptr, const uint32_t num_records) const;
-        const uint8_t* find_dname_end(const uint8_t *ptr) const;
-        void update_records(uint32_t &section_start, uint32_t num_records, uint32_t threshold, uint32_t offset);
-        uint8_t *update_dname(uint8_t *ptr, uint32_t threshold, uint32_t offset);
-        static void inline_convert_v4(uint32_t value, char *output);
-        static bool contains_dname(uint16_t type);
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-        void add_record(const Resource &resource, const sections_type &sections);
-        
-        dnshdr dns;
-        byte_array records_data;
-        uint32_t answers_idx, authority_idx, additional_idx;
-    };
-}
-
-#endif // TINS_DNS_H
-

include/dot11/CMakeLists.txt

@@ -1,6 +0,0 @@
-FILE(GLOB INCLUDE_FILES "*.h")
-INSTALL(
-    FILES ${INCLUDE_FILES} 
-    DESTINATION include/tins/dot11
-    COMPONENT Headers
-)

include/dot11/dot11_beacon.h

@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */    
-
-#include "../config.h"
-
-#if !defined(TINS_DOT11_DOT11_BEACON_H) && defined(HAVE_DOT11)
-#define TINS_DOT11_DOT11_BEACON_H
-
-#include "../dot11/dot11_mgmt.h"
-
-namespace Tins {
-    /**
-     * \brief Class representing an 802.11 Beacon.
-     *
-     */
-    class Dot11Beacon : public Dot11ManagementFrame {
-    public:
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::DOT11_BEACON;
-
-        /**
-         * \brief Constructor for creating a 802.11 Beacon.
-         *
-         * Constructs a 802.11 Beacon taking destination and source 
-         * hardware address.
-         *
-         * \param dst_hw_addr The destination hardware address.
-         * \param src_hw_addr The source hardware address.
-         */
-        Dot11Beacon(const address_type &dst_hw_addr = address_type(), 
-                    const address_type &src_hw_addr = address_type());
-
-        /**
-         * \brief Constructs a Dot11Beacon object from a buffer and adds
-         * all identifiable PDUs found in the buffer as children of this 
-         * one.
-         *
-         * If the next PDU is not recognized, then a RawPDU is used.
-         * 
-         * If there is not enough size for the header in the buffer
-         * or the input data is malformed, a malformed_packet exception 
-         * is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        Dot11Beacon(const uint8_t *buffer, uint32_t total_sz);
-
-        /**
-         * \brief Getter for the timestamp field.
-         *
-         * \return The stored timestamp value.
-         */
-        uint64_t timestamp() const { return Endian::le_to_host(_body.timestamp); }
-
-        /**
-         * \brief Getter for the interval field.
-         *
-         * \return The stored interval value.
-         */
-        uint16_t interval() const { return Endian::le_to_host(_body.interval); }
-
-        /**
-         * \brief Getter for the Capabilities Information structure.
-         *
-         * \return A constant refereence to the stored Capabilities 
-         * Information field.
-         */
-        const capability_information& capabilities() const { return _body.capability; }
-
-        /**
-         * \brief Getter for the Capabilities Information.
-         *
-         * \return A refereence to the stored Capabilities Information 
-         * field.
-         */
-        capability_information& capabilities() { return _body.capability; }
-
-        /**
-         * \brief Setter for the timestamp field.
-         *
-         * \param new_timestamp The timestamp to be set.
-         */
-        void timestamp(uint64_t new_timestamp);
-
-        /**
-         * \brief Setter for the interval field.
-         *
-         * \param new_interval The interval to be set.
-         */
-        void interval(uint16_t new_interval);
-
-        /**
-         * \brief Returns the frame's header length.
-         *
-         * \return An uint32_t with the header's size.
-         * \sa PDU::header_size()
-         */
-        uint32_t header_size() const;
-
-        /**
-         * \brief Check wether this PDU matches the specified flag.
-         * \param flag The flag to match
-         * \sa PDU::matches_flag
-         */
-        bool matches_flag(PDUType flag) const {
-           return flag == pdu_flag || Dot11ManagementFrame::matches_flag(flag);
-        }
-
-        /**
-         * \brief Clones this PDU.
-         *
-         * \sa PDU::clone
-         */
-        Dot11Beacon *clone() const {
-            return new Dot11Beacon(*this);
-        }
-
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return pdu_flag; }
-    private:
-        TINS_BEGIN_PACK
-        struct BeaconBody {
-            uint64_t timestamp;
-            uint16_t interval;
-            capability_information capability;
-        } TINS_END_PACK;
-
-        uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
-
-        BeaconBody _body;
-    };
-} // namespace Tins
-
-#endif // TINS_DOT11_DOT11_BEACON_H

include/dot3.h

@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_DOT3_H
-#define TINS_DOT3_H
-
-#include <stdint.h>
-#include "macros.h"
-#include "pdu.h"
-#include "endianness.h"
-#include "hw_address.h"
-
-namespace Tins {
-
-    /** 
-     * \brief Class representing an Ethernet II PDU.
-     */
-    class Dot3 : public PDU {
-    public:
-        /**
-         * \brief The address type.
-         */
-        typedef HWAddress<6> address_type; 
-        
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::IEEE802_3;
-
-        /**
-         * \brief Represents the Dot3 broadcast address.
-         */
-        static const address_type BROADCAST;
-
-        /**
-         * \brief Constructor for creating an Dot3 PDU
-         *
-         * Constructor that builds an Dot3 PDU taking the interface name,
-         * destination's and source's MAC.
-         *
-         * \param dst_hw_addr The destination hardware address.
-         * \param src_hw_addr The source hardware address.
-         * \param child The PDU which will be set as the inner PDU.
-         */
-        Dot3(const address_type &dst_hw_addr = address_type(), 
-            const address_type &src_hw_addr = address_type());
-
-        /**
-         * \brief Constructs a Dot3 object from a buffer and adds a
-         * LLC object with the remaining data as the inner PDU.
-         * 
-         * If there is not enough size for a Dot3 header, a 
-         * malformed_packet exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        Dot3(const uint8_t *buffer, uint32_t total_sz);
-
-        /* Getters */
-        /**
-         * \brief Getter for the destination hardware address.
-         *
-         * \return The destination hardware address.
-         */
-        address_type dst_addr() const { return _eth.dst_mac; }
-
-        /**
-         * \brief Getter for the source hardware address.
-         *
-         * \return The source hardware address.
-         */
-        address_type src_addr() const { return _eth.src_mac; }
-
-        /**
-         * \brief Getter for the length field.
-         * \return The length field value.
-         */
-        uint16_t length() const { return Endian::be_to_host(_eth.length); };
-
-        /* Setters */
-
-        /**
-         * \brief Setter for the destination hardware address.
-         *
-         * \param new_dst_mac The new destination hardware address.
-         */
-        void dst_addr(const address_type &new_dst_mac);
-
-        /**
-         * \brief Setter for the source hardware address.
-         *
-         * \param new_src_mac The new source hardware address.
-         */
-        void src_addr(const address_type &new_src_mac);
-
-        /**
-         * \brief Setter for the length field.
-         *
-         * \param new_length uint16_t with the new value of the length field.
-         */
-        void length(uint16_t new_length);
-
-        /* Virtual methods */
-        /**
-         * \brief Returns the Dot3 frame's header length.
-         *
-         * \return An uint32_t with the header's size.
-         * \sa PDU::header_size()
-         */
-        uint32_t header_size() const;
-        
-        #ifndef WIN32
-        /**
-         * \sa PDU::send()
-         */
-        void send(PacketSender &sender, const NetworkInterface &iface);
-        #endif // WIN32
-
-        /** 
-         * \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * \sa PDU::matches_response
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        bool matches_response(const uint8_t *ptr, uint32_t total_sz) const;
-
-        #ifndef WIN32
-        /** 
-         * \sa PDU::recv_response
-         */
-        PDU *recv_response(PacketSender &sender, const NetworkInterface &iface);
-        #endif // WIN32
-
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return pdu_flag; }
-
-        /**
-         * \sa PDU::clone
-         */
-        Dot3 *clone() const {
-            return new Dot3(*this);
-        }
-    private:
-        /**
-         * Struct that represents the Ethernet II header
-         */
-        TINS_BEGIN_PACK
-        struct ethhdr {
-            uint8_t dst_mac[address_type::address_size];
-            uint8_t src_mac[address_type::address_size];
-            uint16_t length;
-        } TINS_END_PACK;
-
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-
-
-        ethhdr _eth;
-    };
-}
-
-
-#endif // TINS_DOT3_H

include/eapol.h

@@ -1,741 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_EAPOL_H
-#define TINS_EAPOL_H
-
-#include <stdint.h>
-#include "pdu.h"
-#include "macros.h"
-#include "small_uint.h"
-#include "endianness.h"
-
-
-namespace Tins {
-    
-    /** \cond 
-     * Forward declaration. Avoid header inclusion.
-     */
-    class RSNInformation;
-    /** \endcond */
-    
-    /**
-     * \brief Class that represents the EAP encapsulation over LAN.
-     */
-    class EAPOL : public PDU {
-    public:
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::EAPOL;
-    
-        /**
-         * The EAPOL type enum.
-         */
-        enum EAPOLTYPE {
-            RC4 = 1,
-            RSN,
-            EAPOL_WPA = 254
-        };
-        
-        /**
-         * \brief Static method to instantiate the correct EAPOL subclass 
-         * based on a raw buffer.
-         * 
-         * If no valid EAPOL type is detected, a null pointer is returned.
-         * 
-         * \sa RC4EAPOL
-         * \sa RSNEAPOL
-         * 
-         * \param buffer The buffer from which the data will be taken.
-         * \param total_sz The total size of the buffer.
-         */
-        static EAPOL *from_bytes(const uint8_t *buffer, uint32_t total_sz);
-        
-        /* Getters */
-        
-        /**
-         * \brief Getter for the version field.
-         * \return The version field.
-         */
-        uint8_t version() const { return _header.version; }
-        
-        /**
-         * \brief Getter for the packet type field.
-         * \return The packet type field.
-         */
-        uint8_t packet_type() const { return _header.packet_type; }
-        
-        /**
-         * \brief Getter for the length field.
-         * \return The length field.
-         */
-        uint16_t length() const { return Endian::be_to_host(_header.length); }
-        
-        /**
-         * \brief Getter for the type field.
-         * \return The type field.
-         */
-        uint8_t type() const { return _header.type; }
-        
-        /* Setters */
-        
-        /**
-         * \brief Sets the version field.
-         * \param new_version The new version to be set.
-         */
-        void version(uint8_t new_version);
-        
-        /**
-         * \brief Sets the packet type field.
-         * \param new_ptype The new packet type to be set.
-         */
-        void packet_type(uint8_t new_ptype);
-        
-        /**
-         * \brief Sets the length field.
-         * \param new_length The new length to be set.
-         */
-        void length(uint16_t new_length);
-        
-        /**
-         * \brief Sets the type field.
-         * \param new_type The new type to be set.
-         */
-        void type(uint8_t new_type);
-        
-        /**
-         * \brief Getter for the PDU's type.
-         * \return Returns the PDUType corresponding to the PDU.
-         */
-        PDUType pdu_type() const { return PDU::EAPOL; }
-    protected:
-        /**
-         * \brief Protected constructor that sets the packet_type and type fields.
-         */
-        EAPOL(uint8_t packet_type, EAPOLTYPE type);
-        
-        /**
-         * \brief Constructor which creates an EAPOL object from a buffer.
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        EAPOL(const uint8_t *buffer, uint32_t total_sz);
-        
-        TINS_BEGIN_PACK
-        struct eapolhdr {
-            uint8_t version, packet_type;
-            uint16_t length;
-            uint8_t type;
-        } TINS_END_PACK;
-        
-        /**
-         * \brief Virtual method which should serialize the subclass specific
-         * body and save it in a byte array.
-         * 
-         * \param buffer The pointer in which to save the serialization.
-         * \param total_sz The total size of the buffer.
-         */
-        virtual void write_body(uint8_t *buffer, uint32_t total_sz) = 0;
-    private:
-        /** 
-         * \brief Serialices this EAPOL PDU.
-         * \param buffer The buffer in which the PDU will be serialized.
-         * \param total_sz The size available in the buffer.
-         * \param parent The PDU that's one level below this one on the stack.
-         */
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-    
-        eapolhdr _header;
-    };
-    
-    
-    
-    /**
-     * \brief Class that represents the RC4 EAPOL PDU.
-     */
-    class RC4EAPOL : public EAPOL {
-    public:
-        /**
-         * The type used to store the key.
-         */
-        typedef std::vector<uint8_t> key_type;
-    
-        /**
-         * This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::RC4EAPOL;
-        
-        /**
-         * The length of the key IV field
-         */
-        static const size_t key_iv_size = 16;
-        
-        /**
-         * The length of the key sign field
-         */
-        static const size_t key_sign_size = 16;
-    
-        /**
-         * \brief Default constructor.
-         */
-        RC4EAPOL();
-        
-        /**
-         * \brief Constructs a RC4EAPOL object from a buffer.
-         * 
-         * If there is not enough size for a RC4EAPOL header in the 
-         * buffer, a malformed_packet exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        RC4EAPOL(const uint8_t *buffer, uint32_t total_sz);
-        
-        /* Getters */
-        
-        /**
-         * \brief Getter for the key length field.
-         * \return The key length field.
-         */
-        uint16_t key_length() const { return Endian::be_to_host(_header.key_length); }
-        
-        /**
-         * \brief Getter for the replay counter field.
-         * \return The replay counter field.
-         */
-        uint64_t replay_counter() const { return Endian::be_to_host(_header.replay_counter); }
-        
-        /**
-         * \brief Getter for the key IV field.
-         * \return The key IV field.
-         */
-        const uint8_t *key_iv() const { return _header.key_iv; }
-        
-        /**
-         * \brief Getter for the key flag field.
-         * \return The key flag field.
-         */
-        small_uint<1> key_flag() const { return _header.key_flag; }
-        
-        /**
-         * \brief Getter for the key index field.
-         * \return The key index field.
-         */
-        small_uint<7> key_index() const { return _header.key_index; }
-        
-        /**
-         * \brief Getter for the key signature field.
-         * \return The key signature field.
-         */
-        const uint8_t *key_sign() const { return _header.key_sign; }
-        
-        /**
-         * \brief Getter for the key field.
-         * \return The key field.
-         */
-        const key_type &key() const { return _key; }
-        
-        /* Setters */
-        
-        /**
-         * \brief Sets the key length field.
-         * \param new_key_length The new key length to be set.
-         */
-        void key_length(uint16_t new_key_length);
-        
-        /**
-         * \brief Sets the replay counter field.
-         * \param new_replay_counter The new replay counter to be set.
-         */
-        void replay_counter(uint64_t new_replay_counter);
-        
-        /**
-         * \brief Sets the key IV field.
-         * \param new_key_iv The new key IV to be set.
-         */
-        void key_iv(const uint8_t *new_key_iv);
-        
-        /**
-         * \brief Sets the key flag field.
-         * \param new_key_flag The new key flag to be set.
-         */
-        void key_flag(small_uint<1> new_key_flag);
-        
-        /**
-         * \brief Sets the key index field.
-         * \param new_key_index The new key index to be set.
-         */
-        void key_index(small_uint<7> new_key_index);
-        
-        /**
-         * \brief Sets the key signature field.
-         * \param new_key_sign The new key signature to be set.
-         */
-        void key_sign(const uint8_t *new_key_sign);
-        
-        /**
-         * \brief Sets the key field.
-         * \param new_key The new key to be set.
-         */
-        void key(const key_type &new_key);
-        
-        /* Virtual method override. */
-        
-        /**
-         * \brief Returns the header size.
-         *
-         * This metod overrides PDU::header_size. This size includes the
-         * payload and options size.
-         *
-         * \sa PDU::header_size
-         */
-        uint32_t header_size() const;
-        
-        /**
-         * \brief Getter for the PDU's type.
-         * \return Returns the PDUType corresponding to the PDU.
-         */
-        PDUType pdu_type() const { return PDU::RC4EAPOL; }
-        
-        /**
-         * \brief Check wether this PDU matches the specified flag.
-         * \param flag The flag to match
-         * \sa PDU::matches_flag
-         */
-        bool matches_flag(PDUType flag) const {
-           return flag == PDU::RC4EAPOL || EAPOL::matches_flag(flag);
-        }
-        
-        /**
-         * \brief Clones this PDU.
-         * 
-         * \sa PDU::clone
-         */
-        RC4EAPOL *clone() const {
-            return new RC4EAPOL(*this);
-        }
-    private:
-        TINS_BEGIN_PACK
-        struct rc4hdr {
-            uint16_t key_length;
-            uint64_t replay_counter;
-            uint8_t key_iv[key_iv_size];
-            uint8_t key_index:7,
-                    key_flag:1;
-            uint8_t key_sign[16];
-        } TINS_END_PACK;
-        
-        void write_body(uint8_t *buffer, uint32_t total_sz);
-        
-        
-        key_type _key;
-        rc4hdr _header;
-    };
-    
-    
-    /**
-     * \brief Class that represents the RSN EAPOL PDU.
-     */
-    class RSNEAPOL : public EAPOL {
-    public:
-        /**
-         * The type used to store the key.
-         */
-        typedef std::vector<uint8_t> key_type;
-    
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::RSNEAPOL;
-        
-        /**
-         * The length of the key IV field
-         */
-        static const size_t key_iv_size = 16;
-        
-        /**
-         * The length of the nonce field
-         */
-        static const size_t nonce_size = 32;
-    
-        /**
-         * The length of the mic field
-         */
-        static const size_t mic_size = 16;
-        
-        /**
-         * The length of the rsc field
-         */
-        static const size_t rsc_size = 8;
-        
-        /**
-         * The length of the id field
-         */
-        static const size_t id_size = 8;
-        
-        /**
-         * \brief Creates an instance of RSNEAPOL.
-         */
-        RSNEAPOL();
-        
-        /**
-         * \brief Constructs a RSNEAPOL object from a buffer.
-         * 
-         * If there is not enough size for the RSNEAPOL header, a
-         * malformed_packet exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        RSNEAPOL(const uint8_t *buffer, uint32_t total_sz);
-        
-        /* Getters */
-        
-        /**
-         * \brief Getter for the key length field.
-         * \return The key length field.
-         */
-        uint16_t key_length() const { return Endian::be_to_host(_header.key_length); }
-        
-        /**
-         * \brief Getter for the replay counter field.
-         * \return The replay counter field.
-         */
-        uint64_t replay_counter() const { return Endian::be_to_host(_header.replay_counter); }
-        
-        /**
-         * \brief Getter for the key IV field.
-         * \return The key IV field.
-         */
-        const uint8_t *key_iv() const { return _header.key_iv; }
-        
-        /**
-         * \brief Getter for the nonce field.
-         * \return The nonce field.
-         */
-        const uint8_t *nonce() const { return _header.nonce; }
-        
-        /**
-         * \brief Getter for the rsc field.
-         * \return The rsc field.
-         */
-        const uint8_t *rsc() const { return _header.rsc; }
-        
-        /**
-         * \brief Getter for the id field.
-         * \return The id field.
-         */
-        const uint8_t *id() const { return _header.id; }
-        
-        /**
-         * \brief Getter for the mic field.
-         * \return The mic field.
-         */
-        const uint8_t *mic() const { return _header.mic; }
-        
-        /**
-         * \brief Getter for the wpa length field.
-         * \return The wpa length field.
-         */
-        uint16_t wpa_length() const { return Endian::be_to_host(_header.wpa_length); }
-        
-        /**
-         * \brief Getter for the key field.
-         * \return The key field.
-         */
-        const key_type &key() const { return _key; }
-        
-        /**
-         * \brief Getter for the key mic field.
-         * \return 1 if this EAPOL PDU contains a valid MIC, 0 otherwise.
-         */
-        small_uint<1> key_mic() const { return _header.key_mic; };
-
-        /**
-         * \brief Getter for the secure field.
-         * \return The secure field.
-         */
-        small_uint<1> secure() const { return _header.secure; };
-
-        /**
-         * \brief Getter for the error field.
-         * \return The error field.
-         */
-        small_uint<1> error() const { return _header.error; };
-
-        /**
-         * \brief Getter for the request field.
-         * \return The request field.
-         */
-        small_uint<1> request() const { return _header.request; };
-
-        /**
-         * \brief Getter for the encrypted field.
-         * \return The encrypted field.
-         */
-        small_uint<1> encrypted() const { return _header.encrypted; };
-
-        /**
-         * \brief Getter for the key descriptor field.
-         * \return The key descriptor field.
-         */
-        small_uint<3> key_descriptor() const { return _header.key_descriptor; };
-
-        /**
-         * \brief Getter for the key type field.
-         * 
-         * \return 1 if this is a pairwise key, 0 otherwise.
-         */
-        small_uint<1> key_t() const { return _header.key_t; };
-
-        /**
-         * \brief Getter for the key_index field.
-         * \return The key_index field.
-         */
-        small_uint<2> key_index() const { return _header.key_index; };
-
-        /**
-         * \brief Getter for the install field.
-         * \return The install field.
-         */
-        small_uint<1> install() const { return _header.install; };
-
-        /**
-         * \brief Getter for the key_ack field.
-         * \return The key_ack field.
-         */
-        small_uint<1> key_ack() const { return _header.key_ack; };
-        
-        /**
-         * \brief Returns the header size.
-         *
-         * This metod overrides PDU::header_size. This size includes the
-         * payload and options size.
-         *
-         * \sa PDU::header_size
-         */
-        uint32_t header_size() const;
-        
-        /* Setters */
-        
-        /**
-         * \brief Sets the key length field.
-         * \param new_key_length The new key length to be set.
-         */
-        void key_length(uint16_t new_key_length);
-        
-        /**
-         * \brief Sets the replay counter field.
-         * \param new_replay_counter The new replay counter to be set.
-         */
-        void replay_counter(uint64_t new_replay_counter);
-        
-        /**
-         * \brief Sets the key IV field.
-         * \param new_key_iv The new key IV to be set.
-         */
-        void key_iv(const uint8_t *new_key_iv);
-        
-        /**
-         * \brief Sets the nonce field.
-         * 
-         * This method sets the nonce field. This field is 32 bytes long,
-         * therefore the input buffer should be at least that length.
-         * \param new_nonce The new nonce to be set.
-         */
-        void nonce(const uint8_t *new_nonce);
-        
-        /**
-         * \brief Sets the rsc field.
-         * \param new_rsc The new rsc to be set.
-         */
-        void rsc(const uint8_t *new_rsc);
-        
-        /**
-         * \brief Sets the id field.
-         * \param new_id The new id to be set.
-         */
-        void id(const uint8_t *new_id);
-        
-        /**
-         * \brief Sets the mic field.
-         * 
-         * This method sets the mic field. This field is 16 bytes long,
-         * therefore the input buffer should be at least that length.
-         * \param new_mic The new mic to be set.
-         */
-        void mic(const uint8_t *new_mic);
-        
-        /**
-         * \brief Sets the wpa length field.
-         * \param new_wpa_length The new wpa length to be set.
-         */
-        void wpa_length(uint16_t new_wpa_length);
-        
-        /**
-         * \brief Sets the key field.
-         * \param new_key The new key to be set.
-         */
-        void key(const key_type &new_key);
-        
-        /**
-         * \brief Setter for the key_mic field.
-         * \param new_key_mic The new to be set.
-         */
-        void key_mic(small_uint<1> new_key_mic);
-
-        /**
-         * \brief Setter for the secure field.
-         * \param new_secure The new to be set.
-         */
-        void secure(small_uint<1> new_secure);
-
-        /**
-         * \brief Setter for the error field.
-         * \param new_error The new to be set.
-         */
-        void error(small_uint<1> new_error);
-
-        /**
-         * \brief Setter for the request field.
-         * \param new_request The new to be set.
-         */
-        void request(small_uint<1> new_request);
-
-        /**
-         * \brief Setter for the encrypted field.
-         * \param new_encrypted The new to be set.
-         */
-        void encrypted(small_uint<1 > new_encrypted);
-
-        /**
-         * \brief Setter for the key_descriptor field.
-         * \param new_key_descriptor The new to be set.
-         */
-        void key_descriptor(small_uint<3> new_key_descriptor);
-
-        /**
-         * \brief Setter for the key_t field.
-         * \param new_key_t The new to be set.
-         */
-        void key_t(small_uint<1> new_key_t);
-
-        /**
-         * \brief Setter for the key_index field.
-         * \param new_key_index The new to be set.
-         */
-        void key_index(small_uint<2> new_key_index);
-
-        /**
-         * \brief Setter for the install field.
-         * \param new_install The new to be set.
-         */
-        void install(small_uint<1> new_install);
-
-        /**
-         * \brief Setter for the key_ack field.
-         * \param new_key_ack The new to be set.
-         */
-        void key_ack(small_uint<1> new_key_ack);
-        
-        /**
-         * \brief Getter for the PDU's type.
-         * \return Returns the PDUType corresponding to the PDU.
-         */
-        PDUType pdu_type() const { return PDU::RSNEAPOL; }
-        
-        /**
-         * \brief Check wether this PDU matches the specified flag.
-         * \param flag The flag to match
-         * \sa PDU::matches_flag
-         */
-        bool matches_flag(PDUType flag) const {
-           return flag == PDU::RSNEAPOL || EAPOL::matches_flag(flag);
-        }
-        
-        /**
-         * \brief Clones this PDU.
-         * 
-         * \sa PDU::clone
-         */
-        RSNEAPOL *clone() const {
-            return new RSNEAPOL(*this);
-        }
-    private:
-        TINS_BEGIN_PACK
-        struct rsnhdr {
-        #if TINS_IS_LITTLE_ENDIAN
-            uint16_t key_mic:1,
-                secure:1,
-                error:1,
-                request:1,
-                encrypted:1,
-                reserved:3, 
-                key_descriptor:3,
-                key_t:1,
-                key_index:2,
-                install:1,
-                key_ack:1;       
-            uint16_t key_length;
-            uint64_t replay_counter;
-            uint8_t nonce[nonce_size], key_iv[key_iv_size];
-            uint8_t rsc[rsc_size], id[id_size];
-            uint8_t mic[mic_size];
-            uint16_t wpa_length;
-        #else
-            uint16_t reserved:3,
-                encrypted:1,
-                request:1,
-                error:1,
-                secure:1,
-                key_mic:1,
-                key_ack:1,
-                install:1,
-                key_index:2,
-                key_t:1,
-                key_descriptor:3;
-            uint16_t key_length;
-            uint64_t replay_counter;
-            uint8_t nonce[nonce_size], key_iv[key_iv_size];
-            uint8_t rsc[rsc_size], id[id_size];
-            uint8_t mic[mic_size];
-            uint16_t wpa_length;
-        #endif
-        } TINS_END_PACK;
-        
-        void write_body(uint8_t *buffer, uint32_t total_sz);
-        
-        
-        rsnhdr _header;
-        key_type _key;
-    };
-}
-
-#endif // TINS_EAPOL_H

include/endianness.h

@@ -1,237 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
- 
-#ifndef TINS_ENDIANNESS_H
-#define TINS_ENDIANNESS_H
-
-#include <stdint.h>
-#include "macros.h"
-
-#if defined(__APPLE__)
-    #include <sys/types.h>
-    #define TINS_IS_LITTLE_ENDIAN (BYTE_ORDER == LITTLE_ENDIAN)
-    #define TINS_IS_BIG_ENDIAN (BYTE_ORDER == BIG_ENDIAN)
-#elif defined(BSD)
-    #include <sys/endian.h>
-    #define TINS_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
-    #define TINS_IS_BIG_ENDIAN (_BYTE_ORDER == _BIG_ENDIAN)
-#elif defined(WIN32)
-    // Assume windows == little endian. fixme later
-    #define TINS_IS_LITTLE_ENDIAN 1
-    #define TINS_IS_BIG_ENDIAN 0
-#else
-    #include <endian.h>
-    #define TINS_IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN)
-    #define TINS_IS_BIG_ENDIAN (__BYTE_ORDER == __BIG_ENDIAN)
-#endif
-
-
-
-namespace Tins {
-namespace Endian {
-    /** 
-     * \brief "Changes" a 8-bit integral value's endianess. This is an
-     * identity function.
-     *
-     * \param data The data to convert.
-     */
-    inline uint8_t do_change_endian(uint8_t data) {
-        return data;
-    }
-    
-    /** 
-     * \brief Changes a 16-bit integral value's endianess.
-     *
-     * \param data The data to convert.
-     */
-    inline uint16_t do_change_endian(uint16_t data) {
-        return ((data & 0xff00) >> 8)  | ((data & 0x00ff) << 8);
-    }
-    
-    /**
-     * \brief Changes a 32-bit integral value's endianess.
-     *
-     * \param data The data to convert.
-     */
-    inline uint32_t do_change_endian(uint32_t data) {
-        return (((data & 0xff000000) >> 24) | ((data & 0x00ff0000) >> 8)  |
-                ((data & 0x0000ff00) << 8)  | ((data & 0x000000ff) << 24));
-    }
-    
-    /**
-     * \brief Changes a 64-bit integral value's endianess.
-     *
-     * \param data The data to convert.
-     */
-     inline uint64_t do_change_endian(uint64_t data) {
-        return (((uint64_t)(do_change_endian((uint32_t)(data & 0xffffffff))) << 32) |
-                (do_change_endian(((uint32_t)(data >> 32)))));
-     }
-     
-    /**
-     * \cond
-     */
-    
-    // Helpers to convert
-    template<typename T>
-    struct conversion_dispatch_helper {
-        static T dispatch(T data) {
-            return do_change_endian(data);
-        }
-    };
-    
-    
-    template<size_t>
-    struct conversion_dispatcher;
-    
-    template<>
-    struct conversion_dispatcher<sizeof(uint8_t)> 
-    : public conversion_dispatch_helper<uint8_t> 
-    { };
-    
-    template<>
-    struct conversion_dispatcher<sizeof(uint16_t)> 
-    : public conversion_dispatch_helper<uint16_t> 
-    { };
-    
-    template<>
-    struct conversion_dispatcher<sizeof(uint32_t)> 
-    : public conversion_dispatch_helper<uint32_t> 
-    { };
-    
-    template<>
-    struct conversion_dispatcher<sizeof(uint64_t)> 
-    : public conversion_dispatch_helper<uint64_t> 
-    { };
-    
-    /**
-     * \endcond
-     */
-    
-    /**
-     * \brief Changes an integral value's endianess.
-     * 
-     * This dispatchs to the corresponding function.
-     *
-     * \param data The data to convert.
-     */ 
-     template<typename T>
-     inline T change_endian(T data) {
-         return conversion_dispatcher<sizeof(T)>::dispatch(data);
-     }
-    
-    #if TINS_IS_LITTLE_ENDIAN
-        /** 
-         * \brief Convert any integral type to big endian.
-         *
-         * \param data The data to convert.
-         */
-        template<typename T>
-        inline T host_to_be(T data) {
-            return change_endian(data);
-        }
-         
-        /**
-         * \brief Convert any integral type to little endian.
-         *
-         * On little endian platforms, the parameter is simply returned.
-         * 
-         * \param data The data to convert.
-         */
-         template<typename T>
-         inline T host_to_le(T data) {
-             return data;
-         }
-         
-        /**
-         * \brief Convert any big endian value to the host's endianess.
-         * 
-         * \param data The data to convert.
-         */
-         template<typename T>
-         inline T be_to_host(T data) {
-             return change_endian(data);
-         }
-         
-        /**
-         * \brief Convert any little endian value to the host's endianess.
-         * 
-         * \param data The data to convert.
-         */
-         template<typename T>
-         inline T le_to_host(T data) {
-             return data;
-         }
-    #elif TINS_IS_BIG_ENDIAN
-        /** 
-         * \brief Convert any integral type to big endian.
-         *
-         * \param data The data to convert.
-         */
-        template<typename T>
-        inline T host_to_be(T data) {
-            return data;
-        }
-         
-        /**
-         * \brief Convert any integral type to little endian.
-         *
-         * On little endian platforms, the parameter is simply returned.
-         * 
-         * \param data The data to convert.
-         */
-         template<typename T>
-         inline T host_to_le(T data) {
-             return change_endian(data);
-         }
-         
-        /**
-         * \brief Convert any big endian value to the host's endianess.
-         * 
-         * \param data The data to convert.
-         */
-         template<typename T>
-         inline T be_to_host(T data) {
-             return data;
-         }
-         
-        /**
-         * \brief Convert any little endian value to the host's endianess.
-         * 
-         * \param data The data to convert.
-         */
-         template<typename T>
-         inline T le_to_host(T data) {
-             return change_endian(data);
-         }
-    #endif
-}
-}
-
-#endif // TINS_ENDIANNESS_H

include/ethernetII.h

@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_ETHERNET_II_H
-#define TINS_ETHERNET_II_H
-
-#include <stdint.h>
-#include "macros.h"
-#include "pdu.h"
-#include "endianness.h"
-#include "hw_address.h"
-
-namespace Tins {
-
-    /**
-     * \brief Class representing an Ethernet II PDU.
-     */
-    class EthernetII : public PDU {
-    public:
-        /**
-         * \brief The hardware address type.
-         */
-        typedef HWAddress<6> address_type;
-        
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::ETHERNET_II;
-
-        /**
-         * \brief Represents the ethernetII broadcast address.
-         */
-        static const address_type BROADCAST;
-
-        /**
-         * \brief Constructs an ethernet II PDU.
-         *
-         * \param dst_hw_addr address_type containing the destination's MAC.
-         * \param src_hw_addr address_type containing the source's MAC.
-         */
-        EthernetII(const address_type &dst_hw_addr = address_type(), 
-                    const address_type &src_hw_addr = address_type());
-
-        /**
-         * \brief Constructs a EthernetII object from a buffer and adds 
-         * all identifiable PDUs found in the buffer as children of 
-         * this one.
-         * 
-         * If the next PDU is not recognized, then a RawPDU is used.
-         * 
-         * If there is not enough size for a EthernetII header in the 
-         * buffer, a malformed_packet exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        EthernetII(const uint8_t *buffer, uint32_t total_sz);
-
-        /* Getters */
-        /**
-         * \brief Getter for the destination's hardware address.
-         *
-         * \return address_type containing the destination hardware 
-         * address.
-         */
-        address_type dst_addr() const { return _eth.dst_mac; }
-
-        /**
-         * \brief Getter for the source's hardware address.
-         *
-         * \return address_type containing the source hardware address.
-         */
-        address_type src_addr() const { return _eth.src_mac; }
-
-        /**
-         * \brief Getter for the payload_type
-         * \return The payload type.
-         */
-        uint16_t payload_type() const { return Endian::be_to_host(_eth.payload_type); };
-
-        /* Setters */
-
-        /**
-         * \brief Setter for the destination hardware address.
-         *
-         * \param new_dst_addr the destination hardware address to be set.
-         */
-        void dst_addr(const address_type &new_dst_addr);
-
-        /**
-         * \brief Setter for the source hardware address.
-         *
-         * \param new_src_addr the source hardware address to be set.
-         */
-        void src_addr(const address_type &new_src_addr);
-
-        /**
-         * \brief Setter for the payload type.
-         *
-         * \param new_payload_type the new value of the payload type field.
-         */
-        void payload_type(uint16_t new_payload_type);
-
-        /* Virtual methods */
-        /**
-         * \brief Returns the ethernet frame's header length.
-         *
-         * \return An uint32_t with the header's size.
-         * \sa PDU::header_size()
-         */
-        uint32_t header_size() const;
-        
-        /**
-         * \brief Returns the ethernet II frame's padding.
-         *
-         * \return An uint32_t with the padding size.
-         * \sa PDU::trailer_size()
-         */
-        uint32_t trailer_size() const;
-
-        // Windows does not support sending L2 PDUs.
-        #ifndef WIN32
-        /**
-         * \sa PDU::send()
-         */
-        void send(PacketSender &sender, const NetworkInterface &iface);
-        #endif // WIN32
-
-        /** 
-         * \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * \sa PDU::matches_response
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        bool matches_response(const uint8_t *ptr, uint32_t total_sz) const;
-
-        #ifndef WIN32
-        /** 
-         * \brief Receives a matching response for this packet.
-         *
-         * \sa PDU::recv_response
-         */
-        PDU *recv_response(PacketSender &sender, const NetworkInterface &iface);
-        #endif // WIN32
-
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return PDU::ETHERNET_II; }
-
-        /**
-         * \sa PDU::clone
-         */
-        EthernetII *clone() const {
-            return new EthernetII(*this);
-        }
-    private:
-        /**
-         * Struct that represents the Ethernet II header
-         */
-        TINS_BEGIN_PACK
-        struct ethhdr {
-            uint8_t dst_mac[address_type::address_size];
-            uint8_t src_mac[address_type::address_size];
-            uint16_t payload_type;
-        } TINS_END_PACK;
-        
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-
-        ethhdr _eth;
-    };
-
-}
-
-
-#endif // TINS_ETHERNET_II_H

include/exceptions.h

@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_EXCEPTIONS_H
-#define TINS_EXCEPTIONS_H
-
-#include <string>
-#include <stdexcept>
-
-namespace Tins {
-/**
- * \brief Exception thrown when an option is not found.
- */
-class option_not_found : public std::runtime_error {
-public:
-    option_not_found()
-    : std::runtime_error(std::string()) { }
-
-    // try to avoid allocations by doing this.
-    const char* what() const throw() {
-        return "Option not found";
-    }
-};
-
-/**
- * \brief Exception thrown when a malformed packet is parsed.
- */
-class malformed_packet : public std::runtime_error {
-public:
-    malformed_packet()
-    : std::runtime_error(std::string()) { }
-    
-    const char* what() const throw() {
-        return "Malformed packet";
-    }
-};
-
-/**
- * \brief Exception thrown when a PDU is not found when using PDU::rfind_pdu.
- */
-class pdu_not_found : public std::runtime_error {
-public:
-    pdu_not_found()
-    : std::runtime_error(std::string()) { }
-    
-    const char* what() const throw() {
-        return "PDU not found";
-    }
-};
-
-/**
- * \brief Exception thrown when PDU::send requires a valid interface,
- * but an invalid is used.
- */
-class invalid_interface : public std::runtime_error {
-public:
-    invalid_interface()
-    : std::runtime_error(std::string()) { }
-    
-    const char* what() const throw() {
-        return "Invalid interface";
-    }
-};
-
-/**
- * \brief Exception thrown when PacketSender fails to open a socket.
- */
-class socket_open_error : public std::runtime_error {
-public:
-    socket_open_error(const std::string &msg) 
-    : std::runtime_error(msg) { }
-};
-
-/**
- * \brief Exception thrown when PacketSender fails to close a socket.
- */
-class socket_close_error : public std::runtime_error {
-public:
-    socket_close_error(const std::string &msg) 
-    : std::runtime_error(msg) { }
-};
-
-/**
- * \brief Exception thrown when PacketSender fails to write on a socket.
- */
-class socket_write_error : public std::runtime_error {
-public:
-    socket_write_error(const std::string &msg) 
-    : std::runtime_error(msg) { }
-};
-
-/**
- * \brief Exception thrown when an invalid socket type is provided
- * to PacketSender.
- */
-class invalid_socket_type : public std::exception {
-public:
-    const char *what() const throw() {
-        return "The provided socket type is invalid";
-    }
-};
-
-/**
- * \brief Exception thrown when an unkown link layer PDU type is 
- * found while sniffing.
- */
-class unknown_link_type : public std::exception {
-public:
-    const char *what() const throw() {
-        return "The sniffed link layer PDU type is unknown";
-    }
-};
-
-/**
- * \brief Exception thrown when a malformed option is found.
- */
-class malformed_option : public std::exception {
-public:
-    const char *what() const throw() {
-        return "Malformed option";
-    }
-};
-
-/**
- * \brief Exception thrown when a call to tins_cast fails.
- */
-class bad_tins_cast : public std::exception {
-public:
-    const char *what() const throw() {
-        return "Bad Tins cast";
-    }
-};
-
-/**
- * \brief Exception thrown when sniffing a protocol that
- * has been disabled at compile time.
- */
-class protocol_disabled : public std::exception {
-public:
-    const char *what() const throw() {
-        return "Protocol disabled";
-    }
-};
-
-} // Tins
-
-#endif // TINS_EXCEPTIONS_H

include/handshake_capturer.h

@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "config.h"
-
-#if !defined(TINS_HANDSHAKE_CAPTURER_H)  && defined(HAVE_DOT11)
-#define TINS_HANDSHAKE_CAPTURER_H
-
-#include <vector>
-#include <map>
-#include <utility>
-#include "hw_address.h"
-#include "eapol.h"
-
-// .h
-namespace Tins {
-    /**
-     * \brief Generic EAPOL handshake.
-     *
-     * Stores both the client and supplicant addresses, as well as 
-     * all of the EAPOL packets used during the handshake.
-     */
-    template<typename T>
-    class EAPOLHandshake {
-    public:
-        typedef std::vector<T> container_type;
-        typedef HWAddress<6> address_type;
-        
-        /**
-         * \brief Default constructor.
-         */
-        EAPOLHandshake() { }
-
-        /**
-         * Constructs an EAPOLHandshake object.
-         * 
-         * \param client_address The client address.
-         * \param supplicant_address The supplicant address.
-         * \param cont The container that holds the EAPOL packets used
-         * in the handshake.
-         */
-        EAPOLHandshake(const address_type &client_address, 
-          const address_type &supplicant_address, const container_type &cont) 
-        : cl_address_(client_address), suppl_address_(supplicant_address), 
-        handshake_(cont) 
-        {
-            
-        }
-        
-        /**
-         * \return const address_type&
-         */
-        const address_type &client_address() const {
-            return cl_address_;
-        }
-        
-        /**
-         * \return const address_type&
-         */
-        const address_type &supplicant_address() const {
-            return suppl_address_;
-        }
-        
-        /**
-         * \return const container_type&
-         */
-        const container_type &handshake() const {
-            return handshake_;
-        }
-    private:
-        address_type cl_address_, suppl_address_;
-        container_type handshake_;
-    };
-    
-    /**
-     * The type used to store RSN handshakes.
-     */
-    typedef EAPOLHandshake<RSNEAPOL> RSNHandshake;
-    
-    /**
-     * Captures 802.1X RSN handshakes.
-     */
-    class RSNHandshakeCapturer {
-    public:
-        /**
-         * The type of handshakes that will be captured.
-         */
-        typedef RSNHandshake handshake_type;
-
-        /**
-         * The type in which all of the captured handshakes
-         * will be stored.
-         */
-        typedef std::vector<handshake_type> handshakes_type;
-        
-        /**
-         * \brief Processes a packet.
-         * 
-         * This will fetch the RSNEAPOL layer, if any, and store
-         * it in an intermediate storage. When a handshake is 
-         * completed, it will be stored separately. 
-         *
-         * \sa RSNHandshakeCapturer::handshakes
-         */
-        bool process_packet(const PDU &pdu);
-
-        /**
-         * \brief Retrieves the completed handshakes.
-         *
-         * This will return the handshakes that have been completed 
-         * so far. A handshake is completed when the 4-way handshake
-         * is captured.
-         *
-         * \sa RSNHandshakeCapturer::clear_handshakes
-         */
-        const handshakes_type &handshakes() const {
-            return completed_handshakes_;
-        }
-
-        /**
-         * \brief Clears the completed handshakes.
-         *
-         * Since completed handshakes are stored in a std::vector,
-         * it is advisable to remove all of them once they have been 
-         * processed.
-         */
-        void clear_handshakes() {
-            completed_handshakes_.clear();
-        }
-    private:
-        typedef handshake_type::address_type address_type;
-        typedef handshake_type::container_type eapol_list;
-        typedef std::map<std::pair<address_type, address_type>, eapol_list> handshake_map;
-    
-        bool do_insert(const handshake_map::key_type &key, const RSNEAPOL *eapol, 
-          size_t expected);
-    
-        handshake_map handshakes_;
-        handshakes_type completed_handshakes_;
-    };
-}
-
-#endif // TINS_HANDSHAKE_CAPTURER_H

include/icmp.h

@@ -1,406 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_ICMP_H
-#define TINS_ICMP_H
-
-// Windows likes to define macros with not-so-common-names, which break
-// this code
-#ifdef WIN32
-    #ifdef TIMESTAMP_REQUEST
-        #undef TIMESTAMP_REQUEST
-    #endif // TIMESTAMP_REQUEST
-
-    #ifdef TIMESTAMP_REPLY
-        #undef TIMESTAMP_REPLY
-    #endif // TIMESTAMP_REPLY
-#endif // WIN32
-
-#include "macros.h"
-#include "pdu.h"
-#include "endianness.h"
-#include "ip_address.h"
-
-namespace Tins {
-
-    /** \brief Class that represents an ICMP PDU.
-     *
-     * ICMP is the representation of the ICMP PDU. Instances of this class
-     * must be sent over a level 3 PDU, this will otherwise fail.
-     */
-    class ICMP : public PDU {
-    public:
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::ICMP;
-    
-        /**
-         * The type used to store addresses.
-         */
-        typedef IPv4Address address_type;
-
-        /** \brief ICMP flags
-         */
-        enum Flags {
-            ECHO_REPLY       = 0,
-            DEST_UNREACHABLE = 3,
-            SOURCE_QUENCH    = 4,
-            REDIRECT         = 5,
-            ECHO_REQUEST     = 8,
-            TIME_EXCEEDED    = 11,
-            PARAM_PROBLEM    = 12,
-            TIMESTAMP_REQUEST = 13,
-            TIMESTAMP_REPLY  = 14,
-            INFO_REQUEST     = 15,
-            INFO_REPLY       = 16,
-            ADDRESS_MASK_REQUEST = 17,
-            ADDRESS_MASK_REPLY = 18
-        };
-
-        /**
-         * \brief Creates an instance of ICMP.
-         *
-         * If no flag is specified, then ECHO_REQUEST will be used.
-         * \param flag The type flag which will be set.
-         */
-        ICMP(Flags flag = ECHO_REQUEST);
-
-        /**
-         * \brief Constructs an ICMP object from a buffer.
-         * 
-         * If there is not enough size for an ICMP header, a 
-         * malformed_packet exception is thrown.
-         * 
-         * Any extra data in the buffer will be stored in a RawPDU.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        ICMP(const uint8_t *buffer, uint32_t total_sz);
-        
-        /**
-         * \brief Sets the code field.
-         *
-         * \param new_code The code which will be stored in the ICMP struct.
-         */
-        void code(uint8_t new_code);
-
-        /** \brief Sets the type field.
-         *
-         * \param type The type which will be stored in the ICMP struct.
-         */
-        void type(Flags type);
-
-        /**
-         * \brief Setter for the id field.
-         *
-         * \param new_id uint16_t with the new id.
-         */
-        void id(uint16_t new_id);
-
-        /**
-         * \brief Setter for the sequence field.
-         *
-         * \param new_seq uint16_t with the new sequence.
-         */
-        void sequence(uint16_t new_seq);
-
-        /**
-         * \brief Setter for the gateway field.
-         *
-         * \param new_gw The new value for the gateway field.
-         */
-        void gateway(address_type new_gw);
-
-        /**
-         * \brief Setter for the mtu field.
-         *
-         * \param new_mtu uint16_t with the new sequence.
-         */
-        void mtu(uint16_t new_mtu);
-        
-        /**
-         * \brief Setter for the pointer field.
-         *
-         * \param new_pointer uint8_t with the new pointer.
-         */
-        void pointer(uint8_t new_pointer);
-
-        /**
-         * \brief Setter for the original timestamp field.
-         *
-         * \param new_timestamp the value to be set.
-         */
-        void original_timestamp(uint32_t new_timestamp);
-
-        /**
-         * \brief Setter for the receive timestamp field.
-         *
-         * \param new_timestamp the value to be set.
-         */
-        void receive_timestamp(uint32_t new_timestamp);
-
-        /**
-         * \brief Setter for the transmit timestamp field.
-         *
-         * \param new_timestamp the value to be set.
-         */
-        void transmit_timestamp(uint32_t new_timestamp);
-
-        /**
-         * \brief Setter for the address mask field.
-         *
-         * \param new_mask the value to be set.
-         */
-        void address_mask(address_type new_mask);
-
-        /**
-         * \brief Sets echo request flag for this PDU.
-         *
-         * \param id The identifier for this request.
-         * \param seq The sequence number for this request.
-         */
-        void set_echo_request(uint16_t id, uint16_t seq);
-
-        /**
-         * \brief Sets echo reply flag for this PDU.
-         *
-         * \param id The identifier for this request.
-         * \param seq The sequence number for this request.
-         */
-        void set_echo_reply(uint16_t id, uint16_t seq);
-
-        /**
-         * \brief Sets information request flag for this PDU.
-         *
-         * \param id The identifier for this request.
-         * \param seq The sequence number for this request.
-         */
-        void set_info_request(uint16_t id, uint16_t seq);
-
-        /**
-         * \brief Sets information reply flag for this PDU.
-         *
-         * \param id The identifier for this request.
-         * \param seq The sequence number for this request.
-         */
-        void set_info_reply(uint16_t id, uint16_t seq);
-
-        /**
-         * \brief Sets destination unreachable for this PDU.
-         */
-        void set_dest_unreachable();
-
-        /**
-         * \brief Sets time exceeded flag for this PDU.
-         *
-         * \param ttl_exceeded If true this PDU will represent a ICMP ttl
-         * exceeded, otherwise it will represent a fragment reassembly
-         * time exceeded.
-         */
-        void set_time_exceeded(bool ttl_exceeded = true);
-
-        /**
-         * \brief Sets parameter problem flag for this PDU.
-         *
-         * \param set_pointer Indicates wether a pointer to the bad octet
-         * is provided.
-         * \param bad_octet Identifies the octet in which the error was
-         * detected. If set_pointer == false, it is ignored.
-         */
-        void set_param_problem(bool set_pointer = false, uint8_t bad_octet = 0);
-
-        /**
-         * \brief Sets source quench flag for this PDU.
-         */
-        void set_source_quench();
-
-        /**
-         * \brief Sets redirect flag for this PDU.
-         *
-         * \param icode The code to be set.
-         * \param address Address of the gateway to which traffic should
-         * be sent.
-         */
-        void set_redirect(uint8_t icode, address_type address);
-
-        /**
-         * \brief Getter for the ICMP type flag.
-         *
-         * \return The type flag for this ICMP PDU.
-         */
-        Flags type() const { return (Flags)_icmp.type; }
-
-        /**
-         * \brief Getter for the ICMP code flag.
-         *
-         * \return The code flag for this ICMP PDU.
-         */
-        uint8_t code() const { return _icmp.code; }
-
-        /**
-         * \brief Getter for the checksum field.
-         *
-         * \return Returns the checksum as an unit16_t.
-         */
-        uint16_t checksum() const { return Endian::be_to_host(_icmp.check); }
-
-        /**
-         * \brief Getter for the echo id.
-         *
-         * \return Returns the echo id.
-         */
-        uint16_t id() const { return Endian::be_to_host(_icmp.un.echo.id); }
-
-        /**
-         * \brief Getter for the echo sequence number.
-         *
-         * \return Returns the echo sequence number.
-         */
-        uint16_t sequence() const { return Endian::be_to_host(_icmp.un.echo.sequence); }
-
-        /**
-         * \brief Getter for the gateway field.
-         *
-         * \return Returns the gateway field value.
-         */
-        address_type gateway() const { 
-            return address_type(Endian::be_to_host(_icmp.un.gateway)); 
-        }
-
-         /**
-          * \brief Getter for the pointer field.
-          *
-          * \return Returns the pointer field value.
-          */
-        uint8_t pointer() const { return this->_icmp.un.pointer; }
-        
-        /**
-          * \brief Getter for the mtu field.
-          *
-          * \return Returns the mtu field value.
-          */
-        uint16_t mtu() const { return Endian::be_to_host(_icmp.un.frag.mtu); }
-
-        /**
-          * \brief Getter for the original timestamp field.
-          *
-          * \return Returns the original timestamp value.
-          */
-        uint32_t original_timestamp() const { return Endian::be_to_host(_orig_timestamp_or_address_mask); }
-
-        /**
-          * \brief Getter for the receive timestamp field.
-          *
-          * \return Returns the receive timestamp value.
-          */
-        uint32_t receive_timestamp() const { return Endian::be_to_host(_recv_timestamp); }
-
-        /**
-          * \brief Getter for the transmit timestamp field.
-          *
-          * \return Returns the transmit timestamp value.
-          */
-        uint32_t transmit_timestamp() const { return Endian::be_to_host(_trans_timestamp); }
-
-        /**
-          * \brief Getter for the address mask field.
-          *
-          * \return Returns the address mask value.
-          */
-        address_type address_mask() const { 
-            return address_type(Endian::be_to_host(_orig_timestamp_or_address_mask)); 
-        }
-
-        /**
-         * \brief Returns the header size.
-         *
-         * This metod overrides PDU::header_size. This size includes the
-         * payload and options size. \sa PDU::header_size
-         */
-        uint32_t header_size() const;
-
-        /**
-         * \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * \sa PDU::matches_response
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        bool matches_response(const uint8_t *ptr, uint32_t total_sz) const;
-
-        /**
-         * \brief Getter for the PDU's type.
-         *
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return PDU::ICMP; }
-        
-        /**
-         * \sa PDU::clone
-         */
-        ICMP *clone() const {
-            return new ICMP(*this);
-        }
-    private:
-        TINS_BEGIN_PACK
-        struct icmphdr {
-            uint8_t	type;
-            uint8_t	code;
-            uint16_t check;
-            union {
-                struct {
-                    uint16_t id;
-                    uint16_t sequence;
-                } echo;
-                uint32_t gateway;
-                struct {
-                    uint16_t unused;
-                    uint16_t mtu;
-                } frag;
-                uint8_t pointer;
-            } un;
-        } TINS_END_PACK;
-
-        void checksum(uint16_t new_check);
-        
-        /** \brief Serialices this ICMP PDU.
-         * \param buffer The buffer in which the PDU will be serialized.
-         * \param total_sz The size available in the buffer.
-         * \param parent The PDU that's one level below this one on the stack.
-         */
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-
-        icmphdr _icmp;
-        uint32_t _orig_timestamp_or_address_mask, _recv_timestamp, _trans_timestamp;
-    };
-}
-
-#endif // TINS_ICMP_H

include/internals.h

@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
- 
-#ifndef TINS_INTERNALS_H
-#define TINS_INTERNALS_H
-
-#include <sstream>
-#include <string>
-#include <stdint.h>
-#include "constants.h"
-#include "pdu.h"
-#include "hw_address.h"
-
-/**
- * \cond
- */
-namespace Tins {
-class IPv4Address;
-class IPv6Address;
-
-namespace Internals {
-template<size_t n>
-class byte_array {
-public:
-    typedef uint8_t* iterator;
-    typedef const uint8_t* const_iterator;
-    
-    byte_array() {
-        std::fill(begin(), end(), 0);
-    }
-    
-    template<typename InputIterator>
-    byte_array(InputIterator start, InputIterator last) {
-        std::copy(start, last, data);
-    }
-    
-    template<typename InputIterator>
-    byte_array(InputIterator start) {
-        std::copy(start, n, data);
-    }
-
-    uint8_t &operator[](size_t i) {
-        return data[i];
-    }
-
-    uint8_t operator[](size_t i) const{
-        return data[i];
-    }
-    
-    iterator begin() {
-        return data;
-    }
-    
-    iterator end() {
-        return data + n;
-    }
-    
-    const_iterator begin() const {
-        return data;
-    }
-    
-    const_iterator end() const {
-        return data + n;
-    }
-    
-    size_t size() const {
-        return n;
-    }
-private:
-    uint8_t data[n];
-};
-
-void skip_line(std::istream &input);
-bool from_hex(const std::string &str, uint32_t &result);
-
-template<bool, typename T = void>
-struct enable_if {
-    typedef T type;
-};
-
-template<typename T>
-struct enable_if<false, T> {
-    
-};
-
-PDU *pdu_from_flag(Constants::Ethernet::e flag, const uint8_t *buffer, 
-  uint32_t size, bool rawpdu_on_no_match = true);
-PDU *pdu_from_flag(Constants::IP::e flag, const uint8_t *buffer, 
-  uint32_t size, bool rawpdu_on_no_match = true);
-PDU *pdu_from_flag(PDU::PDUType type, const uint8_t *buffer, uint32_t size);
-
-Constants::Ethernet::e pdu_flag_to_ether_type(PDU::PDUType flag);
-Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag);
-
-template<typename T>
-bool increment_buffer(T &addr) {
-    typename T::iterator it = addr.end() - 1;
-    while(it >= addr.begin() && *it == 0xff) {
-        *it = 0;
-        --it;
-    }
-    // reached end
-    if(it < addr.begin())
-        return true;
-    (*it)++;
-    return false;
-}
-
-template<typename T>
-bool decrement_buffer(T &addr) {
-    typename T::iterator it = addr.end() - 1;
-    while(it >= addr.begin() && *it == 0) {
-        *it = 0xff;
-        --it;
-    }
-    // reached end
-    if(it < addr.begin())
-        return true;
-    (*it)--;
-    return false;
-}
-
-bool increment(IPv4Address &addr);
-bool increment(IPv6Address &addr);
-bool decrement(IPv4Address &addr);
-bool decrement(IPv6Address &addr);
-template<size_t n>
-bool increment(HWAddress<n> &addr) {
-    return increment_buffer(addr);
-}
-template<size_t n>
-bool decrement(HWAddress<n> &addr) {
-    return decrement_buffer(addr);
-}
-
-IPv4Address last_address_from_mask(IPv4Address addr, IPv4Address mask);
-IPv6Address last_address_from_mask(IPv6Address addr, const IPv6Address &mask);
-template<size_t n>
-HWAddress<n> last_address_from_mask(HWAddress<n> addr, const HWAddress<n> &mask) {
-    typename HWAddress<n>::iterator addr_iter = addr.begin();
-    for(typename HWAddress<n>::const_iterator it = mask.begin(); it != mask.end(); ++it, ++addr_iter) {
-        *addr_iter = *addr_iter | ~*it;
-    }
-    return addr;
-}
-
-inline bool is_dot3(const uint8_t *ptr, size_t sz) {
-    return (sz >= 13 && ptr[12] < 8);
-}
-
-template<typename T>
-struct is_unsigned_integral {
-    static const bool value = false;
-};
-
-template<>
-struct is_unsigned_integral<uint8_t> {
-    static const bool value = true;
-};
-
-template<>
-struct is_unsigned_integral<uint16_t> {
-    static const bool value = true;
-};
-
-template<>
-struct is_unsigned_integral<uint32_t> {
-    static const bool value = true;
-};
-
-template<>
-struct is_unsigned_integral<uint64_t> {
-    static const bool value = true;
-};
-} // namespace Internals
-} // namespace Tins
-/**
- * \endcond
- */
-
-#endif

include/ip.h

@@ -1,662 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_IP_H
-#define TINS_IP_H
-
-#include <list>
-#include "pdu.h"
-#include "small_uint.h"
-#include "endianness.h"
-#include "ip_address.h"
-#include "pdu_option.h"
-#include "macros.h"
-#include "cxxstd.h"
-
-namespace Tins {
-
-    /**
-     * \brief Class that represents an IP PDU.
-     * 
-     * By default, IP PDUs are initialized, setting TTL to IP::DEFAULT_TTL,
-     * id field to 1 and version to 4. Taking this into account, users
-     * should set destination and source port and would be enough to send one.
-     */
-    class IP : public PDU {
-    public:
-        /**
-         * This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::IP;
-    
-        /**
-         * The type used to store addresses.
-         */
-        typedef IPv4Address address_type;
-
-        /**
-         * \brief Enum indicating the option's class.
-         *
-         * Enum OptionClass represents the different classes of
-         * IP Options.
-         */
-        enum OptionClass {
-            CONTROL = 0,
-            MEASUREMENT = 2
-        };
-
-        /**
-         * \brief Enum indicating the option's id number.
-         *
-         * Enum Option indicates the possible IP Options.
-         */
-        enum OptionNumber {
-            END = 0,
-            NOOP = 1,
-            SEC = 2,
-            LSSR = 3,
-            TIMESTAMP = 4,
-            EXTSEC = 5,
-            RR = 7,
-            SID = 8,
-            SSRR = 9,
-            MTUPROBE = 11,
-            MTUREPLY = 12,
-            EIP = 17,
-            TR = 18,
-            ADDEXT = 19,
-            RTRALT = 20,
-            SDB = 21,
-            DPS = 23,
-            UMP = 24,
-            QS = 25
-        };
-        
-        /**
-         * \brief The type used to represent an option's type.
-         */
-        TINS_BEGIN_PACK
-        struct option_identifier {
-        #if TINS_IS_LITTLE_ENDIAN
-            uint8_t number:5,
-                    op_class:2,
-                    copied:1;
-        #elif TINS_IS_BIG_ENDIAN
-            uint8_t copied:1,
-                    op_class:2,
-                    number:5;
-        #endif
-            /**
-             * \brief Default constructor.
-             * 
-             * Initializes every field to 0.
-             */
-            option_identifier() 
-            #if TINS_IS_LITTLE_ENDIAN
-            : number(0), op_class(0), copied(0) {}
-            #else
-            : copied(0), op_class(0), number(0) {}
-            #endif
-            
-            /**
-             * \brief Constructs this option from a single uint8_t value.
-             * 
-             * This parses the value and initializes each field with the
-             * appropriate value.
-             * 
-             * \param value The value to be parsed and used for 
-             * initialization
-             */
-            option_identifier(uint8_t value) 
-            #if TINS_IS_LITTLE_ENDIAN
-            : number(value & 0x1f), 
-              op_class((value >> 5) & 0x03), 
-              copied((value >> 7) & 0x01) {}
-            #elif TINS_IS_BIG_ENDIAN
-            : copied((value >> 7) & 0x01),
-              op_class((value >> 5) & 0x03), 
-              number(value & 0x1f) {}
-            #endif
-            
-            /**
-             * Constructor using user provided values for each field.
-             * \param number The number field value.
-             * \param op_class The option class field value.
-             * \param copied The copied field value.
-             */
-            option_identifier(OptionNumber number, OptionClass op_class,
-              small_uint<1> copied) 
-            #if TINS_IS_LITTLE_ENDIAN
-            : number(number), op_class(op_class), copied(copied) {}
-            #else
-            : copied(copied), op_class(op_class), number(number) {}
-            #endif
-            
-            /**
-             * \brief Equality operator.
-             */
-            bool operator==(const option_identifier &rhs) const {
-                return number == rhs.number && op_class == rhs.op_class && copied == rhs.copied;
-            }
-        } TINS_END_PACK;
-        
-        /**
-         * The IP options type.
-         */
-        typedef PDUOption<option_identifier, IP> option;
-
-        /**
-         * The type of the security option.
-         */
-        struct security_type {
-            uint16_t security, compartments;
-            uint16_t handling_restrictions;
-            small_uint<24> transmission_control;
-            
-            security_type(uint16_t sec = 0, uint16_t comp = 0,
-              uint16_t hand_res = 0, small_uint<24> tcc = 0)
-            : security(sec), compartments(comp), 
-              handling_restrictions(hand_res), transmission_control(tcc) 
-              {}
-            
-            static security_type from_option(const option &opt);
-        };
-        
-        /**
-         * The type of the Loose Source and Record Route
-         */
-        struct generic_route_option_type {
-            typedef std::vector<address_type> routes_type;
-            
-            uint8_t pointer;
-            routes_type routes;
-            
-            generic_route_option_type(uint8_t ptr = 0, 
-              routes_type rts = routes_type())
-            : pointer(ptr), routes(rts) {}
-            
-            static generic_route_option_type from_option(const option &opt);
-        };
-        
-        /**
-         * The type of the Loose Source and Record Route
-         */
-        typedef generic_route_option_type lsrr_type;
-        
-        /**
-         * The type of the Strict Source and Record Route
-         */
-        typedef generic_route_option_type ssrr_type;
-        
-        /**
-         * The type of the Record Route
-         */
-        typedef generic_route_option_type record_route_type;
-
-        /**
-         * The type used to store IP options.
-         */
-        typedef std::list<option> options_type;
-
-        /**
-         * \brief Constructor for building the IP PDU.
-         *
-         * Both the destination and source IP address can be supplied.
-         * By default, those fields are initialized using the IP 
-         * address 0.0.0.0.
-         *
-         * \param ip_dst The destination ip address(optional).
-         * \param ip_src The source ip address(optional).
-         */
-        IP(address_type ip_dst = address_type(), 
-            address_type ip_src = address_type());
-
-        /**
-         * \brief Constructs an IP object from a buffer and adds all 
-         * identifiable PDUs found in the buffer as children of this 
-         * one.
-         * 
-         * If there is not enough size for an IP header, a 
-         * malformed_packet exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        IP(const uint8_t *buffer, uint32_t total_sz);
-
-        /* Getters */
-
-        /**
-         * \brief Getter for the header length field.
-         *
-         * \return The number of dwords the header occupies in an uin8_t.
-         */
-        small_uint<4> head_len() const { return this->_ip.ihl; }
-
-        /**
-         * \brief Getter for the type of service field.
-         *
-         * \return The this IP PDU's type of service.
-         */
-        uint8_t tos() const { return _ip.tos; }
-
-        /**
-         * \brief Getter for the total length field.
-         *
-         * \return The total length of this IP PDU.
-         */
-        uint16_t tot_len() const { 
-            return Endian::be_to_host(_ip.tot_len); 
-        }
-
-        /**
-         * \brief Getter for the id field.
-         *
-         * \return The id for this IP PDU.
-         */
-        uint16_t id() const { return Endian::be_to_host(_ip.id); }
-
-        /**
-         * \brief Getter for the fragment offset field.
-         *
-         * \return The fragment offset for this IP PDU.
-         */
-        uint16_t frag_off() const { return Endian::be_to_host(_ip.frag_off); }
-
-        /**
-         * \brief Getter for the time to live field.
-         *
-         * \return The time to live for this IP PDU.
-         */
-        uint8_t ttl() const { return _ip.ttl; }
-
-        /**
-         * \brief Getter for the protocol field.
-         *
-         * \return The protocol for this IP PDU.
-         */
-        uint8_t protocol() const { return _ip.protocol; }
-
-        /**
-         * \brief Getter for the checksum field.
-         *
-         * \return The checksum for this IP PDU.
-         */
-        uint16_t checksum() const { return Endian::be_to_host(_ip.check); }
-
-        /**
-         * \brief Getter for the source address field.
-         *
-         * \return The source address for this IP PDU.
-         */
-        address_type src_addr() const { return address_type(_ip.saddr); }
-
-        /** 
-         * \brief Getter for the destination address field.
-         * \return The destination address for this IP PDU.
-         */
-        address_type dst_addr() const  { return address_type(_ip.daddr); }
-        
-        /** 
-         * \brief Getter for the version field.
-         * \return The version for this IP PDU.
-         */
-        small_uint<4> version() const  { return _ip.version; }
-
-        /** 
-         * \brief Getter for the IP options.
-         * \return The stored options.
-         */
-        const options_type &options() const  { return _ip_options; }
-
-        /* Setters */
-
-        /**
-         * \brief Setter for the type of service field.
-         *
-         * \param new_tos The new type of service.
-         */
-        void tos(uint8_t new_tos);
-
-        /**
-         * \brief Setter for the id field.
-         *
-         * \param new_id The new id.
-         */
-        void id(uint16_t new_id);
-
-        /**
-         * \brief Setter for the fragment offset field.
-         *
-         * \param new_frag_off The new fragment offset.
-         */
-        void frag_off(uint16_t new_frag_off);
-
-        /**
-         * \brief Setter for the time to live field.
-         *
-         * \param new_ttl The new time to live.
-         */
-        void ttl(uint8_t new_ttl);
-
-        /**
-         * \brief Setter for the protocol field.
-         *
-         * Note that this protocol will be overwritten using the 
-         * inner_pdu's protocol type during serialization unless the IP 
-         * datagram is fragmented. 
-         * 
-         * If the packet is fragmented and was originally sniffed, the
-         * original protocol type will be kept when serialized.
-         * 
-         * If this packet has been crafted manually and the inner_pdu
-         * is, for example, a RawPDU, then setting the protocol yourself
-         * is necessary.
-         * 
-         * \param new_protocol The new protocol.
-         */
-        void protocol(uint8_t new_protocol);
-
-        /**
-         * \brief Setter for the source address field.
-         *
-         * \param ip The source address to be set.
-         */
-        void src_addr(address_type ip);
-
-        /**
-         * \brief Setter for the destination address field.
-         *
-         * \param ip The destination address to be set.
-         */
-        void dst_addr(address_type ip);
-        
-        /**
-         * \brief Setter for the version field.
-         *
-         * \param ver The version field to be set.
-         */
-        void version(small_uint<4> ver);
-
-        /**
-         * \brief Adds an IP option.
-         * 
-         * The option is added after the last option in the option 
-         * fields.
-         * 
-         * \param opt The option to be added
-         */
-        void add_option(const option &opt);
-        
-        #if TINS_IS_CXX11
-            /**
-             * \brief Adds an IP option.
-             * 
-             * The option is move-constructed.
-             * 
-             * \param opt The option to be added.
-             */
-            void add_option(option &&opt) {
-                internal_add_option(opt);
-                _ip_options.push_back(std::move(opt));
-            }
-
-            /**
-             * \brief Adds an IP option.
-             * 
-             * The option is constructed from the provided parameters.
-             * 
-             * \param args The arguments to be used in the option's 
-             * constructor.
-             */
-            template<typename... Args>
-            void add_option(Args&&... args) {
-                _ip_options.emplace_back(std::forward<Args>(args)...);
-                internal_add_option(_ip_options.back());
-            }
-        #endif
-
-        /**
-         * \brief Searchs for an option that matchs the given flag.
-         * 
-         * If the option is not found, a null pointer is returned. 
-         * Deleting the returned pointer will result in <b>undefined 
-         * behaviour</b>.
-         * 
-         * \param id The option identifier to be searched.
-         */
-        const option *search_option(option_identifier id) const;
-
-        // Option setters
-        
-        /**
-         * \brief Adds an End Of List option.
-         */
-        void eol();
-
-        /**
-         * \brief Adds a NOP option.
-         */
-        void noop();
-
-        /**
-         * \brief Adds a security option.
-         *
-         * \param data The data to be stored in this option.
-         */
-        void security(const security_type &data);
-        
-        /**
-         * \brief Adds a Loose Source and Record Route option.
-         *
-         * \param data The data to be stored in this option.
-         */
-        void lsrr(const lsrr_type &data) {
-            add_route_option(131, data);
-        }
-        
-        /**
-         * \brief Adds a Strict Source and Record Route option.
-         *
-         * \param data The data to be stored in this option.
-         */
-        void ssrr(const ssrr_type &data) {
-            add_route_option(137, data);
-        }
-        
-        /**
-         * \brief Adds a Record Route option.
-         *
-         * \param data The data to be stored in this option.
-         */
-        void record_route(const record_route_type &data) {
-            add_route_option(7, data);
-        }
-        
-        /**
-         * \brief Adds a Stream Identifier option.
-         *
-         * \param stream_id The stream id to be stored in this option.
-         */
-        void stream_identifier(uint16_t stream_id);
-        
-        // Option getters
-        
-        /**
-         * \brief Searchs and returns a security option.
-         * 
-         * If no such option exists, an option_not_found exception
-         * is thrown.
-         * 
-         * \return security_type containing the option found.
-         */
-        security_type security() const;
-        
-        /**
-         * \brief Searchs and returns a Loose Source and Record Route 
-         * option.
-         * 
-         * If no such option exists, an option_not_found exception
-         * is thrown.
-         * 
-         * \return lsrr_type containing the option found.
-         */
-        lsrr_type lsrr() const {
-            return search_route_option(131);
-        }
-        
-        /**
-         * \brief Searchs and returns a Strict Source and Record Route 
-         * option.
-         * 
-         * If no such option exists, an option_not_found exception
-         * is thrown.
-         * 
-         * \return ssrr_type containing the option found.
-         */
-        ssrr_type ssrr() const {
-            return search_route_option(137);
-        }
-        
-        /**
-         * \brief Searchs and returns a Record Route option.
-         * 
-         * If no such option exists, an option_not_found exception
-         * is thrown.
-         * 
-         * \return record_route_type containing the option found.
-         */
-        record_route_type record_route() const {
-            return search_route_option(7);
-        }
-
-        /**
-         * \brief Searchs and returns a Stream Identifier option.
-         * 
-         * If no such option exists, an option_not_found exception
-         * is thrown.
-         * 
-         * \return uint16_t containing the option found.
-         */
-        uint16_t stream_identifier() const;
-
-        /* Virtual methods */
-
-        /**
-         * \brief Returns the header size.
-         *
-         * This metod overrides PDU::header_size. \sa PDU::header_size
-         */
-        uint32_t header_size() const;
-
-        /**
-         * \sa PDU::send()
-         */
-        void send(PacketSender &sender, const NetworkInterface &);
-
-        /**
-         * \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * \sa PDU::matches_response
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        bool matches_response(const uint8_t *ptr, uint32_t total_sz) const;
-
-        /**
-         * \brief Receives a matching response for this packet.
-         *
-         * \sa PDU::recv_response
-         * \param sender The packet sender which will receive the packet.
-         */
-        PDU *recv_response(PacketSender &sender, const NetworkInterface &);
-
-        /**
-         * Indicates whether this PDU is fragmented.
-         *
-         * \return true if this PDU is fragmented, false otherwise.
-         */
-        bool is_fragmented() const;
-
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return PDU::IP; }
-
-        /**
-         * \sa PDU::clone
-         */
-        IP *clone() const {
-            return new IP(*this);
-        }
-    private:
-        static const uint8_t DEFAULT_TTL;
-
-        TINS_BEGIN_PACK
-        struct iphdr {
-        #if TINS_IS_LITTLE_ENDIAN
-            uint8_t ihl:4,
-                    version:4;
-        #else
-            uint8_t version:4,
-                    ihl:4;
-        #endif
-            uint8_t tos;
-            uint16_t tot_len;
-            uint16_t id;
-            uint16_t frag_off;
-            uint8_t ttl;
-            uint8_t protocol;
-            uint16_t check;
-            uint32_t saddr;
-            uint32_t daddr;
-            /*The options start here. */
-        } TINS_END_PACK;
-
-
-        void head_len(small_uint<4> new_head_len);
-        void tot_len(uint16_t new_tot_len);
-
-        void prepare_for_serialize(const PDU *parent);
-        void internal_add_option(const option &option);
-        void init_ip_fields();
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-        uint8_t* write_option(const option &opt, uint8_t* buffer);
-        void add_route_option(option_identifier id, const generic_route_option_type &data);
-        generic_route_option_type search_route_option(option_identifier id) const;
-        void checksum(uint16_t new_check);
-
-        iphdr _ip;
-        uint16_t _options_size, _padded_options_size;
-        options_type _ip_options;
-    };
-}
-
-#endif // TINS_IP_H

include/llc.h

@@ -1,402 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_IEEE8022_H
-#define TINS_IEEE8022_H
-
-#include <list>
-#include <vector>
-#include <stdint.h>
-#include "macros.h"
-#include "pdu.h"
-#include "endianness.h"
-
-namespace Tins {
-
-    /**
-     * \brief Class representing a LLC frame.
-     *
-     * This PDU follows the standard LLC frame described in the IEEE 802.2 specs.
-     */
-    class LLC : public PDU {
-    public:
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::LLC;
-
-    	/**
-         * \brief Represents the LLC global DSAP address.
-         */
-        static const uint8_t GLOBAL_DSAP_ADDR;
-        
-        /**
-         * \brief Represents the LLC NULL address.
-         */
-        static const uint8_t NULL_ADDR;
-
-        /**
-         * \brief LLC Format flags.
-         */
-        enum Format {
-            INFORMATION = 0,
-            SUPERVISORY = 1,
-            UNNUMBERED = 3
-        };
-
-        /**
-         * \brief LLC Modifier functions.
-         */
-        enum ModifierFunctions {
-        	UI = 0x00,
-        	XID = 0x1D,
-        	TEST = 0x07,
-        	SABME = 0x1E,
-        	DISC = 0x02,
-        	UA = 0x06,
-        	DM = 0x18,
-        	FRMR = 0x11
-        };
-
-        /**
-         * \brief LLC Supervisory functions
-         */
-        enum SupervisoryFunctions {
-        	RECEIVE_READY = 0,
-        	REJECT = 2,
-        	RECEIVE_NOT_READY = 1
-        };
-
-        /**
-         * \brief Default constructor.
-         */
-    	LLC();
-
-    	/**
-    	 * \brief Constructs an instance of LLC, setting the dsap and ssap.
-    	 * The control field is set to 0.
-    	 * \param dsap The dsap value to be set.
-    	 * \param ssap The ssap value to be set.
-    	 */
-    	LLC(uint8_t dsap, uint8_t ssap);
-
-        /**
-         * \brief Constructs a LLC object from a buffer and adds all 
-         * identifiable PDUs found in the buffer as children of this one.
-         * 
-         * If there is not enough size for a LLC header, a malformed_packet
-         * exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-    	LLC(const uint8_t *buffer, uint32_t total_sz);
-
-        /* Setters */
-
-    	/**
-		 * \brief Setter for the group destination bit.
-		 * \param value The value to be set.
-		 */
-        void group(bool value);
-
-        /**
-		 * \brief Setter for the dsap field.
-		 * \param new_dsap The new dsap field.
-		 */
-		void dsap(uint8_t new_dsap);
-
-		/**
-		 * \brief Setter for the response bit.
-		 * \param value The value to be set.
-		 */
-		void response(bool value);
-
-		/**
-		 * \brief Setter for the ssap field.
-		 * \param new_ssap The new ssap field.
-		 */
-		void ssap(uint8_t new_ssap);
-
-		/**
-		 * \brief Setter for the LLC frame format type.
-		 * \param type The LLC frame format to set.
-		 */
-		void type(Format type);
-
-		/**
-		 * \brief Setter for sender send sequence number.
-		 * 	Only applied if format is INFORMATION.
-		 * \param seq_number New sender send sequence number to be set.
-		 */
-		void send_seq_number(uint8_t seq_number);
-
-		/**
-		 * \brief Setter for sender receive sequence number.
-		 * 	Only applied if format is INFORMATION or SUPERVISORY.
-		 * \param seq_number New sender receive sequence number to be set.
-		 */
-		void receive_seq_number(uint8_t seq_number);
-
-		/**
-		 * \brief Setter for the poll/final flag.
-		 * \param value Bool indicating the value of the flag.
-		 */
-		void poll_final(bool value);
-
-		/**
-		 * \brief Setter for the supervisory function.
-		 * Only applied if format is SUPERVISORY.
-		 * \param new_func Value to set on the supervisory function field.
-		 */
-		void supervisory_function(SupervisoryFunctions new_func);
-
-		/**
-		 * \brief Setter for the modifier function field.
-		 * Only applied if format is UNNUMBERED.
-		 * \param modifier_func Value to set on the modifier function field.
-		 */
-		void modifier_function(ModifierFunctions mod_func);
-
-		/**
-		 * \brief Add a xid information field.
-		 * Only applied if format is UNNUMBERED and function is XID.
-		 * \param xid_id XID information of the MAC sublayer.
-		 * \param llc_type_class Value to set the llc_type_class field.
-		 * \param receive_window XID sender's receive window size.
-		 */
-		void add_xid_information(uint8_t xid_id, uint8_t llc_type_class, uint8_t receive_window);
-
-		//TODO: Add Acknowledged connectionless information
-
-        /* Getters */
-
-		/**
-		 * \brief Getter for the group destination bit.
-		 * \return Whether the group bit is set or not.
-		 */
-		bool group() {return _header.dsap & 0x01; }
-
-		/**
-		 * \brief Getter for the dsap field.
-		 * \return The dsap field value
-		 */
-		uint8_t dsap() {return _header.dsap; }
-
-		/**
-		 * \brief Getter for the response bit.
-		 * \return Whether the response bit is set or not.
-		 */
-		bool response() {return (_header.ssap & 0x01); }
-
-		/**
-		 * \brief Getter for the ssap field.
-		 * \return The ssap field.
-		 */
-		uint8_t ssap() {return _header.ssap; }
-
-		/**
-		 * \brief Getter for the LLC frame format type.
-		 * \return The LLC frame format.
-		 */
-		uint8_t type() {return _type; }
-
-		/**
-		 * \brief Getter for sender send sequence number.
-		 *
-		 * \return The sender send sequence number if format is INFORMATION else 0.
-		 */
-		uint8_t send_seq_number() {
-			return (type() == INFORMATION) ? (control_field.info.send_seq_num) : 0;
-		}
-
-		/**
-		 * \brief Getter for sender receive sequence number.
-		 *
-		 * \return 	The sender receive sequence number if format is
-		 * 			INFORMATION or SUPERVISORY else 0.
-		 */
-		uint8_t receive_seq_number() {
-			switch (type()) {
-				case INFORMATION:
-					return control_field.info.recv_seq_num;
-				case SUPERVISORY:
-					return control_field.super.recv_seq_num;
-				case UNNUMBERED:
-					return 0;
-                default:
-                    return 0;
-			}
-		}
-
-		/**
-		 * \brief Getter for the poll/final flag.
-		 * \return Whether the poll/final flag is set.
-		 */
-		bool poll_final() {
-			switch (type()) {
-				case UNNUMBERED:
-					return control_field.unnumbered.poll_final_bit;
-				case INFORMATION:
-					return control_field.info.poll_final_bit;
-				case SUPERVISORY:
-					return control_field.super.poll_final_bit;
-                default:
-                    return false;
-			}
-		}
-
-		/**
-		 * \brief Getter for the supervisory function.
-		 *
-		 * \return The supervisory function if format is SUPERVISORY else 0.
-		 */
-		uint8_t supervisory_function() {
-			if (type() == SUPERVISORY)
-				return control_field.super.supervisory_func;
-			return 0;
-		}
-
-		/**
-		 * \brief Getter for the modifier function field.
-		 *
-		 * \return The modifier function if format is UNNUMBERED else 0.
-		 */
-		uint8_t modifier_function() {
-			if (type() == UNNUMBERED)
-				return (control_field.unnumbered.mod_func1 << 3) + control_field.unnumbered.mod_func2;
-			return 0;
-		}
-
-        /**
-         * \brief Returns the LLC frame's header length.
-         *
-         * \return The header's size.
-         * \sa PDU::header_size()
-         */
-        uint32_t header_size() const;
-
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return pdu_flag; }
-
-        /**
-		 * \brief Delete all the information fields added.
-		 */
-		void clear_information_fields();
-
-        /**
-         * \brief Clones this PDU.
-         *
-         * \sa PDU::clone
-         */
-        LLC *clone() const {
-            return new LLC(*this);
-        }
-    private:
-        TINS_BEGIN_PACK
-        struct llchdr {
-            uint8_t dsap;
-            uint8_t ssap;
-        } TINS_END_PACK;
-
-        #if TINS_IS_LITTLE_ENDIAN
-            TINS_BEGIN_PACK
-            struct info_control_field {
-                uint16_t
-                            type_bit:1,
-                            send_seq_num:7,
-                            poll_final_bit:1,
-                            recv_seq_num:7;
-            } TINS_END_PACK;
-
-            TINS_BEGIN_PACK
-            struct super_control_field {
-                uint16_t	type_bit:2,
-                            supervisory_func:2,
-                            unused:4,
-                            poll_final_bit:1,
-                            recv_seq_num:7;
-            } TINS_END_PACK;
-
-            TINS_BEGIN_PACK
-            struct un_control_field {
-                uint8_t		type_bits:2,
-                            mod_func1:2,
-                            poll_final_bit:1,
-                            mod_func2:3;
-            } TINS_END_PACK;
-        #elif TINS_IS_BIG_ENDIAN
-            TINS_BEGIN_PACK
-            struct info_control_field {
-                uint16_t    send_seq_num:7,
-                            type_bit:1,
-                            recv_seq_num:7,
-                            poll_final_bit:1;
-            } TINS_END_PACK;
-
-            TINS_BEGIN_PACK
-            struct super_control_field {
-                uint16_t	unused:4,
-                            supervisory_func:2,
-                            type_bit:2,
-                            recv_seq_num:7,
-                            poll_final_bit:1;
-            } TINS_END_PACK;
-
-            TINS_BEGIN_PACK
-            struct un_control_field {
-                uint8_t		mod_func2:3,
-                            poll_final_bit:1,
-                            mod_func1:2,
-                            type_bits:2;
-            } TINS_END_PACK;
-        #endif
-        
-        typedef std::vector<uint8_t> field_type;
-
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-
-        llchdr _header;
-        uint8_t control_field_length;
-        union {
-        	info_control_field info;
-        	super_control_field super;
-        	un_control_field unnumbered;
-        } control_field;
-        Format _type;
-        uint8_t information_field_length;
-        std::list<field_type> information_fields;
-    };
-
-}
-
-#endif // TINS_IEEE8022_H

include/packet_sender.h

@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_PACKET_SENDER_H
-#define TINS_PACKET_SENDER_H
-
-
-#include <string>
-#include <stdexcept>
-#include <vector>
-#include <stdint.h>
-#include <map>
-#include "network_interface.h"
-#include "macros.h"
-#include "cxxstd.h"
-
-struct timeval;
-struct sockaddr;
-
-namespace Tins {
-    class PDU;
-    
-    /**
-     * \brief Class that enables sending the created PDUs
-     *
-     * PacketSender class is responsible for sending the packets using the
-     * correct PDU layer. It is responsible for opening the raw sockets.
-     */
-    class PacketSender {
-    public:
-        /** 
-         * The default timeout for receive actions.
-         */
-        static const uint32_t DEFAULT_TIMEOUT;
-    
-        /** 
-         * Flags to indicate the socket type.
-         */
-        enum SocketType {
-            ETHER_SOCKET,
-            IP_TCP_SOCKET,
-            IP_UDP_SOCKET,
-            IP_RAW_SOCKET,
-            ARP_SOCKET,
-            ICMP_SOCKET,
-            IPV6_SOCKET,
-            SOCKETS_END
-        };
-
-        /**
-         * \brief Constructor for PacketSender objects.
-         * 
-         * \param iface The default interface in which to send the packets.
-         * \param recv_timeout The timeout which will be used when receiving responses.
-         */
-        PacketSender(const NetworkInterface &iface = NetworkInterface(), 
-          uint32_t recv_timeout = DEFAULT_TIMEOUT, uint32_t usec = 0);
-        
-        #if TINS_IS_CXX11
-            /**
-             * \brief Move constructor.
-             * \param rhs The sender to be moved.
-             */
-            PacketSender(PacketSender &&rhs) NOEXCEPT {
-                *this = std::move(rhs);
-            }
-            
-            /**
-             * \brief Move assignment operator.
-             * \param rhs The sender to be moved.
-             */
-            PacketSender& operator=(PacketSender &&rhs) NOEXCEPT {
-                _sockets = std::move(rhs._sockets);
-                rhs._sockets = std::vector<int>(SOCKETS_END, INVALID_RAW_SOCKET);
-                #ifndef WIN32
-                    #if defined(BSD) || defined(__FreeBSD_kernel__)
-                    _ether_socket = std::move(rhs._ether_socket);
-                    #else
-                    _ether_socket = rhs._ether_socket;
-                    rhs._ether_socket = INVALID_RAW_SOCKET;
-                    #endif
-                #endif
-                _types = rhs._types; // no move
-                _timeout = rhs._timeout;
-                _timeout_usec = rhs._timeout_usec;
-                default_iface = rhs.default_iface;
-                return *this;
-            }
-        #endif
-        
-        /** 
-         * \brief PacketSender destructor.
-         * 
-         * This gracefully closes all open sockets.
-         */
-        ~PacketSender();
-
-        #ifndef WIN32
-        /** 
-         * \brief Opens a layer 2 socket.
-         * 
-         * If this operation fails, then a socket_open_error will be thrown.
-         */
-        void open_l2_socket(const NetworkInterface& iface = NetworkInterface());
-        #endif // WIN32
-
-        /** 
-         * \brief Opens a layer 3 socket, using the corresponding protocol
-         * for the given flag.
-         * 
-         * If this operation fails, then a socket_open_error will be thrown.
-         * If the provided socket type is not valid, an invalid_socket_type
-         * exception will be throw.
-         * 
-         * \param type The type of socket which will be used to pick the protocol flag
-         * for this socket.
-         */
-        void open_l3_socket(SocketType type);
-
-        /** 
-         * \brief Closes the socket associated with the given flag.
-         * 
-         * If the provided type is invalid, meaning no such open socket
-         * exists, an invalid_socket_type exception is thrown.
-         * 
-         * If any socket close errors are encountered, a socket_close_error
-         * is thrown.
-         * 
-         * \param type The type of the socket to be closed.
-         */
-        void close_socket(SocketType type, const NetworkInterface &iface = NetworkInterface());
-
-        /**
-         * \brief Sets the default interface.
-         * 
-         * The interface will be used whenever PacketSender::send(PDU&) 
-         * is called.
-         */
-        void default_interface(const NetworkInterface &iface);
-        
-        /**
-         * \brief Gets the default interface.
-         * 
-         * \sa PacketSender::default_interface
-         */
-        const NetworkInterface& default_interface() const;
-
-        /** 
-         * \brief Sends a PDU. 
-         * 
-         * This method opens the appropriate socket, if it's not open yet, 
-         * and sends the PDU on the open socket.
-         * 
-         * If any send error occurs, then a socket_write_error is thrown.
-         * 
-         * If the PDU contains a link layer protocol, then default_interface
-         * is used.
-         * 
-         * \sa PacketSender::default_interface
-         * 
-         * \param pdu The PDU to be sent.
-         */
-        void send(PDU &pdu);
-        
-        /** 
-         * \brief Sends a PDU. 
-         * 
-         * \sa PacketSender::send
-         * 
-         * This overload takes a NetworkInterface. The packet is sent
-         * through that interface if a link-layer PDU is present, 
-         * otherwise this call is equivalent to send(PDU&).
-         * 
-         * The interface stored in the link layer PDU(if any), is restored
-         * after this method ends.
-         * 
-         * \param pdu The PDU to be sent.
-         * \param iface The network interface to use.
-         */
-        void send(PDU &pdu, const NetworkInterface &iface);
-
-        /** 
-         * \brief Sends a PDU and waits for its response. 
-         * 
-         * This method is used to send PDUs and receive their response. 
-         * It opens the required socket(if it's not open yet). This can be used
-         * to expect responses for ICMP, ARP, and such packets that are normally
-         * answered by the host that receives the packet.
-         * 
-         * \param pdu The PDU to send.
-         * \return Returns the response PDU, 0 if not response was received.
-         */
-        PDU *send_recv(PDU &pdu);
-        
-        /** 
-         * \brief Sends a PDU and waits for its response. 
-         * 
-         * This method is used to send PDUs and receive their response. 
-         * It opens the required socket(if it's not open yet). This can be used
-         * to expect responses for ICMP, ARP, and such packets that are normally
-         * answered by the host that receives the packet.
-         * 
-         * \param pdu The PDU to send.
-         * \param iface The network interface in which to send and receive.
-         * \return Returns the response PDU, 0 if not response was received.
-         */
-        PDU *send_recv(PDU &pdu, const NetworkInterface &iface);
-
-        #ifndef WIN32
-        /** 
-         * \brief Receives a layer 2 PDU response to a previously sent PDU.
-         * 
-         * This PacketSender will receive data from a raw socket, open using the corresponding flag,
-         * according to the given type of protocol, until a match for the given PDU is received. 
-         * 
-         * \param pdu The PDU which will try to match the responses.
-         * \param link_addr The sockaddr struct which will be used to receive the PDU.
-         * \param len_addr The sockaddr struct length.
-         * \return Returns the response PDU. If no response is received, then 0 is returned.
-         */
-        PDU *recv_l2(PDU &pdu, struct sockaddr *link_addr, uint32_t len_addr,
-          const NetworkInterface &iface = NetworkInterface());
-
-        /** 
-         * \brief Sends a level 2 PDU.
-         * 
-         * This method sends a layer 2 PDU, using a raw socket, open 
-         * using the corresponding flag, according to the given type of 
-         * protocol. 
-         * 
-         * If any socket write error occurs, a socket_write_error is thrown.
-         * 
-         * \param pdu The PDU to send.
-         * \param link_addr The sockaddr struct which will be used to send the PDU.
-         * \param len_addr The sockaddr struct length.
-         */
-        void send_l2(PDU &pdu, struct sockaddr* link_addr, uint32_t len_addr, 
-          const NetworkInterface &iface = NetworkInterface());
-        #endif // WIN32
-
-        /** 
-         * \brief Receives a layer 3 PDU response to a previously sent PDU.
-         * 
-         * This PacketSender will receive data from a raw socket, open using the corresponding flag,
-         * according to the given type of protocol, until a match for the given PDU is received. 
-         * 
-         * \param pdu The PDU which will try to match the responses.
-         * \param link_addr The sockaddr struct which will be used to receive the PDU.
-         * \param len_addr The sockaddr struct length.
-         * \param type The socket protocol type.
-         * \return Returns the response PDU. If no response is received, then 0 is returned.
-         */
-        PDU *recv_l3(PDU &pdu, struct sockaddr *link_addr, uint32_t len_addr, SocketType type);
-
-        /** 
-         * \brief Sends a level 3 PDU.
-         * 
-         * This method sends a layer 3 PDU, using a raw socket, open using the corresponding flag,
-         * according to the given type of protocol.
-         * 
-         * If any socket write error occurs, a socket_write_error is thrown.
-         * 
-         * \param pdu The PDU to send.
-         * \param link_addr The sockaddr struct which will be used to send the PDU.
-         * \param len_addr The sockaddr struct length.
-         * \param type The socket protocol type.
-         */
-        void send_l3(PDU &pdu, struct sockaddr *link_addr, uint32_t len_addr, SocketType type);
-    private:
-        static const int INVALID_RAW_SOCKET;
-
-        typedef std::map<SocketType, int> SocketTypeMap;
-
-        PacketSender(const PacketSender&);
-        PacketSender& operator=(const PacketSender&);
-        int find_type(SocketType type);
-        int timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y);
-        #ifndef WIN32
-            bool ether_socket_initialized(const NetworkInterface& iface = NetworkInterface()) const;
-            int get_ether_socket(const NetworkInterface& iface = NetworkInterface());
-        #endif
-        template<typename T>
-        void send(PDU &pdu, const NetworkInterface &iface) {
-            static_cast<T&>(pdu).send(*this, iface);
-        }
-        
-        PDU *recv_match_loop(const std::vector<int>& sockets, PDU &pdu, struct sockaddr* link_addr, 
-            uint32_t addrlen);
-
-        std::vector<int> _sockets;
-        #ifndef WIN32
-            #if defined(BSD) || defined(__FreeBSD_kernel__)
-            typedef std::map<uint32_t, int> BSDEtherSockets;
-            BSDEtherSockets _ether_socket;
-            #else
-            int _ether_socket;
-            #endif
-        #endif
-        SocketTypeMap _types;
-        uint32_t _timeout, _timeout_usec;
-        NetworkInterface default_iface;
-        // In BSD we need to store the buffer size, retrieved using BIOCGBLEN
-        #if defined(BSD) || defined(__FreeBSD_kernel__)
-        int buffer_size;
-        #endif
-    };
-}
-
-#endif // TINS_PACKET_SENDER_H

include/pdu.h

@@ -1,505 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
- 
-#ifndef TINS_PDU_H
-#define TINS_PDU_H
-
-
-#include <stdint.h>
-#include <vector>
-#include "macros.h"
-#include "cxxstd.h"
-#include "exceptions.h"
-
-/** \brief The Tins namespace.
- */
-namespace Tins {
-
-    class PacketSender;
-    class NetworkInterface;
-    
-    /**
-     * The type used to store several PDU option values.
-     */
-    typedef std::vector<uint8_t> byte_array;
-
-    /** \brief Base class for protocol data units.
-     *
-     * Every PDU implementation must inherit this one. PDUs can be serialized,
-     * therefore allowing a PacketSender to send them through the corresponding
-     * sockets. PDUs are created upwards: upper layers will be children of the
-     * lower ones. Each PDU must provide its flag identifier. This will be most
-     * likely added to its parent's data, hence it should be a valid identifier.
-     * For example, IP should provide IPPROTO_IP.
-     */
-    class PDU {
-    public:
-        /**
-         * The type that will be returned when serializing PDUs.
-         */
-        typedef byte_array serialization_type;
-
-        /**
-         * The typep used to identify the endianness of every PDU.
-         */
-        enum endian_type {
-            BE,
-            LE
-        };
-
-        /**
-         * \brief Enum which identifies each type of PDU.
-         *
-         * This enum is used to identify the PDU type.
-         */
-        enum PDUType {
-            RAW,
-            ETHERNET_II,
-            IEEE802_3,
-            RADIOTAP,
-            DOT11,
-            DOT11_ACK,
-            DOT11_ASSOC_REQ,
-            DOT11_ASSOC_RESP,
-            DOT11_AUTH,
-            DOT11_BEACON,
-            DOT11_BLOCK_ACK,
-            DOT11_BLOCK_ACK_REQ,
-            DOT11_CF_END,
-            DOT11_DATA,
-            DOT11_CONTROL,
-            DOT11_DEAUTH,
-            DOT11_DIASSOC,
-            DOT11_END_CF_ACK,
-            DOT11_MANAGEMENT,
-            DOT11_PROBE_REQ,
-            DOT11_PROBE_RESP,
-            DOT11_PS_POLL,
-            DOT11_REASSOC_REQ,
-            DOT11_REASSOC_RESP,
-            DOT11_RTS,
-            DOT11_QOS_DATA,
-            LLC,
-            SNAP,
-            IP,
-            ARP,
-            TCP,
-            UDP,
-            ICMP,
-            BOOTP,
-            DHCP,
-            EAPOL,
-            RC4EAPOL,
-            RSNEAPOL,
-            DNS,
-            LOOPBACK,
-            IPv6,
-            ICMPv6,
-            SLL,
-            DHCPv6,
-            DOT1Q,
-            PPPOE,
-            STP,
-            PPI,
-            IPSEC_AH,
-            IPSEC_ESP,
-            USER_DEFINED_PDU = 1000
-        };
-        
-        /**
-         * The endianness used by this PDU. This can be overriden
-         * by subclasses.
-         */
-        static const endian_type endianness = BE;
-
-        /** 
-         * \brief Default constructor.
-         */
-        PDU();
-        
-        #if TINS_IS_CXX11
-            /**
-             * \brief Move constructor.
-             * 
-             * \param rhs The PDU to be moved.
-             */
-            PDU(PDU &&rhs) NOEXCEPT 
-            : _inner_pdu(0)
-            {
-                std::swap(_inner_pdu, rhs._inner_pdu);
-            }
-            
-            /**
-             * \brief Move assignment operator.
-             * 
-             * \param rhs The PDU to be moved.
-             */
-            PDU& operator=(PDU &&rhs) NOEXCEPT {
-                std::swap(_inner_pdu, rhs._inner_pdu);
-                return *this;
-            }
-        #endif
-
-        /** 
-         * \brief PDU destructor.
-         *
-         * Deletes the inner pdu, as a consequence every child pdu is
-         * deleted.
-         */
-        virtual ~PDU();
-
-        /** \brief The header's size
-         */
-        virtual uint32_t header_size() const = 0;
-
-        /** \brief Trailer's size.
-         *
-         * Some protocols require a trailer(like Ethernet). This defaults to 0.
-         */
-        virtual uint32_t trailer_size() const { return 0; }
-
-        /** \brief The whole chain of PDU's size, including this one.
-         *
-         * Returns the sum of this and all children PDUs' size.
-         */
-        uint32_t size() const;
-
-        /**
-         * \brief Getter for the inner PDU.
-         * \return The current inner PDU. Might be 0.
-         */
-        PDU *inner_pdu() const { return _inner_pdu; }
-        
-        /**
-         * \brief Releases the inner PDU.
-         * 
-         * This method makes this PDU to <b>no longer own</b> the inner
-         * PDU. The current inner PDU is returned, and is <b>not</b>
-         * destroyed. That means after calling this function, you are 
-         * responsible for using operator delete on the returned pointer.
-         * 
-         * Use this method if you want to somehow re-use a PDU that
-         * is already owned by another PDU.
-         * 
-         * \return The current inner PDU. Might be 0.
-         */
-        PDU *release_inner_pdu();
-
-        /**
-         * \brief Sets the child PDU.
-         *
-         * When setting a new inner_pdu, the instance takesownership of
-         * the object, therefore deleting it when it's no longer required.
-         * 
-         * \param next_pdu The new child PDU.
-         */
-        void inner_pdu(PDU *next_pdu);
-        
-        /**
-         * \brief Sets the child PDU.
-         *
-         * The PDU parameter is cloned using PDU::clone.
-         * 
-         * \param next_pdu The new child PDU.
-         */
-        void inner_pdu(const PDU &next_pdu);
-
-
-        /** 
-         * \brief Serializes the whole chain of PDU's, including this one.
-         *
-         * This allocates a std::vector of size size(), and fills it
-         * with the serialization this PDU, and all of the inner ones'.
-         * 
-         * \return serialization_type containing the serialization
-         * of the whole stack of PDUs.
-         */
-        serialization_type serialize();
-
-        /**
-         * \brief Finds and returns the first PDU that matches the given flag.
-         *
-         * This method searches for the first PDU which has the same type flag as
-         * the given one. If the first PDU matches that flag, it is returned.
-         * If no PDU matches, 0 is returned.
-         * \param flag The flag which being searched.
-         */
-        template<typename T> 
-        T *find_pdu(PDUType type = T::pdu_flag) {
-            PDU *pdu = this;
-            while(pdu) {
-                if(pdu->matches_flag(type))
-                    return static_cast<T*>(pdu);
-                pdu = pdu->inner_pdu();
-            }
-            return 0;
-        }
-        
-        /**
-         * \brief Finds and returns the first PDU that matches the given flag.
-         *
-         * \param flag The flag which being searched.
-         */
-        template<typename T> 
-        const T *find_pdu(PDUType type = T::pdu_flag) const {
-            return const_cast<PDU*>(this)->find_pdu<T>();
-        }
-
-        /**
-         * \brief Finds and returns the first PDU that matches the given flag.
-         * 
-         * If the PDU is not found, a pdu_not_found exception is thrown.
-         * 
-         * \sa PDU::find_pdu
-         * 
-         * \param flag The flag which being searched.
-         */
-        template<typename T>
-        T &rfind_pdu(PDUType type = T::pdu_flag) {
-            T *ptr = find_pdu<T>(type);
-            if(!ptr)
-                throw pdu_not_found();
-            return *ptr;
-        }
-
-        /**
-         * \brief Finds and returns the first PDU that matches the given flag.
-         *
-         * \param flag The flag which being searched.
-         */
-        template<typename T> 
-        const T &rfind_pdu(PDUType type = T::pdu_flag) const {
-            return const_cast<PDU*>(this)->rfind_pdu<T>();
-        }
-
-        /**
-         * \brief Clones this packet.
-         *
-         * This method clones this PDU and clones every inner PDU,
-         * therefore obtaining a clone of the whole inner PDU chain.
-         * The pointer returned must be deleted by the user.
-         * \return A pointer to a clone of this packet.
-         */
-        virtual PDU *clone() const = 0;
-
-        /** 
-         * \brief Send the stack of PDUs through a PacketSender.
-         *
-         * This method will be called only for the PDU on the bottom of the stack,
-         * therefore it should only implement this method if it can be sent.
-         * 
-         * PacketSender implements specific methods to send packets which start
-         * on every valid TCP/IP stack layer; this should only be a proxy for
-         * those methods.
-         * 
-         * If this PDU does not represent a link layer protocol, then
-         * the interface argument will be ignored.
-         * 
-         * \param sender The PacketSender which will send the packet.
-         * \param iface The network interface in which this packet will 
-         * be sent.
-         */
-        virtual void send(PacketSender &sender, const NetworkInterface &iface);
-
-        /** 
-         * \brief Receives a matching response for this packet.
-         *
-         * This method should act as a proxy for PacketSender::recv_lX methods.
-         * 
-         * \param sender The packet sender which will receive the packet.
-         * \param iface The interface in which to expect the response.
-         */
-        virtual PDU *recv_response(PacketSender &sender, const NetworkInterface &iface);
-
-        /** 
-         * \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * This method must check wether the buffer pointed by ptr is a valid
-         * response for this PDU. If it is valid, then it might want to propagate
-         * the call to the next PDU. Note that in some cases, such as ICMP
-         * Host Unreachable, there is no need to ask the next layer for matching.
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        virtual bool matches_response(const uint8_t *ptr, uint32_t total_sz) const { 
-            return false; 
-        }
-
-        /**
-         * \brief Check wether this PDU matches the specified flag.
-         *
-         * This method should be reimplemented in PDU classes which have
-         * subclasses, and try to match the given PDU to each of its parent
-         * classes' flag.
-         * \param flag The flag to match.
-         */
-        virtual bool matches_flag(PDUType flag) const {
-           return flag == pdu_type();
-        }
-
-        /**
-         * \brief Getter for the PDU's type.
-         *
-         * \return Returns the PDUType corresponding to the PDU.
-         */
-        virtual PDUType pdu_type() const = 0;
-    protected:
-        /**
-         * \brief Copy constructor.
-         */
-        PDU(const PDU &other);
-
-        /**
-         * \brief Copy assignment operator.
-         */
-        PDU &operator=(const PDU &other);
-
-        /**
-         * \brief Copy other PDU's inner PDU(if any).
-         * \param pdu The PDU from which to copy the inner PDU.
-         */
-        void copy_inner_pdu(const PDU &pdu);
-
-        /**
-         * \brief Prepares this PDU for serialization.
-         * 
-         * This method is called before the inner PDUs are serialized.
-         * It's useful in situations such as when serializing IP PDUs,
-         * which don't contain any link layer encapsulation, and therefore
-         * require to set the source IP address before the TCP/UDP checksum
-         * is calculated.
-         * 
-         * By default, this method does nothing
-         * 
-         * \param parent The parent PDU.
-         */
-        virtual void prepare_for_serialize(const PDU *parent) { }
-
-        /** 
-         * \brief Serializes this PDU and propagates this action to child PDUs.
-         *
-         * \param buffer The buffer in which to store this PDU's serialization.
-         * \param total_sz The total size of the buffer.
-         * \param parent The parent PDU. Will be 0 if there's the parent does not exist.
-         */
-        void serialize(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-
-        /** 
-         * \brief Serializes this TCP PDU.
-         *
-         * Each PDU must override this method and implement it's own
-         * serialization.
-         * \param buffer The buffer in which the PDU will be serialized.
-         * \param total_sz The size available in the buffer.
-         * \param parent The PDU that's one level below this one on the stack. Might be 0.
-         */
-        virtual void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent) = 0;
-    private:
-        PDU *_inner_pdu;
-    };
-    
-    /**
-     * \brief Concatenation operator.
-     * 
-     * This operator concatenates several PDUs. A copy of the right 
-     * operand is set at the end of the left one's inner PDU chain.
-     * This means that:
-     * 
-     * IP some_ip = IP("127.0.0.1") / TCP(12, 13) / RawPDU("bleh");
-     * 
-     * Works as expected, meaning the output PDU will look like the 
-     * following:
-     * 
-     * IP - TCP - RawPDU
-     * 
-     * \param lop The left operand, which will be the one modified.
-     * \param rop The right operand, the one which will be appended
-     * to lop.
-     */
-    template<typename T>
-    T &operator/= (T &lop, const PDU &rop) {
-        PDU *last = &lop;
-        while(last->inner_pdu())
-            last = last->inner_pdu();
-        last->inner_pdu(rop.clone());
-        return lop;
-    }
-    
-    /**
-     * \brief Concatenation operator.
-     * 
-     * \sa operator/=
-     */
-    template<typename T>
-    T operator/ (T lop, const PDU &rop) {
-        lop /= rop;
-        return lop;
-    }
-    
-    /**
-     * \brief Concatenation operator on PDU pointers.
-     * 
-     * \sa operator/=
-     */
-    template<typename T>
-    T *operator/= (T* lop, const PDU &rop) {
-        *lop /= rop;
-        return lop;
-    }
-
-    namespace Internals {
-        template<typename T>
-        struct remove_pointer {
-            typedef T type;
-        };
-
-        template<typename T>
-        struct remove_pointer<T*> {
-            typedef T type;
-        };
-    }
-
-    template<typename T, typename U>
-    T tins_cast(U *pdu) {
-        typedef typename Internals::remove_pointer<T>::type TrueT;
-        return pdu && (TrueT::pdu_flag == pdu->pdu_type()) ?
-            static_cast<T>(pdu) :
-            0;
-    }
-
-    template<typename T, typename U>
-    T &tins_cast(U &pdu) {
-        T *ptr = tins_cast<T*>(&pdu);
-        if(!ptr)
-            throw bad_tins_cast();
-        return *ptr;
-    }
-}
-
-#endif // TINS_PDU_H

include/pdu_option.h

@@ -1,521 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef TINS_PDU_OPTION_H
-#define TINS_PDU_OPTION_H
-
-#include <vector>
-#include <iterator>
-#include <cstring>
-#include <algorithm>
-#include <string>
-#include <stdint.h>
-#include "exceptions.h"
-#include "endianness.h"
-#include "internals.h"
-#include "ip_address.h"
-#include "ipv6_address.h"
-#include "hw_address.h"
-
-namespace Tins {
-/**
- * \cond
- */
-template<typename OptionType, class PDUType>
-class PDUOption;
-
-namespace Internals {
-    template<typename T, typename X, typename PDUType>
-    T convert_to_integral(const PDUOption<X, PDUType> & opt) {
-        if(opt.data_size() != sizeof(T))
-            throw malformed_option();
-        T data = *(T*)opt.data_ptr();
-        if(PDUType::endianness == PDUType::BE)
-            data = Endian::be_to_host(data);
-        else
-            data = Endian::le_to_host(data);
-        return data;
-    }
-    
-    template<typename T, typename = void>
-    struct converter {
-        template<typename X, typename PDUType>
-        static T convert(const PDUOption<X, PDUType>& opt) {
-            return T::from_option(opt);
-        }
-    };
-    
-    template<>
-    struct converter<uint8_t> {
-        template<typename X, typename PDUType>
-        static uint8_t convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() != 1)
-                throw malformed_option();
-            return *opt.data_ptr();
-        }
-    };
-    
-    template<>
-    struct converter<uint16_t> {
-        template<typename X, typename PDUType>
-        static uint16_t convert(const PDUOption<X, PDUType>& opt) {
-            return convert_to_integral<uint16_t>(opt);
-        }
-    };
-    
-    template<>
-    struct converter<uint32_t> {
-        template<typename X, typename PDUType>
-        static uint32_t convert(const PDUOption<X, PDUType>& opt) {
-            return convert_to_integral<uint32_t>(opt);
-        }
-    };
-    
-    template<>
-    struct converter<uint64_t> {
-        template<typename X, typename PDUType>
-        static uint64_t convert(const PDUOption<X, PDUType>& opt) {
-            return convert_to_integral<uint64_t>(opt);
-        }
-    };
-
-    template<size_t n>
-    struct converter<HWAddress<n> > {
-        template<typename X, typename PDUType>
-        static HWAddress<n> convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() != n)
-                throw malformed_option();
-            return HWAddress<n>(opt.data_ptr());
-        }
-    };
-
-    template<>
-    struct converter<IPv4Address> {
-        template<typename X, typename PDUType>
-        static IPv4Address convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() != sizeof(uint32_t))
-                throw malformed_option();
-            const uint32_t *ptr = (const uint32_t*)opt.data_ptr();
-            if(PDUType::endianness == PDUType::BE)
-                return IPv4Address(*ptr);
-            else
-                return IPv4Address(Endian::change_endian(*ptr));
-        }
-    };
-
-    template<>
-    struct converter<IPv6Address> {
-        template<typename X, typename PDUType>
-        static IPv6Address convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() != IPv6Address::address_size)
-                throw malformed_option();
-            return IPv6Address(opt.data_ptr());
-        }
-    };
-    
-    template<>
-    struct converter<std::string> {
-        template<typename X, typename PDUType>
-        static std::string convert(const PDUOption<X, PDUType>& opt) {
-            return std::string(
-                opt.data_ptr(),
-                opt.data_ptr() + opt.data_size()
-            );
-        }
-    };
-    
-    template<>
-    struct converter<std::vector<float> > {
-        template<typename X, typename PDUType>
-        static std::vector<float> convert(const PDUOption<X, PDUType>& opt) {
-            std::vector<float> output;
-            const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
-            while(ptr != end) {
-                output.push_back(float(*(ptr++) & 0x7f) / 2);
-            }
-            return output;
-        }
-    };
-    
-    template<typename T>
-    struct converter<std::vector<T>, typename enable_if<is_unsigned_integral<T>::value>::type> {
-        template<typename X, typename PDUType>
-        static std::vector<T> convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() % sizeof(T) != 0)
-                throw malformed_option();
-            const T *ptr = (const T*)opt.data_ptr();
-            const T *end = (const T*)(opt.data_ptr() + opt.data_size());
-            
-            std::vector<T> output(std::distance(ptr, end));
-            typename std::vector<T>::iterator it = output.begin();
-            while(ptr < end) {
-                if(PDUType::endianness == PDUType::BE)
-                    *it++ = Endian::be_to_host(*ptr++);
-                else
-                    *it++ = Endian::le_to_host(*ptr++);
-            }
-            return output;
-        }
-    };
-    
-    template<typename T, typename U>
-    struct converter<
-            std::vector<std::pair<T, U> >, 
-            typename enable_if<
-                is_unsigned_integral<T>::value && is_unsigned_integral<U>::value
-            >::type
-    > {
-        template<typename X, typename PDUType>
-        static std::vector<std::pair<T, U> > convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() % (sizeof(T) + sizeof(U)) != 0)
-                throw malformed_option();
-            const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
-            
-            std::vector<std::pair<T, U> > output;
-            while(ptr < end) {
-                std::pair<T, U> data;
-                data.first = *(const T*)ptr;
-                ptr += sizeof(T);
-                data.second = *(const U*)ptr;
-                ptr += sizeof(U);
-                if(PDUType::endianness == PDUType::BE) {
-                    data.first = Endian::be_to_host(data.first);
-                    data.second = Endian::be_to_host(data.second);
-                }
-                else {
-                    data.first = Endian::le_to_host(data.first);
-                    data.second = Endian::le_to_host(data.second);
-                }
-                output.push_back(data);
-            }
-            return output;
-        }
-    };
-    
-    template<>
-    struct converter<std::vector<IPv4Address> > {
-        template<typename X, typename PDUType>
-        static std::vector<IPv4Address> convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() % 4 != 0)
-                throw malformed_option();
-            const uint32_t *ptr = (const uint32_t*)opt.data_ptr();
-            const uint32_t *end = (const uint32_t*)(opt.data_ptr() + opt.data_size());
-            
-            std::vector<IPv4Address> output(std::distance(ptr, end));
-            std::vector<IPv4Address>::iterator it = output.begin();
-            while(ptr < end) {
-                if(PDUType::endianness == PDUType::BE)
-                    *it++ = IPv4Address(*ptr++);
-                else
-                    *it++ = IPv4Address(Endian::change_endian(*ptr++));
-            }
-            return output;
-        }
-    };
-    
-    template<>
-    struct converter<std::vector<IPv6Address> > {
-        template<typename X, typename PDUType>
-        static std::vector<IPv6Address> convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() % IPv6Address::address_size != 0)
-                throw malformed_option();
-            const uint8_t *ptr = opt.data_ptr(), *end = opt.data_ptr() + opt.data_size();
-            std::vector<IPv6Address> output;
-            while(ptr < end) {
-                output.push_back(IPv6Address(ptr));
-                ptr += IPv6Address::address_size;
-            }
-            return output;
-        }
-    };
-    
-    template<typename T, typename U>
-    struct converter<
-            std::pair<T, U>, 
-            typename enable_if<
-                is_unsigned_integral<T>::value && is_unsigned_integral<U>::value
-            >::type
-    > {
-        template<typename X, typename PDUType>
-        static std::pair<T, U> convert(const PDUOption<X, PDUType>& opt) {
-            if(opt.data_size() != sizeof(T) + sizeof(U))
-                throw malformed_option();
-            std::pair<T, U> output;
-            std::memcpy(&output.first, opt.data_ptr(), sizeof(T));
-            std::memcpy(&output.second, opt.data_ptr() + sizeof(T), sizeof(U));
-            if(PDUType::endianness == PDUType::BE) {
-                output.first = Endian::be_to_host(output.first);
-                output.second = Endian::be_to_host(output.second);
-            }
-            else {
-                output.first = Endian::le_to_host(output.first);
-                output.second = Endian::le_to_host(output.second);
-            }
-            return output;
-        }
-    };
-}
-
-/**
- * \endcond
- */
-
-/**
- * \class PDUOption
- * \brief Represents a PDU option field.
- * 
- * Several PDUs, such as TCP, IP, Dot11 or DHCP contain options. All
- * of them behave exactly the same way. This class represents those
- * options.
- * 
- * The OptionType template parameter indicates the type that will be
- * used to store this option's identifier.
- */
-template<typename OptionType, class PDUType>
-class PDUOption {
-private:
-    static const int small_buffer_size = 8;
-public:
-    typedef uint8_t data_type;
-    typedef OptionType option_type;
-
-    /**
-     * \brief Constructs a PDUOption.
-     * \param opt The option type.
-     * \param length The option's data length.
-     * \param data The option's data(if any).
-     */
-    PDUOption(option_type opt = option_type(), size_t length = 0, const data_type *data = 0) 
-    : option_(opt), size_(length) {
-        set_payload_contents(data, data + (data ? length : 0));
-    }
-    
-    /**
-     * \brief Copy constructor.
-     * \param rhs The PDUOption to be copied.
-     */
-    PDUOption(const PDUOption& rhs) {
-        real_size_ = 0;
-        *this = rhs;
-    }
-    
-    #if TINS_IS_CXX11
-    /**
-     * \brief Move constructor.
-     * \param rhs The PDUOption to be moved.
-     */
-    PDUOption(PDUOption&& rhs) {
-        real_size_ = 0;
-        *this = std::move(rhs);
-    }
-    
-    /**
-     * \brief Move assignment operator.
-     * \param rhs The PDUOption to be moved.
-     */
-    PDUOption& operator=(PDUOption&& rhs) {
-        option_ = rhs.option_;
-        size_ = rhs.size_;
-        if(real_size_ > small_buffer_size) {
-            delete[] payload_.big_buffer_ptr;
-        }
-        real_size_ = rhs.real_size_;
-        if(real_size_ > small_buffer_size) {
-            payload_.big_buffer_ptr = nullptr;
-            std::swap(payload_.big_buffer_ptr, rhs.payload_.big_buffer_ptr);
-            rhs.real_size_ = 0;
-        }
-        else {
-            std::copy(
-                rhs.data_ptr(),
-                rhs.data_ptr() + rhs.data_size(),
-                payload_.small_buffer
-            );
-        }
-        return *this;
-    }
-    
-    #endif // TINS_IS_CXX11
-    
-    /**
-     * \brief Copy assignment operator.
-     * \param rhs The PDUOption to be copied.
-     */
-    PDUOption& operator=(const PDUOption& rhs) {
-        option_ = rhs.option_;
-        size_ = rhs.size_;
-        if(real_size_ > small_buffer_size) {
-            delete[] payload_.big_buffer_ptr;
-        }
-        real_size_ = rhs.real_size_;
-        set_payload_contents(rhs.data_ptr(), rhs.data_ptr() + rhs.data_size());
-        return *this;
-    }
-    
-    /**
-     * \brief Destructor.
-     */
-    ~PDUOption() {
-        if(real_size_ > small_buffer_size) {
-            delete[] payload_.big_buffer_ptr;
-        }
-    }
-    
-    /**
-     * \brief Constructs a PDUOption from iterators, which 
-     * indicate the data to be stored in it.
-     * 
-     * \param opt The option type.
-     * \param start The beginning of the option data.
-     * \param end The end of the option data.
-     */
-    template<typename ForwardIterator>
-    PDUOption(option_type opt, ForwardIterator start, ForwardIterator end) 
-    : option_(opt), size_(std::distance(start, end)) {
-        set_payload_contents(start, end);
-    }
-    
-    /**
-     * \brief Constructs a PDUOption from iterators, which 
-     * indicate the data to be stored in it.
-     * 
-     * The length parameter indicates the contents of the length field
-     * when this option is serialized. Note that this can be different
-     * to std::distance(start, end).
-     * 
-     * \sa length_field
-     * 
-     * \param opt The option type.
-     * \param length The length of this option.
-     * \param start The beginning of the option data.
-     * \param end The end of the option data.
-     */
-    template<typename ForwardIterator>
-    PDUOption(option_type opt, size_t length, ForwardIterator start, ForwardIterator end) 
-    : option_(opt), size_(length) {
-        set_payload_contents(start, end);
-    }
-    
-    /**
-     * Retrieves this option's type.
-     * \return uint8_t containing this option's size.
-     */
-    option_type option() const {
-        return option_;
-    }
-    
-    /**
-     * Sets this option's type
-     * \param opt The option type to be set.
-     */
-    void option(option_type opt) {
-        option_ = opt;
-    }
-    
-    /**
-     * Retrieves this option's data.
-     * 
-     * If this method is called when data_size() == 0, 
-     * dereferencing the returned pointer will result in undefined
-     * behaviour.
-     * 
-     * \return const data_type& containing this option's value.
-     */
-    const data_type *data_ptr() const {
-        return real_size_ <= small_buffer_size ?
-            payload_.small_buffer : 
-            payload_.big_buffer_ptr;
-    }
-    
-    /**
-     * \brief Retrieves the length of this option's data.
-     * 
-     * This is the actual size of the data.
-     */
-    size_t data_size() const {
-        return real_size_;
-    }
-    
-    /**
-     * \brief Retrieves the data length field.
-     * 
-     * This is what the size field will contain when this option is 
-     * serialized. It can differ from the actual data size. 
-     * 
-     * This will be equal to data_size unless the constructor that takes
-     * both a data length and two iterators is used.
-
-     * 
-     * \sa data_size.
-     */
-    size_t length_field() const {
-        return size_;
-    }
-    
-    /**
-     * \brief Constructs a T from this PDUOption.
-     * 
-     * Use this method to convert a PDUOption to the specific type that
-     * represents it. For example, if you know an option is of type
-     * PDU::SACK, you could use option.to<TCP::sack_type>().
-     */
-    template<typename T>
-    T to() const {
-        return Internals::converter<T>::convert(*this);
-    }
-private:
-    template<typename ForwardIterator>
-    void set_payload_contents(ForwardIterator start, ForwardIterator end) {
-        real_size_ = std::distance(start, end);
-        if(real_size_ <= small_buffer_size) {
-            std::copy(
-                start,
-                end,
-                payload_.small_buffer
-            );
-        }
-        else {
-            payload_.big_buffer_ptr = new data_type[real_size_];
-            std::copy(
-                start, 
-                end,
-                payload_.big_buffer_ptr
-            );
-        }
-    }
-
-    option_type option_;
-    uint16_t size_, real_size_;
-    union {
-        data_type small_buffer[small_buffer_size];
-        data_type* big_buffer_ptr;
-    } payload_;
-};
-} // namespace Tins
-#endif // TINS_PDU_OPTION_H

include/radiotap.h

@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 2014, Matias Fontanini
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following disclaimer
- *   in the documentation and/or other materials provided with the
- *   distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "config.h"
-
-#if !defined(TINS_RADIOTAP_H) && defined(HAVE_DOT11)
-#define TINS_RADIOTAP_H
-
-#include "macros.h"
-#include "pdu.h"
-#include "endianness.h"
-
-namespace Tins {
-    class PacketSender;
-    
-    /** 
-     * \brief Class that represents the IEEE 802.11 radio tap header.
-     * 
-     * By default, RadioTap PDUs set the necesary fields to send an 802.11
-     * PDU as its inner pdu, avoiding packet drops. As a consequence, 
-     * the FCS-at-end flag is on, the channel is set to 1, TSFT is set to 0,
-     * dbm_signal is set to 0xce, and the rx_flag and antenna fields to 0.
-     */
-    class RadioTap : public PDU {
-    public:
-        /**
-         * \brief This PDU's flag.
-         */
-        static const PDU::PDUType pdu_flag = PDU::RADIOTAP;
-    
-        /**
-         * \brief Enumeration of the different channel type flags.
-         * 
-         * These channel type flags can be OR'd and set using the
-         * RadioTap::channel() method.
-         */
-        enum ChannelType {
-            TURBO   = 0x10,
-            CCK     = 0x20,
-            OFDM    = 0x40,
-            TWO_GZ  = 0x80,
-            FIVE_GZ = 0x100,
-            PASSIVE = 0x200,
-            DYN_CCK_OFDM = 0x400,
-            GFSK    = 0x800
-        };
-        
-        /**
-         * \brief Flags used in the present field.
-         * 
-         * \sa RadioTap::present()
-         */
-        enum PresentFlags {
-            TSTF                = 1,
-            FLAGS               = 2,
-            RATE                = 4,
-            CHANNEL             = 8,
-            FHSS                = 16,
-            DBM_SIGNAL          = 32,
-            DBM_NOISE           = 64,
-            LOCK_QUALITY        = 128,
-            TX_ATTENUATION      = 256,
-            DB_TX_ATTENUATION   = 512,
-            DBM_TX_ATTENUATION  = 1024,
-            ANTENNA             = 2048,
-            DB_SIGNAL           = 4096,
-            DB_NOISE            = 8192,
-            RX_FLAGS            = 16382,
-            CHANNEL_PLUS        = 262144
-        };
-        
-        /**
-         * \brief Flags used in the RadioTap::flags() method.
-         */
-        enum FrameFlags {
-            CFP           = 1,
-            PREAMBLE      = 2,
-            WEP           = 4,
-            FRAGMENTATION = 8,
-            FCS           = 16,
-            PADDING       = 32,
-            FAILED_FCS    = 64,
-            SHORT_GI      = 128
-        };
-        
-        /**
-         * \brief Default constructor.
-         */
-        RadioTap();
-        
-        /**
-         * \brief Constructs a RadioTap object from a buffer and adds all
-         * identifiable PDUs found in the buffer as children of this one.
-         * 
-         * If there is not enough size for a RadioTap header, a
-         * malformed_packet exception is thrown.
-         * 
-         * \param buffer The buffer from which this PDU will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        RadioTap(const uint8_t *buffer, uint32_t total_sz);
-        
-        /* Setters */
-        
-        #ifndef WIN32
-        /**
-         * \sa PDU::send()
-         */
-        void send(PacketSender &sender, const NetworkInterface &iface);
-        #endif
-        
-        /**
-         * \brief Setter for the version field.
-         * \param new_version The new version.
-         */
-        void version(uint8_t new_version);
-        
-        /**
-         * \brief Setter for the padding field.
-         * \param new_padding The new padding.
-         */
-        void padding(uint8_t new_padding);
-        
-        /**
-         * \brief Setter for the length field.
-         * \param new_length The new length.
-         */
-        void length(uint16_t new_length);
-        
-        /**
-         * \brief Setter for the TSFT field.
-         * \param new_tsft The new TSFT
-         */
-        void tsft(uint64_t new_tsft);
-        
-        /**
-         * \brief Setter for the flags field.
-         * \param new_flags The new flags.
-         */
-        void flags(FrameFlags new_flags);
-        
-        /**
-         * \brief Setter for the rate field.
-         * \param new_rate The new rate.
-         */
-        void rate(uint8_t new_rate);
-        
-        /**
-         * \brief Setter for the channel frequency and type field.
-         * \param new_freq The new channel frequency.
-         * \param new_type The new channel type.
-         */
-        void channel(uint16_t new_freq, uint16_t new_type);
-        
-        /**
-         * \brief Setter for the dbm signal field.
-         * \param new_dbm_signal The new dbm signal.
-         */
-        void dbm_signal(uint8_t new_dbm_signal);
-        
-        /**
-         * \brief Setter for the dbm noise field.
-         * \param new_dbm_noise The new dbm noise.
-         */
-        void dbm_noise(uint8_t new_dbm_noise);
-        
-        /**
-         * \brief Setter for the signal quality field.
-         * \param new_antenna The signal quality signal.
-         */
-        void signal_quality(uint8_t new_signal_quality);
-
-        /**
-         * \brief Setter for the antenna field.
-         * \param new_antenna The antenna signal.
-         */
-        void antenna(uint8_t new_antenna);
-        
-        /**
-         * \brief Setter for the db signal field.
-         * \param new_antenna The db signal signal.
-         */
-        void db_signal(uint8_t new_db_signal);
-
-        /**
-         * \brief Setter for the rx flag field.
-         * \param new_rx_flag The antenna signal.
-         */
-        void rx_flags(uint16_t new_rx_flag);
-        
-        /* Getters */
-        
-        /**
-         * \brief Getter for the version field.
-         * \return The version field.
-         */
-        uint8_t version() const { return _radio.it_version; }
-    
-        /**
-         * \brief Getter for the padding field.
-         * \return The padding field.
-         */
-        uint8_t padding() const { return _radio.it_pad; }
-        
-        /**
-         * \brief Getter for the length field.
-         * \return The length field.
-         */
-        uint16_t length() const { return Endian::le_to_host(_radio.it_len); }
-        
-        /**
-         * \brief Getter for the tsft field.
-         * \return The tsft field.
-         */
-        uint64_t tsft() const { return Endian::le_to_host(_tsft); }
-        
-        /**
-         * \brief Getter for the flags field.
-         * \return The flags field.
-         */
-        FrameFlags flags() const { return (FrameFlags)_flags; }
-        
-        /**
-         * \brief Getter for the rate field.
-         * \return The rate field.
-         */
-        uint8_t rate() const { return _rate; }
-        
-        /**
-         * \brief Getter for the channel frequency field.
-         * \return The channel frequency field.
-         */
-        uint16_t channel_freq() const { return Endian::le_to_host(_channel_freq); }
-        
-        /**
-         * \brief Getter for the channel type field.
-         * \return The channel type field.
-         */
-        uint16_t channel_type() const { return Endian::le_to_host(_channel_type); }
-        
-        /**
-         * \brief Getter for the dbm signal field.
-         * \return The dbm signal field.
-         */
-        uint8_t dbm_signal() const { return _dbm_signal; }
-        
-        /**
-         * \brief Getter for the dbm noise field.
-         * \return The dbm noise field.
-         */
-        uint8_t dbm_noise() const { return _dbm_noise; }
-        
-        /**
-         * \brief Getter for the signal quality field.
-         * \return The signal quality field.
-         */
-        uint16_t signal_quality() const { return _signal_quality; }
-
-        /**
-         * \brief Getter for the antenna field.
-         * \return The antenna field.
-         */
-        uint8_t antenna() const { return _antenna; }
-
-        /**
-         * \brief Getter for the db signal field.
-         * \return The db signal field.
-         */
-        uint8_t db_signal() const { return _db_signal; }
-        
-        /**
-         * \brief Getter for the channel+ field.
-         * \return The channel+ field.
-         */
-        uint32_t channel_plus() const { return Endian::le_to_host<uint32_t>(_channel_type); }
-        
-        /**
-         * \brief Getter for the rx flags field.
-         * \return The rx flags field.
-         */
-        uint16_t rx_flags() const { return Endian::le_to_host(_rx_flags); }
-        
-        /**
-         * \brief Getter for the present bit fields.
-         * 
-         * Use this method and masks created from the values taken from 
-         * the PresentFlags enum to find out which fields are set. 
-         * Accessing non-initialized fields, the behaviour is undefined
-         * will be undefined. It is only safe to use the getter of a field 
-         * if its corresponding bit flag is set in the present field.
-         */
-        PresentFlags present() const { 
-            //return (PresentFlags)*(uint32_t*)(&_radio.it_len + 1); 
-            return (PresentFlags)Endian::le_to_host(_radio.flags_32);
-        }
-        
-        /** \brief Check wether ptr points to a valid response for this PDU.
-         *
-         * \sa PDU::matches_response
-         * \param ptr The pointer to the buffer.
-         * \param total_sz The size of the buffer.
-         */
-        bool matches_response(const uint8_t *ptr, uint32_t total_sz) const;
-        
-        /**
-         * \brief Returns the RadioTap frame's header length.
-         *
-         * \return An uint32_t with the header's size.
-         * \sa PDU::header_size()
-         */
-        uint32_t header_size() const;
-        
-        /**
-         * \brief Returns the frame's trailer size.
-         * \return The trailer's size.
-         */
-        uint32_t trailer_size() const;
-        
-        /**
-         * \sa PDU::clone
-         */
-        RadioTap *clone() const {
-            return new RadioTap(*this);
-        }
-        
-        /**
-         * \brief Getter for the PDU's type.
-         * \sa PDU::pdu_type
-         */
-        PDUType pdu_type() const { return PDU::RADIOTAP; }
-    private:
-        TINS_BEGIN_PACK
-        struct radiotap_hdr {
-        #if TINS_IS_LITTLE_ENDIAN
-            uint8_t it_version;	
-            uint8_t it_pad;
-            uint16_t it_len;
-            union {
-                struct {
-                    uint32_t tsft:1,
-                        flags:1,
-                        rate:1,
-                        channel:1,
-                        fhss:1,
-                        dbm_signal:1,
-                        dbm_noise:1,
-                        lock_quality:1,
-                        tx_attenuation:1,
-                        db_tx_attenuation:1,
-                        dbm_tx_attenuation:1,
-                        antenna:1,
-                        db_signal:1,
-                        db_noise:1,
-                        rx_flags:1,
-                        reserved1:3,
-                        channel_plus:1,
-                        reserved2:12,
-                        ext:1;
-                } flags;
-                uint32_t flags_32;
-            };
-        #else
-            uint8_t it_pad;
-            uint8_t it_version;	
-            uint16_t it_len;
-            union {
-                struct {
-                    uint32_t lock_quality:1,
-                        dbm_noise:1,
-                        dbm_signal:1,
-                        fhss:1,
-                        channel:1,
-                        rate:1,
-                        flags:1,
-                        tsft:1,
-                        reserved3:1,
-                        rx_flags:1,
-                        db_tx_attenuation:1,
-                        dbm_tx_attenuation:1,
-                        antenna:1,
-                        db_signal:1,
-                        db_noise:1,
-                        tx_attenuation:1,
-                        reserved2:5,
-                        channel_plus:1,
-                        reserved1:2,
-                        reserved4:7,
-                        ext:1;
-                } flags;
-                uint32_t flags_32;
-            };
-        #endif
-        } TINS_END_PACK;
-        
-        void init();
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-        
-        
-        radiotap_hdr _radio;
-        // present fields...
-        uint64_t _tsft;
-        uint16_t _channel_type, _channel_freq, _rx_flags, _signal_quality;
-        uint8_t _antenna, _flags, _rate, _dbm_signal, _dbm_noise, _channel, _max_power, _db_signal;
-    };
-}
-
-#endif // TINS_RADIOTAP_H