Fix tests

CMakeLists.txt

@@ -38,7 +38,7 @@ set(VECTORSZ 4000 CACHE STRING "Memory allocation for spin state vector")
 include("CheckTypeSize")
 check_type_size("void *" SIZEOF_VOID_P)
 check_type_size("int" SIZEOF_INT)
-add_compile_options(-Wall -Wextra -Werror)
+add_compile_options(-Wall -Wextra -Werror -O2)
 
 #
 # release/debug compile flags

src/dockerapi.cpp

@@ -271,7 +271,7 @@ Document DockerAPI::inspect_img(const string &img_name) {
 }
 
 Document DockerAPI::rm_img(const string &img_name) {
-    string path = "/images/" + img_name;
+    string path = "/images/" + img_name + "?force=true";
     return this->send_curl_request(method::DELETE, path);
 }
 

src/droptrace.bpf.c

@@ -1,7 +1,5 @@
 #include "../build/vmlinux.h"
 
-#include <linux/string.h>
-
 #include <bpf/bpf_core_read.h>
 #include <bpf/bpf_helpers.h>
 

src/droptrace.cpp

@@ -105,9 +105,7 @@ void DropTrace::start() {
         logger.error("Another BPF progam is already loaded");
     }
 
-    _bpf = droptrace_bpf__open();
-
-    if (!_bpf) {
+    if (!(_bpf = droptrace_bpf__open())) {
         logger.error("Failed to open BPF program", errno);
     }
 
@@ -163,7 +161,6 @@ void DropTrace::start_listening_for(const Packet &pkt, Driver *driver) {
 
     _ringbuf = ring_buffer__new(bpf_map__fd(_bpf->maps.events),
                                 DropTrace::ringbuf_handler, this, nullptr);
-
     if (!_ringbuf) {
         logger.error("Failed to create ring buffer", errno);
     }

src/packet.cpp

@@ -8,12 +8,11 @@
 
 #include "driver/docker.hpp"
 #include "driver/driver.hpp"
-#include "eqclassmgr.hpp"
+#include "eqclass.hpp"
 #include "interface.hpp"
 #include "lib/hash.hpp"
 #include "model-access.hpp"
 #include "payload.hpp"
-#include "process/process.hpp"
 #include "protocols.hpp"
 
 Packet::Packet() :

third_party/bpftool/CMakeLists.txt

@@ -8,5 +8,5 @@ ExternalProject_Add(bpftool
     STEP_TARGETS build
 )
 
-set(bpftool_VERSION "7.2.0" PARENT_SCOPE)
+set(bpftool_VERSION "7.4.0" PARENT_SCOPE)
 set(bpftool_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/bpftool PARENT_SCOPE)

third_party/libbpf/CMakeLists.txt

@@ -16,6 +16,6 @@ ExternalProject_Add(libbpf
     STEP_TARGETS build
 )
 
-set(libbpf_VERSION "1.2.2" PARENT_SCOPE)
+set(libbpf_VERSION "1.4.0" PARENT_SCOPE)
 set(libbpf_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/install PARENT_SCOPE)
 set(libbpf_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/install/libbpf.a PARENT_SCOPE)