From 6ad8e3ed2440a50c5db47f332ab640164f0f3ae0 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 16 Sep 2022 14:43:36 +0200 Subject: [PATCH] af_packet: Add -Wunused and -Werror This would've found the enable_defrag issue and also points out another unused variable. --- src/iosource/af_packet/CMakeLists.txt | 2 ++ src/iosource/af_packet/src/AF_Packet.cc | 13 ++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/iosource/af_packet/CMakeLists.txt b/src/iosource/af_packet/CMakeLists.txt index 66bf28de1d..50b37967ae 100644 --- a/src/iosource/af_packet/CMakeLists.txt +++ b/src/iosource/af_packet/CMakeLists.txt @@ -5,6 +5,8 @@ project(ZeekPluginAF_Packet) include(ZeekPlugin) +add_compile_options(-Wunused -Werror) + zeek_plugin_begin(Zeek AF_Packet) zeek_plugin_cc(src/Plugin.cc) zeek_plugin_cc(src/AF_Packet.cc) diff --git a/src/iosource/af_packet/src/AF_Packet.cc b/src/iosource/af_packet/src/AF_Packet.cc index 5c02b17c72..5e54130a31 100644 --- a/src/iosource/af_packet/src/AF_Packet.cc +++ b/src/iosource/af_packet/src/AF_Packet.cc @@ -223,13 +223,12 @@ bool AF_PacketSource::ExtractNextPacket(zeek::Packet* pkt) if ( ! socket_fd ) return false; - struct tpacket3_hdr *packet = 0; - const u_char *data; - struct timeval ts; - while ( true ) - { - if ( ! rx_ring->GetNextPacket(&packet) ) - return false; + struct tpacket3_hdr *packet = 0; + const u_char *data; + while ( true ) + { + if ( ! rx_ring->GetNextPacket(&packet) ) + return false; current_hdr.ts.tv_sec = packet->tp_sec; current_hdr.ts.tv_usec = packet->tp_nsec / 1000;