sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
312 discussions

git:master:a166327a: ndb_redis: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: a166327a4fbd77a71f88085474eba85fe7ebdf32 URL: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:56:22+01:00 ndb_redis: add fixup_free* to exported functions --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… Patch: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 13b188ee266..c3ac9eb3cfa 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -77,6 +77,7 @@ static int w_redis_pipe_cmd5(struct sip_msg *msg, char *ssrv, char *scmd, static int w_redis_pipe_cmd6(struct sip_msg *msg, char *ssrv, char *scmd, char *sargv1, char *sargv2, char *sargv3, char *sres); static int fixup_redis_cmd6(void **param, int param_no); +static int fixup_free_redis_cmd6(void **param, int param_no); static int w_redis_execute(struct sip_msg *msg, char *ssrv); static int w_redis_free_reply(struct sip_msg *msg, char *res); @@ -103,28 +104,27 @@ static pv_export_t mod_pvs[] = { {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; - static cmd_export_t cmds[] = { {"redis_cmd", (cmd_function)w_redis_cmd3, 3, - fixup_redis_cmd6, 0, ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd4, 4, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd5, 5, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd6, 6, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd3, 3, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd4, 4, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd5, 5, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd6, 6, fixup_redis_cmd6, - 0, ANY_ROUTE}, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd4, 4, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd5, 5, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd6, 6, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd3, 3, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd4, 4, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd5, 5, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd6, 6, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, {"redis_execute", (cmd_function)w_redis_execute, 1, fixup_redis_cmd6, 0, ANY_ROUTE}, - {"redis_free", (cmd_function)w_redis_free_reply, 1, fixup_spve_null, 0, - ANY_ROUTE}, + {"redis_free", (cmd_function)w_redis_free_reply, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"bind_ndb_redis", (cmd_function)bind_ndb_redis, 0, 0, 0, 0}, @@ -562,6 +562,10 @@ static int fixup_redis_cmd6(void **param, int param_no) return fixup_spve_null(param, 1); } +static int fixup_free_redis_cmd6(void **param, int param_no) +{ + return fixup_free_spve_null(param, 1); +} /** *

1 week, 3 days

git:master:793a494f: outbound: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 793a494f5b23f2ef5e82664924c3bed3893105bb URL: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:50:42+01:00 outbound: reformat exported structures --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… Patch: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 3ca15b38bdd..f64e2dfbe28 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -61,25 +61,32 @@ static unsigned int ob_force_no_flag = (unsigned int)-1; static str ob_key = {0, 0}; static str flow_token_secret = {0, 0}; +/* clang-format off */ static cmd_export_t cmds[] = { - {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"force_outbound_flag", PARAM_INT, &ob_force_flag}, - {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, {0, 0, 0}}; + {"force_outbound_flag", PARAM_INT, &ob_force_flag}, + {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, + {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {0, 0, 0} +}; struct module_exports exports = { - "outbound", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported��RPC��methods */ - 0, /* exported pseudo-variables */ - 0, /* response��function */ - mod_init, /* module initialization function */ - 0, /* per-child initialization function */ - destroy /* destroy function */ + "outbound", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static void mod_init_openssl(void) {

1 week, 3 days

git:master:67d6825c: nsq: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 67d6825cfac11efbb94bcab67c137beb84188187 URL: https://github.com/kamailio/kamailio/commit/67d6825cfac11efbb94bcab67c137be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:50:42+01:00 nsq: reformat exported structures --- Modified: src/modules/nsq/nsq_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/67d6825cfac11efbb94bcab67c137be… Patch: https://github.com/kamailio/kamailio/commit/67d6825cfac11efbb94bcab67c137be… --- diff --git a/src/modules/nsq/nsq_mod.c b/src/modules/nsq/nsq_mod.c index 94127ef4cbc..63ffe78482a 100644 --- a/src/modules/nsq/nsq_mod.c +++ b/src/modules/nsq/nsq_mod.c @@ -30,25 +30,40 @@ #include "nsq_mod.h" MODULE_VERSION - +/* clang-format off */ static pv_export_t nsq_mod_pvs[] = { - {{"nsqE", (sizeof("nsqE") - 1)}, PVT_OTHER, nsq_pv_get_event_payload, 0, - 0, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"nsqE", (sizeof("nsqE") - 1)}, PVT_OTHER, nsq_pv_get_event_payload, 0, + 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"consumer_workers", PARAM_INT, &nsq_consumer_workers}, - {"max_in_flight", PARAM_INT, &nsq_max_in_flight}, - {"lookupd_address", PARAM_STR, &nsq_lookupd_address}, - {"lookupd_port", PARAM_INT, &lookupd_port}, - {"consumer_use_nsqd", PARAM_INT, - &consumer_use_nsqd}, // consume messages from nsqd instead of lookupd - {"topic_channel", PARAM_STRING | PARAM_USE_FUNC, - (void *)nsq_add_topic_channel}, - {"nsqd_address", PARAM_STR, &nsqd_address}, - {"nsqd_port", PARAM_INT, &nsqd_port}, - {"consumer_event_key", PARAM_STR, &nsq_event_key}, - {"consumer_event_subkey", PARAM_STR, &nsq_event_sub_key}, {0, 0, 0}}; + {"consumer_workers", PARAM_INT, &nsq_consumer_workers}, + {"max_in_flight", PARAM_INT, &nsq_max_in_flight}, + {"lookupd_address", PARAM_STR, &nsq_lookupd_address}, + {"lookupd_port", PARAM_INT, &lookupd_port}, + {"consumer_use_nsqd", PARAM_INT, &consumer_use_nsqd}, + {"topic_channel", PARAM_STRING | PARAM_USE_FUNC, (void *)nsq_add_topic_channel}, + {"nsqd_address", PARAM_STR, &nsqd_address}, + {"nsqd_port", PARAM_INT, &nsqd_port}, + {"consumer_event_key", PARAM_STR, &nsq_event_key}, + {"consumer_event_subkey", PARAM_STR, &nsq_event_sub_key}, + {0, 0, 0} +}; + +struct module_exports exports = { + "nsq", + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + nsq_mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + mod_destroy /* module destroy function */ +}; +/* clang-format on */ static void free_tc_list(nsq_topic_channel_t *tcl) { @@ -100,18 +115,6 @@ static int nsq_add_topic_channel(modparam_t type, void *val) return 0; } -struct module_exports exports = { - "nsq", DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported MI functions */ - nsq_mod_pvs, /* exported pseudo-variables */ - 0, /* response function*/ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - mod_destroy /* destroy function */ -}; - static int fire_init_event(int rank) { struct sip_msg *fmsg;

1 week, 3 days

git:master:57711e24: nosip: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 57711e24c83afa8e46d9c17730c610d0c17dd141 URL: https://github.com/kamailio/kamailio/commit/57711e24c83afa8e46d9c17730c610d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:50:41+01:00 nosip: reformat exported structures --- Modified: src/modules/nosip/nosip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/57711e24c83afa8e46d9c17730c610d… Patch: https://github.com/kamailio/kamailio/commit/57711e24c83afa8e46d9c17730c610d… --- diff --git a/src/modules/nosip/nosip_mod.c b/src/modules/nosip/nosip_mod.c index e3e2232c440..78417e29100 100644 --- a/src/modules/nosip/nosip_mod.c +++ b/src/modules/nosip/nosip_mod.c @@ -53,30 +53,36 @@ static regex_t nosip_msg_match_regexp; static char *nosip_msg_skip = NULL; static regex_t nosip_msg_skip_regexp; +/* clang-format off */ +static cmd_export_t cmds[] = { + {0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{0, 0, 0, 0, 0}}; - -static pv_export_t mod_pvs[] = {{{"nosip", (sizeof("nosip") - 1)}, /* */ - PVT_OTHER, pv_get_nosip, 0, 0, 0, 0, 0}, - - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; +static pv_export_t mod_pvs[] = { + {{"nosip", (sizeof("nosip") - 1)}, + PVT_OTHER, pv_get_nosip, 0, 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; -static param_export_t params[] = {{"msg_match", PARAM_STRING, &nosip_msg_match}, - {"msg_skip", PARAM_STRING, &nosip_msg_skip}, {0, 0, 0}}; +static param_export_t params[] = { + {"msg_match", PARAM_STRING, &nosip_msg_match}, + {"msg_skip", PARAM_STRING, &nosip_msg_skip}, + {0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "nosip", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - mod_pvs, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "nosip", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /** *

1 week, 3 days

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Xenofon Karamanos

Ok, i' ll see how to integrate lynx then. Currently, the target `modname_doc` will produce all forms in the build directory iirc, and then it would copy it to the `src/modules/module_name/docs` directory. (even though I opted to comment the copy command to not pollute the source files. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282843(a)github.com>

1 week, 3 days

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Daniel-Constantin Mierla

I see `output_dir` in the makefile for the docbooks, not for the code building: ``` doc/docbook/Makefile 39:output_dir ?= . ``` The variant with lynx has to be there, many doc generation scripts running on server rely on it, being also very common on linux distros and we know how the output is generated. We can experiment more with pandoc in the future. Are now different make targets (or some defines) to generate the text readme and the html readme? I could notice the `modname_doc` (e.g., `acc_doc`) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282713(a)github.com>

1 week, 3 days

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Xenofon Karamanos

The `pandoc` was an alternative I found that could achieve what `lynx` did for the text generation, since `lynx` is technically a text web-browser. Pandoc offers more forms to transform if needed, but of course, we can fall back on' Lynx' if it doesn't fit our needs or it's too slow. The `outpit_dir` is specific for docs or for the whole build? I -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282373(a)github.com>

1 week, 3 days

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Daniel-Constantin Mierla

@xkaraman: can the use of `pandoc` be made optional? What is the benefit of using it? The old makefiles needed only `xsltproc` (and `lynx` for text readme generation) and it seemed enough. Also, the generation of the html readmes for modules on the website is done the same way. Important it would be to support the output directory, like: ``` make output_dir=/tmp/kamailio-docs exclude_modules="" modules-doc ``` The above command generates all html files for modules' readmes and place them in /tmp/kamailio-docs. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150281498(a)github.com>

1 week, 3 days

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Xenofon Karamanos

Yeah, looking into it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150280974(a)github.com>

1 week, 3 days

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Victor Seva

@xkaraman this change broke the build ``` cmake --build /home/runner/work/kamailio/kamailio/build -j8 [ 0%] Building C object src/modules/acc/CMakeFiles/acc.dir/acc.c.o [ 0%] Building C object src/modules/acc/CMakeFiles/acc.dir/acc_cdr.c.o gmake[2]: *** No rule to make target 'src/modules/xprint_doc', needed by 'src/modules/CMakeFiles/kamailio_docs'. Stop. [ 0%] Generating cfg.tab.c and cfg.tab.h from cfg.y gmake[1]: *** [CMakeFiles/Makefile2:3444: src/modules/CMakeFiles/kamailio_docs.dir/all] Error 2 [ 0%] Building C object src/modules/alias_db/CMakeFiles/alias_db.dir/alias_db.c.o gmake[1]: *** Waiting for unfinished jobs.... ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150280924(a)github.com>

1 week, 3 days

← Newer
1
...
14
15
16
17
18
19
20
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024