From a71a3d29ffd2b7012530f0b1bb7cf9aedf01aff3 Mon Sep 17 00:00:00 2001 From: Kyle Fazzari Date: Wed, 25 Jan 2017 13:26:11 -0800 Subject: [PATCH] Fix -Wextra compiler warnings. (#184) * Fix -Wextra compiler warnings. Fix #183. Signed-off-by: Kyle Fazzari * Comment out unused parameters. This is done everywhere possible instead of using Internals::unused(). Note that this involved moving some implementations into the corresponding .cpp file. Signed-off-by: Kyle Fazzari * Fix warnings in tests as well. Signed-off-by: Kyle Fazzari * Leave IPv4Reassembler alone, it's growing. Signed-off-by: Kyle Fazzari --- CMakeLists.txt | 2 +- include/tins/cxxstd.h | 2 ++ include/tins/dot11/dot11_base.h | 4 ++-- include/tins/hw_address.h | 2 +- include/tins/pdu.h | 10 ++++------ src/arp.cpp | 2 +- src/bootp.cpp | 2 +- src/dhcp.cpp | 2 +- src/dhcpv6.cpp | 2 +- src/dns.cpp | 4 ++-- src/dot11/dot11_base.cpp | 11 ++++++++--- src/dot1q.cpp | 2 +- src/dot3.cpp | 4 ++-- src/ethernetII.cpp | 2 +- src/icmp.cpp | 2 +- src/ip.cpp | 2 ++ src/ipv6.cpp | 4 ++-- src/llc.cpp | 2 +- src/offline_packet_filter.cpp | 4 +++- src/packet_sender.cpp | 6 ++++++ src/packet_writer.cpp | 11 ++++++----- src/pdu.cpp | 7 +++++++ src/pktap.cpp | 2 +- src/ppi.cpp | 2 +- src/radiotap.cpp | 2 +- src/rawpdu.cpp | 2 +- src/snap.cpp | 2 +- src/sniffer.cpp | 4 ++++ src/tcp_ip/stream.cpp | 4 ++-- src/tcp_stream.cpp | 2 +- src/udp.cpp | 2 +- tests/src/icmpv6_test.cpp | 4 ++-- tests/src/tcp_ip_test.cpp | 14 +++++++------- tests/src/wpa2_decrypt_test.cpp | 4 ++-- 34 files changed, 80 insertions(+), 53 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c35a242..9ef1961 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ IF(MSVC) ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS=1") ADD_DEFINITIONS("-DNOGDI=1") ELSE() - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") ENDIF() IF(APPLE) diff --git a/include/tins/cxxstd.h b/include/tins/cxxstd.h index 1a0b309..5ea4723 100644 --- a/include/tins/cxxstd.h +++ b/include/tins/cxxstd.h @@ -56,6 +56,8 @@ struct smart_ptr { typedef std::auto_ptr type; #endif }; + +template void unused(const T&) { } } } diff --git a/include/tins/dot11/dot11_base.h b/include/tins/dot11/dot11_base.h index c8091e4..aa4d38e 100644 --- a/include/tins/dot11/dot11_base.h +++ b/include/tins/dot11/dot11_base.h @@ -508,8 +508,8 @@ public: */ static Dot11* from_bytes(const uint8_t* buffer, uint32_t total_sz); protected: - virtual void write_ext_header(Memory::OutputMemoryStream& stream) { } - virtual void write_fixed_parameters(Memory::OutputMemoryStream& stream) { } + virtual void write_ext_header(Memory::OutputMemoryStream& stream); + virtual void write_fixed_parameters(Memory::OutputMemoryStream& stream); void parse_tagged_parameters(Memory::InputMemoryStream& stream); void add_tagged_option(OptionTypes opt, uint8_t len, const uint8_t* val); protected: diff --git a/include/tins/hw_address.h b/include/tins/hw_address.h index 91cbf01..543b2a1 100644 --- a/include/tins/hw_address.h +++ b/include/tins/hw_address.h @@ -269,7 +269,7 @@ public: * * This effectively returns the address_size constant. */ - const size_t size() const { + size_t size() const { return address_size; } diff --git a/include/tins/pdu.h b/include/tins/pdu.h index bb6005b..ab006ef 100644 --- a/include/tins/pdu.h +++ b/include/tins/pdu.h @@ -353,7 +353,7 @@ public: */ template const T* find_pdu(PDUType type = T::pdu_flag) const { - return const_cast(this)->find_pdu(); + return const_cast(this)->find_pdu(type); } /** @@ -381,7 +381,7 @@ public: */ template const T& rfind_pdu(PDUType type = T::pdu_flag) const { - return const_cast(this)->rfind_pdu(); + return const_cast(this)->rfind_pdu(type); } /** @@ -433,9 +433,7 @@ public: * \param ptr The pointer to the buffer. * \param total_sz The size of the buffer. */ - virtual bool matches_response(const uint8_t* ptr, uint32_t total_sz) const { - return false; - } + virtual bool matches_response(const uint8_t* ptr, uint32_t total_sz) const; /** * \brief Check whether this PDU matches the specified flag. @@ -485,7 +483,7 @@ protected: * * \param parent The parent PDU. */ - virtual void prepare_for_serialize(const PDU* parent) { } + virtual void prepare_for_serialize(const PDU* parent); /** * \brief Serializes this PDU and propagates this action to child PDUs. diff --git a/src/arp.cpp b/src/arp.cpp index 061a6d8..e4ed5e2 100644 --- a/src/arp.cpp +++ b/src/arp.cpp @@ -43,7 +43,7 @@ using Tins::Memory::OutputMemoryStream; namespace Tins { -PDU::metadata ARP::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { +PDU::metadata ARP::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) { if (TINS_UNLIKELY(total_sz < sizeof(arp_header))) { throw malformed_packet(); } diff --git a/src/bootp.cpp b/src/bootp.cpp index 530d3db..0611ec8 100644 --- a/src/bootp.cpp +++ b/src/bootp.cpp @@ -115,7 +115,7 @@ void BootP::vend(const vend_type& newvend_) { vend_ = newvend_; } -void BootP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void BootP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); stream.write(bootp_); stream.write(vend_.begin(), vend_.end()); diff --git a/src/dhcp.cpp b/src/dhcp.cpp index 01690fb..99e132a 100644 --- a/src/dhcp.cpp +++ b/src/dhcp.cpp @@ -47,7 +47,7 @@ using Tins::Memory::OutputMemoryStream; namespace Tins { -PDU::metadata DHCP::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { +PDU::metadata DHCP::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) { if (TINS_UNLIKELY(total_sz < sizeof(bootp_header))) { throw malformed_packet(); } diff --git a/src/dhcpv6.cpp b/src/dhcpv6.cpp index d8ef69d..db2e4b9 100644 --- a/src/dhcpv6.cpp +++ b/src/dhcpv6.cpp @@ -45,7 +45,7 @@ using Tins::Memory::OutputMemoryStream; namespace Tins { -PDU::metadata DHCPv6::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { +PDU::metadata DHCPv6::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) { if (TINS_UNLIKELY(total_sz < 2)) { throw malformed_packet(); } diff --git a/src/dns.cpp b/src/dns.cpp index 5bf8bd8..48cb06f 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -51,7 +51,7 @@ using Tins::Memory::OutputMemoryStream; namespace Tins { -PDU::metadata DNS::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { +PDU::metadata DNS::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) { if (TINS_UNLIKELY(total_sz < sizeof(dns_header))) { throw malformed_packet(); } @@ -386,7 +386,7 @@ uint32_t DNS::compose_name(const uint8_t* ptr, char* out_ptr) const { return end_ptr - start_ptr; } -void DNS::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void DNS::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); stream.write(header_); stream.write(records_data_.begin(), records_data_.end()); diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp index f647d4d..82765eb 100644 --- a/src/dot11/dot11_base.cpp +++ b/src/dot11/dot11_base.cpp @@ -67,9 +67,8 @@ Dot11::Dot11(const address_type& dst_hw_addr) addr1(dst_hw_addr); } -Dot11::Dot11(const dot11_header* header_ptr) +Dot11::Dot11(const dot11_header* /*header_ptr*/) : header_(), options_size_(0) { - } Dot11::Dot11(const uint8_t* buffer, uint32_t total_sz) @@ -78,6 +77,12 @@ Dot11::Dot11(const uint8_t* buffer, uint32_t total_sz) stream.read(header_); } +void Dot11::write_ext_header(Memory::OutputMemoryStream& /*stream*/) { +} + +void Dot11::write_fixed_parameters(Memory::OutputMemoryStream& /*stream*/) { +} + void Dot11::parse_tagged_parameters(InputMemoryStream& stream) { if (stream) { while (stream.size() >= 2) { @@ -208,7 +213,7 @@ void Dot11::send(PacketSender& sender, const NetworkInterface& iface) { } #endif // _WIN32 -void Dot11::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void Dot11::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); stream.write(header_); write_ext_header(stream); diff --git a/src/dot1q.cpp b/src/dot1q.cpp index 574521d..2a3c74a 100644 --- a/src/dot1q.cpp +++ b/src/dot1q.cpp @@ -39,7 +39,7 @@ using Tins::Memory::OutputMemoryStream; namespace Tins { -PDU::metadata Dot1Q::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { +PDU::metadata Dot1Q::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) { if (TINS_UNLIKELY(total_sz < sizeof(dot1q_header))) { throw malformed_packet(); } diff --git a/src/dot3.cpp b/src/dot3.cpp index bfa718d..ec0113b 100644 --- a/src/dot3.cpp +++ b/src/dot3.cpp @@ -56,7 +56,7 @@ namespace Tins { const Dot3::address_type Dot3::BROADCAST("ff:ff:ff:ff:ff:ff"); -PDU::metadata Dot3::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { +PDU::metadata Dot3::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) { if (TINS_UNLIKELY(total_sz < sizeof(dot3_header))) { throw malformed_packet(); } @@ -134,7 +134,7 @@ bool Dot3::matches_response(const uint8_t* ptr, uint32_t total_sz) const { return false; } -void Dot3::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void Dot3::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); header_.length = Endian::host_to_be(size() - sizeof(header_)); stream.write(header_); diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp index 1502d99..d5a19e8 100644 --- a/src/ethernetII.cpp +++ b/src/ethernetII.cpp @@ -161,7 +161,7 @@ bool EthernetII::matches_response(const uint8_t* ptr, uint32_t total_sz) const { return false; } -void EthernetII::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void EthernetII::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); if (inner_pdu()) { Constants::Ethernet::e flag; diff --git a/src/icmp.cpp b/src/icmp.cpp index cc59a84..63bb299 100644 --- a/src/icmp.cpp +++ b/src/icmp.cpp @@ -46,7 +46,7 @@ using Tins::Memory::OutputMemoryStream; namespace Tins { -PDU::metadata ICMP::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { +PDU::metadata ICMP::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) { if (TINS_UNLIKELY(total_sz < sizeof(icmp_header))) { throw malformed_packet(); } diff --git a/src/ip.cpp b/src/ip.cpp index d600617..125d2b3 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -450,6 +450,8 @@ void IP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* pare total_sz = Endian::host_to_be(total_sz); header_.frag_off = Endian::be_to_host(header_.frag_off); } + #else + Internals::unused(parent); #endif tot_len(total_sz); head_len(static_cast(header_size() / sizeof(uint32_t))); diff --git a/src/ipv6.cpp b/src/ipv6.cpp index f5b2e0f..a6a704a 100644 --- a/src/ipv6.cpp +++ b/src/ipv6.cpp @@ -70,7 +70,7 @@ PDU::metadata IPv6::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { return metadata(header_size, pdu_flag, PDU::UNKNOWN); } -IPv6::IPv6(address_type ip_dst, address_type ip_src, PDU* child) +IPv6::IPv6(address_type ip_dst, address_type ip_src, PDU* /*child*/) : header_(), headers_size_(0) { version(6); dst_addr(ip_dst); @@ -219,7 +219,7 @@ bool IPv6::matches_response(const uint8_t* ptr, uint32_t total_sz) const { return false; } -void IPv6::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void IPv6::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); if (inner_pdu()) { uint8_t new_flag = Internals::pdu_flag_to_ip_type(inner_pdu()->pdu_type()); diff --git a/src/llc.cpp b/src/llc.cpp index 9408579..43d3aa4 100644 --- a/src/llc.cpp +++ b/src/llc.cpp @@ -196,7 +196,7 @@ void LLC::clear_information_fields() { information_fields_.clear(); } -void LLC::write_serialization(uint8_t* buffer, uint32_t total_sz, const Tins::PDU* parent) { +void LLC::write_serialization(uint8_t* buffer, uint32_t total_sz, const Tins::PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); if (inner_pdu() && inner_pdu()->pdu_type() == PDU::STP) { dsap(0x42); diff --git a/src/offline_packet_filter.cpp b/src/offline_packet_filter.cpp index 4d8ea10..e909bff 100644 --- a/src/offline_packet_filter.cpp +++ b/src/offline_packet_filter.cpp @@ -28,6 +28,7 @@ */ #include +#include #include "offline_packet_filter.h" #include "pdu.h" #include "exceptions.h" @@ -64,7 +65,8 @@ void OfflinePacketFilter::init(const string& pcap_filter, } bool OfflinePacketFilter::matches_filter(const uint8_t* buffer, uint32_t total_sz) const { - pcap_pkthdr header = {}; + pcap_pkthdr header; + memset(&header, 0, sizeof(header)); header.len = total_sz; header.caplen = total_sz; return pcap_offline_filter(&filter_, &header, buffer) != 0; diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp index 7955f66..919c402 100644 --- a/src/packet_sender.cpp +++ b/src/packet_sender.cpp @@ -156,6 +156,7 @@ bool PacketSender::ether_socket_initialized(const NetworkInterface& iface) const #if defined(BSD) || defined(__FreeBSD_kernel__) return ether_socket_.count(iface.id()); #else + Internals::unused(iface); return ether_socket_ != INVALID_RAW_SOCKET; #endif } @@ -234,6 +235,7 @@ void PacketSender::open_l2_socket(const NetworkInterface& iface) { } ether_socket_[iface.id()] = sock; #else + Internals::unused(iface); if (ether_socket_ == INVALID_RAW_SOCKET) { ether_socket_ = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); @@ -284,6 +286,7 @@ void PacketSender::close_socket(SocketType type, const NetworkInterface& iface) } ether_socket_.erase(it); #elif !defined(_WIN32) + Internals::unused(iface); if (ether_socket_ == INVALID_RAW_SOCKET) { throw invalid_socket_type(); } @@ -294,6 +297,7 @@ void PacketSender::close_socket(SocketType type, const NetworkInterface& iface) #endif } else { + Internals::unused(iface); if (type >= SOCKETS_END || sockets_[type] == INVALID_RAW_SOCKET) { throw invalid_socket_type(); } @@ -354,6 +358,8 @@ void PacketSender::send_l2(PDU& pdu, PDU::serialization_type buffer = pdu.serialize(); #ifdef TINS_HAVE_PACKET_SENDER_PCAP_SENDPACKET + Internals::unused(len_addr); + Internals::unused(link_addr); open_l2_socket(iface); pcap_t* handle = pcap_handles_[iface]; const int buf_size = static_cast(buffer.size()); diff --git a/src/packet_writer.cpp b/src/packet_writer.cpp index b08d43a..f6f7eaf 100644 --- a/src/packet_writer.cpp +++ b/src/packet_writer.cpp @@ -31,6 +31,7 @@ #include #endif #include +#include #include "packet_writer.h" #include "packet.h" #include "pdu.h" @@ -71,11 +72,11 @@ void PacketWriter::write(Packet& packet) { void PacketWriter::write(PDU& pdu, const struct timeval& tv) { PDU::serialization_type buffer = pdu.serialize(); - struct pcap_pkthdr header = { - tv, - static_cast(buffer.size()), - static_cast(buffer.size()) - }; + struct pcap_pkthdr header; + memset(&header, 0, sizeof(header)); + header.ts = tv; + header.caplen = static_cast(buffer.size()); + header.len = static_cast(buffer.size()); pcap_dump((u_char*)dumper_, &header, &buffer[0]); } diff --git a/src/pdu.cpp b/src/pdu.cpp index b8de490..f772da3 100644 --- a/src/pdu.cpp +++ b/src/pdu.cpp @@ -73,6 +73,9 @@ void PDU::copy_inner_pdu(const PDU& pdu) { } } +void PDU::prepare_for_serialize(const PDU* /*parent*/) { +} + uint32_t PDU::size() const { uint32_t sz = header_size() + trailer_size(); const PDU* ptr(inner_pdu_); @@ -91,6 +94,10 @@ PDU* PDU::recv_response(PacketSender &, const NetworkInterface &) { return 0; } +bool PDU::matches_response(const uint8_t* /*ptr*/, uint32_t /*total_sz*/) const { + return false; +} + void PDU::inner_pdu(PDU* next_pdu) { delete inner_pdu_; inner_pdu_ = next_pdu; diff --git a/src/pktap.cpp b/src/pktap.cpp index 4a52be3..280346f 100644 --- a/src/pktap.cpp +++ b/src/pktap.cpp @@ -65,7 +65,7 @@ uint32_t PKTAP::header_size() const { return sizeof(header_); } -void PKTAP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void PKTAP::write_serialization(uint8_t* /*buffer*/, uint32_t /*total_sz*/, const PDU* /*parent*/) { throw pdu_not_serializable(); } diff --git a/src/ppi.cpp b/src/ppi.cpp index a256d99..1246570 100644 --- a/src/ppi.cpp +++ b/src/ppi.cpp @@ -94,7 +94,7 @@ uint32_t PPI::header_size() const { return static_cast(sizeof(header_) + data_.size()); } -void PPI::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) { +void PPI::write_serialization(uint8_t* /*buffer*/, uint32_t /*total_sz*/, const PDU *) { throw pdu_not_serializable(); } diff --git a/src/radiotap.cpp b/src/radiotap.cpp index 4579e6e..69326dc 100644 --- a/src/radiotap.cpp +++ b/src/radiotap.cpp @@ -507,7 +507,7 @@ bool RadioTap::matches_response(const uint8_t* ptr, uint32_t total_sz) const { return false; } -void RadioTap::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void RadioTap::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); uint8_t* buffer_start = buffer; radio_.it_len = Endian::host_to_le(header_size()); diff --git a/src/rawpdu.cpp b/src/rawpdu.cpp index f082092..07a3196 100644 --- a/src/rawpdu.cpp +++ b/src/rawpdu.cpp @@ -57,7 +57,7 @@ void RawPDU::payload(const payload_type& pload) { payload_ = pload; } -bool RawPDU::matches_response(const uint8_t* ptr, uint32_t total_sz) const { +bool RawPDU::matches_response(const uint8_t* /*ptr*/, uint32_t /*total_sz*/) const { return true; } diff --git a/src/snap.cpp b/src/snap.cpp index d557f0e..bf1d327 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -91,7 +91,7 @@ uint32_t SNAP::header_size() const { return sizeof(snap_); } -void SNAP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* parent) { +void SNAP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU* /*parent*/) { OutputMemoryStream stream(buffer, total_sz); if (inner_pdu()) { Constants::Ethernet::e flag = Internals::pdu_flag_to_ether_type( diff --git a/src/sniffer.cpp b/src/sniffer.cpp index a012e35..11de400 100644 --- a/src/sniffer.cpp +++ b/src/sniffer.cpp @@ -356,6 +356,8 @@ void Sniffer::set_immediate_mode(bool enabled) { if (pcap_set_immediate_mode(get_pcap_handle(), enabled)) { throw pcap_error(pcap_geterr(get_pcap_handle())); } + #else + Internals::unused(enabled); #endif // HAVE_PCAP_IMMEDIATE_MODE } @@ -366,6 +368,8 @@ void Sniffer::set_timestamp_precision(int value) { if (result == PCAP_ERROR_TSTAMP_PRECISION_NOTSUP) { throw pcap_error("Timestamp precision not supported"); } + #else + Internals::unused(value); #endif // HAVE_PCAP_TIMESTAMP_PRECISION } diff --git a/src/tcp_ip/stream.cpp b/src/tcp_ip/stream.cpp index c870ad8..3e62ace 100644 --- a/src/tcp_ip/stream.cpp +++ b/src/tcp_ip/stream.cpp @@ -309,13 +309,13 @@ void Stream::on_server_flow_data(const Flow& /*flow*/) { } } -void Stream::on_client_out_of_order(const Flow& flow, uint32_t seq, const payload_type& payload) { +void Stream::on_client_out_of_order(const Flow& /*flow*/, uint32_t seq, const payload_type& payload) { if (on_client_out_of_order_callback_) { on_client_out_of_order_callback_(*this, seq, payload); } } -void Stream::on_server_out_of_order(const Flow& flow, uint32_t seq, const payload_type& payload) { +void Stream::on_server_out_of_order(const Flow& /*flow*/, uint32_t seq, const payload_type& payload) { if (on_server_out_of_order_callback_) { on_server_out_of_order_callback_(*this, seq, payload); } diff --git a/src/tcp_stream.cpp b/src/tcp_stream.cpp index 3e1c78b..d2cafde 100644 --- a/src/tcp_stream.cpp +++ b/src/tcp_stream.cpp @@ -156,7 +156,7 @@ void TCPStream::safe_insert(fragments_type& frags, uint32_t seq, RawPDU* raw) { } bool TCPStream::generic_process(uint32_t& my_seq, - uint32_t& other_seq, + uint32_t& /*other_seq*/, payload_type& pload, fragments_type& frags, TCP* tcp) { diff --git a/src/udp.cpp b/src/udp.cpp index 8cb1689..318eb46 100644 --- a/src/udp.cpp +++ b/src/udp.cpp @@ -43,7 +43,7 @@ using Tins::Memory::OutputMemoryStream; namespace Tins { -PDU::metadata UDP::extract_metadata(const uint8_t *buffer, uint32_t total_sz) { +PDU::metadata UDP::extract_metadata(const uint8_t* /*buffer*/, uint32_t total_sz) { if (TINS_UNLIKELY(total_sz < sizeof(udp_header))) { throw malformed_packet(); } diff --git a/tests/src/icmpv6_test.cpp b/tests/src/icmpv6_test.cpp index e2d5564..4d8f231 100644 --- a/tests/src/icmpv6_test.cpp +++ b/tests/src/icmpv6_test.cpp @@ -654,7 +654,7 @@ TEST_F(ICMPv6Test, ExtensionsParsingWithoutALengthField) { const uint8_t ext[] = { 0, 8, 1, 1, 24, 150, 1, 1 }; ICMPv6 icmp(packet_with_extensions, sizeof(packet_with_extensions)); ICMPExtensionsStructure extensions = icmp.extensions(); - ASSERT_EQ(1, extensions.extensions().size()); + ASSERT_EQ(1U, extensions.extensions().size()); EXPECT_EQ( ICMPExtension::payload_type(ext, ext + sizeof(ext)), extensions.extensions().begin()->serialize() @@ -673,7 +673,7 @@ TEST_F(ICMPv6Test, ExtensionsParsingWithALengthField) { const uint8_t ext[] = { 0, 8, 1, 1, 24, 150, 1, 1 }; ICMPv6 icmp(packet_with_extensions_and_length, sizeof(packet_with_extensions_and_length)); ICMPExtensionsStructure extensions = icmp.extensions(); - ASSERT_EQ(1, extensions.extensions().size()); + ASSERT_EQ(1U, extensions.extensions().size()); EXPECT_EQ( ICMPExtension::payload_type(ext, ext + sizeof(ext)), extensions.extensions().begin()->serialize() diff --git a/tests/src/tcp_ip_test.cpp b/tests/src/tcp_ip_test.cpp index 84648a7..ae9f600 100644 --- a/tests/src/tcp_ip_test.cpp +++ b/tests/src/tcp_ip_test.cpp @@ -136,7 +136,7 @@ void FlowTest::cumulative_stream_server_data_handler(Stream& stream) { stream_server_payload_chunks.push_back(stream.server_flow().payload()); } -void FlowTest::out_of_order_handler(Flow& session, uint32_t seq, Flow::payload_type payload) { +void FlowTest::out_of_order_handler(Flow& /*session*/, uint32_t seq, Flow::payload_type payload) { flow_out_of_order_chunks.push_back(make_pair(seq, move(payload))); } @@ -777,11 +777,11 @@ TEST_F(AckTrackerTest, AckingTcp_Sack2) { tracker.process_packet(make_tcp_ack(5)); EXPECT_EQ(4U, tracker.acked_intervals().size()); - EXPECT_EQ(5, tracker.ack_number()); + EXPECT_EQ(5U, tracker.ack_number()); tracker.process_packet(make_tcp_ack(15)); EXPECT_EQ(0U, tracker.acked_intervals().size()); - EXPECT_EQ(15, tracker.ack_number()); + EXPECT_EQ(15U, tracker.ack_number()); } TEST_F(AckTrackerTest, AckingTcp_Sack3) { @@ -803,16 +803,16 @@ TEST_F(AckTrackerTest, AckingTcp_SackOutOfOrder1) { AckTracker tracker(0, true); tracker.process_packet(make_tcp_ack(10)); tracker.process_packet(make_tcp_ack(0, make_pair(9, 12))); - EXPECT_EQ(0, tracker.acked_intervals().size()); - EXPECT_EQ(11, tracker.ack_number()); + EXPECT_EQ(0U, tracker.acked_intervals().size()); + EXPECT_EQ(11U, tracker.ack_number()); } TEST_F(AckTrackerTest, AckingTcp_SackOutOfOrder2) { AckTracker tracker(0, true); tracker.process_packet(make_tcp_ack(10)); tracker.process_packet(make_tcp_ack(0, make_pair(10, 12))); - EXPECT_EQ(0, tracker.acked_intervals().size()); - EXPECT_EQ(11, tracker.ack_number()); + EXPECT_EQ(0U, tracker.acked_intervals().size()); + EXPECT_EQ(11U, tracker.ack_number()); } TEST_F(FlowTest, AckNumbersAreCorrect) { diff --git a/tests/src/wpa2_decrypt_test.cpp b/tests/src/wpa2_decrypt_test.cpp index e91129c..a5f5c8d 100644 --- a/tests/src/wpa2_decrypt_test.cpp +++ b/tests/src/wpa2_decrypt_test.cpp @@ -339,7 +339,7 @@ TEST_F(WPA2DecryptTest, HandshakeCapturedCallback) { decrypter.decrypt(radio); } - ASSERT_EQ(2, handshakes_.size()); + ASSERT_EQ(2U, handshakes_.size()); handshake hs = handshakes_[0]; EXPECT_EQ(hs.ssid, "Coherer"); EXPECT_EQ(address_type("00:0d:93:82:36:3a"), hs.client_hw); @@ -367,7 +367,7 @@ TEST_F(WPA2DecryptTest, AccessPointFoundCallback) { decrypter.decrypt(radio); } - ASSERT_EQ(2, access_points_.size()); + ASSERT_EQ(2U, access_points_.size()); ap_data data = access_points_[0]; EXPECT_EQ("Coherer", data.ssid); EXPECT_EQ(address_type("00:0c:41:82:b2:55"), data.bssid);