From 8844c04752a1e828c48013eb5c91d1d0bc88b2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20De=20Keersmaeker?=
<francois.dekeersmaeker@uclouvain.be>
Date: Tue, 29 Oct 2024 15:47:14 +0100
Subject: [PATCH] Templates: updated special characters in NFQueue name
---
profile_translator_blocklist/templates/CMakeLists.txt.j2 | 1 +
profile_translator_blocklist/templates/callback.c.j2 | 2 +-
profile_translator_blocklist/templates/main.c.j2 | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/profile_translator_blocklist/templates/CMakeLists.txt.j2 b/profile_translator_blocklist/templates/CMakeLists.txt.j2
index 104d742..bc15605 100644
--- a/profile_translator_blocklist/templates/CMakeLists.txt.j2
+++ b/profile_translator_blocklist/templates/CMakeLists.txt.j2
@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.20)
set(EXECUTABLE_OUTPUT_PATH ${BIN_DIR})
# Nfqueue C file for device {{device}}
+{% set nfqueue_name = nfqueue.name.replace(':', '_').replace('#', '_').replace('.', '_').replace('/', '_').replace('*', '_').replace('?', '_').replace('=', '_') %}
add_executable({{nfqueue_name}} nfqueues.c)
target_link_libraries({{nfqueue_name}} pthread)
IF( OPENWRT_CROSSCOMPILING )
diff --git a/profile_translator_blocklist/templates/callback.c.j2 b/profile_translator_blocklist/templates/callback.c.j2
index 477630a..9fd9781 100644
--- a/profile_translator_blocklist/templates/callback.c.j2
+++ b/profile_translator_blocklist/templates/callback.c.j2
@@ -35,7 +35,7 @@ uint32_t old_verdict = verdict;
{% endmacro %}
{% macro write_callback_function(loop_index, nfqueue) %}
-{% set nfqueue_name = nfqueue.name.replace('-', '_').replace('#', '_').replace('.', '_').replace('/', '_').replace('*', '_').replace('?', '_').replace('=', '_') %}
+{% set nfqueue_name = nfqueue.name.replace('-', '_').replace(':', '_').replace('#', '_').replace('.', '_').replace('/', '_').replace('*', '_').replace('?', '_').replace('=', '_') %}
/**
* @brief {{nfqueue.name}} callback function, called when a packet enters the queue.
*
diff --git a/profile_translator_blocklist/templates/main.c.j2 b/profile_translator_blocklist/templates/main.c.j2
index aa5eaa7..83d9167 100644
--- a/profile_translator_blocklist/templates/main.c.j2
+++ b/profile_translator_blocklist/templates/main.c.j2
@@ -136,7 +136,7 @@ int main(int argc, char *argv[]) {
uint8_t i = 0;
{% for nfqueue in nfqueues if nfqueue.queue_num >= 0 %}
- {% set nfqueue_name = nfqueue.name.replace('-', '_').replace('#', '_').replace('.', '_').replace('/', '_').replace('*', '_').replace('?', '_').replace('=', '_') %}
+ {% set nfqueue_name = nfqueue.name.replace('-', '_').replace(':', '_').replace('#', '_').replace('.', '_').replace('/', '_').replace('*', '_').replace('?', '_').replace('=', '_') %}
/* {{nfqueue.name}} */
// Setup thread-specific data
thread_data[i].id = i;
--
GitLab