3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Fix FindPCAP.cmake to find winpcap on x64.

Browse Source
This commit is contained in:
Matias Fontanini
2015-05-17 11:52:30 -07:00
parent 8276dca22e
commit 5cd0c8e41b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Modules/FindPCAP.cmake
View File

@@ -28,9 +28,17 @@ find_path(PCAP_INCLUDE_DIR
HINTS ${PCAP_ROOT_DIR}/include
)
set (HINT_DIR ${PCAP_ROOT_DIR}/lib)
# On x64 windows, we should look also for the .lib at /lib/x64/
# as this is the default path for the WinPcap developer's pack
if (${CMAKE_SIZEOF_VOID_P} EQUAL 8 AND WIN32)
set (HINT_DIR ${PCAP_ROOT_DIR}/lib/x64/ ${HINT_DIR})
endif ()
find_library(PCAP_LIBRARY
NAMES pcap wpcap
HINTS ${PCAP_ROOT_DIR}/lib
HINTS ${HINT_DIR}
)
include(FindPackageHandleStandardArgs)

4
tests/src/radiotap.cpp
View File

@@ -198,7 +198,7 @@ const uint8_t RadioTapTest::expected_packet5[] = {
TEST_F(RadioTapTest, DefaultConstructor) {
RadioTap radio;
EXPECT_TRUE(radio.flags() & RadioTap::FCS);
EXPECT_TRUE((radio.flags() & RadioTap::FCS) != 0);
EXPECT_EQ(Utils::mhz_to_channel(radio.channel_freq()), 1);
EXPECT_EQ(radio.channel_type(), 0xa0U);
EXPECT_EQ(radio.tsft(), 0U);
@@ -235,7 +235,7 @@ TEST_F(RadioTapTest, ConstructorFromBuffer1) {
EXPECT_EQ(radio.length(), 26);
EXPECT_EQ(radio.rate(), 2);
EXPECT_EQ(radio.flags(), 0x10);
EXPECT_TRUE(radio.flags() & RadioTap::FCS);
EXPECT_TRUE((radio.flags() & RadioTap::FCS) != 0);
EXPECT_EQ(radio.antenna(), 1);
EXPECT_TRUE(radio.find_pdu<Dot11Beacon>() != NULL);
}