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 build issues when disabling Dot11

Browse Source 
Fixes #258
This commit is contained in:
Matias Fontanini
2017-10-18 06:40:51 -07:00
parent c439eccdf8
commit f4635a696e
5 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/tins/utils/radiotap_parser.h
View File

@@ -27,7 +27,9 @@
*
*/
#ifndef TINS_RADIOTAP_PARSER_H
#include <tins/config.h>
#if !defined(TINS_RADIOTAP_PARSER_H) && defined(TINS_HAVE_DOT11)
#define TINS_RADIOTAP_PARSER_H
#include <stdint.h>

5
include/tins/utils/radiotap_writer.h
View File

@@ -27,7 +27,10 @@
*
*/
#ifndef TINS_RADIOTAP_WRITER_H
#include <tins/config.h>
#if !defined(TINS_RADIOTAP_WRITER_H) && defined(TINS_HAVE_DOT11)
#define TINS_RADIOTAP_WRITER_H
#include <vector>

7
src/utils/radiotap_parser.cpp
View File

@@ -27,8 +27,11 @@
*
*/
#include <iostream>
#include <tins/utils/radiotap_parser.h>
#ifdef TINS_HAVE_DOT11
#include <iostream>
#include <tins/exceptions.h>
using std::vector;
@@ -331,3 +334,5 @@ void RadioTapParser::load_current_flags() {
} // Utils
} // Tins
#endif // TINS_HAVE_DOT11

7
src/utils/radiotap_writer.cpp
View File

@@ -27,8 +27,11 @@
*
*/
#include <cmath>
#include <tins/utils/radiotap_writer.h>
#ifdef TINS_HAVE_DOT11
#include <cmath>
#include <tins/utils/radiotap_parser.h>
#include <tins/exceptions.h>
@@ -167,3 +170,5 @@ void RadioTapWriter::update_paddings(const vector<uint8_t>& paddings, uint32_t o
} // Utils
} // Tins
#endif // TINS_HAVE_DOT11

54
tests/src/CMakeLists.txt
View File

@@ -40,24 +40,6 @@ CREATE_TEST(arp)
CREATE_TEST(dhcp)
CREATE_TEST(dhcpv6)
CREATE_TEST(dns)
CREATE_TEST(dot11/ack)
CREATE_TEST(dot11/assoc_request)
CREATE_TEST(dot11/assoc_response)
CREATE_TEST(dot11/authentication)
CREATE_TEST(dot11/beacon)
CREATE_TEST(dot11/block_ack_request)
CREATE_TEST(dot11/cf_end)
CREATE_TEST(dot11/cf_end_ack)
CREATE_TEST(dot11/data)
CREATE_TEST(dot11/deauthentication)
CREATE_TEST(dot11/disassoc)
CREATE_TEST(dot11/dot11)
CREATE_TEST(dot11/probe_request)
CREATE_TEST(dot11/probe_response)
CREATE_TEST(dot11/ps_poll)
CREATE_TEST(dot11/reassoc_request)
CREATE_TEST(dot11/reassoc_response)
CREATE_TEST(dot11/rts)
CREATE_TEST(dot1q)
CREATE_TEST(ethernet)
CREATE_TEST(hw_address)
@@ -79,7 +61,6 @@ CREATE_TEST(pdu)
CREATE_TEST(pdu_iterator)
CREATE_TEST(pppoe)
CREATE_TEST(raw_pdu)
CREATE_TEST(radiotap)
CREATE_TEST(rc4_eapol)
CREATE_TEST(rsn_eapol)
CREATE_TEST(sll)
@@ -89,14 +70,39 @@ CREATE_TEST(tcp)
CREATE_TEST(tcp_ip)
CREATE_TEST(udp)
CREATE_TEST(utils)
CREATE_TEST(wep_decrypt)
IF(LIBTINS_ENABLE_PCAP)
CREATE_TEST(offline_packet_filter)
CREATE_TEST(ppi)
CREATE_TEST(tcp_stream)
IF(LIBTINS_ENABLE_DOT11)
CREATE_TEST(ppi)
ENDIF()
ENDIF()
IF(LIBTINS_ENABLE_DOT11)
CREATE_TEST(dot11/ack)
CREATE_TEST(dot11/assoc_request)
CREATE_TEST(dot11/assoc_response)
CREATE_TEST(dot11/authentication)
CREATE_TEST(dot11/beacon)
CREATE_TEST(dot11/block_ack_request)
CREATE_TEST(dot11/cf_end)
CREATE_TEST(dot11/cf_end_ack)
CREATE_TEST(dot11/data)
CREATE_TEST(dot11/deauthentication)
CREATE_TEST(dot11/disassoc)
CREATE_TEST(dot11/dot11)
CREATE_TEST(dot11/probe_request)
CREATE_TEST(dot11/probe_response)
CREATE_TEST(dot11/ps_poll)
CREATE_TEST(dot11/reassoc_request)
CREATE_TEST(dot11/reassoc_response)
CREATE_TEST(dot11/rts)
CREATE_TEST(radiotap)
CREATE_TEST(wep_decrypt)
IF(LIBTINS_ENABLE_WPA2)
CREATE_TEST(wpa2_decrypt)
ENDIF()
ENDIF()
IF(LIBTINS_ENABLE_WPA2)
CREATE_TEST(wpa2_decrypt)
ENDIF()