From 8bf3b1af4555b7d73f17c79e7047eb1e18327919 Mon Sep 17 00:00:00 2001 From: zhiweicai Date: Tue, 16 Dec 2014 21:32:59 -0500 Subject: [PATCH 1/3] fix ip_to_int function on windows --- include/tins/config.h | 4 +++- src/ip_address.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/tins/config.h b/include/tins/config.h index 23672e8..2326bf8 100644 --- a/include/tins/config.h +++ b/include/tins/config.h @@ -6,4 +6,6 @@ #define HAVE_DOT11 /* Have WPA2 decryption library */ -#define HAVE_WPA2_DECRYPTION +//#define HAVE_WPA2_DECRYPTION + + diff --git a/src/ip_address.cpp b/src/ip_address.cpp index 75fbce7..f05f6dd 100644 --- a/src/ip_address.cpp +++ b/src/ip_address.cpp @@ -81,7 +81,7 @@ uint32_t IPv4Address::ip_to_int(const char* ip) { #ifdef WIN32 in_addr addr; if(InetPtonA(AF_INET, ip, &addr)) { - return addr.s_addr; + return Endian::be_to_host(addr.s_addr); } else { throw std::runtime_error("Invalid ip address"); From c3a81f76d5ebc733ebdb84aad6585ce92be38ef6 Mon Sep 17 00:00:00 2001 From: zhiweicai Date: Tue, 16 Dec 2014 21:40:35 -0500 Subject: [PATCH 2/3] recover config.h --- include/tins/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tins/config.h b/include/tins/config.h index 2326bf8..16027eb 100644 --- a/include/tins/config.h +++ b/include/tins/config.h @@ -6,6 +6,6 @@ #define HAVE_DOT11 /* Have WPA2 decryption library */ -//#define HAVE_WPA2_DECRYPTION +#define HAVE_WPA2_DECRYPTION From ab972565d681e267768e5c9771cfea53be53d75f Mon Sep 17 00:00:00 2001 From: zhiweicai Date: Tue, 16 Dec 2014 21:42:20 -0500 Subject: [PATCH 3/3] recover config.h --- include/tins/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/tins/config.h b/include/tins/config.h index 16027eb..23672e8 100644 --- a/include/tins/config.h +++ b/include/tins/config.h @@ -7,5 +7,3 @@ /* Have WPA2 decryption library */ #define HAVE_WPA2_DECRYPTION - -