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 system issues.

Browse Source
This commit is contained in:
Matias Fontanini
2014-08-23 13:05:51 -03:00
parent d0d4379b1b
commit 3a02bd0a3f
5 changed files with 96 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
src/CMakeLists.txt
View File

@@ -1,132 +1,57 @@
OPTION(LIBTINS_BUILD_SHARED "Build libtins as a shared library." ON)
IF(LIBTINS_BUILD_SHARED)
SET(LIBTINS_TYPE SHARED)
ELSE(LIBTINS_BUILD_SHARED)
SET(LIBTINS_TYPE STATIC)
ENDIF(LIBTINS_BUILD_SHARED)
SET(LIBTINS_INCLUDE_DIR ../include)
INCLUDE_DIRECTORIES(${LIBTINS_INCLUDE_DIR})
SET(PUBLIC_HEADERS
${LIBTINS_INCLUDE_DIR}/internals.h
${LIBTINS_INCLUDE_DIR}/dhcpv6.h
${LIBTINS_INCLUDE_DIR}/dot11.h
${LIBTINS_INCLUDE_DIR}/dot1q.h
${LIBTINS_INCLUDE_DIR}/dot3.h
${LIBTINS_INCLUDE_DIR}/small_uint.h
${LIBTINS_INCLUDE_DIR}/ip.h
${LIBTINS_INCLUDE_DIR}/ipsec.h
${LIBTINS_INCLUDE_DIR}/eapol.h
${LIBTINS_INCLUDE_DIR}/tcp_stream.h
${LIBTINS_INCLUDE_DIR}/pppoe.h
${LIBTINS_INCLUDE_DIR}/handshake_capturer.h
${LIBTINS_INCLUDE_DIR}/ipv6.h
${LIBTINS_INCLUDE_DIR}/icmpv6.h
${LIBTINS_INCLUDE_DIR}/ieee802_3.h
${LIBTINS_INCLUDE_DIR}/endianness.h
${LIBTINS_INCLUDE_DIR}/rsn_information.h
${LIBTINS_INCLUDE_DIR}/loopback.h
${LIBTINS_INCLUDE_DIR}/ethernetII.h
${LIBTINS_INCLUDE_DIR}/crypto.h
${LIBTINS_INCLUDE_DIR}/packet.h
${LIBTINS_INCLUDE_DIR}/llc.h
${LIBTINS_INCLUDE_DIR}/ip_reassembler.h
${LIBTINS_INCLUDE_DIR}/icmp.h
${LIBTINS_INCLUDE_DIR}/hw_address.h
${LIBTINS_INCLUDE_DIR}/packet_writer.h
${LIBTINS_INCLUDE_DIR}/macros.h
${LIBTINS_INCLUDE_DIR}/arp.h
${LIBTINS_INCLUDE_DIR}/ip_address.h
${LIBTINS_INCLUDE_DIR}/pdu.h
${LIBTINS_INCLUDE_DIR}/packet_sender.h
${LIBTINS_INCLUDE_DIR}/bootp.h
${LIBTINS_INCLUDE_DIR}/network_interface.h
${LIBTINS_INCLUDE_DIR}/sll.h
${LIBTINS_INCLUDE_DIR}/ppi.h
${LIBTINS_INCLUDE_DIR}/radiotap.h
${LIBTINS_INCLUDE_DIR}/dns.h
${LIBTINS_INCLUDE_DIR}/rawpdu.h
${LIBTINS_INCLUDE_DIR}/sniffer.h
${LIBTINS_INCLUDE_DIR}/snap.h
${LIBTINS_INCLUDE_DIR}/pdu_cacher.h
${LIBTINS_INCLUDE_DIR}/dhcp.h
${LIBTINS_INCLUDE_DIR}/timestamp.h
${LIBTINS_INCLUDE_DIR}/tcp.h
${LIBTINS_INCLUDE_DIR}/pdu_option.h
${LIBTINS_INCLUDE_DIR}/tins.h
${LIBTINS_INCLUDE_DIR}/udp.h
${LIBTINS_INCLUDE_DIR}/ipv6_address.h
${LIBTINS_INCLUDE_DIR}/constants.h
${LIBTINS_INCLUDE_DIR}/utils.h
${LIBTINS_INCLUDE_DIR}/cxxstd.h
${LIBTINS_INCLUDE_DIR}/stp.h
${LIBTINS_INCLUDE_DIR}/exceptions.h
${LIBTINS_INCLUDE_DIR}/address_range.h
${LIBTINS_INCLUDE_DIR}/pdu_allocator.h
${LIBTINS_INCLUDE_DIR}/dot11/dot11_base.h
${LIBTINS_INCLUDE_DIR}/dot11/dot11_beacon.h
${LIBTINS_INCLUDE_DIR}/dot11/dot11_data.h
${LIBTINS_INCLUDE_DIR}/dot11/dot11_mgmt.h
${LIBTINS_INCLUDE_DIR}/dot11/dot11_assoc.h
${LIBTINS_INCLUDE_DIR}/dot11/dot11_auth.h
${LIBTINS_INCLUDE_DIR}/dot11/dot11_probe.h
${LIBTINS_INCLUDE_DIR}/dot11/dot11_control.h
${LIBTINS_INCLUDE_DIR}/config.h
)
ADD_LIBRARY(
tins ${LIBTINS_TYPE}
arp.cpp
bootp.cpp
handshake_capturer.cpp
stp.cpp
pppoe.cpp
crypto.cpp
dhcp.cpp
dhcpv6.cpp
dns.cpp
dot3.cpp
dot1q.cpp
eapol.cpp
ethernetII.cpp
icmp.cpp
icmpv6.cpp
internals.cpp
ip_reassembler.cpp
ip.cpp
ip_address.cpp
ipv6.cpp
ipv6_address.cpp
ipsec.cpp
llc.cpp
loopback.cpp
network_interface.cpp
packet_sender.cpp
packet_writer.cpp
ppi.cpp
pdu.cpp
radiotap.cpp
address_range.cpp
rawpdu.cpp
rsn_information.cpp
sll.cpp
snap.cpp
sniffer.cpp
tcp.cpp
tcp_stream.cpp
udp.cpp
utils.cpp
dot11/dot11_base.cpp
dot11/dot11_data.cpp
dot11/dot11_mgmt.cpp
dot11/dot11_beacon.cpp
dot11/dot11_assoc.cpp
dot11/dot11_auth.cpp
dot11/dot11_probe.cpp
dot11/dot11_control.cpp
tins ${LIBTINS_TYPE}
arp.cpp
bootp.cpp
handshake_capturer.cpp
stp.cpp
pppoe.cpp
crypto.cpp
dhcp.cpp
dhcpv6.cpp
dns.cpp
dot3.cpp
dot1q.cpp
eapol.cpp
ethernetII.cpp
icmp.cpp
icmpv6.cpp
internals.cpp
ip_reassembler.cpp
ip.cpp
ip_address.cpp
ipv6.cpp
ipv6_address.cpp
ipsec.cpp
llc.cpp
loopback.cpp
network_interface.cpp
packet_sender.cpp
packet_writer.cpp
ppi.cpp
pdu.cpp
radiotap.cpp
address_range.cpp
rawpdu.cpp
rsn_information.cpp
sll.cpp
snap.cpp
sniffer.cpp
tcp.cpp
tcp_stream.cpp
udp.cpp
utils.cpp
dot11/dot11_base.cpp
dot11/dot11_data.cpp
dot11/dot11_mgmt.cpp
dot11/dot11_beacon.cpp
dot11/dot11_assoc.cpp
dot11/dot11_auth.cpp
dot11/dot11_probe.cpp
dot11/dot11_control.cpp
)
TARGET_LINK_LIBRARIES(tins pcap)
@@ -141,5 +66,5 @@ INSTALL(
EXPORT libtinsTargets
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
PUBLIC_HEADER DESTINATION include/tins COMPONENT dev
COMPONENT dev
)

2
src/dhcpv6.cpp
View File

@@ -368,8 +368,6 @@ void DHCPv6::rapid_commit() {
}
void DHCPv6::user_class(const user_class_type &value) {
typedef user_class_type::data_type::const_iterator iterator;
std::vector<uint8_t> buffer;
Internals::class_option_data2option(value.data.begin(), value.data.end(), buffer);
add_option(