Added IP information printing from NFLOG packet
DHCPv6 decoder fix
- fix the tests for DH6OPT_SIP_SERVER_D, DH6OPT_DOMAIN_LIST and DH6OPT_NTP_SERVER,
- add missing ")".
Merge pull request #316 from fxlb/master

 DHCPv6 decoder fix (reviewed, fixed, squashed and rebased)
Merge pull request #67 from PetarAlilovic/master

IP packet information printing from NFLOG packet
Merge remote-tracking branch 'mcrhub/master'
Use byte offset instead of rip_dest (a 32-bit field) to extract
16-bit field in order to avoid type punning.  This fixes compile
on IA64 platforms.
Merge pull request #314 from delphij/master

Don't use rip_dest (a 32-bit field) to extract 16-bit.
tcpdump: add STBC Rx support

Information will be represented as:
- Rx-STBC0 - mean, Rx-STBC is supported by driver but packet was not encoded in STBC
- Rx-STBC1 - 1 Nss stream was encoded in STBC
- Rx-STBC2 - 2 Nss streams
- Rx-STBC3 - 3

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
add test for rx-stbc flag

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Merge pull request #318 from olerem/stbc

STBC Rx support and a new test case for it
justify the previous 802.11 test case name
undefine HAVE_LIBCRYPTO if configure can't find evp.h
finalize the evp.h bugfix (#46)
Use __inline with MSVC for all source files.
Clean up various things.

Clean up white space, just add 104 (the length of the NFLOG header) to
the pointer, and return the length of the NFLOG header from
nflog_if_print().  Mark the caplen argument to nflog_print() as unused.
OpenFlow 1.0: fix OFPST_QUEUE decoding bug

The while loop in of10_queue_stats_reply_print() decremented the
remaining length by 104 instead of 32. As soon as that happened the
decoding didn't proceed/stop in a normal way and was likely to hit
snapend. Fixed.
OpenFlow 1.0: adjust OFPST_TABLE indentation
Fix a strict-aliasing GCC warning in getname6(), as the GCC manual suggests.
Merge remote-tracking branch 'bpf/master'

Conflicts:
	Makefile.in
Typo in displayed text