From a80d2f84233f6ea12f01ce6750a19e928edea375 Mon Sep 17 00:00:00 2001 From: Farzaneh Soltanzadeh Date: Sun, 14 Jul 2024 08:51:16 -0700 Subject: [PATCH 1/6] update cmake and boost required varsions --- libzzz/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzzz/CMakeLists.txt b/libzzz/CMakeLists.txt index c4fc32c..b643f33 100644 --- a/libzzz/CMakeLists.txt +++ b/libzzz/CMakeLists.txt @@ -1,7 +1,7 @@ # # Project Properties # -CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2) +CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12) PROJECT (zzz) SET (APPLICATION_NAME "ZZZ Library") SET (APPLICATION_CODENAME "${PROJECT_NAME}") @@ -41,7 +41,7 @@ INCLUDE_DIRECTORIES ("${MAINFOLDER}/src") # # Locate Project Prerequisites SET(BOOST_ROOT "/usr/include") -FIND_PACKAGE (Boost 1.53 COMPONENTS "system" REQUIRED) +FIND_PACKAGE (Boost 1.74 COMPONENTS "system" REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES (${Boost_LIBRARY_DIRS}) From 16067de504f218e2e51bd34fef70b2c4de3c14e3 Mon Sep 17 00:00:00 2001 From: Farzaneh Soltanzadeh Date: Sun, 14 Jul 2024 08:54:20 -0700 Subject: [PATCH 2/6] update based on kamailio 5.8 --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index a242de3..1b5b6aa 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,6 @@ DEFS+=$(MYINC_PARAMS) LIBS+= -L$(SYSBASE)/include/lib -L/usr/local/lib/ -L$(LOCALBASE)/lib -L./libzzz/lib LIBS+= -lzzz -SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/srutils/srutils - include ../../Makefile.modules libzzz.a: From 84dc8c01f4946a8646499175338f9a6c51b2776e Mon Sep 17 00:00:00 2001 From: Farzaneh Soltanzadeh Date: Sun, 14 Jul 2024 08:59:45 -0700 Subject: [PATCH 3/6] update from sh to bash so the pushd command can be run --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1b5b6aa..eb0ae2d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# +SHELL := /bin/bash include ../../Makefile.defs auto_gen= From 0c81268d314056c5430f8fe1024993907fe32716 Mon Sep 17 00:00:00 2001 From: Farzaneh Soltanzadeh Date: Sun, 14 Jul 2024 09:00:08 -0700 Subject: [PATCH 4/6] update boost required version --- libzzz/src/test/catch.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libzzz/src/test/catch.hpp b/libzzz/src/test/catch.hpp index be41486..bfe57d3 100644 --- a/libzzz/src/test/catch.hpp +++ b/libzzz/src/test/catch.hpp @@ -64,7 +64,7 @@ // #included from: catch_compiler_capabilities.h #define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED -// Much of the following code is based on Boost (1.53) +// Much of the following code is based on Boost (1.74) #ifdef __clang__ From bece285c61eecd69efe1c93c7a0bb8161d620047 Mon Sep 17 00:00:00 2001 From: Farzaneh Soltanzadeh Date: Sun, 14 Jul 2024 11:02:11 -0700 Subject: [PATCH 5/6] change Module interface based on kamailio 5.8 --- zzz_mod.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/zzz_mod.c b/zzz_mod.c index 7bc2e89..ddbb14e 100644 --- a/zzz_mod.c +++ b/zzz_mod.c @@ -60,18 +60,16 @@ static param_export_t params[] = { /* Module interface */ struct module_exports exports = { - "zzz", + "zzz", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported statistics */ - 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ - 0, /* extra processes */ - mod_init, /* module initialization function */ - 0, /* response function*/ - destroy, /* destroy function */ - 0 /* per-child init function */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + destroy /* destroy function */ }; /* Module initialization function - The main initialization function will be called From 207c864462e2f50069922d9477e5f65eee2f80aa Mon Sep 17 00:00:00 2001 From: Farzaneh Soltanzadeh Date: Sun, 14 Jul 2024 13:43:26 -0700 Subject: [PATCH 6/6] correct cmd --- zzz_mod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zzz_mod.c b/zzz_mod.c index ddbb14e..1a35b44 100644 --- a/zzz_mod.c +++ b/zzz_mod.c @@ -48,7 +48,7 @@ static int get_incremented_number_mod_f (struct sip_msg *msg, static cmd_export_t cmds[] = { {"get_incremented_number_mod", (cmd_function)get_incremented_number_mod_f, 1, fixup_get_params, fixup_get_params_free, ANY_ROUTE}, - {0, 0, 0, 0, 0} + {0, 0, 0, 0, 0, 0} }; /* Exported parameters */