chore(libscap): generate uthash.h at build time

Signed-off-by: Andrea Terzolo <[email protected]>

cmake/modules/libscap.cmake

@@ -12,6 +12,8 @@ include(GNUInstallDirs)
 
 include(ExternalProject)
 
+include(uthash)
+
 include(CheckSymbolExists)
 check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
 check_symbol_exists(strlcat "string.h" HAVE_STRLCAT)

cmake/modules/uthash.cmake

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2023 The Falco Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
+set(UTHASH_DOWNLOAD_URL "https://raw.githubusercontent.com/troydhanson/uthash/v1.9.8/src/uthash.h")
+set(UTHASH_DOWNLOAD_DIR "${LIBSCAP_DIR}/userspace/libscap")
+
+if(NOT EXISTS "${UTHASH_DOWNLOAD_DIR}/uthash.h")
+	message(STATUS "Download 'uthash.h' from: ${UTHASH_DOWNLOAD_URL}")
+	file(DOWNLOAD
+	"${UTHASH_DOWNLOAD_URL}"
+	"${UTHASH_DOWNLOAD_DIR}/uthash.h"
+	)
+endif()

userspace/libscap/linux/scap_cgroup.c

@@ -20,7 +20,7 @@ limitations under the License.
 #include "scap_assert.h"
 #include "scap_const.h"
 #include "strerror.h"
-#include "uthash.h"
+#include "uthash_ext.h"
 
 #include <dirent.h>
 #include <errno.h>

userspace/libscap/linux/scap_fds.c

@@ -26,7 +26,7 @@ limitations under the License.
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include "uthash.h"
+#include "uthash_ext.h"
 #include "compat/misc.h"
 #include <inttypes.h>
 #include <unistd.h>

userspace/libscap/linux/scap_linux_int.h

@@ -20,7 +20,7 @@ limitations under the License.
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "uthash.h"
+#include "uthash_ext.h"
 
 typedef struct scap_fdinfo scap_fdinfo;
 

userspace/libscap/scap.h

@@ -60,7 +60,7 @@ typedef struct ppm_evt_hdr scap_evt;
 //
 #include <time.h>
 #include <stdarg.h>
-#include "uthash.h"
+#include "uthash_ext.h"
 #include "../common/types.h"
 #include "../../driver/ppm_api_version.h"
 #include "../../driver/ppm_events_public.h"

userspace/libscap/scap_fds.c

@@ -19,7 +19,7 @@ limitations under the License.
 
 #include "scap.h"
 #include "scap-int.h"
-#include "uthash.h"
+#include "uthash_ext.h"
 #include <inttypes.h>
 #include <string.h>
 

userspace/libscap/scap_suppress.h

@@ -24,7 +24,7 @@ limitations under the License.
 extern "C" {
 #endif
 
-#include "uthash.h"
+#include "uthash_ext.h"
 
 typedef struct scap_tid
 {

userspace/libscap/uthash_ext.h

@@ -0,0 +1,33 @@
+/*
+Copyright (C) 2023 The Falco Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+
+#pragma once
+
+#define uthash_fatal(msg) uth_status = SCAP_FAILURE 
+
+/* `uthash.h` is generated at build time, see `uthash.cmake` */
+#include "uthash.h"
+
+/* Further definitions on top of 'uthash.h' */
+#define HASH_FIND_INT32(head,findint,out)                                        \
+    HASH_FIND(hh,head,findint,sizeof(uint32_t),out)
+#define HASH_ADD_INT32(head,intfield,add)                                        \
+    HASH_ADD(hh,head,intfield,sizeof(uint32_t),add)
+#define HASH_FIND_INT64(head,findint,out)                                        \
+    HASH_FIND(hh,head,findint,sizeof(uint64_t),out)
+#define HASH_ADD_INT64(head,intfield,add)                                        \
+    HASH_ADD(hh,head,intfield,sizeof(uint64_t),add)