Updated CHANGES, README and configure.ac files.

Removed DNSResourceRecord. Records in DNS are now managed completely by DNS::Resource.
Fixed some endianness bugs on ICMPv6 and PPI.
2026-01-23 10:45:57 +01:00 · 2014-01-23 11:30:05 -03:00 · 2014-01-21 22:56:53 -03:00 · 2014-01-19 14:40:57 -03:00 · 2014-01-19 14:17:25 -03:00 · 2014-01-19 13:11:50 -03:00
169 changed files with 18308 additions and 9429 deletions
--- a/108
+++ b/108
@@ -1,3 +1,111 @@
+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
--- a/4
+++ b/4
@@ -31,7 +31,7 @@ PROJECT_NAME           = libtins
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER         = 1.0
+PROJECT_NUMBER         = 1.2

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -1085,7 +1085,7 @@ SERVER_BASED_SEARCH    = NO
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.

-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO

 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,14 +13,13 @@ 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/dns_record.cpp \
-                    src/dot11.cpp \
                    src/dot3.cpp \
                    src/dot1q.cpp \
                    src/eapol.cpp \
@@ -28,16 +27,21 @@ libtins_la_SOURCES=src/arp.cpp \
                    src/icmp.cpp \
                    src/icmpv6.cpp \
                    src/internals.cpp \
-                    src/ip.cpp src/ip_address.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 \
@@ -46,20 +50,30 @@ libtins_la_SOURCES=src/arp.cpp \
                    src/tcp.cpp \
                    src/tcp_stream.cpp \
                    src/udp.cpp \
-                    src/utils.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

-libtins_includedir = $(includedir)/tins
-libtins_include_HEADERS = include/internals.h \
+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/dns_record.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 \
@@ -70,6 +84,7 @@ libtins_include_HEADERS = include/internals.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 \
@@ -81,6 +96,7 @@ libtins_include_HEADERS = include/internals.h \
 							include/bootp.h \
 							include/network_interface.h \
 							include/sll.h \
+							include/ppi.h \
 							include/radiotap.h \
 							include/dns.h \
 							include/rawpdu.h \
@@ -98,4 +114,18 @@ libtins_include_HEADERS = include/internals.h \
 							include/utils.h \
 							include/cxxstd.h \
 							include/stp.h \
-							include/exceptions.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/
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,11 +55,12 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(libtins_include_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/libtins.pc.in $(top_srcdir)/configure \
-	$(top_srcdir)/include/config.h.in AUTHORS THANKS TODO \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
+DIST_COMMON = README $(am__configure_deps) $(libtins_HEADERS) \
+	$(libtins_dot11_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/libtins.pc.in \
+	$(top_srcdir)/configure $(top_srcdir)/include/config.h.in \
+	AUTHORS THANKS config.guess config.sub depcomp install-sh \
+	ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -101,20 +102,25 @@ am__uninstall_files_from_dir = { \
         $(am__cd) "$$dir" && rm -f $$files; }; \
  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
-	"$(DESTDIR)$(libtins_includedir)"
+	"$(DESTDIR)$(libtinsdir)" "$(DESTDIR)$(libtins_dot11dir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libtins_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-am_libtins_la_OBJECTS = src/arp.lo src/bootp.lo src/stp.lo \
-	src/pppoe.lo src/crypto.lo src/dhcp.lo src/dhcpv6.lo \
-	src/dns.lo src/dns_record.lo src/dot11.lo src/dot3.lo \
+am_libtins_la_OBJECTS = src/arp.lo src/bootp.lo \
+	src/handshake_capturer.lo src/stp.lo src/pppoe.lo \
+	src/crypto.lo src/dhcp.lo src/dhcpv6.lo src/dns.lo src/dot3.lo \
 	src/dot1q.lo src/eapol.lo src/ethernetII.lo src/icmp.lo \
-	src/icmpv6.lo src/internals.lo src/ip.lo src/ip_address.lo \
-	src/ipv6.lo src/ipv6_address.lo src/llc.lo src/loopback.lo \
-	src/network_interface.lo src/packet_sender.lo \
-	src/packet_writer.lo src/pdu.lo src/radiotap.lo src/rawpdu.lo \
+	src/icmpv6.lo src/internals.lo src/ip_reassembler.lo src/ip.lo \
+	src/ip_address.lo src/ipv6.lo src/ipv6_address.lo src/ipsec.lo \
+	src/llc.lo src/loopback.lo src/network_interface.lo \
+	src/packet_sender.lo src/packet_writer.lo src/ppi.lo \
+	src/pdu.lo src/radiotap.lo src/address_range.lo src/rawpdu.lo \
 	src/rsn_information.lo src/sll.lo src/snap.lo src/sniffer.lo \
-	src/tcp.lo src/tcp_stream.lo src/udp.lo src/utils.lo
+	src/tcp.lo src/tcp_stream.lo src/udp.lo src/utils.lo \
+	src/dot11/dot11_base.lo src/dot11/dot11_data.lo \
+	src/dot11/dot11_mgmt.lo src/dot11/dot11_beacon.lo \
+	src/dot11/dot11_assoc.lo src/dot11/dot11_auth.lo \
+	src/dot11/dot11_probe.lo src/dot11/dot11_control.lo
 libtins_la_OBJECTS = $(am_libtins_la_OBJECTS)
 libtins_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -140,7 +146,7 @@ am__can_run_installinfo = \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
 DATA = $(pkgconfig_DATA)
-HEADERS = $(libtins_include_HEADERS)
+HEADERS = $(libtins_HEADERS) $(libtins_dot11_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -295,14 +301,13 @@ 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/dns_record.cpp \
-                    src/dot11.cpp \
                    src/dot3.cpp \
                    src/dot1q.cpp \
                    src/eapol.cpp \
@@ -310,16 +315,21 @@ libtins_la_SOURCES = src/arp.cpp \
                    src/icmp.cpp \
                    src/icmpv6.cpp \
                    src/internals.cpp \
-                    src/ip.cpp src/ip_address.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 \
@@ -328,20 +338,29 @@ libtins_la_SOURCES = src/arp.cpp \
                    src/tcp.cpp \
                    src/tcp_stream.cpp \
                    src/udp.cpp \
-                    src/utils.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

-libtins_includedir = $(includedir)/tins
-libtins_include_HEADERS = include/internals.h \
+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/dns_record.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 \
@@ -352,6 +371,7 @@ libtins_include_HEADERS = include/internals.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 \
@@ -363,6 +383,7 @@ libtins_include_HEADERS = include/internals.h \
 							include/bootp.h \
 							include/network_interface.h \
 							include/sll.h \
+							include/ppi.h \
 							include/radiotap.h \
 							include/dns.h \
 							include/rawpdu.h \
@@ -380,8 +401,21 @@ libtins_include_HEADERS = include/internals.h \
 							include/utils.h \
 							include/cxxstd.h \
 							include/stp.h \
-							include/exceptions.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/
 all: all-am

 .SUFFIXES:
@@ -477,14 +511,14 @@ src/$(DEPDIR)/$(am__dirstamp):
 	@: > src/$(DEPDIR)/$(am__dirstamp)
 src/arp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/bootp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/handshake_capturer.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/stp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/pppoe.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/crypto.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/dhcp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/dhcpv6.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/dns.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/dns_record.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/dot11.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/dot3.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/dot1q.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/eapol.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -492,10 +526,13 @@ src/ethernetII.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/icmp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/icmpv6.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/internals.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/ip_reassembler.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/ip.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/ip_address.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/ipv6.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/ipv6_address.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/ipsec.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/llc.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/loopback.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/network_interface.lo: src/$(am__dirstamp) \
@@ -504,8 +541,11 @@ src/packet_sender.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/packet_writer.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/ppi.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/pdu.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/radiotap.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/address_range.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/rawpdu.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/rsn_information.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -516,11 +556,35 @@ src/tcp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/tcp_stream.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/udp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/utils.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/dot11/$(am__dirstamp):
+	@$(MKDIR_P) src/dot11
+	@: > src/dot11/$(am__dirstamp)
+src/dot11/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/dot11/$(DEPDIR)
+	@: > src/dot11/$(DEPDIR)/$(am__dirstamp)
+src/dot11/dot11_base.lo: src/dot11/$(am__dirstamp) \
+	src/dot11/$(DEPDIR)/$(am__dirstamp)
+src/dot11/dot11_data.lo: src/dot11/$(am__dirstamp) \
+	src/dot11/$(DEPDIR)/$(am__dirstamp)
+src/dot11/dot11_mgmt.lo: src/dot11/$(am__dirstamp) \
+	src/dot11/$(DEPDIR)/$(am__dirstamp)
+src/dot11/dot11_beacon.lo: src/dot11/$(am__dirstamp) \
+	src/dot11/$(DEPDIR)/$(am__dirstamp)
+src/dot11/dot11_assoc.lo: src/dot11/$(am__dirstamp) \
+	src/dot11/$(DEPDIR)/$(am__dirstamp)
+src/dot11/dot11_auth.lo: src/dot11/$(am__dirstamp) \
+	src/dot11/$(DEPDIR)/$(am__dirstamp)
+src/dot11/dot11_probe.lo: src/dot11/$(am__dirstamp) \
+	src/dot11/$(DEPDIR)/$(am__dirstamp)
+src/dot11/dot11_control.lo: src/dot11/$(am__dirstamp) \
+	src/dot11/$(DEPDIR)/$(am__dirstamp)
 libtins.la: $(libtins_la_OBJECTS) $(libtins_la_DEPENDENCIES) $(EXTRA_libtins_la_DEPENDENCIES) 
 	$(libtins_la_LINK) -rpath $(libdir) $(libtins_la_OBJECTS) $(libtins_la_LIBADD) $(LIBS)

 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f src/address_range.$(OBJEXT)
+	-rm -f src/address_range.lo
 	-rm -f src/arp.$(OBJEXT)
 	-rm -f src/arp.lo
 	-rm -f src/bootp.$(OBJEXT)
@@ -533,10 +597,22 @@ mostlyclean-compile:
 	-rm -f src/dhcpv6.lo
 	-rm -f src/dns.$(OBJEXT)
 	-rm -f src/dns.lo
-	-rm -f src/dns_record.$(OBJEXT)
-	-rm -f src/dns_record.lo
-	-rm -f src/dot11.$(OBJEXT)
-	-rm -f src/dot11.lo
+	-rm -f src/dot11/dot11_assoc.$(OBJEXT)
+	-rm -f src/dot11/dot11_assoc.lo
+	-rm -f src/dot11/dot11_auth.$(OBJEXT)
+	-rm -f src/dot11/dot11_auth.lo
+	-rm -f src/dot11/dot11_base.$(OBJEXT)
+	-rm -f src/dot11/dot11_base.lo
+	-rm -f src/dot11/dot11_beacon.$(OBJEXT)
+	-rm -f src/dot11/dot11_beacon.lo
+	-rm -f src/dot11/dot11_control.$(OBJEXT)
+	-rm -f src/dot11/dot11_control.lo
+	-rm -f src/dot11/dot11_data.$(OBJEXT)
+	-rm -f src/dot11/dot11_data.lo
+	-rm -f src/dot11/dot11_mgmt.$(OBJEXT)
+	-rm -f src/dot11/dot11_mgmt.lo
+	-rm -f src/dot11/dot11_probe.$(OBJEXT)
+	-rm -f src/dot11/dot11_probe.lo
 	-rm -f src/dot1q.$(OBJEXT)
 	-rm -f src/dot1q.lo
 	-rm -f src/dot3.$(OBJEXT)
@@ -545,6 +621,8 @@ mostlyclean-compile:
 	-rm -f src/eapol.lo
 	-rm -f src/ethernetII.$(OBJEXT)
 	-rm -f src/ethernetII.lo
+	-rm -f src/handshake_capturer.$(OBJEXT)
+	-rm -f src/handshake_capturer.lo
 	-rm -f src/icmp.$(OBJEXT)
 	-rm -f src/icmp.lo
 	-rm -f src/icmpv6.$(OBJEXT)
@@ -555,6 +633,10 @@ mostlyclean-compile:
 	-rm -f src/ip.lo
 	-rm -f src/ip_address.$(OBJEXT)
 	-rm -f src/ip_address.lo
+	-rm -f src/ip_reassembler.$(OBJEXT)
+	-rm -f src/ip_reassembler.lo
+	-rm -f src/ipsec.$(OBJEXT)
+	-rm -f src/ipsec.lo
 	-rm -f src/ipv6.$(OBJEXT)
 	-rm -f src/ipv6.lo
 	-rm -f src/ipv6_address.$(OBJEXT)
@@ -571,6 +653,8 @@ mostlyclean-compile:
 	-rm -f src/packet_writer.lo
 	-rm -f src/pdu.$(OBJEXT)
 	-rm -f src/pdu.lo
+	-rm -f src/ppi.$(OBJEXT)
+	-rm -f src/ppi.lo
 	-rm -f src/pppoe.$(OBJEXT)
 	-rm -f src/pppoe.lo
 	-rm -f src/radiotap.$(OBJEXT)
@@ -599,23 +683,25 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c

+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/address_range.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/arp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/bootp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/crypto.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dhcp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dhcpv6.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dns.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dns_record.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dot11.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dot1q.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dot3.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/eapol.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ethernetII.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/handshake_capturer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/icmp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/icmpv6.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/internals.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ip.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ip_address.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ip_reassembler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ipsec.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ipv6.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ipv6_address.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/llc.Plo@am__quote@
@@ -624,6 +710,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/packet_sender.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/packet_writer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pdu.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ppi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pppoe.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/radiotap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rawpdu.Plo@am__quote@
@@ -636,6 +723,14 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tcp_stream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/udp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dot11/$(DEPDIR)/dot11_assoc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dot11/$(DEPDIR)/dot11_auth.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dot11/$(DEPDIR)/dot11_base.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dot11/$(DEPDIR)/dot11_beacon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dot11/$(DEPDIR)/dot11_control.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dot11/$(DEPDIR)/dot11_data.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dot11/$(DEPDIR)/dot11_mgmt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dot11/$(DEPDIR)/dot11_probe.Plo@am__quote@

 .cpp.o:
@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -667,6 +762,7 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 	-rm -rf src/.libs src/_libs
+	-rm -rf src/dot11/.libs src/dot11/_libs

 distclean-libtool:
 	-rm -f libtool config.lt
@@ -691,27 +787,48 @@ uninstall-pkgconfigDATA:
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-libtins_includeHEADERS: $(libtins_include_HEADERS)
+install-libtinsHEADERS: $(libtins_HEADERS)
 	@$(NORMAL_INSTALL)
-	@list='$(libtins_include_HEADERS)'; test -n "$(libtins_includedir)" || list=; \
+	@list='$(libtins_HEADERS)'; test -n "$(libtinsdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libtins_includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libtins_includedir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libtinsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libtinsdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libtins_includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libtins_includedir)" || exit $$?; \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libtinsdir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libtinsdir)" || exit $$?; \
 	done

-uninstall-libtins_includeHEADERS:
+uninstall-libtinsHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libtins_include_HEADERS)'; test -n "$(libtins_includedir)" || list=; \
+	@list='$(libtins_HEADERS)'; test -n "$(libtinsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libtins_includedir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(libtinsdir)'; $(am__uninstall_files_from_dir)
+install-libtins_dot11HEADERS: $(libtins_dot11_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(libtins_dot11_HEADERS)'; test -n "$(libtins_dot11dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libtins_dot11dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libtins_dot11dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libtins_dot11dir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libtins_dot11dir)" || exit $$?; \
+	done
+
+uninstall-libtins_dot11HEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libtins_dot11_HEADERS)'; test -n "$(libtins_dot11dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(libtins_dot11dir)'; $(am__uninstall_files_from_dir)

 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -931,7 +1048,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libtins_includedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libtinsdir)" "$(DESTDIR)$(libtins_dot11dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -962,6 +1079,8 @@ distclean-generic:
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/$(am__dirstamp)
+	-rm -f src/dot11/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/dot11/$(am__dirstamp)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -973,7 +1092,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \

 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf src/$(DEPDIR)
+	-rm -rf src/$(DEPDIR) src/dot11/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -990,7 +1109,8 @@ info: info-am

 info-am:

-install-data-am: install-libtins_includeHEADERS install-pkgconfigDATA
+install-data-am: install-libtinsHEADERS install-libtins_dot11HEADERS \
+	install-pkgconfigDATA

 install-dvi: install-dvi-am

@@ -1021,7 +1141,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf src/$(DEPDIR)
+	-rm -rf src/$(DEPDIR) src/dot11/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

@@ -1038,8 +1158,8 @@ ps: ps-am

 ps-am:

-uninstall-am: uninstall-libLTLIBRARIES \
-	uninstall-libtins_includeHEADERS uninstall-pkgconfigDATA
+uninstall-am: uninstall-libLTLIBRARIES uninstall-libtinsHEADERS \
+	uninstall-libtins_dot11HEADERS uninstall-pkgconfigDATA

 .MAKE: install-am install-strip

@@ -1053,14 +1173,15 @@ uninstall-am: uninstall-libLTLIBRARIES \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-libtins_includeHEADERS \
-	install-man install-pdf install-pdf-am install-pkgconfigDATA \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-libtins_includeHEADERS uninstall-pkgconfigDATA
+	install-libLTLIBRARIES install-libtinsHEADERS \
+	install-libtins_dot11HEADERS install-man install-pdf \
+	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-libLTLIBRARIES uninstall-libtinsHEADERS \
+	uninstall-libtins_dot11HEADERS uninstall-pkgconfigDATA


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/33
+++ b/33
@@ -1,24 +1,27 @@
 ------------------------------------------------------------------------
-       libtins v1.0
+       libtins v2.0
 ------------------------------------------------------------------------


 -------------------------------- About ---------------------------------

-libtins is a C++ library for crafting, sending, sniffing and 
-interpreting raw network packets.
+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 which 
-show libtins' actual performance, please visit:
+In order to read tutorials, examples and checkout some benchmarks of the
+library, please visit:

-http://libtins.sourceforge.net 
+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
@@ -32,11 +35,23 @@ like to generate a static library file as well, run:
 The generated static/shared library files will be located in the .libs
 directory.

-If you want to enable C++11 features, such as move semantics, use the
--enable-c++11 switch:
+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 
@@ -55,4 +70,4 @@ ldconfig
 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.sourceforge.net/index.php?page=examples
+http://libtins.github.io/examples/
--- a/README.md
+++ b/README.md
@@ -0,0 +1,85 @@
+libtins
+=======
+
+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](http://libtins.github.io/) depends on 
+[libpcap](http://www.tcpdump.org/) and 
+[openssl](http://www.openssl.org/), although the latter is not necessary 
+if some features of the library are disabled.
+
+In order to compile, execute:
+
+```Shell
+./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:
+
+```Shell
+./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:
+
+```Shell
+./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:
+
+```Shell
+./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:
+
+```Shell
+./configure --disable-dot11
+```
+
+## Installing ##
+
+Once you're done, if you want to install the header files and the 
+shared object, execute as root:
+
+```Shell
+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):
+
+```Shell
+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/
--- a/122
+++ b/122
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libtins 1.0.
+# Generated by GNU Autoconf 2.69 for libtins 2.0.
 #
 # Report bugs to <matias.fontanini@gmail.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libtins'
 PACKAGE_TARNAME='libtins'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='libtins 1.0'
+PACKAGE_VERSION='2.0'
+PACKAGE_STRING='libtins 2.0'
 PACKAGE_BUGREPORT='matias.fontanini@gmail.com'
 PACKAGE_URL='http://libtins.sourceforge.net'

@@ -775,6 +775,8 @@ enable_maintainer_mode
 with_pcap_include_path
 with_pcap_lib_path
 enable_c__11
+enable_dot11
+enable_wpa2
 '
      ac_precious_vars='build_alias
 host_alias
@@ -1329,7 +1331,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures libtins 1.0 to adapt to many kinds of systems.
+\`configure' configures libtins 2.0 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1400,7 +1402,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of libtins 1.0:";;
+     short | recursive ) echo "Configuration of libtins 2.0:";;
   esac
  cat <<\_ACEOF

@@ -1418,6 +1420,8 @@ Optional Features:
  --disable-maintainer-mode  disable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
  --enable-c++11          enable C++11 features
+  --disable-dot11         disable IEEE 802.11 support
+  --disable-wpa2          disable WPA2 decryption features

 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1512,7 +1516,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-libtins configure 1.0
+libtins configure 2.0
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2002,7 +2006,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by libtins $as_me 1.0, which was
+It was created by libtins $as_me 2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -2930,7 +2934,7 @@ fi

 # Define the identity of the package.
 PACKAGE='libtins'
- VERSION='1.0'
+ VERSION='2.0'


 cat >>confdefs.h <<_ACEOF
@@ -15199,6 +15203,8 @@ CPPFLAGS=$old_cppflags

 # Options

+wpa2_msg="WPA2 decryption(which requires openssl) can be disabled using the --disable-wpa2 flag."
+
 # Check whether --enable-c++11 was given.
 if test "${enable_c__11+set}" = set; then :
  enableval=$enable_c__11;     ax_cxx_compile_cxx11_required=truednl
@@ -15324,6 +15330,100 @@ $as_echo "#define HAVE_CXX11 1" >>confdefs.h
  fi


+fi
+
+
+# Check whether --enable-dot11 was given.
+if test "${enable_dot11+set}" = set; then :
+  enableval=$enable_dot11;
+else
+
+
+$as_echo "#define HAVE_DOT11 1" >>confdefs.h
+
+
+        # Only allow enabling WPA2 if Dot11 is enabled.
+        # Check whether --enable-wpa2 was given.
+if test "${enable_wpa2+set}" = set; then :
+  enableval=$enable_wpa2;
+else
+
+                for ac_header in openssl/evp.h openssl/hmac.h openssl/aes.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  as_fn_error $? "openssl headers are missing! $wpa2_msg " "$LINENO" 5
+
+$as_echo "#define HAVE_WPA2_DECRYPTION 0" >>confdefs.h
+
+
+fi
+
+done
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PKCS5_PBKDF2_HMAC_SHA1 in -lcrypto" >&5
+$as_echo_n "checking for PKCS5_PBKDF2_HMAC_SHA1 in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_PKCS5_PBKDF2_HMAC_SHA1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PKCS5_PBKDF2_HMAC_SHA1 ();
+int
+main ()
+{
+return PKCS5_PBKDF2_HMAC_SHA1 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_PKCS5_PBKDF2_HMAC_SHA1=yes
+else
+  ac_cv_lib_crypto_PKCS5_PBKDF2_HMAC_SHA1=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_PKCS5_PBKDF2_HMAC_SHA1" >&5
+$as_echo "$ac_cv_lib_crypto_PKCS5_PBKDF2_HMAC_SHA1" >&6; }
+if test "x$ac_cv_lib_crypto_PKCS5_PBKDF2_HMAC_SHA1" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCRYPTO 1
+_ACEOF
+
+  LIBS="-lcrypto $LIBS"
+
+else
+  as_fn_error $? "openssl library is missing! $wpa2_msg " "$LINENO" 5
+
+fi
+
+
+$as_echo "#define HAVE_WPA2_DECRYPTION 1" >>confdefs.h
+
+
+
+fi
+
+
+
 fi


@@ -15332,7 +15432,7 @@ fi



-LIBTINS_VERSION=1:0:0
+LIBTINS_VERSION=2:0:0

 ac_config_files="$ac_config_files Makefile libtins.pc"

@@ -15866,7 +15966,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libtins $as_me 1.0, which was
+This file was extended by libtins $as_me 2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -15933,7 +16033,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libtins config.status 1.0
+libtins config.status 2.0
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
-AC_INIT([libtins], [1.0], [matias.fontanini@gmail.com], [libtins], [http://libtins.sourceforge.net])
+AC_INIT([libtins], [2.0], [matias.fontanini@gmail.com], [libtins], [http://libtins.sourceforge.net])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_HEADER(include/config.h)
-AM_INIT_AUTOMAKE([-Wall -Werror])
+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-extra-portability foreign])
 LT_INIT([disable-static])
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE([enable])
@@ -36,17 +36,50 @@ 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], [1:0:0])
+AC_SUBST([LIBTINS_VERSION], [2:0:0])
 AC_CONFIG_FILES([Makefile libtins.pc])
 AC_OUTPUT
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,7 +1,7 @@
 CXX=@CXX@
 CXXFLAGS=-Wall @CXXFLAGS@
 LDFLAGS=-ltins
-EXECUTABLES=arpspoof portscan traceroute beacon_display
+EXECUTABLES=arpspoofing arpmonitor portscan traceroute beacon_display dns_queries dns_spoof wps_detect

 all: $(EXECUTABLES)

@@ -9,11 +9,23 @@ compile: $(OBJECTS)

 recompile: clean all

-arpspoof: 
+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)
+
 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
--- a/examples/arpmonitor.cpp
+++ b/examples/arpmonitor.cpp
@@ -0,0 +1,63 @@
+#include <tins/tins.h>
+#include <map>
+#include <iostream>
+#include <functional>
+
+using namespace Tins;
+
+class arp_monitor {
+public:
+    void run(Sniffer &sniffer);
+private:
+    bool callback(const PDU &pdu);
+
+    std::map<IPv4Address, HWAddress<6>> addresses;
+};
+
+void arp_monitor::run(Sniffer &sniffer)
+{
+    sniffer.sniff_loop(
+        std::bind(
+            &arp_monitor::callback,
+            this,
+            std::placeholders::_1
+        )
+    );
+}
+
+bool arp_monitor::callback(const PDU &pdu)
+{
+    // Retrieve the ARP layer
+    const ARP &arp = pdu.rfind_pdu<ARP>();
+    // Is it an 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()) {
+            // 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;
+        }
+        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;
+            }
+        }
+    }
+    return true;
+}
+
+int main(int argc, char *argv[]) 
+{
+    if(argc != 2) {
+        std::cout << "Usage: " << *argv << " <interface>\n";
+        return 1;
+    }
+    arp_monitor monitor;
+    Sniffer sniffer(argv[1], 2000, true, "arp");
+    monitor.run(sniffer);
+}
--- a/examples/arpspoofing.cpp
+++ b/examples/arpspoofing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Nasel
+ * Copyright (c) 2012, Matias Fontanini
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -62,18 +62,18 @@ void do_arp_spoofing(NetworkInterface iface, IPv4Address gw, IPv4Address victim,
    
    /* We tell the gateway that the victim is at out hw address,
     * and tell the victim that the gateway is at out hw address */
-    ARP *gw_arp     = new ARP(gw, victim, gw_hw, info.hw_addr), 
-        *victim_arp = new ARP(victim, gw, victim_hw, info.hw_addr);
+    ARP gw_arp(gw, victim, gw_hw, info.hw_addr), 
+        victim_arp(victim, gw, victim_hw, info.hw_addr);
    // We are "replying" ARP requests
-    gw_arp->opcode(ARP::REPLY);
-    victim_arp->opcode(ARP::REPLY);
+    gw_arp.opcode(ARP::REPLY);
+    victim_arp.opcode(ARP::REPLY);
    
    /* The packet we'll send to the gateway and victim. 
     * We include our hw address as the source address
     * in ethernet layer, to avoid possible packet dropping
     * performed by any routers. */
-    EthernetII to_gw(gw_hw, info.hw_addr, gw_arp);
-    EthernetII to_victim(victim_hw, info.hw_addr, victim_arp);
+    EthernetII to_gw = EthernetII(gw_hw, info.hw_addr) / gw_arp;
+    EthernetII to_victim = EthernetII(victim_hw, info.hw_addr) / victim_arp;
    while(true) {
        // Just send them once every 5 seconds.
        sender.send(to_gw, iface);
--- a/examples/beacon_display.cpp
+++ b/examples/beacon_display.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Nasel
+ * Copyright (c) 2012, Matias Fontanini
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -53,11 +53,11 @@ void BeaconSniffer::run(const std::string &iface) {
 
 bool BeaconSniffer::callback(PDU &pdu) {
    // Get the Dot11 layer
-    Dot11Beacon *beacon = pdu.find_pdu<Dot11Beacon>();
+    const Dot11Beacon &beacon = pdu.rfind_pdu<Dot11Beacon>();
    // All beacons must have from_ds == to_ds == 0
-    if(beacon && !beacon->from_ds() && !beacon->to_ds()) {
+    if(!beacon.from_ds() && !beacon.to_ds()) {
        // Get the AP address
-        address_type addr = beacon->addr2();
+        address_type addr = beacon.addr2();
        // Look it up in our set
        ssids_type::iterator it = ssids.find(addr);
        if(it == ssids.end()) {
@@ -66,7 +66,7 @@ bool BeaconSniffer::callback(PDU &pdu) {
                /* If no ssid option is set, then Dot11::ssid will throw 
                 * a std::runtime_error.
                 */
-                std::string ssid = beacon->ssid();
+                std::string ssid = beacon.ssid();
                // Save it so we don't show it again.
                ssids.insert(addr);
                // Display the tuple "address - ssid".
--- a/examples/configure
+++ b/examples/configure
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for myconfig 0.1.
+# Generated by GNU Autoconf 2.69 for myconfig 0.1.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -89,6 +87,7 @@ fi
 IFS=" ""	$as_nl"

 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
  *[\\/]* ) as_myself=$0 ;;
  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -133,6 +132,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH

+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
  emulate sh
@@ -166,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
  exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -211,14 +236,25 @@ IFS=$as_save_IFS


      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi

    if test x$as_have_required = xno; then :
@@ -320,6 +356,14 @@ $as_echo X"$as_dir" |


 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -441,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
  chmod +x "$as_me.lineno" ||
    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }

+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
  # Don't try to exec as it changes $[0], causing all sort of problems
  # (the dirname of $[0] is not the place where we might find the
  # original and so on.  Autoconf is especially sensitive to this).
@@ -475,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
    # ... but there are two gotchas:
    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
  elif ln conf$$.file conf$$ 2>/dev/null; then
    as_ln_s=ln
  else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
  fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -496,28 +544,8 @@ else
  as_mkdir_p=false
 fi

-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p

 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -592,7 +620,6 @@ ac_includes_default="\

 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-CFLAGS
 EGREP
 GREP
 CXXCPP
@@ -1059,7 +1086,7 @@ Try \`$0 --help' for more information"
    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
    ;;

  esac
@@ -1110,8 +1137,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
  if test "x$build_alias" = x; then
    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
  elif test "x$build_alias" != "x$host_alias"; then
    cross_compiling=yes
  fi
@@ -1339,9 +1364,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
 myconfig configure 0.1
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.69

-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1385,11 +1410,57 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  as_fn_set_status $ac_retval

 } # ac_fn_cxx_try_compile

+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
 # ac_fn_cxx_try_cpp LINENO
 # ------------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -1422,7 +1493,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

    ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  as_fn_set_status $ac_retval

 } # ac_fn_cxx_try_cpp
@@ -1435,10 +1506,10 @@ fi
 ac_fn_cxx_check_header_mongrel ()
 {
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
  $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1501,7 +1572,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 esac
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  eval "$3=\$ac_header_compiler"
@@ -1510,7 +1581,7 @@ eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

 } # ac_fn_cxx_check_header_mongrel

@@ -1551,7 +1622,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
       ac_retval=$ac_status
 fi
  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  as_fn_set_status $ac_retval

 } # ac_fn_cxx_try_run
@@ -1565,7 +1636,7 @@ ac_fn_cxx_check_header_compile ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1583,61 +1654,15 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

 } # ac_fn_cxx_check_header_compile
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

 It was created by myconfig $as_me 0.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@

@@ -1895,7 +1920,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
  fi
 done

@@ -2001,7 +2026,7 @@ if test -z "$CXX"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$CXX"; then
@@ -2013,7 +2038,7 @@ do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    break 2
@@ -2045,7 +2070,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$ac_ct_CXX"; then
@@ -2057,7 +2082,7 @@ do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    ac_cv_prog_ac_ct_CXX="$ac_prog"
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    break 2
@@ -2209,7 +2234,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -2252,7 +2277,7 @@ else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -2311,7 +2336,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    fi
  fi
 fi
@@ -2322,7 +2347,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2363,7 +2388,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -2373,7 +2398,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2410,7 +2435,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -2499,13 +2524,30 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu


-if test -n "$debug"
-then
-    CFLAGS="-DDEBUG -g"
-else
-    CFLAGS="-O3"
-fi
+saved_libs="${LIBS}"
+LIBS="${LIBS} -ltins"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtins" >&5
+$as_echo_n "checking libtins... " >&6; }

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <tins/dns.h>
+int
+main ()
+{
+Tins::DNS dummy
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  echo done
+else
+  echo error; echo *** libtins is not installed. Aborting... ***; exit 1
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS="${saved_libs}"

 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -2515,7 +2557,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  if ${ac_cv_prog_CXXCPP+:} false; then :
  $as_echo_n "(cached) " >&6
 else
      # Double quotes because CXXCPP needs to be expanded
@@ -2631,7 +2673,7 @@ else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi

 ac_ext=cpp
@@ -2643,7 +2685,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  if test -z "$GREP"; then
@@ -2657,7 +2699,7 @@ do
    for ac_prog in grep ggrep; do
    for ac_exec_ext in '' $ac_executable_extensions; do
      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
  # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -2706,7 +2748,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -2723,7 +2765,7 @@ do
    for ac_prog in egrep; do
    for ac_exec_ext in '' $ac_executable_extensions; do
      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
  # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -2773,7 +2815,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2900,65 +2942,20 @@ fi
 done


-for ac_header in pcap.h
+for ac_header in tins/tins.h
 do :
-  ac_fn_cxx_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
-if test "x$ac_cv_header_pcap_h" = x""yes; then :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "tins/tins.h" "ac_cv_header_tins_tins_h" "$ac_includes_default"
+if test "x$ac_cv_header_tins_tins_h" = xyes; then :
  cat >>confdefs.h <<_ACEOF
-#define HAVE_PCAP_H 1
+#define HAVE_TINS_TINS_H 1
 _ACEOF

+else
+  echo "*** Error: libtins' headers are absent ***"; exit 1;
 fi

 done

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_loop in -lpcap" >&5
-$as_echo_n "checking for pcap_loop in -lpcap... " >&6; }
-if test "${ac_cv_lib_pcap_pcap_loop+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpcap  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pcap_loop ();
-int
-main ()
-{
-return pcap_loop ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_pcap_pcap_loop=yes
-else
-  ac_cv_lib_pcap_pcap_loop=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_loop" >&5
-$as_echo "$ac_cv_lib_pcap_pcap_loop" >&6; }
-if test "x$ac_cv_lib_pcap_pcap_loop" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPCAP 1
-_ACEOF
-
-  LIBS="-lpcap $LIBS"
-
-else
-  as_fn_error $? "pcap library is needed!" "$LINENO" 5
-fi
-

 ac_config_files="$ac_config_files Makefile"

@@ -3026,10 +3023,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -3097,7 +3105,7 @@ LTLIBOBJS=$ac_ltlibobjs



-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -3198,6 +3206,7 @@ fi
 IFS=" ""	$as_nl"

 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
  *[\\/]* ) as_myself=$0 ;;
  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3393,16 +3402,16 @@ if (echo >conf$$.file) 2>/dev/null; then
    # ... but there are two gotchas:
    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
  elif ln conf$$.file conf$$ 2>/dev/null; then
    as_ln_s=ln
  else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
  fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -3462,28 +3471,16 @@ else
  as_mkdir_p=false
 fi

-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p

 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3505,7 +3502,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by myconfig $as_me 0.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
  CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3558,10 +3555,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 myconfig config.status 0.1
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."

@@ -3638,7 +3635,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  shift
  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
  CONFIG_SHELL='$SHELL'
@@ -3669,7 +3666,7 @@ do
  case $ac_config_target in
    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  esac
 done

@@ -3690,9 +3687,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
  trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -3700,12 +3698,13 @@ $debug ||

 {
  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
  tmp=./conf$$-$RANDOM
  (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp

 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -3727,7 +3726,7 @@ else
  ac_cs_awk_cr=$ac_cr
 fi

-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF


@@ -3755,7 +3754,7 @@ done
 rm -f conf$$subs.sh

 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -3803,7 +3802,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  for (key in S) S_is_set[key] = 1
  FS = ""

@@ -3835,7 +3834,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF

@@ -3875,7 +3874,7 @@ do
  esac
  case $ac_mode$ac_tag in
  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
  :[FH]-) ac_tag=-:-;;
  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  esac
@@ -3894,7 +3893,7 @@ do
    for ac_f
    do
      case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
      *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -3903,7 +3902,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
      esac
      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
      as_fn_append ac_file_inputs " '$ac_f'"
@@ -3929,8 +3928,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
    esac

    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
    esac
    ;;
  esac
@@ -4055,21 +4054,22 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5

 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}

-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  esac \
  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 ;;
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -3,14 +3,15 @@ AC_INIT(myconfig, 0.1)
 AC_PROG_CXX()
 AC_LANG(C++)

-if test -n "$debug"
-then
-    CFLAGS="-DDEBUG -g"
-else
-    CFLAGS="-O3"
-fi
+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_CHECK_HEADERS([pcap.h])
-AC_CHECK_LIB(pcap, pcap_loop, [], [AC_MSG_ERROR([pcap library is needed!])])
-AC_SUBST(CFLAGS)
 AC_OUTPUT(Makefile)
--- a/examples/dns_queries.cpp
+++ b/examples/dns_queries.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2012, 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 <tins/tins.h>
+#include <iostream>
+
+using namespace Tins;
+
+bool callback(const PDU &pdu) 
+{
+    // The packet probably looks like this:
+    //
+    // EthernetII / IP / UDP / RawPDU
+    //
+    // So we retrieve the RawPDU layer, and construct a 
+    // DNS PDU using its contents.
+    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;
+    return true;
+}
+
+int main(int argc, char *argv[]) 
+{
+    if(argc != 2) {
+        std::cout << "Usage: " << *argv << " <interface>" << std::endl;
+        return 1;
+    }
+    // Sniff on the provided interface, maximum packet size 2000
+    // in promiscuos mode and only udp packets sent to port 53
+    Sniffer sniffer(argv[1], 2000, true, "udp and dst port 53");
+    sniffer.sniff_loop(callback);
+}
--- a/examples/dns_spoof.cpp
+++ b/examples/dns_spoof.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2012, 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 <tins/tins.h>
+#include <iostream>
+
+using namespace Tins;
+
+PacketSender sender;
+
+bool callback(const PDU &pdu) 
+{
+    // The packet probably looks like this:
+    //
+    // EthernetII / IP / UDP / RawPDU
+    //
+    // So we retrieve each layer, and construct a 
+    // DNS PDU from the RawPDU layer contents.
+    EthernetII eth = pdu.rfind_pdu<EthernetII>();
+    IP ip = eth.rfind_pdu<IP>();
+    UDP udp = ip.rfind_pdu<UDP>();
+    DNS dns = udp.rfind_pdu<RawPDU>().to<DNS>();
+
+    // Is it a 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) {
+                // Here's one! Let's add an answer.
+                dns.add_answer(
+                    query.dname(), 
+                    // 777 is just a random TTL
+                    DNS::make_info(DNS::A, query.query_class(), 777),
+                    IPv4Address("127.0.0.1")
+                );
+            }
+        }
+        // Have we added some answers?
+        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;
+            // Send it!
+            sender.send(pkt);
+        }
+    }
+    return true;
+}
+
+int main(int argc, char *argv[]) 
+{
+    if(argc != 2) {
+        std::cout << "Usage: " << *argv << " <interface>" << std::endl;
+        return 1;
+    }
+    // Sniff on the provided interface, maximum packet size 2000
+    // in promiscuos mode and only udp packets sent to port 53
+    Sniffer sniffer(argv[1], 2000, true, "udp and dst port 53");
+    // All packets will be sent through the provided interface
+    sender.default_interface(argv[1]);
+    sniffer.sniff_loop(callback);
+}
--- a/examples/portscan.cpp
+++ b/examples/portscan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Nasel
+ * Copyright (c) 2012, Matias Fontanini
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -54,19 +54,17 @@ typedef std::pair<Sniffer*, std::string> sniffer_data;
 * the scanned port's status.
 */
 bool handler(PDU &pdu) {
-    TCP *tcp = pdu.find_pdu<TCP>();
-    if(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";
-        }
-        // Is SYN flag on? Then port is open!
-        else if(tcp->get_flag(TCP::SYN) && tcp->get_flag(TCP::ACK))
-            cout << "Port: " << setw(5) << tcp->sport() << " open\n";
+    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";
    }
+    // 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;
 }

@@ -75,17 +73,18 @@ void send_syns(const NetworkInterface &iface, IPv4Address dest_ip, const vector<
    // Retrieve the addresses.
    NetworkInterface::Info info = iface.addresses();
    PacketSender sender;
-    TCP *tcp = new TCP();
    // Allocate the IP PDU
-    IP ip(dest_ip, info.ip_addr, tcp);
+    IP ip = IP(dest_ip, info.ip_addr) / TCP();
+    // Get the reference to the TCP PDU
+    TCP &tcp = ip.rfind_pdu<TCP>();
    // Set the SYN flag on.
-    tcp->set_flag(TCP::SYN, 1);
-    // Just some arbitrary port. 
-    tcp->sport(1337);
+    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) {
        // Set the new port and send the packet!
-        tcp->dport(atoi(it->c_str()));
+        tcp.dport(atoi(it->c_str()));
        sender.send(ip);
    }
    // Wait 1 second.
@@ -93,11 +92,11 @@ void send_syns(const NetworkInterface &iface, IPv4Address dest_ip, const vector<
    /* Special packet to indicate that we're done. This will be sniffed
     * by our function, which will in turn return false.  
     */
-    tcp->set_flag(TCP::RST, 1);
+    tcp.set_flag(TCP::RST, 1);
    // Pretend we're the scanned host...
    ip.src_addr(dest_ip);
    // We use an ethernet pdu, otherwise the kernel will drop it.
-    EthernetII eth(info.hw_addr, info.hw_addr, ip.clone());
+    EthernetII eth = EthernetII(info.hw_addr, info.hw_addr) / ip;
    sender.send(eth, iface);
 }

--- a/examples/traceroute.cpp
+++ b/examples/traceroute.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Nasel
+ * Copyright (c) 2012, Matias Fontanini
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,11 @@ public:
        
        PacketSender sender;
        // Create our handler
-        auto handler = make_sniffer_handler(this, &Traceroute::sniff_callback);
+        auto handler = std::bind(
+            &Traceroute::sniff_callback, 
+            this, 
+            std::placeholders::_1
+        );
        // We're running
        running = true;
        // Start the sniff thread
@@ -74,7 +78,7 @@ private:

    void send_packets(PacketSender &sender) {
        // ICMPs are icmp-requests by default
-        IP ip(addr, iface.addresses().ip_addr, new ICMP());
+        IP ip = IP(addr, iface.addresses().ip_addr) / ICMP();
        // We'll find at most 10 hops.
        
        for(auto i = 1; i <= 10; ++i) {
@@ -98,30 +102,20 @@ private:
    }

    bool sniff_callback(PDU &pdu) {
-        IP *ip = pdu.find_pdu<IP>();
-        RawPDU *raw = pdu.find_pdu<RawPDU>();
-        if(ip && raw) {
-            ttl_map::const_iterator iter;
-            IP inner_ip;
-            // This will fail if its a corrupted packet
-            try {
-                // Fetch the IP PDU attached to the ICMP response
-                inner_ip = IP(&raw->payload()[0], raw->payload_size());
-            }
-            catch(std::runtime_error &ex) {
-                return running;
-            }
-            // Critical section
-            {
-                std::lock_guard<std::mutex> _(lock);
-                iter = ttls.find(inner_ip.id());
-            } 
+        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());
+        } 

-            // It's an actual response
-            if(iter != ttls.end()) {
-                // Store it
-                results[inner_ip.id()] = ip->src_addr();
-            }
+        // It's an actual response
+        if(iter != ttls.end()) {
+            // Store it
+            results[inner_ip.id()] = ip.src_addr();
        }
        return running;
    }
--- a/examples/wps_detect.cpp
+++ b/examples/wps_detect.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2012, 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 <tins/tins.h>
+#include <iostream>
+#include <set>
+#include <string>
+
+using namespace Tins;
+
+// BSSIDs which we've already seen
+std::set<HWAddress<6>> addrs;
+// This will be the content of the OUI field in the vendor specific 
+// tagged option if it's a WPS tag.
+const HWAddress<3> expected_oui("00:50:F2");
+
+bool handler(const PDU& pdu) {
+    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()) {
+            // Is this a vendor-specific tag?
+            if(opt.option() == Dot11::VENDOR_SPECIFIC) {
+                // Make sure there's enough size for the OUI + identifier
+                if(opt.data_size() >= 4) { 
+                    // Retrieve the OUI field
+                    HWAddress<3> addr = opt.data_ptr();
+                    // Are we interested in this OUI and is it a WPS tag?
+                    if(addr == expected_oui && opt.data_ptr()[3] == 0x04) {
+                        std::cout << "[+] Access point: " << beacon.ssid() << " uses WPS\n";
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+int main(int argc, char *argv[]) {
+    if(argc != 2) {
+        std::cout << "Usage: " << *argv << " <DEVICE>\n";
+        return 1;
+    }
+    // Only sniff beacons
+    Sniffer sniffer(argv[1], 2000, true, "wlan type mgt subtype beacon");
+    sniffer.sniff_loop(handler);
+}
--- a/include/address_range.h
+++ b/include/address_range.h
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2012, 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_ADDRESS_RANGE
+#define TINS_ADDRESS_RANGE
+
+#include <stdexcept>
+#include <iterator>
+#include "endianness.h"
+#include "internals.h"
+
+namespace Tins {
+/**
+ * \brief AddressRange iterator class.
+ */
+template<typename Address>
+class AddressRangeIterator : public std::iterator<std::forward_iterator_tag, const Address> {
+public:
+    typedef typename std::iterator<std::forward_iterator_tag, const Address>::value_type value_type;
+
+    struct end_iterator {
+
+    };
+
+    /**
+     * Constructs an iterator.
+     *
+     * \param first The address held by this iterator.
+     */
+    AddressRangeIterator(const value_type &addr)
+    : addr(addr), reached_end(false)
+    {
+
+    }
+
+    /**
+     * Constructs an iterator.
+     *
+     * \param first The address held by this iterator.
+     */
+    AddressRangeIterator(const value_type &address, end_iterator)
+    : addr(address)
+    {
+        reached_end = Internals::increment(addr);
+    }
+
+    /**
+     * Retrieves the current address pointed by this iterator.
+     */
+    const value_type& operator*() const {
+        return addr;
+    }
+
+    /**
+     * Retrieves a pointer to the current address pointed by this iterator.
+     */
+    const value_type* operator->() const {
+        return &addr;
+    }
+
+    /**
+     * Compares two iterators for equality.
+     *
+     * \param rhs The iterator with which to compare.
+     */
+    bool operator==(const AddressRangeIterator &rhs) const {
+        return reached_end == rhs.reached_end && addr == rhs.addr;
+    }
+
+    /**
+     * Compares two iterators for inequality.
+     *
+     * \param rhs The iterator with which to compare.
+     */
+    bool operator!=(const AddressRangeIterator &rhs) const {
+        return !(*this == rhs);
+    }
+
+    /**
+     * Increments this iterator.
+     */
+    AddressRangeIterator& operator++() {
+        reached_end = Internals::increment(addr);
+        return *this;
+    }
+
+    /**
+     * Increments this iterator.
+     */
+    AddressRangeIterator operator++(int) {
+        AddressRangeIterator copy(*this);
+        (*this)++;
+        return copy;
+    }
+private:
+    Address addr;
+    bool reached_end;
+};
+
+/**
+ * \brief Represents a range of addresses.
+ *
+ * This class provides a begin()/end() interface which allows
+ * iterating through every address stored in it. 
+ *
+ * Note that when iterating a range that was created using
+ * operator/(IPv4Address, int) and the analog for IPv6, the 
+ * network and broadcast addresses are discarded:
+ *
+ * \code
+ * auto range = IPv4Address("192.168.5.0") / 24;
+ * for(const auto &addr : range) {
+ *     // process 192.168.5.1-254, .0 and .255 are discarded
+ *     process(addr);
+ * }
+ *
+ * // That's only valid for iteration, not for AddressRange<>::contains
+ * 
+ * assert(range.contains("192.168.5.0")); // works
+ * assert(range.contains("192.168.5.255")); // works
+ * \endcode
+ *
+ * Ranges created using AddressRange(address_type, address_type) 
+ * will allow the iteration over the entire range:
+ *
+ * \code
+ * AddressRange<IPv4Address> range("192.168.5.0", "192.168.5.255");
+ * for(const auto &addr : range) {
+ *     // process 192.168.5.0-255, no addresses are discarded
+ *     process(addr);
+ * }
+ * 
+ * assert(range.contains("192.168.5.0")); // still valid
+ * assert(range.contains("192.168.5.255")); // still valid
+ * \endcode
+ * 
+ */
+template<typename Address>
+class AddressRange {
+public:
+    /**
+     * The type of addresses stored in the range.
+     */
+    typedef Address address_type;
+
+    /**
+     * The iterator type.
+     */
+    typedef AddressRangeIterator<address_type> const_iterator;
+
+    /**
+     * \brief The iterator type.
+     *
+     * This is the same type as const_iterator, since the
+     * addresses stored in this range are read only.
+     */
+    typedef const_iterator iterator;
+
+    /**
+     * \brief Constructs an address range from two addresses.
+     *
+     * The range will consist of the addresses [first, last].
+     *
+     * If only_hosts is true, then the network and broadcast addresses
+     * will not be available when iterating the range. 
+     *
+     * If last < first, an std::runtime_error exception is thrown.
+     * 
+     * \param first The first address in the range.
+     * \param last The last address(inclusive) in the range.
+     * \param only_hosts Indicates whether only host addresses
+     * should be accessed when using iterators.
+     */
+    AddressRange(const address_type &first, const address_type &last, bool only_hosts = false)
+    : first(first), last(last), only_hosts(only_hosts)
+    {
+        if(last < first)
+            throw std::runtime_error("Invalid address range");
+    }
+
+    /**
+     * \brief Creates an address range from a base address
+     * and a network mask.
+     *
+     * \param first The base address.
+     * \param mask The network mask to be used.
+     */
+    static AddressRange from_mask(const address_type &first, const address_type &mask) {
+        return AddressRange<address_type>(
+            first, 
+            Internals::last_address_from_mask(first, mask), 
+            true
+        );
+    }
+
+    /**
+     * \brief Indicates whether an address is included in this range.
+     * \param addr The address to test.
+     * \return a bool indicating whether the address is in the range.
+     */
+    bool contains(const address_type &addr) const {
+        return (first < addr && addr < last) || addr == first || addr == last;
+    }
+
+    /**
+     * \brief Returns an interator to the beginning of this range.
+     * \brief const_iterator pointing to the beginning of this range.
+     */
+    const_iterator begin() const {
+        address_type addr = first;
+        if(only_hosts)
+            Internals::increment(addr);
+        return const_iterator(addr);
+    }
+
+    /**
+     * \brief Returns an interator to the end of this range.
+     * \brief const_iterator pointing to the end of this range.
+     */
+    const_iterator end() const {
+        address_type addr = last;
+        if(only_hosts)
+            Internals::decrement(addr);
+        return const_iterator(addr, typename const_iterator::end_iterator());
+    }
+
+    /**
+     * \brief Indicates whether this range is iterable.
+     *
+     * Iterable ranges are those for which there is at least one 
+     * address that could represent a host. For IPv4 ranges, a /31 or
+     * /32 ranges does not contain any, therefore it's not iterable.
+     * The same is true for /127 and /128 IPv6 ranges.
+     *
+     * If is_iterable returns false for a range, then iterating it
+     * through the iterators returned by begin() and end() is 
+     * undefined. 
+     * 
+     * \return bool indicating whether this range is iterable.
+     */
+    bool is_iterable() const {
+        // Since first < last, it's iterable
+        if(!only_hosts)
+            return true;
+        // We need that distance(first, last) >= 4
+        address_type addr(first);
+        for(int i = 0; i < 3; ++i) {
+            // If there's overflow before the last iteration, we're done
+            if(Internals::increment(addr) && i != 2)
+                return false;
+        }
+        // If addr <= last, it's OK.
+        return addr < last || addr == last;
+    }
+private:
+    address_type first, last;
+    bool only_hosts;
+};
+
+/**
+ * An IPv4 address range.
+ */
+typedef AddressRange<IPv4Address> IPv4Range;
+
+/**
+ * An IPv6 address range.
+ */
+typedef AddressRange<IPv6Address> IPv6Range;
+
+/**
+ * \brief Constructs an AddressRange from a base address and a mask.
+ * \param addr The range's first address.
+ * \param mask The bit-length of the prefix.
+ */
+template<size_t n>
+AddressRange<HWAddress<n> > operator/(const HWAddress<n> &addr, int mask) {
+    if(mask > 48)
+        throw std::logic_error("Prefix length cannot exceed 48");
+    HWAddress<n> last_addr;
+    typename HWAddress<n>::iterator it = last_addr.begin();
+    while(mask > 8) {
+        *it = 0xff;
+        ++it;
+        mask -= 8;
+    }
+    *it = 0xff << (8 - mask);
+    return AddressRange<HWAddress<6> >::from_mask(addr, last_addr);
+}
+
+/**
+ * \brief Constructs an IPv6Range from a base IPv6Address and a mask.
+ * \param addr The range's first address.
+ * \param mask The bit-length of the prefix.
+ */
+IPv6Range operator/(const IPv6Address &addr, int mask);
+
+/**
+ * \brief Constructs an IPv4Range from a base IPv4Address and a mask.
+ * \param addr The range's first address.
+ * \param mask The bit-length of the prefix.
+ */
+IPv4Range operator/(const IPv4Address &addr, int mask);
+} // namespace Tins
+
+#endif // TINS_ADDRESS_RANGE
--- a/include/arp.h
+++ b/include/arp.h
@@ -71,10 +71,18 @@ namespace Tins {
        };

        /**
-         * \brief Default constructor for ARP PDU objects.
-         *
+         * \brief Constructs an ARP object using the provided addresses.
+         * 
         * ARP requests and replies can be constructed easily using
-         * ARP::make_arp_request/reply static functions.
+         * 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(), 
@@ -125,41 +133,42 @@ namespace Tins {
        ipaddress_type target_ip_addr() const { return ipaddress_type(_arp.ar_tip); }

        /**
-         * \brief Getter for the hardware address format.
+         * \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.
+         * \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.
+         * \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.
+         * \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.
+         * \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.
+        /** 
+         * \brief Getter for the header size.
         * \return Returns the ARP header size.
         * \sa PDU::header_size
         */
@@ -195,35 +204,35 @@ namespace Tins {
        void target_ip_addr(ipaddress_type new_tgt_ip_addr);

        /**
-         * \brief Setter for the hardware address format.
+         * \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.
+         * \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.
+         * \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.
+         * \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.
+         * \brief Setter for the ARP opcode field.
         *
         * \param new_opcode Flag enum value of the ARP opcode to set.
         */
@@ -233,18 +242,18 @@ namespace Tins {
         * \brief Getter for the PDU's type.
         * \sa PDU::pdu_type
         */
-        PDUType pdu_type() const { return PDU::ARP; }
+        PDUType pdu_type() const { return pdu_flag; }

        /**
         * \brief Creates an ARP Request within an EthernetII PDU.
         *
-         * Creates an ARP Request PDU and embeds it within a Layer 2 PDU ready to be
-         * sent. 
+         * Creates an ARP Request PDU and embeds it inside an EthernetII
+         * PDU.
         *
-         * \param target IPv4Address with the target's IP.
-         * \param sender IPv4Address with the sender's IP.
-         * \param hw_snd uint8_t array of 6 bytes containing the sender's hardware address.
-         * \return Returns a EthernetII containing the ARP Request.
+         * \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());
@@ -252,20 +261,21 @@ namespace Tins {
        /**
         * \brief Creates an ARP Reply within an EthernetII PDU.
         *
-         * Creates an ARP Reply PDU and embeds it within a Layer 2 PDU ready to be
-         * sent. 
+         * Creates an ARP Reply PDU and embeds it inside an EthernetII 
+         * PDU.
         *
-         * \param target IPv4Address with the target's IP.
-         * \param sender IPv4Address with the sender's IP.
-         * \param hw_tgt uint8_t array of 6 bytes containing the target's hardware address.
-         * \param hw_snd uint8_t array of 6 bytes containing the sender's hardware address.
-         * \return Returns an EthetnetII containing the ARP Replay.
+         * \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.
+        /** 
+         * \brief Check wether ptr points to a valid response for this PDU.
         *
         * \sa PDU::matches_response
         * \param ptr The pointer to the buffer.
--- a/include/bootp.h
+++ b/include/bootp.h
@@ -275,7 +275,8 @@ namespace Tins {
                _bootp.chaddr
            );
            // Fill what's left with zeros
-            std::fill(end, _bootp.chaddr + chaddr_type::address_size, 0);
+            if(end < _bootp.chaddr + chaddr_type::address_size)
+                std::fill(end, _bootp.chaddr + chaddr_type::address_size, 0);
        }

        /** 
@@ -299,7 +300,7 @@ namespace Tins {
        /**
         * \brief Check wether ptr points to a valid response for this PDU.
         *
-         * This returns true, if the xid field is equal.
+         * This returns true if the xid field is equal.
         * 
         * \sa PDU::matches_response
         * \param ptr The pointer to the buffer.
@@ -311,7 +312,7 @@ namespace Tins {
         * \brief Getter for the PDU's type.
         * \sa PDU::pdu_type
         */
-        PDUType pdu_type() const { return PDU::BOOTP; }
+        PDUType pdu_type() const { return pdu_flag; }

        /**
         * \sa PDU::clone
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -6,15 +6,30 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H

+/* Have IEEE 802.11 support */
+#undef HAVE_DOT11
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H

+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#undef HAVE_LIBCRYPTO
+
 /* Define to 1 if you have the `pcap' library (-lpcap). */
 #undef HAVE_LIBPCAP

 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H

+/* Define to 1 if you have the <openssl/aes.h> header file. */
+#undef HAVE_OPENSSL_AES_H
+
+/* Define to 1 if you have the <openssl/evp.h> header file. */
+#undef HAVE_OPENSSL_EVP_H
+
+/* Define to 1 if you have the <openssl/hmac.h> header file. */
+#undef HAVE_OPENSSL_HMAC_H
+
 /* Define to 1 if you have the <pcap.h> header file. */
 #undef HAVE_PCAP_H

@@ -39,6 +54,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H

+/* Have WPA2 decryption library */
+#undef HAVE_WPA2_DECRYPTION
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
   */
 #undef LT_OBJDIR
--- a/include/crypto.h
+++ b/include/crypto.h
@@ -27,22 +27,72 @@
 *
 */

-#ifndef TINS_CRYPTO_H
+#include "config.h"
+
+#if !defined(TINS_CRYPTO_H) && defined(HAVE_DOT11)
 #define TINS_CRYPTO_H

 #include <map>
 #include <string>
 #include <algorithm>
 #include <vector>
-#include "dot11.h"
 #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.
     */
@@ -65,11 +115,11 @@ namespace Crypto {
    };

    /**
-     * 
+     * \brief Decrypts WEP-encrypted traffic.
     */
    class WEPDecrypter {
    public:
-        typedef Dot11::address_type address_type;
+        typedef HWAddress<6> address_type;
    
        /**
         * \brief Constructs a WEPDecrypter object.
@@ -93,19 +143,18 @@ namespace Crypto {
        void remove_password(const address_type &addr);
        
        /**
-         * \brief Decrypts the provided PDU and forwards the decrypted
-         * PDU to the functor held by this object.
+         * \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 it is invalid,
-         * then false is returned.
+         * If the CRC found after decrypting is invalid, false is 
+         * returned.
         * 
-         * \return false if decryption failed due to invalid CRC, true
-         * otherwise.
+         * \return false if no decryption was performed or decryption 
+         * failed, true otherwise.
         */
        bool decrypt(PDU &pdu);
    private:
@@ -117,6 +166,96 @@ namespace Crypto {
        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.
@@ -183,7 +322,7 @@ namespace Crypto {
    void rc4(ForwardIterator start, ForwardIterator end, RC4Key &key, OutputIterator output);
    
    /**
-     * \brief Wrapper function to create DecrypterProxyes using a 
+     * \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
@@ -191,6 +330,20 @@ namespace Crypto {
     */
    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
    
@@ -229,7 +382,7 @@ namespace Crypto {
    {
        return DecrypterProxy<Functor, WEPDecrypter>(functor);
    }
-    
+
    // RC4 stuff
    
    template<typename ForwardIterator>
--- a/include/dhcp.h
+++ b/include/dhcp.h
@@ -32,6 +32,7 @@


 #include <list>
+#include <vector>
 #include <string>
 #include "bootp.h"
 #include "pdu_option.h"
@@ -40,8 +41,10 @@
 namespace Tins {
    /** 
     * \brief Class that represents the DHCP PDU.
-     * 
-     * The end option is added automatically at the end of the option list.
+     *
+     * When adding options, the "End" option is not added automatically. 
+     *
+     * \sa DHCP::end
     */
    class DHCP : public BootP {
    public:
@@ -143,7 +146,7 @@ namespace Tins {
        /**
         * The DHCP option type.
         */
-        typedef PDUOption<uint8_t> option;
+        typedef PDUOption<uint8_t, DHCP> option;
        
        /**
         * The type used to store the DHCP options.
@@ -162,12 +165,11 @@ namespace Tins {
         * \brief Constructs a DHCP object from a buffer.
         * 
         * If there is not enough size for a BootP header, or any of
-         * the TLV options contain an invalid size field, then a
+         * 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.
-         * Subclasses might use 0 to provide their own interpretation of this field.
         */
        DHCP(const uint8_t *buffer, uint32_t total_sz);
        
@@ -199,13 +201,18 @@ namespace Tins {
        const option *search_option(OptionTypes opt) const;
        
        /** 
-         * \brief Adds a type option the the option list.
+         * \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 the the option list.
+         * \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
@@ -215,60 +222,90 @@ namespace Tins {
        
        /** 
         * \brief Adds a server identifier option.
-         * \param ip The ip of the server.
+         * 
+         * 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::list<ipaddress_type> &routers);
+        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::list<ipaddress_type> &dns);
+        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);
@@ -278,7 +315,7 @@ namespace Tins {
        /**
         * \brief Searchs for a type option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return uint8_t containing the type option.
@@ -288,7 +325,7 @@ namespace Tins {
        /**
         * \brief Searchs for a server identifier option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return ipaddress_type Containing the server identifier.
@@ -298,7 +335,7 @@ namespace Tins {
        /**
         * \brief Searchs for a lease time option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return uint32_t Containing the lease time.
@@ -308,7 +345,7 @@ namespace Tins {
        /**
         * \brief Searchs for a lease renewal time option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return uint32_t Containing the renewal time.
@@ -318,7 +355,7 @@ namespace Tins {
        /**
         * \brief Searchs for a rebind time option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return uint32_t Containing the rebind time.
@@ -328,7 +365,7 @@ namespace Tins {
        /**
         * \brief Searchs for a subnet mask option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return ipaddress_type Containing the subnet mask.
@@ -338,29 +375,29 @@ namespace Tins {
        /**
         * \brief Searchs for a routers option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
-         * \return std::list<ipaddress_type> Containing the routers 
+         * \return std::vector<ipaddress_type> Containing the routers 
         * option data.
         */
-        std::list<ipaddress_type> routers() const;
+        std::vector<ipaddress_type> routers() const;
        
        /**
         * \brief Searchs for a dns option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return std::list<ipaddress_type> Contanining the DNS servers
         * provided.
         */
-        std::list<ipaddress_type> domain_name_servers() const; 
+        std::vector<ipaddress_type> domain_name_servers() const; 
        
        /**
         * \brief Searchs for a broadcast option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return ipaddress_type Containing the broadcast address.
@@ -370,7 +407,7 @@ namespace Tins {
        /**
         * \brief Searchs for a requested option.
         * 
-         * If the option is not found, a option_not_found exception
+         * If the option is not found, an option_not_found exception
         * is thrown.
         * 
         * \return ipaddress_type Containing the requested IP address.
@@ -380,14 +417,15 @@ namespace Tins {
        /**
         * \brief Searchs for a domain name option.
         * 
-         * If the option is not found, a option_not_found exception
+         * 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 Getter for the options list.
+        /** 
+         * \brief Getter for the options list.
         * \return The option list.
         */
        const options_type options() const { return _options; }
@@ -396,7 +434,7 @@ namespace Tins {
         * \brief Getter for the PDU's type.
         * \sa PDU::pdu_type
         */
-        PDUType pdu_type() const { return PDU::DHCP; }
+        PDUType pdu_type() const { return pdu_flag; }
        
        /** 
         * \brief Getter for the header size.
@@ -413,27 +451,19 @@ namespace Tins {
        }
    private:
        static const uint32_t MAX_DHCP_SIZE;
-        
-        template<typename T>
-        struct type2type {};
      
        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-        
+
        template<class T> 
-        T generic_search(OptionTypes opt, type2type<T>) const {
+        T search_and_convert(OptionTypes opt) const {
            const option *option = search_option(opt);
-            if(option && option->data_size() == sizeof(T))
-                return *(const T*)option->data_ptr();
-            else
+            if(!option)
                throw option_not_found();
+            return option->to<T>();
        }
        
        void internal_add_option(const option &opt);
-        std::list<ipaddress_type> generic_search(OptionTypes opt, type2type<std::list<ipaddress_type> >) const;
-        std::string generic_search(OptionTypes opt, type2type<std::string>) const;
-        ipaddress_type generic_search(OptionTypes opt, type2type<ipaddress_type>) const;
-        
-        serialization_type serialize_list(const std::list<ipaddress_type> &ip_list);
+        serialization_type serialize_list(const std::vector<ipaddress_type> &ip_list);
        
        options_type _options;
        uint32_t _size;
--- a/include/dhcpv6.h
+++ b/include/dhcpv6.h
@@ -46,7 +46,7 @@ public:
    /**
     * Represents a DHCPv6 option. 
     */
-    typedef PDUOption<uint16_t> option;
+    typedef PDUOption<uint16_t, DHCPv6> option;

    /**
     * The message types.
@@ -179,6 +179,8 @@ public:
        ia_na_type(uint32_t id = 0, uint32_t t1 = 0, uint32_t t2 = 0,
          const options_type& options = options_type())
        : id(id), t1(t1), t2(t2), options(options) {}
+
+        static ia_na_type from_option(const option &opt);
    };
    
    /**
@@ -194,6 +196,8 @@ public:
        ia_ta_type(uint32_t id = 0,
          const options_type& options = options_type())
        : id(id), options(options) {}
+
+        static ia_ta_type from_option(const option &opt);
    };

    /**
@@ -211,6 +215,8 @@ public:
          const options_type& options = options_type())
        : address(address), preferred_lifetime(preferred_lifetime), 
          valid_lifetime(valid_lifetime), options(options) {}
+
+        static ia_address_type from_option(const option &opt);
    };
    
    /**
@@ -228,6 +234,8 @@ public:
          const auth_info_type &auth_info = auth_info_type())
        : protocol(protocol), algorithm(algorithm), rdm(rdm),
        replay_detection(replay_detection), auth_info(auth_info) {}
+
+        static authentication_type from_option(const option &opt);
    };
    
    /**
@@ -239,6 +247,8 @@ public:
        
        status_code_type(uint16_t code = 0, const std::string &message = "")
        : code(code), message(message) { }
+
+        static status_code_type from_option(const option &opt);
    };
    
    /**
@@ -253,6 +263,8 @@ public:
        vendor_info_type(uint32_t enterprise_number = 0, 
          const data_type &data = data_type())
        : enterprise_number(enterprise_number), data(data) { }
+
+        static vendor_info_type from_option(const option &opt);
    };
    
    
@@ -264,7 +276,19 @@ public:
    /**
     * The type used to store the User Class option.
     */
-    typedef std::vector<class_option_data_type> user_class_type;
+    //typedef std::vector<class_option_data_type> user_class_type;
+    struct user_class_type {
+        typedef std::vector<class_option_data_type> data_type;
+        data_type data;
+
+        user_class_type(const data_type &data = data_type())
+        : data(data)
+        {
+
+        }
+
+        static user_class_type from_option(const option &opt);
+    };
    
    /**
     * The type used to store the Vendor Class option.
@@ -279,6 +303,8 @@ public:
          const class_data_type &vendor_class_data = class_data_type())
        : enterprise_number(enterprise_number), 
        vendor_class_data(vendor_class_data) { }
+
+        static vendor_class_type from_option(const option &opt);
    };
    
    /**
@@ -361,12 +387,14 @@ public:
        
        duid_type(const duid_ll &identifier)
        : id(duid_en::duid_id), data(identifier.serialize()) {}
+
+        static duid_type from_option(const option &opt);
    };
        
    /**
     * The type used to store the Option Request option.
     */
-    typedef std::vector<OptionTypes> option_request_type;
+    typedef std::vector<uint16_t> option_request_type;
    
    /**
     * The type used to store the Relay Message option.
@@ -442,7 +470,6 @@ public:
     * \return The stored options.
     */
    const options_type &options() const { return options_; }
- ;

    // Setters
    /**
@@ -838,52 +865,61 @@ private:
            throw option_not_found();
        return option;
    }
-    
-    template<typename InputIterator>
-    void class_option_data2option(InputIterator start, InputIterator end, 
-      std::vector<uint8_t>& buffer, size_t start_index = 0) 
-    {
-        size_t index = start_index;
-        while(start != end) {
-            buffer.resize(buffer.size() + sizeof(uint16_t) + start->size());
-            *(uint16_t*)&buffer[index] = Endian::host_to_be<uint16_t>(start->size());
-            index += sizeof(uint16_t);
-            std::copy(start->begin(), start->end(), buffer.begin() + index);
-            index += start->size();
-            
-            start++;
-        }
-    }
-    
-    template<typename OutputType>
-    OutputType option2class_option_data(const uint8_t *ptr, uint32_t total_sz) const
-    {
-        typedef typename OutputType::value_type value_type;
-        OutputType output;
-        size_t index = 0;
-        while(index + 2 < total_sz) {
-            uint16_t size = Endian::be_to_host(
-                *(const uint16_t*)(ptr + index)
-            );
-            index += sizeof(uint16_t);
-            if(index + size > total_sz)
-                throw option_not_found();
-            output.push_back(
-                value_type(ptr + index, ptr + index + size)
-            );
-            index += size;
-        }
-        if(index != total_sz)
+
+    template<typename T>
+    T search_and_convert(OptionTypes opt) const {
+        const option *option = search_option(opt);
+        if(!option)
            throw option_not_found();
-        return output;
+        return option->to<T>();
    }
-    

    uint8_t header_data[4];
    uint32_t options_size;
    ipaddress_type link_addr, peer_addr;
    options_type options_;
-};    
+};   
+
+namespace Internals {
+template<typename InputIterator>
+void class_option_data2option(InputIterator start, InputIterator end, 
+  std::vector<uint8_t>& buffer, size_t start_index = 0) 
+{
+    size_t index = start_index;
+    while(start != end) {
+        buffer.resize(buffer.size() + sizeof(uint16_t) + start->size());
+        *(uint16_t*)&buffer[index] = Endian::host_to_be<uint16_t>(start->size());
+        index += sizeof(uint16_t);
+        std::copy(start->begin(), start->end(), buffer.begin() + index);
+        index += start->size();
+        
+        start++;
+    }
+}
+
+template<typename OutputType>
+OutputType option2class_option_data(const uint8_t *ptr, uint32_t total_sz)
+{
+    typedef typename OutputType::value_type value_type;
+    OutputType output;
+    size_t index = 0;
+    while(index + 2 < total_sz) {
+        uint16_t size = Endian::be_to_host(
+            *(const uint16_t*)(ptr + index)
+        );
+        index += sizeof(uint16_t);
+        if(index + size > total_sz)
+            throw option_not_found();
+        output.push_back(
+            value_type(ptr + index, ptr + index + size)
+        );
+        index += size;
+    }
+    if(index != total_sz)
+        throw malformed_option();
+    return output;
+}
+} 
 }

 #endif // TINS_DHCPV6_H
--- a/include/dns.h
+++ b/include/dns.h
@@ -39,7 +39,6 @@
 #include "macros.h"
 #include "pdu.h"
 #include "endianness.h"
-#include "dns_record.h"

 namespace Tins {
    class IPv4Address;
@@ -200,14 +199,24 @@ namespace Tins {
         */
        class Resource {
        public:
-            Resource(const std::string &nm, const std::string &ad, 
-              uint16_t t, uint16_t c, uint32_t tt) 
-            : dname_(nm), addr_(ad), type_(t), qclass_(c), ttl_(tt) {}
+            /**
+             * 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 dname field.
+             * \brief Getter for the domain name field.
             * 
             * This returns the domain name for which this record 
             * provides an answer.
@@ -215,9 +224,9 @@ namespace Tins {
            const std::string &dname() const { return dname_; }
            
            /**
-             * Getter for the type field.
+             * Getter for the data field. 
             */
-            const std::string &data() const { return addr_; }
+            const std::string &data() const { return data_; }
            
            /**
             * Getter for the query type field.
@@ -233,8 +242,52 @@ namespace Tins {
             * 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_, addr_;
+            std::string dname_, data_;
            uint16_t type_, qclass_;
            uint32_t ttl_;
        };
@@ -482,94 +535,71 @@ namespace Tins {
        void add_query(const Query &query);
        
        /**
-         * \brief Add a query response.
+         * \brief Add an answer resource record.
         * 
-         * \param name The resolved name.
-         * \param type The type of this answer.
-         * \param qclass The class of this answer.
-         * \param ttl The time-to-live of this answer.
-         * \param ip The ip address of the resolved name.
+         * \param resource The resource to be added.
         */
-        void add_answer(const std::string &name, 
-          const DNSResourceRecord::info &info, address_type ip);
-          
+        void add_answer(const Resource &resource);
+
        /**
-         * \brief Add a query response.
+         * \brief Add an authority resource record.
         * 
-         * \param name The resolved name.
-         * \param type The type of this answer.
-         * \param qclass The class of this answer.
-         * \param ttl The time-to-live of this answer.
-         * \param ip The ip address of the resolved name.
+         * \param resource The resource to be added.
         */
-        void add_answer(const std::string &name, 
-          const DNSResourceRecord::info &info, address_v6_type ip);
-                        
-        /**
-         * \brief Add a query response.
-         * 
-         * \param name The resolved name.
-         * \param type The type of this answer.
-         * \param qclass The class of this answer.
-         * \param ttl The time-to-live of this answer.
-         * \param dname The domain of the resolved name.
-         */
-        void add_answer(const std::string &name, 
-          const DNSResourceRecord::info &info, const std::string &dname);
-                        
-        /**
-         * \brief Add a query response.
-         * 
-         * \param name The resolved name.
-         * \param type The type of this answer.
-         * \param qclass The class of this answer.
-         * \param ttl The time-to-live of this answer.
-         * \param data The data of this option.
-         * \param sz The size of the data.
-         */
-        void add_answer(const std::string &name, 
-          const DNSResourceRecord::info &info, const uint8_t *data, uint32_t sz);
+        void add_authority(const Resource &resource);
        
        /**
-         * \brief Add an authority record.
+         * \brief Add an additional resource record.
         * 
-         * \param name The resolved name.
-         * \param type The type of this record.
-         * \param qclass The class of this record.
-         * \param ttl The time-to-live of this record.
-         * \param data The data of this option.
-         * \param sz The size of the data.
+         * \param resource The resource to be added.
         */
-        void add_authority(const std::string &name, 
-          const DNSResourceRecord::info &info, const uint8_t *data, uint32_t sz);
-        
-        /**
-         * \brief Add an additional record.
-         * 
-         * \param name The resolved name.
-         * \param type The type of this record.
-         * \param qclass The class of this record.
-         * \param ttl The time-to-live of this record.
-         * \param ip The ip address of the resolved name.
-         */
-        void add_additional(const std::string &name, 
-          const DNSResourceRecord::info &info, uint32_t ip);
-                        
+        void add_additional(const Resource &resource);
        
        /**
         * \brief Getter for this PDU's DNS queries.
-         * \return std::list<Query> containing the queries in this
-         * record.
+         * 
+         * \return The query records in this PDU.
         */
        queries_type queries() const;
        
        /**
         * \brief Getter for this PDU's DNS answers
-         * \return std::list<Resource> containing the answers in this
-         * record.
+         * 
+         * \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.
         *
@@ -585,17 +615,6 @@ namespace Tins {
        DNS *clone() const {
            return new DNS(*this);
        }
-        
-        /**
-         * Helper function to create a resource record information
-         * 
-         * \param type The type of the query.
-         * \param qclass The class of the query.
-         * \param ttl The time-to-live of the query.
-         */
-        static DNSResourceRecord::info make_info(QueryType type, QueryClass qclass, uint32_t ttl) {
-            return DNSResourceRecord::info((uint16_t)type, (uint16_t)qclass, ttl);
-        }
    private:
        TINS_BEGIN_PACK
        struct dnshdr {
@@ -629,35 +648,23 @@ namespace Tins {
                     authority, additional;
        } TINS_END_PACK;
        
-        typedef std::map<uint16_t, std::string> SuffixMap;
-        typedef std::map<uint16_t, uint16_t> SuffixIndices;
-        typedef std::list<DNSResourceRecord> ResourcesType;
        typedef std::list<Query> QueriesType;
+        typedef std::vector<std::pair<uint32_t*, uint32_t> > sections_type;
        
-        const uint8_t *build_resource_list(ResourcesType &lst, const uint8_t *ptr, uint32_t &sz, uint16_t nrecs);
-        uint32_t find_domain_name(const std::string &dname);
-        bool find_domain_name(const std::string &dname, const ResourcesType &lst, uint16_t &out);
-        void parse_domain_name(const std::string &dn, std::string &out) const;
-        void unparse_domain_name(const std::string &dn, std::string &out) const;
-        void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
-        uint8_t *serialize_list(const ResourcesType &lst, uint8_t *buffer) const;
-        void compose_name(const uint8_t *ptr, uint32_t sz, std::string &out) const;
-        void convert_resources(const ResourcesType &lst, std::list<Resource> &res) const;
-        DNSResourceRecord make_record(const std::string &name, const DNSResourceRecord::info &info, uint32_t ip);
-        DNSResourceRecord make_record(const std::string &name, const DNSResourceRecord::info &info, const std::string &dname);
-        DNSResourceRecord make_record(const std::string &name, const DNSResourceRecord::info &info, const uint8_t *ptr, uint32_t len);
-        void add_suffix(uint32_t index, const uint8_t *data, uint32_t sz) const;
-        uint32_t build_suffix_map(uint32_t index, const ResourcesType &lst) const;
-        uint32_t build_suffix_map(uint32_t index, const QueriesType &lst) const;
-        void build_suffix_map() const ;
+        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;
-        uint32_t extra_size;
-        std::list<Query> queries_;
-        ResourcesType ans, arity, addit;
-        mutable SuffixMap suffixes;
-        mutable SuffixIndices suffix_indices;
+        byte_array records_data;
+        uint32_t answers_idx, authority_idx, additional_idx;
    };
 }

--- a/include/dns_record.h
+++ b/include/dns_record.h
@@ -1,272 +0,0 @@
-/*
- * Copyright (c) 2012, 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_RECORD_H
-#define TINS_DNS_RECORD_H
-
-#include <string>
-#include <vector>
-#include <stdint.h>
-#include "cxxstd.h"
-#include "macros.h"
-
-namespace Tins {
-/** 
- * \cond
- */
-class DNSRRImpl {
-public:
-    virtual ~DNSRRImpl() {}
-    virtual uint32_t size() const = 0;
-    virtual uint32_t do_write(uint8_t *buffer) const = 0;
-    virtual bool matches(const std::string &dname) const { return false; }
-    virtual DNSRRImpl *clone() const = 0;
-};
-
-/**
- * \brief Abstracts a DNS resource record.
- */
-class DNSResourceRecord {
-public:
-    /**
-     * \brief The type used to store resource records' information.
-     */
-    TINS_BEGIN_PACK
-    struct info {
-        uint16_t type, qclass;
-        uint32_t ttl;
-        
-        info(uint16_t tp, uint16_t qc, uint32_t tm) 
-          : type(tp), qclass(qc), ttl(tm) { }
-        
-        info() : type(), qclass(), ttl() {}
-    } TINS_END_PACK;
-    
-    /**
-     * \brief Constructs a record.
-     * \param impl A pointer to the impl object.
-     * \param data A pointer to the start of the data buffer.
-     * \param len The length of the data.
-     */
-    DNSResourceRecord(DNSRRImpl *impl = 0, const uint8_t *data = 0, uint16_t len = 0);
-    
-    /**
-     * \brief Constructs a record.
-     * 
-     * If the input data is malformed, a malformed_packet exception
-     * is thrown.
-     * 
-     * \param buffer A pointer to the start of the data buffer.
-     * \param len The length of the data.
-     */
-    DNSResourceRecord(const uint8_t *buffer, uint32_t size);
-    
-    /**
-     * \brief Constructs a record from an input range.
-     * \param impl A pointer to the impl object.
-     * \param start The begining of the range.
-     * \param end The end of the range.
-     */
-    template<typename ForwardIterator>
-    DNSResourceRecord(DNSRRImpl *impl, ForwardIterator start, ForwardIterator end) 
-    : impl(impl), data(start, end)
-    {  }
-    
-    /**
-     * \brief Copy constructor.
-     * 
-     * This handles cloning the impl object.
-     * \param rhs The record which will be copied.
-     */
-    DNSResourceRecord(const DNSResourceRecord &rhs);
-    
-    /**
-     * \brief Copy assignment operator.
-     * 
-     * This handles cloning the impl object.
-     * \param rhs The record which will be copied.
-     */
-    DNSResourceRecord& operator=(const DNSResourceRecord &rhs);
-    
-    #if TINS_IS_CXX11
-        /**
-         * Move constructor.
-         */
-        DNSResourceRecord(DNSResourceRecord &&rhs) noexcept 
-        : info_(rhs.info_), data(std::move(rhs.data)), impl(0) {
-            std::swap(impl, rhs.impl);
-        }
-        
-        /**
-         * Move assignment operator.
-         */
-        DNSResourceRecord& operator=(DNSResourceRecord &&rhs) noexcept 
-        {
-            info_ = rhs.info_;
-            data = std::move(rhs.data);
-            delete impl;
-            impl = 0;
-            std::swap(impl, rhs.impl);
-            return *this;
-        }
-    #endif // TINS_IS_CXX11
-    
-    /**
-     * \brief Destructor.
-     * 
-     * This frees the impl object.
-     */
-    ~DNSResourceRecord();
-
-    /**
-     * \brief Writes this record to a buffer.
-     * 
-     * \param buffer The buffer in which to store the serialization.
-     * \return uint32_t containing the number of bytes written.
-     */
-    uint32_t write(uint8_t *buffer) const;
-    
-    /**
-     * \brief Returns the size of the data in this record.
-     */
-    uint32_t data_size() const {
-        return data.size();
-    }
-    
-    /**
-     * \brief Returns the pointer to the start of the data buffer.
-     */
-    const uint8_t *data_ptr() const {
-        return &data[0];
-    }
-    
-    /**
-     * \brief Returns a bool indicating whether this record contains
-     * a domain name as the name being resolved.
-     */
-    bool has_domain_name() const;
-    
-    /**
-     * \brief Returns a pointer to the domain name stored in this record.
-     * 
-     * This will throw a std::bad_cast exception if the impl object is
-     * not of the type NamedDNSRRImpl.
-     */
-    const std::string *dname() const;
-    
-    /**
-     * \brief Returns the offset stored in this record.
-     * 
-     * This will throw a std::bad_cast exception if the impl object is
-     * not of the type OffsetedDNSRRImpl.
-     */
-    uint16_t offset() const;
-    
-    /**
-     * \brief Returns the size of this record.
-     */
-    uint32_t size() const;
-    
-    /**
-     * \brief Returns a reference to the info field.
-     */
-    info &information() {
-        return info_;
-    }
-    
-    /**
-     * \brief Returns a const reference to the info field.
-     */
-    const info &information() const {
-        return info_;
-    }
-    
-    /**
-     * \brief Checks if the domain name stored in this record matches
-     * the given one.
-     * 
-     * This is a shortcut 
-     */
-    bool matches(const std::string &dname) const;
-private:
-    DNSRRImpl *clone_impl() const;
-    size_t impl_size() const;
-
-    info info_;
-    std::vector<uint8_t> data;
-    DNSRRImpl *impl;
-};
-
-class OffsetedDNSRRImpl : public DNSRRImpl {
-public:
-    OffsetedDNSRRImpl(uint16_t off);
-    
-    uint32_t do_write(uint8_t *buffer) const;
-    uint32_t size() const;
-    OffsetedDNSRRImpl *clone() const;
-    uint16_t offset() const;
-private:
-    uint16_t offset_;
-};
-
-class NamedDNSRRImpl : public DNSRRImpl {
-public:
-    NamedDNSRRImpl(const std::string &nm);
-    
-    template<typename ForwardIterator>
-    NamedDNSRRImpl(ForwardIterator start, ForwardIterator end)
-    : name(start, end) 
-    { }
-    
-    uint32_t do_write(uint8_t *buffer) const;
-    
-    uint32_t size() const;
-    
-    bool matches(const std::string &dname) const;
-    
-    const std::string *dname_pointer() const;
-    NamedDNSRRImpl *clone() const;
-private:
-    std::string name;
-};
-
-/** 
- * \endcond
- */
-
-inline DNSResourceRecord make_offseted_record(uint16_t offset, const uint8_t *data = 0, uint32_t size = 0) {
-    return DNSResourceRecord(new OffsetedDNSRRImpl(offset), data, size);
-}
-
-inline DNSResourceRecord make_named_record(const std::string &name, const uint8_t *data = 0, uint32_t size = 0) {
-    return DNSResourceRecord(new NamedDNSRRImpl(name), data, size);
-}
-}
-
-#endif // TINS_DNS_RECORD_H
--- a/include/dot11.h
+++ b/include/dot11.h
--- a/include/dot11/dot11_assoc.h
+++ b/include/dot11/dot11_assoc.h
@@ -0,0 +1,622 @@
+/*
+ * Copyright (c) 2012, 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_ASSOC_H) && defined(HAVE_DOT11)
+#define TINS_DOT11_DOT11_ASSOC_H
+
+#include "../dot11/dot11_mgmt.h"
+
+namespace Tins {
+/**
+ * \brief Class representing a Disassociation frame in the IEEE 802.11 Protocol.
+ *
+ */
+class Dot11Disassoc : public Dot11ManagementFrame {
+public:
+   /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_DIASSOC;
+
+    /**
+     * \brief Constructor for creating a 802.11 Disassociation.
+     *
+     * Constructs a 802.11 Disassociation taking the destination
+     * and source hardware address.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11Disassoc(const address_type &dst_hw_addr = address_type(), 
+                const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11Disassoc 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.
+     */
+    Dot11Disassoc(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the reason code field.
+     *
+     * \return The stored reason code.
+     */
+    uint16_t reason_code() const { return Endian::le_to_host(_body.reason_code); }
+
+    /**
+     * \brief Setter for the reason code field.
+     *
+     * \param new_reason_code The reason code to be set.
+     */
+    void reason_code(uint16_t new_reason_code);
+
+    /**
+     * \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 Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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
+     */
+    Dot11Disassoc *clone() const {
+        return new Dot11Disassoc(*this);
+    }
+private:
+    struct DisassocBody {
+        uint16_t reason_code;
+    };
+
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+
+    DisassocBody _body;
+};
+
+/**
+ * \brief Class representing an Association Request frame in the IEEE 802.11 Protocol.
+ *
+ */
+class Dot11AssocRequest : public Dot11ManagementFrame {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_ASSOC_REQ;
+
+    /**
+     * \brief Constructor for creating a 802.11 Association Request.
+     *
+     * Constructs a 802.11 Association Request taking the
+     * destination and source hardware address.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11AssocRequest(const address_type &dst_hw_addr = address_type(), 
+                    const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11AssocRequest 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.
+     */
+    Dot11AssocRequest(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the Capabilities Information.
+     *
+     * \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 Getter for the listen interval field.
+     *
+     * \return The stored listen interval field.
+     */
+    uint16_t listen_interval() const { return Endian::le_to_host(_body.listen_interval); }
+
+    /**
+     * \brief Setter for the listen interval field.
+     *
+     * \param new_listen_interval The listen interval to be set.
+     */
+    void listen_interval(uint16_t new_listen_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 Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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
+     */
+    Dot11AssocRequest *clone() const {
+        return new Dot11AssocRequest(*this);
+    }
+private:
+    struct AssocReqBody {
+        capability_information capability;
+        uint16_t listen_interval;
+    };
+
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+
+    AssocReqBody _body;
+};
+
+/**
+ * \brief Class representing an Association Response frame in the IEEE 802.11 Protocol.
+ *
+ */
+class Dot11AssocResponse : public Dot11ManagementFrame {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_ASSOC_RESP;
+
+    /**
+     * \brief Constructor for creating a 802.11 Association Response.
+     *
+     * Constructors a 802.11 Association Response taking destination 
+     * and source hardware address.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11AssocResponse(const address_type &dst_hw_addr = address_type(), 
+                        const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructor which creates a Dot11AssocResponse 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.
+     */
+    Dot11AssocResponse(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the Capabilities Information field.
+     *
+     * \return A constant reference to the stored Capabilities 
+     * Information field.
+     */
+    const capability_information& capabilities() const { return _body.capability;}
+
+    /**
+     * \brief Getter for the Capabilities Information field.
+     *
+     * \return A reference to the stored Capabilities 
+     * Information field.
+     */
+    capability_information& capabilities() { return _body.capability;}
+
+    /**
+     * \brief Getter for the status code field.
+     *
+     * \return The stored status code.
+     */
+    uint16_t status_code() const { return Endian::le_to_host(_body.status_code); }
+
+    /**
+     * \brief Getter for the AID field.
+     *
+     * \return The stored AID field.
+     */
+    uint16_t aid() const { return Endian::le_to_host(_body.aid); }
+
+    /**
+     * \brief Setter for the status code.
+     *
+     * \param new_status_code The status code to be set.
+     */
+    void status_code(uint16_t new_status_code);
+
+    /**
+     * \brief Setter for the AID field.
+     *
+     * \param new_aid The AID value to be set.
+     */
+    void aid(uint16_t new_aid);
+
+    /**
+     * \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 Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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
+     */
+    Dot11AssocResponse *clone() const {
+        return new Dot11AssocResponse(*this);
+    }
+private:
+    struct AssocRespBody {
+        capability_information capability;
+        uint16_t status_code;
+        uint16_t aid;
+    };
+
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+
+    AssocRespBody _body;
+};
+
+/**
+ * \brief Class representing an ReAssociation Request frame in the IEEE 802.11 Protocol.
+ *
+ */
+class Dot11ReAssocRequest : public Dot11ManagementFrame {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_REASSOC_REQ;
+
+    /**
+     * \brief Constructor for creating a 802.11 ReAssociation Request.
+     *
+     * Constructors a 802.11 Association Request taking the destination 
+     * and source hardware address.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11ReAssocRequest(const address_type &dst_hw_addr = address_type(), 
+                        const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11AssocRequest 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.
+     */
+    Dot11ReAssocRequest(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the Capabilities Information.
+     *
+     * \return A constant reference to the stored Capabilities 
+     * Information field.
+     */
+    const capability_information& capabilities() const { return _body.capability;}
+
+    /**
+     * \brief Getter for the Capabilities Information.
+     *
+     * \return A reference to the stored Capabilities Information 
+     * field.
+     */
+    capability_information& capabilities() { return _body.capability;}
+
+    /**
+     * \brief Getter for the listen interval field.
+     *
+     * \return The stored listen interval.
+     */
+    uint16_t listen_interval() const { return Endian::le_to_host(_body.listen_interval); }
+
+    /**
+     * \brief Getter for the current ap field.
+     *
+     * \return The current ap.
+     */
+    address_type current_ap() const { return _body.current_ap; }
+
+    /**
+     * \brief Setter for the listen interval field.
+     *
+     * \param new_listen_interval The listen interval to be set.
+     */
+    void listen_interval(uint16_t new_listen_interval);
+
+    /**
+     * \brief Setter for the current ap.
+     *
+     * \param new_current_ap The address of the current ap.
+     */
+    void current_ap(const address_type &new_current_ap);
+
+    /**
+     * \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 Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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
+     */
+    Dot11ReAssocRequest *clone() const {
+        return new Dot11ReAssocRequest(*this);
+    }
+private:
+    struct ReAssocReqBody {
+        capability_information capability;
+        uint16_t listen_interval;
+        uint8_t current_ap[address_type::address_size];
+    };
+
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+
+    ReAssocReqBody _body;
+};
+
+/**
+ * \brief IEEE 802.11 ReAssociation Response frame.
+ *
+ */
+class Dot11ReAssocResponse : public Dot11ManagementFrame {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_REASSOC_RESP;
+
+    /**
+     * \brief Constructor for creating a 802.11 Association Response.
+     *
+     * Constructs a 802.11 ReAssociation Response taking the 
+     * destination and source hardware address.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11ReAssocResponse(const address_type &dst_hw_addr = address_type(), 
+                        const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11ReAssocResponse 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.
+     */
+    Dot11ReAssocResponse(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the Capabilities Information.
+     *
+     * \return A constant reference to the stored Capabilities 
+     * Information field.
+     */
+    const capability_information& capabilities() const { return _body.capability;}
+
+    /**
+     * \brief Getter for the Capabilities Information.
+     *
+     * \return A reference to the stored Capabilities Information 
+     * field.
+     */
+    capability_information& capabilities() { return _body.capability;}
+
+    /**
+     * \brief Getter for the status code field.
+     *
+     * \return The stored status code.
+     */
+    uint16_t status_code() const { return Endian::le_to_host(_body.status_code); }
+
+    /**
+     * \brief Getter for the AID field.
+     *
+     * \return The stored AID field value.
+     */
+    uint16_t aid() const { return Endian::le_to_host(_body.aid); }
+
+    /**
+     * \brief Setter for the status code field.
+     *
+     * \param new_status_code The status code to be set.
+     */
+    void status_code(uint16_t new_status_code);
+
+    /**
+     * \brief Setter for the AID field.
+     *
+     * \param new_aid The AID to be set.
+     */
+    void aid(uint16_t new_aid);
+
+    /**
+     * \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 Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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
+     */
+    Dot11ReAssocResponse *clone() const {
+        return new Dot11ReAssocResponse(*this);
+    }
+private:
+    struct ReAssocRespBody {
+        capability_information capability;
+        uint16_t status_code;
+        uint16_t aid;
+    };
+
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+
+    ReAssocRespBody _body;
+};
+} // namespace Tins
+
+#endif // TINS_DOT11_DOT11_ASSOC_H
--- a/include/dot11/dot11_auth.h
+++ b/include/dot11/dot11_auth.h
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2012, 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_AUTH_H) && defined(HAVE_DOT11)
+#define TINS_DOT11_DOT11_AUTH_H
+
+#include "../dot11/dot11_mgmt.h"
+
+namespace Tins {
+/**
+ * \brief IEEE 802.11 Authentication Request frame.
+ */
+class Dot11Authentication : public Dot11ManagementFrame {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_AUTH;
+
+    /**
+     * \brief Constructor for creating a 802.11 Authentication.
+     *
+     * Constructs a 802.11 Dot11Authentication taking the 
+     * destination and source hardware address.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11Authentication(const address_type &dst_hw_addr = address_type(), 
+                        const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11Authentication 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.
+     */
+    Dot11Authentication(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the Authetication Algorithm Number field.
+     *
+     * \return The stored authentication algorithm number.
+     */
+    uint16_t auth_algorithm() const {return Endian::le_to_host(_body.auth_algorithm); }
+
+    /**
+     * \brief Getter for the Authetication Sequence Number field.
+     *
+     * \return The stored authentication sequence number.
+     */
+    uint16_t auth_seq_number() const {return Endian::le_to_host(_body.auth_seq_number); }
+
+    /**
+     * \brief Getter for the status code field.
+     *
+     * \return The stored status code.
+     */
+    uint16_t status_code() const { return Endian::le_to_host(_body.status_code); }
+
+    /**
+     * \brief Setter for the Authetication Algorithm Number field.
+     *
+     * \param new_auth_algorithm The Authetication Algorithm Number 
+     * to be set.
+     */
+    void auth_algorithm(uint16_t new_auth_algorithm);
+
+    /**
+     * \brief Setter for the Authetication Sequence Number field.
+     *
+     * \param new_auth_seq_number The Authetication Sequence Number 
+     * to be set.
+     */
+    void auth_seq_number(uint16_t new_auth_seq_number);
+
+    /**
+     * \brief Setter for the status code field.
+     *
+     * \param new_status_code The status code to be set.
+     */
+    void status_code(uint16_t new_status_code);
+
+    /**
+     * \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 Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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
+     */
+    Dot11Authentication *clone() const {
+        return new Dot11Authentication(*this);
+    }
+private:
+    struct AuthBody {
+        uint16_t auth_algorithm;
+        uint16_t auth_seq_number;
+        uint16_t status_code;
+    };
+
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+
+    AuthBody _body;
+
+};
+
+/**
+ * \brief IEEE 802.11 Deauthentication frame.
+ *
+ */
+class Dot11Deauthentication : public Dot11ManagementFrame {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_DEAUTH;
+
+    /**
+     * \brief Constructor for creating a 802.11 Deauthentication.
+     *
+     * Constructs a 802.11 Deauthentication taking the 
+     * destination and source hardware address.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11Deauthentication(const address_type &dst_hw_addr = address_type(), 
+                        const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11Deauthentication 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.
+     */
+    Dot11Deauthentication(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the reason code field.
+     *
+     * \return The reason code to be set.
+     */
+    uint16_t reason_code() const { return Endian::le_to_host(_body.reason_code); }
+
+    /**
+     * \brief Setter for the reason code field.
+     *
+     * \param new_reason_code The reason code to be set.
+     */
+    void reason_code(uint16_t new_reason_code);
+
+    /**
+     * \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 Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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
+     */
+    Dot11Deauthentication *clone() const {
+        return new Dot11Deauthentication(*this);
+    }
+private:
+    struct DeauthBody {
+        uint16_t reason_code;
+    };
+
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+
+    DeauthBody _body;
+};
+} // namespace Tins
+
+
+#endif // TINS_DOT11_DOT11_AUTH_H
--- a/include/dot11/dot11_base.h
+++ b/include/dot11/dot11_base.h
@@ -0,0 +1,522 @@
+/*
+ * Copyright (c) 2012, 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_H) && defined(HAVE_DOT11)
+#define TINS_DOT11_DOT11_H
+
+#include <list>
+#include "../pdu.h"
+#include "../pdu_option.h"
+#include "../small_uint.h"
+#include "../hw_address.h"
+#include "../endianness.h"
+#include "../cxxstd.h"
+#include "../macros.h"
+
+namespace Tins {
+class RSNInformation;
+
+/**
+ * \brief Class representing an 802.11 frame.
+ */
+class Dot11 : public PDU {
+public:
+    /**
+     * The type used to store hardware addresses.
+     */
+    typedef HWAddress<6> address_type;
+
+    /**
+     * \brief IEEE 802.11 options struct.
+     */
+    typedef PDUOption<uint8_t, Dot11> option;
+
+    /**
+     * The type used to store tagged options.
+     */
+    typedef std::list<option> options_type;
+
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11;
+
+    /**
+     * \brief Broadcast hardware address.
+     */
+    static const address_type BROADCAST;
+
+    /**
+     * The endianness used by Dot11.
+     */
+    static const endian_type endianness = LE;
+
+    /**
+     * \brief Enum for the different types of 802.11 frames.
+     *
+     */
+    enum Types {
+        MANAGEMENT = 0,
+        CONTROL = 1,
+        DATA = 2
+    };
+
+    /**
+     * \brief Enum for the different types of tagged options.
+     */
+    enum OptionTypes {
+        SSID,
+        SUPPORTED_RATES,
+        FH_SET,
+        DS_SET,
+        CF_SET,
+        TIM,
+        IBSS_SET,
+        COUNTRY,
+        HOPPING_PATTERN_PARAMS,
+        HOPPING_PATTERN_TABLE,
+        REQUEST_INFORMATION,
+        BSS_LOAD,
+        EDCA,
+        TSPEC,
+        TCLAS,
+        SCHEDULE,
+        CHALLENGE_TEXT,
+        POWER_CONSTRAINT = 32,
+        POWER_CAPABILITY,
+        TPC_REQUEST,
+        TPC_REPORT,
+        SUPPORTED_CHANNELS,
+        CHANNEL_SWITCH,
+        MEASUREMENT_REQUEST,
+        MEASUREMENT_REPORT,
+        QUIET,
+        IBSS_DFS,
+        ERP_INFORMATION,
+        TS_DELAY,
+        TCLAS_PROCESSING,
+        QOS_CAPABILITY = 46,
+        RSN = 48,
+        EXT_SUPPORTED_RATES = 50,
+        VENDOR_SPECIFIC = 221
+    };
+
+    /**
+     * \brief Enum for the different subtypes of 802.11 management frames.
+     *
+     */
+    enum ManagementSubtypes {
+        ASSOC_REQ = 0,
+        ASSOC_RESP = 1,
+        REASSOC_REQ = 2,
+        REASSOC_RESP = 3,
+        PROBE_REQ = 4,
+        PROBE_RESP = 5,
+        BEACON = 8,
+        ATIM = 9,
+        DISASSOC = 10,
+        AUTH = 11,
+        DEAUTH = 12
+    };
+
+    /**
+     * \brief Enum for the different subtypes of 802.11 control frames.
+     *
+     */
+    enum ControlSubtypes {
+        BLOCK_ACK_REQ = 8,
+        BLOCK_ACK = 9,
+        PS = 10,
+        RTS = 11,
+        CTS = 12,
+        ACK = 13,
+        CF_END = 14,
+        CF_END_ACK = 15
+    };
+
+    /**
+     * \brief Enum fro the different subtypes of 802.11 data frames.
+     *
+     */
+    enum DataSubtypes {
+        DATA_DATA = 0,
+        DATA_CF_ACK = 1,
+        DATA_CF_POLL = 2,
+        DATA_CF_ACK_POLL = 3,
+        DATA_NULL = 4,
+        CF_ACK = 5,
+        CF_POLL = 6,
+        CF_ACK_POLL = 7,
+        QOS_DATA_DATA = 8,
+        QOS_DATA_CF_ACK = 9,
+        QOS_DATA_CF_POLL = 10,
+        QOS_DATA_CF_ACK_POLL = 11,
+        QOS_DATA_NULL = 12
+    };
+    
+    /**
+     * \brief Constructs an 802.11 PDU.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     */
+    Dot11(const address_type &dst_hw_addr = address_type());
+
+    /**
+     * \brief Constructs 802.11 PDU 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 802.11 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.
+     */
+    Dot11(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the protocol version field.
+     *
+     * \return The stored protocol version field.
+     */
+    small_uint<2> protocol() const { return _header.control.protocol; }
+
+    /**
+     * \brief Getter for the Type field.
+     *
+     * \return The stored Type field.
+     */
+    small_uint<2> type() const { return _header.control.type; }
+
+    /**
+     * \brief Getter for the Subtype field.
+     *
+     * \return The stored Subtype field.
+     */
+    small_uint<4> subtype() const { return _header.control.subtype; }
+
+    /**
+     * \brief Getter for the To-DS field.
+     *
+     * \return The stored To-DS field.
+     */
+    small_uint<1> to_ds() const { return _header.control.to_ds; }
+
+    /**
+     * \brief Getter for the From-DS field.
+     *
+     * \return The stored From-DS field.
+     */
+    small_uint<1> from_ds() const { return _header.control.from_ds; }
+
+    /**
+     * \brief Getter for the More-Frag field.
+     *
+     * \return The stored More-Frag field.
+     */
+    small_uint<1> more_frag() const { return _header.control.more_frag; }
+
+    /**
+     * \brief Getter for the Retry field.
+     *
+     * \return The stored Retry field.
+     */
+    small_uint<1> retry() const { return _header.control.retry; }
+
+    /**
+     * \brief Getter for the Power-Management field.
+     *
+     * \return The stored Power-Management field.
+     */
+    small_uint<1> power_mgmt() const { return _header.control.power_mgmt; }
+
+    /**
+     * \brief Getter for the WEP field.
+     *
+     * \return The stored WEP field.
+     */
+    small_uint<1> wep() const { return _header.control.wep; }
+
+    /**
+     * \brief Getter for the Order field.
+     *
+     * \return The stored Order field.
+     */
+    small_uint<1> order() const { return _header.control.order; }
+
+    /**
+     * \brief Getter for the Duration-ID field.
+     *
+     * \return The stored Duration-ID field.
+     */
+    uint16_t duration_id() const { return Endian::le_to_host(_header.duration_id); }
+
+    /**
+     * \brief Getter for the first address.
+     *
+     * \return The stored first address.
+     */
+    address_type addr1() const { return _header.addr1; }
+
+    // Setters
+
+    /**
+     * \brief Setter for the protocol version field.
+     *
+     * \param new_proto The new protocol version field value.
+     */
+    void protocol(small_uint<2> new_proto);
+
+    /**
+     * \brief Setter for the type field.
+     *
+     * \param new_type The new type field value.
+     */
+    void type(small_uint<2> new_type);
+
+    /**
+     * \brief Setter for the subtype field.
+     *
+     * \param new_subtype The new subtype field value.
+     */
+    void subtype(small_uint<4> new_subtype);
+
+    /**
+     * \brief Setter for the To-DS field.
+     *
+     * \param new_value The new To-DS field value.
+     */
+    void to_ds(small_uint<1> new_value);
+
+    /**
+     * \brief Setter for the From-DS field.
+     *
+     * \param new_value The new From-DS field value.
+     */
+    void from_ds(small_uint<1> new_value);
+
+    /**
+     * \brief Setter for the More-Frag field.
+     *
+     * \param new_value The new More-Frag field value.
+     */
+    void more_frag(small_uint<1> new_value);
+
+    /**
+     * \brief Setter for the Retry field.
+     *
+     * \param new_value The new Retry field value.
+     */
+    void retry(small_uint<1> new_value);
+
+    /**
+     * \brief Setter for the Power-Management field.
+     *
+     * \param new_value The new Power-Management field value.
+     */
+    void power_mgmt(small_uint<1> new_value);
+
+    /**
+     * \brief Setter for the WEP field.
+     *
+     * \param new_value The new WEP field value.
+     */
+    void wep(small_uint<1> new_value);
+
+    /**
+     * \brief Setter for the Order field.
+     *
+     * \param new_value The new Order field value.
+     */
+    void order(small_uint<1> new_value);
+
+    /**
+     * \brief Setter for the Duration-ID field.
+     *
+     * \param new_duration_id The new Duration-ID field value.
+     */
+    void duration_id(uint16_t new_duration_id);
+
+    /**
+     * \brief Setter for the first address.
+     *
+     * \param new_addr1 The new first address.
+     */
+    void addr1(const address_type &new_addr1);
+
+    /* Virtual methods */
+    /**
+     * \brief Returns the 802.11 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 Adds a new option to this Dot11 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 Dot11 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 Looks up a tagged option in the option list.
+     * 
+     * The returned pointer <b>must not</b> be free'd.
+     * 
+     * \param opt The option identifier.
+     * \return The option found, or 0 if no such option has been set.
+     */
+    const option *search_option(OptionTypes opt) const;
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+    
+    /**
+     * \sa PDU::clone
+     */
+    Dot11 *clone() const {
+        return new Dot11(*this);
+    }
+
+    /**
+     * \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;
+    }
+    
+    /**
+     * \brief Getter for the option list.
+     * 
+     * \return The options list.
+     */
+    const options_type &options() const { return _options; }
+
+    /**
+     * \brief Allocates an Dot11 PDU from a buffer.
+     * 
+     * This can be used somehow as a "virtual constructor". This 
+     * method instantiates the appropriate subclass of Dot11 from the 
+     * given buffer.
+     * 
+     * The allocated class' type will be figured out from the
+     * information provided in the buffer.
+     * 
+     * \param buffer The buffer from which to take the PDU data.
+     * \param total_sz The total size of the buffer.
+     * \return The allocated Dot11 PDU.
+     */
+    static Dot11 *from_bytes(const uint8_t *buffer, uint32_t total_sz);
+protected:
+    virtual uint32_t write_ext_header(uint8_t *buffer, uint32_t total_sz) { return 0; }
+    virtual uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) { return 0; }
+    void parse_tagged_parameters(const uint8_t *buffer, uint32_t total_sz);
+    void add_tagged_option(OptionTypes opt, uint8_t len, const uint8_t *val);
+protected:
+    /**
+     * Struct that represents the 802.11 header
+     */
+    TINS_BEGIN_PACK
+    struct ieee80211_header {
+        TINS_BEGIN_PACK
+        struct {
+        #if TINS_IS_LITTLE_ENDIAN
+            uint16_t protocol:2,
+                    type:2,
+                    subtype:4,
+                    to_ds:1,
+                    from_ds:1,
+                    more_frag:1,
+                    retry:1,
+                    power_mgmt:1,
+                    more_data:1,
+                    wep:1,
+                    order:1;
+        #elif TINS_IS_BIG_ENDIAN
+            uint16_t subtype:4,
+                    type:2,
+                    protocol:2,
+                    order:1,
+                    wep:1,
+                    more_data:1,
+                    power_mgmt:1,
+                    retry:1,
+                    more_frag:1,
+                    from_ds:1,
+                    to_ds:1;
+        #endif
+        } TINS_END_PACK control;
+        uint16_t duration_id;
+        uint8_t addr1[address_type::address_size];
+
+    } TINS_END_PACK;
+private:
+    Dot11(const ieee80211_header *header_ptr);
+    
+    void internal_add_option(const option &opt);
+    void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
+
+
+    ieee80211_header _header;
+    uint32_t _options_size;
+    options_type _options;
+};
+}
+
+#endif // TINS_DOT11_DOT11_H
--- a/include/dot11/dot11_beacon.h
+++ b/include/dot11/dot11_beacon.h
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2012, 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
--- a/include/dot11/dot11_control.h
+++ b/include/dot11/dot11_control.h
@@ -0,0 +1,746 @@
+/*
+ * Copyright (c) 2012, 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_CONTROL_H) && defined(HAVE_DOT11)
+
+#define TINS_DOT11_DOT11_CONTROL_H
+
+#include "../dot11/dot11_base.h"
+
+namespace Tins {
+/**
+ * \brief Class that represents an 802.11 control frame.
+ */
+class Dot11Control : public Dot11 {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_CONTROL;
+    
+    /**
+     * \brief Constructor for creating a 802.11 control frame PDU
+     *
+     * Constructs a 802.11 Control PDU taking the destination and 
+     * source hardware addresses.
+     *
+     * \param dst_addr The destination hardware address.
+     */
+    Dot11Control(const address_type &dst_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11Control 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.
+     */
+    Dot11Control(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return PDU::DOT11_CONTROL; }
+
+    /**
+     * \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::DOT11_CONTROL || Dot11::matches_flag(flag);
+    }
+};
+
+/**
+ * \brief Class that represents an abstraction of the 802.11 control frames
+ * that contain a target address.
+ */
+class Dot11ControlTA : public Dot11Control {
+public:
+    /**
+     * \brief Getter for the target address field.
+     */
+    address_type target_addr() const { return _taddr; }
+
+    /**
+     * \brief Setter for the target address field.
+     * \param addr The new target address.
+     */
+    void target_addr(const address_type &addr);
+protected:
+    /**
+     * \brief Constructor for creating a 802.11 control frame TA PDU
+     *
+     * Constructs a 802.11 PDU taking the destination and source 
+     * hardware addresses.
+     *
+     * \param dst_addr The destination hardware address.
+     * \param target_addr The source hardware address.
+     */
+    Dot11ControlTA(const address_type &dst_addr = address_type(), 
+                const address_type &target_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11ControlTA 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.
+     */
+    Dot11ControlTA(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Returns the 802.11 frame's header length.
+     *
+     * \return An uint32_t with the header's size.
+     * \sa PDU::header_size()
+     */
+    uint32_t header_size() const;
+protected:
+    /**
+     * \brief Getter for the control ta additional fields size.
+     */
+    uint32_t controlta_size() const { return _taddr.size() + sizeof(ieee80211_header); }
+
+    uint32_t write_ext_header(uint8_t *buffer, uint32_t total_sz);
+private:
+
+    address_type _taddr;
+};
+
+/**
+ * \brief IEEE 802.11 RTS frame.
+ */
+class Dot11RTS : public Dot11ControlTA {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_RTS;
+
+    /**
+     * \brief Constructor for creating a 802.11 RTS frame PDU
+     *
+     * Constructs a 802.11 RTS PDU taking the destination and source
+     * hardware addresses.
+     *
+     * \param dst_addr The destination hardware address.
+     * \param target_addr The source hardware address.
+     */
+    Dot11RTS(const address_type &dst_addr = address_type(), 
+            const address_type &target_addr = address_type());
+                
+    /**
+     * \brief Constructs a Dot11RTS 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.
+     */
+    Dot11RTS(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11RTS *clone() const {
+        return new Dot11RTS(*this);
+    }
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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 || Dot11Control::matches_flag(flag);
+    }
+};
+
+class Dot11PSPoll : public Dot11ControlTA {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_PS_POLL;
+
+    /**
+     * \brief Constructor for creating a 802.11 PS-Poll frame PDU
+     *
+     * Constructs a 802.11 PDU taking the destination and source 
+     * hardware addresses.
+     *
+     * \param dst_addr The destination hardware address.
+     * \param target_addr The source hardware address.
+     */
+    Dot11PSPoll(const address_type &dst_addr = address_type(), 
+                const address_type &target_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11PSPoll 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.
+     */
+    Dot11PSPoll(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11PSPoll *clone() const {
+        return new Dot11PSPoll(*this);
+    }
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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 || Dot11Control::matches_flag(flag);
+    }
+};
+
+class Dot11CFEnd : public Dot11ControlTA {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_CF_END;
+
+    /**
+     * \brief Constructor for creating a 802.11 CF-End frame PDU
+     *
+     * Constructs a 802.11 PDU taking the destination and source 
+     * hardware addresses.
+     *
+     * \param dst_addr The destination hardware address.
+     * \param target_addr The source hardware address.
+     */
+    Dot11CFEnd(const address_type &dst_addr = address_type(), 
+            const address_type &target_addr = address_type());
+                
+    /**
+     * \brief Constructs a Dot11CFEnd 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.
+     */
+    Dot11CFEnd(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11CFEnd *clone() const {
+        return new Dot11CFEnd(*this);
+    }
+
+     /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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 || Dot11Control::matches_flag(flag);
+    }
+};
+
+class Dot11EndCFAck : public Dot11ControlTA {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_END_CF_ACK;
+
+    /**
+     * \brief Constructor for creating a 802.11 End-CF-Ack frame PDU
+     *
+     * Constructs a 802.11 PDU taking the destination and source 
+     * hardware addresses.
+     * 
+     * \param dst_addr The destination hardware address.
+     * \param target_addr The source hardware address.
+     */
+    Dot11EndCFAck(const address_type &dst_addr = address_type(), 
+                const address_type &target_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11EndCFAck frame 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.
+     */
+    Dot11EndCFAck(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11EndCFAck *clone() const {
+        return new Dot11EndCFAck(*this);
+    }
+
+     /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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 || Dot11Control::matches_flag(flag);
+    }
+};
+
+class Dot11Ack : public Dot11Control {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_ACK;
+
+    /**
+     * \brief Constructor for creating a 802.11 Ack frame PDU
+     *
+     * Constructs a 802.11 PDU taking the destination and source 
+     * hardware addresses.
+     *
+     * \param dst_addr The destination hardware address.
+     */
+    Dot11Ack(const address_type &dst_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11Ack frame 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.
+     */
+    Dot11Ack(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11Ack *clone() const {
+        return new Dot11Ack(*this);
+    }
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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 || Dot11Control::matches_flag(flag);
+    }
+};
+
+/**
+ * \brief Class that represents an 802.11 Block Ack Request PDU.
+ */
+class Dot11BlockAckRequest : public Dot11ControlTA {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_BLOCK_ACK_REQ;
+
+    /**
+     * \brief Constructor for creating a 802.11 Block Ack request frame PDU
+     *
+     * Constructs a 802.11 PDU taking the destination and source 
+     * hardware addresses.
+     * 
+     * \param dst_addr The destination hardware address.
+     * \param target_addr The source hardware address.
+     */
+    Dot11BlockAckRequest(const address_type &dst_addr = address_type(), 
+                        const address_type &target_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11BlockAckRequest 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.
+     */
+    Dot11BlockAckRequest(const uint8_t *buffer, uint32_t total_sz);
+
+    /* Getter */
+
+    /**
+     * \brief Getter for the bar control field.
+     * \return The stored bar control field.
+     */
+    small_uint<4> bar_control() const { 
+        #if TINS_IS_LITTLE_ENDIAN
+        return _bar_control & 0xf; 
+        #else
+        return (_bar_control >> 8) & 0xf; 
+        #endif
+    }
+
+    /**
+     * \brief Getter for the start sequence field.
+     * \return The stored start sequence.
+     */
+    small_uint<12> start_sequence() const { 
+        #if TINS_IS_LITTLE_ENDIAN
+        return (_start_sequence >> 4) & 0xfff; 
+        #else
+        return (Endian::le_to_host<uint16_t>(_start_sequence) >> 4) & 0xfff; 
+        #endif
+    }
+    
+    /**
+     * \brief Getter for the fragment number field.
+     * \return The stored fragment number field.
+     */
+    small_uint<4> fragment_number() const { 
+        #if TINS_IS_LITTLE_ENDIAN
+        return _start_sequence & 0xf; 
+        #else
+        return (_start_sequence >> 8) & 0xf; 
+        #endif
+    }
+    
+    /**
+     * \brief Returns the 802.11 frame's header length.
+     *
+     * \return The header's size.
+     * \sa PDU::header_size()
+     */
+    uint32_t header_size() const;
+
+    /* Setter */
+
+    /**
+     * \brief Setter for the bar control field.
+     * \param bar The bar control field to be set.
+     */
+    void bar_control(small_uint<4> bar);
+
+    /**
+     * \brief Setter for the start sequence field.
+     * \param bar The start sequence field to be set.
+     */
+    void start_sequence(small_uint<12> seq);
+    
+    /**
+     * \brief Setter for the fragment number field.
+     * \param frag The fragment number field to be set.
+     */
+    void fragment_number(small_uint<4> frag);
+
+    /**
+     * \brief Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11BlockAckRequest *clone() const {
+        return new Dot11BlockAckRequest(*this);
+    }
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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 || Dot11Control::matches_flag(flag);
+    }
+protected:
+    uint32_t write_ext_header(uint8_t *buffer, uint32_t total_sz);
+private:
+    void init_block_ack();
+
+    uint16_t _bar_control;
+    uint16_t _start_sequence;
+};
+
+/**
+ * \brief Class that represents an 802.11 block ack frame.
+ */
+class Dot11BlockAck : public Dot11ControlTA {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_BLOCK_ACK;
+    
+    /**
+     * The size of the bitmap field.
+     */
+    static const size_t bitmap_size = 8;
+
+    /**
+     * \brief Constructor for creating a 802.11 Block Ack frame PDU
+     *
+     * Constructs a 802.11 PDU taking the destination and source 
+     * hardware addresses.
+     * 
+     * \param dst_addr The destination hardware address.
+     * \param target_addr The source hardware address.
+     */
+    Dot11BlockAck(const address_type &dst_addr = address_type(), 
+                const address_type &target_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11BlockAck frame 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.
+     */
+    Dot11BlockAck(const uint8_t *buffer, uint32_t total_sz);
+
+    /* Getters */
+
+    /**
+     * \brief Getter for the bar control field.
+     * \return The stored bar control field.
+     */
+    small_uint<4> bar_control() const { 
+        #if TINS_IS_LITTLE_ENDIAN
+        return _bar_control & 0xf; 
+        #else
+        return (_bar_control >> 8) & 0xf; 
+        #endif
+    }
+
+    /**
+     * \brief Getter for the start sequence field.
+     * \return The stored start sequence.
+     */
+    small_uint<12> start_sequence() const { 
+        #if TINS_IS_LITTLE_ENDIAN
+        return (_start_sequence >> 4) & 0xfff; 
+        #else
+        return (Endian::le_to_host<uint16_t>(_start_sequence) >> 4) & 0xfff; 
+        #endif
+    }
+    
+    /**
+     * \brief Getter for the fragment number field.
+     * \return The stored fragment number field.
+     */
+    small_uint<4> fragment_number() const { 
+        #if TINS_IS_LITTLE_ENDIAN
+        return _start_sequence & 0xf; 
+        #else
+        return (_start_sequence >> 8) & 0xf; 
+        #endif
+    }
+    
+    /**
+     * \brief Returns the 802.11 frame's header length.
+     *
+     * \return An uint32_t with the header's size.
+     * \sa PDU::header_size()
+     */
+    uint32_t header_size() const;
+
+    /* Setters */
+
+    /**
+     * \brief Setter for the bar control field.
+     * \param bar The bar control field to be set.
+     */
+    void bar_control(small_uint<4> bar);
+
+    /**
+     * \brief Setter for the start sequence field.
+     * \param bar The start sequence field to be set.
+     */
+    void start_sequence(small_uint<12> seq);
+    
+    /**
+     * \brief Setter for the fragment number field.
+     * \param frag The fragment number field to be set.
+     */
+    void fragment_number(small_uint<4> frag);
+
+    /**
+     * \brief Getter for the bitmap field.
+     * 
+     * The returned pointer <b>must not</b> be free'd.
+     * 
+     * \return The bitmap field.
+     */
+    const uint8_t *bitmap() const { return _bitmap; }
+
+    /**
+     * \brief Setter for the bitmap field.
+     * \param bit The new bitmap field to be set.
+     */
+    void bitmap(const uint8_t *bit);
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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 || Dot11Control::matches_flag(flag);
+    }
+
+    /**
+     * \brief Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11BlockAck *clone() const {
+        return new Dot11BlockAck(*this);
+    }
+private:
+    void init_block_ack();
+    uint32_t write_ext_header(uint8_t *buffer, uint32_t total_sz);
+
+    uint16_t _bar_control, _start_sequence;
+    uint8_t _bitmap[bitmap_size];
+};
+} // namespace Tins
+#endif // TINS_DOT11_DOT11_CONTROL_H
--- a/include/dot11/dot11_data.h
+++ b/include/dot11/dot11_data.h
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2012, 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_DATA_H) && defined(HAVE_DOT11)
+#define TINS_DOT11_DOT11_DATA_H
+
+#include "../dot11/dot11_base.h"
+
+namespace Tins {
+class Dot11Data : public Dot11 {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_DATA;
+    
+    /**
+     * \brief Constructor for creating a 802.11 Data frame.
+     *
+     * Constructs a 802.11 Data frame taking the
+     * destination and source hardware addresses.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11Data(const address_type &dst_hw_addr = address_type(), 
+            const address_type &src_hw_addr = address_type());
+                
+    /**
+     * \brief Constructs a Dot11Data 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.
+     */
+    Dot11Data(const uint8_t *buffer, uint32_t total_sz);
+    
+    /**
+     * \brief Getter for the second address.
+     *
+     * \return The stored second address.
+     */
+    address_type addr2() const { return _ext_header.addr2; }
+
+    /**
+     * \brief Getter for the third address.
+     *
+     * \return The stored third address.
+     */
+    address_type addr3() const { return _ext_header.addr3; }
+
+    /**
+     * \brief Getter for the fragment number field.
+     *
+     * \return The stored fragment number.
+     */
+    small_uint<4> frag_num() const { 
+        #if TINS_IS_LITTLE_ENDIAN
+        return _ext_header.frag_seq & 0xf; 
+        #else
+        return (_ext_header.frag_seq >> 8) & 0xf; 
+        #endif
+    }
+
+    /**
+     * \brief Getter for the sequence number field.
+     *
+     * \return The stored sequence number.
+     */
+    small_uint<12> seq_num() const { 
+        #if TINS_IS_LITTLE_ENDIAN
+        return (_ext_header.frag_seq >> 4) & 0xfff; 
+        #else
+        return (Endian::le_to_host<uint16_t>(_ext_header.frag_seq) >> 4) & 0xfff; 
+        #endif
+    }
+
+    /**
+     * \brief Getter for the fourth address.
+     *
+     * \return The fourth address.
+     */
+    address_type addr4() const { return _addr4; }
+
+    /**
+     * \brief Setter for the second address.
+     *
+     * \param new_addr2 The second address to be set.
+     */
+    void addr2(const address_type &new_addr2);
+
+    /**
+     * \brief Setter for the third address.
+     *
+     * \param new_addr3 The third address to be set.
+     */
+    void addr3(const address_type &new_addr3);
+
+    /**
+     * \brief Setter for the fragment number field.
+     *
+     * \param new_frag_num The fragment number to be set.
+     */
+    void frag_num(small_uint<4> new_frag_num);
+
+    /**
+     * \brief Setter for the sequence number field.
+     *
+     * \param new_seq_num The sequence number to be set.
+     */
+    void seq_num(small_uint<12> new_seq_num);
+
+    /**
+     * \brief Setter for the fourth address field.
+     *
+     * \param new_addr4 The fourth address to be set.
+     */
+    void addr4(const address_type &new_addr4);
+
+    /**
+     * \brief Retrieves the frame's source address.
+     *
+     * This is a wrapper over the addr* member functions which
+     * takes into account the value of the FromDS and ToDS bits.
+     *
+     * If FromDS == ToDS == 1, the return value is not defined.
+     */
+    address_type src_addr() const {
+        if(!from_ds() && !to_ds())
+            return addr2();
+        if(!from_ds() && to_ds())
+            return addr2();
+        return addr3();
+    }
+
+    /**
+     * \brief Retrieves the frame's destination address.
+     *
+     * This is a wrapper over the addr* member functions which
+     * takes into account the value of the FromDS and ToDS bits.
+     *
+     * If FromDS == ToDS == 1, the return value is not defined.
+     */
+    address_type dst_addr() const {
+        if(!from_ds() && !to_ds())
+            return addr1();
+        if(!from_ds() && to_ds())
+            return addr3();
+        return addr1();
+    }
+
+    /**
+     * \brief Retrieves the frame's BSSID address.
+     *
+     * This is a wrapper over the addr* member functions which
+     * takes into account the value of the FromDS and ToDS bits.
+     *
+     * If FromDS == ToDS == 1, the return value is not defined.
+     */
+    address_type bssid_addr() const {
+        if(!from_ds() && !to_ds())
+            return addr3();
+        if(!from_ds() && to_ds())
+            return addr1();
+        return addr2();
+    }
+
+    /**
+     * \brief Returns the 802.11 frame's header length.
+     *
+     * \return An uint32_t with 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 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 || Dot11::matches_flag(flag);
+    }
+
+    /**
+     * \brief Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11Data *clone() const {
+        return new Dot11Data(*this);
+    }
+protected:
+    TINS_BEGIN_PACK
+    struct ExtendedHeader {
+        uint8_t addr2[address_type::address_size];
+        uint8_t addr3[address_type::address_size];
+        uint16_t frag_seq;
+    } TINS_END_PACK;
+    
+    struct no_inner_pdu { };
+    Dot11Data(const uint8_t *buffer, uint32_t total_sz, no_inner_pdu);
+
+    uint32_t init(const uint8_t *buffer, uint32_t total_sz);
+    uint32_t write_ext_header(uint8_t *buffer, uint32_t total_sz);
+
+    uint32_t data_frame_size() { 
+        return Dot11::header_size() + sizeof(_ext_header) + 
+            ((from_ds() && to_ds()) ? _addr4.size() : 0); 
+    }
+private:
+    ExtendedHeader _ext_header;
+    address_type _addr4;
+};
+
+class Dot11QoSData : public Dot11Data {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_QOS_DATA;
+
+    /**
+     * \brief Constructor for creating a 802.11 QoS Data PDU
+     *
+     * Constructs a 802.11 QoS Data PDU taking the
+     * destination and source hardware addresses.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11QoSData(const address_type &dst_hw_addr = address_type(), 
+                const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructors Dot11QoSData 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.
+     */
+    Dot11QoSData(const uint8_t *buffer, uint32_t total_sz);
+    
+    /**
+     * \brief Getter for the QOS Control field.
+     *
+     * \return The stored QOS Control field value.
+     */
+    uint16_t qos_control() const { return Endian::le_to_host(_qos_control); }
+
+    /**
+     * \brief Setter for the QOS Control field.
+     *
+     * \param new_qos_control The QOS Control to be set.
+     */
+    void qos_control(uint16_t new_qos_control);
+
+    /**
+     * \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 Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    Dot11QoSData *clone() const {
+        return new Dot11QoSData(*this);
+    }
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return PDU::DOT11_QOS_DATA; }
+
+    /**
+     * \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::DOT11_QOS_DATA || Dot11Data::matches_flag(flag);
+    }
+private:
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+
+
+    uint16_t _qos_control;
+};
+}
+
+#endif // TINS_DOT11_DOT11_DATA_H
--- a/include/dot11/dot11_mgmt.h
+++ b/include/dot11/dot11_mgmt.h
--- a/include/dot11/dot11_probe.h
+++ b/include/dot11/dot11_probe.h
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2012, 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_PROBE_H) && defined(HAVE_DOT11)
+
+#define TINS_DOT11_DOT11_PROBE_H
+
+#include "../dot11/dot11_mgmt.h"
+
+namespace Tins {
+/**
+ * \brief Class representing an Probe Request frame in the IEEE 802.11 Protocol.
+ *
+ */
+class Dot11ProbeRequest : public Dot11ManagementFrame {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_PROBE_REQ;
+
+    /**
+     * \brief Constructor for creating a 802.11 Probe Request.
+     *
+     * Constructs a 802.11 Probe Request taking the 
+     * destination and source hardware address.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11ProbeRequest(const address_type &dst_hw_addr = address_type(), 
+                    const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11ProbeRequest 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.
+     */
+    Dot11ProbeRequest(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return PDU::DOT11_PROBE_REQ; }
+
+    /**
+     * \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()
+     */
+    Dot11ProbeRequest* clone() const {
+        return new Dot11ProbeRequest(*this);
+    }
+
+};
+
+/**
+ * \brief Class representing an Probe Response frame in the IEEE 802.11 Protocol.
+ *
+ */
+class Dot11ProbeResponse : public Dot11ManagementFrame {
+public:
+    /**
+     * \brief This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::DOT11_PROBE_RESP;
+
+    /**
+     * \brief Constructor for creating a 802.11 Probe Response.
+     *
+     * Constructs a 802.11 Probe Response taking the
+     * destination and source hardware addresses.
+     *
+     * \param dst_hw_addr The destination hardware address.
+     * \param src_hw_addr The source hardware address.
+     */
+    Dot11ProbeResponse(const address_type &dst_hw_addr = address_type(), 
+                    const address_type &src_hw_addr = address_type());
+
+    /**
+     * \brief Constructs a Dot11ProbeResponse 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.
+     */
+    Dot11ProbeResponse(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.
+     *
+     * \return A constant reference to the stored Capabilities 
+     * Information field.
+     */
+    const capability_information& capabilities() const { return _body.capability;}
+
+    /**
+     * \brief Getter for the Capabilities Information.
+     *
+     * \return A reference 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 Clones this PDU.
+     *
+     * \sa PDU::clone()
+     */
+    Dot11ProbeResponse* clone() const {
+        return new Dot11ProbeResponse(*this);
+    }
+
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+
+    /**
+     * \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);
+    }
+protected:
+
+private:
+    TINS_BEGIN_PACK
+    struct ProbeResp {
+        uint64_t timestamp;
+        uint16_t interval;
+        capability_information capability;
+    } TINS_END_PACK;
+
+    ProbeResp _body;
+
+    uint32_t write_fixed_parameters(uint8_t *buffer, uint32_t total_sz);
+};
+} // namespace Tins
+#endif // TINS_DOT11_DOT11_PROBE_H
--- a/include/dot1q.h
+++ b/include/dot1q.h
@@ -35,6 +35,9 @@
 #include "small_uint.h"

 namespace Tins {
+/**
+ * Represents an IEEE 802.1q PDU.
+ */
 class Dot1Q : public PDU {
 public:
    /**
@@ -78,24 +81,24 @@ public:
    uint32_t trailer_size() const;

    /**
-     *  \brief Getter for the priority field.
-     *  \return The stored priority field value.
+     * \brief Getter for the priority field.
+     * \return The stored priority field value.
     */
    small_uint<3> priority() const {
        return _header.priority;
    }

    /**
-     *  \brief Getter for the cfi field.
-     *  \return The stored cfi field value.
+     * \brief Getter for the Canonical Format Identifier field.
+     * \return The stored CFI field value.
     */
    small_uint<1> cfi() const {
        return _header.cfi;
    }

    /**
-     *  \brief Getter for the id field.
-     *  \return The stored id field value.
+     * \brief Getter for the VLAN ID field.
+     * \return The stored VLAN ID field value.
     */
    small_uint<12> id() const {
        #if TINS_IS_LITTLE_ENDIAN
@@ -106,8 +109,8 @@ public:
    }

    /**
-     *  \brief Getter for the payload type field.
-     *  \return The stored type field value.
+     * \brief Getter for the payload type field.
+     * \return The stored type field value.
     */
    uint16_t payload_type() const {
        return Endian::be_to_host(_header.type);
@@ -137,31 +140,31 @@ public:
    // Setters

    /**
-     *  \brief Setter for the priority field.
-     *  \param new_priority The new priority field value.
+     * \brief Setter for the priority field.
+     * \param new_priority The new priority field value.
     */
    void priority(small_uint<3> new_priority);

    /**
-     *  \brief Setter for the cfi field.
-     *  \param new_cfi The new cfi field value.
+     * \brief Setter for the Canonical Format Identifie field.
+     * \param new_cfi The new CFI field value.
     */
    void cfi(small_uint<1> new_cfi);

    /**
-     *  \brief Setter for the id field.
-     *  \param new_id The new id field value.
+     * \brief Setter for the VLAN ID field.
+     * \param new_id The new VLAN ID field value.
     */
    void id(small_uint<12> new_id);

    /**
-     *  \brief Setter for the payload type field.
-     *  \param new_type The new type field value.
+     * \brief Setter for the payload type field.
+     * \param new_type The new type field value.
     */
    void payload_type(uint16_t new_type);
    
    /**
-     *  \brief Indicates whether the appropriate padding will be 
+     * \brief Indicates whether the appropriate padding will be 
     * at the end of the packet.
     * 
     * This flag could be disabled in case two or more contiguous Dot1Q 
--- a/include/eapol.h
+++ b/include/eapol.h
@@ -473,8 +473,8 @@ namespace Tins {
        const key_type &key() const { return _key; }
        
        /**
-         * \brief Getter for the key_mic field.
-         * \return The key_mic field.
+         * \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; };

@@ -500,17 +500,18 @@ namespace Tins {
         * \brief Getter for the encrypted field.
         * \return The encrypted field.
         */
-        small_uint<1 > encrypted() const { return _header.encrypted; };
+        small_uint<1> encrypted() const { return _header.encrypted; };

        /**
-         * \brief Getter for the key_descriptor field.
-         * \return The key_descriptor field.
+         * \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_t field.
-         * \return The key_t field.
+         * \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; };

--- a/include/endianness.h
+++ b/include/endianness.h
@@ -55,6 +55,16 @@

 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.
     *
@@ -80,7 +90,7 @@ namespace Endian {
     * \param data The data to convert.
     */
     inline uint64_t do_change_endian(uint64_t data) {
-        return (((uint64_t)(do_change_endian((uint32_t)((data << 32) >> 32))) << 32) |
+        return (((uint64_t)(do_change_endian((uint32_t)(data & 0xffffffff))) << 32) |
                (do_change_endian(((uint32_t)(data >> 32)))));
     }
     
@@ -100,6 +110,11 @@ namespace Endian {
    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> 
--- a/include/ethernetII.h
+++ b/include/ethernetII.h
@@ -136,6 +136,14 @@ namespace Tins {
         */
        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
        /**
--- a/include/exceptions.h
+++ b/include/exceptions.h
@@ -124,6 +124,49 @@ public:
        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
--- a/include/handshake_capturer.h
+++ b/include/handshake_capturer.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2012, 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
--- a/include/hw_address.h
+++ b/include/hw_address.h
@@ -37,6 +37,7 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
+#include "cxxstd.h"

 namespace Tins {
 /**
@@ -68,6 +69,11 @@ public:
     * elements in this address.
     */
    static const size_t address_size = n;
+
+    /**
+     * \brief The broadcast address.
+     */
+    static const HWAddress<n, Storage> broadcast;
    
    /**
     * \brief Constructor from a const storage_type*.
@@ -137,11 +143,18 @@ public:
     */
    template<size_t i>
    HWAddress(const HWAddress<i> &rhs) {
-        std::copy(
-            rhs.begin(),
-            rhs.begin() + std::min(i, n),
-            begin()
+        // Fill extra bytes
+        std::fill(
+            // Copy as most as we can
+            std::copy(
+                rhs.begin(),
+                rhs.begin() + std::min(i, n),
+                begin()
+            ),
+            end(),
+            0
        );
+        
    }
    
    /**
@@ -226,6 +239,27 @@ public:
        return address_size;
    }
    
+    /**
+     * \brief Indicates whether this is a broadcast address.
+     */
+    bool is_broadcast() const {
+        return *this == broadcast;
+    }
+    
+    /**
+     * \brief Indicates whether this is a multicast address.
+     */
+    bool is_multicast() const {
+        return (buffer[0] & 0x01);
+    }
+
+    /**
+     * \brief Indicates whether this is an unicast address.
+     */
+    bool is_unicast() const {
+        return !is_broadcast() && !is_multicast();
+    }
+
    /**
     * \brief Convert this address to a hex-notation std::string address.
     * 
@@ -236,6 +270,15 @@ public:
        oss << *this;
        return oss.str();
    }
+
+    /**
+     * \brief Retrieves the i-th storage_type in this address.
+     *
+     * \param i The element to retrieve.
+     */
+    storage_type operator[](size_t i) const {
+        return buffer[i];
+    }
    
    /**
     * \brief Writes this HWAddress in hex-notation to a std::ostream.
@@ -295,13 +338,16 @@ void HWAddress<n, Storage>::convert(const std::string &hw_addr,
  OutputIterator output) 
 {
    unsigned i(0);
+    size_t count(0);
    storage_type tmp;
-    while(i < hw_addr.size()) {
+    while(i < hw_addr.size() && count < n) {
        const unsigned end = i+2;
        tmp = storage_type();
        while(i < end) {
            if(hw_addr[i] >= 'a' && hw_addr[i] <= 'f')
                tmp = (tmp << 4) | (hw_addr[i] - 'a' + 10);
+            else if(hw_addr[i] >= 'A' && hw_addr[i] <= 'F')
+                tmp = (tmp << 4) | (hw_addr[i] - 'A' + 10);
            else if(hw_addr[i] >= '0' && hw_addr[i] <= '9')
                tmp = (tmp << 4) | (hw_addr[i] - '0');
            else if(hw_addr[i] == ':')
@@ -311,6 +357,7 @@ void HWAddress<n, Storage>::convert(const std::string &hw_addr,
            i++;
        }
        *(output++) = tmp;
+        count++;
        if(i < hw_addr.size()) {
            if(hw_addr[i] == ':')
                i++;
@@ -318,6 +365,23 @@ void HWAddress<n, Storage>::convert(const std::string &hw_addr,
                throw std::runtime_error("Invalid separator");
        }
    }
+    while(count++ < n) {
+        *(output++) = storage_type();
+    }
 }
-}
+
+template<size_t n, typename Storage>
+const HWAddress<n, Storage> HWAddress<n, Storage>::broadcast("ff:ff:ff:ff:ff:ff");
+} // namespace Tins
+#if TINS_IS_CXX11
+namespace std
+{
+template<size_t n>
+struct hash<Tins::HWAddress<n>> {
+    size_t operator()(const Tins::HWAddress<n> &addr) const {
+        return std::hash<std::string>()(addr.to_string());
+    }
+};
+} // namespace std
+#endif
 #endif // TINS_HWADDRESS_H
--- a/include/icmp.h
+++ b/include/icmp.h
@@ -33,6 +33,7 @@
 #include "macros.h"
 #include "pdu.h"
 #include "endianness.h"
+#include "ip_address.h"

 namespace Tins {

@@ -48,6 +49,11 @@ namespace Tins {
         */
        static const PDU::PDUType pdu_flag = PDU::ICMP;
    
+        /**
+         * The type used to store addresses.
+         */
+        typedef IPv4Address address_type;
+
        /** \brief ICMP flags
         */
        enum Flags {
@@ -58,8 +64,12 @@ namespace Tins {
            ECHO_REQUEST     = 8,
            TIME_EXCEEDED    = 11,
            PARAM_PROBLEM    = 12,
+            TIMESTAMP_REQUEST = 13,
+            TIMESTAMP_REPLY  = 14,
            INFO_REQUEST     = 15,
-            INFO_REPLY       = 16
+            INFO_REPLY       = 16,
+            ADDRESS_MASK_REQUEST = 17,
+            ADDRESS_MASK_REPLY = 18
        };

        /**
@@ -96,13 +106,6 @@ namespace Tins {
         */
        void type(Flags type);

-        /**
-         * \brief Setter for checksum field.
-         *
-         * \param new_check uint16_t with the new checksum.
-         */
-        void check(uint16_t new_check);
-
        /**
         * \brief Setter for the id field.
         *
@@ -120,9 +123,9 @@ namespace Tins {
        /**
         * \brief Setter for the gateway field.
         *
-         * \param new_gw uint32_t with the new gateway.
+         * \param new_gw The new value for the gateway field.
         */
-        void gateway(uint32_t new_gw);
+        void gateway(address_type new_gw);

        /**
         * \brief Setter for the mtu field.
@@ -138,6 +141,34 @@ namespace Tins {
         */
        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.
         *
@@ -206,7 +237,7 @@ namespace Tins {
         * \param address Address of the gateway to which traffic should
         * be sent.
         */
-        void set_redirect(uint8_t icode, uint32_t address);
+        void set_redirect(uint8_t icode, address_type address);

        /**
         * \brief Getter for the ICMP type flag.
@@ -227,7 +258,7 @@ namespace Tins {
         *
         * \return Returns the checksum as an unit16_t.
         */
-        uint16_t check() const { return Endian::be_to_host(this->_icmp.check); }
+        uint16_t check() const { return Endian::be_to_host(_icmp.check); }

        /**
         * \brief Getter for the echo id.
@@ -246,23 +277,55 @@ namespace Tins {
        /**
         * \brief Getter for the gateway field.
         *
-         * \return Returns the gateways in an unit32_t.
+         * \return Returns the gateway field value.
         */
-         uint32_t gateway() const { return Endian::be_to_host(this->_icmp.un.gateway); }
+        address_type gateway() const { 
+            return address_type(Endian::be_to_host(_icmp.un.gateway)); 
+        }

         /**
          * \brief Getter for the pointer field.
          *
-          * \return Returns the pointer value.
+          * \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 value in an uint16_t.
+          * \return Returns the mtu field value.
          */
-        uint16_t mtu() const { return Endian::be_to_host(this->_icmp.un.frag.mtu); }
+        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.
@@ -313,6 +376,8 @@ namespace Tins {
                uint8_t pointer;
            } un;
        } TINS_END_PACK;
+
+        void check(uint16_t new_check);
        
        /** \brief Serialices this ICMP PDU.
         * \param buffer The buffer in which the PDU will be serialized.
@@ -322,6 +387,7 @@ namespace Tins {
        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;
    };
 }

--- a/include/icmpv6.h
+++ b/include/icmpv6.h
@@ -135,7 +135,7 @@ public:
    /**
     * The type used to represent ICMPv6 options.
     */
-    typedef PDUOption<uint8_t> option;
+    typedef PDUOption<uint8_t, ICMPv6> option;
    
    /**
     * The type used to store options.
@@ -145,30 +145,53 @@ public:
    /**
     * \brief The type used to store the new home agent information 
     * option data.
-     * 
-     * The first member contains the home agent preference field, while
-     * the second one contains the home agent lifetime.
     */
-    typedef std::pair<uint16_t, uint16_t> new_ha_info_type;
+    typedef std::vector<uint16_t> new_ha_info_type;
    
    /**
     * The type used to store the source/target address list options.
     */
-    typedef std::vector<ipaddress_type> addr_list_type;
+    struct addr_list_type {
+        typedef std::vector<ipaddress_type> addresses_type;
+        
+        uint8_t reserved[6];
+        addresses_type addresses;
+        
+        addr_list_type(const addresses_type &addresses = addresses_type())
+        : addresses(addresses) 
+        {
+            std::fill(reserved, reserved + sizeof(reserved), 0);
+        }
+        
+        static addr_list_type from_option(const option &opt);
+    };
    
    /**
     * The type used to store the nonce option data.
     */
    typedef std::vector<uint8_t> nonce_type;
    
+    /**
+     * The type used to store the MTU option.
+     */
+    typedef std::pair<uint16_t, uint32_t> mtu_type;
+    
    /**
     * \brief The type used to store the neighbour advertisement 
     * acknowledgement option data.
-     * 
-     * The first member contains the option code field, while
-     * the second one contains the status.
     */
-    typedef std::pair<uint8_t, uint8_t> naack_type;
+    struct naack_type {
+        uint8_t code, status;
+        uint8_t reserved[4];
+        
+        naack_type(uint8_t code = 0, uint8_t status = 0)
+        : code(code), status(status)
+        {
+            std::fill(reserved, reserved + 4, 0);
+        }
+        
+        static naack_type from_option(const option &opt);
+    };
    
    /**
     * \brief The type used to store the link layer address option data.
@@ -207,6 +230,8 @@ public:
        {
            
        }
+        
+        static lladdr_type from_option(const option &opt);
    };
    
    /**
@@ -226,6 +251,8 @@ public:
        : prefix_len(prefix_len), A(A), L(L), 
          valid_lifetime(valid_lifetime), preferred_lifetime(preferred_lifetime),
          prefix(prefix) { }
+          
+        static prefix_info_type from_option(const option &opt);
    };
    
    /**
@@ -290,6 +317,8 @@ public:
        {
            std::fill(key_hash, key_hash + sizeof(key_hash), 0);
        }
+
+        static rsa_sign_type from_option(const option &opt);
    };
    
    /**
@@ -303,6 +332,8 @@ public:
          const ipaddress_type &address = ipaddress_type())
        : option_code(option_code), prefix_len(prefix_len), address(address)
        {}
+
+        static ip_prefix_type from_option(const option &opt);
    };
    
    /**
@@ -319,6 +350,8 @@ public:
          const ipaddress_type &address = ipaddress_type())
        : dist(dist), pref(pref), r(r), valid_lifetime(valid_lifetime),
          address(address) { }
+
+        static map_type from_option(const option &opt);
    };
    
    /**
@@ -336,6 +369,8 @@ public:
          uint32_t route_lifetime = 0, const prefix_type &prefix = prefix_type())
        : prefix_len(prefix_len), pref(pref), route_lifetime(route_lifetime),
          prefix(prefix) { }
+
+        static route_info_type from_option(const option &opt);
    };
    
    /**
@@ -350,6 +385,8 @@ public:
        recursive_dns_type(uint32_t lifetime = 0, 
          const servers_type &servers = servers_type())
        : lifetime(lifetime), servers(servers) {}
+
+        static recursive_dns_type from_option(const option &opt);
    };
    
    /**
@@ -364,6 +401,8 @@ public:
        handover_key_req_type(small_uint<4> AT = 0,
          const key_type &key = key_type())
        : AT(AT), key(key) { }
+
+        static handover_key_req_type from_option(const option &opt);
    };
    
    /**
@@ -375,6 +414,8 @@ public:
        handover_key_reply_type(uint16_t lifetime = 0, small_uint<4> AT = 0,
          const key_type &key = key_type())
        : handover_key_req_type(AT, key), lifetime(lifetime) { }
+
+        static handover_key_reply_type from_option(const option &opt);
    };
    
    /**
@@ -389,6 +430,8 @@ public:
        handover_assist_info_type(uint8_t option_code=0, 
          const hai_type &hai = hai_type())
        : option_code(option_code), hai(hai) { }
+
+        static handover_assist_info_type from_option(const option &opt);
    };
    
    /**
@@ -403,6 +446,8 @@ public:
        mobile_node_id_type(uint8_t option_code=0, 
          const mn_type &mn = mn_type())
        : option_code(option_code), mn(mn) { }
+
+        static mobile_node_id_type from_option(const option &opt);
    };
    
    /**
@@ -417,8 +462,58 @@ public:
        dns_search_list_type(uint32_t lifetime = 0,
          const domains_type &domains = domains_type())
        : lifetime(lifetime), domains(domains) { }
+
+        static dns_search_list_type from_option(const option &opt);
    };
-    
+
+    /**
+     * The type used to store the timestamp option.
+     */
+    struct timestamp_type {
+        uint8_t reserved[6];
+        uint64_t timestamp;
+
+        timestamp_type(uint64_t timestamp = 0)
+        : timestamp(timestamp)
+        {
+            std::fill(reserved, reserved + sizeof(reserved), 0);
+        }
+
+        static timestamp_type from_option(const option &opt);
+    };
+
+    /**
+     * The type used to store the shortcut limit option.
+     */
+    struct shortcut_limit_type {
+        uint8_t limit, reserved1;
+        uint32_t reserved2;
+
+        shortcut_limit_type(uint8_t limit = 0)
+        : limit(limit), reserved1(), reserved2()
+        {
+
+        }
+
+        static shortcut_limit_type from_option(const option &opt);
+    };
+
+    /**
+     * The type used to store new advertisement interval option.
+     */
+    struct new_advert_interval_type {
+        uint16_t reserved;
+        uint32_t interval;
+
+        new_advert_interval_type(uint32_t interval = 0)
+        : reserved(), interval(interval)
+        {
+
+        }
+
+        static new_advert_interval_type from_option(const option &opt);
+    };
+
    /**
     * \brief Constructs an ICMPv6 object.
     * 
@@ -820,33 +915,30 @@ public:
    /**
     * \brief Setter for the redirect header option.
     * 
-     * This method appends the 6 reserved bytes and inserts the 
-     * necessary padding at the end.
-     * 
     * \param data The redirect header option data.
     */
-    void redirect_header(PDU::serialization_type data);
+    void redirect_header(const byte_array &data);
    
    /**
     * \brief Setter for the MTU option.
     * 
     * \param value The MTU option data.
     */
-    void mtu(uint32_t value);
+    void mtu(const mtu_type& value);
    
    /**
     * \brief Setter for the shortcut limit option.
     * 
     * \param value The shortcut limit option data.
     */
-    void shortcut_limit(uint8_t value);
+    void shortcut_limit(const shortcut_limit_type& value);
    
    /**
     * \brief Setter for the new advertisement interval option.
     * 
     * \param value The new advertisement interval option data.
     */
-    void new_advert_interval(uint32_t value);
+    void new_advert_interval(const new_advert_interval_type &value);
    
    /**
     * \brief Setter for the new home agent information option.
@@ -881,7 +973,7 @@ public:
     * 
     * \param value The new timestamp option data.
     */
-    void timestamp(uint64_t value);
+    void timestamp(const timestamp_type &value);
    
    /**
     * \brief Setter for the new nonce option.
@@ -1001,7 +1093,7 @@ public:
     * This method will throw an option_not_found exception if the
     * option is not found.
     */
-    PDU::serialization_type redirect_header() const;
+    byte_array redirect_header() const;
    
    /**
     * \brief Getter for the MTU option.
@@ -1009,7 +1101,7 @@ public:
     * This method will throw an option_not_found exception if the
     * option is not found.
     */
-    uint32_t mtu() const;
+    mtu_type mtu() const;
    
    /**
     * \brief Getter for the shortcut limit option.
@@ -1017,7 +1109,7 @@ public:
     * This method will throw an option_not_found exception if the
     * option is not found.
     */
-    uint8_t shortcut_limit() const;
+    shortcut_limit_type shortcut_limit() const;
    
    /**
     * \brief Getter for the new advertisement interval option.
@@ -1025,7 +1117,7 @@ public:
     * This method will throw an option_not_found exception if the
     * option is not found.
     */
-    uint32_t new_advert_interval() const;
+    new_advert_interval_type new_advert_interval() const;
    
    /**
     * \brief Getter for the new home agent information option.
@@ -1065,7 +1157,7 @@ public:
     * This method will throw an option_not_found exception if the
     * option is not found.
     */
-    uint64_t timestamp() const;
+    timestamp_type timestamp() const;
    
    /**
     * \brief Getter for the nonce option.
@@ -1225,6 +1317,14 @@ private:
        return option;
    }

+    template<typename T>
+    T search_and_convert(OptionTypes type) const {
+        const option *opt = search_option(type);
+        if(!opt)
+            throw option_not_found();
+        return opt->to<T>();
+    }
+
    icmp6hdr _header;
    ipaddress_type _target_address, _dest_address;
    options_type _options;
--- a/include/internals.h
+++ b/include/internals.h
@@ -35,33 +35,171 @@
 #include <stdint.h>
 #include "constants.h"
 #include "pdu.h"
+#include "hw_address.h"

 /**
 * \cond
 */
 namespace Tins {
-namespace Internals {
-    void skip_line(std::istream &input);
-    bool from_hex(const std::string &str, uint32_t &result);
-    
-    template<bool, typename>
-    struct enable_if {
-        
-    };
+class IPv4Address;
+class IPv6Address;

-    template<typename T>
-    struct enable_if<true, T> {
-        typedef T type;
-    };
+namespace Internals {
+template<size_t n>
+class byte_array {
+public:
+    typedef uint8_t* iterator;
+    typedef const uint8_t* const_iterator;
    
-    PDU *pdu_from_flag(Constants::Ethernet::e flag, const uint8_t *buffer, 
-      uint32_t size, bool rawpdu_on_no_match = true);
+    byte_array() {
+        std::fill(begin(), end(), 0);
+    }
    
-    PDU *pdu_from_flag(PDU::PDUType type, const uint8_t *buffer, uint32_t size);
+    template<typename InputIterator>
+    byte_array(InputIterator start, InputIterator last) {
+        std::copy(start, last, data);
+    }
    
-    Constants::Ethernet::e pdu_flag_to_ether_type(PDU::PDUType flag);
+    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
 */
--- a/include/ip.h
+++ b/include/ip.h
@@ -169,7 +169,7 @@ namespace Tins {
        /**
         * The IP options type.
         */
-        typedef PDUOption<option_identifier> option;
+        typedef PDUOption<option_identifier, IP> option;

        /**
         * The type of the security option.
@@ -184,6 +184,8 @@ namespace Tins {
            : security(sec), compartments(comp), 
              handling_restrictions(hand_res), transmission_control(tcc) 
              {}
+            
+            static security_type from_option(const option &opt);
        };
        
        /**
@@ -198,6 +200,8 @@ namespace Tins {
            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);
        };
        
        /**
@@ -333,13 +337,6 @@ namespace Tins {

        /* Setters */

-        /**
-         * \brief Setter for the header length field.
-         *
-         * \param new_head_len The new header length.
-         */
-        void head_len(small_uint<4> new_head_len);
-
        /**
         * \brief Setter for the type of service field.
         *
@@ -347,13 +344,6 @@ namespace Tins {
         */
        void tos(uint8_t new_tos);

-        /**
-         * \brief Setter for the total length field.
-         *
-         * \param new_tot_len The new total length.
-         */
-        void tot_len(uint16_t new_tot_len);
-
        /**
         * \brief Setter for the id field.
         *
@@ -378,6 +368,17 @@ namespace Tins {
        /**
         * \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);
@@ -582,6 +583,13 @@ namespace Tins {
         */
        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
@@ -618,6 +626,10 @@ namespace Tins {
            /*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();
--- a/include/ip_address.h
+++ b/include/ip_address.h
@@ -33,110 +33,167 @@
 #include <string>
 #include <iostream>
 #include <stdint.h>
+#include "cxxstd.h"

 namespace Tins {
+/**
+ * \class IPv4Address
+ * \brief Abstraction of an IPv4 address.
+ */
+class IPv4Address {
+public:
    /**
-     * \class IPv4Address
-     * \brief Abstraction of an IPv4 address.
+     * The address size.
     */
-    class IPv4Address {
-    public:
-        /**
-         * The address size.
-         */
-        static const size_t address_size = sizeof(uint32_t);
-        
-        /**
-         * \brief Constructor taking a const char*.
-         * 
-         * Constructs an IPv4Address from a dotted-notation address 
-         * cstring. If the pointer provided is null, then a default 
-         * IPv4Address object is constructed, which corresponds to 
-         * the 0.0.0.0 address.
-         * 
-         * \param ip const char* containing the dotted-notation address.
-         */
-        IPv4Address(const char *ip = 0);
-        
-        /**
-         * \brief Constructor taking a std::string.
-         * 
-         * Constructs an IPv4Address from a dotted-notation std::strings
-         * 
-         * \param ip std::string containing the dotted-notation address.
-         */
-        IPv4Address(const std::string &ip);
-        
-        /**
-         * \brief Constructor taking a IP address represented as a
-         * big endian integer.
-         * 
-         * This constructor should be used internally by PDUs that
-         * handle IP addresses. The provided integer <b>must</b> be
-         * be in big endian.
-         */
-        explicit IPv4Address(uint32_t ip);
-        
-        /**
-         * \brief User defined conversion to big endian integral value.
-         */
-        operator uint32_t() const;
-        
-        /**
-         * \brief Retrieve the string representation of this address.
-         * 
-         * \return std::string containing the representation of this address.
-         */
-        std::string to_string() const;
-        
-        /**
-         * \brief Compare this IPv4Address for equality.
-         * 
-         * \param rhs The address to be compared.
-         * \return bool indicating whether this address equals rhs.
-         */
-        bool operator==(const IPv4Address &rhs) const {
-            return ip_addr == rhs.ip_addr;
-        }
-        
-        /**
-         * \brief Compare this IPv4Address for inequality.
-         * 
-         * \param rhs The address to be compared.
-         * \return bool indicating whether this address is distinct 
-         * from rhs.
-         */
-        bool operator!=(const IPv4Address &rhs) const {
-            return !(*this == rhs);
-        }
-        
-        /**
-         * \brief Compare this IPv4Address for less-than inequality.
-         * 
-         * \param rhs The address to be compared.
-         * \return bool indicating whether this address is less-than rhs.
-         */
-        bool operator< (const IPv4Address &rhs) const {
-            return ip_addr < rhs.ip_addr;
-        }
-        
-        /**
-         * \brief Writes this address to a std::ostream.
-         * 
-         * This method writes addr in a dotted-string notation address
-         * to the std::ostream argument.
-         * 
-         * \param output The std::ostream in which to write the address.
-         * \param addr The IPv4Address to be written.
-         * \return std::stream& pointing to output.
-         */
-        friend std::ostream &operator<<(std::ostream &output, const IPv4Address &addr);
-    private:
-        uint32_t ip_to_int(const std::string &ip);
+    static const size_t address_size = sizeof(uint32_t);
+
+    /**
+     * The broadcast address.
+     */
+    static const IPv4Address broadcast;
+
+    /**
+     * \brief Constructor taking a const char*.
+     * 
+     * Constructs an IPv4Address from a dotted-notation address 
+     * cstring. If the pointer provided is null, then a default 
+     * IPv4Address object is constructed, which corresponds to 
+     * the 0.0.0.0 address.
+     * 
+     * \param ip const char* containing the dotted-notation address.
+     */
+    IPv4Address(const char *ip = 0);
    
-        uint32_t ip_addr;
-    };
-}
+    /**
+     * \brief Constructor taking a std::string.
+     * 
+     * Constructs an IPv4Address from a dotted-notation std::strings
+     * 
+     * \param ip std::string containing the dotted-notation address.
+     */
+    IPv4Address(const std::string &ip);
+    
+    /**
+     * \brief Constructor taking a IP address represented as a
+     * big endian integer.
+     * 
+     * This constructor should be used internally by PDUs that
+     * handle IP addresses. The provided integer <b>must</b> be
+     * be in big endian.
+     */
+    explicit IPv4Address(uint32_t ip);
+    
+    /**
+     * \brief User defined conversion to big endian integral value.
+     */
+    operator uint32_t() const;
+    
+    /**
+     * \brief Retrieve the string representation of this address.
+     * 
+     * \return std::string containing the representation of this address.
+     */
+    std::string to_string() const;
+    
+    /**
+     * \brief Compare this IPv4Address for equality.
+     * 
+     * \param rhs The address to be compared.
+     * \return bool indicating whether this address equals rhs.
+     */
+    bool operator==(const IPv4Address &rhs) const {
+        return ip_addr == rhs.ip_addr;
+    }
+    
+    /**
+     * \brief Compare this IPv4Address for inequality.
+     * 
+     * \param rhs The address to be compared.
+     * \return bool indicating whether this address is distinct 
+     * from rhs.
+     */
+    bool operator!=(const IPv4Address &rhs) const {
+        return !(*this == rhs);
+    }
+    
+    /**
+     * \brief Compare this IPv4Address for less-than inequality.
+     * 
+     * \param rhs The address to be compared.
+     * \return bool indicating whether this address is less-than rhs.
+     */
+    bool operator< (const IPv4Address &rhs) const {
+        return ip_addr < rhs.ip_addr;
+    }
+    
+    /**
+     * \brief Returns true if this is a private IPv4 address.
+     * 
+     * This takes into account the private network ranges defined in
+     * RFC 1918. Therefore, this method returns true if this address
+     * is in any of the following network ranges, false otherwise:
+     * 
+     * - 192.168.0.0/16
+     * - 10.0.0.0/8
+     * - 172.16.0.0/12
+     */
+    bool is_private() const;
+    
+    /**
+     * \brief Returns true if this is a loopback IPv4 address.
+     * 
+     * This method returns true if this address is in the address range
+     * 127.0.0.0/8, false otherwise.
+     */
+    bool is_loopback() const;
+
+    /**
+     * \brief Returns true if this is a multicast IPv4 address.
+     * 
+     * This method returns true if this address is in the address range
+     * 224.0.0.0/4, false otherwise.
+     */
+    bool is_multicast() const;
+
+    /**
+     * \brief Returns true if this is an unicast IPv4 address.
+     */
+    bool is_unicast() const;
+
+    /**
+     * \brief Returns true if this is a broadcast IPv4 address.
+     */
+    bool is_broadcast() const;
+    
+    /**
+     * \brief Writes this address to a std::ostream.
+     * 
+     * This method writes addr in a dotted-string notation address
+     * to the std::ostream argument.
+     * 
+     * \param output The std::ostream in which to write the address.
+     * \param addr The IPv4Address to be written.
+     * \return std::stream& pointing to output.
+     */
+    friend std::ostream &operator<<(std::ostream &output, const IPv4Address &addr);
+private:
+    uint32_t ip_to_int(const std::string &ip);
+
+    uint32_t ip_addr;
+};
+} //namespace Tins
+
+#if TINS_IS_CXX11
+namespace std
+{
+template<>
+struct hash<Tins::IPv4Address> {
+    size_t operator()(const Tins::IPv4Address &addr) const {
+        return std::hash<uint32_t>()(addr);
+    }
+};
+} // namespace std
+#endif


 #endif // TINS_IPADDRESS_H
--- a/include/ip_reassembler.h
+++ b/include/ip_reassembler.h
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2012, 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_REASSEMBLER_H
+#define TINS_IP_REASSEMBLER_H
+
+#include <vector>
+#include <map>
+#include "pdu.h"
+#include "ip_address.h"
+
+namespace Tins {
+/** 
+ * \cond
+ */
+class IP;
+namespace Internals {
+class IPv4Fragment {
+public:
+    typedef PDU::serialization_type payload_type;
+
+    IPv4Fragment() : offset_() { }
+
+    template<typename T>
+    IPv4Fragment(T *pdu, uint16_t offset)
+    : payload_(pdu->serialize()), offset_(offset) 
+    {
+        
+    }
+    
+    const payload_type &payload() const {
+        return payload_;
+    }
+    
+    uint16_t offset() const {
+        return offset_;
+    }
+private:
+    payload_type payload_;
+    uint16_t offset_;
+};
+
+class IPv4Stream {
+public:
+    IPv4Stream();
+    
+    void add_fragment(IP *ip);
+    bool is_complete() const;
+    PDU *allocate_pdu() const;
+private:
+    typedef std::vector<IPv4Fragment> fragments_type;
+    
+    uint16_t extract_offset(const IP *ip);
+    bool extract_more_frag(const IP *ip);
+
+    fragments_type fragments;
+    bool received_end;
+    uint8_t transport_proto;
+    size_t received_size, total_size;
+};
+} // namespace Internals
+
+/** 
+ * \endcond
+ */
+
+/**
+ * \brief Reassembles fragmented IP packets.
+ */
+class IPv4Reassembler {
+public:
+    /**
+     * The status of each processed packet.
+     */
+    enum packet_status {
+        NOT_FRAGMENTED,
+        FRAGMENTED,
+        REASSEMBLED
+    };
+
+    /**
+     * The type used to represent the overlapped segment 
+     * reassembly technique to be used.
+     */
+    enum overlapping_technique {
+        NONE
+    };
+
+    /**
+     * Constructs an IPV4Reassembler.
+     * \param technique The technique to be used for reassembling
+     * overlapped fragments.
+     */
+    IPv4Reassembler(overlapping_technique technique = NONE);
+
+    /**
+     * \brief Processes a PDU and tries to reassemble it.
+     *
+     * This method tries to reassemble the provided packet. If
+     * the packet is successfully reassembled using previously
+     * processed packets, its contents will be modified so that
+     * it contains the whole payload and not just a fragment.
+     * 
+     * \param pdu The PDU to process.
+     * \return NOT_FRAGMENTED if the PDU does not contain an IP
+     * layer or is not fragmented, FRAGMENTED if the packet is 
+     * fragmented or REASSEMBLED if the packet was fragmented 
+     * but has now been reassembled.
+     */
+    packet_status process(PDU &pdu);
+
+    /**
+     * Removes all of the packets and data stored.
+     */
+    void clear_streams();
+
+    /**
+     * \brief Removes all of the packets and data stored that 
+     * belongs to IP headers whose identifier, source and destination
+     * addresses are equal to the provided parameters.
+     * 
+     * \param id The idenfier to search.
+     * \param addr1 The source address to search.
+     * \param addr2 The destinatin address to search.
+     * \sa IP::id
+     */
+    void remove_stream(uint16_t id, IPv4Address addr1, IPv4Address addr2);
+private:
+    typedef std::pair<IPv4Address, IPv4Address> address_pair;
+    typedef std::pair<uint16_t, address_pair> key_type;
+    typedef std::map<key_type, Internals::IPv4Stream> streams_type;
+
+    key_type make_key(const IP *ip) const;
+    address_pair make_address_pair(IPv4Address addr1, IPv4Address addr2) const;
+    
+    streams_type streams;
+    overlapping_technique technique;
+};
+
+/**
+ * Proxy functor class that reassembles PDUs.
+ */
+template<typename Functor>
+class IPv4ReassemblerProxy {
+public:
+    /**
+     * Constructs the proxy from a functor object.
+     *
+     * \param func The functor object.
+     */
+    IPv4ReassemblerProxy(Functor func)
+    : functor_(func)
+    {
+
+    }
+
+    /**
+     * \brief Tries to reassemble the packet and forwards it to 
+     * the functor.
+     * 
+     * \param pdu The packet to process
+     * \return true if the packet wasn't forwarded, otherwise
+     * the value returned by the functor.
+     */
+    bool operator()(PDU &pdu) {
+        // Forward it unless it's fragmented.
+        if(reassembler.process(pdu) != IPv4Reassembler::FRAGMENTED)
+            return functor_(pdu);
+        else
+            return true;
+    }
+private:
+    IPv4Reassembler reassembler;
+    Functor functor_;
+};
+
+/**
+ * Helper function that creates an IPv4ReassemblerProxy.
+ *
+ * \param func The functor object to use in the IPv4ReassemblerProxy.
+ * \return An IPv4ReassemblerProxy.
+ */
+template<typename Functor>
+IPv4ReassemblerProxy<Functor> make_ipv4_reassembler_proxy(Functor func) {
+    return IPv4ReassemblerProxy<Functor>(func);
+}
+}
+
+
+#endif // TINS_IP_REASSEMBLER_H
--- a/include/ipsec.h
+++ b/include/ipsec.h
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2012, 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_IPSEC_H
+#define TINS_IPSEC_H
+
+#include "pdu.h"
+#include "endianness.h"
+#include "small_uint.h"
+
+namespace Tins {
+/**
+ * \brief Represents an IPSec Authentication Header.
+ */
+class IPSecAH : public PDU {
+public:
+    /**
+     * This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::IPSEC_AH;
+
+    /**
+     * \brief Default constructor.
+     *
+     * The ICV field is initialized with four 0 bytes. The length
+     * field is initialized appropriately.
+     */
+    IPSecAH();
+    
+    /**
+     * \brief Constructs an IPSecAH 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 IPSecAH 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.
+     */
+    IPSecAH(const uint8_t *buffer, uint32_t total_sz);
+
+    // Getters
+
+    /**
+     *  \brief Getter for the Next header field.
+     *  \return The stored Next header field value.
+     */
+    uint8_t next_header() const {
+        return _header.next_header;
+    }
+
+    /**
+     *  \brief Getter for the Length field.
+     *  \return The stored Length field value.
+     */
+    uint8_t length() const {
+        return _header.length;
+    }
+
+    /**
+     *  \brief Getter for the Security Parameters Index field.
+     *  \return The stored Security Parameters Index field value.
+     */
+    uint32_t spi() const {
+        return Endian::be_to_host(_header.spi);
+    }
+
+    /**
+     *  \brief Getter for the Sequence number field.
+     *  \return The stored Sequence number field value.
+     */
+    uint32_t seq_number() const {
+        return Endian::be_to_host(_header.seq_number);
+    }
+    
+    /**
+     *  \brief Getter for the ICV field.
+     *  \return The stored ICV field value.
+     */
+    const byte_array &icv() const {
+        return _icv;
+    }
+
+    // Setters
+
+    /**
+     *  \brief Setter for the Next header field.
+     *  \param new_next_header The new Next header field value.
+     */
+    void next_header(uint8_t new_next_header);
+
+    /**
+     *  \brief Setter for the Length field.
+     *  \param new_length The new Length field value.
+     */
+    void length(uint8_t new_length);
+
+    /**
+     *  \brief Setter for the Security Parameters Index field.
+     *  \param new_spi The new Security Parameters Index field value.
+     */
+    void spi(uint32_t new_spi);
+
+    /**
+     *  \brief Setter for the Sequence number field.
+     *  \param new_seq_number The new Sequence number field value.
+     */
+    void seq_number(uint32_t new_seq_number);
+    
+    /**
+     *  \brief Setter for the ICV field.
+     *  \param new_icv The new ICV field value.
+     */
+    void icv(const byte_array &new_icv);
+
+    /**
+     * \brief Returns the header size.
+     *
+     * This metod overrides PDU::header_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; }
+
+    /**
+     * \sa PDU::clone
+     */
+    IPSecAH *clone() const {
+        return new IPSecAH(*this);
+    }
+private:
+    struct header {
+        uint8_t next_header, length;
+        uint32_t spi, seq_number;
+    };
+
+    void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *);
+    
+    header _header;
+    byte_array _icv;
+};
+
+/**
+ * \brief Represents an IPSec Authentication Header.
+ */
+class IPSecESP : public PDU {
+public:
+    /**
+     * This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::IPSEC_ESP;
+
+    /**
+     * \brief Default constructor.
+     */
+    IPSecESP();
+    
+    /**
+     * \brief Constructs an IPSecESP 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 IPSecESP 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.
+     */
+    IPSecESP(const uint8_t *buffer, uint32_t total_sz);
+
+    // Getters
+    
+    /**
+     *  \brief Getter for the Security Parameters Index field.
+     *  \return The stored Security Parameters Index field value.
+     */
+    uint32_t spi() const {
+        return Endian::be_to_host(_header.spi);
+    }
+
+    /**
+     *  \brief Getter for the Sequence number field.
+     *  \return The stored Sequence number field value.
+     */
+    uint32_t seq_number() const {
+        return Endian::be_to_host(_header.seq_number);
+    }
+
+    // Setters
+
+    /**
+     *  \brief Setter for the Security Parameters Index field.
+     *  \param new_spi The new Security Parameters Index field value.
+     */
+    void spi(uint32_t new_spi);
+
+    /**
+     *  \brief Setter for the Sequence number field.
+     *  \param new_seq_number The new Sequence number field value.
+     */
+    void seq_number(uint32_t new_seq_number);
+
+    /**
+     * \brief Returns the header size.
+     *
+     * This metod overrides PDU::header_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; }
+
+    /**
+     * \sa PDU::clone
+     */
+    IPSecESP *clone() const {
+        return new IPSecESP(*this);
+    }
+private:
+    struct header {
+        uint32_t spi, seq_number;
+    };
+
+    void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *);
+    
+    header _header;
+};
+}
+
+#endif // TINS_IPSEC_H
--- a/include/ipv6.h
+++ b/include/ipv6.h
@@ -60,7 +60,7 @@ public:
    /**
     * The type used to represent IPv6 extension headers.
     */
-    typedef PDUOption<uint8_t> ext_header;
+    typedef PDUOption<uint8_t, IPv6> ext_header;
    
    /**
     * The type used to store the extension headers.
--- a/include/ipv6_address.h
+++ b/include/ipv6_address.h
@@ -33,8 +33,13 @@
 #include <string>
 #include <stdexcept>
 #include <stdint.h>
+#include "cxxstd.h"

 namespace Tins {
+
+/**
+ * Represents an IPv6 address.
+ */
 class IPv6Address {
 public:
    /**
@@ -177,6 +182,22 @@ public:
        return std::copy(begin(), end(), iter);
    }
    
+    /**
+     * \brief Returns true if this is a loopback IPv6 address.
+     * 
+     * This method returns true if this address is the ::1/128 address,
+     * false otherwise.
+     */
+    bool is_loopback() const;
+
+    /**
+     * \brief Returns true if this is a multicast IPv6 address.
+     * 
+     * This method returns true if this address is in the address range
+     * ff00::/8, false otherwise.
+     */
+    bool is_multicast() const;
+    
    /**
     * \brief Writes this address in hex-notation to a std::ostream.
     * 
@@ -192,6 +213,18 @@ private:

    uint8_t address[address_size];
 };
-}
+} //namespace Tins
+
+#if TINS_IS_CXX11
+namespace std
+{
+template<>
+struct hash<Tins::IPv6Address> {
+    size_t operator()(const Tins::IPv6Address &addr) const {
+        return std::hash<std::string>()(addr.to_string());
+    }
+};
+} // namespace std
+#endif

 #endif // TINS_IPV6_ADDRESS
--- a/include/llc.h
+++ b/include/llc.h
@@ -55,6 +55,10 @@ namespace Tins {
         * \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;

        /**
@@ -302,7 +306,7 @@ namespace Tins {
         * \brief Getter for the PDU's type.
         * \sa PDU::pdu_type
         */
-        PDUType pdu_type() const { return PDU::LLC; }
+        PDUType pdu_type() const { return pdu_flag; }

        /**
 		 * \brief Delete all the information fields added.
--- a/include/loopback.h
+++ b/include/loopback.h
@@ -84,7 +84,7 @@ public:
     * \brief Getter for the PDU's type.
     * \sa PDU::pdu_type
     */
-    PDUType pdu_type() const { return PDU::IP; }
+    PDUType pdu_type() const { return pdu_flag; }
    
    /**
     * \sa PDU::clone
--- a/include/packet_sender.h
+++ b/include/packet_sender.h
@@ -76,6 +76,7 @@ namespace Tins {
        /**
         * \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(), 
@@ -168,7 +169,7 @@ namespace Tins {
         * 
         * \sa PacketSender::default_interface
         */
-        const NetworkInterface& default_interface();
+        const NetworkInterface& default_interface() const;

        /** 
         * \brief Sends a PDU. 
@@ -309,7 +310,8 @@ namespace Tins {
            static_cast<T&>(pdu).send(*this, iface);
        }
        
-        PDU *recv_match_loop(int sock, PDU &pdu, struct sockaddr* link_addr, uint32_t addrlen);
+        PDU *recv_match_loop(const std::vector<int>& sockets, PDU &pdu, struct sockaddr* link_addr, 
+            uint32_t addrlen);

        std::vector<int> _sockets;
        #ifndef WIN32
--- a/include/packet_writer.h
+++ b/include/packet_writer.h
@@ -112,7 +112,7 @@ public:
     * 
     * The template parameter T must at some point yield a PDU& after
     * applying operator* one or more than one time. This accepts both
-     * raw and smartpointers.
+     * raw and smart pointers.
     */
    template<typename T>
    void write(T &pdu) {
--- a/include/pdu.h
+++ b/include/pdu.h
@@ -65,6 +65,14 @@ namespace Tins {
         */
        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.
         *
@@ -117,8 +125,18 @@ namespace Tins {
            DHCPv6,
            DOT1Q,
            PPPOE,
-            STP
+            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.
@@ -454,6 +472,34 @@ namespace Tins {
        *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
--- a/include/pdu_allocator.h
+++ b/include/pdu_allocator.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2012, 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_ALLOCATOR_H
+#define TINS_PDU_ALLOCATOR_H
+
+#include <map>
+#include "pdu.h"
+
+namespace Tins {
+/**
+ * \cond
+ */
+class EthernetII;
+class SNAP;
+class Dot1Q;
+class SLL;
+class IP;
+class IPv6;
+
+namespace Internals {
+template<typename PDUType>
+PDU *default_allocator(const uint8_t *buffer, uint32_t size)
+{
+    return new PDUType(buffer, size);
+}
+
+template<typename Tag>
+class PDUAllocator {
+public:
+    typedef typename Tag::identifier_type id_type;
+    typedef PDU *(*allocator_type)(const uint8_t *, uint32_t);
+
+    template<typename PDUType>
+    static void register_allocator(id_type identifier)
+    {
+        allocators[identifier] = &default_allocator<PDUType>;
+        pdu_types[PDUType::pdu_flag] = identifier;
+    }
+
+    static PDU *allocate(id_type identifier, const uint8_t *buffer, uint32_t size) 
+    {
+        typename allocators_type::const_iterator it = allocators.find(identifier);
+        return (it == allocators.end()) ? 0 : (*it->second)(buffer, size);
+    }
+
+    static bool pdu_type_registered(PDU::PDUType type)
+    {
+        return pdu_types.count(type) != 0;
+    }
+
+    static id_type pdu_type_to_id(PDU::PDUType type) 
+    {
+        typename pdu_map_types::const_iterator it = pdu_types.find(type);
+        return it->second;
+    }
+private:
+    typedef std::map<id_type, allocator_type> allocators_type;
+    typedef std::map<PDU::PDUType, id_type> pdu_map_types;
+
+    static allocators_type allocators;
+    static pdu_map_types pdu_types;
+};
+
+template<typename Tag>
+typename PDUAllocator<Tag>::allocators_type PDUAllocator<Tag>::allocators;
+
+template<typename Tag>
+typename PDUAllocator<Tag>::pdu_map_types PDUAllocator<Tag>::pdu_types;
+
+template<typename IDType>
+struct pdu_tag {
+    typedef IDType identifier_type;
+};
+
+template<typename PDUType>
+struct pdu_tag_mapper;
+
+#define TINS_GENERATE_TAG_MAPPER(pdu, id_type) \
+template<> \
+struct pdu_tag_mapper<pdu> { \
+    typedef pdu_tag<id_type> type; \
+}; 
+
+TINS_GENERATE_TAG_MAPPER(EthernetII, uint16_t)
+TINS_GENERATE_TAG_MAPPER(SNAP, uint16_t)
+TINS_GENERATE_TAG_MAPPER(SLL, uint16_t)
+TINS_GENERATE_TAG_MAPPER(Dot1Q, uint16_t)
+TINS_GENERATE_TAG_MAPPER(IP, uint8_t)
+TINS_GENERATE_TAG_MAPPER(IPv6, uint8_t)
+
+#undef TINS_GENERATE_TAG_MAPPER
+
+template<typename PDUType>
+PDU* allocate(
+    typename pdu_tag_mapper<PDUType>::type::identifier_type id, 
+    const uint8_t *buffer, 
+    uint32_t size)
+{
+    return PDUAllocator<typename pdu_tag_mapper<PDUType>::type>::allocate(id, buffer, size);
+}
+
+template<typename PDUType>
+bool pdu_type_registered(PDU::PDUType type)
+{
+    return PDUAllocator<typename pdu_tag_mapper<PDUType>::type>::pdu_type_registered(type);
+}
+
+template<typename PDUType>
+typename pdu_tag_mapper<PDUType>::type::identifier_type pdu_type_to_id(PDU::PDUType type) 
+{
+    return PDUAllocator<typename pdu_tag_mapper<PDUType>::type>::pdu_type_to_id(type);
+}
+} // namespace Interals
+/**
+ * \endcond
+ */
+
+/**
+ * \brief Defines inner PDU allocators.
+ */
+namespace Allocators {
+/**
+ * \brief Registers an allocator for the provided PDU type.
+ *
+ * Registering a certain allocator for a PDU type is useful for 
+ * extending the library. Once an allocator is registered, it will
+ * be taken into account while constructing a PDU from a buffer.
+ * 
+ * If PDU finds that it cannot define which is the protocol
+ * that should be allocated based on its protocol identifier, it
+ * will try using the registered allocators if any.
+ *
+ * \code
+ * // Register the 0x666 identifer. Now if EthernetII finds a
+ * // network layer identifier field whose value is 0x666, it will
+ * // use SomePDUType as its inner PDU type.
+ * Allocators::register_allocator<EthernetII, SomePDUType>(0x666);
+ * \endcode
+ *
+ * Note that some PDU types are grouped together. For example, 
+ * registering an allocator for EthernetII will make it work for 
+ * the rest of the link layer protocols, sine they should all work 
+ * the same way.
+ */
+template<typename PDUType, typename AllocatedType>
+void register_allocator(typename Internals::pdu_tag_mapper<PDUType>::type::identifier_type id)
+{
+    Internals::PDUAllocator<
+        typename Internals::pdu_tag_mapper<PDUType>::type
+    >::template register_allocator<AllocatedType>(id);
+}
+} // namespace Allocators
+} // namespace Tins
+
+#endif // TINS_PDU_ALLOCATOR_H
--- a/include/pdu_option.h
+++ b/include/pdu_option.h
@@ -32,10 +32,259 @@

 #include <vector>
 #include <iterator>
+#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;
+            output.first = *(const T*)opt.data_ptr();
+            output.second = *(const U*)(opt.data_ptr() + sizeof(T));
+            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.
@@ -46,16 +295,11 @@ namespace Tins {
 * 
 * The OptionType template parameter indicates the type that will be
 * used to store this option's identifier.
- * 
- * The Container template parameter indicates the container which will
- * be used to store this option's data. The container <b>must</b>
- * store data sequentially. std::vector<uint8_t> is the default
- * container.
 */
-template<typename OptionType, class Container = std::vector<uint8_t> >
+template<typename OptionType, class PDUType>
 class PDUOption {
 public:
-    typedef Container container_type;
+    typedef std::vector<uint8_t> container_type;
    typedef typename container_type::value_type data_type;
    typedef OptionType option_type;

@@ -158,6 +402,18 @@ public:
    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:
    option_type option_;
    uint16_t size_;
--- a/include/ppi.h
+++ b/include/ppi.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2012, 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_PPI_H
+#define TINS_PPI_H
+
+#include "pdu.h"
+#include "endianness.h"
+#include "small_uint.h"
+
+namespace Tins {
+/**
+ * \brief Represents a Per-Packet Information PDU.
+ *
+ * This PDU can only be constructed from a buffer, and
+ * cannot be serialized. Therefore, it is only useful while
+ * sniffing packets.
+ */
+class PPI : public PDU {
+public:
+    /**
+     * This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::PPI;
+
+    /**
+     * \brief Constructs an PPI 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 PPI 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.
+     */
+    PPI(const uint8_t *buffer, uint32_t total_sz);
+
+    // Getters
+
+    /**
+     *  \brief Getter for the version field.
+     *  \return The stored version field value.
+     */
+    uint8_t version() const {
+        return _header.version;
+    }
+
+    /**
+     *  \brief Getter for the flags field.
+     *  \return The stored flags field value.
+     */
+    uint8_t flags() const {
+        return _header.flags;
+    }
+
+    /**
+     *  \brief Getter for the length field.
+     *  \return The stored length field value.
+     */
+    uint16_t length() const {
+        return Endian::le_to_host(_header.length);
+    }
+
+    /**
+     *  \brief Getter for the Data Link Type field.
+     *  \return The stored Data Link Type field value.
+     */
+    uint32_t dlt() const {
+        return Endian::le_to_host(_header.dlt);
+    }
+
+    /**
+     * \brief Returns the header size.
+     *
+     * This metod overrides PDU::header_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 Clones this PDU.
+     *
+     * \sa PDU::clone
+     */
+    PPI *clone() const {
+        return new PPI(*this);
+    }
+private:
+    void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *);
+
+    struct header {
+        uint8_t version, flags;
+        uint16_t length;
+        uint32_t dlt;
+    };
+
+    header _header;
+    byte_array _data;
+};
+}
+
+#endif // TINS_PPI_H
--- a/include/pppoe.h
+++ b/include/pppoe.h
@@ -72,7 +72,7 @@ public:
    /**
     * The type used to store a TLV option.
     */
-    typedef PDUOption<TagTypes> tag;
+    typedef PDUOption<TagTypes, PPPoE> tag;
    
    /**
     * The type used to store the options.
@@ -90,6 +90,8 @@ public:
        
        vendor_spec_type(uint32_t vendor_id = 0, const data_type &data = data_type())
        : vendor_id(vendor_id), data(data) { }
+        
+        static vendor_spec_type from_option(const tag &opt);
    };
    
    /**
@@ -397,19 +399,11 @@ private:
    }
    
    template<typename T>
-    T retrieve_tag_iterable(TagTypes id) const {
-        const tag *tag = search_tag(id);
-        if(!tag)
+    T search_and_convert(TagTypes id) const {
+        const tag *t = search_tag(id);
+        if(!t)
            throw option_not_found();
-        return T(tag->data_ptr(), tag->data_ptr() + tag->data_size());
-    }
-
-    template<template <typename> class Functor>
-    const tag *safe_search_tag(TagTypes opt, uint32_t size) const {
-        const tag *option = search_tag(opt);
-        if(!option || Functor<uint32_t>()(option->data_size(), size))
-            throw option_not_found();
-        return option;
+        return t->to<T>();
    }

    TINS_BEGIN_PACK
--- a/include/radiotap.h
+++ b/include/radiotap.h
@@ -27,7 +27,9 @@
 *
 */

-#ifndef TINS_RADIOTAP_H
+#include "config.h"
+
+#if !defined(TINS_RADIOTAP_H) && defined(HAVE_DOT11)
 #define TINS_RADIOTAP_H

 #include "macros.h"
@@ -89,7 +91,8 @@ namespace Tins {
            ANTENNA             = 2048,
            DB_SIGNAL           = 4096,
            DB_NOISE            = 8192,
-            RX_FLAGS            = 16382
+            RX_FLAGS            = 16382,
+            CHANNEL_PLUS        = 262144
        };
        
        /**
@@ -187,12 +190,24 @@ namespace Tins {
         */
        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.
@@ -261,17 +276,29 @@ namespace Tins {
         */
        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(_channel_type); }
+        uint32_t channel_plus() const { return Endian::le_to_host<uint32_t>(_channel_type); }
        
        /**
         * \brief Getter for the rx flags field.
@@ -289,7 +316,8 @@ namespace Tins {
         * if its corresponding bit flag is set in the present field.
         */
        PresentFlags present() const { 
-            return (PresentFlags)*(uint32_t*)(&_radio.it_len + 1); 
+            //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.
@@ -333,50 +361,60 @@ namespace Tins {
            uint8_t it_version;	
            uint8_t it_pad;
            uint16_t it_len;
-            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;
+            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;
-            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;
+            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;
        
@@ -387,9 +425,8 @@ namespace Tins {
        radiotap_hdr _radio;
        // present fields...
        uint64_t _tsft;
-        uint32_t _channel_type;
-        uint16_t _channel_freq, _rx_flags;
-        uint8_t _antenna, _flags, _rate, _dbm_signal, _dbm_noise, _channel, _max_power;
+        uint16_t _channel_type, _channel_freq, _rx_flags, _signal_quality;
+        uint8_t _antenna, _flags, _rate, _dbm_signal, _dbm_noise, _channel, _max_power, _db_signal;
    };
 }

--- a/include/rsn_information.h
+++ b/include/rsn_information.h
@@ -35,152 +35,160 @@
 #include "endianness.h"

 namespace Tins{
+class Dot11;
+template<typename T, typename U>
+class PDUOption;
+/**
+ * \brief Class that models the RSN information structure.
+ */
+class RSNInformation {
+public:
    /**
-     * \brief Class that models the RSN information structure.
+     * \brief Enum that represents the different cypher suites.
     */
-    class RSNInformation {
-    public:
-        /**
-         * \brief Enum that represents the different cypher suites.
-         */
-        enum CypherSuites {
-            WEP_40  = 0x01ac0f00,
-            TKIP    = 0x02ac0f00,
-            CCMP    = 0x04ac0f00,
-            WEP_104 = 0x05ac0f00
-        };
-
-        /**
-         * \brief Enum that represents the different akm suites.
-         */
-        enum AKMSuites {
-            PMKSA = 0x01ac0f00,
-            PSK   = 0x02ac0f00
-        };
-
-        /**
-         * The type used to store the cypher suites.
-         */
-        typedef std::vector<CypherSuites> cyphers_type;
-        
-        /**
-         * The type used to store the AKM suites.
-         */
-        typedef std::vector<AKMSuites> akm_type;
-        
-        /**
-         * The type returned on serialization.
-         */
-        typedef std::vector<uint8_t> serialization_type;
-
-        /**
-         * \brief Creates an instance of RSNInformation.
-         *
-         * By default, the version is set to 1.
-         */
-        RSNInformation();
-        
-        /**
-         * \brief Creates an instance of RSNInformation from a 
-         * serialization_type object.
-         * 
-         * \param buffer The buffer from which to construct this object.
-         */
-        RSNInformation(const serialization_type &buffer);
-        
-        /**
-         * \brief Constructs a RSNInformation from a buffer.
-         * 
-         * If the input is malformed, a malformed_packet exception is
-         * thrown.
-         * 
-         * \param buffer The buffer from which this object will be constructed.
-         * \param total_sz The total size of the buffer.
-         */
-        RSNInformation(const uint8_t *buffer, uint32_t total_sz);
-
-        /**
-         * \brief Helper function to create a WPA2-PSK RSNInformation
-         * \return An instance RSNInformation which contains information
-         * for a WPA2-PSK AP.
-         */
-        static RSNInformation wpa2_psk();
-
-        /**
-         * \brief Adds a pairwise cypher suite.
-         * \param cypher The pairwise cypher suite to be added.
-         */
-        void add_pairwise_cypher(CypherSuites cypher);
-
-        /**
-         * \brief Adds a akm suite.
-         * \param akm The akm suite to be added.
-         */
-        void add_akm_cypher(AKMSuites akm);
-
-        /**
-         * \brief Sets the group suite cypher.
-         * \param group The group suite cypher to be set.
-         */
-        void group_suite(CypherSuites group);
-
-        /**
-         * \brief Sets the version.
-         * \param ver The version to be set.
-         */
-        void version(uint16_t ver);
-
-        /**
-         * \brief Sets the capabilities field.
-         * \param cap The capabilities to be set.
-         */
-        void capabilities(uint16_t cap);
-
-        /* Getters */
-
-        /**
-         * \brief Getter for the group suite field.
-         * \return The group suite field.
-         */
-        CypherSuites group_suite() const { return _group_suite; }
-
-        /**
-         * \brief Getter for the version field.
-         * \return The version field.
-         */
-        uint16_t version() const { return Endian::le_to_host(_version); }
-        
-        /**
-         * \brief Getter for the capabilities field.
-         * \return The version field.
-         */
-        uint16_t capabilities() const { return Endian::le_to_host(_capabilities); }
-
-        /**
-         * \brief Getter for the pairwise cypher suite list.
-         * \return A list of pairwise cypher suites.
-         */
-        const cyphers_type &pairwise_cyphers() const { return _pairwise_cyphers; }
-
-        /**
-         * \brief Getter for the akm suite list.
-         * \return A list of akm suites.
-         */
-        const akm_type &akm_cyphers() const { return _akm_cyphers; }
-
-        /**
-         * \brief Serializes this object.
-         * \return The result of the serialization. 
-         */
-         serialization_type serialize() const;
-    private:
-        void init(const uint8_t *buffer, uint32_t total_sz);
-    
-        uint16_t _version, _capabilities;
-        CypherSuites _group_suite;
-        akm_type _akm_cyphers;
-        cyphers_type _pairwise_cyphers;
+    enum CypherSuites {
+        WEP_40  = 0x01ac0f00,
+        TKIP    = 0x02ac0f00,
+        CCMP    = 0x04ac0f00,
+        WEP_104 = 0x05ac0f00
    };
+
+    /**
+     * \brief Enum that represents the different akm suites.
+     */
+    enum AKMSuites {
+        PMKSA = 0x01ac0f00,
+        PSK   = 0x02ac0f00
+    };
+
+    /**
+     * The type used to store the cypher suites.
+     */
+    typedef std::vector<CypherSuites> cyphers_type;
+    
+    /**
+     * The type used to store the AKM suites.
+     */
+    typedef std::vector<AKMSuites> akm_type;
+    
+    /**
+     * The type returned on serialization.
+     */
+    typedef std::vector<uint8_t> serialization_type;
+
+    /**
+     * \brief Constructs an RSNInformation object.
+     *
+     * By default, the version is set to 1.
+     */
+    RSNInformation();
+    
+    /**
+     * \brief Constructs an RSNInformation object from a 
+     * serialization_type object.
+     * 
+     * \param buffer The buffer from which to construct this object.
+     */
+    RSNInformation(const serialization_type &buffer);
+    
+    /**
+     * \brief Constructs a RSNInformation from a buffer.
+     * 
+     * If the input is malformed, a malformed_packet exception is
+     * thrown.
+     * 
+     * \param buffer The buffer from which this object will be constructed.
+     * \param total_sz The total size of the buffer.
+     */
+    RSNInformation(const uint8_t *buffer, uint32_t total_sz);
+
+    /**
+     * \brief Helper function to create a WPA2-PSK RSNInformation
+     * \return An instance RSNInformation which contains information
+     * for a WPA2-PSK AP.
+     */
+    static RSNInformation wpa2_psk();
+
+    /**
+     * \brief Adds a pairwise cypher suite.
+     * \param cypher The pairwise cypher suite to be added.
+     */
+    void add_pairwise_cypher(CypherSuites cypher);
+
+    /**
+     * \brief Adds an akm suite.
+     * \param akm The akm suite to be added.
+     */
+    void add_akm_cypher(AKMSuites akm);
+
+    /**
+     * \brief Sets the group suite cypher.
+     * \param group The group suite cypher to be set.
+     */
+    void group_suite(CypherSuites group);
+
+    /**
+     * \brief Sets the version.
+     * \param ver The version to be set.
+     */
+    void version(uint16_t ver);
+
+    /**
+     * \brief Sets the capabilities field.
+     * \param cap The capabilities to be set.
+     */
+    void capabilities(uint16_t cap);
+
+    /* Getters */
+
+    /**
+     * \brief Getter for the group suite field.
+     * \return The group suite field.
+     */
+    CypherSuites group_suite() const { return _group_suite; }
+
+    /**
+     * \brief Getter for the version field.
+     * \return The version field.
+     */
+    uint16_t version() const { return Endian::le_to_host(_version); }
+    
+    /**
+     * \brief Getter for the capabilities field.
+     * \return The version field.
+     */
+    uint16_t capabilities() const { return Endian::le_to_host(_capabilities); }
+
+    /**
+     * \brief Getter for the pairwise cypher suite list.
+     * \return A list of pairwise cypher suites.
+     */
+    const cyphers_type &pairwise_cyphers() const { return _pairwise_cyphers; }
+
+    /**
+     * \brief Getter for the akm suite list.
+     * \return A list of akm suites.
+     */
+    const akm_type &akm_cyphers() const { return _akm_cyphers; }
+
+    /**
+     * \brief Serializes this object.
+     * \return The result of the serialization. 
+     */
+     serialization_type serialize() const;
+     
+     /**
+      * Constructs an RSNInformation object from a Dot11 tagged option.
+      */
+     static RSNInformation from_option(const PDUOption<uint8_t, Dot11> &opt);
+private:
+    void init(const uint8_t *buffer, uint32_t total_sz);
+
+    uint16_t _version, _capabilities;
+    CypherSuites _group_suite;
+    akm_type _akm_cyphers;
+    cyphers_type _pairwise_cyphers;
+};
 } // namespace Tins

 #endif // TINS_RSN_INFORMATION
--- a/include/sll.h
+++ b/include/sll.h
@@ -70,40 +70,40 @@ public:
    // Getters

    /**
-     *  \brief Getter for the packet_type field.
-     *  \return The stored packet_type field value.
+     *  \brief Getter for the Packet Type field.
+     *  \return The stored Packet Type field value.
     */
    uint16_t packet_type() const {
        return Endian::be_to_host(_header.packet_type);
    }

    /**
-     *  \brief Getter for the lladdr_type field.
-     *  \return The stored lladdr_type field value.
+     *  \brief Getter for the LLADDR Type field.
+     *  \return The stored LLADDR Type field value.
     */
    uint16_t lladdr_type() const {
        return Endian::be_to_host(_header.lladdr_type);
    }

    /**
-     *  \brief Getter for the lladdr_len field.
-     *  \return The stored lladdr_len field value.
+     *  \brief Getter for the LLADDR Length field.
+     *  \return The stored LLADDR Length field value.
     */
    uint16_t lladdr_len() const {
        return Endian::be_to_host(_header.lladdr_len);
    }

    /**
-     *  \brief Getter for the address field.
-     *  \return The stored address field value.
+     *  \brief Getter for the Address field.
+     *  \return The stored Address field value.
     */
    address_type address() const {
        return _header.address;
    }

    /**
-     *  \brief Getter for the protocol field.
-     *  \return The stored protocol field value.
+     *  \brief Getter for the Protocol field.
+     *  \return The stored Protocol field value.
     */
    uint16_t protocol() const {
        return Endian::be_to_host(_header.protocol);
@@ -118,32 +118,32 @@ public:
    // Setters

    /**
-     *  \brief Setter for the packet_type field.
-     *  \param new_packet_type The new packet_type field value.
+     *  \brief Setter for the Packet Type field.
+     *  \param new_packet_type The new Packet Type field value.
     */
    void packet_type(uint16_t new_packet_type);

    /**
-     *  \brief Setter for the lladdr_type field.
-     *  \param new_lladdr_type The new lladdr_type field value.
+     *  \brief Setter for the LLADDR Type field.
+     *  \param new_lladdr_type The new LLADDR Type field value.
     */
    void lladdr_type(uint16_t new_lladdr_type);

    /**
-     *  \brief Setter for the lladdr_len field.
-     *  \param new_lladdr_len The new lladdr_len field value.
+     *  \brief Setter for the LLADDR Length field.
+     *  \param new_lladdr_len The new LLADDR Length field value.
     */
    void lladdr_len(uint16_t new_lladdr_len);

    /**
-     *  \brief Setter for the address field.
-     *  \param new_address The new address field value.
+     *  \brief Setter for the Address field.
+     *  \param new_address The new Address field value.
     */
    void address(const address_type &new_address);

    /**
-     *  \brief Setter for the protocol field.
-     *  \param new_protocol The new protocol field value.
+     *  \brief Setter for the Protocol field.
+     *  \param new_protocol The new Protocol field value.
     */
    void protocol(uint16_t new_protocol);
    
--- a/include/snap.h
+++ b/include/snap.h
@@ -76,40 +76,40 @@ namespace Tins {
        /* Setters */
        
        /**
-         * \brief Setter for the control field.
-         * \param new_id The new control to be set.
+         * \brief Setter for the Control field.
+         * \param new_id The new Control to be set.
         */
        void control(uint8_t new_control);
        
        /**
-         * \brief Setter for the org code field.
-         * \param new_org The new org code to be set.
+         * \brief Setter for the Organization Code field.
+         * \param new_org The new Organization Code to be set.
         */
        void org_code(small_uint<24> new_org);
        
        /**
-         * \brief Setter for the eth type field.
-         * \param new_eth The new eth type to be set.
+         * \brief Setter for the Ethernet Type field.
+         * \param new_eth The new Ethernet Type to be set.
         */
        void eth_type(uint16_t new_eth);
        
        /* Getters */
        
        /**
-         * \brief Getter for the dsap field.
-         * \return The dsap field.
+         * \brief Getter for the DSAP field.
+         * \return The DSAP field.
         */
        uint8_t dsap() const { return _snap.dsap; }
        
        /**
-         * \brief Getter for the ssap field.
-         * \return The ssap field.
+         * \brief Getter for the SSAP field.
+         * \return The SSAP field.
         */
        uint8_t ssap() const { return _snap.ssap; }
        
        /**
-         * \brief Getter for the control field.
-         * \return The control field.
+         * \brief Getter for the Control field.
+         * \return The Control field.
         */
        uint8_t control() const { 
            #if TINS_IS_LITTLE_ENDIAN
@@ -120,8 +120,8 @@ namespace Tins {
        }
        
        /**
-         * \brief Getter for the org code field.
-         * \return The org code field.
+         * \brief Getter for the Organization Code field.
+         * \return The Organization Code field.
         */        
        small_uint<24> org_code() const { 
            #if TINS_IS_LITTLE_ENDIAN
@@ -132,8 +132,8 @@ namespace Tins {
        }
        
        /**
-         * \brief Getter for the eth type field.
-         * \return The eth field.
+         * \brief Getter for the Ethernet Type field.
+         * \return The Ethernet Type field.
         */
        uint16_t eth_type() const { return Endian::be_to_host(_snap.eth_type); } 
        
@@ -149,7 +149,7 @@ namespace Tins {
         * \brief Getter for the PDU's type.
         * \sa PDU::pdu_type
         */
-        PDUType pdu_type() const { return PDU::SNAP; }
+        PDUType pdu_type() const { return pdu_flag; }
        
        /**
         * \brief Clones this PDU.
--- a/include/sniffer.h
+++ b/include/sniffer.h
@@ -36,18 +36,16 @@
 #include <string>
 #include <memory>
 #include <stdexcept>
+#include <iterator>
 #include "pdu.h"
-#include "ethernetII.h"
-#include "radiotap.h"
 #include "packet.h"
-#include "loopback.h"
-#include "dot11.h"
-#include "dot3.h"
-#include "sll.h"
 #include "cxxstd.h"
 #include "exceptions.h"
+#include "internals.h"

 namespace Tins {
+    class SnifferIterator;
+
    /**
     * \class BaseSniffer
     * \brief Base class for sniffers.
@@ -60,28 +58,31 @@ namespace Tins {
     */
    class BaseSniffer {
    public:
+        /**
+         * The iterator type.
+         */
+        typedef SnifferIterator iterator;
+
        #if TINS_IS_CXX11
            /**
             * \brief Move constructor.
             * This constructor is available only in C++11.
             */
            BaseSniffer(BaseSniffer &&rhs) noexcept 
+            : handle(nullptr), mask()
            {
                *this = std::move(rhs);
            }
            
            /**
             * \brief Move assignment operator.
-             * This opeartor is available only in C++11.
+             * This operator is available only in C++11.
             */
            BaseSniffer& operator=(BaseSniffer &&rhs) noexcept 
            {
-                handle = 0;
-                mask = rhs.mask;
-                iface_type = rhs.iface_type;
-                actual_filter.bf_insns = 0;
-                std::swap(handle, rhs.handle);
-                std::swap(actual_filter, rhs.actual_filter);
+                using std::swap;
+                swap(handle, rhs.handle);
+                swap(mask, rhs.mask);
                return *this;
            }
        #endif
@@ -95,7 +96,7 @@ namespace Tins {
        /**
         * \brief Compiles a filter and uses it to capture one packet.
         * 
-         * This method returns the first sniffed packet that matches the 
+         * This method returns the first valid sniffed packet that matches the 
         * sniffer's filter, or the first sniffed packet if no filter has
         * been set.
         * 
@@ -115,48 +116,57 @@ namespace Tins {
         * \code
         * // bad!!
         * PtrPacket p = s.next_packet();
-         * 
         * \endcode
         * 
         * Is not, since PtrPacket can't be copy constructed. 
         * 
         * \sa Packet::release_pdu
         * 
-         * \return The captured packet, matching the given filter.
-         * If an error occured(probably compiling the filter), PtrPacket::pdu
-         * will return 0. Caller takes ownership of the PDU * stored in
+         * \return A captured packet. If an error occured, PtrPacket::pdu 
+         * will return 0. Caller takes ownership of the PDU pointer stored in 
         * the PtrPacket.
         */
        PtrPacket next_packet();
        
        /**
-         * \brief Starts a sniffing loop, using a callback object for every
+         * \brief Starts a sniffing loop, using a callback functor for every
         * sniffed packet.
         * 
-         * The callback object must implement an operator with some of
-         * the following(or compatible) signatures:
+         * The functor must implement an operator with one of the 
+         * following signatures:
         * 
         * \code
-         * bool operator()(PDU&);
-         * bool operator()(RefPacket&);
+         * bool(PDU&);
+         * bool(const PDU&);
         * \endcode
         * 
-         * This operator will be called using the sniffed packets 
-         * as arguments. You can modify the parameter argument as you wish. 
-         * Calling PDU methods like PDU::release_inner_pdu is perfectly 
-         * valid.
+         * This functor will be called using the each of the sniffed packets 
+         * as its argument. Using PDU member functions that modify the PDU,
+         * such as PDU::release_inner_pdu, is perfectly valid.
         * 
-         * The callback taking a RefPacket will contain a timestamp
-         * indicating the moment in which the packet was taken out of 
-         * the wire/pcap file. 
-         * 
-         * Note that the Functor object will be copied using its copy
-         * constructor, so that object should be some kind of proxy to
+         * Note that if you're using a functor object, it will be copied using 
+         * its copy constructor, so it should be some kind of proxy to
         * another object which will process the packets(e.g. std::bind).
+         *
+         * Sniffing will stop when either max_packets are sniffed(if it is != 0), 
+         * or when the functor returns false.
+         *
+         * This method catches both malformed_packet and pdu_not_found exceptions,
+         * which allows writing much cleaner code, since you can call PDU::rfind_pdu
+         * without worrying about catching the exception that can be thrown. This 
+         * allows writing code such as the following:
+         *
+        * \code
+         * bool callback(const PDU& pdu) {
+         *     // If either RawPDU is not found, or construction of the DNS 
+         *     // object fails, the BaseSniffer object will trap the exceptions, 
+         *     // so we don't need to worry about it.
+         *     DNS dns = pdu.rfind_pdu<RawPDU>().to<DNS>();
+         *     return true;
+         * }
+         * \endcode
         * 
-         * \sa RefPacket
-         * 
-         * \param cback_handler The callback handler object which should process packets.
+         * \param function The callback handler object which should process packets.
         * \param max_packets The maximum amount of packets to sniff. 0 == infinite.
         */
        template<class Functor>
@@ -171,6 +181,9 @@ namespace Tins {
        
        /**
         * \brief Stops sniffing loops.
+         *
+         * This method must be called from the same thread from which
+         * BaseSniffer::sniff_loop was called.
         */
        void stop_sniff();

@@ -178,6 +191,32 @@ namespace Tins {
         * \brief Gets the file descriptor associated with the sniffer.
         */
        int get_fd();
+
+        /**
+         * \brief Sets the read timeout for this sniffer.
+         *
+         * This calls pcap_set_timeout using the provided parameter.
+         * \param ms The amount of milliseconds.
+         */
+        void set_timeout(int ms);
+
+        /**
+         * \brief Retrieves this sniffer's link type.
+         *
+         * This calls pcap_datalink on the stored pcap handle and
+         * returns its result.
+         */
+        int link_type() const;
+
+        /**
+         * Retrieves an iterator to the next packet in this sniffer.
+         */
+        iterator begin();
+
+        /**
+         * Retrieves an end iterator.
+         */
+        iterator end();
    protected:
        /**
         * Default constructor.
@@ -195,65 +234,26 @@ namespace Tins {
         */
        void init(pcap_t *phandle, const std::string &filter, bpf_u_int32 if_mask);
    private:
-        template<class Functor>
-        struct LoopData {
-            pcap_t *handle;
-            Functor c_handler;
-            int iface_type;
-            
-            LoopData(pcap_t *_handle, const Functor _handler, 
-              int if_type) 
-            : handle(_handle), c_handler(_handler), iface_type(if_type)
-            { }
-        };
-        
-        struct PCapLoopBreaker {
-            bool &went_well;
-            pcap_t *handle;
-            
-            PCapLoopBreaker(bool &went_well, pcap_t *handle)
-            : went_well(went_well), handle(handle) { }
-            
-            ~PCapLoopBreaker() {
-                if(!went_well)
-                    pcap_breakloop(handle);
-            }
-        };
-    
        BaseSniffer(const BaseSniffer&);
        BaseSniffer &operator=(const BaseSniffer&);
-        static bool is_dot3(const uint8_t *ptr, size_t sz) {
-            return (sz >= 13 && ptr[12] < 8);
-        }
-        
-        template<class ConcretePDU, class Functor>
-        static bool call_functor(LoopData<Functor> *data, const u_char *packet, const struct pcap_pkthdr *header);
-        
-        bool compile_set_filter(const std::string &filter, bpf_program &prog);
-        
-        template<class Functor>
-        static void callback_handler(u_char *args, const struct pcap_pkthdr *header, const u_char *packet);
        
        pcap_t *handle;
        bpf_u_int32 mask;
-        bpf_program actual_filter;
-        int iface_type;
    };
    
    /** 
     * \class Sniffer
-     * \brief Sniffs packets using pcap filters.
-     * 
-     * This class uses a given filter to sniff packets and allow the user
-     * to handle them. Each time a filter is set, it's used until a new one
-     * is set. Both Sniffer::next_packet and Sniffer::sniff_loop have an
-     * optional filter parameter. If a filter is set using those parameter,
-     * the previously set filter is freed and the new one is used.
+     * \brief Sniffs packets from a network interface.
     */
    class Sniffer : public BaseSniffer {
    public:
+        enum promisc_type {
+            NON_PROMISC,
+            PROMISC
+        };
+
        /**
-         * \brief Constructs an instance of Sniffer.
+         * Constructs an instance of Sniffer.
         * \param device The device which will be sniffed.
         * \param max_packet_size The maximum packet size to be read.
         * \param promisc bool indicating wether to put the interface in promiscuous mode.(optional)
@@ -261,11 +261,27 @@ namespace Tins {
         */
        Sniffer(const std::string &device, unsigned max_packet_size,
          bool promisc = false, const std::string &filter = "");
+
+        /**
+         * \brief Constructs an instance of Sniffer.
+         *
+         * The maximum capture size is set to 65535. By default the interface won't
+         * be put into promiscuous mode.
+         * 
+         * \param device The device which will be sniffed.
+         * \param promisc Indicates if the interface should be put in promiscuous mode.
+         * \param filter A capture filter to be used on the sniffing session.(optional);
+         */
+        Sniffer(const std::string &device, promisc_type promisc = NON_PROMISC, 
+          const std::string &filter = "");
+    private:
+        void init_sniffer(const std::string &device, unsigned max_packet_size,
+          bool promisc = false, const std::string &filter = "");
    };
    
    /**
     * \class FileSniffer
-     * \brief Parses pcap files and interprets the packets in it.
+     * \brief Reads pcap files and interprets the packets in it.
     * 
     * This class acts exactly in the same way that Sniffer, but reads
     * packets from a pcap file instead of an interface.
@@ -279,58 +295,6 @@ namespace Tins {
         */
        FileSniffer(const std::string &file_name, const std::string &filter = "");
    };
-        
-    template<class Functor>
-    void Tins::BaseSniffer::sniff_loop(Functor function, uint32_t max_packets) {
-        LoopData<Functor> data(handle, function, iface_type);
-        pcap_loop(handle, max_packets, &BaseSniffer::callback_handler<Functor>, (u_char*)&data);
-    }
-    
-    template<class ConcretePDU, class Functor>
-    bool Tins::BaseSniffer::call_functor(LoopData<Functor> *data, const u_char *packet, 
-      const struct pcap_pkthdr *header) 
-    {
-        ConcretePDU some_pdu((const uint8_t*)packet, header->caplen);
-        Timestamp ts(header->ts);
-        RefPacket pck(some_pdu, ts);
-        return data->c_handler(pck);
-    }
-    
-    template<class Functor>
-    void Tins::BaseSniffer::callback_handler(u_char *args, const struct pcap_pkthdr *header, const u_char *packet) {
-        bool ret_val(true);
-        LoopData<Functor> *data = reinterpret_cast<LoopData<Functor>*>(args);
-        PCapLoopBreaker _(ret_val, data->handle);
-        try {
-            Internals::smart_ptr<PDU>::type pdu;
-            if(data->iface_type == DLT_EN10MB) {
-                ret_val = is_dot3((const uint8_t*)packet, header->caplen) ?
-                        call_functor<Tins::Dot3>(data, packet, header) :
-                        call_functor<Tins::EthernetII>(data, packet, header);
-            }
-            else if(data->iface_type == DLT_IEEE802_11_RADIO)
-                ret_val = call_functor<Tins::RadioTap>(data, packet, header);
-            else if(data->iface_type == DLT_IEEE802_11) {
-                Internals::smart_ptr<PDU>::type pdu(
-                    Tins::Dot11::from_bytes((const uint8_t*)packet, header->caplen)
-                );
-                if(pdu.get()) {
-                    RefPacket pck(*pdu, header->ts);
-                    ret_val = data->c_handler(pck);
-                }
-            }
-            else if(data->iface_type == DLT_NULL) 
-                ret_val = call_functor<Tins::Loopback>(data, packet, header);
-            else if(data->iface_type == DLT_LINUX_SLL)
-                ret_val = call_functor<Tins::SLL>(data, packet, header);
-        }
-        catch(malformed_packet&) { 
-            ret_val = true;
-        }
-        catch(pdu_not_found&) { 
-            ret_val = true;
-        }
-    }
    
    template<class T>
    class HandlerProxy {
@@ -354,6 +318,96 @@ namespace Tins {
    {
        return HandlerProxy<T>(ptr, function);
    }
+
+    /**
+     * \brief Iterates over packets sniffed by a BaseSniffer.
+     */
+    class SnifferIterator : public std::iterator<std::forward_iterator_tag, PDU> {
+    public:
+        /**
+         * Constructs a SnifferIterator.
+         * \param sniffer The sniffer to iterate.
+         */
+        SnifferIterator(BaseSniffer *sniffer = 0)
+        : sniffer(sniffer)
+        {
+            if(sniffer)
+                advance();
+        }
+
+        /**
+         * Advances the iterator.
+         */
+        SnifferIterator& operator++() {
+            advance();
+            return *this;
+        }
+
+        /**
+         * Advances the iterator.
+         */
+        SnifferIterator operator++(int) {
+            SnifferIterator other(*this);
+            advance();
+            return other;
+        }
+
+        /**
+         * Dereferences the iterator.
+         * \return reference to the current packet.
+         */
+        PDU &operator*() {
+            return *pkt.pdu();
+        }
+
+        /**
+         * Dereferences the iterator.
+         * \return pointer to the current packet.
+         */
+        PDU *operator->() {
+            return &(**this);
+        }
+
+        /**
+         * Compares this iterator for equality.
+         * \param rhs The iterator to be compared to.
+         */
+        bool operator==(const SnifferIterator &rhs) const {
+            return sniffer == rhs.sniffer;
+        }
+
+        /**
+         * Compares this iterator for in-equality.
+         * \param rhs The iterator to be compared to.
+         */
+        bool operator!=(const SnifferIterator &rhs) const {
+            return !(*this == rhs);
+        }
+    private:
+        void advance() {
+            pkt = sniffer->next_packet();
+            if(!pkt)
+                sniffer = 0;
+        }
+
+        BaseSniffer *sniffer;
+        Packet pkt;
+    };
+
+    template<class Functor>
+    void Tins::BaseSniffer::sniff_loop(Functor function, uint32_t max_packets) {
+        for(iterator it = begin(); it != end(); ++it) {
+            try {
+                // If the functor returns false, we're done
+                if(!function(*it))
+                    return;
+            }
+            catch(malformed_packet&) { }
+            catch(pdu_not_found&) { }
+            if(max_packets && --max_packets == 0)
+                return;
+        }
+    }
 }
    
 #endif // TINS_SNIFFER_H
--- a/include/stp.h
+++ b/include/stp.h
@@ -80,94 +80,94 @@ public:
    // Getters

    /**
-     *  \brief Getter for the proto_id field.
-     *  \return The stored proto_id field value.
+     *  \brief Getter for the Protocol ID field.
+     *  \return The stored Protocol ID field value.
     */
    uint16_t proto_id() const {
        return Endian::be_to_host(_header.proto_id);
    }

    /**
-     *  \brief Getter for the proto_version field.
-     *  \return The stored proto_version field value.
+     *  \brief Getter for the Protocol Version field.
+     *  \return The stored Protocol Version field value.
     */
    uint8_t proto_version() const {
        return _header.proto_version;
    }

    /**
-     *  \brief Getter for the bpdu_type field.
-     *  \return The stored bpdu_type field value.
+     *  \brief Getter for the BDU Type field.
+     *  \return The stored BDU Type field value.
     */
    uint8_t bpdu_type() const {
        return _header.bpdu_type;
    }

    /**
-     *  \brief Getter for the bpdu_flags field.
-     *  \return The stored bpdu_flags field value.
+     *  \brief Getter for the BDU Flags field.
+     *  \return The stored BDU Flags field value.
     */
    uint8_t bpdu_flags() const {
        return _header.bpdu_flags;
    }

    /**
-     *  \brief Getter for the root_path_cost field.
-     *  \return The stored root_path_cost field value.
+     *  \brief Getter for the Root Path Cost field.
+     *  \return The stored Root Path Cost field value.
     */
    uint32_t root_path_cost() const {
        return Endian::be_to_host(_header.root_path_cost);
    }

    /**
-     *  \brief Getter for the port_id field.
-     *  \return The stored port_id field value.
+     *  \brief Getter for the Port ID field.
+     *  \return The stored Port ID field value.
     */
    uint16_t port_id() const {
        return Endian::be_to_host(_header.port_id);
    }

    /**
-     *  \brief Getter for the msg_age field.
-     *  \return The stored msg_age field value.
+     *  \brief Getter for the Message Age field.
+     *  \return The stored Message Age field value.
     */
    uint16_t msg_age() const {
        return Endian::be_to_host(_header.msg_age) / 256;
    }

    /**
-     *  \brief Getter for the max_age field.
-     *  \return The stored max_age field value.
+     *  \brief Getter for the Maximum Age field.
+     *  \return The stored Maximum Age field value.
     */
    uint16_t max_age() const {
        return Endian::be_to_host(_header.max_age) / 256;
    }

    /**
-     *  \brief Getter for the hello_time field.
-     *  \return The stored hello_time field value.
+     *  \brief Getter for the Hello Time field.
+     *  \return The stored Hello Time field value.
     */
    uint16_t hello_time() const {
        return Endian::be_to_host(_header.hello_time) / 256;
    }

    /**
-     *  \brief Getter for the fwd_delay field.
-     *  \return The stored fwd_delay field value.
+     *  \brief Getter for the Forward Delay field.
+     *  \return The stored Forward Delay field value.
     */
    uint16_t fwd_delay() const {
        return Endian::be_to_host(_header.fwd_delay) / 256;
    }
    
    /**
-     *  \brief Getter for the root id field.
-     *  \return The stored root id field value.
+     *  \brief Getter for the Root ID field.
+     *  \return The stored Root ID field value.
     */
    bpdu_id_type root_id() const;
    
    /**
-     *  \brief Getter for the bridge id field.
-     *  \return The stored bridge id field value.
+     *  \brief Getter for the Bridge ID field.
+     *  \return The stored Bridge ID field value.
     */
    bpdu_id_type bridge_id() const;

@@ -194,74 +194,74 @@ public:
    // Setters

    /**
-     *  \brief Setter for the proto_id field.
-     *  \param new_proto_id The new proto_id field value.
+     *  \brief Setter for the Protocol ID field.
+     *  \param new_proto_id The new Protocol ID field value.
     */
    void proto_id(uint16_t new_proto_id);

    /**
-     *  \brief Setter for the proto_version field.
-     *  \param new_proto_version The new proto_version field value.
+     *  \brief Setter for the Protocol Version field.
+     *  \param new_proto_version The new Protocol Version field value.
     */
    void proto_version(uint8_t new_proto_version);

    /**
-     *  \brief Setter for the bpdu_type field.
-     *  \param new_bpdu_type The new bpdu_type field value.
+     *  \brief Setter for the BPDU Type field.
+     *  \param new_bpdu_type The new BPDU Type field value.
     */
    void bpdu_type(uint8_t new_bpdu_type);

    /**
-     *  \brief Setter for the bpdu_flags field.
-     *  \param new_bpdu_flags The new bpdu_flags field value.
+     *  \brief Setter for the BPDU Flags field.
+     *  \param new_bpdu_flags The new BPDU Flags field value.
     */
    void bpdu_flags(uint8_t new_bpdu_flags);

    /**
-     *  \brief Setter for the root_path_cost field.
-     *  \param new_root_path_cost The new root_path_cost field value.
+     *  \brief Setter for the Root Path Cost field.
+     *  \param new_root_path_cost The new Root Path Cost field value.
     */
    void root_path_cost(uint32_t new_root_path_cost);

    /**
-     *  \brief Setter for the port_id field.
-     *  \param new_port_id The new port_id field value.
+     *  \brief Setter for the Port ID field.
+     *  \param new_port_id The new Port ID field value.
     */
    void port_id(uint16_t new_port_id);

    /**
-     *  \brief Setter for the msg_age field.
-     *  \param new_msg_age The new msg_age field value.
+     *  \brief Setter for the Message Age field.
+     *  \param new_msg_age The new Message Age field value.
     */
    void msg_age(uint16_t new_msg_age);

    /**
-     *  \brief Setter for the max_age field.
-     *  \param new_max_age The new max_age field value.
+     *  \brief Setter for the Maximum Age field.
+     *  \param new_max_age The new Maximum Age field value.
     */
    void max_age(uint16_t new_max_age);

    /**
-     *  \brief Setter for the hello_time field.
-     *  \param new_hello_time The new hello_time field value.
+     *  \brief Setter for the Hello Time field.
+     *  \param new_hello_time The new Hello Time field value.
     */
    void hello_time(uint16_t new_hello_time);

    /**
-     *  \brief Setter for the fwd_delay field.
-     *  \param new_fwd_delay The new fwd_delay field value.
+     *  \brief Setter for the Forward Delay field.
+     *  \param new_fwd_delay The new Forward Delay field value.
     */
    void fwd_delay(uint16_t new_fwd_delay);
    
    /**
-     *  \brief Setter for the root id field.
-     *  \param new_fwd_delay The new root id field value.
+     *  \brief Setter for the Root ID field.
+     *  \param new_fwd_delay The new Root ID field value.
     */
    void root_id(const bpdu_id_type &id);
    
    /**
-     *  \brief Setter for the bridge id field.
-     *  \param new_fwd_delay The new bridge id field value.
+     *  \brief Setter for the Bridge ID field.
+     *  \param new_fwd_delay The new Bridge ID field value.
     */
    void bridge_id(const bpdu_id_type &id);
 private:
--- a/include/tcp.h
+++ b/include/tcp.h
@@ -64,14 +64,14 @@ namespace Tins {
         * These flags identify those supported by the TCP PDU.
         */
        enum Flags {
-            FIN,
-            SYN,
-            RST,
-            PSH,
-            ACK,
-            URG,
-            ECE,
-            CWR
+            FIN = 1,
+            SYN = 2,
+            RST = 4,
+            PSH = 8,
+            ACK = 16,
+            URG = 32,
+            ECE = 64,
+            CWR = 128
        };

        /**
@@ -102,7 +102,7 @@ namespace Tins {
        /**
         * The type used to store TCP options.
         */
-        typedef PDUOption<uint8_t> option;
+        typedef PDUOption<uint8_t, TCP> option;

        /**
         * The type used to store the options.
@@ -207,7 +207,25 @@ namespace Tins {
         * \param tcp_flag The polled flag.
         * \return The value of the flag.
         */
-        small_uint<1> get_flag(Flags tcp_flag);
+        small_uint<1> get_flag(Flags tcp_flag) const;
+
+        /**
+         * 
+         * \brief Gets the flags' values.
+         *
+         * All of the set flags will be joined together into
+         * a 12 bit value. This way, you can check for multiple
+         * flags at the same time:
+         * 
+         * \code
+         * TCP tcp = ...;
+         * if(tcp.flags() == (TCP::SYN | TCP::ACK))
+         *     // It's a SYN+ACK!
+         * \endcode
+         * 
+         * \return The value of the flags field.
+         */
+        small_uint<12> flags() const;
        
        /* Setters */

@@ -353,6 +371,25 @@ namespace Tins {
         */
        void set_flag(Flags tcp_flag, small_uint<1> value);
        
+        /**
+         * \brief Sets the value of the flag fields.
+         *
+         * This method can be used to set several flags at the 
+         * same time.
+         * 
+         * \code
+         * TCP tcp = ...;
+         * tcp.flags(TCP::SYN | TCP::ACK);
+         * // ...
+         * // only set the ACK, keeping the rest of the old flags.
+         * tcp.flags(tcp.flags() | TCP::ACK);
+         * \endcode
+         * 
+         * \param value The new value of the flags.
+         */
+        void flags(small_uint<12> value);
+        
+
        /**
         * \brief Adds a TCP option.
         *
@@ -453,11 +490,11 @@ namespace Tins {
        static const uint16_t DEFAULT_WINDOW;
        
        template<class T> 
-        T generic_search(OptionTypes opt) const {
-            const option *option = search_option(opt);
-            if(option && option->data_size() == sizeof(T))
-                return *(const T*)(&option->data_ptr()[0]);
-            throw option_not_found();
+        T generic_search(OptionTypes opt_type) const {
+            const option *opt = search_option(opt_type);
+            if(!opt)
+                throw option_not_found();
+            return opt->to<T>();
        }
        
        void internal_add_option(const option &option);
--- a/include/tcp_stream.h
+++ b/include/tcp_stream.h
@@ -345,36 +345,34 @@ void TCPStreamFollower::follow_streams(ForwardIterator start, ForwardIterator en

 template<typename DataFunctor, typename EndFunctor>
 bool TCPStreamFollower::callback(PDU &pdu, const DataFunctor &data_fun, const EndFunctor &end_fun) {
-    IP *ip = pdu.find_pdu<IP>();
-    TCP *tcp = pdu.find_pdu<TCP>();
-    if(ip && tcp) {
-        TCPStream::StreamInfo info( 
-            ip->src_addr(), ip->dst_addr(),
-            tcp->sport(), tcp->dport()
-        );
-        sessions_type::iterator it = sessions.find(info);
-        if(it == sessions.end()) {
-            std::swap(info.client_addr, info.server_addr);
-            std::swap(info.client_port, info.server_port);
-            if((it = sessions.find(info)) == sessions.end()) {
-                if(tcp->get_flag(TCP::SYN) && !tcp->get_flag(TCP::ACK)) {
-                    sessions.insert(
-                        std::make_pair(
-                            info,
-                            TCPStream(ip, tcp, last_identifier++)
-                        )
-                    );
-                }
-                return true;
+    IP &ip = pdu.rfind_pdu<IP>();
+    TCP &tcp = pdu.rfind_pdu<TCP>();
+    TCPStream::StreamInfo info( 
+        ip.src_addr(), ip.dst_addr(),
+        tcp.sport(), tcp.dport()
+    );
+    sessions_type::iterator it = sessions.find(info);
+    if(it == sessions.end()) {
+        std::swap(info.client_addr, info.server_addr);
+        std::swap(info.client_port, info.server_port);
+        if((it = sessions.find(info)) == sessions.end()) {
+            if(tcp.get_flag(TCP::SYN) && !tcp.get_flag(TCP::ACK)) {
+                sessions.insert(
+                    std::make_pair(
+                        info,
+                        TCPStream(&ip, &tcp, last_identifier++)
+                    )
+                );
            }
+            return true;
        }
-        if(it->second.update(ip, tcp))
-            data_fun(it->second);
-        // We're done with this stream
-        if(it->second.is_finished()) {
-            end_fun(it->second);
-            sessions.erase(it);
-        }
+    }
+    if(it->second.update(&ip, &tcp))
+        data_fun(it->second);
+    // We're done with this stream
+    if(it->second.is_finished()) {
+        end_fun(it->second);
+        sessions.erase(it);
    }
    return true;
 }
--- a/include/tins.h
+++ b/include/tins.h
@@ -67,5 +67,11 @@
 #include "dhcpv6.h"
 #include "pppoe.h"
 #include "stp.h"
+#include "handshake_capturer.h"
+#include "address_range.h"
+#include "pdu_allocator.h"
+#include "ipsec.h"
+#include "ip_reassembler.h"
+#include "ppi.h"

 #endif // TINS_TINS_H
--- a/include/udp.h
+++ b/include/udp.h
@@ -51,8 +51,8 @@ namespace Tins {
        /** 
         * \brief UDP constructor.
         *
-         * Creates an instance of UDP. Destination and source port can
-         * be provided, otherwise both will be 0.
+         * Constructs an instance of UDP. The destination and source 
+         * port can be provided, otherwise both of them will be 0.
         * 
         * \param dport Destination port.
         * \param sport Source port.
--- a/include/utils.h
+++ b/include/utils.h
@@ -168,13 +168,20 @@ namespace Tins {
        
        
        /**
-         * \brief Retrieves entries int the routing table.
+         * \brief Retrieves entries in the routing table.
         * 
         * \brief output ForwardIterator in which entries will be stored.
         */
        template<class ForwardIterator>
        void route_entries(ForwardIterator output);

+        /**
+         * \brief Retrieves entries in the routing table.
+         * 
+         * \return a vector which contains all of the route entries.
+         */
+        std::vector<RouteEntry> route_entries();
+
        /** \brief Returns the 32 bit crc of the given buffer.
         *
         * \param data The input buffer.
--- a/src/address_range.cpp
+++ b/src/address_range.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2012, 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 "address_range.h"
+#include "ip_address.h"
+#include "ipv6_address.h"
+
+namespace Tins {
+IPv4Range operator/(const IPv4Address &addr, int mask) {
+    if(mask > 32)
+        throw std::logic_error("Prefix length cannot exceed 32");
+    return IPv4Range::from_mask(
+        addr, 
+        IPv4Address(Endian::host_to_be(0xffffffff << (32 - mask)))
+    );
+}
+
+IPv6Range operator/(const IPv6Address &addr, int mask) {
+    if(mask > 128)
+        throw std::logic_error("Prefix length cannot exceed 128");
+    IPv6Address last_addr;
+    IPv6Address::iterator it = last_addr.begin();
+    while(mask > 8) {
+        *it = 0xff;
+        ++it;
+        mask -= 8;
+    }
+    *it = 0xff << (8 - mask);
+    return IPv6Range::from_mask(addr, last_addr);
+}
+}
--- a/src/arp.cpp
+++ b/src/arp.cpp
@@ -63,6 +63,7 @@ ARP::ARP(const uint8_t *buffer, uint32_t total_sz)
        throw malformed_packet();
    memcpy(&_arp, buffer, sizeof(arphdr));
    total_sz -= sizeof(arphdr);
+    //TODO: Check whether this should be removed or not.
    if(total_sz)
        inner_pdu(new RawPDU(buffer + sizeof(arphdr), total_sz));
 }
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -26,9 +26,19 @@
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
- 
+
 #include "crypto.h"

+#ifdef HAVE_DOT11
+
+#ifdef HAVE_WPA2_DECRYPTION
+    #include <openssl/evp.h>
+    #include <openssl/hmac.h>
+    #include <openssl/aes.h>
+#endif // HAVE_WPA2_DECRYPTION
+#include "dot11/dot11_data.h"
+#include "dot11/dot11_beacon.h"
+
 namespace Tins {
 namespace Crypto {
 WEPDecrypter::WEPDecrypter() 
@@ -63,14 +73,16 @@ bool WEPDecrypter::decrypt(PDU &pdu) {
            passwords_type::iterator it = passwords.find(addr);
            if(it != passwords.end()) {
                dot11->inner_pdu(decrypt(*raw, it->second));
-                dot11->wep(0);
-                // Invalid WEP packet(CRC check failed). Skip it.
-                if(!dot11->inner_pdu())
-                    return false;
+                // If its valid, then return true
+                if(dot11->inner_pdu()) {
+                    // it's no longer encrypted.
+                    dot11->wep(0);
+                    return true;
+                }
            }
        }
    }
-    return true;
+    return false;
 }

 PDU *WEPDecrypter::decrypt(RawPDU &raw, const std::string &password) {
@@ -98,5 +110,440 @@ PDU *WEPDecrypter::decrypt(RawPDU &raw, const std::string &password) {
        return 0;
    }
 }
+
+#ifdef HAVE_WPA2_DECRYPTION
+// WPA2Decrypter
+
+const HWAddress<6> &min(const HWAddress<6>& lhs, const HWAddress<6>& rhs) {
+    return lhs < rhs ? lhs : rhs;
 }
+
+const HWAddress<6> &max(const HWAddress<6>& lhs, const HWAddress<6>& rhs) {
+    return lhs < rhs ? rhs : lhs;
 }
+
+template<typename InputIterator1, typename InputIterator2, typename OutputIterator>
+void xor_range(InputIterator1 src1, InputIterator2 src2, OutputIterator dst, size_t sz) {
+    for(size_t i = 0; i < sz; ++i) {
+        *dst++ = *src1++ ^ *src2++;
+    }
+}
+
+const uint16_t sbox_table[2][256]= {
+    {
+        0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
+        0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
+        0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
+        0x41EC, 0xB367, 0x5FFD, 0x45EA, 0x23BF, 0x53F7, 0xE496, 0x9B5B,
+        0x75C2, 0xE11C, 0x3DAE, 0x4C6A, 0x6C5A, 0x7E41, 0xF502, 0x834F,
+        0x685C, 0x51F4, 0xD134, 0xF908, 0xE293, 0xAB73, 0x6253, 0x2A3F,
+        0x080C, 0x9552, 0x4665, 0x9D5E, 0x3028, 0x37A1, 0x0A0F, 0x2FB5,
+        0x0E09, 0x2436, 0x1B9B, 0xDF3D, 0xCD26, 0x4E69, 0x7FCD, 0xEA9F,
+        0x121B, 0x1D9E, 0x5874, 0x342E, 0x362D, 0xDCB2, 0xB4EE, 0x5BFB,
+        0xA4F6, 0x764D, 0xB761, 0x7DCE, 0x527B, 0xDD3E, 0x5E71, 0x1397,
+        0xA6F5, 0xB968, 0x0000, 0xC12C, 0x4060, 0xE31F, 0x79C8, 0xB6ED,
+        0xD4BE, 0x8D46, 0x67D9, 0x724B, 0x94DE, 0x98D4, 0xB0E8, 0x854A,
+        0xBB6B, 0xC52A, 0x4FE5, 0xED16, 0x86C5, 0x9AD7, 0x6655, 0x1194,
+        0x8ACF, 0xE910, 0x0406, 0xFE81, 0xA0F0, 0x7844, 0x25BA, 0x4BE3,
+        0xA2F3, 0x5DFE, 0x80C0, 0x058A, 0x3FAD, 0x21BC, 0x7048, 0xF104,
+        0x63DF, 0x77C1, 0xAF75, 0x4263, 0x2030, 0xE51A, 0xFD0E, 0xBF6D,
+        0x814C, 0x1814, 0x2635, 0xC32F, 0xBEE1, 0x35A2, 0x88CC, 0x2E39,
+        0x9357, 0x55F2, 0xFC82, 0x7A47, 0xC8AC, 0xBAE7, 0x322B, 0xE695,
+        0xC0A0, 0x1998, 0x9ED1, 0xA37F, 0x4466, 0x547E, 0x3BAB, 0x0B83,
+        0x8CCA, 0xC729, 0x6BD3, 0x283C, 0xA779, 0xBCE2, 0x161D, 0xAD76,
+        0xDB3B, 0x6456, 0x744E, 0x141E, 0x92DB, 0x0C0A, 0x486C, 0xB8E4,
+        0x9F5D, 0xBD6E, 0x43EF, 0xC4A6, 0x39A8, 0x31A4, 0xD337, 0xF28B,
+        0xD532, 0x8B43, 0x6E59, 0xDAB7, 0x018C, 0xB164, 0x9CD2, 0x49E0,
+        0xD8B4, 0xACFA, 0xF307, 0xCF25, 0xCAAF, 0xF48E, 0x47E9, 0x1018,
+        0x6FD5, 0xF088, 0x4A6F, 0x5C72, 0x3824, 0x57F1, 0x73C7, 0x9751,
+        0xCB23, 0xA17C, 0xE89C, 0x3E21, 0x96DD, 0x61DC, 0x0D86, 0x0F85,
+        0xE090, 0x7C42, 0x71C4, 0xCCAA, 0x90D8, 0x0605, 0xF701, 0x1C12,
+        0xC2A3, 0x6A5F, 0xAEF9, 0x69D0, 0x1791, 0x9958, 0x3A27, 0x27B9,
+        0xD938, 0xEB13, 0x2BB3, 0x2233, 0xD2BB, 0xA970, 0x0789, 0x33A7,
+        0x2DB6, 0x3C22, 0x1592, 0xC920, 0x8749, 0xAAFF, 0x5078, 0xA57A,
+        0x038F, 0x59F8, 0x0980, 0x1A17, 0x65DA, 0xD731, 0x84C6, 0xD0B8,
+        0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A
+    },
+    {
+        0xA5C6, 0x84F8, 0x99EE, 0x8DF6, 0x0DFF, 0xBDD6, 0xB1DE, 0x5491,
+        0x5060, 0x0302, 0xA9CE, 0x7D56, 0x19E7, 0x62B5, 0xE64D, 0x9AEC,
+        0x458F, 0x9D1F, 0x4089, 0x87FA, 0x15EF, 0xEBB2, 0xC98E, 0x0BFB,
+        0xEC41, 0x67B3, 0xFD5F, 0xEA45, 0xBF23, 0xF753, 0x96E4, 0x5B9B,
+        0xC275, 0x1CE1, 0xAE3D, 0x6A4C, 0x5A6C, 0x417E, 0x02F5, 0x4F83,
+        0x5C68, 0xF451, 0x34D1, 0x08F9, 0x93E2, 0x73AB, 0x5362, 0x3F2A,
+        0x0C08, 0x5295, 0x6546, 0x5E9D, 0x2830, 0xA137, 0x0F0A, 0xB52F,
+        0x090E, 0x3624, 0x9B1B, 0x3DDF, 0x26CD, 0x694E, 0xCD7F, 0x9FEA,
+        0x1B12, 0x9E1D, 0x7458, 0x2E34, 0x2D36, 0xB2DC, 0xEEB4, 0xFB5B,
+        0xF6A4, 0x4D76, 0x61B7, 0xCE7D, 0x7B52, 0x3EDD, 0x715E, 0x9713,
+        0xF5A6, 0x68B9, 0x0000, 0x2CC1, 0x6040, 0x1FE3, 0xC879, 0xEDB6,
+        0xBED4, 0x468D, 0xD967, 0x4B72, 0xDE94, 0xD498, 0xE8B0, 0x4A85,
+        0x6BBB, 0x2AC5, 0xE54F, 0x16ED, 0xC586, 0xD79A, 0x5566, 0x9411,
+        0xCF8A, 0x10E9, 0x0604, 0x81FE, 0xF0A0, 0x4478, 0xBA25, 0xE34B,
+        0xF3A2, 0xFE5D, 0xC080, 0x8A05, 0xAD3F, 0xBC21, 0x4870, 0x04F1,
+        0xDF63, 0xC177, 0x75AF, 0x6342, 0x3020, 0x1AE5, 0x0EFD, 0x6DBF,
+        0x4C81, 0x1418, 0x3526, 0x2FC3, 0xE1BE, 0xA235, 0xCC88, 0x392E,
+        0x5793, 0xF255, 0x82FC, 0x477A, 0xACC8, 0xE7BA, 0x2B32, 0x95E6,
+        0xA0C0, 0x9819, 0xD19E, 0x7FA3, 0x6644, 0x7E54, 0xAB3B, 0x830B,
+        0xCA8C, 0x29C7, 0xD36B, 0x3C28, 0x79A7, 0xE2BC, 0x1D16, 0x76AD,
+        0x3BDB, 0x5664, 0x4E74, 0x1E14, 0xDB92, 0x0A0C, 0x6C48, 0xE4B8,
+        0x5D9F, 0x6EBD, 0xEF43, 0xA6C4, 0xA839, 0xA431, 0x37D3, 0x8BF2,
+        0x32D5, 0x438B, 0x596E, 0xB7DA, 0x8C01, 0x64B1, 0xD29C, 0xE049,
+        0xB4D8, 0xFAAC, 0x07F3, 0x25CF, 0xAFCA, 0x8EF4, 0xE947, 0x1810,
+        0xD56F, 0x88F0, 0x6F4A, 0x725C, 0x2438, 0xF157, 0xC773, 0x5197,
+        0x23CB, 0x7CA1, 0x9CE8, 0x213E, 0xDD96, 0xDC61, 0x860D, 0x850F,
+        0x90E0, 0x427C, 0xC471, 0xAACC, 0xD890, 0x0506, 0x01F7, 0x121C,
+        0xA3C2, 0x5F6A, 0xF9AE, 0xD069, 0x9117, 0x5899, 0x273A, 0xB927,
+        0x38D9, 0x13EB, 0xB32B, 0x3322, 0xBBD2, 0x70A9, 0x8907, 0xA733,
+        0xB62D, 0x223C, 0x9215, 0x20C9, 0x4987, 0xFFAA, 0x7850, 0x7AA5,
+        0x8F03, 0xF859, 0x8009, 0x171A, 0xDA65, 0x31D7, 0xC684, 0xB8D0,
+        0xC382, 0xB029, 0x775A, 0x111E, 0xCB7B, 0xFCA8, 0xD66D, 0x3A2C
+    }
+};
+
+uint16_t sbox(uint16_t i) {
+    return sbox_table[0][i & 0xff] ^ sbox_table[1][(i >> 8)];
+}
+
+uint16_t join_bytes(uint8_t b1, uint8_t b2) {
+    return (static_cast<uint16_t>(b1) << 8) | b2;
+}
+
+uint16_t rotate(uint16_t value) {
+    return ((value >> 1) & 0x7fff) | (value << 15);
+}
+
+uint16_t upper_byte(uint16_t value) {
+    return (value >> 8) & 0xff;
+}
+
+uint16_t lower_byte(uint16_t value) {
+    return value & 0xff;
+}
+
+HWAddress<6> get_bssid(const Dot11Data &dot11) {
+    if(dot11.from_ds() && !dot11.to_ds())
+        return dot11.addr3();
+    else if(!dot11.from_ds() && dot11.to_ds())
+        return dot11.addr2();
+    else 
+        return dot11.addr2();
+}
+
+namespace WPA2 {
+
+SessionKeys::SessionKeys() {
+
+}
+
+SessionKeys::SessionKeys(const RSNHandshake &hs, const pmk_type &pmk) {
+    uint8_t PKE[100] = "Pairwise key expansion";
+    uint8_t MIC[16];
+    min(hs.client_address(), hs.supplicant_address()).copy(PKE + 23);
+    max(hs.client_address(), hs.supplicant_address()).copy(PKE + 29);
+    const uint8_t *nonce1 = hs.handshake()[1].nonce(), 
+                  *nonce2 = hs.handshake()[2].nonce();
+    if(std::lexicographical_compare(nonce1, nonce1 + 32, nonce2, nonce2 + 32)) {
+        std::copy(nonce1, nonce1 + 32, PKE + 35);
+        std::copy(nonce2, nonce2 + 32, PKE + 67);
+    }
+    else {
+        std::copy(nonce2, nonce2 + 32, PKE + 35);
+        std::copy(nonce1, nonce1 + 32, PKE + 67);
+    }
+    for(int i(0); i < 4; ++i) {
+        PKE[99] = i;
+        HMAC(EVP_sha1(), pmk.begin(), pmk.size(), PKE, 100, ptk.begin() + i * 20, 0);
+    }
+    PDU::serialization_type buffer = const_cast<RSNEAPOL&>(hs.handshake()[3]).serialize();
+    std::fill(buffer.begin() + 81, buffer.begin() + 81 + 16, 0);
+    if(hs.handshake()[3].key_descriptor() == 2)
+        HMAC(EVP_sha1(), ptk.begin(), 16, &buffer[0], buffer.size(), MIC, 0);
+    else
+        HMAC(EVP_md5(), ptk.begin(), 16, &buffer[0], buffer.size(), MIC, 0);
+    
+    if(!std::equal(MIC, MIC + sizeof(MIC), hs.handshake()[3].mic()))
+        throw invalid_handshake();
+    is_ccmp = (hs.handshake()[3].key_descriptor() == 2);
+}
+
+SNAP *SessionKeys::ccmp_decrypt_unicast(const Dot11Data &dot11, RawPDU &raw) const {
+    RawPDU::payload_type &pload = raw.payload();
+    uint8_t MIC[16] = {0};
+    uint8_t PN[6] = {
+        pload[7],
+        pload[6],
+        pload[5],
+        pload[4],
+        pload[1],
+        pload[0]
+    };
+    
+    uint8_t AAD[32] = {0};
+    AAD[0] = 0;
+    AAD[1] = 22 + 6 * int(dot11.from_ds() && dot11.to_ds());
+    if(dot11.subtype() == Dot11::QOS_DATA_DATA) 
+        AAD[1] += 2;
+    AAD[2] = dot11.protocol() | (dot11.type() << 2) | ((dot11.subtype() << 4) & 0x80);
+    AAD[3] = 0x40 | dot11.to_ds() | (dot11.from_ds() << 1) |
+            (dot11.more_frag() << 2) | (dot11.order() << 7);
+    dot11.addr1().copy(AAD + 4);
+    dot11.addr2().copy(AAD + 10);
+    dot11.addr3().copy(AAD + 16);
+    
+    AAD[22] = dot11.frag_num();
+    AAD[23] = 0;
+    
+    if(dot11.from_ds() && dot11.to_ds())
+        dot11.addr4().copy(AAD + 24);
+    
+    AES_KEY ctx;
+    AES_set_encrypt_key(ptk.begin() + 32, 128, &ctx);
+    uint8_t crypted_block[16];
+    size_t total_sz = raw.payload_size() - 16, offset = 8, blocks = (total_sz + 15) / 16;
+    
+    uint8_t counter[16];
+    counter[0] = 0x59;
+    counter[1] = 0;
+    dot11.addr2().copy(counter + 2);
+    std::copy(PN, PN + 6, counter + 8);
+    counter[14] = (total_sz >> 8) & 0xff;
+    counter[15] = total_sz & 0xff;
+    
+    AES_encrypt(counter, MIC, &ctx);
+    xor_range(MIC, AAD, MIC, 16);
+    AES_encrypt(MIC, MIC, &ctx);
+    xor_range(MIC, AAD + 16, MIC, 16);
+    AES_encrypt(MIC, MIC, &ctx);
+    
+    counter[0] = 1;
+    counter[14] = counter[15] = 0;
+    AES_encrypt(counter, crypted_block, &ctx);
+    uint8_t nice_MIC[8];
+    std::copy(pload.begin() + pload.size() - 8, pload.end(), nice_MIC);
+    xor_range(crypted_block, nice_MIC, nice_MIC, 8);
+    for(size_t i = 1; i <= blocks; ++i) {
+        size_t block_sz = (i == blocks) ? (total_sz % 16) : 16;
+        if(block_sz == 0)
+            block_sz = 16;
+        counter[14] = (i >> 8) & 0xff;
+        counter[15] = i & 0xff;
+        AES_encrypt(counter, crypted_block, &ctx );
+
+        xor_range(crypted_block, &pload[offset], &pload[(i - 1) * 16], block_sz);
+        
+        xor_range(MIC, &pload[(i - 1) * 16], MIC, block_sz);
+        AES_encrypt(MIC, MIC, &ctx);   
+        offset += block_sz;
+    }
+    return (std::equal(nice_MIC, nice_MIC + sizeof(nice_MIC), MIC)) ? 
+        new SNAP(&pload[0], total_sz) : 
+        0;
+}
+
+RC4Key SessionKeys::generate_rc4_key(const Dot11Data &dot11, const RawPDU &raw) const {
+    const RawPDU::payload_type &pload = raw.payload();
+    const uint8_t *tk = ptk.begin() + 32;
+    Internals::byte_array<16> rc4_key;
+    uint16_t ppk[6];
+    const Dot11::address_type addr = get_bssid(dot11);
+    // Phase 1
+    ppk[0] = join_bytes(pload[4], pload[5]);
+    ppk[1] = join_bytes(pload[6], pload[7]);
+    ppk[2] = join_bytes(addr[1], addr[0]);
+    ppk[3] = join_bytes(addr[3], addr[2]);
+    ppk[4] = join_bytes(addr[5], addr[4]);
+    
+    for(size_t i = 0; i < 4; ++i) {
+        ppk[0] += sbox(ppk[4] ^ join_bytes(tk[1], tk[0]));
+        ppk[1] += sbox(ppk[0] ^ join_bytes(tk[5], tk[4]));
+        ppk[2] += sbox(ppk[1] ^ join_bytes(tk[9], tk[8]));
+        ppk[3] += sbox(ppk[2] ^ join_bytes(tk[13], tk[12]));
+        ppk[4] += sbox(ppk[3] ^ join_bytes(tk[1], tk[0])) + 2*i;
+        ppk[0] += sbox(ppk[4] ^ join_bytes(tk[3], tk[2]));
+        ppk[1] += sbox(ppk[0] ^ join_bytes(tk[7], tk[6]));
+        ppk[2] += sbox(ppk[1] ^ join_bytes(tk[11], tk[10]));
+        ppk[3] += sbox(ppk[2] ^ join_bytes(tk[15], tk[14]));
+        ppk[4] += sbox(ppk[3] ^ join_bytes(tk[3], tk[2])) + 2*i + 1;
+    }
+
+    // Phase 2, step 1
+    ppk[5] = ppk[4] + join_bytes(pload[0], pload[2]);
+    
+    // Phase 2, step 2
+    ppk[0] += sbox(ppk[5] ^ join_bytes(tk[1], tk[0]));
+    ppk[1] += sbox(ppk[0] ^ join_bytes(tk[3], tk[2]));
+    ppk[2] += sbox(ppk[1] ^ join_bytes(tk[5], tk[4]));
+    ppk[3] += sbox(ppk[2] ^ join_bytes(tk[7], tk[6]));
+    ppk[4] += sbox(ppk[3] ^ join_bytes(tk[9], tk[8]));
+    ppk[5] += sbox(ppk[4] ^ join_bytes(tk[11], tk[10]));
+    
+    ppk[0] += rotate(ppk[5] ^ join_bytes(tk[13], tk[12]));
+    ppk[1] += rotate(ppk[0] ^ join_bytes(tk[15], tk[14]));
+    ppk[2] += rotate(ppk[1]);
+    ppk[3] += rotate(ppk[2]);
+    ppk[4] += rotate(ppk[3]);
+    ppk[5] += rotate(ppk[4]);
+    
+    // Phase 2, step 3
+    rc4_key[0] = upper_byte(join_bytes(pload[0], pload[2]));
+    rc4_key[1] = (rc4_key[0] | 0x20) & 0x7f;
+    rc4_key[2] = lower_byte(join_bytes(pload[0], pload[2]));
+    rc4_key[3] = lower_byte((ppk[5] ^ join_bytes(tk[1], tk[0])) >> 1);
+    rc4_key[4] = lower_byte(ppk[0]);
+    rc4_key[5] = upper_byte(ppk[0]);
+    rc4_key[6] = lower_byte(ppk[1]);
+    rc4_key[7] = upper_byte(ppk[1]);
+    rc4_key[8] = lower_byte(ppk[2]);
+    rc4_key[9] = upper_byte(ppk[2]);
+    rc4_key[10] = lower_byte(ppk[3]);
+    rc4_key[11] = upper_byte(ppk[3]);
+    rc4_key[12] = lower_byte(ppk[4]);
+    rc4_key[13] = upper_byte(ppk[4]);
+    rc4_key[14] = lower_byte(ppk[5]);
+    rc4_key[15] = upper_byte(ppk[5]);
+    return RC4Key(rc4_key.begin(), rc4_key.end());
+}
+
+SNAP *SessionKeys::tkip_decrypt_unicast(const Dot11Data &dot11, RawPDU &raw) const {
+    // at least 20 bytes for IV + crc + stuff
+    if(raw.payload_size() <= 20)
+        return 0;
+    Crypto::RC4Key key = generate_rc4_key(dot11, raw);
+    RawPDU::payload_type &pload = raw.payload();
+    rc4(pload.begin() + 8, pload.end(), key, pload.begin());
+
+    uint32_t crc = Utils::crc32(&pload[0], pload.size() - 12);
+    if(pload[pload.size() - 12] != (crc & 0xff) ||
+        pload[pload.size() - 11] != ((crc >> 8) & 0xff) ||
+        pload[pload.size() - 10] != ((crc >> 16) & 0xff) ||
+        pload[pload.size() - 9] != ((crc >> 24) & 0xff))
+        return 0;
+
+    return new SNAP(&pload[0], pload.size() - 20);
+}
+
+SNAP *SessionKeys::SessionKeys::decrypt_unicast(const Dot11Data &dot11, RawPDU &raw) const {
+    return is_ccmp ? 
+        ccmp_decrypt_unicast(dot11, raw) :
+        tkip_decrypt_unicast(dot11, raw);
+}
+
+// supplicant_data
+
+SupplicantData::SupplicantData(const std::string &psk, const std::string &ssid) {
+    PKCS5_PBKDF2_HMAC_SHA1(
+        psk.c_str(), 
+        psk.size(), 
+        (unsigned char *)ssid.c_str(), 
+        ssid.size(), 
+        4096, 
+        pmk_.size(), 
+        pmk_.begin()
+    );
+}
+
+const SupplicantData::pmk_type &SupplicantData::pmk() const {
+    return pmk_;
+}
+} // namespace WPA2
+
+void WPA2Decrypter::add_ap_data(const std::string &psk, const std::string &ssid) {
+    pmks.insert(std::make_pair(ssid, WPA2::SupplicantData(psk, ssid)));
+}
+
+void WPA2Decrypter::add_ap_data(const std::string &psk, const std::string &ssid,
+  const address_type &addr) 
+{
+    add_ap_data(psk, ssid);
+    add_access_point(ssid, addr);
+}
+
+void WPA2Decrypter::add_access_point(const std::string &ssid, const address_type &addr) {
+    pmks_map::const_iterator it = pmks.find(ssid);
+    if(it == pmks.end()) 
+        throw std::runtime_error("supplicant data not registered");
+    aps.insert(std::make_pair(addr, it->second));
+}
+
+void WPA2Decrypter::try_add_keys(const Dot11Data &dot11, const RSNHandshake &hs) {
+    bssids_map::const_iterator it = find_ap(dot11);
+    if(it != aps.end()) {
+        addr_pair addr_p = extract_addr_pair(dot11);
+        try {
+            WPA2::SessionKeys session(hs, it->second.pmk());
+            keys[addr_p] = session;
+        }
+        catch(WPA2::invalid_handshake&) { }
+    }
+}
+
+WPA2Decrypter::addr_pair WPA2Decrypter::extract_addr_pair(const Dot11Data &dot11) {
+    if(dot11.from_ds() && !dot11.to_ds())
+        return make_addr_pair(dot11.addr2(), dot11.addr3());
+    else if(!dot11.from_ds() && dot11.to_ds())
+        return make_addr_pair(dot11.addr1(), dot11.addr2());
+    else 
+        return make_addr_pair(dot11.addr2(), dot11.addr3());
+}
+
+WPA2Decrypter::addr_pair WPA2Decrypter::extract_addr_pair_dst(const Dot11Data &dot11) {
+    if(dot11.from_ds() && !dot11.to_ds())
+        return make_addr_pair(dot11.addr1(), dot11.addr2());
+    else if(!dot11.from_ds() && dot11.to_ds())
+        return make_addr_pair(dot11.addr1(), dot11.addr3());
+    else 
+        return make_addr_pair(dot11.addr1(), dot11.addr3());
+}
+
+WPA2Decrypter::bssids_map::const_iterator WPA2Decrypter::find_ap(const Dot11Data &dot11) {
+    if(dot11.from_ds() && !dot11.to_ds())
+        return aps.find(dot11.addr2());
+    else if(!dot11.from_ds() && dot11.to_ds())
+        return aps.find(dot11.addr1());
+    else 
+        return aps.find(dot11.addr3());
+}
+
+bool WPA2Decrypter::decrypt(PDU &pdu) {
+    if(capturer.process_packet(pdu)) {
+        try_add_keys(pdu.rfind_pdu<Dot11Data>(), capturer.handshakes().front());
+        capturer.clear_handshakes();
+    }
+    else if(const Dot11Beacon *beacon = pdu.find_pdu<Dot11Beacon>()) {
+        if(aps.count(beacon->addr3()) == 0) {
+            try {
+                std::string ssid = beacon->ssid();
+                if(pmks.count(ssid)) {
+                    add_access_point(ssid, beacon->addr3());
+                }
+            }
+            catch(option_not_found&) { }
+        }
+    }
+    else {
+        Dot11Data *data = pdu.find_pdu<Dot11Data>();
+        RawPDU *raw = pdu.find_pdu<RawPDU>();
+        if(data && raw && data->wep()) {
+            // search for the tuple (bssid, src_addr)
+            keys_map::const_iterator it = keys.find(extract_addr_pair(*data));
+            
+            // search for the tuple (bssid, dst_addr) if the above didn't work
+            if(it == keys.end())
+                it = keys.find(extract_addr_pair_dst(*data));
+            if(it != keys.end()) {
+                SNAP *snap = it->second.decrypt_unicast(*data, *raw);
+                if(snap) {
+                    data->inner_pdu(snap);
+                    data->wep(0);
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+} // namespace WPA2
+#endif // HAVE_WPA2_DECRYPTION
+} // namespace Crypto
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -100,11 +100,11 @@ void DHCP::type(Flags type) {
 }

 void DHCP::end() {
-    add_option(option(DHCP_MESSAGE_TYPE));
+    add_option(option(END));
 }

 uint8_t DHCP::type() const {
-    return generic_search(DHCP_MESSAGE_TYPE, type2type<uint8_t>());
+    return search_and_convert<uint8_t>(DHCP_MESSAGE_TYPE);
 }

 void DHCP::server_identifier(ipaddress_type ip) {
@@ -113,7 +113,7 @@ void DHCP::server_identifier(ipaddress_type ip) {
 }

 DHCP::ipaddress_type DHCP::server_identifier() const {
-    return generic_search(DHCP_SERVER_IDENTIFIER, type2type<ipaddress_type>());
+    return search_and_convert<ipaddress_type>(DHCP_SERVER_IDENTIFIER);
 }

 void DHCP::lease_time(uint32_t time) {
@@ -122,7 +122,7 @@ void DHCP::lease_time(uint32_t time) {
 }

 uint32_t DHCP::lease_time() const {
-    return Endian::host_to_be(generic_search(DHCP_LEASE_TIME, type2type<uint32_t>()));
+    return search_and_convert<uint32_t>(DHCP_LEASE_TIME);
 }

 void DHCP::renewal_time(uint32_t time) {
@@ -131,7 +131,7 @@ void DHCP::renewal_time(uint32_t time) {
 }
        
 uint32_t DHCP::renewal_time() const {
-    return Endian::host_to_be(generic_search(DHCP_RENEWAL_TIME, type2type<uint32_t>()));
+    return search_and_convert<uint32_t>(DHCP_RENEWAL_TIME);
 }

 void DHCP::subnet_mask(ipaddress_type mask) {
@@ -140,25 +140,25 @@ void DHCP::subnet_mask(ipaddress_type mask) {
 }

 DHCP::ipaddress_type DHCP::subnet_mask() const {
-    return generic_search(SUBNET_MASK, type2type<ipaddress_type>());
+    return search_and_convert<ipaddress_type>(SUBNET_MASK);
 }

-void DHCP::routers(const list<ipaddress_type> &routers) {
+void DHCP::routers(const std::vector<ipaddress_type> &routers) {
    serialization_type buffer = serialize_list(routers);
    add_option(option(ROUTERS, buffer.begin(), buffer.end()));
 }

-std::list<DHCP::ipaddress_type> DHCP::routers() const {
-    return generic_search(ROUTERS, type2type<std::list<ipaddress_type> >());
+std::vector<DHCP::ipaddress_type> DHCP::routers() const {
+    return search_and_convert<std::vector<DHCP::ipaddress_type> >(ROUTERS);
 }

-void DHCP::domain_name_servers(const list<ipaddress_type> &dns) {
+void DHCP::domain_name_servers(const std::vector<ipaddress_type> &dns) {
    serialization_type buffer = serialize_list(dns);
    add_option(option(DOMAIN_NAME_SERVERS, buffer.begin(), buffer.end()));
 }

-std::list<DHCP::ipaddress_type> DHCP::domain_name_servers() const {
-    return generic_search(DOMAIN_NAME_SERVERS, type2type<std::list<ipaddress_type> >());
+std::vector<DHCP::ipaddress_type> DHCP::domain_name_servers() const {
+    return search_and_convert<std::vector<DHCP::ipaddress_type> >(DOMAIN_NAME_SERVERS);
 }

 void DHCP::broadcast(ipaddress_type addr) {
@@ -167,7 +167,7 @@ void DHCP::broadcast(ipaddress_type addr) {
 }

 DHCP::ipaddress_type DHCP::broadcast() const {
-    return generic_search(BROADCAST_ADDRESS, type2type<ipaddress_type>());
+    return search_and_convert<ipaddress_type>(BROADCAST_ADDRESS);
 }

 void DHCP::requested_ip(ipaddress_type addr) {
@@ -176,7 +176,7 @@ void DHCP::requested_ip(ipaddress_type addr) {
 }

 DHCP::ipaddress_type DHCP::requested_ip() const {
-    return generic_search(DHCP_REQUESTED_ADDRESS, type2type<ipaddress_type>());
+    return search_and_convert<ipaddress_type>(DHCP_REQUESTED_ADDRESS);
 }

 void DHCP::domain_name(const string &name) {
@@ -184,7 +184,7 @@ void DHCP::domain_name(const string &name) {
 }

 std::string DHCP::domain_name() const {
-    return generic_search(DOMAIN_NAME, type2type<std::string>());
+    return search_and_convert<std::string>(DOMAIN_NAME);
 }

 void DHCP::rebind_time(uint32_t time) {
@@ -193,13 +193,13 @@ void DHCP::rebind_time(uint32_t time) {
 }
        
 uint32_t DHCP::rebind_time() const {
-    return Endian::host_to_be(generic_search(DHCP_REBINDING_TIME, type2type<uint32_t>()));
+    return search_and_convert<uint32_t>(DHCP_REBINDING_TIME);
 }

-PDU::serialization_type DHCP::serialize_list(const list<ipaddress_type> &ip_list) {
+PDU::serialization_type DHCP::serialize_list(const std::vector<ipaddress_type> &ip_list) {
    serialization_type buffer(ip_list.size() * sizeof(uint32_t));
    uint32_t *ptr = (uint32_t*)&buffer[0];
-    for(list<ipaddress_type>::const_iterator it = ip_list.begin(); it != ip_list.end(); ++it)
+    for(std::vector<ipaddress_type>::const_iterator it = ip_list.begin(); it != ip_list.end(); ++it)
        *(ptr++) = *it;
    return buffer;
 }
@@ -227,31 +227,4 @@ void DHCP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *pa
    }
    BootP::write_serialization(buffer, total_sz, parent);
 }
-
-std::list<DHCP::ipaddress_type> DHCP::generic_search(OptionTypes opt_type, type2type<std::list<ipaddress_type> >) const {
-    const option *opt = search_option(opt_type);
-    if(!opt)
-        throw option_not_found();
-    const uint32_t *ptr = (const uint32_t*)opt->data_ptr();
-    uint32_t len = opt->data_size();
-    if((len % sizeof(uint32_t)) != 0)
-        throw option_not_found();
-    std::list<ipaddress_type> container;
-    while(len) {
-        container.push_back(ipaddress_type(*(ptr++)));
-        len -= sizeof(uint32_t);
-    }
-    return container;
-}
-
-std::string DHCP::generic_search(OptionTypes opt_type, type2type<std::string>) const {
-    const option *opt = search_option(opt_type);
-    if(!opt)
-        throw option_not_found();
-    return string(opt->data_ptr(), opt->data_ptr() + opt->data_size());
-}
-
-DHCP::ipaddress_type DHCP::generic_search(OptionTypes opt, type2type<ipaddress_type>) const {
-    return ipaddress_type(generic_search(opt, type2type<uint32_t>()));
-}
 }
--- a/src/dhcpv6.cpp
+++ b/src/dhcpv6.cpp
@@ -157,121 +157,43 @@ void DHCPv6::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *
 // ********************************************************************

 DHCPv6::ia_na_type DHCPv6::ia_na() const {
-    const option *opt = safe_search_option<std::less>(
-        IA_NA, sizeof(uint32_t) * 3
-    );
-    const uint8_t *ptr = opt->data_ptr() + sizeof(uint32_t) * 3;
-    const uint32_t *ptr_32 = (const uint32_t*)opt->data_ptr();
-    DHCPv6::ia_na_type output;
-    output.id = Endian::be_to_host(*ptr_32++);
-    output.t1 = Endian::be_to_host(*ptr_32++);
-    output.t2 = Endian::be_to_host(*ptr_32++);
-    output.options.assign(ptr, opt->data_ptr() + opt->data_size());
-    return output;
+    return search_and_convert<ia_na_type>(IA_NA);
 }

 DHCPv6::ia_ta_type DHCPv6::ia_ta() const {
-    const option *opt = safe_search_option<std::less>(
-        IA_TA, sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr() + sizeof(uint32_t);
-    const uint32_t *ptr_32 = (const uint32_t*)opt->data_ptr();
-    DHCPv6::ia_ta_type output;
-    output.id = Endian::be_to_host(*ptr_32++);
-    output.options.assign(ptr, opt->data_ptr() + opt->data_size());
-    return output;
+    return search_and_convert<ia_ta_type>(IA_TA);
 }

 DHCPv6::ia_address_type DHCPv6::ia_address() const {
-    const option *opt = safe_search_option<std::less>(
-        IA_ADDR, sizeof(uint32_t) * 2 + ipaddress_type::address_size
-    );
-    const uint8_t *ptr = opt->data_ptr() + sizeof(uint32_t) * 2 + ipaddress_type::address_size;
-    const uint32_t *ptr_32 = (const uint32_t*)(opt->data_ptr() + ipaddress_type::address_size);
-    DHCPv6::ia_address_type output;
-    output.address = opt->data_ptr();
-    output.preferred_lifetime = Endian::be_to_host(*ptr_32++);
-    output.valid_lifetime = Endian::be_to_host(*ptr_32++);
-    output.options.assign(ptr, opt->data_ptr() + opt->data_size());
-    return output;
+    return search_and_convert<ia_address_type>(IA_ADDR);
 }

 DHCPv6::option_request_type DHCPv6::option_request() const {
-    const option *opt = safe_search_option<std::less>(
-        OPTION_REQUEST, 2
-    );
-    const uint16_t *ptr = (const uint16_t*)opt->data_ptr(), 
-                    *end = (const uint16_t*)(opt->data_ptr() + opt->data_size());
-    option_request_type output;
-    while(ptr < end) {
-        output.push_back(
-            static_cast<OptionTypes>(Endian::be_to_host(*ptr++))
-        );
-    }
-    return output;
+    return search_and_convert<option_request_type>(OPTION_REQUEST);
 }

 uint8_t DHCPv6::preference() const {
-    const option *opt = safe_search_option<std::not_equal_to>(
-        PREFERENCE, 1
-    );
-    return *opt->data_ptr();
+    return search_and_convert<uint8_t>(PREFERENCE);
 }

 uint16_t DHCPv6::elapsed_time() const {
-    const option *opt = safe_search_option<std::not_equal_to>(
-        ELAPSED_TIME, 2
-    );
-    return Endian::be_to_host(
-        *(const uint16_t*)opt->data_ptr()
-    );
+    return search_and_convert<uint16_t>(ELAPSED_TIME);
 }

 DHCPv6::relay_msg_type DHCPv6::relay_message() const {
-    const option *opt = safe_search_option<std::less>(
-        RELAY_MSG, 1
-    );
-    return relay_msg_type(
-        opt->data_ptr(), 
-        opt->data_ptr() + opt->data_size()
-    );
+    return search_and_convert<relay_msg_type>(RELAY_MSG);
 }

 DHCPv6::authentication_type DHCPv6::authentication() const {
-    const option *opt = safe_search_option<std::less>(
-        AUTH, sizeof(uint8_t) * 3 + sizeof(uint64_t)
-    );
-    const uint8_t *ptr = opt->data_ptr();
-    authentication_type output;
-    output.protocol = *ptr++;
-    output.algorithm = *ptr++;
-    output.rdm = *ptr++;
-    output.replay_detection = Endian::be_to_host(
-        *(const uint64_t*)ptr
-    );
-    ptr += sizeof(uint64_t);
-    output.auth_info.assign(ptr, opt->data_ptr() + opt->data_size());
-    return output;
+    return search_and_convert<authentication_type>(AUTH);
 }

 DHCPv6::ipaddress_type DHCPv6::server_unicast() const {
-    const option *opt = safe_search_option<std::not_equal_to>(
-        UNICAST, ipaddress_type::address_size
-    );
-    return ipaddress_type(opt->data_ptr());
+    return search_and_convert<ipaddress_type>(UNICAST);
 }

 DHCPv6::status_code_type DHCPv6::status_code() const {
-    const option *opt = safe_search_option<std::less>(
-        STATUS_CODE, sizeof(uint16_t)
-    );
-    status_code_type output;
-    output.code = Endian::be_to_host(*(const uint16_t*)opt->data_ptr());
-    output.message.assign(
-        opt->data_ptr() + sizeof(uint16_t),
-        opt->data_ptr() + opt->data_size()
-    );
-    return output;
+    return search_and_convert<status_code_type>(STATUS_CODE);
 }

 bool DHCPv6::has_rapid_commit() const {
@@ -279,60 +201,23 @@ bool DHCPv6::has_rapid_commit() const {
 }

 DHCPv6::user_class_type DHCPv6::user_class() const {
-    const option *opt = safe_search_option<std::less>(
-        USER_CLASS, sizeof(uint16_t)
-    );
-    return option2class_option_data<user_class_type>(
-        opt->data_ptr(), opt->data_size()
-    );
+    return search_and_convert<user_class_type>(USER_CLASS);
 }

 DHCPv6::vendor_class_type DHCPv6::vendor_class() const {
-    const option *opt = safe_search_option<std::less>(
-        VENDOR_CLASS, sizeof(uint32_t)
-    );
-    typedef vendor_class_type::class_data_type data_type;
-    vendor_class_type output;
-    output.enterprise_number = Endian::be_to_host(
-        *(const uint32_t*)opt->data_ptr()
-    );
-    output.vendor_class_data = option2class_option_data<data_type>(
-        opt->data_ptr() + sizeof(uint32_t),
-        opt->data_size() - sizeof(uint32_t)
-    );
-    
-    return output;
+    return search_and_convert<vendor_class_type>(VENDOR_CLASS);
 }

 DHCPv6::vendor_info_type DHCPv6::vendor_info() const {
-    const option *opt = safe_search_option<std::less>(
-        VENDOR_OPTS, sizeof(uint32_t)
-    );
-    vendor_info_type output;
-    output.enterprise_number = Endian::be_to_host(
-        *(const uint32_t*)opt->data_ptr()
-    );
-    output.data.assign(
-        opt->data_ptr() + sizeof(uint32_t),
-        opt->data_ptr() + opt->data_size()
-    );
-    return output;
+    return search_and_convert<vendor_info_type>(VENDOR_OPTS);
 }

 DHCPv6::interface_id_type DHCPv6::interface_id() const {
-    const option *opt = safe_search_option<std::equal_to>(
-        INTERFACE_ID, 0
-    );
-    return interface_id_type(
-        opt->data_ptr(),
-        opt->data_ptr() + opt->data_size()
-    );
+    return search_and_convert<interface_id_type>(INTERFACE_ID);
 }

 uint8_t DHCPv6::reconfigure_msg() const {
-    return *safe_search_option<std::not_equal_to>(
-        RECONF_MSG, 1
-    )->data_ptr();
+    return search_and_convert<uint8_t>(RECONF_MSG);
 }

 bool DHCPv6::has_reconfigure_accept() const {
@@ -340,29 +225,11 @@ bool DHCPv6::has_reconfigure_accept() const {
 }

 DHCPv6::duid_type DHCPv6::client_id() const {
-    const option *opt = safe_search_option<std::less>(
-        CLIENTID, sizeof(uint16_t) + 1
-    );
-    return duid_type(
-        Endian::be_to_host(*(const uint16_t*)opt->data_ptr()),
-        serialization_type(
-            opt->data_ptr() + sizeof(uint16_t),
-            opt->data_ptr() + opt->data_size()
-        )
-    );
+    return search_and_convert<duid_type>(CLIENTID);
 }

 DHCPv6::duid_type DHCPv6::server_id() const {
-    const option *opt = safe_search_option<std::less>(
-        SERVERID, sizeof(uint16_t) + 1
-    );
-    return duid_type(
-        Endian::be_to_host(*(const uint16_t*)opt->data_ptr()),
-        serialization_type(
-            opt->data_ptr() + sizeof(uint16_t),
-            opt->data_ptr() + opt->data_size()
-        )
-    );
+    return search_and_convert<duid_type>(SERVERID);
 }

 // ********************************************************************
@@ -492,10 +359,10 @@ void DHCPv6::rapid_commit() {
 }

 void DHCPv6::user_class(const user_class_type &value) {
-    typedef user_class_type::const_iterator iterator;
+    typedef user_class_type::data_type::const_iterator iterator;
    
    std::vector<uint8_t> buffer;
-    class_option_data2option(value.begin(), value.end(), buffer);
+    Internals::class_option_data2option(value.data.begin(), value.data.end(), buffer);
    add_option(
        option(USER_CLASS, buffer.begin(), buffer.end())
    );
@@ -506,7 +373,7 @@ void DHCPv6::vendor_class(const vendor_class_type &value) {
        sizeof(uint32_t)
    );
    *(uint32_t*)&buffer[0] = Endian::host_to_be(value.enterprise_number);
-    class_option_data2option(
+    Internals::class_option_data2option(
        value.vendor_class_data.begin(),
        value.vendor_class_data.end(),
        buffer,
@@ -650,4 +517,131 @@ void DHCPv6::server_id(const duid_type &value) {
    );
 }

+// Options
+
+DHCPv6::ia_na_type DHCPv6::ia_na_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint32_t) * 3)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + sizeof(uint32_t) * 3;
+    const uint32_t *ptr_32 = (const uint32_t*)opt.data_ptr();
+    DHCPv6::ia_na_type output;
+    output.id = Endian::be_to_host(*ptr_32++);
+    output.t1 = Endian::be_to_host(*ptr_32++);
+    output.t2 = Endian::be_to_host(*ptr_32++);
+    output.options.assign(ptr, opt.data_ptr() + opt.data_size());
+    return output;
+}
+
+DHCPv6::ia_ta_type DHCPv6::ia_ta_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint32_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + sizeof(uint32_t);
+    const uint32_t *ptr_32 = (const uint32_t*)opt.data_ptr();
+    DHCPv6::ia_ta_type output;
+    output.id = Endian::be_to_host(*ptr_32++);
+    output.options.assign(ptr, opt.data_ptr() + opt.data_size());
+    return output;
+}
+
+DHCPv6::ia_address_type DHCPv6::ia_address_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint32_t) * 2 + DHCPv6::ipaddress_type::address_size)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + sizeof(uint32_t) * 2 + ipaddress_type::address_size;
+    const uint32_t *ptr_32 = (const uint32_t*)(opt.data_ptr() + ipaddress_type::address_size);
+    DHCPv6::ia_address_type output;
+    output.address = opt.data_ptr();
+    output.preferred_lifetime = Endian::be_to_host(*ptr_32++);
+    output.valid_lifetime = Endian::be_to_host(*ptr_32++);
+    output.options.assign(ptr, opt.data_ptr() + opt.data_size());
+    return output;
+}
+
+DHCPv6::authentication_type DHCPv6::authentication_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint8_t) * 3 + sizeof(uint64_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    authentication_type output;
+    output.protocol = *ptr++;
+    output.algorithm = *ptr++;
+    output.rdm = *ptr++;
+    output.replay_detection = Endian::be_to_host(
+        *(const uint64_t*)ptr
+    );
+    ptr += sizeof(uint64_t);
+    output.auth_info.assign(ptr, opt.data_ptr() + opt.data_size());
+    return output;
+}
+
+DHCPv6::status_code_type DHCPv6::status_code_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint16_t))
+        throw malformed_option();
+    status_code_type output;
+    output.code = Endian::be_to_host(*(const uint16_t*)opt.data_ptr());
+    output.message.assign(
+        opt.data_ptr() + sizeof(uint16_t),
+        opt.data_ptr() + opt.data_size()
+    );
+    return output;
+}
+
+DHCPv6::vendor_info_type DHCPv6::vendor_info_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint32_t))
+        throw malformed_option();
+    vendor_info_type output;
+    output.enterprise_number = Endian::be_to_host(
+        *(const uint32_t*)opt.data_ptr()
+    );
+    output.data.assign(
+        opt.data_ptr() + sizeof(uint32_t),
+        opt.data_ptr() + opt.data_size()
+    );
+    return output;
+}
+
+DHCPv6::vendor_class_type DHCPv6::vendor_class_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint32_t))
+        throw malformed_option();
+    typedef vendor_class_type::class_data_type data_type;
+    vendor_class_type output;
+    output.enterprise_number = Endian::be_to_host(
+        *(const uint32_t*)opt.data_ptr()
+    );
+    output.vendor_class_data = Internals::option2class_option_data<data_type>(
+        opt.data_ptr() + sizeof(uint32_t),
+        opt.data_size() - sizeof(uint32_t)
+    );
+    
+    return output;
+}
+
+DHCPv6::duid_type DHCPv6::duid_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint16_t) + 1)
+        throw malformed_option();
+    return duid_type(
+        Endian::be_to_host(*(const uint16_t*)opt.data_ptr()),
+        serialization_type(
+            opt.data_ptr() + sizeof(uint16_t),
+            opt.data_ptr() + opt.data_size()
+        )
+    );
+}
+
+DHCPv6::user_class_type DHCPv6::user_class_type::from_option(const option &opt)
+{
+    if(opt.data_size() < sizeof(uint16_t))
+        throw malformed_option();
+    user_class_type output;
+    output.data = Internals::option2class_option_data<data_type>(
+        opt.data_ptr(), opt.data_size()
+    );
+    return output;
+}
 } // namespace Tins
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -32,6 +32,7 @@
 #include <cassert>
 #include <sstream>
 #include <memory>
+#include <cstdio>
 #include "dns.h"
 #include "ip_address.h"
 #include "ipv6_address.h"
@@ -43,60 +44,75 @@ using std::list;

 namespace Tins {

-DNS::DNS() : extra_size(0) {
+DNS::DNS() 
+: answers_idx(), authority_idx(), additional_idx()
+{ 
    std::memset(&dns, 0, sizeof(dns));
 }

-DNS::DNS(const uint8_t *buffer, uint32_t total_sz) : extra_size(0) {
+DNS::DNS(const uint8_t *buffer, uint32_t total_sz) 
+: answers_idx(), authority_idx(), additional_idx()
+{ 
    if(total_sz < sizeof(dnshdr))
        throw malformed_packet();
    std::memcpy(&dns, buffer, sizeof(dnshdr));
-    const uint8_t *end(buffer + total_sz);
-    uint16_t nquestions(questions_count());
-    buffer += sizeof(dnshdr);
-    total_sz -= sizeof(dnshdr);
+    records_data.assign(
+        buffer + sizeof(dnshdr),
+        buffer + total_sz
+    );
+    buffer = &records_data[0];
+    const uint8_t *end = &records_data[0] + records_data.size(), *prev_start = buffer;
+    uint16_t nquestions = questions_count();
    for(uint16_t i(0); i < nquestions; ++i) {
-        const uint8_t *ptr(buffer);
-        while(ptr < end && *ptr)
-            ptr++;
-        Query query;
-        if((ptr + (sizeof(uint16_t) * 2)) >= end)
+        buffer = find_dname_end(buffer);
+        if((buffer + (sizeof(uint16_t) * 2)) > end)
            throw malformed_packet();
-        query.dname(string(buffer, ptr));
-        ptr++;
-        const uint16_t *opt_ptr = reinterpret_cast<const uint16_t*>(ptr);
-        query.type((QueryType)*(opt_ptr++));
-        query.query_class((QueryClass)*(opt_ptr++));
-        queries_.push_back(query);
-        total_sz -= reinterpret_cast<const uint8_t*>(opt_ptr) - buffer;
-        extra_size += reinterpret_cast<const uint8_t*>(opt_ptr) - buffer;
-        buffer = reinterpret_cast<const uint8_t*>(opt_ptr);
+        buffer += sizeof(uint16_t) * 2;
    }
-    buffer = build_resource_list(ans, buffer, total_sz, answers_count());
-    buffer = build_resource_list(arity, buffer, total_sz, authority_count());
-    build_resource_list(addit, buffer, total_sz, additional_count());
-    if(total_sz)
-        inner_pdu(new RawPDU(buffer, total_sz));
+    answers_idx = buffer - prev_start;
+    authority_idx = find_section_end(&records_data[answers_idx], answers_count()) - &records_data[0];
+    additional_idx = find_section_end(&records_data[authority_idx], authority_count()) - &records_data[0];
 }

-const uint8_t *DNS::build_resource_list(ResourcesType &lst, const uint8_t *ptr, uint32_t &sz, uint16_t nrecs) {
-    const uint8_t *ptr_end(ptr + sz);
-    const uint8_t *parse_start(ptr);
-    for(uint16_t i(0); i < nrecs; ++i) {
-        const uint8_t *this_opt_start(ptr);
-        if(ptr + sizeof(uint16_t) > ptr_end)
-            throw malformed_packet();
-        lst.push_back(DNSResourceRecord(ptr, ptr_end - ptr));
-        ptr += lst.back().size();
-        extra_size += ptr - this_opt_start;
-        
+const uint8_t* DNS::find_dname_end(const uint8_t *ptr) const {
+    const uint8_t *end = &records_data[0] + records_data.size();
+    while(ptr < end) {
+        if(*ptr == 0) {
+            ++ptr;
+            break;
+        }
+        else {
+            if((*ptr & 0xc0)) {
+                ptr += sizeof(uint16_t);
+                break;
+            }
+            else {
+                uint8_t size = *ptr;
+                ptr += size + 1;
+            }
+        }
+    }
+    return ptr;
+}
+
+const uint8_t *DNS::find_section_end(const uint8_t *ptr, const uint32_t num_records) const {
+    const uint8_t *end = &records_data[0] + records_data.size();
+    for(uint32_t i = 0; i < num_records; ++i) {
+        ptr = find_dname_end(ptr);
+        if(ptr + sizeof(uint16_t) * 3 + sizeof(uint32_t) > end)
+            throw malformed_packet();
+        ptr += sizeof(uint16_t) * 2 + sizeof(uint32_t);
+        uint16_t data_size = Endian::be_to_host(*(uint16_t*)ptr); // Data size
+        ptr += sizeof(uint16_t);
+        if(ptr + data_size > end)
+            throw malformed_packet();
+        ptr += data_size;
    }
-    sz -= ptr - parse_start;
    return ptr;
 }

 uint32_t DNS::header_size() const {
-    return sizeof(dns) + extra_size;
+    return sizeof(dns) + records_data.size();
 }

 void DNS::id(uint16_t new_id) {
@@ -144,342 +160,372 @@ void DNS::rcode(uint8_t new_rcode) {
 }

 bool DNS::contains_dname(uint16_t type) {
-    type = Endian::be_to_host(type);
    return type == MX || type == CNAME ||
          type == PTR || type == NS;
 }

 void DNS::add_query(const Query &query) {
-    string new_str;
-    parse_domain_name(query.dname(), new_str);
-    
-    queries_.push_back(
-        Query(
-            new_str, 
-            (QueryType)Endian::host_to_be<uint16_t>(query.type()), 
-            (QueryClass)Endian::host_to_be<uint16_t>(query.query_class())
-        )
+    string new_str = encode_domain_name(query.dname());
+    // Type (2 bytes) + Class (2 Bytes)
+    new_str.insert(new_str.end(), sizeof(uint16_t) * 2, ' ');
+    *(uint16_t*)&new_str[new_str.size() - 4] = Endian::host_to_be<uint16_t>(query.type());
+    *(uint16_t*)&new_str[new_str.size() - 2] = Endian::host_to_be<uint16_t>(query.query_class());
+
+    uint32_t offset = new_str.size(), threshold = answers_idx;
+    update_records(answers_idx, answers_count(), threshold, offset);
+    update_records(authority_idx, authority_count(), threshold, offset);
+    update_records(additional_idx, additional_count(), threshold, offset);
+    records_data.insert(
+        records_data.begin() + threshold,
+        new_str.begin(),
+        new_str.end()
+    );
+    dns.questions = Endian::host_to_be<uint16_t>(
+        questions_count() + 1
    );
-    extra_size += new_str.size() + 1 + (sizeof(uint16_t) << 1);
-    dns.questions = Endian::host_to_be<uint16_t>(queries_.size());
 }

-void DNS::add_answer(const string &name, const DNSResourceRecord::info &info, 
-  address_type ip) 
-{
-    ans.push_back(make_record(name, info, Endian::host_to_be((uint32_t)ip)));
-    dns.answers = Endian::host_to_be<uint16_t>(ans.size());
+void DNS::add_answer(const Resource &resource) {
+    sections_type sections;
+    sections.push_back(std::make_pair(&authority_idx, authority_count()));
+    sections.push_back(std::make_pair(&additional_idx, additional_count()));
+    add_record(resource, sections);
+    dns.answers = Endian::host_to_be<uint16_t>(
+        answers_count() + 1
+    );
 }

-void DNS::add_answer(const string &name, const DNSResourceRecord::info &info, 
-  address_v6_type ip) 
-{
-    ans.push_back(make_record(name, info, ip.begin(), address_v6_type::address_size));
-    dns.answers = Endian::host_to_be<uint16_t>(ans.size());
-}
-
-void DNS::add_answer(const std::string &name, const DNSResourceRecord::info &info, 
-  const std::string &dname) 
-{
-    string new_str;
-    parse_domain_name(dname, new_str);
-    DNSResourceRecord res = make_record(name, info, new_str);
-    ans.push_back(res);
-    dns.answers = Endian::host_to_be<uint16_t>(ans.size());
-}
-
-void DNS::add_answer(const std::string &name, const DNSResourceRecord::info &info, 
-  const uint8_t *data, uint32_t sz) 
-{
-    ans.push_back(make_record(name, info, data, sz));
-    dns.answers = Endian::host_to_be<uint16_t>(ans.size());
-}
-
-void DNS::add_authority(const string &name, const DNSResourceRecord::info &info, 
-  const uint8_t *data, uint32_t sz) 
-{
-    arity.push_back(make_record(name, info, data, sz));
-    dns.authority = Endian::host_to_be<uint16_t>(arity.size());
-}
-
-void DNS::add_additional(const string &name, const DNSResourceRecord::info &info, 
-uint32_t ip) 
-{
-    addit.push_back(make_record(name, info, ip));
-    dns.additional = Endian::host_to_be<uint16_t>(addit.size());
-}
-
-DNSResourceRecord DNS::make_record(const std::string &name, const DNSResourceRecord::info &info, uint32_t ip) {
-    ip = Endian::host_to_be(ip);
-    return make_record(name, info, reinterpret_cast<uint8_t*>(&ip), sizeof(ip));
-}
-
-DNSResourceRecord DNS::make_record(const std::string &name, 
-  const DNSResourceRecord::info &info, const std::string &dname) 
-{
-    return make_record(name, info, reinterpret_cast<const uint8_t*>(dname.c_str()), dname.size() + 1);
-}
-
-DNSResourceRecord DNS::make_record(const std::string &name, 
-  const DNSResourceRecord::info &info, const uint8_t *ptr, uint32_t len) 
-{
-    string nm;
-    parse_domain_name(name, nm);
-    uint16_t index = find_domain_name(nm);
-    DNSResourceRecord res;
-    if(index)
-        res = make_offseted_record(Endian::host_to_be(index), ptr, len);
-    else
-        res = make_named_record(nm, ptr, len);
-    res.information().type = Endian::host_to_be<uint16_t>(info.type);
-    res.information().qclass = Endian::host_to_be<uint16_t>(info.qclass);
-    res.information().ttl = Endian::host_to_be(info.ttl);
-    extra_size += res.size();
-    return res;
-}
-
-uint32_t DNS::find_domain_name(const std::string &dname) {
-    uint16_t index(sizeof(dnshdr));
-    list<Query>::const_iterator it(queries_.begin());
-    for(; it != queries_.end() && it->dname() != dname; ++it)
-        index += it->dname().size() + 1 + (sizeof(uint16_t) << 1);
-    if(it != queries_.end() ||
-       find_domain_name(dname, ans, index) || 
-       find_domain_name(dname, arity, index) || 
-       find_domain_name(dname, addit, index))
-        return index;
-    else
-        return 0;
-}
-
-bool DNS::find_domain_name(const std::string &dname, const ResourcesType &lst, uint16_t &out) {
-    ResourcesType::const_iterator it(lst.begin());
-    while(it != lst.end()) {
-        if(it->matches(dname))
-            break;
-        out += it->size();
-        ++it;
+void DNS::add_record(const Resource &resource, const sections_type &sections) {
+    // We need to check that the data provided is correct. Otherwise, the sections
+    // will end up being inconsistent.
+    IPv4Address v4_addr;
+    IPv6Address v6_addr;
+    std::string buffer = encode_domain_name(resource.dname()), encoded_data;
+    // By default the data size is the length of the data field.
+    uint32_t data_size = resource.data().size();
+    if(resource.type() == A) {
+        v4_addr = resource.data();
+        data_size = 4;
+    }
+    else if(resource.type() == AAAA) {
+        v6_addr = resource.data();
+        data_size = IPv6Address::address_size;
+    }
+    else if(contains_dname(resource.type())) { 
+        encoded_data = encode_domain_name(resource.data());
+        data_size = encoded_data.size();
+    }
+    uint32_t offset = buffer.size() + sizeof(uint16_t) * 3 + sizeof(uint32_t) + data_size, 
+            threshold = sections.empty() ? records_data.size() : *sections.front().first;
+    // Skip the preference field
+    if(resource.type() == MX) {
+        offset += sizeof(uint16_t);
+    }
+    for(size_t i = 0; i < sections.size(); ++i) {
+        update_records(*sections[i].first, sections[i].second, threshold, offset);
+    }
+    
+    records_data.insert(
+        records_data.begin() + threshold,
+        offset,
+        0
+    );
+    uint8_t *ptr = std::copy(
+        buffer.begin(),
+        buffer.end(),
+        &records_data[threshold]
+    );
+    *(uint16_t*)ptr = Endian::host_to_be(resource.type());
+    ptr += sizeof(uint16_t);
+    *(uint16_t*)ptr = Endian::host_to_be(resource.query_class());
+    ptr += sizeof(uint16_t);
+    *(uint32_t*)ptr = Endian::host_to_be(resource.ttl());
+    ptr += sizeof(uint32_t);
+    *(uint16_t*)ptr = Endian::host_to_be<uint16_t>(
+        data_size + (resource.type() == MX ? 2 : 0)
+    );
+    ptr += sizeof(uint16_t);
+    if(resource.type() == MX) {
+        ptr += sizeof(uint16_t);
+    }
+    if(resource.type() == A) {
+        uint32_t ip_int = v4_addr;
+        std::memcpy(ptr, &ip_int, sizeof(ip_int));
+    }
+    else if(resource.type() == AAAA) {
+        std::copy(v6_addr.begin(), v6_addr.end(), ptr);
+    }
+    else if(!encoded_data.empty()) {
+        std::copy(encoded_data.begin(), encoded_data.end(), ptr);
+    }
+    else {
+        std::copy(resource.data().begin(), resource.data().end(), ptr);
    }
-    return it != lst.end();
 }

-void DNS::parse_domain_name(const std::string &dn, std::string &out) const {
+void DNS::add_authority(const Resource &resource) {
+    sections_type sections;
+    sections.push_back(std::make_pair(&additional_idx, additional_count()));
+    add_record(resource, sections);
+    dns.authority = Endian::host_to_be<uint16_t>(
+        authority_count() + 1
+    );
+}
+
+void DNS::add_additional(const Resource &resource){
+    add_record(resource, sections_type());
+    dns.additional = Endian::host_to_be<uint16_t>(
+        additional_count() + 1
+    );
+}
+
+std::string DNS::encode_domain_name(const std::string &dn) {
+    std::string output;
    size_t last_index(0), index;
    while((index = dn.find('.', last_index+1)) != string::npos) {
-        out.push_back(index - last_index);
-        out.append(dn.begin() + last_index, dn.begin() + index);
+        output.push_back(index - last_index);
+        output.append(dn.begin() + last_index, dn.begin() + index);
        last_index = index + 1; //skip dot
    }
-    out.push_back(dn.size() - last_index);
-    out.append(dn.begin() + last_index, dn.end());
+    output.push_back(dn.size() - last_index);
+    output.append(dn.begin() + last_index, dn.end());
+    output.push_back('\0');
+    return output;
 }

-void DNS::unparse_domain_name(const std::string &dn, std::string &out) const {
-    if(dn.size()) {
-        uint32_t index(1), len(dn[0]);
-        while(index + len < dn.size() && len) {
-            if(index != 1)
-                out.push_back('.');
-            out.append(dn.begin() + index, dn.begin() + index + len);
-            index += len;
-            if(index < dn.size() - 1)
-                len = dn[index];
-            index++;
+// The output buffer should be at least 256 bytes long. This used to use
+// a std::string but it worked about 50% slower, so this is somehow 
+// unsafe but a lot faster.
+const uint8_t* DNS::compose_name(const uint8_t *ptr, char *out_ptr) const {
+    const uint8_t *end = &records_data[0] + records_data.size();
+    const uint8_t *end_ptr = 0;
+    char *current_out_ptr = out_ptr;
+    while(*ptr) {
+        // It's an offset
+        if((*ptr & 0xc0)) {
+            if(ptr + sizeof(uint16_t) > end)
+                throw malformed_packet();
+            uint16_t index = Endian::be_to_host(*(uint16_t*)ptr) & 0x3fff;
+            // Check that the offset is neither too low or too high
+            if(index < 0x0c || &records_data[index - 0x0c] >= ptr)
+                throw malformed_packet();
+            // We've probably found the end of the original domain name. Save it.
+            if(end_ptr == 0)
+                end_ptr = ptr + sizeof(uint16_t);
+            // Now this is our pointer
+            ptr = &records_data[index - 0x0c];
        }
-        if(index < dn.size()) {
-            out.push_back('.');
-            out.append(dn.begin() + index, dn.end());
+        else {
+            // It's a label, grab its size.
+            uint8_t size = *ptr;
+            ptr++;
+            if(ptr + size > end || current_out_ptr - out_ptr + size + 1 > 255)
+                throw malformed_packet();
+            // Append a dot if it's not the first one.
+            if(current_out_ptr != out_ptr)
+                *current_out_ptr++ = '.';
+            std::copy(
+                ptr,
+                ptr + size,
+                current_out_ptr
+            );
+            current_out_ptr += size;
+            ptr += size;
        }
    }
+    // Add the null terminator.
+    *current_out_ptr = 0;
+    return end_ptr ? end_ptr : (ptr + 1);
 }

 void DNS::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent) {
    #ifdef TINS_DEBUG
-    assert(total_sz >= sizeof(dns) + extra_size);
+    assert(total_sz >= sizeof(dns) + records_data.size());//extra_size);
    #endif
    std::memcpy(buffer, &dns, sizeof(dns)); 
    buffer += sizeof(dns);
-    for(list<Query>::const_iterator it(queries_.begin()); it != queries_.end(); ++it) {
-        std::copy(it->dname().begin(), it->dname().end(), buffer);
-        buffer += it->dname().size();
-        *buffer++ = 0;
-        *((uint16_t*)buffer) = it->type();
-        buffer += sizeof(uint16_t);
-        *((uint16_t*)buffer) = it->query_class();
-        buffer += sizeof(uint16_t);
-    }
-    buffer = serialize_list(ans, buffer);
-    buffer = serialize_list(arity, buffer);
-    buffer = serialize_list(addit, buffer);
+    std::copy(records_data.begin(), records_data.end(), buffer);
 }

-uint8_t *DNS::serialize_list(const ResourcesType &lst, uint8_t *buffer) const {
-    for(ResourcesType::const_iterator it(lst.begin()); it != lst.end(); ++it)
-        buffer += it->write(buffer);
-    return buffer;
+// Optimization. Creating an IPv4Address and then using IPv4Address::to_string
+// was quite slow. The output buffer should be able to hold an IPv4 address.
+void DNS::inline_convert_v4(uint32_t value, char *output) {
+    output += sprintf(
+        output, 
+        "%d.%d.%d.%d", 
+        value & 0xff, 
+        (value >> 8) & 0xff,
+        (value >> 16) & 0xff,
+        (value >> 24) & 0xff
+    );
+    *output = 0;
 }

-void DNS::add_suffix(uint32_t index, const uint8_t *data, uint32_t sz) const {
-    uint32_t i(0), suff_sz(data[0]);
-    SuffixMap::iterator it;
-    while((i + suff_sz + 1 <= sz || (suff_sz == 0xc0 && i + 1 < sz)) && suff_sz) {
-        if((suff_sz & 0xc0)) {
-            if((it = suffixes.find(data[i+1])) != suffixes.end())
-                suffix_indices[index + i] = data[i+1];
-            i += sizeof(uint16_t);
-        }
-        else {
-            ++i;
-            suffixes.insert(std::make_pair(index + i - 1, string(data + i, data + i + suff_sz)));
-            i += suff_sz;
-        }        
-        if(i < sz)
-            suff_sz = data[i];
-    }
-}
-
-uint32_t DNS::build_suffix_map(uint32_t index, const ResourcesType &lst) const {
-    const string *str;
-    for(ResourcesType::const_iterator it(lst.begin()); it != lst.end(); ++it) {
-        str = it->has_domain_name() ? it->dname() : 0;
-        if(str) {
-            add_suffix(index, (uint8_t*)str->c_str(), str->size());
-            index += str->size() + 1;
-        }
-        else
-            index += sizeof(uint16_t);
-        index += sizeof(DNSResourceRecord::info) + sizeof(uint16_t);
-        uint32_t sz(it->data_size());
-        const uint8_t *ptr = it->data_ptr();
-        if(Endian::be_to_host(it->information().type) == MX) {
-            ptr += 2;
-            sz -= 2;
-            index += 2;
-        }
-        if(contains_dname(it->information().type))
-            add_suffix(index, ptr, sz);
-        index += sz;
-    }
-    return index;
-}
-
-uint32_t DNS::build_suffix_map(uint32_t index, const list<Query> &lst) const {
-    for(list<Query>::const_iterator it(lst.begin()); it != lst.end(); ++it) {
-        add_suffix(index, (uint8_t*)it->dname().c_str(), it->dname().size());
-        index += it->dname().size() + 1 + (sizeof(uint16_t) << 1);
-    }
-    return index;
-}
-
-void DNS::build_suffix_map() const {
-    uint32_t index(sizeof(dnshdr));
-    index = build_suffix_map(index, queries_);
-    index = build_suffix_map(index, ans);
-    index = build_suffix_map(index, arity);
-    build_suffix_map(index, addit);
-}
-
-void DNS::compose_name(const uint8_t *ptr, uint32_t sz, std::string &out) const {
-    uint32_t i(0);
-    while(i < sz) {
-        if(i && ptr[i])
-            out.push_back('.');
-        if((ptr[i] & 0xc0)) {
-            uint16_t index = Endian::be_to_host(*((uint16_t*)(ptr + i)));
-            index &= 0x3fff;
-            SuffixMap::iterator it(suffixes.find(index));
-            SuffixIndices::iterator suff_it(suffix_indices.find(index));
-            // We need at least a suffix or a suffix index to compose 
-            // the domain name
-            if(it == suffixes.end() && suff_it == suffix_indices.end())
+// Parses records in some section.
+void DNS::convert_records(const uint8_t *ptr, const uint8_t *end, resources_type &res) const {
+    char dname[256], small_addr_buf[256];
+    while(ptr < end) {
+        std::string addr;
+        bool used_small_buffer = false;
+        // Retrieve the record's domain name.
+        ptr = compose_name(ptr, dname);
+        // 3 uint16_t fields: Type + Class + Data size
+        // 1 uint32_t field: TTL
+        if(ptr + sizeof(uint16_t) * 3 + sizeof(uint32_t) > end)
+            throw malformed_packet();
+        // Retrieve the following fields.
+        uint16_t type, qclass, data_size;
+        uint32_t ttl;
+        type = Endian::be_to_host(*(uint16_t*)ptr); // Type
+        ptr += sizeof(uint16_t);
+        qclass = Endian::be_to_host(*(uint16_t*)ptr); // Class
+        ptr += sizeof(uint16_t);
+        ttl = Endian::be_to_host(*(uint32_t*)ptr); // TTL
+        ptr += sizeof(uint32_t);
+        data_size = Endian::be_to_host(*(uint16_t*)ptr); // Data size
+        ptr += sizeof(uint16_t);
+        // Skip the preference field if it's MX
+        if(type ==  MX) {
+            if(data_size < 2)
                throw malformed_packet();
-            bool first(true);
-            do {
-                if(it != suffixes.end()) {
-                    if(!first)
-                        out.push_back('.');
-                    first = false;
-                    out += it->second;
-                    index += it->second.size() + 1;
+            ptr += 2;
+            data_size -= 2;
+        }
+        if(ptr + data_size > end)
+            throw malformed_packet();
+        switch(type) {
+            case AAAA:
+                if(data_size != 16)
+                    throw malformed_packet();
+                addr = IPv6Address(ptr).to_string();
+                break;
+            case A:
+                if(data_size != 4)
+                    throw malformed_packet();
+                inline_convert_v4(*(uint32_t*)ptr, small_addr_buf);
+                used_small_buffer = true;
+                break;
+            case NS:
+            case CNAME:
+            case DNAM:
+            case PTR:
+            case MX:
+                compose_name(ptr, small_addr_buf);
+                used_small_buffer = true;
+                break;
+            default:
+                if(data_size <= 256) {
+                    std::copy(
+                        ptr,
+                        ptr + data_size,
+                        small_addr_buf
+                    );
+                    used_small_buffer = true;
                }
                else
-                    index = suff_it->second;
-                it = suffixes.find(index);
-                if(it == suffixes.end())
-                    suff_it = suffix_indices.find(index);
-                
-            } while(it != suffixes.end() || suff_it != suffix_indices.end());
-            break;
-        }
-        else {
-            uint8_t suff_sz(ptr[i]);
-            i++;
-            if(i + suff_sz <= sz)
-                out.append(ptr + i, ptr + i + suff_sz);
-            i += suff_sz;
-        }
-    }
-}
-
-void DNS::convert_resources(const ResourcesType &lst, std::list<Resource> &res) const {
-    if(!suffixes.size())
-        build_suffix_map();
-    const string *str_ptr;
-    const uint8_t *ptr;
-    uint32_t sz;
-    for(ResourcesType::const_iterator it(lst.begin()); it != lst.end(); ++it) {
-        string dname, addr;
-        if(it->has_domain_name() && (str_ptr = it->dname())) 
-            compose_name(reinterpret_cast<const uint8_t*>(str_ptr->c_str()), str_ptr->size(), dname);
-        else {
-            uint16_t offset = it->offset();
-            compose_name((uint8_t*)&offset, 2, dname);
-        }
-        ptr = it->data_ptr();
-        sz = it->data_size();
-        if(sz == 4)
-            addr = IPv4Address(*(uint32_t*)ptr).to_string();
-        else {
-            if(Endian::be_to_host(it->information().type) ==  MX) {
-                ptr += 2;
-                sz -= 2;
-            }
-            if(Endian::be_to_host(it->information().type) == DNS::AAAA) {
-                if(sz != 16)
-                    throw std::runtime_error("Malformed IPv6 address");
-                addr = IPv6Address(ptr).to_string();
-            }
-            else
-                compose_name(ptr, sz, addr);
+                    addr.assign(ptr, ptr + data_size);
+                break;
        }
+        ptr += data_size;
        res.push_back(
-            Resource(dname, addr, Endian::be_to_host(it->information().type), 
-              Endian::host_to_be(it->information().qclass), 
-              Endian::be_to_host(it->information().ttl)
+            Resource(
+                dname, 
+                (used_small_buffer) ? small_addr_buf : addr, 
+                type, 
+                qclass, 
+                ttl
            )
        );
    }
 }

+// no length checks, records should already be valid
+uint8_t *DNS::update_dname(uint8_t *ptr, uint32_t threshold, uint32_t offset) {
+    while(*ptr != 0) {
+        if((*ptr & 0xc0)) {
+            uint16_t index = Endian::be_to_host(*(uint16_t*)ptr) & 0x3fff;
+            if(index > threshold) {
+                *(uint16_t*)ptr = Endian::host_to_be<uint16_t>((index + offset) | 0xc000);
+            }
+            ptr += sizeof(uint16_t);
+            break;
+        }
+        else {
+            ptr += *ptr + 1;
+        }
+    }
+    return ptr;
+}
+
+// Updates offsets in domain names inside records.
+// No length checks, records are already valid.
+void DNS::update_records(uint32_t &section_start, uint32_t num_records, uint32_t threshold, uint32_t offset) {
+    uint8_t *ptr = &records_data[section_start];
+    for(uint32_t i = 0; i < num_records; ++i) {
+        ptr = update_dname(ptr, threshold, offset);
+        uint16_t type = Endian::be_to_host(*(const uint16_t*)ptr);
+        ptr += sizeof(uint16_t) * 2 + sizeof(uint32_t);
+        uint16_t size = Endian::be_to_host(*(uint16_t*)ptr);
+        ptr += sizeof(uint16_t);
+        if(type == MX) {
+            ptr += sizeof(uint16_t);
+            size -= sizeof(uint16_t);
+        }
+        if(contains_dname(type)) {
+            update_dname(ptr, threshold, offset);
+        }
+        ptr += size;
+    }
+    section_start += offset;
+}
+
 DNS::queries_type DNS::queries() const { 
    queries_type output;
-    for(std::list<Query>::const_iterator it(queries_.begin()); it != queries_.end(); ++it) {
-        string dn;
-        unparse_domain_name(it->dname(), dn);
+    const uint8_t *ptr = &records_data[0], *end = &records_data[answers_idx];
+    char buffer[256];
+    while(ptr < end) {
+        ptr = compose_name(ptr, buffer);
+        if(ptr + sizeof(uint16_t) * 2 > end) 
+            throw malformed_packet();
        output.push_back(
            Query(
-                dn, 
-                (QueryType)Endian::be_to_host<uint16_t>(it->type()), 
-                (QueryClass)Endian::be_to_host<uint16_t>(it->query_class())
+                buffer, 
+                (QueryType)Endian::be_to_host(*(const uint16_t*)ptr), 
+                (QueryClass)Endian::be_to_host(*(const uint16_t*)(ptr + 2))
            )
        );
+        ptr += sizeof(uint16_t) * 2;
    }
    return output;
 }

 DNS::resources_type DNS::answers() const {
    resources_type res;
-    convert_resources(ans, res);
+    convert_records(
+        &records_data[answers_idx], 
+        &records_data[authority_idx], 
+        res
+    );
+    return res;
+}
+
+DNS::resources_type DNS::authority() const {
+    resources_type res;
+    convert_records(
+        &records_data[authority_idx], 
+        &records_data[additional_idx], 
+        res
+    );
+    return res;
+}
+
+DNS::resources_type DNS::additional() const {
+    resources_type res;
+    convert_records(
+        &records_data[additional_idx], 
+        &records_data[records_data.size()], 
+        res
+    );
    return res;
 }

--- a/src/dns_record.cpp
+++ b/src/dns_record.cpp
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2012, 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 <cstring>
-#include <stdexcept>
-#include <memory>
-#include <typeinfo>
-#include "dns_record.h"
-#include "endianness.h"
-#include "exceptions.h"
-
-namespace Tins {
-bool contains_dname(uint16_t type) {
-    type = Endian::be_to_host(type);
-    return type == 1 || type == 2 || 
-            type == 5 ||  type == 6 || 
-            type == 12 || type == 15 || 
-            type == 28 || type == 41;
-}
-    
-DNSResourceRecord::DNSResourceRecord(DNSRRImpl *impl, 
-  const uint8_t *d, uint16_t len) : impl(impl)
-{
-    if(d && len)
-        data.assign(d, d + len);
-}
-
-DNSResourceRecord::DNSResourceRecord(const uint8_t *buffer, uint32_t size) 
-{
-    const uint8_t *buffer_end = buffer + size;
-    Internals::smart_ptr<DNSRRImpl>::type tmp_impl;
-    if((*buffer & 0xc0)) {
-        uint16_t offset(*reinterpret_cast<const uint16_t*>(buffer));
-        offset = Endian::be_to_host(offset) & 0x3fff;
-        tmp_impl.reset(new OffsetedDNSRRImpl(Endian::host_to_be(offset)));
-        buffer += sizeof(uint16_t);
-    }
-    else {
-        const uint8_t *str_end(buffer);
-        while(str_end < buffer_end && *str_end)
-            str_end++;
-        if(str_end == buffer_end)
-            throw malformed_packet();
-        //str_end++;
-        tmp_impl.reset(new NamedDNSRRImpl(buffer, str_end));
-        buffer = ++str_end;
-    }
-    if(buffer + sizeof(info_) > buffer_end)
-        throw malformed_packet();
-    std::memcpy(&info_, buffer, sizeof(info_));
-    buffer += sizeof(info_);
-    if(buffer + sizeof(uint16_t) > buffer_end)
-        throw malformed_packet();
-
-    // Store the option size.
-    data.resize(
-        Endian::be_to_host(*reinterpret_cast<const uint16_t*>(buffer))
-    );
-    buffer += sizeof(uint16_t);
-    if(buffer + data.size() > buffer_end)
-        throw malformed_packet();
-    if(contains_dname(info_.type) || data.size() != sizeof(uint32_t))
-        std::copy(buffer, buffer + data.size(), data.begin());
-    else if(data.size() == sizeof(uint32_t))
-        *(uint32_t*)&data[0] = *(uint32_t*)buffer;
-    impl = tmp_impl.release();
-}
-
-DNSResourceRecord::DNSResourceRecord(const DNSResourceRecord &rhs) 
-: info_(rhs.info_), data(rhs.data), impl(rhs.clone_impl()) 
-{
-    
-}
-
-DNSResourceRecord& DNSResourceRecord::operator=(const DNSResourceRecord &rhs) 
-{
-    delete impl;
-    info_ = rhs.info_;
-    data = rhs.data;
-    impl = rhs.clone_impl();
-    return *this;
-}
-
-DNSResourceRecord::~DNSResourceRecord() {
-    delete impl;
-}
-
-uint32_t DNSResourceRecord::write(uint8_t *buffer) const {
-    const uint32_t sz(impl ? impl->do_write(buffer) : 0);
-    buffer += sz;
-    std::memcpy(buffer, &info_, sizeof(info_));
-    buffer += sizeof(info_);
-    *((uint16_t*)buffer) = Endian::host_to_be<uint16_t>(data.size());
-    buffer += sizeof(uint16_t);
-    std::copy(data.begin(), data.end(), buffer);
-    return sz + sizeof(info_) + sizeof(uint16_t) + data.size();
-}
-
-DNSRRImpl *DNSResourceRecord::clone_impl() const {
-    return impl ? impl->clone() : 0;
-}
-
-bool DNSResourceRecord::has_domain_name() const {
-    if(!impl)
-        throw std::bad_cast();
-    return dynamic_cast<NamedDNSRRImpl*>(impl) != 0;
-}
-
-const std::string *DNSResourceRecord::dname() const {
-    if(!impl)
-        throw std::bad_cast();
-    return dynamic_cast<NamedDNSRRImpl&>(*impl).dname_pointer();
-}
-
-uint16_t DNSResourceRecord::offset() const {
-    return dynamic_cast<OffsetedDNSRRImpl&>(*impl).offset();
-}
-
-size_t DNSResourceRecord::impl_size() const {
-    return impl ? impl->size() : 0;
-}
-
-uint32_t DNSResourceRecord::size() const {
-    return sizeof(info_) + data.size() + sizeof(uint16_t) + impl_size(); 
-}
-
-bool DNSResourceRecord::matches(const std::string &dname) const {
-    return impl ? impl->matches(dname) : false;
-}
-
-// OffsetedRecord
-
-OffsetedDNSRRImpl::OffsetedDNSRRImpl(uint16_t off) 
-: offset_(off | Endian::host_to_be<uint16_t>(0xc000)) 
-{
-    
-}
-
-uint32_t OffsetedDNSRRImpl::do_write(uint8_t *buffer) const {
-    std::memcpy(buffer, &offset_, sizeof(offset_));
-    return sizeof(offset_);
-}
-
-uint32_t OffsetedDNSRRImpl::size() const { 
-    return sizeof(offset_); 
-}
-
-OffsetedDNSRRImpl *OffsetedDNSRRImpl::clone() const {
-    return new OffsetedDNSRRImpl(*this);
-}
-
-uint16_t OffsetedDNSRRImpl::offset() const {
-    return offset_;
-}
-
-// NamedRecord
-
-NamedDNSRRImpl::NamedDNSRRImpl(const std::string &nm) 
-: name(nm) 
-{
-    
-}
-
-uint32_t NamedDNSRRImpl::size() const { 
-    return name.size() + 1; 
-}
-
-uint32_t NamedDNSRRImpl::do_write(uint8_t *buffer) const {
-    buffer = std::copy(name.begin(), name.end(), buffer);
-    *buffer = 0;
-    return name.size() + 1;
-}
-
-const std::string *NamedDNSRRImpl::dname_pointer() const {
-    return &name;
-}
-
-bool NamedDNSRRImpl::matches(const std::string &dname) const { 
-    return dname == name; 
-}
-
-NamedDNSRRImpl *NamedDNSRRImpl::clone() const {
-    return new NamedDNSRRImpl(*this);
-}
-
-}
--- a/src/dot11.cpp
+++ b/src/dot11.cpp
--- a/src/dot11/dot11_assoc.cpp
+++ b/src/dot11/dot11_assoc.cpp
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2012, 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 "dot11/dot11_assoc.h"
+#ifdef HAVE_DOT11
+
+#include <cassert>
+#include <cstring>
+
+namespace Tins {
+/* Diassoc */
+
+Dot11Disassoc::Dot11Disassoc(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr)
+{
+    this->subtype(Dot11::DISASSOC);
+    memset(&_body, 0, sizeof(_body));
+}
+
+Dot11Disassoc::Dot11Disassoc(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) {
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11Disassoc::reason_code(uint16_t new_reason_code) {
+    this->_body.reason_code = Endian::host_to_le(new_reason_code);
+}
+
+uint32_t Dot11Disassoc::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(DisassocBody);
+}
+
+uint32_t Dot11Disassoc::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(DisassocBody);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+
+/* Assoc request. */
+
+Dot11AssocRequest::Dot11AssocRequest(const address_type &dst_hw_addr, 
+const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr)
+{
+    subtype(Dot11::ASSOC_REQ);
+    memset(&_body, 0, sizeof(_body));
+}
+
+Dot11AssocRequest::Dot11AssocRequest(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) 
+{
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11AssocRequest::listen_interval(uint16_t new_listen_interval) {
+    this->_body.listen_interval = Endian::host_to_le(new_listen_interval);
+}
+
+uint32_t Dot11AssocRequest::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(AssocReqBody);
+}
+
+uint32_t Dot11AssocRequest::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(AssocReqBody);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+
+/* Assoc response. */
+
+Dot11AssocResponse::Dot11AssocResponse(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr) 
+{
+    subtype(Dot11::ASSOC_RESP);
+    memset(&_body, 0, sizeof(_body));
+}
+
+Dot11AssocResponse::Dot11AssocResponse(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) 
+{
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11AssocResponse::status_code(uint16_t new_status_code) {
+    this->_body.status_code = Endian::host_to_le(new_status_code);
+}
+
+void Dot11AssocResponse::aid(uint16_t new_aid) {
+    this->_body.aid = Endian::host_to_le(new_aid);
+}
+
+uint32_t Dot11AssocResponse::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(AssocRespBody);
+}
+
+uint32_t Dot11AssocResponse::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(AssocRespBody);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+
+/* ReAssoc request. */
+
+Dot11ReAssocRequest::Dot11ReAssocRequest(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr)
+{
+    this->subtype(Dot11::REASSOC_REQ);
+    memset(&_body, 0, sizeof(_body));
+}
+
+Dot11ReAssocRequest::Dot11ReAssocRequest(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) 
+{
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11ReAssocRequest::listen_interval(uint16_t new_listen_interval) {
+    this->_body.listen_interval = Endian::host_to_le(new_listen_interval);
+}
+
+void Dot11ReAssocRequest::current_ap(const address_type &new_current_ap) {
+    new_current_ap.copy(_body.current_ap);
+}
+
+uint32_t Dot11ReAssocRequest::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(this->_body);
+}
+
+uint32_t Dot11ReAssocRequest::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(this->_body);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+
+/* ReAssoc response. */
+
+Dot11ReAssocResponse::Dot11ReAssocResponse(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr)
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr) 
+{
+    this->subtype(Dot11::REASSOC_RESP);
+    memset(&_body, 0, sizeof(_body));
+}
+
+Dot11ReAssocResponse::Dot11ReAssocResponse(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) {
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11ReAssocResponse::status_code(uint16_t new_status_code) {
+    this->_body.status_code = Endian::host_to_le(new_status_code);
+}
+
+void Dot11ReAssocResponse::aid(uint16_t new_aid) {
+    this->_body.aid = Endian::host_to_le(new_aid);
+}
+
+uint32_t Dot11ReAssocResponse::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(this->_body);
+}
+
+uint32_t Dot11ReAssocResponse::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(this->_body);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dot11/dot11_auth.cpp
+++ b/src/dot11/dot11_auth.cpp
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2012, 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 "dot11/dot11_auth.h"
+#ifdef HAVE_DOT11
+
+#include <cassert>
+#include <cstring>
+
+namespace Tins {
+/* Auth */
+
+Dot11Authentication::Dot11Authentication(const address_type &dst_hw_addr, 
+const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr) 
+{
+    this->subtype(Dot11::AUTH);
+    memset(&_body, 0, sizeof(_body));
+}
+
+Dot11Authentication::Dot11Authentication(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) 
+{
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11Authentication::auth_algorithm(uint16_t new_auth_algorithm) {
+    this->_body.auth_algorithm = Endian::host_to_le(new_auth_algorithm);
+}
+
+void Dot11Authentication::auth_seq_number(uint16_t new_auth_seq_number) {
+    this->_body.auth_seq_number = Endian::host_to_le(new_auth_seq_number);
+}
+
+void Dot11Authentication::status_code(uint16_t new_status_code) {
+    this->_body.status_code = Endian::host_to_le(new_status_code);
+}
+
+uint32_t Dot11Authentication::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(_body);
+}
+
+uint32_t Dot11Authentication::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(this->_body);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+
+/* Deauth */
+
+Dot11Deauthentication::Dot11Deauthentication(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr)
+{
+    this->subtype(Dot11::DEAUTH);
+    memset(&_body, 0, sizeof(_body));
+}
+
+Dot11Deauthentication::Dot11Deauthentication(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) {
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11Deauthentication::reason_code(uint16_t new_reason_code) {
+    this->_body.reason_code = Endian::host_to_le(new_reason_code);
+}
+
+uint32_t Dot11Deauthentication::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(this->_body);
+}
+
+uint32_t Dot11Deauthentication::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(this->_body);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dot11/dot11_base.cpp
+++ b/src/dot11/dot11_base.cpp
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2012, 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 "dot11/dot11_base.h"
+
+#ifdef HAVE_DOT11
+
+#include <cassert>
+#include <cstring>
+#include <stdexcept>
+#include <algorithm>
+#include <utility>
+#include "macros.h"
+#include "exceptions.h"
+
+#ifndef WIN32
+    #if defined(__FreeBSD_kernel__) || defined(BSD) || defined(__APPLE__)
+        #include <sys/types.h>
+        #include <net/if_dl.h>
+    #else
+        #include <netpacket/packet.h>
+    #endif
+    #include <net/ethernet.h>
+    #include <netinet/in.h>
+#endif
+#include "dot11.h"
+#include "rawpdu.h"
+#include "rsn_information.h"
+#include "packet_sender.h"
+#include "snap.h"
+
+namespace Tins {
+const Dot11::address_type Dot11::BROADCAST = "ff:ff:ff:ff:ff:ff";
+
+Dot11::Dot11(const address_type &dst_hw_addr) 
+: _options_size(0)
+{
+    memset(&_header, 0, sizeof(ieee80211_header));
+    addr1(dst_hw_addr);
+}
+
+Dot11::Dot11(const ieee80211_header *header_ptr) 
+{
+
+}
+
+Dot11::Dot11(const uint8_t *buffer, uint32_t total_sz) 
+: _options_size(0) 
+{
+    if(total_sz < sizeof(_header))
+        throw malformed_packet();
+    std::memcpy(&_header, buffer, sizeof(_header));
+}
+
+void Dot11::parse_tagged_parameters(const uint8_t *buffer, uint32_t total_sz) {
+    if(total_sz > 0) {
+        uint8_t opcode, length;
+        while(total_sz >= 2) {
+            opcode = buffer[0];
+            length = buffer[1];
+            buffer += 2;
+            total_sz -= 2;
+            if(length > total_sz) {
+                throw malformed_packet();
+            }
+            add_tagged_option((OptionTypes)opcode, length, buffer);
+            buffer += length;
+            total_sz -= length;
+        }
+    }
+}
+
+void Dot11::add_tagged_option(OptionTypes opt, uint8_t len, const uint8_t *val) {
+    uint32_t opt_size = len + sizeof(uint8_t) * 2;
+    _options.push_back(option((uint8_t)opt, val, val + len));
+    _options_size += opt_size;
+}
+
+void Dot11::internal_add_option(const option &opt) {
+    _options_size += opt.data_size() + sizeof(uint8_t) * 2;
+}
+
+void Dot11::add_option(const option &opt) {
+    internal_add_option(opt);
+    _options.push_back(opt);
+}
+
+const Dot11::option *Dot11::search_option(OptionTypes opt) const {
+    for(std::list<option>::const_iterator it = _options.begin(); it != _options.end(); ++it)
+        if(it->option() == (uint8_t)opt)
+            return &(*it);
+    return 0;
+}
+
+void Dot11::protocol(small_uint<2> new_proto) {
+    this->_header.control.protocol = new_proto;
+}
+
+void Dot11::type(small_uint<2> new_type) {
+    this->_header.control.type = new_type;
+}
+
+void Dot11::subtype(small_uint<4> new_subtype) {
+    this->_header.control.subtype = new_subtype;
+}
+
+void Dot11::to_ds(small_uint<1> new_value) {
+    this->_header.control.to_ds = (new_value)? 1 : 0;
+}
+
+void Dot11::from_ds(small_uint<1> new_value) {
+    this->_header.control.from_ds = (new_value)? 1 : 0;
+}
+
+void Dot11::more_frag(small_uint<1> new_value) {
+    this->_header.control.more_frag = (new_value)? 1 : 0;
+}
+
+void Dot11::retry(small_uint<1> new_value) {
+    this->_header.control.retry = (new_value)? 1 : 0;
+}
+
+void Dot11::power_mgmt(small_uint<1> new_value) {
+    this->_header.control.power_mgmt = (new_value)? 1 : 0;
+}
+
+void Dot11::wep(small_uint<1> new_value) {
+    this->_header.control.wep = (new_value)? 1 : 0;
+}
+
+void Dot11::order(small_uint<1> new_value) {
+    this->_header.control.order = (new_value)? 1 : 0;
+}
+
+void Dot11::duration_id(uint16_t new_duration_id) {
+    this->_header.duration_id = Endian::host_to_le(new_duration_id);
+}
+
+void Dot11::addr1(const address_type &new_addr1) {
+    std::copy(new_addr1.begin(), new_addr1.end(), _header.addr1);
+}
+
+uint32_t Dot11::header_size() const {
+    uint32_t sz = sizeof(ieee80211_header) + _options_size;
+    return sz;
+}
+
+#ifndef WIN32
+void Dot11::send(PacketSender &sender, const NetworkInterface &iface) {
+    if(!iface)
+        throw invalid_interface();
+    
+    #if !defined(BSD) && !defined(__FreeBSD_kernel__)
+        sockaddr_ll addr;
+
+        memset(&addr, 0, sizeof(struct sockaddr_ll));
+
+        addr.sll_family = Endian::host_to_be<uint16_t>(PF_PACKET);
+        addr.sll_protocol = Endian::host_to_be<uint16_t>(ETH_P_ALL);
+        addr.sll_halen = 6;
+        addr.sll_ifindex = iface.id();
+        memcpy(&(addr.sll_addr), _header.addr1, 6);
+        sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr));
+    #else
+        sender.send_l2(*this, 0, 0, iface);
+    #endif
+}
+#endif // WIN32
+
+void Dot11::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent) {
+    #ifdef TINS_DEBUG
+    assert(total_sz >= header_size());
+    #endif
+    memcpy(buffer, &_header, sizeof(_header));
+    buffer += sizeof(_header);
+    total_sz -= sizeof(_header);
+
+    uint32_t written = write_ext_header(buffer, total_sz);
+    buffer += written;
+    total_sz -= written;
+
+    uint32_t child_len = write_fixed_parameters(buffer, total_sz - _options_size);
+    buffer += child_len;
+    #ifdef TINS_DEBUG
+    assert(total_sz >= child_len + _options_size);
+    #endif
+    for(std::list<option>::const_iterator it = _options.begin(); it != _options.end(); ++it) {
+        *(buffer++) = it->option();
+        *(buffer++) = it->length_field();
+        std::copy(it->data_ptr(), it->data_ptr() + it->data_size(), buffer);
+        buffer += it->data_size();
+    }
+}
+
+Dot11 *Dot11::from_bytes(const uint8_t *buffer, uint32_t total_sz) {
+    // We only need the control field, the length of the PDU will depend on the flags set.
+    
+    // This should be sizeof(ieee80211_header::control), but gcc 4.2 complains
+    if(total_sz < 2)
+        throw malformed_packet();
+    const ieee80211_header *hdr = (const ieee80211_header*)buffer;
+    Dot11 *ret = 0;
+    if(hdr->control.type == MANAGEMENT) {
+        if(hdr->control.subtype == BEACON)
+            ret = new Dot11Beacon(buffer, total_sz);
+        else if(hdr->control.subtype == DISASSOC)
+            ret = new Dot11Disassoc(buffer, total_sz);
+        else if(hdr->control.subtype == ASSOC_REQ)
+            ret = new Dot11AssocRequest(buffer, total_sz);
+        else if(hdr->control.subtype == ASSOC_RESP)
+            ret = new Dot11AssocResponse(buffer, total_sz);
+        else if(hdr->control.subtype == REASSOC_REQ)
+            ret = new Dot11ReAssocRequest(buffer, total_sz);
+        else if(hdr->control.subtype == REASSOC_RESP)
+            ret = new Dot11ReAssocResponse(buffer, total_sz); 
+        else if(hdr->control.subtype == AUTH)
+            ret = new Dot11Authentication(buffer, total_sz); 
+        else if(hdr->control.subtype == DEAUTH)
+            ret = new Dot11Deauthentication(buffer, total_sz); 
+        else if(hdr->control.subtype == PROBE_REQ)
+            ret = new Dot11ProbeRequest(buffer, total_sz); 
+        else if(hdr->control.subtype == PROBE_RESP)
+            ret = new Dot11ProbeResponse(buffer, total_sz); 
+    }
+    else if(hdr->control.type == DATA){
+        if(hdr->control.subtype <= 4)
+            ret = new Dot11Data(buffer, total_sz);
+        else
+            ret = new Dot11QoSData(buffer, total_sz);
+    }
+    else if(hdr->control.type == CONTROL){
+        if(hdr->control.subtype == ACK)
+            ret = new Dot11Ack(buffer, total_sz);
+        else if(hdr->control.subtype == CF_END)
+            ret = new Dot11CFEnd(buffer, total_sz);
+        else if(hdr->control.subtype == CF_END_ACK)
+            ret = new Dot11EndCFAck(buffer, total_sz);
+        else if(hdr->control.subtype == PS)
+            ret = new Dot11PSPoll(buffer, total_sz);
+        else if(hdr->control.subtype == RTS)
+            ret = new Dot11RTS(buffer, total_sz);
+        else if(hdr->control.subtype == BLOCK_ACK)
+            ret = new Dot11BlockAck(buffer, total_sz);
+        else if(hdr->control.subtype == BLOCK_ACK_REQ)
+            ret = new Dot11BlockAckRequest(buffer, total_sz);
+    }
+    if(ret == 0)
+        ret = new Dot11(buffer, total_sz);
+    return ret;
+}
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dot11/dot11_beacon.cpp
+++ b/src/dot11/dot11_beacon.cpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2012, 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 "dot11/dot11_beacon.h"
+#ifdef HAVE_DOT11
+
+#include <cstring>
+#include <cassert>
+
+namespace Tins {
+ /* Dot11Beacon */
+
+Dot11Beacon::Dot11Beacon(const address_type &dst_hw_addr, 
+const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr)
+{
+    subtype(Dot11::BEACON);
+    std::memset(&_body, 0, sizeof(_body));
+}
+
+Dot11Beacon::Dot11Beacon(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) 
+{
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    std::memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11Beacon::timestamp(uint64_t new_timestamp) {
+    this->_body.timestamp = Endian::host_to_le(new_timestamp);
+}
+
+void Dot11Beacon::interval(uint16_t new_interval) {
+    this->_body.interval = Endian::host_to_le(new_interval);
+}
+
+uint32_t Dot11Beacon::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(_body);
+}
+
+uint32_t Dot11Beacon::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(_body);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    std::memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dot11/dot11_control.cpp
+++ b/src/dot11/dot11_control.cpp
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) 2012, 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 "dot11/dot11_control.h"
+#ifdef HAVE_DOT11
+
+#include <cassert>
+#include <cstring>
+
+namespace Tins {
+ /* Dot11Control */
+
+Dot11Control::Dot11Control(const address_type &dst_addr) 
+: Dot11(dst_addr) 
+{
+    type(CONTROL);
+}
+
+Dot11Control::Dot11Control(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11(buffer, total_sz) {
+
+}
+
+/* Dot11ControlTA */
+
+Dot11ControlTA::Dot11ControlTA(const address_type &dst_addr, 
+  const address_type &target_address) 
+: Dot11Control(dst_addr)
+{
+    target_addr(target_address);
+}
+
+Dot11ControlTA::Dot11ControlTA(const uint8_t *buffer, uint32_t total_sz) : Dot11Control(buffer, total_sz) {
+    buffer += sizeof(ieee80211_header);
+    total_sz -= sizeof(ieee80211_header);
+    if(total_sz < sizeof(_taddr))
+        throw malformed_packet();
+    //std::memcpy(_taddr, buffer, sizeof(_taddr));
+    _taddr = buffer;
+}
+
+uint32_t Dot11ControlTA::header_size() const {
+    return Dot11::header_size() + sizeof(_taddr);
+}
+
+uint32_t Dot11ControlTA::write_ext_header(uint8_t *buffer, uint32_t total_sz) {
+    #ifdef TINS_DEBUG
+    assert(total_sz >= sizeof(_taddr));
+    #endif
+    //std::memcpy(buffer, _taddr, sizeof(_taddr));
+    _taddr.copy(buffer);
+    return sizeof(_taddr);
+}
+
+void Dot11ControlTA::target_addr(const address_type &addr) {
+    _taddr = addr;
+}
+
+/* Dot11RTS */
+
+Dot11RTS::Dot11RTS(const address_type &dst_addr, 
+  const address_type &target_addr) 
+: Dot11ControlTA(dst_addr, target_addr) 
+{
+    subtype(RTS);
+}
+
+Dot11RTS::Dot11RTS(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ControlTA(buffer, total_sz) {
+
+}
+
+/* Dot11PSPoll */
+
+Dot11PSPoll::Dot11PSPoll(const address_type &dst_addr, 
+  const address_type &target_addr) 
+: Dot11ControlTA(dst_addr, target_addr) 
+{
+    subtype(PS);
+}
+
+Dot11PSPoll::Dot11PSPoll(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ControlTA(buffer, total_sz) {
+
+}
+
+/* Dot11CFEnd */
+
+Dot11CFEnd::Dot11CFEnd(const address_type &dst_addr, 
+  const address_type &target_addr) 
+: Dot11ControlTA(dst_addr, target_addr) 
+{
+    subtype(CF_END);
+}
+
+Dot11CFEnd::Dot11CFEnd(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ControlTA(buffer, total_sz) {
+
+}
+
+/* Dot11EndCFAck */
+
+Dot11EndCFAck::Dot11EndCFAck(const address_type &dst_addr, 
+  const address_type &target_addr) 
+: Dot11ControlTA(dst_addr, target_addr) 
+{
+    subtype(CF_END_ACK);
+}
+
+Dot11EndCFAck::Dot11EndCFAck(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ControlTA(buffer, total_sz) {
+
+}
+
+/* Dot11Ack */
+
+Dot11Ack::Dot11Ack(const address_type &dst_addr) 
+: Dot11Control(dst_addr) 
+{
+    subtype(ACK);
+}
+
+Dot11Ack::Dot11Ack(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11Control(buffer, total_sz)
+{
+
+}
+
+/* Dot11BlockAck */
+
+Dot11BlockAckRequest::Dot11BlockAckRequest(const address_type &dst_addr, 
+  const address_type &target_addr)
+: Dot11ControlTA(dst_addr, target_addr) 
+{
+    init_block_ack();
+}
+
+Dot11BlockAckRequest::Dot11BlockAckRequest(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ControlTA(buffer, total_sz) 
+{
+    uint32_t padding = controlta_size();
+    buffer += padding;
+    total_sz -= padding;
+    if(total_sz < sizeof(_bar_control) + sizeof(_start_sequence))
+        throw malformed_packet();
+    std::memcpy(&_bar_control, buffer, sizeof(_bar_control));
+    buffer += sizeof(_bar_control);
+    std::memcpy(&_start_sequence, buffer, sizeof(_start_sequence));
+}
+
+void Dot11BlockAckRequest::init_block_ack() {
+    subtype(BLOCK_ACK_REQ);
+    std::memset(&_bar_control, 0, sizeof(_bar_control));
+    std::memset(&_start_sequence, 0, sizeof(_start_sequence));
+}
+
+uint32_t Dot11BlockAckRequest::write_ext_header(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t parent_size = Dot11ControlTA::write_ext_header(buffer, total_sz);
+    buffer += parent_size;
+    std::memcpy(buffer, &_bar_control, sizeof(_bar_control));
+    buffer += sizeof(_bar_control);
+    std::memcpy(buffer, &_start_sequence, sizeof(_start_sequence));
+    return parent_size + sizeof(_start_sequence) + sizeof(_bar_control);
+}
+
+void Dot11BlockAckRequest::bar_control(small_uint<4> bar) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _bar_control = bar | (_bar_control & 0xfff0);
+    #else
+    _bar_control = (bar << 8) | (_bar_control & 0xf0ff);
+    #endif
+}
+
+void Dot11BlockAckRequest::start_sequence(small_uint<12> seq) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _start_sequence = (seq << 4) | (_start_sequence & 0xf);
+    #else
+    _start_sequence = Endian::host_to_le<uint16_t>(seq << 4) | (_start_sequence & 0xf00);
+    #endif
+}
+
+void Dot11BlockAckRequest::fragment_number(small_uint<4> frag) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _start_sequence = frag | (_start_sequence & 0xfff0);
+    #else
+    _start_sequence = (frag << 8) | (_start_sequence & 0xf0ff);
+    #endif
+}
+
+uint32_t Dot11BlockAckRequest::header_size() const {
+    return Dot11ControlTA::header_size() + sizeof(_start_sequence) + sizeof(_start_sequence);
+}
+
+/* Dot11BlockAck */
+
+Dot11BlockAck::Dot11BlockAck(const address_type &dst_addr, 
+  const address_type &target_addr)
+: Dot11ControlTA(dst_addr, target_addr) 
+{
+    subtype(BLOCK_ACK);
+    std::memset(_bitmap, 0, sizeof(_bitmap));
+}
+
+Dot11BlockAck::Dot11BlockAck(const uint8_t *buffer, uint32_t total_sz) : Dot11ControlTA(buffer, total_sz) {
+    uint32_t padding = controlta_size();
+    buffer += padding;
+    total_sz -= padding;
+    if(total_sz < sizeof(_bitmap) + sizeof(_bar_control) + sizeof(_start_sequence))
+        throw malformed_packet();
+    std::memcpy(&_bar_control, buffer, sizeof(_bar_control));
+    buffer += sizeof(_bar_control);
+    std::memcpy(&_start_sequence, buffer, sizeof(_start_sequence));
+    buffer += sizeof(_start_sequence);
+    std::memcpy(&_bitmap, buffer, sizeof(_bitmap));
+}
+
+void Dot11BlockAck::bar_control(small_uint<4> bar) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _bar_control = bar | (_bar_control & 0xfff0);
+    #else
+    _bar_control = (bar << 8) | (_bar_control & 0xf0ff);
+    #endif
+}
+
+void Dot11BlockAck::start_sequence(small_uint<12> seq) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _start_sequence = (seq << 4) | (_start_sequence & 0xf);
+    #else
+    _start_sequence = Endian::host_to_le<uint16_t>(seq << 4) | (_start_sequence & 0xf00);
+    #endif
+}
+
+void Dot11BlockAck::fragment_number(small_uint<4> frag) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _start_sequence = frag | (_start_sequence & 0xfff0);
+    #else
+    _start_sequence = (frag << 8) | (_start_sequence & 0xf0ff);
+    #endif
+}
+
+void Dot11BlockAck::bitmap(const uint8_t *bit) {
+    std::memcpy(_bitmap, bit, sizeof(_bitmap));
+}
+
+uint32_t Dot11BlockAck::write_ext_header(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t parent_size = Dot11ControlTA::write_ext_header(buffer, total_sz);
+    buffer += parent_size;
+    std::memcpy(buffer, &_bar_control, sizeof(_bar_control));
+    buffer += sizeof(_bar_control);
+    std::memcpy(buffer, &_start_sequence, sizeof(_start_sequence));
+    buffer += sizeof(_start_sequence);
+    std::memcpy(buffer, _bitmap, sizeof(_bitmap));
+    return parent_size + sizeof(_bitmap) + sizeof(_bar_control) + sizeof(_start_sequence);
+}
+
+uint32_t Dot11BlockAck::header_size() const {
+    return Dot11ControlTA::header_size() + sizeof(_start_sequence) + sizeof(_start_sequence) + sizeof(_bitmap);
+}
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dot11/dot11_data.cpp
+++ b/src/dot11/dot11_data.cpp
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2012, 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 "dot11/dot11_data.h"
+#ifdef HAVE_DOT11
+
+#include <cstring>
+#include <cassert>
+#include "rawpdu.h"
+#include "snap.h"
+
+namespace Tins {
+/* Dot11Data */
+
+Dot11Data::Dot11Data(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11(buffer, total_sz)
+{
+    const uint32_t offset = init(buffer, total_sz);
+    buffer += offset;
+    total_sz -= offset;
+    if(total_sz) {
+        // If the wep bit is on, then just use a RawPDU
+        if(wep())
+            inner_pdu(new Tins::RawPDU(buffer, total_sz));
+        else
+            inner_pdu(new Tins::SNAP(buffer, total_sz));
+    }
+}
+
+Dot11Data::Dot11Data(const uint8_t *buffer, uint32_t total_sz, no_inner_pdu) 
+: Dot11(buffer, total_sz)
+{
+    init(buffer, total_sz);
+}
+
+uint32_t Dot11Data::init(const uint8_t *buffer, uint32_t total_sz) {
+    const uint8_t *start_ptr = buffer;
+    uint32_t sz = Dot11::header_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_ext_header))
+        throw malformed_packet();
+    std::memcpy(&_ext_header, buffer, sizeof(_ext_header));
+    buffer += sizeof(_ext_header);
+    total_sz -= sizeof(_ext_header);
+    if(from_ds() && to_ds()) {
+        if(total_sz < _addr4.size())
+            throw malformed_packet();
+        _addr4 = buffer;
+        buffer += _addr4.size();
+        total_sz -= _addr4.size();
+    }
+    return buffer - start_ptr;
+}
+
+Dot11Data::Dot11Data(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr) 
+: Dot11(dst_hw_addr) 
+{
+    type(Dot11::DATA);
+    memset(&_ext_header, 0, sizeof(_ext_header));
+    addr2(src_hw_addr);
+}
+
+uint32_t Dot11Data::header_size() const {
+    uint32_t sz = Dot11::header_size() + sizeof(_ext_header);
+    if (this->from_ds() && this->to_ds())
+        sz += 6;
+    return sz;
+}
+
+void Dot11Data::addr2(const address_type &new_addr2) {
+    std::copy(new_addr2.begin(), new_addr2.end(), _ext_header.addr2);
+}
+
+void Dot11Data::addr3(const address_type &new_addr3) {
+    std::copy(new_addr3.begin(), new_addr3.end(), _ext_header.addr3);
+}
+
+void Dot11Data::frag_num(small_uint<4> new_frag_num) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _ext_header.frag_seq = new_frag_num | (_ext_header.frag_seq & 0xfff0);
+    #else
+    _ext_header.frag_seq = (new_frag_num << 8) | (_ext_header.frag_seq & 0xf0ff);
+    #endif
+}
+
+void Dot11Data::seq_num(small_uint<12> new_seq_num) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _ext_header.frag_seq = (new_seq_num << 4) | (_ext_header.frag_seq & 0xf);
+    #else
+    _ext_header.frag_seq = Endian::host_to_le<uint16_t>(new_seq_num << 4) | (_ext_header.frag_seq & 0xf00);
+    #endif
+}
+
+void Dot11Data::addr4(const address_type &new_addr4) {
+    _addr4 = new_addr4;
+}
+
+uint32_t Dot11Data::write_ext_header(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t written = sizeof(_ext_header);
+    memcpy(buffer, &_ext_header, sizeof(_ext_header));
+    buffer += sizeof(_ext_header);
+    if (from_ds() && to_ds()) {
+        written += _addr4.size();
+        _addr4.copy(buffer);
+    }
+    return written;
+
+}
+
+/* QoS data. */
+
+Dot11QoSData::Dot11QoSData(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr) 
+: Dot11Data(dst_hw_addr, src_hw_addr) 
+{
+    subtype(Dot11::QOS_DATA_DATA);
+    _qos_control = 0;
+}
+
+Dot11QoSData::Dot11QoSData(const uint8_t *buffer, uint32_t total_sz) 
+// Am I breaking something? :S
+: Dot11Data(buffer, total_sz, no_inner_pdu()) {
+    uint32_t sz = data_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_qos_control))
+        throw malformed_packet();
+    _qos_control = *(uint16_t*)buffer;
+    total_sz -= sizeof(uint16_t);
+    buffer += sizeof(uint16_t);
+    if(total_sz) {
+        // If the wep bit is on, then just use a RawPDU
+        if(wep())
+            inner_pdu(new Tins::RawPDU(buffer, total_sz));
+        else
+            inner_pdu(new Tins::SNAP(buffer, total_sz));
+    }
+}
+
+void Dot11QoSData::qos_control(uint16_t new_qos_control) {
+    this->_qos_control = Endian::host_to_le(new_qos_control);
+}
+
+uint32_t Dot11QoSData::header_size() const {
+    return Dot11Data::header_size() + sizeof(this->_qos_control);
+}
+
+uint32_t Dot11QoSData::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(this->_qos_control);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    *(uint16_t*)buffer = this->_qos_control;
+    return sz;
+}
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dot11/dot11_mgmt.cpp
+++ b/src/dot11/dot11_mgmt.cpp
@@ -0,0 +1,626 @@
+/*
+ * Copyright (c) 2012, 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 "dot11/dot11_mgmt.h"
+#ifdef HAVE_DOT11
+
+#include <cstring>
+#include "rsn_information.h"
+
+namespace Tins {
+/* Dot11ManagementFrame */
+
+Dot11ManagementFrame::Dot11ManagementFrame(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11(buffer, total_sz) 
+{
+    buffer += sizeof(ieee80211_header);
+    total_sz -= sizeof(ieee80211_header);
+    if(total_sz < sizeof(_ext_header))
+        throw malformed_packet();
+    std::memcpy(&_ext_header, buffer, sizeof(_ext_header));
+    total_sz -= sizeof(_ext_header);
+    if(from_ds() && to_ds()) {
+        if(total_sz >= _addr4.size())
+            _addr4 = buffer + sizeof(_ext_header);
+        else
+            throw malformed_packet();
+    }
+}
+
+Dot11ManagementFrame::Dot11ManagementFrame(const address_type &dst_hw_addr, 
+const address_type &src_hw_addr) 
+: Dot11(dst_hw_addr) 
+{
+    type(Dot11::MANAGEMENT);
+    memset(&_ext_header, 0, sizeof(_ext_header));
+    addr2(src_hw_addr);
+}
+
+uint32_t Dot11ManagementFrame::header_size() const {
+    uint32_t sz = Dot11::header_size() + sizeof(_ext_header);
+    if (this->from_ds() && this->to_ds())
+        sz += 6;
+    return sz;
+}
+
+void Dot11ManagementFrame::addr2(const address_type &new_addr2) {
+    std::copy(new_addr2.begin(), new_addr2.end(), _ext_header.addr2);
+}
+
+void Dot11ManagementFrame::addr3(const address_type &new_addr3) {
+    std::copy(new_addr3.begin(), new_addr3.end(), _ext_header.addr3);
+}
+
+void Dot11ManagementFrame::frag_num(small_uint<4> new_frag_num) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _ext_header.frag_seq = new_frag_num | (_ext_header.frag_seq & 0xfff0);
+    #else
+    _ext_header.frag_seq = (new_frag_num << 8) | (_ext_header.frag_seq & 0xf0ff);
+    #endif
+}
+
+void Dot11ManagementFrame::seq_num(small_uint<12> new_seq_num) {
+    #if TINS_IS_LITTLE_ENDIAN
+    _ext_header.frag_seq = (new_seq_num << 4) | (_ext_header.frag_seq & 0xf);
+    #else
+    _ext_header.frag_seq = Endian::host_to_le<uint16_t>(new_seq_num << 4) | (_ext_header.frag_seq & 0xf00);
+    #endif
+}
+
+void Dot11ManagementFrame::addr4(const address_type &new_addr4) {
+    _addr4 = new_addr4;
+}
+
+uint32_t Dot11ManagementFrame::write_ext_header(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t written = sizeof(_ext_header);
+    memcpy(buffer, &_ext_header, sizeof(this->_ext_header));
+    buffer += sizeof(_ext_header);
+    if (from_ds() && to_ds()) {
+        written += 6;
+        std::copy(_addr4.begin(), _addr4.end(), buffer);
+    }
+    return written;
+}
+
+void Dot11ManagementFrame::ssid(const std::string &new_ssid) {
+    add_tagged_option(Dot11::SSID, new_ssid.size(), (const uint8_t*)new_ssid.c_str());
+}
+
+void Dot11ManagementFrame::rsn_information(const RSNInformation& info) {
+    RSNInformation::serialization_type buffer = info.serialize();
+    add_tagged_option(RSN, buffer.size(), &buffer[0]);
+}
+
+uint8_t *Dot11ManagementFrame::serialize_rates(const rates_type &rates) {
+    uint8_t *buffer = new uint8_t[rates.size()], *ptr = buffer;
+    for(rates_type::const_iterator it = rates.begin(); it != rates.end(); ++it) {
+        uint8_t result = *it * 2;
+        if(result == 2 || result == 4 || result == 11 || result == 22)
+            result |= 0x80;
+        *(ptr++) = result;
+    }
+    return buffer;
+}
+
+Dot11ManagementFrame::rates_type Dot11ManagementFrame::deserialize_rates(const option *opt) {
+    rates_type 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;
+}
+
+void Dot11ManagementFrame::supported_rates(const rates_type &new_rates) {
+    uint8_t *buffer = serialize_rates(new_rates);
+    add_tagged_option(SUPPORTED_RATES, new_rates.size(), buffer);
+    delete[] buffer;
+}
+
+void Dot11ManagementFrame::extended_supported_rates(const rates_type &new_rates) {
+    uint8_t *buffer = serialize_rates(new_rates);
+    add_tagged_option(EXT_SUPPORTED_RATES, new_rates.size(), buffer);
+    delete[] buffer;
+}
+
+void Dot11ManagementFrame::qos_capability(qos_capability_type new_qos_capability) {
+    add_tagged_option(QOS_CAPABILITY, 1, &new_qos_capability);
+}
+
+void Dot11ManagementFrame::power_capability(uint8_t min_power, uint8_t max_power) {
+    uint8_t buffer[2];
+    buffer[0] = min_power;
+    buffer[1] = max_power;
+    add_tagged_option(POWER_CAPABILITY, 2, buffer);
+}
+
+void Dot11ManagementFrame::supported_channels(const channels_type &new_channels) {
+    std::vector<uint8_t> buffer(new_channels.size() * 2);
+    uint8_t* ptr = &buffer[0];
+    for(channels_type::const_iterator it = new_channels.begin(); it != new_channels.end(); ++it) {
+        *(ptr++) = it->first;
+        *(ptr++) = it->second;
+    }
+    add_tagged_option(SUPPORTED_CHANNELS, buffer.size(), &buffer[0]);
+}
+
+void Dot11ManagementFrame::edca_parameter_set(uint32_t ac_be, uint32_t ac_bk, uint32_t ac_vi, uint32_t ac_vo) {
+    uint8_t buffer[18];
+    buffer[0] = 0;
+    buffer[1] = 0;
+    uint32_t* ptr = (uint32_t*)(buffer + 2);
+    *(ptr++) = Endian::host_to_le(ac_be);
+    *(ptr++) = Endian::host_to_le(ac_bk);
+    *(ptr++) = Endian::host_to_le(ac_vi);
+    *(ptr++) = Endian::host_to_le(ac_vo);
+    add_tagged_option(EDCA, sizeof(buffer), buffer);
+}
+
+void Dot11ManagementFrame::request_information(const request_info_type elements) {
+    add_tagged_option(REQUEST_INFORMATION, elements.size(), &elements[0]);
+}
+
+void Dot11ManagementFrame::fh_parameter_set(const fh_params_set &fh_params) {
+    uint8_t data[5];
+    uint16_t dwell = Endian::host_to_le(fh_params.dwell_time);
+    std::memcpy(data, &dwell, sizeof(dwell));
+    data[2] = fh_params.hop_set;
+    data[3] = fh_params.hop_pattern;
+    data[4] = fh_params.hop_index;
+    add_tagged_option(FH_SET, sizeof(data), data);
+
+}
+
+void Dot11ManagementFrame::ds_parameter_set(uint8_t current_channel) {
+    add_tagged_option(DS_SET, 1, &current_channel);
+}
+
+void Dot11ManagementFrame::cf_parameter_set(const cf_params_set &params) {
+    uint8_t data[6];
+    data[0] = params.cfp_count;
+    data[1] = params.cfp_period;
+    uint16_t dummy = Endian::host_to_le(params.cfp_max_duration);
+    std::memcpy(data + 2, &dummy, sizeof(uint16_t));
+    dummy = Endian::host_to_le(params.cfp_dur_remaining);
+    std::memcpy(data + 4, &dummy, sizeof(uint16_t));
+    add_tagged_option(CF_SET, sizeof(data), data);
+}
+
+void Dot11ManagementFrame::ibss_parameter_set(uint16_t atim_window) {
+    atim_window = Endian::host_to_le(atim_window);
+    add_tagged_option(IBSS_SET, 2, (uint8_t*)&atim_window);
+}
+
+void Dot11ManagementFrame::ibss_dfs(const ibss_dfs_params &params) {
+    uint8_t sz = address_type::address_size + sizeof(uint8_t) + sizeof(uint8_t) * 2 * params.channel_map.size();
+    uint8_t* buffer = new uint8_t[sz];
+    uint8_t* ptr_buffer = buffer;
+
+    ptr_buffer = params.dfs_owner.copy(ptr_buffer);
+    *(ptr_buffer++) = params.recovery_interval;
+    for (channels_type::const_iterator it = params.channel_map.begin(); it != params.channel_map.end(); ++it) {
+        *(ptr_buffer++) = it->first;
+        *(ptr_buffer++) = it->second;
+    }
+
+    add_tagged_option(IBSS_DFS, sz, buffer);
+
+    delete[] buffer;
+}
+
+void Dot11ManagementFrame::country(const country_params &params) {
+    if ((params.first_channel.size() != params.number_channels.size()) ||
+        (params.number_channels.size() != params.max_transmit_power.size()))
+        throw std::runtime_error("The length of the lists are distinct");
+    if(params.country.size() != 3)
+        throw std::runtime_error("Invalid country identifier length");
+    size_t sz = sizeof(uint8_t) * 3 * params.first_channel.size() + params.country.size();
+    // Use 1 byte padding at the end if the length is odd.
+    if((sz & 1) == 1)
+        sz++;
+    std::vector<uint8_t> buffer(sz);
+    uint8_t *ptr = std::copy(params.country.begin(), params.country.end(), &buffer[0]);
+    for(size_t i(0); i < params.first_channel.size(); ++i) {
+        *(ptr++) = params.first_channel[i];
+        *(ptr++) = params.number_channels[i];
+        *(ptr++) = params.max_transmit_power[i];
+    }
+    add_tagged_option(COUNTRY, sz, &buffer[0]);
+}
+
+void Dot11ManagementFrame::fh_parameters(uint8_t prime_radix, uint8_t number_channels) {
+    uint8_t buffer[2];
+    buffer[0] = prime_radix;
+    buffer[1] = number_channels;
+    add_tagged_option(HOPPING_PATTERN_PARAMS, 2, buffer);
+}
+
+void Dot11ManagementFrame::fh_pattern_table(const fh_pattern_type &params) {
+    std::vector<uint8_t> data(sizeof(uint8_t) * 4 + params.random_table.size());
+    uint8_t *ptr = &data[0];
+    *(ptr++) = params.flag;
+    *(ptr++) = params.number_of_sets;
+    *(ptr++) = params.modulus;
+    *(ptr++) = params.offset;
+    byte_array::const_iterator it(params.random_table.begin());
+    for(; it != params.random_table.end(); ++it)
+        *(ptr++) = *it;
+    add_tagged_option(HOPPING_PATTERN_TABLE, data.size(), &data[0]);
+}
+
+void Dot11ManagementFrame::power_constraint(uint8_t local_power_constraint) {
+    add_tagged_option(POWER_CONSTRAINT, 1, &local_power_constraint);
+}
+
+void Dot11ManagementFrame::channel_switch(const channel_switch_type &data) {
+    uint8_t buffer[3];
+    buffer[0] = data.switch_mode;
+    buffer[1] = data.new_channel;
+    buffer[2] = data.switch_count;
+    add_tagged_option(CHANNEL_SWITCH, 3, buffer);
+
+}
+
+void Dot11ManagementFrame::quiet(const quiet_type &data) {
+    uint8_t buffer[6];
+    uint16_t* ptr_buffer = (uint16_t*)(buffer + 2);
+
+    buffer[0] = data.quiet_count;
+    buffer[1] = data.quiet_period;
+    ptr_buffer[0] = Endian::host_to_le(data.quiet_duration);
+    ptr_buffer[1] = Endian::host_to_le(data.quiet_offset);
+    add_tagged_option(QUIET, sizeof(buffer), buffer);
+
+}
+
+void Dot11ManagementFrame::tpc_report(uint8_t transmit_power, uint8_t link_margin) {
+    uint8_t buffer[2];
+    buffer[0] = transmit_power;
+    buffer[1] = link_margin;
+    add_tagged_option(TPC_REPORT, 2, buffer);
+
+}
+
+void Dot11ManagementFrame::erp_information(uint8_t value) {
+    add_tagged_option(ERP_INFORMATION, 1, &value);
+}
+
+void Dot11ManagementFrame::bss_load(const bss_load_type &data) {
+    uint8_t buffer[5];
+    uint16_t dummy = Endian::host_to_le(data.station_count);
+
+    //*(uint16_t*)buffer = Endian::host_to_le(data.station_count);
+    #if TINS_IS_LITTLE_ENDIAN
+    buffer[0] = dummy & 0xff;
+    buffer[1] = (dummy >> 8) & 0xff;
+    #else
+    buffer[0] = (dummy >> 8) & 0xff;
+    buffer[1] = dummy & 0xff;
+    #endif
+    buffer[2] = data.channel_utilization;
+    dummy = Endian::host_to_le(data.available_capacity);
+    #if TINS_IS_LITTLE_ENDIAN
+    buffer[3] = dummy & 0xff;
+    buffer[4] = (dummy >> 8) & 0xff;
+    #else
+    buffer[3] = (dummy >> 8) & 0xff;
+    buffer[4] = dummy & 0xff;
+    #endif
+    //*(uint16_t*)(buffer + 3) = Endian::host_to_le(data.available_capacity);
+    add_tagged_option(BSS_LOAD, sizeof(buffer), buffer);
+}
+
+void Dot11ManagementFrame::tim(const tim_type &data) {
+    std::vector<uint8_t> buffer(sizeof(uint8_t) * 3 + data.partial_virtual_bitmap.size());
+    buffer[0] = data.dtim_count;
+    buffer[1] = data.dtim_period;
+    buffer[2] = data.bitmap_control;
+    std::copy(
+        data.partial_virtual_bitmap.begin(), 
+        data.partial_virtual_bitmap.end(),
+        &buffer[3]
+    );
+    add_tagged_option(TIM, buffer.size(), &buffer[0]);
+}
+
+void Dot11ManagementFrame::challenge_text(const std::string &text) {
+    add_tagged_option(
+        CHALLENGE_TEXT, 
+        text.size(),
+        (const uint8_t*)text.c_str()
+    );
+}
+
+void Dot11ManagementFrame::vendor_specific(const vendor_specific_type &data) {
+    byte_array buffer(3 + data.data.size());
+    std::copy(
+        data.data.begin(),
+        data.data.end(),
+        data.oui.copy(buffer.begin())
+    );
+    add_tagged_option(VENDOR_SPECIFIC, buffer.size(), &buffer[0]);
+}
+
+// Getters
+
+RSNInformation Dot11ManagementFrame::rsn_information() {
+    return search_and_convert<RSNInformation>(RSN);
+}
+
+std::string Dot11ManagementFrame::ssid() const {
+    const Dot11::option *option = search_option(SSID);
+    if(!option)
+        throw option_not_found();
+    if(option->data_size() == 0 && this->subtype() == Dot11::PROBE_REQ)
+        return "BROADCAST";
+    else 
+        return std::string((const char*)option->data_ptr(), option->data_size());
+}
+
+Dot11ManagementFrame::rates_type Dot11ManagementFrame::supported_rates() const {
+    return search_and_convert<rates_type>(SUPPORTED_RATES);
+}
+
+Dot11ManagementFrame::rates_type Dot11ManagementFrame::extended_supported_rates() const {
+    return search_and_convert<rates_type>(EXT_SUPPORTED_RATES);
+}
+
+Dot11ManagementFrame::qos_capability_type Dot11ManagementFrame::qos_capability() const {
+    return search_and_convert<uint8_t>(QOS_CAPABILITY);
+}
+
+std::pair<uint8_t, uint8_t> Dot11ManagementFrame::power_capability() const {
+    return search_and_convert<std::pair<uint8_t, uint8_t> >(POWER_CAPABILITY);
+}
+
+Dot11ManagementFrame::channels_type Dot11ManagementFrame::supported_channels() const {
+    return search_and_convert<channels_type>(SUPPORTED_CHANNELS);
+}
+
+Dot11ManagementFrame::request_info_type Dot11ManagementFrame::request_information() const {
+    return search_and_convert<request_info_type>(REQUEST_INFORMATION);
+}
+
+Dot11ManagementFrame::fh_params_set Dot11ManagementFrame::fh_parameter_set() const {
+    return search_and_convert<fh_params_set>(FH_SET);
+}
+
+uint8_t Dot11ManagementFrame::ds_parameter_set() const {
+    return search_and_convert<uint8_t>(DS_SET);
+}
+
+Dot11ManagementFrame::cf_params_set Dot11ManagementFrame::cf_parameter_set() const {
+    return search_and_convert<cf_params_set>(CF_SET);
+}
+
+uint16_t Dot11ManagementFrame::ibss_parameter_set() const {
+    return search_and_convert<uint16_t>(IBSS_SET);
+}
+
+Dot11ManagementFrame::ibss_dfs_params Dot11ManagementFrame::ibss_dfs() const {
+    return search_and_convert<ibss_dfs_params>(IBSS_DFS);
+}
+
+Dot11ManagementFrame::country_params Dot11ManagementFrame::country() const {
+    return search_and_convert<country_params>(COUNTRY);
+}
+
+std::pair<uint8_t, uint8_t> Dot11ManagementFrame::fh_parameters() const {
+    return search_and_convert<std::pair<uint8_t, uint8_t> >(HOPPING_PATTERN_PARAMS);
+}
+
+Dot11ManagementFrame::fh_pattern_type Dot11ManagementFrame::fh_pattern_table() const {
+    return search_and_convert<fh_pattern_type>(HOPPING_PATTERN_TABLE);
+}
+
+uint8_t Dot11ManagementFrame::power_constraint() const {
+    return search_and_convert<uint8_t>(POWER_CONSTRAINT);
+}
+
+Dot11ManagementFrame::channel_switch_type Dot11ManagementFrame::channel_switch() const {
+    return search_and_convert<channel_switch_type>(CHANNEL_SWITCH);
+}
+
+Dot11ManagementFrame::quiet_type Dot11ManagementFrame::quiet() const {
+    return search_and_convert<quiet_type>(QUIET);
+}
+
+std::pair<uint8_t, uint8_t> Dot11ManagementFrame::tpc_report() const {
+    return search_and_convert<std::pair<uint8_t, uint8_t> >(TPC_REPORT);
+}
+
+uint8_t Dot11ManagementFrame::erp_information() const {
+    return search_and_convert<uint8_t>(ERP_INFORMATION);
+}
+
+Dot11ManagementFrame::bss_load_type Dot11ManagementFrame::bss_load() const {
+    return search_and_convert<bss_load_type>(BSS_LOAD);
+}
+
+Dot11ManagementFrame::tim_type Dot11ManagementFrame::tim() const {
+    return search_and_convert<tim_type>(TIM);
+}
+
+std::string Dot11ManagementFrame::challenge_text() const {
+    return search_and_convert<std::string>(CHALLENGE_TEXT);
+}
+
+Dot11ManagementFrame::vendor_specific_type Dot11ManagementFrame::vendor_specific() const {
+    const Dot11::option *option = search_option(VENDOR_SPECIFIC);
+    if(!option || option->data_size() < 3)
+        throw option_not_found();
+    return vendor_specific_type::from_bytes(option->data_ptr(), option->data_size());
+}
+
+Dot11ManagementFrame::vendor_specific_type 
+  Dot11ManagementFrame::vendor_specific_type::from_bytes(const uint8_t *buffer, uint32_t sz) 
+{
+    if(sz < 3)
+        throw malformed_option();
+    return vendor_specific_type(
+        buffer, 
+        byte_array(buffer + 3, buffer + sz)
+    );
+}
+
+// Options
+
+Dot11ManagementFrame::fh_params_set Dot11ManagementFrame::fh_params_set::from_option(const option &opt)
+{
+    if(opt.data_size() != 5)
+        throw malformed_option();
+    fh_params_set output;
+    output.dwell_time = Endian::le_to_host(*(uint16_t*)opt.data_ptr());
+    output.hop_set = opt.data_ptr()[2];
+    output.hop_pattern = opt.data_ptr()[3];
+    output.hop_index = opt.data_ptr()[4];
+    return output;
+}
+
+Dot11ManagementFrame::cf_params_set Dot11ManagementFrame::cf_params_set::from_option(const option &opt) 
+{
+    if(opt.data_size() != 6)
+        throw malformed_option();
+    cf_params_set output;
+    output.cfp_count = *opt.data_ptr();
+    output.cfp_period = opt.data_ptr()[1];
+    output.cfp_max_duration = Endian::le_to_host(*(uint16_t*)&opt.data_ptr()[2]);
+    output.cfp_dur_remaining = Endian::le_to_host(*(uint16_t*)&opt.data_ptr()[4]);
+    return output;
+}
+
+Dot11ManagementFrame::ibss_dfs_params Dot11ManagementFrame::ibss_dfs_params::from_option(const option &opt)
+{
+    if(opt.data_size() < ibss_dfs_params::minimum_size)
+        throw malformed_option();
+    ibss_dfs_params output;
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
+    output.dfs_owner = ptr;
+    ptr += output.dfs_owner.size();
+    output.recovery_interval = *(ptr++);
+    while(ptr != end) {
+        uint8_t first = *(ptr++);
+        if(ptr == end)
+            throw option_not_found();
+        output.channel_map.push_back(std::make_pair(first, *(ptr++)));
+    }
+    return output;
+}
+
+Dot11ManagementFrame::country_params Dot11ManagementFrame::country_params::from_option(const option &opt)
+{
+    if(opt.data_size() < country_params::minimum_size)
+        throw malformed_option();
+    country_params output;
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
+    std::copy(ptr, ptr + 3, std::back_inserter(output.country));
+    ptr += output.country.size();
+    while(end - ptr >= 3) {
+        output.first_channel.push_back(*(ptr++));
+        output.number_channels.push_back(*(ptr++));
+        output.max_transmit_power.push_back(*(ptr++));
+    }
+    if(ptr != end)
+        throw malformed_option();
+    return output; 
+}
+
+Dot11ManagementFrame::fh_pattern_type Dot11ManagementFrame::fh_pattern_type::from_option(const option &opt)
+{
+    if(opt.data_size() < fh_pattern_type::minimum_size)
+        throw malformed_option();
+    fh_pattern_type output;
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
+    
+    output.flag = *(ptr++);
+    output.number_of_sets = *(ptr++);
+    output.modulus = *(ptr++);
+    output.offset = *(ptr++);
+    
+    output.random_table.assign(ptr, end);
+    return output;
+}
+
+Dot11ManagementFrame::channel_switch_type Dot11ManagementFrame::channel_switch_type::from_option(const option &opt)
+{
+    if(opt.data_size() != sizeof(uint8_t) * 3)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    channel_switch_type output;
+    output.switch_mode = *(ptr++);
+    output.new_channel = *(ptr++);
+    output.switch_count = *(ptr++);
+    return output;
+}
+
+Dot11ManagementFrame::quiet_type Dot11ManagementFrame::quiet_type::from_option(const option &opt)
+{
+    if(opt.data_size() != (sizeof(uint8_t) * 2 + sizeof(uint16_t) * 2))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    quiet_type output;
+    
+    output.quiet_count = *(ptr++);
+    output.quiet_period = *(ptr++);
+    const uint16_t *ptr_16 = (const uint16_t*)ptr;
+    output.quiet_duration = Endian::le_to_host(*(ptr_16++));
+    output.quiet_offset = Endian::le_to_host(*ptr_16);
+    return output;
+}
+
+Dot11ManagementFrame::bss_load_type Dot11ManagementFrame::bss_load_type::from_option(const option &opt)
+{
+    if(opt.data_size() != sizeof(uint8_t) + 2 * sizeof(uint16_t))
+        throw malformed_option();
+    bss_load_type output;
+    
+    const uint8_t *ptr = opt.data_ptr();
+    output.station_count = Endian::le_to_host(*(uint16_t*)ptr);
+    output.channel_utilization = ptr[2];
+    output.available_capacity = Endian::le_to_host(*(uint16_t*)(ptr + 3));
+    return output;
+}
+
+Dot11ManagementFrame::tim_type Dot11ManagementFrame::tim_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 4 * sizeof(uint8_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
+    tim_type output;
+    
+    output.dtim_count = *(ptr++);
+    output.dtim_period = *(ptr++);
+    output.bitmap_control = *(ptr++);
+    
+    output.partial_virtual_bitmap.assign(ptr, end);
+    return output;
+}
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dot11/dot11_probe.cpp
+++ b/src/dot11/dot11_probe.cpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2012, 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 "dot11/dot11_probe.h"
+
+#ifdef HAVE_DOT11
+
+#include <cstring>
+#include <cassert>
+
+namespace Tins {
+/* Probe Request */
+
+Dot11ProbeRequest::Dot11ProbeRequest(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr) 
+{
+    this->subtype(Dot11::PROBE_REQ);
+}
+
+Dot11ProbeRequest::Dot11ProbeRequest(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) 
+{
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+/* Probe Response */
+
+Dot11ProbeResponse::Dot11ProbeResponse(const address_type &dst_hw_addr, 
+  const address_type &src_hw_addr) 
+: Dot11ManagementFrame(dst_hw_addr, src_hw_addr) 
+{
+    this->subtype(Dot11::PROBE_RESP);
+    memset(&_body, 0, sizeof(_body));
+}
+
+Dot11ProbeResponse::Dot11ProbeResponse(const uint8_t *buffer, uint32_t total_sz) 
+: Dot11ManagementFrame(buffer, total_sz) 
+{
+    uint32_t sz = management_frame_size();
+    buffer += sz;
+    total_sz -= sz;
+    if(total_sz < sizeof(_body))
+        throw malformed_packet();
+    memcpy(&_body, buffer, sizeof(_body));
+    buffer += sizeof(_body);
+    total_sz -= sizeof(_body);
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Dot11ProbeResponse::timestamp(uint64_t new_timestamp) {
+    this->_body.timestamp = Endian::host_to_le(new_timestamp);
+}
+
+void Dot11ProbeResponse::interval(uint16_t new_interval) {
+    this->_body.interval = Endian::host_to_le(new_interval);
+}
+
+uint32_t Dot11ProbeResponse::header_size() const {
+    return Dot11ManagementFrame::header_size() + sizeof(this->_body);
+}
+
+uint32_t Dot11ProbeResponse::write_fixed_parameters(uint8_t *buffer, uint32_t total_sz) {
+    uint32_t sz = sizeof(this->_body);
+    #ifdef TINS_DEBUG
+    assert(sz <= total_sz);
+    #endif
+    memcpy(buffer, &this->_body, sz);
+    return sz;
+}
+} // namespace Tins
+
+#endif // HAVE_DOT11
--- a/src/dot1q.cpp
+++ b/src/dot1q.cpp
@@ -111,7 +111,9 @@ void Dot1Q::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *)
    }
    std::memcpy(buffer, &_header, sizeof(_header));
    
-    buffer += sizeof(_header) + inner_pdu()->size();
+    buffer += sizeof(_header);
+    if(inner_pdu())
+        buffer += inner_pdu()->size();
    std::fill(buffer, buffer + trailer, 0);
 }

--- a/src/eapol.cpp
+++ b/src/eapol.cpp
@@ -32,8 +32,8 @@
 #include <cassert>
 #endif
 #include <stdexcept>
+ #include <iostream> // borrame
 #include "eapol.h"
-#include "dot11.h"
 #include "rsn_information.h"
 #include "exceptions.h"

@@ -57,6 +57,12 @@ EAPOL *EAPOL::from_bytes(const uint8_t *buffer, uint32_t total_sz) {
    if(total_sz < sizeof(eapolhdr))
        throw malformed_packet();
    const eapolhdr *ptr = (const eapolhdr*)buffer;
+    uint32_t data_len = Endian::be_to_host<uint16_t>(ptr->length);
+    // at least 4 for fields always present
+    total_sz = std::min(
+        total_sz, 
+        data_len + 4
+    );
    switch(ptr->type) {
        case RC4:
            return new Tins::RC4EAPOL(buffer, total_sz);
--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -82,6 +82,7 @@ EthernetII::EthernetII(const uint8_t *buffer, uint32_t total_sz)
            )
        );
    }
+
 }

 void EthernetII::dst_addr(const address_type &new_dst_addr) {
@@ -97,9 +98,19 @@ void EthernetII::payload_type(uint16_t new_payload_type) {
 }

 uint32_t EthernetII::header_size() const {
+
    return sizeof(ethhdr);
 }

+uint32_t EthernetII::trailer_size() const {
+    int32_t padding = 60 - sizeof(ethhdr); // EthernetII min size is 60, padding is sometimes needed
+    if (inner_pdu()) {
+        padding -= inner_pdu()->size();
+        padding = std::max(0, padding);
+    }
+    return padding;
+}
+
 #ifndef WIN32
 void EthernetII::send(PacketSender &sender, const NetworkInterface &iface) {
    if(!iface)
@@ -129,8 +140,7 @@ bool EthernetII::matches_response(const uint8_t *ptr, uint32_t total_sz) const {
    const size_t addr_sz = address_type::address_size;
    const ethhdr *eth_ptr = (const ethhdr*)ptr;
    if(std::equal(_eth.src_mac, _eth.src_mac + addr_sz, eth_ptr->dst_mac)) {
-        if(std::equal(_eth.src_mac, _eth.src_mac + addr_sz, eth_ptr->dst_mac) || dst_addr() == BROADCAST ||
-            (_eth.src_mac[0] == 0x33 && _eth.src_mac[1] == 0x33))
+        if(std::equal(_eth.src_mac, _eth.src_mac + addr_sz, eth_ptr->dst_mac) || !dst_addr().is_unicast())
        {
            return (inner_pdu()) ? inner_pdu()->matches_response(ptr + sizeof(_eth), total_sz - sizeof(_eth)) : true;
        }
@@ -140,7 +150,7 @@ bool EthernetII::matches_response(const uint8_t *ptr, uint32_t total_sz) const {

 void EthernetII::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent) {
    #ifdef TINS_DEBUG
-    assert(total_sz >= header_size());
+    assert(total_sz >= header_size() + trailer_size());
    #endif

    /* Inner type defaults to IP */
@@ -151,6 +161,14 @@ void EthernetII::write_serialization(uint8_t *buffer, uint32_t total_sz, const P
        payload_type(static_cast<uint16_t>(flag));
    }
    memcpy(buffer, &_eth, sizeof(ethhdr));
+    uint32_t trailer = trailer_size();
+    if (trailer) {
+        uint32_t trailer_offset = header_size();
+        if (inner_pdu())
+            trailer_offset += inner_pdu()->size();
+        memset(buffer + trailer_offset, 0, trailer);
+    }
+
 }

 #ifndef WIN32
--- a/src/handshake_capturer.cpp
+++ b/src/handshake_capturer.cpp
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2012, 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 "handshake_capturer.h"
+
+#ifdef HAVE_DOT11
+
+#include "dot11/dot11_data.h"
+
+namespace Tins {
+    bool RSNHandshakeCapturer::process_packet(const PDU &pdu) {
+        const RSNEAPOL *eapol = pdu.find_pdu<RSNEAPOL>();
+        const Dot11Data *dot11 = pdu.find_pdu<Dot11Data>();
+        if(!eapol || !dot11)
+            return false;
+        
+        
+        std::pair<address_type, address_type> addresses;
+        if(dot11->to_ds()) {
+            addresses.first = dot11->addr1();
+            addresses.second = dot11->addr2();
+        }
+        else if(dot11->from_ds()) {
+            addresses.first = dot11->addr2();
+            addresses.second = dot11->addr1();
+        }
+        else
+            return false;
+            
+        // 1st    
+        if(eapol->key_t() && eapol->key_ack() && !eapol->key_mic() && !eapol->install()) {
+            handshakes_[addresses].assign(eapol, eapol + 1);
+        }
+        else if(eapol->key_t() && eapol->key_mic() && !eapol->install() && !eapol->key_ack()) {
+            if(*std::max_element(eapol->nonce(), eapol->nonce() + RSNEAPOL::nonce_size) > 0)
+                do_insert(addresses, eapol, 1);
+            else if(do_insert(addresses, eapol, 3)) {
+                completed_handshakes_.push_back(
+                    handshake_type(
+                        addresses.first,
+                        addresses.second,
+                        handshakes_[addresses]
+                    )
+                );
+                handshakes_.erase(addresses);
+                return true;
+            }
+        }
+        else if(eapol->key_t() && eapol->install() && eapol->key_ack() && eapol->key_mic()) {
+            do_insert(addresses, eapol, 2);
+        }
+        return false;
+    }
+    
+    bool RSNHandshakeCapturer::do_insert(const handshake_map::key_type &key, 
+      const RSNEAPOL *eapol, size_t expected)
+    {
+        handshake_map::iterator iter = handshakes_.find(key);
+        if(iter != handshakes_.end()) {
+            if(iter->second.size() != expected) {
+                // skip repeated
+                if(iter->second.size() != expected + 1)
+                    iter->second.clear();
+            }
+            else {
+                iter->second.push_back(*eapol);
+                return true;
+            }
+        }
+        return false;
+    }
+} // namespace Tins;
+
+#endif // HAVE_DOT11
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -43,6 +43,7 @@

 namespace Tins {
 ICMP::ICMP(Flags flag) 
+: _orig_timestamp_or_address_mask(), _recv_timestamp(), _trans_timestamp()
 {
    std::memset(&_icmp, 0, sizeof(icmphdr));
    type(flag);
@@ -53,9 +54,28 @@ ICMP::ICMP(const uint8_t *buffer, uint32_t total_sz)
    if(total_sz < sizeof(icmphdr))
        throw malformed_packet();
    std::memcpy(&_icmp, buffer, sizeof(icmphdr));
+    buffer += sizeof(icmphdr);
    total_sz -= sizeof(icmphdr);
+    if(type() == TIMESTAMP_REQUEST || type() == TIMESTAMP_REPLY) {
+        if(total_sz < sizeof(uint32_t) * 3)
+            throw malformed_packet();
+        const uint32_t *ptr = reinterpret_cast<const uint32_t*>(buffer);
+        original_timestamp(*ptr++);
+        receive_timestamp(*ptr++);
+        transmit_timestamp(*ptr++);
+        total_sz -= sizeof(uint32_t) * 3;
+        buffer += sizeof(uint32_t) * 3;
+    }
+    else if(type() == ADDRESS_MASK_REQUEST || type() == ADDRESS_MASK_REPLY) {
+        if(total_sz < sizeof(uint32_t))
+            throw malformed_packet();
+        const uint32_t *ptr = reinterpret_cast<const uint32_t*>(buffer);
+        address_mask(address_type(*ptr++));
+        total_sz -= sizeof(uint32_t);
+        buffer += sizeof(uint32_t);
+    }
    if(total_sz)
-        inner_pdu(new RawPDU(buffer + sizeof(icmphdr), total_sz));
+        inner_pdu(new RawPDU(buffer, total_sz));
 }

 void ICMP::code(uint8_t new_code) {
@@ -78,8 +98,8 @@ void ICMP::sequence(uint16_t new_seq) {
    _icmp.un.echo.sequence = Endian::host_to_be(new_seq);
 }

-void ICMP::gateway(uint32_t new_gw) {
-    _icmp.un.gateway = Endian::host_to_be(new_gw);
+void ICMP::gateway(address_type new_gw) {
+    _icmp.un.gateway = Endian::host_to_be(static_cast<uint32_t>(new_gw));
 }

 void ICMP::mtu(uint16_t new_mtu) {
@@ -90,8 +110,29 @@ void ICMP::pointer(uint8_t new_pointer) {
    _icmp.un.pointer = new_pointer;
 }

+void ICMP::original_timestamp(uint32_t new_timestamp) {
+    _orig_timestamp_or_address_mask = Endian::host_to_be(new_timestamp);
+}
+
+void ICMP::receive_timestamp(uint32_t new_timestamp) {
+    _recv_timestamp = Endian::host_to_be(new_timestamp);
+}
+
+void ICMP::transmit_timestamp(uint32_t new_timestamp) {
+    _trans_timestamp = Endian::host_to_be(new_timestamp);
+}
+
+void ICMP::address_mask(address_type new_mask) {
+    _orig_timestamp_or_address_mask = Endian::host_to_be(static_cast<uint32_t>(new_mask));
+}
+
 uint32_t ICMP::header_size() const {
-    return sizeof(icmphdr);
+    uint32_t extra = 0;
+    if(type() == TIMESTAMP_REQUEST || type() == TIMESTAMP_REPLY) 
+        extra = sizeof(uint32_t) * 3;
+    else if(type() == ADDRESS_MASK_REQUEST || type() == ADDRESS_MASK_REPLY) 
+        extra = sizeof(uint32_t);
+    return sizeof(icmphdr) + extra;
 }

 void ICMP::set_echo_request(uint16_t id, uint16_t seq) {
@@ -143,7 +184,7 @@ void ICMP::set_source_quench() {
    type(SOURCE_QUENCH);
 }

-void ICMP::set_redirect(uint8_t icode, uint32_t address) {
+void ICMP::set_redirect(uint8_t icode, address_type address) {
    type(REDIRECT);
    code(icode);
    gateway(address);
@@ -153,22 +194,36 @@ void ICMP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *)
    #ifdef TINS_DEBUG
    assert(total_sz >= sizeof(icmphdr));
    #endif
-    if(!_icmp.check) {
-        uint32_t checksum = Utils::do_checksum(buffer + sizeof(icmphdr), buffer + total_sz) + 
-                            Utils::do_checksum((uint8_t*)&_icmp, ((uint8_t*)&_icmp) + sizeof(icmphdr));
-        while (checksum >> 16)
-            checksum = (checksum & 0xffff) + (checksum >> 16);
-        _icmp.check = Endian::host_to_be<uint16_t>(~checksum);
+
+    if(type() == TIMESTAMP_REQUEST || type() == TIMESTAMP_REPLY) {
+        uint32_t *ptr = reinterpret_cast<uint32_t*>(buffer + sizeof(icmphdr));
+        *ptr++ = original_timestamp();
+        *ptr++ = receive_timestamp();
+        *ptr++ = transmit_timestamp();
    }
-    memcpy(buffer, &_icmp, sizeof(icmphdr));
+    else if(type() == ADDRESS_MASK_REQUEST || type() == ADDRESS_MASK_REPLY) {
+        uint32_t *ptr = reinterpret_cast<uint32_t*>(buffer + sizeof(icmphdr));
+        *ptr++ = address_mask();
+    }
+    // checksum calc
    _icmp.check = 0;
+    memcpy(buffer, &_icmp, sizeof(icmphdr));
+    uint32_t checksum = Utils::do_checksum(buffer, buffer + total_sz);
+
+    while (checksum >> 16)
+        checksum = (checksum & 0xffff) + (checksum >> 16);
+
+    _icmp.check = Endian::host_to_be<uint16_t>(~checksum);
+    ((icmphdr*)buffer)->check = _icmp.check;
 }

 bool ICMP::matches_response(const uint8_t *ptr, uint32_t total_sz) const {
    if(total_sz < sizeof(icmphdr))
        return false;
    const icmphdr *icmp_ptr = (const icmphdr*)ptr;
-    if(_icmp.type == ECHO_REQUEST && icmp_ptr->type == ECHO_REPLY) {
+    if((_icmp.type == ECHO_REQUEST && icmp_ptr->type == ECHO_REPLY) || 
+        (_icmp.type == TIMESTAMP_REQUEST && icmp_ptr->type == TIMESTAMP_REPLY) ||
+        (_icmp.type == ADDRESS_MASK_REQUEST && icmp_ptr->type == ADDRESS_MASK_REPLY)) {
        return icmp_ptr->un.echo.id == _icmp.un.echo.id && icmp_ptr->un.echo.sequence == _icmp.un.echo.sequence;
    }
    return false;
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -225,7 +225,7 @@ void ICMPv6::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *
        buffer = write_option(*it, buffer);
    }
    if(!_header.cksum) {
-        const Tins::IPv6 *ipv6 = dynamic_cast<const Tins::IPv6*>(parent);
+        const Tins::IPv6 *ipv6 = tins_cast<const Tins::IPv6*>(parent);
        if(ipv6) {
            uint32_t checksum = Utils::pseudoheader_checksum(
                                    ipv6->src_addr(),  
@@ -294,39 +294,57 @@ void ICMPv6::prefix_info(prefix_info_type info) {
    );
 }

-void ICMPv6::redirect_header(PDU::serialization_type data) {
-    // Reserved fields
-    data.insert(data.begin(), 6, 0);
-    // Padding(if necessary)
-    uint8_t padding = 8 - (data.size() + sizeof(uint8_t) * 2) % 8;
-    if(padding == 8)
-        padding = 0;
-    data.insert(data.end(), padding, 0);
+void ICMPv6::redirect_header(const byte_array& data) {
    add_option(option(REDIRECT_HEADER, data.begin(), data.end()));
 }

-void ICMPv6::mtu(uint32_t value) {
+void ICMPv6::mtu(const mtu_type& value) {
    uint8_t buffer[sizeof(uint16_t) + sizeof(uint32_t)] = {0};
-    *((uint32_t*)(buffer + sizeof(uint16_t))) = Endian::host_to_be(value);
+    const uint16_t u16_tmp = value.first; 
+    const uint32_t u32_tmp = value.second; 
+    buffer[0] = u16_tmp >> 8;
+    buffer[1] = u16_tmp & 0xff;
+
+    buffer[2] = u32_tmp >> 24;
+    buffer[3] = u32_tmp >> 16;
+    buffer[4] = u32_tmp >> 8;
+    buffer[5] = u32_tmp & 0xff;
    add_option(option(MTU, sizeof(buffer), buffer));
 }

-void ICMPv6::shortcut_limit(uint8_t value) {
+void ICMPv6::shortcut_limit(const shortcut_limit_type &value) {
    uint8_t buffer[sizeof(uint16_t) + sizeof(uint32_t)] = {0};
-    buffer[0] = value;
+    const uint32_t u32_tmp = value.reserved2; 
+    buffer[0] = value.limit;
+    buffer[1] = value.reserved1;
+    buffer[2] = u32_tmp >> 24;
+    buffer[3] = u32_tmp >> 16;
+    buffer[4] = u32_tmp >> 8;
+    buffer[5] = u32_tmp & 0xff;
    add_option(option(NBMA_SHORT_LIMIT, sizeof(buffer), buffer));
 }

-void ICMPv6::new_advert_interval(uint32_t value) {
+void ICMPv6::new_advert_interval(const new_advert_interval_type &value) {
    uint8_t buffer[sizeof(uint16_t) + sizeof(uint32_t)] = {0};
-    *((uint32_t*)(buffer + sizeof(uint16_t))) = Endian::host_to_be(value);
+    const uint16_t u16_tmp = value.reserved;
+    const uint32_t u32_tmp = value.interval;
+    buffer[0] = u16_tmp >> 8;
+    buffer[1] = u16_tmp & 0xff;
+
+    buffer[2] = u32_tmp >> 24;
+    buffer[3] = u32_tmp >> 16;
+    buffer[4] = u32_tmp >> 8;
+    buffer[5] = u32_tmp & 0xff;
    add_option(option(ADVERT_INTERVAL, sizeof(buffer), buffer));
 }

 void ICMPv6::new_home_agent_info(const new_ha_info_type &value) {
+    if(value.size() != 3)
+        throw malformed_option();
    uint8_t buffer[sizeof(uint16_t) + sizeof(uint32_t)] = {0};
-    *((uint16_t*)(buffer + sizeof(uint16_t))) = Endian::host_to_be(value.first);
-    *((uint16_t*)(buffer + sizeof(uint16_t) * 2)) = Endian::host_to_be(value.second);
+    *((uint16_t*)(buffer + sizeof(uint16_t))) = Endian::host_to_be(value[0]);
+    *((uint16_t*)(buffer + sizeof(uint16_t))) = Endian::host_to_be(value[1]);
+    *((uint16_t*)(buffer + sizeof(uint16_t) * 2)) = Endian::host_to_be(value[2]);
    add_option(option(HOME_AGENT_INFO, sizeof(buffer), buffer));
 }

@@ -339,10 +357,12 @@ void ICMPv6::target_addr_list(const addr_list_type &value) {
 }

 void ICMPv6::add_addr_list(uint8_t type, const addr_list_type &value) {
+    typedef addr_list_type::addresses_type::const_iterator iterator;
+    
    std::vector<uint8_t> buffer;
-    buffer.reserve(value.size() + 6);
-    buffer.insert(buffer.end(), 6, 0);
-    for(addr_list_type::const_iterator it(value.begin()); it != value.end(); ++it)
+    buffer.reserve(value.addresses.size() + 6);
+    buffer.insert(buffer.end(), value.reserved, value.reserved + 6);
+    for(iterator it = value.addresses.begin(); it != value.addresses.end(); ++it)
        buffer.insert(buffer.end(), it->begin(), it->end());
    add_option(option(type, buffer.begin(), buffer.end()));
 }
@@ -361,10 +381,10 @@ void ICMPv6::rsa_signature(const rsa_sign_type &value) {
    add_option(option(RSA_SIGN, buffer.begin(), buffer.end()));
 }

-void ICMPv6::timestamp(uint64_t value) {
+void ICMPv6::timestamp(const timestamp_type &value) {
    std::vector<uint8_t> buffer(6 + sizeof(uint64_t));
-    buffer.insert(buffer.begin(), 6, 0);
-    *((uint64_t*)&buffer[6]) = Endian::host_to_be(value);
+    std::copy(value.reserved, value.reserved + 6, buffer.begin());
+    *((uint64_t*)&buffer[6]) = Endian::host_to_be(value.timestamp);
    add_option(option(TIMESTAMP, buffer.begin(), buffer.end()));
 }

@@ -394,8 +414,9 @@ void ICMPv6::link_layer_addr(lladdr_type value) {

 void ICMPv6::naack(const naack_type &value) {
    uint8_t buffer[6];
-    buffer[0] = value.first;
-    buffer[1] = value.second;
+    buffer[0] = value.code;
+    buffer[1] = value.status;
+    std::copy(value.reserved, value.reserved + 4, buffer + 2);
    add_option(option(NAACK, buffer, buffer + sizeof(buffer)));
 }

@@ -536,72 +557,35 @@ void ICMPv6::dns_search_list(const dns_search_list_type &value) {
 // ********************************************************************

 ICMPv6::hwaddress_type ICMPv6::source_link_layer_addr() const {
-    const option *opt = search_option(SOURCE_ADDRESS);
-    if(!opt || opt->data_size() != hwaddress_type::address_size)
-        throw option_not_found();
-    return hwaddress_type(opt->data_ptr());
+    return search_and_convert<hwaddress_type>(SOURCE_ADDRESS);
 }

 ICMPv6::hwaddress_type ICMPv6::target_link_layer_addr() const {
-    const option *opt = search_option(TARGET_ADDRESS);
-    if(!opt || opt->data_size() != hwaddress_type::address_size)
-        throw option_not_found();
-    return hwaddress_type(opt->data_ptr());
+    return search_and_convert<hwaddress_type>(TARGET_ADDRESS);
 }

 ICMPv6::prefix_info_type ICMPv6::prefix_info() const {
-    const option *opt = search_option(PREFIX_INFO);
-    if(!opt || opt->data_size() != 2 + sizeof(uint32_t) * 3 + ipaddress_type::address_size)
-        throw option_not_found();
-    const uint8_t *ptr = opt->data_ptr();
-    prefix_info_type output;
-    output.prefix_len = *ptr++;
-    output.L = (*ptr >> 7) & 0x1;
-    output.A = (*ptr++ >> 6) & 0x1;
-    output.valid_lifetime = Endian::be_to_host(*(uint32_t*)ptr);
-    ptr += sizeof(uint32_t);
-    output.preferred_lifetime = Endian::be_to_host(*(uint32_t*)ptr);
-    output.prefix = ptr + sizeof(uint32_t) * 2;
-    return output;
+    return search_and_convert<prefix_info_type>(PREFIX_INFO);
 }

-PDU::serialization_type ICMPv6::redirect_header() const {
-    const option *opt = search_option(REDIRECT_HEADER);
-    if(!opt || opt->data_size() < 6)
-        throw option_not_found();
-    const uint8_t *ptr = opt->data_ptr() + 6;
-    return serialization_type(ptr, ptr + opt->data_size() - 6);
+byte_array ICMPv6::redirect_header() const {
+    return search_and_convert<PDU::serialization_type>(REDIRECT_HEADER);
 }

-uint32_t ICMPv6::mtu() const {
-    const option *opt = search_option(MTU);
-    if(!opt || opt->data_size() != sizeof(uint16_t) + sizeof(uint32_t))
-        throw option_not_found();
-    return Endian::be_to_host(*(const uint32_t*)(opt->data_ptr() + sizeof(uint16_t)));
+ICMPv6::mtu_type ICMPv6::mtu() const {
+    return search_and_convert<mtu_type>(MTU);
 }

-uint8_t ICMPv6::shortcut_limit() const {
-    const option *opt = search_option(NBMA_SHORT_LIMIT);
-    if(!opt || opt->data_size() != sizeof(uint16_t) + sizeof(uint32_t))
-        throw option_not_found();
-    return *opt->data_ptr();
+ICMPv6::shortcut_limit_type ICMPv6::shortcut_limit() const {
+    return search_and_convert<shortcut_limit_type>(NBMA_SHORT_LIMIT);
 }

-uint32_t ICMPv6::new_advert_interval() const {
-    const option *opt = search_option(ADVERT_INTERVAL);
-    if(!opt || opt->data_size() != sizeof(uint16_t) + sizeof(uint32_t))
-        throw option_not_found();
-    return Endian::be_to_host(*(const uint32_t*)(opt->data_ptr() + sizeof(uint16_t)));
+ICMPv6::new_advert_interval_type ICMPv6::new_advert_interval() const {
+    return search_and_convert<new_advert_interval_type>(ADVERT_INTERVAL);
 }

 ICMPv6::new_ha_info_type ICMPv6::new_home_agent_info() const {
-    const option *opt = search_option(HOME_AGENT_INFO);
-    if(!opt || opt->data_size() != sizeof(uint16_t) + sizeof(uint32_t))
-        throw option_not_found();
-    return std::make_pair(
-        Endian::be_to_host(*(const uint16_t*)(opt->data_ptr() + sizeof(uint16_t))),
-        Endian::be_to_host(*(const uint16_t*)(opt->data_ptr() + sizeof(uint16_t) * 2))
-    );
+    return search_and_convert<new_ha_info_type>(HOME_AGENT_INFO);
 }

 ICMPv6::addr_list_type ICMPv6::source_addr_list() const {
@@ -613,87 +597,150 @@ ICMPv6::addr_list_type ICMPv6::target_addr_list() const {
 }

 ICMPv6::addr_list_type ICMPv6::search_addr_list(OptionTypes type) const {
-    const option *opt = search_option(type);
-    if(!opt || opt->data_size() < 6 + ipaddress_type::address_size)
-        throw option_not_found();
+    return search_and_convert<addr_list_type>(type);
+}
+
+ICMPv6::rsa_sign_type ICMPv6::rsa_signature() const {
+    return search_and_convert<rsa_sign_type>(RSA_SIGN);
+}
+
+ICMPv6::timestamp_type ICMPv6::timestamp() const {
+    return search_and_convert<timestamp_type>(TIMESTAMP);
+}
+
+ICMPv6::nonce_type ICMPv6::nonce() const {
+    return search_and_convert<nonce_type>(NONCE);
+}
+
+ICMPv6::ip_prefix_type ICMPv6::ip_prefix() const {
+    return search_and_convert<ip_prefix_type>(IP_PREFIX);
+}   
+
+ICMPv6::lladdr_type ICMPv6::link_layer_addr() const {
+    return search_and_convert<lladdr_type>(LINK_ADDRESS);
+}
+
+ICMPv6::naack_type ICMPv6::naack() const {
+    return search_and_convert<naack_type>(NAACK);
+}
+
+ICMPv6::map_type ICMPv6::map() const {
+    return search_and_convert<map_type>(MAP);
+}
+
+ICMPv6::route_info_type ICMPv6::route_info() const {
+    return search_and_convert<route_info_type>(ROUTE_INFO);
+}
+
+ICMPv6::recursive_dns_type ICMPv6::recursive_dns_servers() const {
+    return search_and_convert<recursive_dns_type>(RECURSIVE_DNS_SERV);
+}
+
+ICMPv6::handover_key_req_type ICMPv6::handover_key_request() const {
+    return search_and_convert<handover_key_req_type>(HANDOVER_KEY_REQ);
+}
+
+ICMPv6::handover_key_reply_type ICMPv6::handover_key_reply() const {
+    return search_and_convert<handover_key_reply_type>(HANDOVER_KEY_REPLY);
+}
+
+ICMPv6::handover_assist_info_type ICMPv6::handover_assist_info() const {
+    return search_and_convert<handover_assist_info_type>(HANDOVER_ASSIST_INFO);
+}
+
+ICMPv6::mobile_node_id_type ICMPv6::mobile_node_identifier() const {
+    return search_and_convert<mobile_node_id_type>(MOBILE_NODE_ID);
+}
+
+ICMPv6::dns_search_list_type ICMPv6::dns_search_list() const {
+    return search_and_convert<dns_search_list_type>(DNS_SEARCH_LIST);
+}
+
+// Options stuff
+
+ICMPv6::addr_list_type ICMPv6::addr_list_type::from_option(const option &opt) 
+{
+    if(opt.data_size() < 6 + ipaddress_type::address_size || (opt.data_size() - 6) % ipaddress_type::address_size != 0)
+        throw malformed_option();
    addr_list_type output;
-    const uint8_t *ptr = opt->data_ptr() + 6, *end = opt->data_ptr() + opt->data_size();
+    const uint8_t *ptr = opt.data_ptr(), *end = opt.data_ptr() + opt.data_size();
+    std::copy(ptr, ptr + 6, output.reserved);
+    ptr += 6;
    while(ptr < end) {
-        if(ptr + ipaddress_type::address_size > end)
-            throw option_not_found();
-        output.push_back(ipaddress_type(ptr));
-        ptr += ipaddress_type::address_size;
+        output.addresses.push_back(ICMPv6::ipaddress_type(ptr));
+        ptr += ICMPv6::ipaddress_type::address_size;
    }
    return output;
 }

-ICMPv6::rsa_sign_type ICMPv6::rsa_signature() const {
-    const option *opt = search_option(RSA_SIGN);
-    // 2 bytes reserved + at least 1 byte signature.
-    // 16 == sizeof(rsa_sign_type::key_hash), removed the sizeof
-    // expression since gcc 4.2 doesn't like it
-    if(!opt || opt->data_size() < 2 + 16 + 1)
-        throw option_not_found();
-    const uint8_t *ptr = opt->data_ptr() + 2;
-    rsa_sign_type output;
-    std::copy(ptr, ptr + sizeof(output.key_hash), output.key_hash);
-    ptr += sizeof(output.key_hash);
-    output.signature.assign(ptr, opt->data_ptr() + opt->data_size());
+ICMPv6::naack_type ICMPv6::naack_type::from_option(const option &opt) 
+{
+    if(opt.data_size() != 6)
+        throw malformed_option();
+    return naack_type(*opt.data_ptr(), opt.data_ptr()[1]);
+}
+
+ICMPv6::lladdr_type ICMPv6::lladdr_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    lladdr_type output(*ptr++);
+    output.address.assign(ptr, opt.data_ptr() + opt.data_size());
    return output;
 }

-uint64_t ICMPv6::timestamp() const {
-    const option *opt = safe_search_option<std::less>(
-        TIMESTAMP, 6 + sizeof(uint64_t)
-    );
-    return Endian::be_to_host(*(uint64_t*)(opt->data_ptr() + 6));
+ICMPv6::prefix_info_type ICMPv6::prefix_info_type::from_option(const option &opt) 
+{
+    if(opt.data_size() != 2 + sizeof(uint32_t) * 3 + ICMPv6::ipaddress_type::address_size)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    prefix_info_type output;
+    output.prefix_len = *ptr++;
+    output.L = (*ptr >> 7) & 0x1;
+    output.A = (*ptr++ >> 6) & 0x1;
+    output.valid_lifetime = Endian::be_to_host(*(uint32_t*)ptr);
+    ptr += sizeof(uint32_t);
+    output.preferred_lifetime = Endian::be_to_host(*(uint32_t*)ptr);
+    output.prefix = ptr + sizeof(uint32_t) * 2;
+    return output;
 }

-ICMPv6::nonce_type ICMPv6::nonce() const {
-    const option *opt = safe_search_option<std::equal_to>(
-        NONCE, 0
-    );
-    return nonce_type(opt->data_ptr(), opt->data_ptr() + opt->data_size());
+ICMPv6::rsa_sign_type ICMPv6::rsa_sign_type::from_option(const option &opt)
+{
+    // 2 bytes reserved + at least 1 byte signature.
+    // 16 == sizeof(rsa_sign_type::key_hash), removed the sizeof
+    // expression since gcc 4.2 doesn't like it
+    if(opt.data_size() < 2 + 16 + 1)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + 2;
+    rsa_sign_type output;
+    std::copy(ptr, ptr + sizeof(output.key_hash), output.key_hash);
+    ptr += sizeof(output.key_hash);
+    output.signature.assign(ptr, opt.data_ptr() + opt.data_size());
+    return output;
 }

-ICMPv6::ip_prefix_type ICMPv6::ip_prefix() const {
-    const option *opt = safe_search_option<std::less>(
-        IP_PREFIX, 2
-    );
-    const uint8_t *ptr = opt->data_ptr();
+ICMPv6::ip_prefix_type ICMPv6::ip_prefix_type::from_option(const option &opt)
+{
+    // 2 bytes + 4 padding + ipv6 address
+    if(opt.data_size() != 2 + 4 + ICMPv6::ipaddress_type::address_size)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
    ip_prefix_type output;
    output.option_code = *ptr++;
    output.prefix_len = *ptr++;
    // skip padding
    ptr += sizeof(uint32_t);
-    output.address = ipaddress_type(ptr);
-    return output;
-}   
-
-ICMPv6::lladdr_type ICMPv6::link_layer_addr() const {
-    // at least the option_code and 1 byte from the link layer address
-    const option *opt = safe_search_option<std::less>(
-        LINK_ADDRESS, 2
-    );
-    const uint8_t *ptr = opt->data_ptr();
-    lladdr_type output(*ptr++);
-    output.address.assign(ptr, opt->data_ptr() + opt->data_size());
+    output.address = ICMPv6::ipaddress_type(ptr);
    return output;
 }

-ICMPv6::naack_type ICMPv6::naack() const {
-    const option *opt = safe_search_option<std::not_equal_to>(
-        NAACK, 6
-    );
-    const uint8_t *ptr = opt->data_ptr();
-    return naack_type(ptr[0], ptr[1]);
-}
-
-ICMPv6::map_type ICMPv6::map() const {
-    const option *opt = safe_search_option<std::not_equal_to>(
-        MAP, 2 + sizeof(uint32_t) + ipaddress_type::address_size
-    );
-    const uint8_t *ptr = opt->data_ptr();
+ICMPv6::map_type ICMPv6::map_type::from_option(const option &opt)
+{
+    if(opt.data_size() != 2 + sizeof(uint32_t) + ipaddress_type::address_size)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
    map_type output;
    output.dist = (*ptr >> 4) & 0x0f;
    output.pref = *ptr++ & 0x0f;
@@ -704,98 +751,98 @@ ICMPv6::map_type ICMPv6::map() const {
    return output;
 }

-ICMPv6::route_info_type ICMPv6::route_info() const {
-    const option *opt = safe_search_option<std::less>(
-        ROUTE_INFO, 2 + sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr();
+ICMPv6::route_info_type ICMPv6::route_info_type::from_option(const option &opt) 
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
    route_info_type output;
    output.prefix_len = *ptr++;
    output.pref = (*ptr++ >> 3) & 0x3;
    output.route_lifetime = Endian::be_to_host(*(uint32_t*)ptr);
    ptr += sizeof(uint32_t);
-    output.prefix.assign(ptr, opt->data_ptr() + opt->data_size());
+    output.prefix.assign(ptr, opt.data_ptr() + opt.data_size());
    return output;
 }

-ICMPv6::recursive_dns_type ICMPv6::recursive_dns_servers() const {
-    const option *opt = safe_search_option<std::less>(
-        RECURSIVE_DNS_SERV, 2 + sizeof(uint32_t) + ipaddress_type::address_size
-    );
-    const uint8_t *ptr = opt->data_ptr() + 2, *end = opt->data_ptr() + opt->data_size();
+ICMPv6::recursive_dns_type ICMPv6::recursive_dns_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t) + ICMPv6::ipaddress_type::address_size)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + 2, *end = opt.data_ptr() + opt.data_size();
    recursive_dns_type output;
    output.lifetime = Endian::be_to_host(*(uint32_t*)ptr);
    ptr += sizeof(uint32_t);
    while(ptr < end) {
-        if(ptr + ipaddress_type::address_size > end)
+        if(ptr + ICMPv6::ipaddress_type::address_size > end)
            throw option_not_found();
        output.servers.push_back(ptr);
-        ptr += ipaddress_type::address_size;
+        ptr += ICMPv6::ipaddress_type::address_size;
    }
    return output;
 }

-ICMPv6::handover_key_req_type ICMPv6::handover_key_request() const {
-    const option *opt = safe_search_option<std::less>(
-        HANDOVER_KEY_REQ, 2 + sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr() + 1, *end = opt->data_ptr() + opt->data_size();
+ICMPv6::handover_key_req_type ICMPv6::handover_key_req_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t))
+        throw option_not_found();
+    const uint8_t *ptr = opt.data_ptr() + 1, *end = opt.data_ptr() + opt.data_size();
    handover_key_req_type output;
    output.AT = (*ptr++ >> 4) & 0x3;
    // is there enough size for the indicated padding?
-    if(end - ptr < *opt->data_ptr())
-        throw option_not_found();
-    output.key.assign(ptr, ptr + ((end - ptr) - *opt->data_ptr()));
+    if(end - ptr < *opt.data_ptr())
+        throw malformed_option();
+    output.key.assign(ptr, ptr + ((end - ptr) - *opt.data_ptr()));
    return output;
 }

-ICMPv6::handover_key_reply_type ICMPv6::handover_key_reply() const {
-    const option *opt = safe_search_option<std::less>(
-        HANDOVER_KEY_REPLY, 2 + sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr() + 1, *end = opt->data_ptr() + opt->data_size();
+ICMPv6::handover_key_reply_type ICMPv6::handover_key_reply_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + 1, *end = opt.data_ptr() + opt.data_size();
    handover_key_reply_type output;
    output.AT = (*ptr++ >> 4) & 0x3;
    output.lifetime = Endian::be_to_host(*(uint16_t*)ptr);
    ptr += sizeof(uint16_t);
    // is there enough size for the indicated padding?
-    if(end - ptr < *opt->data_ptr())
-        throw option_not_found();
-    output.key.assign(ptr, ptr + ((end - ptr) - *opt->data_ptr()));
+    if(end - ptr < *opt.data_ptr())
+        throw malformed_option();
+    output.key.assign(ptr, ptr + ((end - ptr) - *opt.data_ptr()));
    return output;
 }

-ICMPv6::handover_assist_info_type ICMPv6::handover_assist_info() const {
-    const option *opt = safe_search_option<std::less>(
-        HANDOVER_ASSIST_INFO, 2
-    );
-    const uint8_t *ptr = opt->data_ptr(), *end = ptr + opt->data_size();
+ICMPv6::handover_assist_info_type ICMPv6::handover_assist_info_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
    handover_assist_info_type output;
    output.option_code = *ptr++;
    if((end - ptr - 1) < *ptr)
-        throw option_not_found();
+        throw malformed_option();
    output.hai.assign(ptr + 1, ptr + 1 + *ptr);
    return output;
 }

-ICMPv6::mobile_node_id_type ICMPv6::mobile_node_identifier() const {
-    const option *opt = safe_search_option<std::less>(
-        MOBILE_NODE_ID, 2
-    );
-    const uint8_t *ptr = opt->data_ptr(), *end = ptr + opt->data_size();
+ICMPv6::mobile_node_id_type ICMPv6::mobile_node_id_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
    mobile_node_id_type output;
    output.option_code = *ptr++;
    if((end - ptr - 1) < *ptr)
-        throw option_not_found();
+        throw malformed_option();
    output.mn.assign(ptr + 1, ptr + 1 + *ptr);
    return output;
 }

-ICMPv6::dns_search_list_type ICMPv6::dns_search_list() const {
-    const option *opt = safe_search_option<std::less>(
-        DNS_SEARCH_LIST, 2 + sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr(), *end = ptr + opt->data_size();
+ICMPv6::dns_search_list_type ICMPv6::dns_search_list_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
    dns_search_list_type output;
    output.lifetime = Endian::be_to_host(*(uint32_t*)(ptr + 2));
    ptr += 2 + sizeof(uint32_t);
@@ -815,5 +862,35 @@ ICMPv6::dns_search_list_type ICMPv6::dns_search_list() const {
    }
    return output;
 }
+
+ICMPv6::timestamp_type ICMPv6::timestamp_type::from_option(const option &opt)
+{
+    if(opt.data_size() != 6 + sizeof(uint64_t))
+        throw malformed_option();
+    timestamp_type output(Endian::be_to_host(*(uint64_t*)(opt.data_ptr() + 6)));
+    std::copy(opt.data_ptr(), opt.data_ptr() + 6, output.reserved);
+    return output;
+}
+
+ICMPv6::shortcut_limit_type ICMPv6::shortcut_limit_type::from_option(const option &opt)
+{
+    if(opt.data_size() != 6)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    shortcut_limit_type output(*ptr++);
+    output.reserved1 = *ptr++;
+    output.reserved2 = Endian::be_to_host(*(uint32_t*)ptr);
+    return output;
+}
+
+ICMPv6::new_advert_interval_type ICMPv6::new_advert_interval_type::from_option(const option &opt)
+{
+    if(opt.data_size() != 6)
+        throw malformed_option();
+    new_advert_interval_type output;
+    output.reserved = Endian::be_to_host(*(uint16_t*)opt.data_ptr());
+    output.interval = Endian::be_to_host(*(uint32_t*)(opt.data_ptr() + sizeof(uint16_t)));
+    return output;
+}
 }

--- a/src/internals.cpp
+++ b/src/internals.cpp
@@ -32,13 +32,21 @@
 #include "ethernetII.h"
 #include "ieee802_3.h"
 #include "radiotap.h"
-#include "dot11.h"
+#include "dot11/dot11_base.h"
 #include "ipv6.h"
+#include "tcp.h"
+#include "udp.h"
+#include "ipsec.h"
+#include "icmp.h"
+#include "icmpv6.h"
 #include "arp.h"
 #include "eapol.h"
 #include "rawpdu.h"
 #include "dot1q.h"
 #include "pppoe.h"
+#include "ip_address.h"
+#include "ipv6_address.h"
+#include "pdu_allocator.h"

 using std::string;

@@ -72,22 +80,59 @@ Tins::PDU *pdu_from_flag(Constants::Ethernet::e flag, const uint8_t *buffer,
 {
    switch(flag) {
        case Tins::Constants::Ethernet::IP:
-            return new Tins::IP(buffer, size);
+            return new IP(buffer, size);
        case Constants::Ethernet::IPV6:
-            return new Tins::IPv6(buffer, size);
+            return new IPv6(buffer, size);
        case Tins::Constants::Ethernet::ARP:
-            return new Tins::ARP(buffer, size);
+            return new ARP(buffer, size);
        case Tins::Constants::Ethernet::PPPOED:
-            return new Tins::PPPoE(buffer, size);
+            return new PPPoE(buffer, size);
        case Tins::Constants::Ethernet::EAPOL:
-            return Tins::EAPOL::from_bytes(buffer, size);
+            return EAPOL::from_bytes(buffer, size);
        case Tins::Constants::Ethernet::VLAN:
-            return new Tins::Dot1Q(buffer, size);
+            return new Dot1Q(buffer, size);
        default:
+            {
+                PDU *pdu = Internals::allocate<EthernetII>(
+                    static_cast<uint16_t>(flag),
+                    buffer, 
+                    size
+                );
+                if(pdu)
+                    return pdu;
+            }
            return rawpdu_on_no_match ? new RawPDU(buffer, size) : 0;
    };
 }

+Tins::PDU *pdu_from_flag(Constants::IP::e flag, const uint8_t *buffer, 
+  uint32_t size, bool rawpdu_on_no_match) 
+{
+    switch(flag) {
+        case Constants::IP::PROTO_IPIP:
+            return new Tins::TCP(buffer, size);
+        case Constants::IP::PROTO_TCP:
+            return new Tins::TCP(buffer, size);
+        case Constants::IP::PROTO_UDP:
+            return new Tins::UDP(buffer, size);
+        case Constants::IP::PROTO_ICMP:
+            return new Tins::ICMP(buffer, size);
+        case Constants::IP::PROTO_ICMPV6:
+            return new Tins::ICMPv6(buffer, size);
+        case Constants::IP::PROTO_IPV6:
+            return new Tins::IPv6(buffer, size);
+        case Constants::IP::PROTO_AH:
+            return new Tins::IPSecAH(buffer, size);
+        case Constants::IP::PROTO_ESP:
+            return new Tins::IPSecESP(buffer, size);
+        default:
+            break;
+    }
+    if(rawpdu_on_no_match)
+        return new Tins::RawPDU(buffer, size);
+    return 0;
+}
+
 Tins::PDU *pdu_from_flag(PDU::PDUType type, const uint8_t *buffer, uint32_t size) 
 {
    switch(type) {
@@ -101,33 +146,35 @@ Tins::PDU *pdu_from_flag(PDU::PDUType type, const uint8_t *buffer, uint32_t size
            return new Tins::ARP(buffer, size);
        case Tins::PDU::IEEE802_3:
            return new Tins::IEEE802_3(buffer, size);
-        case Tins::PDU::RADIOTAP:
-            return new Tins::RadioTap(buffer, size);
        case Tins::PDU::PPPOE:
            return new Tins::PPPoE(buffer, size);
-        case Tins::PDU::DOT11:
-        case Tins::PDU::DOT11_ACK:
-        case Tins::PDU::DOT11_ASSOC_REQ:
-        case Tins::PDU::DOT11_ASSOC_RESP:
-        case Tins::PDU::DOT11_AUTH:
-        case Tins::PDU::DOT11_BEACON:
-        case Tins::PDU::DOT11_BLOCK_ACK:
-        case Tins::PDU::DOT11_BLOCK_ACK_REQ:
-        case Tins::PDU::DOT11_CF_END:
-        case Tins::PDU::DOT11_DATA:
-        case Tins::PDU::DOT11_CONTROL:
-        case Tins::PDU::DOT11_DEAUTH:
-        case Tins::PDU::DOT11_DIASSOC:
-        case Tins::PDU::DOT11_END_CF_ACK:
-        case Tins::PDU::DOT11_MANAGEMENT:
-        case Tins::PDU::DOT11_PROBE_REQ:
-        case Tins::PDU::DOT11_PROBE_RESP:
-        case Tins::PDU::DOT11_PS_POLL:
-        case Tins::PDU::DOT11_REASSOC_REQ:
-        case Tins::PDU::DOT11_REASSOC_RESP:
-        case Tins::PDU::DOT11_RTS:
-        case Tins::PDU::DOT11_QOS_DATA:
-            return Tins::Dot11::from_bytes(buffer, size);
+        #ifdef HAVE_DOT11
+            case Tins::PDU::RADIOTAP:
+                return new Tins::RadioTap(buffer, size);
+            case Tins::PDU::DOT11:
+            case Tins::PDU::DOT11_ACK:
+            case Tins::PDU::DOT11_ASSOC_REQ:
+            case Tins::PDU::DOT11_ASSOC_RESP:
+            case Tins::PDU::DOT11_AUTH:
+            case Tins::PDU::DOT11_BEACON:
+            case Tins::PDU::DOT11_BLOCK_ACK:
+            case Tins::PDU::DOT11_BLOCK_ACK_REQ:
+            case Tins::PDU::DOT11_CF_END:
+            case Tins::PDU::DOT11_DATA:
+            case Tins::PDU::DOT11_CONTROL:
+            case Tins::PDU::DOT11_DEAUTH:
+            case Tins::PDU::DOT11_DIASSOC:
+            case Tins::PDU::DOT11_END_CF_ACK:
+            case Tins::PDU::DOT11_MANAGEMENT:
+            case Tins::PDU::DOT11_PROBE_REQ:
+            case Tins::PDU::DOT11_PROBE_RESP:
+            case Tins::PDU::DOT11_PS_POLL:
+            case Tins::PDU::DOT11_REASSOC_REQ:
+            case Tins::PDU::DOT11_REASSOC_RESP:
+            case Tins::PDU::DOT11_RTS:
+            case Tins::PDU::DOT11_QOS_DATA:
+                return Tins::Dot11::from_bytes(buffer, size);
+        #endif // HAVE_DOT11
        default:
            return 0;
    };
@@ -146,8 +193,69 @@ Constants::Ethernet::e pdu_flag_to_ether_type(PDU::PDUType flag) {
        case PDU::PPPOE:
            return Constants::Ethernet::PPPOED;
        default:
+            if(Internals::pdu_type_registered<EthernetII>(flag))
+                return static_cast<Constants::Ethernet::e>(
+                    Internals::pdu_type_to_id<EthernetII>(flag)
+                );
            return Constants::Ethernet::UNKNOWN;
    }
 }
+
+Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag) {
+    switch(flag) {
+        case PDU::IP:
+            return Constants::IP::PROTO_IPIP;
+        case PDU::TCP:
+            return Constants::IP::PROTO_TCP;
+        case PDU::UDP:
+            return Constants::IP::PROTO_UDP;
+        case PDU::ICMP:
+            return Constants::IP::PROTO_ICMP;
+        case PDU::ICMPv6:
+            return Constants::IP::PROTO_ICMPV6;
+        case PDU::IPSEC_AH:
+            return Constants::IP::PROTO_AH;
+        case PDU::IPSEC_ESP:
+            return Constants::IP::PROTO_ESP;
+        default:
+            return static_cast<Constants::IP::e>(0xff);
+    };
 }
+
+bool increment(IPv4Address &addr) {
+    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr);
+    bool reached_end = ++addr_int == 0xffffffff;
+    addr = IPv4Address(Endian::be_to_host<uint32_t>(addr_int));
+    return reached_end;
 }
+
+bool increment(IPv6Address &addr) {
+    return increment_buffer(addr);
+}
+
+bool decrement(IPv4Address &addr) {
+    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr);
+    bool reached_end = --addr_int == 0;
+    addr = IPv4Address(Endian::be_to_host<uint32_t>(addr_int));
+    return reached_end;
+}
+
+bool decrement(IPv6Address &addr) {
+    return decrement_buffer(addr);
+}
+
+IPv4Address last_address_from_mask(IPv4Address addr, IPv4Address mask) {
+    uint32_t addr_int = Endian::be_to_host<uint32_t>(addr),
+            mask_int = Endian::be_to_host<uint32_t>(mask);
+    return IPv4Address(Endian::host_to_be(addr_int | ~mask_int));
+}
+
+IPv6Address last_address_from_mask(IPv6Address addr, const IPv6Address &mask) {
+    IPv6Address::iterator addr_iter = addr.begin();
+    for(IPv6Address::const_iterator it = mask.begin(); it != mask.end(); ++it, ++addr_iter) {
+        *addr_iter = *addr_iter | ~*it;
+    }
+    return addr;
+}
+} // namespace Internals
+} // namespace Tins
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -42,16 +42,13 @@
    #include <winsock2.h>
 #endif
 #include "ip.h"
-#include "ipv6.h"
-#include "tcp.h"
-#include "udp.h"
-#include "icmp.h"
 #include "rawpdu.h"
 #include "utils.h"
 #include "packet_sender.h"
 #include "constants.h"
 #include "network_interface.h"
 #include "exceptions.h"
+#include "pdu_allocator.h"

 using std::list;

@@ -115,24 +112,36 @@ IP::IP(const uint8_t *buffer, uint32_t total_sz)
    uint8_t padding = _options_size % 4;
    _padded_options_size = padding ? (_options_size - padding + 4) : _options_size;
    // check this line PLX
+    total_sz = std::min(total_sz, (uint32_t)tot_len());
+    if (total_sz < head_len() * sizeof(uint32_t))
+        throw malformed_packet();
    total_sz -= head_len() * sizeof(uint32_t);
    if (total_sz) {
-        switch(_ip.protocol) {
-            case Constants::IP::PROTO_TCP:
-                inner_pdu(new Tins::TCP(buffer, total_sz));
-                break;
-            case Constants::IP::PROTO_UDP:
-                inner_pdu(new Tins::UDP(buffer, total_sz));
-                break;
-            case Constants::IP::PROTO_ICMP:
-                inner_pdu(new Tins::ICMP(buffer, total_sz));
-                break;
-            case Constants::IP::PROTO_IPV6:
-                inner_pdu(new Tins::IPv6(buffer, total_sz));
-                break;
-            default:
-                inner_pdu(new Tins::RawPDU(buffer, total_sz));
-                break;
+        // Don't try to decode it if it's fragmented
+        if(!is_fragmented()) {
+            inner_pdu(
+                Internals::pdu_from_flag(
+                    static_cast<Constants::IP::e>(_ip.protocol),
+                    buffer, 
+                    total_sz,
+                    false
+                )
+            );
+            if(!inner_pdu()) {
+                inner_pdu(
+                    Internals::allocate<IP>(
+                        _ip.protocol,
+                        buffer, 
+                        total_sz
+                    )
+                );
+                if(!inner_pdu())
+                    inner_pdu(new RawPDU(buffer, total_sz));
+            }
+        }
+        else {
+            // It's fragmented, just use RawPDU
+            inner_pdu(new RawPDU(buffer, total_sz));
        }
    }
 }
@@ -146,6 +155,12 @@ void IP::init_ip_fields() {
    _padded_options_size = 0;
 }

+bool IP::is_fragmented() const {
+    // It's 0 if offset == 0 && more_frag == 0
+    // It's 0x4000 if dont_fragment = 1
+    return frag_off() != 0 && frag_off() != 0x4000;
+}
+
 /* Setters */

 void IP::tos(uint8_t new_tos) {
@@ -256,40 +271,24 @@ void IP::add_route_option(option_identifier id, const generic_route_option_type
 }

 IP::generic_route_option_type IP::search_route_option(option_identifier id) const {
-    const option *option = search_option(id);
-    if(!option || option->data_size() < 1 + sizeof(uint32_t) || 
-      ((option->data_size() - 1) % sizeof(uint32_t)) != 0)
+    const option *opt = search_option(id);
+    if(!opt)
        throw option_not_found();
-    generic_route_option_type output;
-    output.pointer = *option->data_ptr();
-    const uint32_t *route = (const uint32_t*)(option->data_ptr() + 1),
-                    *end = route + (option->data_size() - 1) / sizeof(uint32_t);
-    while(route < end)
-        output.routes.push_back(address_type(*route++));
-    return output;
+    return opt->to<generic_route_option_type>();
 }

 IP::security_type IP::security() const {
-    const option *option = search_option(130);
-    if(!option || option->data_size() < 9)
+    const option *opt = search_option(130);
+    if(!opt)
        throw option_not_found();
-    security_type output;
-    const uint16_t *ptr = reinterpret_cast<const uint16_t*>(option->data_ptr());
-    output.security = Endian::be_to_host(*ptr++);
-    output.compartments = Endian::be_to_host(*ptr++);
-    output.handling_restrictions = Endian::be_to_host(*ptr++);
-    uint32_t tcc = option->data_ptr()[6];
-    tcc = (tcc << 8) | option->data_ptr()[7];
-    tcc = (tcc << 8) | option->data_ptr()[8];
-    output.transmission_control = tcc;
-    return output;
+    return opt->to<security_type>();
 }

 uint16_t IP::stream_identifier() const {
-    const option *option = search_option(136);
-    if(!option || option->data_size() != sizeof(uint16_t))
+    const option *opt = search_option(136);
+    if(!opt)
        throw option_not_found();
-    return Endian::be_to_host(*(const uint16_t*)option->data_ptr());
+    return opt->to<uint16_t>();
 }

 void IP::add_option(const option &opt) {
@@ -379,26 +378,14 @@ void IP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU* pare
    #endif
    checksum(0);
    if(inner_pdu()) {
-        uint32_t new_flag;
-        switch(inner_pdu()->pdu_type()) {
-            case PDU::IP:
-                new_flag = Constants::IP::PROTO_IPIP;
-                break;
-            case PDU::TCP:
-                new_flag = Constants::IP::PROTO_TCP;
-                break;
-            case PDU::UDP:
-                new_flag = Constants::IP::PROTO_UDP;
-                break;
-            case PDU::ICMP:
-                new_flag = Constants::IP::PROTO_ICMP;
-                break;
-            default:
-                // check for other protos
-                new_flag = 0xff;
-        };
-        protocol(new_flag);
-        //flag(new_flag);
+        uint32_t new_flag = Internals::pdu_flag_to_ip_type(inner_pdu()->pdu_type());
+        if(new_flag == 0xff && Internals::pdu_type_registered<IP>(inner_pdu()->pdu_type())) {
+            new_flag = static_cast<Constants::IP::e>(
+                Internals::pdu_type_to_id<IP>(inner_pdu()->pdu_type())
+            );
+        }
+        if(!is_fragmented() || new_flag != 0xff)
+            protocol(new_flag);
    }
    
    #if __FreeBSD__ || defined(__FreeBSD_kernel__)
@@ -429,12 +416,58 @@ bool IP::matches_response(const uint8_t *ptr, uint32_t total_sz) const {
    if(total_sz < sizeof(iphdr))
        return false;
    const iphdr *ip_ptr = (const iphdr*)ptr;
+    // dest unreachable?
+    if(ip_ptr->protocol == Constants::IP::PROTO_ICMP) {
+        const uint8_t *pkt_ptr = ptr + sizeof(iphdr);
+        uint32_t pkt_sz = total_sz - sizeof(iphdr);
+        // It's an ICMP dest unreachable
+        if(pkt_sz > 4 && pkt_ptr[0] == 3) {
+            pkt_ptr += 4;
+            pkt_sz -= 4;
+            // If our IP header is in the ICMP payload, then it's the same packet.
+            // This keeps in mind checksum and IP identifier, so I guess it's enough.
+            if(pkt_sz >= sizeof(iphdr) && std::memcmp(&_ip, pkt_ptr, sizeof(iphdr))) 
+                return true;
+        }
+    }
    // checks for broadcast addr
-    if((_ip.saddr == ip_ptr->daddr && (_ip.daddr == ip_ptr->saddr || _ip.daddr == 0xffffffff)) ||
-        (_ip.daddr == 0xffffffff && _ip.saddr == 0)) {
+    if((_ip.saddr == ip_ptr->daddr && (_ip.daddr == ip_ptr->saddr || dst_addr().is_broadcast())) ||
+        (dst_addr().is_broadcast() && _ip.saddr == 0)) {
        uint32_t sz = std::min<uint32_t>(_ip.ihl * sizeof(uint32_t), total_sz);
        return inner_pdu() ? inner_pdu()->matches_response(ptr + sz, total_sz - sz) : true;
    }
    return false;
 }
+
+// Option static constructors from options
+
+IP::security_type IP::security_type::from_option(const option &opt) 
+{
+    if(opt.data_size() != 9)
+        throw malformed_option();
+    security_type output;
+    const uint16_t *ptr = reinterpret_cast<const uint16_t*>(opt.data_ptr());
+    output.security = Endian::be_to_host(*ptr++);
+    output.compartments = Endian::be_to_host(*ptr++);
+    output.handling_restrictions = Endian::be_to_host(*ptr++);
+    uint32_t tcc = opt.data_ptr()[6];
+    tcc = (tcc << 8) | opt.data_ptr()[7];
+    tcc = (tcc << 8) | opt.data_ptr()[8];
+    output.transmission_control = tcc;
+    return output;
+}
+
+IP::generic_route_option_type IP::generic_route_option_type::from_option(
+  const option &opt) 
+{
+    if(opt.data_size() < 1 + sizeof(uint32_t) || ((opt.data_size() - 1) % sizeof(uint32_t)) != 0)
+        throw malformed_option();
+    generic_route_option_type output;
+    output.pointer = *opt.data_ptr();
+    const uint32_t *route = (const uint32_t*)(opt.data_ptr() + 1),
+                    *end = route + (opt.data_size() - 1) / sizeof(uint32_t);
+    while(route < end)
+        output.routes.push_back(address_type(*route++));
+    return output;
+}
 }
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -31,10 +31,22 @@
 #include <sstream>
 #include "ip_address.h"
 #include "endianness.h"
+#include "address_range.h"

 using std::string;

 namespace Tins{
+const IPv4Address IPv4Address::broadcast("255.255.255.255");
+
+const AddressRange<IPv4Address> private_ranges[] = {
+    IPv4Address("192.168.0.0") / 16,
+    IPv4Address("10.0.0.0") / 8,
+    IPv4Address("172.16.0.0") / 12
+};
+
+const AddressRange<IPv4Address> loopback_range = IPv4Address("127.0.0.0") / 8;
+const AddressRange<IPv4Address> multicast_range = IPv4Address("224.0.0.0") / 4;
+    
 IPv4Address::IPv4Address(uint32_t ip) 
 : ip_addr(Endian::be_to_host(ip)) {
    
@@ -94,4 +106,30 @@ std::ostream &operator<<(std::ostream &output, const IPv4Address &addr) {
    }
    return output;;
 }
+
+bool IPv4Address::is_private() const {
+    const AddressRange<IPv4Address> *iter = private_ranges;
+    while(iter != private_ranges + 3) {
+        if(iter->contains(*this))
+            return true;
+        ++iter;
+    }
+    return false;
+}
+
+bool IPv4Address::is_loopback() const {
+    return loopback_range.contains(*this);
+}
+
+bool IPv4Address::is_multicast() const {
+    return multicast_range.contains(*this);
+}
+
+bool IPv4Address::is_unicast() const {
+    return !is_multicast() && !is_broadcast();
+}
+
+bool IPv4Address::is_broadcast() const {
+    return *this == broadcast;
+}
 }
--- a/src/ip_reassembler.cpp
+++ b/src/ip_reassembler.cpp
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2012, 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 "ip.h"
+#include "rawpdu.h"
+#include "constants.h"
+#include "internals.h"
+#include "ip_reassembler.h"
+
+namespace Tins {
+namespace Internals {
+IPv4Stream::IPv4Stream() 
+: received_end(false), received_size(), total_size() 
+{ 
+
+}
+
+void IPv4Stream::add_fragment(IP *ip) {
+    fragments_type::iterator it = fragments.begin();
+    uint16_t offset = extract_offset(ip);
+    while(it != fragments.end() && offset > it->offset()) {
+        ++it;
+    }
+    // No duplicates plx
+    if(it != fragments.end() && it->offset() == offset) 
+        return;
+    fragments.insert(it, IPv4Fragment(ip->inner_pdu(), offset));
+    received_size += ip->inner_pdu()->size();
+    if(!extract_more_frag(ip)) {
+        total_size = offset + ip->inner_pdu()->size();
+        received_end = true;
+    }
+    if(offset == 0)
+        transport_proto = ip->protocol();
+}
+
+bool IPv4Stream::is_complete() const {
+    return received_end && received_size == total_size;
+}
+
+PDU *IPv4Stream::allocate_pdu() const {
+    PDU::serialization_type buffer;
+    buffer.reserve(total_size);
+    // Check if we actually have all the data we need. Otherwise return nullptr;
+    uint16_t expected = 0;
+    for(fragments_type::const_iterator it = fragments.begin(); it != fragments.end(); ++it) {
+        if(expected != it->offset())
+            return 0;
+        expected = it->offset() + it->payload().size();
+        buffer.insert(buffer.end(), it->payload().begin(), it->payload().end());
+    }
+    return Internals::pdu_from_flag(
+        static_cast<Constants::IP::e>(transport_proto),
+        &buffer[0],
+        buffer.size()
+    );
+}
+
+uint16_t IPv4Stream::extract_offset(const IP *ip) {
+    return (ip->frag_off() & 0x1fff) * 8;
+}
+
+bool IPv4Stream::extract_more_frag(const IP *ip) {
+    return ip->frag_off() & 0x2000;
+}
+} // namespace Internals
+
+IPv4Reassembler::IPv4Reassembler(overlapping_technique technique)
+: technique(technique)
+{
+
+}
+
+IPv4Reassembler::packet_status IPv4Reassembler::process(PDU &pdu) {
+    IP *ip = pdu.find_pdu<IP>();
+    if(ip && ip->inner_pdu()) {
+        // There's fragmentation
+        if(ip->is_fragmented()) {
+            // Create it or look it up, it's the same
+            Internals::IPv4Stream &stream = streams[make_key(ip)];
+            stream.add_fragment(ip);
+            if(stream.is_complete()) {
+                PDU *pdu = stream.allocate_pdu();
+                // The packet is corrupt
+                if(!pdu)  {
+                    streams.erase(make_key(ip));
+                    return FRAGMENTED;
+                }
+                ip->inner_pdu(pdu);
+                ip->frag_off(0);
+                return REASSEMBLED;
+            }
+            else
+                return FRAGMENTED;
+        }
+    }
+    return NOT_FRAGMENTED;
+}
+
+IPv4Reassembler::key_type IPv4Reassembler::make_key(const IP *ip) const {
+    return std::make_pair(
+        ip->id(),
+        make_address_pair(ip->src_addr(), ip->dst_addr())
+    );
+}
+
+IPv4Reassembler::address_pair IPv4Reassembler::make_address_pair(IPv4Address addr1, IPv4Address addr2) const {
+    if(addr1 < addr2)
+        return std::make_pair(addr1, addr2);
+    else
+        return std::make_pair(addr2, addr1);
+}
+
+void IPv4Reassembler::clear_streams() {
+    streams.clear();
+}
+
+void IPv4Reassembler::remove_stream(uint16_t id, IPv4Address addr1, IPv4Address addr2) {
+    streams.erase(
+        std::make_pair(
+            id, 
+            make_address_pair(addr1, addr2)
+        )
+    );
+}
+
+} // namespace Tins
--- a/src/ipsec.cpp
+++ b/src/ipsec.cpp
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2012, 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 <cstring>
+#include "ipsec.h"
+#include "internals.h"
+#include "rawpdu.h"
+
+namespace Tins {
+
+IPSecAH::IPSecAH() 
+: _header(), _icv(4) {
+    length(2);
+}
+
+IPSecAH::IPSecAH(const uint8_t *buffer, uint32_t total_sz) {
+    // At least size for the header + 32bits of ICV
+    if(total_sz < sizeof(_header) + sizeof(uint32_t))
+        throw malformed_packet();
+    std::memcpy(&_header, buffer, sizeof(_header));
+    const uint32_t ah_len = 4 * (static_cast<uint16_t>(length()) + 2);
+    if(ah_len > total_sz)
+        throw malformed_packet();
+    _icv.assign(buffer + sizeof(_header), buffer + ah_len);
+    buffer += ah_len;
+    total_sz -= ah_len;
+    if(total_sz) {
+        inner_pdu(
+            Internals::pdu_from_flag(
+                static_cast<Constants::IP::e>(next_header()),
+                buffer, 
+                total_sz,
+                true
+            )
+        );
+    }
+}
+
+void IPSecAH::next_header(uint8_t new_next_header) {
+    _header.next_header = new_next_header;
+}
+
+void IPSecAH::length(uint8_t new_length) {
+    _header.length = new_length;
+}
+
+void IPSecAH::spi(uint32_t new_spi) {
+    _header.spi = Endian::host_to_be(new_spi);
+}
+
+void IPSecAH::seq_number(uint32_t new_seq_number) {
+    _header.seq_number = Endian::host_to_be(new_seq_number);
+}
+
+void IPSecAH::icv(const byte_array &new_icv) {
+    _icv = new_icv;
+}
+
+uint32_t IPSecAH::header_size() const {
+    return sizeof(_header) + _icv.size();
+}
+
+void IPSecAH::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *) {
+    if(inner_pdu())
+        next_header(Internals::pdu_flag_to_ip_type(inner_pdu()->pdu_type()));
+    std::memcpy(buffer, &_header, sizeof(_header));
+    std::copy(  
+        _icv.begin(),
+        _icv.end(),
+        buffer + sizeof(_header)
+    );
+}
+
+// IPSecESP
+
+IPSecESP::IPSecESP() 
+: _header()
+{
+
+}
+
+IPSecESP::IPSecESP(const uint8_t *buffer, uint32_t total_sz) {
+    if(total_sz < sizeof(_header))
+        throw malformed_packet();
+    std::memcpy(&_header, buffer, sizeof(_header));
+    buffer += sizeof(_header);
+    total_sz -= sizeof(_header);
+    if(total_sz) {
+        inner_pdu(new RawPDU(buffer, total_sz));
+    }
+}
+
+void IPSecESP::spi(uint32_t new_spi) {
+    _header.spi = Endian::host_to_be(new_spi);
+}
+
+void IPSecESP::seq_number(uint32_t new_seq_number) {
+    _header.seq_number = Endian::host_to_be(new_seq_number);
+}
+
+uint32_t IPSecESP::header_size() const {
+    return sizeof(_header);
+}
+
+void IPSecESP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *) {
+    std::memcpy(buffer, &_header, sizeof(_header));
+}
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matias F	ed175e0ad6	Updated CHANGES, README and configure.ac files.	2014-01-23 11:30:05 -03:00
Matias Fontanini	c5404a6111	Removed DNSResourceRecord. Records in DNS are now managed completely by DNS::Resource.	2014-01-21 22:56:53 -03:00
Matias Fontanini	6d7e06535a	Fixed some endianness bugs on ICMPv6 and PPI.	2014-01-19 14:40:57 -03:00
Matias Fontanini	853e1ce647	tins.h now includes ppi.h.	2014-01-19 14:17:25 -03:00
Matias Fontanini	dbcdda9d36	Rewrote the DNS parsing algorithm. Everything is now done on the read buffer, without any extra data structures, making it work about 400% faster than before.	2014-01-19 13:11:50 -03:00
Matias Fontanini	17ceba6064	Fixed broken strict-aliasing rules on ICMPv6.	2014-01-15 19:56:58 -03:00
Matias Fontanini	52078cc567	Finished porting DHCPv6.	2014-01-15 19:39:07 -03:00
Matias Fontanini	e2656739f1	Ported DHCP and Dot11. Almost ported DHCPv6 completely.	2013-12-23 23:02:58 -03:00
Matias Fontanini	33091ccbae	Ported PPPoE and started porting Dot11.	2013-12-18 13:02:41 -03:00
Matias Fontanini	ca6b603478	Finished porting ICMPv6.	2013-12-17 19:00:00 -03:00
Matias Fontanini	069ae82b10	Keep porting ICMPv6 to use PDUOption::to<>.	2013-12-17 00:10:26 -03:00
Matias Fontanini	ea6638c163	IP now uses PDUOption::to<>. Started porting ICMPv6 to do so as well.	2013-12-16 15:50:17 -03:00
Matias Fontanini	112a357726	Added PDUOption::to<>. TCP options now use this method when being converted to their appropriate types.	2013-12-16 14:11:53 -03:00
Matias Fontanini	0e54579200	Layer 3 packets sent using PacketSender::send_recv for which the answer is a different PDU type(such as ICMP destination unreachable), are detected by PacketSender and matched like usual.	2013-12-14 18:10:33 -03:00
Matias Fontanini	ccb8ffd1b5	ICMP::gateway is now an IPv4Address.	2013-12-14 14:28:39 -03:00
Matias Fontanini	b83c1a2a96	Added support for ICMP address mask request/reply.	2013-12-14 14:21:04 -03:00
Matias Fontanini	81a947e3b3	Fixed bug on ICMP checksum calculation when using timestamp request/replies.	2013-12-14 13:42:12 -03:00
Matias Fontanini	1cec0f106d	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.	2013-12-14 12:49:50 -03:00
Matias Fontanini	0acb0fee3e	IP packets sent using PacketSender::send_recv now match ICMP responses.	2013-12-14 12:48:56 -03:00
Matias Fontanini	9b57585b62	Added support for ICMP timestamp request/reply packets. ICMP::matches_response now works with these types of packets as well.	2013-12-13 17:23:17 -03:00
Matias Fontanini	2ddec368c3	Fixed bug on IP when serializing fragmented packets. The original protocol id was being overwritten with 0xff(unknown) when the inner_pdu was a RawPDU, even if it was just a fragment of a transport layer PDU. The protocol id is now kept if the packet is fragmented.	2013-12-04 10:56:48 -03:00
matias	83dc8819b6	Updated README.md.	2013-11-24 16:37:10 -03:00
matias	5e668e6e83	Updated README.md	2013-11-24 13:31:19 -03:00
matias	ca4912ded4	Added README.md and updated README.	2013-11-24 11:07:39 -03:00
Matias Fontanini	295ebb679c	Added 1000ms as the default read timeout used when calling pcap_open_live. Added BaseSniffer::set_timeout to modify this parameter.	2013-11-19 20:51:58 -03:00
Matias Fontanini	6355aff3cd	Added IPv4Reassembler class.	2013-11-17 15:32:24 -03:00
Matias Fontanini	a6655191d4	Fragmented IP packet's inner_pdu PDUs are not decoded now.	2013-11-16 19:40:08 -03:00
Matias Fontanini	dc6c37777b	Updated configure.ac and README files.	2013-11-10 14:14:25 -03:00
Matias Fontanini	23552ea105	Fixed issue with relative include paths in dot11 headers.	2013-11-10 11:55:36 -03:00
Matias Fontanini	9962381fc7	Added the --disable-dot11 configure switch.	2013-11-09 14:41:08 -03:00
Matias Fontanini	93ab8d3b91	Removed useless include directives from ip.cpp and ipv6.cpp.	2013-11-04 23:31:46 -03:00
Matias Fontanini	5345b29f8c	Added support for IPSec.	2013-11-04 23:05:00 -03:00
Matias Fontanini	de06fee5ab	Fixed bug triggered when ifaddrs::ifa_addr was null.	2013-11-04 15:53:55 -03:00
Matias Fontanini	6d329424f1	Created an overload of Internals::pdu_from_flag for transport layer PDUs.	2013-11-04 13:46:25 -03:00
Matias Fontanini	dfbbea33d5	Added another overload of Utils::route_entries and fixed a bug in Utils::network_interfaces.	2013-11-02 19:19:55 -03:00
Matias Fontanini	0b02af616a	Added ARP monitor example.	2013-10-29 21:10:11 -03:00
Matias Fontanini	a101ec9796	Added the missing WPS detector example.	2013-10-29 19:19:53 -03:00
Matias Fontanini	b0868b5d60	Added another Sniffer constructor.	2013-10-21 23:31:07 -03:00
Matias Fontanini	f57b8c189c	Added WPS detector example. Updated configure files.	2013-10-21 22:54:18 -03:00
Matias Fontanini	a507355e27	Added tins_cast as a replacement for dynamic_cast when using it on PDU classes.	2013-10-18 09:28:43 -03:00
Matias Fontanini	87fdd62b57	Added some examples.	2013-10-17 20:44:54 -03:00
Matias Fontanini	3337335df2	Fixed compilation error on internals.h.	2013-10-16 14:45:03 -03:00
Matias Fontanini	08113b8f5f	Updated the CHANGES file.	2013-10-07 23:50:54 -03:00
Matias Fontanini	6dd949611d	Modified some header documentation.	2013-10-07 23:31:22 -03:00
Matias Fontanini	b6a55935b4	Modified some Dot11ManagementFrame documentation.	2013-10-07 14:00:45 -03:00
Matias Fontanini	01b2a9c7b2	Modified some examples fixed some doxygen documentation.	2013-10-06 23:00:20 -03:00
Matias Fontanini	58e2c93e30	Added HWAddress and IPv4Address::is_unicast and a static const member 'broadcast' for both classes.	2013-10-06 22:56:00 -03:00
Matias Fontanini	bcfe26175a	BaseSniffer now uses pcap_loop instead of pcap_dispatch.	2013-09-24 08:59:46 -03:00
Matias Fontanini	c4e6a7c0d6	Fixed some compilation errors/warnings and bugs when using Big Endian architectures.	2013-09-24 00:34:14 -03:00
Matias Fontanini	9cbac6b044	BaseSniffer::next_packet now uses pcap_dispatch.	2013-09-23 22:55:18 -03:00
Matias Fontanini	2414edd1e7	Fixed a bug in PPI and Dot1Q triggered when constructing from buffer/serializing. Done some documentation fixes.	2013-09-22 19:37:02 -03:00
Matias Fontanini	74ef177e25	Added address_range.cpp.	2013-09-21 01:21:15 -03:00
Matias Fontanini	54d012b92e	Done some fixes on HWAddress. Added HWAddress::operator/ which returns an AddressRange.	2013-09-20 17:37:20 -03:00
Matias Fontanini	1b4efc1520	Rolled the BaseSniffer changes since that was OK.	2013-09-20 12:37:21 -03:00
Matias Fontanini	96ecd054ab	Fixed issue with bpf_programs on BaseSniffer. Done some documentation changes.	2013-09-20 11:07:09 -03:00
Matias Fontanini	d7d2dec5cb	Done some optimizations on TCP's constructor from buffer.	2013-09-15 16:01:00 -03:00
Matias Fontanini	20f3911e12	BaseSniffer::sniff_loop now uses begin() and end() to process packets, making it around 8% faster. Also added BaseSniffer::link_type to retrieve the pcap handle link type.	2013-09-15 12:16:54 -03:00
Matias Fontanini	f8d71687e1	Modified some classes' documentation.	2013-09-14 19:01:05 -03:00
Matias Fontanini	d393c1fbfc	Moved calls to pcap_loop and pcap_breakloop to sniffer.cpp.	2013-09-08 19:20:52 -03:00
Matias Fontanini	e21e34e194	Added IPv4Address, IPv6Address and HWAddress<> 'is_multicast' member function.	2013-09-08 17:23:08 -03:00
Matias Fontanini	a01fff411e	Added missing PPI files.	2013-09-05 09:09:56 -03:00
Matias Fontanini	7d4222fb17	Added PPI PDU.	2013-09-05 00:49:11 -03:00
Matias Fontanini	de0ec914cc	Fixed bug in RadioTap. The flags field was being used even if it was not present.	2013-09-04 16:34:24 -03:00
Matias Fontanini	15f2896811	Added is_private and is_loopback methods to IPv4 and IPv6 addresses.	2013-09-04 12:57:36 -03:00
Matias Fontanini	b26f353e46	Added helper functions to Dot11Data to retrieve the source, destination and BSSID addresses.	2013-09-03 22:58:07 -03:00
Matias Fontanini	5f2c923c48	Added PDUAllocator class, which makes extending PDUs easier.	2013-08-29 23:31:10 -03:00
Matias Fontanini	4ca21bdad7	Fixed some issues when parsing DNS answers. MX records are now serialized correctly.	2013-08-04 14:27:03 -03:00
Matias Fontanini	2cc0ceb1aa	Fixed bug triggered in DNS when parsing some unknown record types.	2013-07-25 10:47:09 -03:00
Matias Fontanini	7063e60af9	Merge branch 'master' of ssh://git.code.sf.net/p/libtins/code	2013-07-24 23:32:55 -03:00
Matias Fontanini	21b80a7370	BaseSniffer is now iterable.	2013-07-24 23:32:33 -03:00
Matias Fontanini	fb8fb92ee6	BaseSniffer::next_packet now loops until either a valid packet is found or pcap_next fails.	2013-07-24 22:27:53 -03:00
Santiago Alessandri	2a5b64526f	Replaced tabs for spaces in the previous commit	2013-07-14 13:13:38 -03:00
Santiago Alessandri	02d3a14083	Fixed issue related with EthernetII protocol. The Ethernet II protocol forces a minimum length of 60 bytes. It is necessary to add a trailer for padding of null-bytes when the inner_pdu's size does not meet the requirement. Also EthernetII packets received were being incorrectly parsed due to the existance of this padding. The issue has been solved and several tests were added. All tests successfully pass.	2013-07-12 20:06:55 -03:00
Matias Fontanini	3b349471ea	Added AddressRange class template.	2013-07-06 17:48:26 -03:00
Matias Fontanini	f385e4e975	Added a const overload of TCP::get_flag. Added TCP::flags.	2013-06-17 21:25:30 -03:00
Matias Fontanini	acff8f1e1f	The --disable-wpa2 switch now works as expected.	2013-06-15 10:00:50 -03:00
Matias Fontanini	59090e62d2	Added -Wno-extra-portability to automake's flags.	2013-06-07 10:28:19 -03:00
Matias Fontanini	74594a3b20	Updated CHANGES file.	2013-06-05 09:08:42 -03:00
Matias Fontanini	681bdc727f	Updated configure.ac and README files.	2013-06-04 20:04:10 -03:00
Matias Fontanini	996e0f139e	Fixed bug on Dot11QoSData.	2013-06-04 15:49:49 -03:00
Matias Fontanini	c2353314fa	WEPDecrypter now returns true iff the packet was decrypted successfully.	2013-06-04 15:49:33 -03:00
Matias Fontanini	5d315c5b6d	Fixed a CCMP padding bug.	2013-06-02 16:14:21 -03:00
Matias Fontanini	87ac5acdd8	WPA2Decrypter now decrypts both CCMP and TKIP encrypted traffic.	2013-06-01 21:29:06 -03:00
Matias Fontanini	3b4dc10211	Added HWAddress<>::operator[].	2013-06-01 12:05:53 -03:00
Matias Fontanini	8c1d71c7b7	Both of WPA2Decrypter::add_supplicant_data overloads work.	2013-06-01 10:48:22 -03:00
Matias Fontanini	5db196a630	Fixed tests dependency file.	2013-05-31 22:33:50 -03:00
Matias Fontanini	ec8374be60	Split dot11.h and dot11.cpp into several files.	2013-05-31 22:16:56 -03:00
Matias Fontanini	eeb62add59	Added WPA2Decrypter tests.	2013-05-31 14:11:12 -03:00
Matias Fontanini	908fcb56e8	Added WPA2Decrypter class.	2013-05-30 23:36:14 -03:00
Matias Fontanini	ddf47365c1	RadioTap now calculates its size always while serializing. Added 2 missing RadioTap fields as well.	2013-05-30 18:14:11 -03:00
Matias Fontanini	b052aa1d88	Added HWAddress<>::is_broadcast.	2013-05-29 11:14:36 -03:00
Matias Fontanini	cacf75995d	Added automake foreign option.	2013-05-28 15:19:00 -03:00
Matias Fontanini	4960077495	RSNHandshakeCapturer is now DefaultConstructible.	2013-05-28 10:15:33 -03:00
Matias Fontanini	8147a2bfb7	Added RSNHandshakeCapturer class.	2013-05-25 18:00:20 -03:00
Piotr Haber	28c8d393d6	do not parse Dot11 frame if FCS is wrong Signed-off-by: Matias Fontanini <matias.fontanini@gmail.com>	2013-05-23 17:54:17 -03:00
Matias Fontanini	ec7e718e38	Implemented std::hash for IPv4Address and IPv6Address.	2013-05-21 13:07:14 -03:00
Matias Fontanini	62740e8e64	Implemented std::hash specialization for HWAddress.	2013-05-04 20:09:32 -03:00
Matias Fontanini	2bb699dc97	Merge branch 'master' of ssh://git.code.sf.net/p/libtins/code	2013-05-01 14:08:16 -03:00
Piotr Haber	14b1a4988b	take wildcard SSID into account Specification states (Ch 8.4.2.2 of IEEE Std 802.11-2007) that in Probe Reqest frames SSID IE of length 0 signifies "wildcard" SSID. Return "BROADCAST" from Dot11ManagementFrame::ssid() in such case. Signed-off-by: Matias Fontanini <matias.fontanini@gmail.com>	2013-05-01 14:06:02 -03:00
Matias Fontanini	7f6e4446b4	Fixed the examples.	2013-04-24 12:07:52 -03:00