- sr-dev - kamailio.org

git:master:bc0d1a1b: ims_ocs: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: bc0d1a1b166a7c4eac6d4eb0652d77263db3d0a6 URL: https://github.com/kamailio/kamailio/commit/bc0d1a1b166a7c4eac6d4eb0652d772… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:18:45+01:00 ims_ocs: add fixup_free* to exported functions --- Modified: src/modules/ims_ocs/ims_ocs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc0d1a1b166a7c4eac6d4eb0652d772… Patch: https://github.com/kamailio/kamailio/commit/bc0d1a1b166a7c4eac6d4eb0652d772… --- diff --git a/src/modules/ims_ocs/ims_ocs_mod.c b/src/modules/ims_ocs/ims_ocs_mod.c index 3ee4e4ab485..93af1190989 100644 --- a/src/modules/ims_ocs/ims_ocs_mod.c +++ b/src/modules/ims_ocs/ims_ocs_mod.c @@ -53,22 +53,25 @@ int event_route_ccr_term = 0; static int w_ccr_result( struct sip_msg *msg, char *result, char *grantedunits, char *final); -static cmd_export_t cmds[] = {{"ccr_result", (cmd_function)w_ccr_result, 3, - fixup_var_pve_str_12, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = {{"ccr_result", (cmd_function)w_ccr_result, 3, fixup_var_pve_str_12, fixup_free_fparam_all, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; /** module exports */ struct module_exports exports = {"ims_ocs", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - mod_destroy}; + cmds, /* Exported functions */ + params, 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + mod_destroy +}; +/* clang-format on */ /** * init module function

1 0

git:master:645ff32f: ims_isc: reformat exported structures
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 645ff32f0e2150f69669212d2de5eb5e3efb75ce URL: https://github.com/kamailio/kamailio/commit/645ff32f0e2150f69669212d2de5eb5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:15:34+01:00 ims_isc: reformat exported structures --- Modified: src/modules/ims_isc/ims_isc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/645ff32f0e2150f69669212d2de5eb5… Patch: https://github.com/kamailio/kamailio/commit/645ff32f0e2150f69669212d2de5eb5…

1 0

git:master:53945198: ims_ipsec_pcscf: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 5394519800abb8e6ad205f614fa11fb4a3986fe9 URL: https://github.com/kamailio/kamailio/commit/5394519800abb8e6ad205f614fa11fb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:08:41+01:00 ims_ipsec_pcscf: add fixup_free* to exported functions --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5394519800abb8e6ad205f614fa11fb… Patch: https://github.com/kamailio/kamailio/commit/5394519800abb8e6ad205f614fa11fb… --- diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index b1e9fbe93a7..0c1097d55b3 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -68,7 +68,7 @@ static int domain_fixup(void **param, int param_no); static int save_fixup2(void **param, int param_no); static int free_uint_fixup(void **param, int param_no); static int unregister_fixup(void **param, int param_no); -static int unregister2_fixup(void **param, int param_no); +static int unregister_fixup_free(void **param, int param_no); extern int bind_ipsec_pcscf(usrloc_api_t *api); @@ -91,9 +91,9 @@ static cmd_export_t cmds[] = { {"ipsec_destroy", (cmd_function)w_destroy, 1, save_fixup2, 0, REQUEST_ROUTE | ONREPLY_ROUTE }, {"ipsec_destroy", (cmd_function)w_destroy, 2, unregister_fixup, - 0, ANY_ROUTE }, - {"ipsec_destroy_by_contact", (cmd_function)w_destroy_by_contact, 4, - unregister2_fixup, 0, ANY_ROUTE}, + unregister_fixup_free, ANY_ROUTE }, + {"ipsec_destroy_by_contact", (cmd_function)w_destroy_by_contact, 4, unregister_fixup, + unregister_fixup_free, ANY_ROUTE}, {"bind_ims_ipsec_pcscf", (cmd_function)bind_ipsec_pcscf, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -495,15 +495,14 @@ static int unregister_fixup(void **param, int param_no) } else { return fixup_spve_all(param, param_no); } - return E_CFG; } -static int unregister2_fixup(void **param, int param_no) +static int unregister_fixup_free(void **param, int param_no) { if(param_no == 1) { - return domain_fixup(param, param_no); + return 0; } else { - return fixup_spve_all(param, param_no); + return fixup_free_spve_all(param, param_no); } }

1 0

git:master:5450313f: ims_icscf: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 5450313fb0dc2794cd160d44f9d10eb9e1c4c047 URL: https://github.com/kamailio/kamailio/commit/5450313fb0dc2794cd160d44f9d10eb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T08:56:58+01:00 ims_icscf: add fixup_free* to exported functions --- Modified: src/modules/ims_icscf/ims_icscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5450313fb0dc2794cd160d44f9d10eb… Patch: https://github.com/kamailio/kamailio/commit/5450313fb0dc2794cd160d44f9d10eb…

1 0

git:master:5e1e3b71: ims_diameter_server: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 5e1e3b71e7394d08c91aaa19c8d83e419a3c8419 URL: https://github.com/kamailio/kamailio/commit/5e1e3b71e7394d08c91aaa19c8d83e4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T08:46:15+01:00 ims_diameter_server: add fixup_free* to exported functions --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/5e1e3b71e7394d08c91aaa19c8d83e4… Patch: https://github.com/kamailio/kamailio/commit/5e1e3b71e7394d08c91aaa19c8d83e4… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index a5d77bf6bea..bb0f8dc8a9f 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -71,41 +71,46 @@ static int ki_diameter_request_peer(struct sip_msg *msg, str *peer, int appid, static int ki_diameter_request_peer_async(struct sip_msg *msg, str *peer, int appid, int commandcode, str *message); +/* clang-format off */ static cmd_export_t cmds[] = { - {"diameter_request", (cmd_function)w_diameter_request, 3, - fixup_var_pve_str_12, 0, ANY_ROUTE}, - {"diameter_request", (cmd_function)w_diameter_request_peer, 4, - fixup_var_pve_str_12, 0, ANY_ROUTE}, - {"diameter_request_async", (cmd_function)w_diameter_request_async, 3, - fixup_var_pve_str_12, 0, ANY_ROUTE}, - {"diameter_request_async", (cmd_function)w_diameter_request_peer_async, - 4, fixup_var_pve_str_12, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"diameter_request", (cmd_function)w_diameter_request, 3, + fixup_var_pve_str_12, fixup_free_fparam_all, ANY_ROUTE}, + {"diameter_request", (cmd_function)w_diameter_request_peer, 4, + fixup_var_pve_str_12, fixup_free_fparam_all, ANY_ROUTE}, + {"diameter_request_async", (cmd_function)w_diameter_request_async, 3, + fixup_var_pve_str_12, fixup_free_fparam_all, ANY_ROUTE}, + {"diameter_request_async", (cmd_function)w_diameter_request_peer_async, + 4, fixup_var_pve_str_12, fixup_free_fparam_all, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; static pv_export_t mod_pvs[] = { - {{"diameter_command", sizeof("diameter_command") - 1}, PVT_OTHER, - pv_get_command, 0, 0, 0, 0, 0}, - {{"diameter_application", sizeof("diameter_application") - 1}, - PVT_OTHER, pv_get_application, 0, 0, 0, 0, 0}, - {{"diameter_request", sizeof("diameter_request") - 1}, PVT_OTHER, - pv_get_request, 0, 0, 0, 0, 0}, - {{"diameter_response", sizeof("diameter_response") - 1}, PVT_OTHER, - pv_get_response, pv_set_response, 0, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"diameter_command", sizeof("diameter_command") - 1}, PVT_OTHER, + pv_get_command, 0, 0, 0, 0, 0}, + {{"diameter_application", sizeof("diameter_application") - 1}, + PVT_OTHER, pv_get_application, 0, 0, 0, 0, 0}, + {{"diameter_request", sizeof("diameter_request") - 1}, PVT_OTHER, + pv_get_request, 0, 0, 0, 0, 0}, + {{"diameter_response", sizeof("diameter_response") - 1}, PVT_OTHER, + pv_get_response, pv_set_response, 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = {"ims_diameter_server", - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* exported statistics */ - 0, /* exported RPC methods */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - mod_destroy}; + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* Exported functions */ + params, /* exported statistics */ + 0, /* exported RPC methods */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + mod_destroy +}; +/* clang-format on */ /** * init module function

1 0

git:master:6e19534e: ims_dialog: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 6e19534e9790188f0db8009170d05f1bd77b5ca5 URL: https://github.com/kamailio/kamailio/commit/6e19534e9790188f0db8009170d05f1… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T08:40:58+01:00 ims_dialog: add fixup_free* to exported functions --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/6e19534e9790188f0db8009170d05f1… Patch: https://github.com/kamailio/kamailio/commit/6e19534e9790188f0db8009170d05f1…

1 0

git:master:35dcb1d7: db_cassandra: relocated to archive
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 35dcb1d7852282417a11c7771189e50734c0883b URL: https://github.com/kamailio/kamailio/commit/35dcb1d7852282417a11c7771189e50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T18:36:36+01:00 db_cassandra: relocated to archive - new location: https://github.com/kamailio/kamailio-archive --- Removed: src/modules/db_cassandra/Cassandra.cpp Removed: src/modules/db_cassandra/Cassandra.h Removed: src/modules/db_cassandra/Makefile Removed: src/modules/db_cassandra/README Removed: src/modules/db_cassandra/cassandra_constants.cpp Removed: src/modules/db_cassandra/cassandra_constants.h Removed: src/modules/db_cassandra/cassandra_types.cpp Removed: src/modules/db_cassandra/cassandra_types.h Removed: src/modules/db_cassandra/db_cassandra.c Removed: src/modules/db_cassandra/dbcassa_base.cpp Removed: src/modules/db_cassandra/dbcassa_base.h Removed: src/modules/db_cassandra/dbcassa_table.c Removed: src/modules/db_cassandra/dbcassa_table.h Removed: src/modules/db_cassandra/doc/Makefile Removed: src/modules/db_cassandra/doc/db_cassandra.xml Removed: src/modules/db_cassandra/doc/db_cassandra_admin.xml Removed: src/modules/db_cassandra/kamailio_cassa.cfg --- Diff: https://github.com/kamailio/kamailio/commit/35dcb1d7852282417a11c7771189e50… Patch: https://github.com/kamailio/kamailio/commit/35dcb1d7852282417a11c7771189e50…

1 0

git:master:7215f255: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 7215f2554e3c2551870902fd061f20d5a4160bca URL: https://github.com/kamailio/kamailio/commit/7215f2554e3c2551870902fd061f20d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-20T18:31:10+01:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/7215f2554e3c2551870902fd061f20d… Patch: https://github.com/kamailio/kamailio/commit/7215f2554e3c2551870902fd061f20d… --- diff --git a/src/modules/sqlops/README b/src/modules/sqlops/README index e8b7b072fc6..d55fab0e081 100644 --- a/src/modules/sqlops/README +++ b/src/modules/sqlops/README @@ -209,9 +209,10 @@ modparam("sqlops", "log_buf_size", 4096) 3.5. connect_mode (int) - Control if the module must stop loading when connecting to database - server fails during start up. Values: 0 - stop loading; 1 - continue - even if connecting to database server fails. + Control how the module will connect to database. Values: 0 - connect at + start up or fail 1 - connect at start up but continue even if + connecting to database server fails 2 - do not connect until needed + (this will limit the amount of idle connections) Default value is 0.

1 0

[kamailio/kamailio] sqlops: new connect mode to limit the amount of connections (PR #4027)
by Julien Chavanton 20 Nov '24

20 Nov '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist:  - [x] Tested changes locally #### Description  Very often I only need one connection from a worker process, to cache fill provisioning data to Kamailio. This new sqlops connect mode will reduce the amount of idle connection to the database server significantly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4027 -- Commit Summary -- * sqlops: new connect mode to limit the amount of connections -- File Changes -- M src/modules/sqlops/doc/sqlops_admin.xml (8) M src/modules/sqlops/sql_api.c (5) M src/modules/sqlops/sqlops.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4027.patch https://github.com/kamailio/kamailio/pull/4027.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4027 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4027(a)github.com>

3 7

git:master:a4175247: sqlops: new connect mode to limit the amount of connections (#4027)
by GitHub 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: a41752478201b2235f60b2f22e5d3c4113742b33 URL: https://github.com/kamailio/kamailio/commit/a41752478201b2235f60b2f22e5d3c4… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2024-11-20T12:30:20-05:00 sqlops: new connect mode to limit the amount of connections (#4027) --- Modified: src/modules/sqlops/doc/sqlops_admin.xml Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/a41752478201b2235f60b2f22e5d3c4… Patch: https://github.com/kamailio/kamailio/commit/a41752478201b2235f60b2f22e5d3c4…

1 0

git:master:1d83950e: pipelimit: remove destroy of internal structures on mod-destroy callback
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 1d83950eb3f0eba21b2ade1d1c5565b1ef95c1d1 URL: https://github.com/kamailio/kamailio/commit/1d83950eb3f0eba21b2ade1d1c5565b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T17:41:22+01:00 pipelimit: remove destroy of internal structures on mod-destroy callback - it is safer and faster to be removed at once by core or OS when application context is destroyed --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/1d83950eb3f0eba21b2ade1d1c5565b… Patch: https://github.com/kamailio/kamailio/commit/1d83950eb3f0eba21b2ade1d1c5565b… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 27b247e49c3..a632a4cda51 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -433,45 +433,7 @@ static int mod_init(void) static void destroy(void) { - pl_destroy_htable(); - - if(network_load_value) { - shm_free(network_load_value); - network_load_value = NULL; - } - if(load_value) { - shm_free(load_value); - load_value = NULL; - } - if(load_source) { - shm_free(load_source); - load_source = NULL; - } - if(pid_kp) { - shm_free(pid_kp); - pid_kp = NULL; - } - if(pid_ki) { - shm_free(pid_ki); - pid_ki = NULL; - } - if(pid_kd) { - shm_free(pid_kd); - pid_kd = NULL; - } - if(_pl_pid_setpoint) { - shm_free(_pl_pid_setpoint); - _pl_pid_setpoint = NULL; - } - if(drop_rate) { - shm_free(drop_rate); - drop_rate = NULL; - } - - if(pl_timer) { - timer_free(pl_timer); - pl_timer = NULL; - } + LM_DBG("done"); }

1 0

git:master:6f6504dd: mtree: remove destroy of internal structures on mod-destroy callback
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 6f6504dd6091d0493a8401b4e71ceea98ad5f6ca URL: https://github.com/kamailio/kamailio/commit/6f6504dd6091d0493a8401b4e71ceea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T17:16:11+01:00 mtree: remove destroy of internal structures on mod-destroy callback - it is safer and faster to be removed at once by core or OS when application context is destroyed --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f6504dd6091d0493a8401b4e71ceea… Patch: https://github.com/kamailio/kamailio/commit/6f6504dd6091d0493a8401b4e71ceea… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 99cd5337bc3..881fd36bf4b 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -312,15 +312,6 @@ static int child_init(int rank) static void mod_destroy(void) { LM_DBG("cleaning up\n"); - mt_destroy_trees(); - if(db_con != NULL && mt_dbf.close != NULL) - mt_dbf.close(db_con); - /* destroy lock */ - if(mt_lock) { - lock_destroy(mt_lock); - lock_dealloc(mt_lock); - mt_lock = 0; - } } static int fixup_mt_match(void **param, int param_no)

1 0

git:master:d984ba4a: pv: reset buf.s to avoid double free on error for pv_set_xto_attr()
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: d984ba4a6b9cc57e7084a87ca617a9d377659d25 URL: https://github.com/kamailio/kamailio/commit/d984ba4a6b9cc57e7084a87ca617a9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T17:01:21+01:00 pv: reset buf.s to avoid double free on error for pv_set_xto_attr() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d984ba4a6b9cc57e7084a87ca617a9d… Patch: https://github.com/kamailio/kamailio/commit/d984ba4a6b9cc57e7084a87ca617a9d… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1054a6ae57b..3eeba112324 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3788,8 +3788,10 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, goto error; } } else { - if(buf.s != 0) + if(buf.s != 0) { pkg_free(buf.s); + buf.s = NULL; + } } if(llen_uri > 0) { @@ -3805,8 +3807,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, goto error; } } else { - if(buf_uri.s != 0) + if(buf_uri.s != 0) { pkg_free(buf_uri.s); + } } return 0;

1 0

git:master:8cf59e2b: textopsx: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 8cf59e2bd1f9bb60d68b52f175df5dad9c34b533 URL: https://github.com/kamailio/kamailio/commit/8cf59e2bd1f9bb60d68b52f175df5da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T16:07:21+01:00 textopsx: add fixup_free* to exported functions --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/8cf59e2bd1f9bb60d68b52f175df5da… Patch: https://github.com/kamailio/kamailio/commit/8cf59e2bd1f9bb60d68b52f175df5da… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 8982924296a..4f6944816c3 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -128,12 +128,12 @@ static cmd_export_t cmds[] = { {"msg_set_buffer", (cmd_function)msg_set_buffer_f, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, - change_reply_status_fixup, 0, ONREPLY_ROUTE}, + change_reply_status_fixup, fixup_free_fparam_all, ONREPLY_ROUTE}, {"change_reply_status_code", change_reply_status_code_f, 1, - fixup_igp_null, 0, ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ONREPLY_ROUTE}, {"remove_body", (cmd_function)w_remove_body_f, 0, 0, 0, ANY_ROUTE}, - {"keep_hf", (cmd_function)w_keep_hf_f, 0, fixup_regexp_null, 0, ANY_ROUTE}, - {"keep_hf", (cmd_function)w_keep_hf_f, 1, fixup_regexp_null, 0, ANY_ROUTE}, + {"keep_hf", (cmd_function)w_keep_hf_f, 0, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, + {"keep_hf", (cmd_function)w_keep_hf_f, 1, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, {"fnmatch", (cmd_function)w_fnmatch2_f, 2, fixup_fnmatch, 0, ANY_ROUTE}, {"fnmatch", (cmd_function)w_fnmatch3_f, 3, fixup_fnmatch, 0, ANY_ROUTE}, {"append_hf_value", insupddel_hf_value_f, 2, append_hf_value_fixup, 0,

1 0

git:master:55216ee0: tsilo: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 55216ee07d5904adc6e9b9750c5b78c9cf100fcf URL: https://github.com/kamailio/kamailio/commit/55216ee07d5904adc6e9b9750c5b78c… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T15:31:40+01:00 tsilo: add fixup_free* to exported functions --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/55216ee07d5904adc6e9b9750c5b78c… Patch: https://github.com/kamailio/kamailio/commit/55216ee07d5904adc6e9b9750c5b78c… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index 719f7cb0f3a..5d290485227 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -62,14 +62,15 @@ static int w_ts_append_to(struct sip_msg *msg, char *idx, char *lbl, char *d); static int w_ts_append_to2( struct sip_msg *msg, char *idx, char *lbl, char *d, char *ruri); static int fixup_ts_append_to(void **param, int param_no); +static int fixup_free_ts_append_to(void **param, int param_no); static int w_ts_append(struct sip_msg *_msg, char *_table, char *_ruri); static int fixup_ts_append(void **param, int param_no); +static int fixup_free_ts_append(void **param, int param_no); static int w_ts_append_by_contact2( struct sip_msg *_msg, char *_table, char *_ruri); static int w_ts_append_by_contact3( struct sip_msg *_msg, char *_table, char *_ruri, char *_contact); static int w_ts_append_branches(struct sip_msg *_msg, char *_ruri, char *_p2); -static int fixup_ts_append_by_contact(void **param, int param_no); static int w_ts_store(struct sip_msg *msg, char *p1, char *p2); static int w_ts_store1(struct sip_msg *msg, char *_ruri, char *p2); @@ -81,24 +82,23 @@ stat_var *added_branches; /* clang-format off */ static cmd_export_t cmds[] = { - {"ts_append_to", (cmd_function)w_ts_append_to, 3, fixup_ts_append_to, 0, + {"ts_append_to", (cmd_function)w_ts_append_to, 3, fixup_ts_append_to, fixup_free_ts_append_to, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append_to", (cmd_function)w_ts_append_to2, 4, fixup_ts_append_to, - 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append", (cmd_function)w_ts_append, 2, fixup_ts_append, 0, + {"ts_append_to", (cmd_function)w_ts_append_to2, 4, fixup_ts_append_to, fixup_free_ts_append_to, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append_by_contact", (cmd_function)w_ts_append_by_contact2, - 2, /* for two parameters */ - fixup_ts_append_by_contact, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append_by_contact", (cmd_function)w_ts_append_by_contact3, - 3, /* for three parameters */ - fixup_ts_append_by_contact, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append_branches", (cmd_function)w_ts_append_branches, 1, - fixup_spve_null, fixup_free_spve_null, + {"ts_append", (cmd_function)w_ts_append, 2, fixup_ts_append, fixup_free_ts_append, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"ts_append_by_contact", (cmd_function)w_ts_append_by_contact2, 2, fixup_ts_append, fixup_free_ts_append, + /* for two parameters */ + REQUEST_ROUTE | FAILURE_ROUTE}, + {"ts_append_by_contact", (cmd_function)w_ts_append_by_contact3, 3,fixup_ts_append, fixup_free_ts_append, + /* for three parameters */ + REQUEST_ROUTE | FAILURE_ROUTE}, + {"ts_append_branches", (cmd_function)w_ts_append_branches, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"ts_store", (cmd_function)w_ts_store, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_store", (cmd_function)w_ts_store1, 1, fixup_spve_null, 0, + {"ts_store", (cmd_function)w_ts_store1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -239,6 +239,16 @@ static int fixup_ts_append_to(void **param, int param_no) return 0; } +static int fixup_free_ts_append_to(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) { + fixup_free_igp_null(param, 1); + } else if(param_no == 4) { + fixup_free_spve_null(param, 1); + } + return 0; +} + static int fixup_ts_append(void **param, int param_no) { if(param_no == 1) { @@ -257,19 +267,11 @@ static int fixup_ts_append(void **param, int param_no) return 0; } -static int fixup_ts_append_by_contact(void **param, int param_no) +static int fixup_free_ts_append(void **param, int param_no) { - if(param_no == 1) { - if(strlen((char *)*param) <= 1 - && (*(char *)(*param) == 0 || *(char *)(*param) == '0')) { - *param = (void *)0; - LM_ERR("empty table name\n"); - return -1; - } - } if(param_no == 2 || param_no == 3) { - return fixup_spve_null(param, 1); + fixup_free_spve_null(param, 1); } return 0;

1 0

git:master:c499dac3: tmrec: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: c499dac336469de50a520adebeaa3b408791f308 URL: https://github.com/kamailio/kamailio/commit/c499dac336469de50a520adebeaa3b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T15:22:20+01:00 tmrec: reformat exported structures --- Modified: src/modules/tmrec/tmrec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c499dac336469de50a520adebeaa3b4… Patch: https://github.com/kamailio/kamailio/commit/c499dac336469de50a520adebeaa3b4… --- diff --git a/src/modules/tmrec/tmrec_mod.c b/src/modules/tmrec/tmrec_mod.c index 298552d8db5..fb07d45eeb0 100644 --- a/src/modules/tmrec/tmrec_mod.c +++ b/src/modules/tmrec/tmrec_mod.c @@ -60,35 +60,39 @@ int tmrec_wday = 0; char tmrec_separator = '|'; char *tmrec_separator_param = NULL; -static cmd_export_t cmds[] = {{"tmrec_match", (cmd_function)w_tmrec_match, 1, - fixup_tmrec_match, 0, ANY_ROUTE}, - {"tmrec_match", (cmd_function)w_tmrec_match, 2, fixup_tmrec_match, 0, - ANY_ROUTE}, - {"is_leap_year", (cmd_function)w_is_leap_year, 0, fixup_is_leap_year, 0, - ANY_ROUTE}, - {"is_leap_year", (cmd_function)w_is_leap_year, 1, fixup_is_leap_year, 0, - ANY_ROUTE}, - {"time_period_match", (cmd_function)w_time_period_match, 1, - fixup_time_period_match, 0, ANY_ROUTE}, - {"time_period_match", (cmd_function)w_time_period_match, 2, - fixup_time_period_match, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"wday", PARAM_INT, &tmrec_wday}, - {"separator", PARAM_STRING, &tmrec_separator_param}, {0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"tmrec_match", (cmd_function)w_tmrec_match, 1, + fixup_tmrec_match, 0, ANY_ROUTE}, + {"tmrec_match", (cmd_function)w_tmrec_match, 2, fixup_tmrec_match, 0, ANY_ROUTE}, + {"is_leap_year", (cmd_function)w_is_leap_year, 0, fixup_is_leap_year, 0, ANY_ROUTE}, + {"is_leap_year", (cmd_function)w_is_leap_year, 1, fixup_is_leap_year, 0, ANY_ROUTE}, + {"time_period_match", (cmd_function)w_time_period_match, 1, + fixup_time_period_match, 0, ANY_ROUTE}, + {"time_period_match", (cmd_function)w_time_period_match, 2, + fixup_time_period_match, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -struct module_exports exports = { - "tmrec", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module init function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ +static param_export_t params[] = { + {"wday", PARAM_INT, &tmrec_wday}, + {"separator", PARAM_STRING, &tmrec_separator_param}, + {0, 0, 0} }; +struct module_exports exports = { + "tmrec", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module init function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ +}; +/* clang-format on */ /** * init module function

1 0

git:master:f1ce7400: tmx: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: f1ce74009aa0266207b054cdacc254bf222cd41c URL: https://github.com/kamailio/kamailio/commit/f1ce74009aa0266207b054cdacc254b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T15:19:16+01:00 tmx: reformat exported structures --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f1ce74009aa0266207b054cdacc254b… Patch: https://github.com/kamailio/kamailio/commit/f1ce74009aa0266207b054cdacc254b…

1 0

git:master:a4a1f9d1: topos_redis: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: a4a1f9d19213dcfa471b7e2accf9b05f5b1b9735 URL: https://github.com/kamailio/kamailio/commit/a4a1f9d19213dcfa471b7e2accf9b05… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T15:14:05+01:00 topos_redis: reformat exported structures --- Modified: src/modules/topos_redis/topos_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a4a1f9d19213dcfa471b7e2accf9b05… Patch: https://github.com/kamailio/kamailio/commit/a4a1f9d19213dcfa471b7e2accf9b05… --- diff --git a/src/modules/topos_redis/topos_redis_mod.c b/src/modules/topos_redis/topos_redis_mod.c index 19975cb74a3..761190f5ca7 100644 --- a/src/modules/topos_redis/topos_redis_mod.c +++ b/src/modules/topos_redis/topos_redis_mod.c @@ -47,24 +47,29 @@ topos_api_t _tps_api = {0}; ndb_redis_api_t _tps_redis_api = {0}; -static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"serverid", PARAM_STR, &_topos_redis_serverid}, {0, 0, 0}}; + {"serverid", PARAM_STR, &_topos_redis_serverid}, + {0, 0, 0} +}; struct module_exports exports = { - "topos_redis", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "topos_redis", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; - +/* clang-format on */ /** *

1 0

git:master:8f4e66d3: tsilo: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 8f4e66d3617b38077a827f5ac158074cbd45207c URL: https://github.com/kamailio/kamailio/commit/8f4e66d3617b38077a827f5ac158074… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T15:11:44+01:00 tsilo: reformat exported structures --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/8f4e66d3617b38077a827f5ac158074… Patch: https://github.com/kamailio/kamailio/commit/8f4e66d3617b38077a827f5ac158074…

1 0

git:master:24961934: ims_charging: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 24961934218578d3a3e8db5e0e6d65b0a31d903a URL: https://github.com/kamailio/kamailio/commit/24961934218578d3a3e8db5e0e6d65b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:54:59+01:00 ims_charging: add fixup_free* to exported functions --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/24961934218578d3a3e8db5e0e6d65b… Patch: https://github.com/kamailio/kamailio/commit/24961934218578d3a3e8db5e0e6d65b…

1 0

git:master:065987e8: uac_redirect: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 065987e8c18b88aeed9b68c2e204ae4b51e56989 URL: https://github.com/kamailio/kamailio/commit/065987e8c18b88aeed9b68c2e204ae4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:54:04+01:00 uac_redirect: add fixup_free* to exported functions --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/065987e8c18b88aeed9b68c2e204ae4… Patch: https://github.com/kamailio/kamailio/commit/065987e8c18b88aeed9b68c2e204ae4… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 505a09ffd5b..35d7b54998f 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -71,14 +71,15 @@ static int w_get_redirect1(struct sip_msg *msg, char *dir, char *foo); static int w_get_redirect2(struct sip_msg *msg, char *dir, char *foo); static int regexp_compile(char *re_s, regex_t **re); static int get_redirect_fixup(void **param, int param_no); +static int get_redirect_fixup_free(void **param, int param_no); static int setf_fixup(void **param, int param_no); /* clang-format off */ static cmd_export_t cmds[] = { {"set_deny_filter", (cmd_function)w_set_deny, 2, setf_fixup, 0, FAILURE_ROUTE}, {"set_accept_filter", (cmd_function)w_set_accept, 2, setf_fixup, 0, FAILURE_ROUTE}, - {"get_redirects", (cmd_function)w_get_redirect2, 2, get_redirect_fixup, 0, FAILURE_ROUTE}, - {"get_redirects", (cmd_function)w_get_redirect1, 1, get_redirect_fixup, 0, FAILURE_ROUTE}, + {"get_redirects", (cmd_function)w_get_redirect2, 2, get_redirect_fixup, get_redirect_fixup_free, FAILURE_ROUTE}, + {"get_redirects", (cmd_function)w_get_redirect1, 1, get_redirect_fixup, get_redirect_fixup_free, FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -177,6 +178,13 @@ static int get_redirect_fixup(void **param, int param_no) return 0; } +static int get_redirect_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + return fixup_free_spve_null(param, 1); + } + return 0; +} static int setf_fixup(void **param, int param_no) {

1 0

git:master:aaf32a47: uac_redirect: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: aaf32a472ff0729fd4230a02948ad6e4de06451c URL: https://github.com/kamailio/kamailio/commit/aaf32a472ff0729fd4230a02948ad6e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:49:54+01:00 uac_redirect: reformat exported structures --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/aaf32a472ff0729fd4230a02948ad6e… Patch: https://github.com/kamailio/kamailio/commit/aaf32a472ff0729fd4230a02948ad6e… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index d5699a7bd48..505a09ffd5b 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -73,40 +73,40 @@ static int regexp_compile(char *re_s, regex_t **re); static int get_redirect_fixup(void **param, int param_no); static int setf_fixup(void **param, int param_no); +/* clang-format off */ +static cmd_export_t cmds[] = { + {"set_deny_filter", (cmd_function)w_set_deny, 2, setf_fixup, 0, FAILURE_ROUTE}, + {"set_accept_filter", (cmd_function)w_set_accept, 2, setf_fixup, 0, FAILURE_ROUTE}, + {"get_redirects", (cmd_function)w_get_redirect2, 2, get_redirect_fixup, 0, FAILURE_ROUTE}, + {"get_redirects", (cmd_function)w_get_redirect1, 1, get_redirect_fixup, 0, FAILURE_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{"set_deny_filter", (cmd_function)w_set_deny, 2, - setf_fixup, 0, FAILURE_ROUTE}, - {"set_accept_filter", (cmd_function)w_set_accept, 2, setf_fixup, 0, - FAILURE_ROUTE}, - {"get_redirects", (cmd_function)w_get_redirect2, 2, get_redirect_fixup, - 0, FAILURE_ROUTE}, - {"get_redirects", (cmd_function)w_get_redirect1, 1, get_redirect_fixup, - 0, FAILURE_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"deny_filter", PARAM_STRING, &deny_filter_s}, - {"accept_filter", PARAM_STRING, &accept_filter_s}, - {"default_filter", PARAM_STRING, &def_filter_s}, - {"acc_function", PARAM_STR, &uacred_acc_fct_s}, - {"acc_db_table", PARAM_STR, &uacred_acc_db_table}, - {"bflags", PARAM_INT, &bflags}, - {"flags_hdr_mode", PARAM_INT, &flags_hdr_mode}, - {"q_value", PARAM_INT, &_redirect_q_value}, {0, 0, 0}}; - +static param_export_t params[] = { + {"deny_filter", PARAM_STRING, &deny_filter_s}, + {"accept_filter", PARAM_STRING, &accept_filter_s}, + {"default_filter", PARAM_STRING, &def_filter_s}, + {"acc_function", PARAM_STR, &uacred_acc_fct_s}, + {"acc_db_table", PARAM_STR, &uacred_acc_db_table}, + {"bflags", PARAM_INT, &bflags}, + {"flags_hdr_mode", PARAM_INT, &flags_hdr_mode}, + {"q_value", PARAM_INT, &_redirect_q_value}, + {0, 0, 0} +}; struct module_exports exports = { - "uac_redirect", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - redirect_init, /* module initialization function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "uac_redirect", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + redirect_init, /* module initialization function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; - +/* clang-format on */ int get_nr_max(char *s, unsigned char *max) {

1 0

git:master:96e98152: uid_auth_db: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 96e98152faf6a47c0380a85b9fc9bd63794bbcc6 URL: https://github.com/kamailio/kamailio/commit/96e98152faf6a47c0380a85b9fc9bd6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:41:57+01:00 uid_auth_db: add fixup_free* to exported functions --- Modified: src/modules/uid_auth_db/uid_auth_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/96e98152faf6a47c0380a85b9fc9bd6… Patch: https://github.com/kamailio/kamailio/commit/96e98152faf6a47c0380a85b9fc9bd6… --- diff --git a/src/modules/uid_auth_db/uid_auth_db_mod.c b/src/modules/uid_auth_db/uid_auth_db_mod.c index 87842a04506..4bb4caeee63 100644 --- a/src/modules/uid_auth_db/uid_auth_db_mod.c +++ b/src/modules/uid_auth_db/uid_auth_db_mod.c @@ -103,10 +103,10 @@ int credentials_n; /* Number of credentials in the list */ * Exported functions */ static cmd_export_t cmds[] = { - {"www_authenticate", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, - {"www_authorize", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, - {"proxy_authenticate", proxy_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, - {"proxy_authorize", proxy_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {"www_authenticate", www_authenticate, 2, authdb_fixup, fixup_free_fparam_all, REQUEST_ROUTE}, + {"www_authorize", www_authenticate, 2, authdb_fixup, fixup_free_fparam_all, REQUEST_ROUTE}, + {"proxy_authenticate", proxy_authenticate, 2, authdb_fixup, fixup_free_fparam_all, REQUEST_ROUTE}, + {"proxy_authorize", proxy_authenticate, 2, authdb_fixup, fixup_free_fparam_all, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:985193bd: uid_auth_db: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 985193bd6ae93e9a6e5517bef4bb5bedba7505a3 URL: https://github.com/kamailio/kamailio/commit/985193bd6ae93e9a6e5517bef4bb5be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:41:57+01:00 uid_auth_db: reformat exported structures --- Modified: src/modules/uid_auth_db/uid_auth_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/985193bd6ae93e9a6e5517bef4bb5be… Patch: https://github.com/kamailio/kamailio/commit/985193bd6ae93e9a6e5517bef4bb5be… --- diff --git a/src/modules/uid_auth_db/uid_auth_db_mod.c b/src/modules/uid_auth_db/uid_auth_db_mod.c index 06cb3030d94..87842a04506 100644 --- a/src/modules/uid_auth_db/uid_auth_db_mod.c +++ b/src/modules/uid_auth_db/uid_auth_db_mod.c @@ -98,51 +98,53 @@ str *credentials; /* Parsed list of credentials to load */ int credentials_n; /* Number of credentials in the list */ +/* clang-format off */ /* * Exported functions */ -static cmd_export_t cmds[] = {{"www_authenticate", www_authenticate, 2, - authdb_fixup, 0, REQUEST_ROUTE}, - {"www_authorize", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, - {"proxy_authenticate", proxy_authenticate, 2, authdb_fixup, 0, - REQUEST_ROUTE}, - {"proxy_authorize", proxy_authenticate, 2, authdb_fixup, 0, - REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - +static cmd_export_t cmds[] = { + {"www_authenticate", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {"www_authorize", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {"proxy_authenticate", proxy_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {"proxy_authorize", proxy_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STRING, &db_url}, - {"username_column", PARAM_STR, &username_column}, - {"did_column", PARAM_STR, &did_column}, - {"realm_column", PARAM_STR, &realm_column}, - {"password_column", PARAM_STR, &pass_column}, - {"password_column_2", PARAM_STR, &pass_column_2}, - {"plain_password_column", PARAM_STR, &plain_password_column}, - {"flags_column", PARAM_STR, &flags_column}, - {"calculate_ha1", PARAM_INT, &calc_ha1}, - {"load_credentials", PARAM_STR, &credentials_list}, - {"use_did", PARAM_INT, &use_did}, - {"check_all_ha1", PARAM_INT, &check_all}, {0, 0, 0}}; - +static param_export_t params[] = { + {"db_url", PARAM_STRING, &db_url}, + {"username_column", PARAM_STR, &username_column}, + {"did_column", PARAM_STR, &did_column}, + {"realm_column", PARAM_STR, &realm_column}, + {"password_column", PARAM_STR, &pass_column}, + {"password_column_2", PARAM_STR, &pass_column_2}, + {"plain_password_column", PARAM_STR, &plain_password_column}, + {"flags_column", PARAM_STR, &flags_column}, + {"calculate_ha1", PARAM_INT, &calc_ha1}, + {"load_credentials", PARAM_STR, &credentials_list}, + {"use_did", PARAM_INT, &use_did}, + {"check_all_ha1", PARAM_INT, &check_all}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "uid_auth_db", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module init function */ - child_init, /* child init function */ - destroy /* destroy function */ + "uid_auth_db", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module init function */ + child_init, /* child init function */ + destroy /* destroy function */ }; +/* clang-format on */ static authdb_table_info_t *registered_tables = NULL;

1 0

git:master:20bf9c83: ims_auth: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 20bf9c834030f098fcc934135380eebc7bd4ff45 URL: https://github.com/kamailio/kamailio/commit/20bf9c834030f098fcc934135380eeb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:31:25+01:00 ims_auth: add fixup_free* to exported functions --- Modified: src/modules/ims_auth/ims_auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20bf9c834030f098fcc934135380eeb… Patch: https://github.com/kamailio/kamailio/commit/20bf9c834030f098fcc934135380eeb…

1 0

[kamailio/kamailio] Add missing fixup_free* to exported functions (PR #4031)
by Federico Cabiddu 20 Nov '24

20 Nov '24

#### Pre-Submission Checklist    - [x ] Commit message has the format required by CONTRIBUTING guide - [x ] Commits are split per component (core, individual modules, libs, utils, ...) - [xx Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4031 -- Commit Summary -- * cnxcc: add fixup_free function * corex: add fixup_free to file_read function * crypto: add fixup_free function * dispatcher: add fixup_free to several exported functions * dlgs: fix some fixup_free * enum: add fixup_free* to exported functions * evapi: add fixup_free* to exported functions * exec: add fixup_free* to exported functions -- File Changes -- M src/modules/cnxcc/cnxcc_mod.c (20) M src/modules/corex/corex_mod.c (20) M src/modules/crypto/crypto_mod.c (18) M src/modules/dispatcher/dispatcher.c (42) M src/modules/dlgs/dlgs_mod.c (6) M src/modules/enum/enum_mod.c (10) M src/modules/evapi/evapi_mod.c (29) M src/modules/exec/exec_mod.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4031.patch https://github.com/kamailio/kamailio/pull/4031.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4031 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4031(a)github.com>

1 14

git:master:b3d64393: http_async_client: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: b3d64393f9c9c87bf76f2d01e2fe4764a3c0aeca URL: https://github.com/kamailio/kamailio/commit/b3d64393f9c9c87bf76f2d01e2fe476… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 http_async_client: add fixup_free* to exported functions --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b3d64393f9c9c87bf76f2d01e2fe476… Patch: https://github.com/kamailio/kamailio/commit/b3d64393f9c9c87bf76f2d01e2fe476… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 40c45bb4a23..0a9cbb0fbfb 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -166,7 +166,7 @@ enum http_time_name_t /* clang-format off */ static cmd_export_t cmds[] = { {"http_async_query", (cmd_function)w_http_async_query, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:ff6e7d6d: htable: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: ff6e7d6d7a5288a5f6e247943c6bf45d40c9ed94 URL: https://github.com/kamailio/kamailio/commit/ff6e7d6d7a5288a5f6e247943c6bf45… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 htable: add fixup_free* to exported functions --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/ff6e7d6d7a5288a5f6e247943c6bf45… Patch: https://github.com/kamailio/kamailio/commit/ff6e7d6d7a5288a5f6e247943c6bf45… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 48f9e1c7724..8c97ac681c6 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -67,6 +67,7 @@ static int child_init(int rank); static void destroy(void); static int fixup_ht_key(void **param, int param_no); +static int fixup_free_ht_key(void **param, int param_no); static int w_ht_rm(sip_msg_t *msg, char *htname, char *itname); static int ht_rm_name_re(struct sip_msg *msg, char *key, char *foo); static int ht_rm_value_re(struct sip_msg *msg, char *key, char *foo); @@ -119,36 +120,36 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"sht_print", (cmd_function)ht_print, 0, 0, 0, ANY_ROUTE}, - {"sht_rm", (cmd_function)w_ht_rm, 2, fixup_spve_spve, 0, ANY_ROUTE}, - {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_key, 0, + {"sht_rm", (cmd_function)w_ht_rm, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_key, fixup_free_ht_key, ANY_ROUTE}, - {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_key, 0, + {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_key, fixup_free_ht_key, ANY_ROUTE}, - {"sht_rm_name", (cmd_function)w_ht_rm_name, 3, fixup_spve_all, 0, + {"sht_rm_name", (cmd_function)w_ht_rm_name, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"sht_rm_value", (cmd_function)w_ht_rm_value, 3, fixup_spve_all, 0, + {"sht_rm_value", (cmd_function)w_ht_rm_value, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"sht_match_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, 0, + {"sht_match_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"sht_has_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, 0, + {"sht_has_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"sht_match_str_value", (cmd_function)w_ht_match_str_value, 3, - fixup_spve_all, 0, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"sht_has_str_value", (cmd_function)w_ht_match_str_value, 3, - fixup_spve_all, 0, ANY_ROUTE}, - {"sht_lock", (cmd_function)w_ht_slot_lock, 1, fixup_ht_key, 0, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"sht_lock", (cmd_function)w_ht_slot_lock, 1, fixup_ht_key, fixup_free_ht_key, ANY_ROUTE}, - {"sht_unlock", (cmd_function)w_ht_slot_unlock, 1, fixup_ht_key, 0, + {"sht_unlock", (cmd_function)w_ht_slot_unlock, 1, fixup_ht_key, fixup_free_ht_key, ANY_ROUTE}, - {"sht_reset", (cmd_function)ht_reset, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sht_reset", (cmd_function)ht_reset, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sht_iterator_start", (cmd_function)w_ht_iterator_start, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sht_iterator_next", (cmd_function)w_ht_iterator_next, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sht_iterator_end", (cmd_function)w_ht_iterator_end, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sht_iterator_rm", (cmd_function)w_ht_iterator_rm, 1, fixup_spve_null, - 0, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {"sht_iterator_sets", (cmd_function)w_ht_iterator_sets, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sht_iterator_seti", (cmd_function)w_ht_iterator_seti, 2, @@ -378,6 +379,12 @@ static int fixup_ht_key(void **param, int param_no) return 0; } +static int fixup_free_ht_key(void **param, int param_no) +{ + pkg_free(*param); + return 0; +} + /** * */

1 0

git:master:59ec3f21: h350: add fixup_free to exported function
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 59ec3f219c345f2dd783baaf5fd118f760044ff4 URL: https://github.com/kamailio/kamailio/commit/59ec3f219c345f2dd783baaf5fd118f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 h350: add fixup_free to exported function --- Modified: src/modules/h350/h350_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/59ec3f219c345f2dd783baaf5fd118f… Patch: https://github.com/kamailio/kamailio/commit/59ec3f219c345f2dd783baaf5fd118f… --- diff --git a/src/modules/h350/h350_mod.c b/src/modules/h350/h350_mod.c index 81275a13242..c0f08a5b5a0 100644 --- a/src/modules/h350/h350_mod.c +++ b/src/modules/h350/h350_mod.c @@ -42,6 +42,7 @@ static int child_init(int rank); * fixup functions */ static int one_str_pv_elem_fixup(void **param, int param_no); +static int one_str_pv_elem_fixup_free(void **param, int param_no); static int h350_auth_lookup_fixup(void **param, int param_no); /* @@ -70,53 +71,48 @@ int h350_search_scope_int = -1; */ ldap_api_t ldap_api; +/* clang-format off */ /* * Exported functions */ static cmd_export_t cmds[] = { - {"h350_sipuri_lookup", (cmd_function)w_h350_sipuri_lookup, 1, - one_str_pv_elem_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {"h350_auth_lookup", (cmd_function)w_h350_auth_lookup, 2, - h350_auth_lookup_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {"h350_result_call_preferences", (cmd_function)w_h350_call_preferences, - 1, one_str_pv_elem_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {"h350_result_service_level", (cmd_function)w_h350_service_level, 1, - one_str_pv_elem_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"h350_sipuri_lookup", (cmd_function)w_h350_sipuri_lookup, 1, one_str_pv_elem_fixup, one_str_pv_elem_fixup_free, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {"h350_auth_lookup", (cmd_function)w_h350_auth_lookup, 2, h350_auth_lookup_fixup, 0, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {"h350_result_call_preferences", (cmd_function)w_h350_call_preferences, 1, one_str_pv_elem_fixup, one_str_pv_elem_fixup, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {"h350_result_service_level", (cmd_function)w_h350_service_level, 1, one_str_pv_elem_fixup, one_str_pv_elem_fixup, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ static param_export_t params[] = { - {"ldap_session", PARAM_STRING, &h350_ldap_session}, - {"base_dn", PARAM_STRING, &h350_base_dn}, - {"search_scope", PARAM_STRING, &h350_search_scope}, {0, 0, 0}}; + {"ldap_session", PARAM_STRING, &h350_ldap_session}, + {"base_dn", PARAM_STRING, &h350_base_dn}, + {"search_scope", PARAM_STRING, &h350_search_scope}, {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "h350", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* Exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* child initialization function */ - 0 /* destroy function */ + "h350", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* Exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* child initialization function */ + 0 /* destroy function */ }; +/* clang-format on */ static int child_init(int rank) { @@ -208,6 +204,22 @@ static int one_str_pv_elem_fixup(void **param, int param_no) return 0; } +static int one_str_pv_elem_fixup_free(void **param, int param_no) +{ + str s; + + if(param_no == 1) { + s.s = (char *)*param; + if(s.s == 0 || s.s[0] == 0) { + return 0; + } else { + pv_elem_free_all(*param); + } + } + + return 0; +} + static int h350_auth_lookup_fixup(void **param, int param_no) { pv_elem_t *model;

1 0

git:master:13998407: group: add fixup_free to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 13998407d5b42b40586e3c9f605624e26d89d953 URL: https://github.com/kamailio/kamailio/commit/13998407d5b42b40586e3c9f605624e… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 group: add fixup_free to exported functions --- Modified: src/modules/group/group_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/13998407d5b42b40586e3c9f605624e… Patch: https://github.com/kamailio/kamailio/commit/13998407d5b42b40586e3c9f605624e… --- diff --git a/src/modules/group/group_mod.c b/src/modules/group/group_mod.c index adc8ae94f8f..27f427a1e50 100644 --- a/src/modules/group/group_mod.c +++ b/src/modules/group/group_mod.c @@ -71,9 +71,11 @@ static int mod_init(void); /*! Header field fixup */ static int hf_fixup(void **param, int param_no); +static int hf_fixup_free(void **param, int param_no); /*! get user group ID fixup */ static int get_gid_fixup(void **param, int param_no); +static int get_gid_fixup_free(void **param, int param_no); #define TABLE "grp" @@ -106,47 +108,49 @@ db_func_t group_dbf; db1_con_t *group_dbh = 0; +/* clang-format off */ /*! * Exported functions */ static cmd_export_t cmds[] = { - {"is_user_in", (cmd_function)is_user_in, 2, hf_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, - {"get_user_group", (cmd_function)get_user_group, 2, get_gid_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"is_user_in", (cmd_function)is_user_in, 2, hf_fixup, hf_fixup_free, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + {"get_user_group", (cmd_function)get_user_group, 2, get_gid_fixup, get_gid_fixup_free, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0}}; /*! * Exported parameters */ static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"table", PARAM_STR, &table}, {"user_column", PARAM_STR, &user_column}, - {"domain_column", PARAM_STR, &domain_column}, - {"group_column", PARAM_STR, &group_column}, - {"use_domain", PARAM_INT, &use_domain}, - {"re_table", PARAM_STR, &re_table}, - {"re_exp_column", PARAM_STR, &re_exp_column}, - {"re_gid_column", PARAM_STR, &re_gid_column}, - {"multiple_gid", PARAM_INT, &multiple_gid}, {0, 0, 0}}; + {"table", PARAM_STR, &table}, {"user_column", PARAM_STR, &user_column}, + {"domain_column", PARAM_STR, &domain_column}, + {"group_column", PARAM_STR, &group_column}, + {"use_domain", PARAM_INT, &use_domain}, + {"re_table", PARAM_STR, &re_table}, + {"re_exp_column", PARAM_STR, &re_exp_column}, + {"re_gid_column", PARAM_STR, &re_gid_column}, + {"multiple_gid", PARAM_INT, &multiple_gid}, {0, 0, 0}}; /*! * Module interface */ struct module_exports exports = { - "group", /* module name */ - 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 */ - child_init, /* per-child init function */ - destroy /* module destroy function */ + "group", /* module name */ + 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 */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static int child_init(int rank) { @@ -281,6 +285,14 @@ static int hf_fixup(void **param, int param_no) return 0; } +static int hf_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + pkg_free(*param); + } + return 0; +} + /*! * \brief Group ID fixup @@ -318,6 +330,15 @@ static int get_gid_fixup(void **param, int param_no) return 0; } +static int get_gid_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + pv_spec_free(*param); + } + + return 0; +} + /** * */

1 0

git:master:e1030203: geoip2: add fixup_free to exported funrcions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: e10302033e42f25cf88b975fe9926d9210028299 URL: https://github.com/kamailio/kamailio/commit/e10302033e42f25cf88b975fe9926d9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 geoip2: add fixup_free to exported funrcions --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e10302033e42f25cf88b975fe9926d9… Patch: https://github.com/kamailio/kamailio/commit/e10302033e42f25cf88b975fe9926d9… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index cfb40f69860..2a9329d3cef 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -63,7 +63,7 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"geoip2_match", (cmd_function)w_geoip2_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"geoip2_distance", (cmd_function)w_geoip2_distance, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}

1 0

git:master:7251ba1f: geoip: add fixup_free to exported funrcions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 7251ba1fd6c888a2f352cf1763d213031e7e3f6a URL: https://github.com/kamailio/kamailio/commit/7251ba1fd6c888a2f352cf1763d2130… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 geoip: add fixup_free to exported funrcions --- Modified: src/modules/geoip/geoip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7251ba1fd6c888a2f352cf1763d2130… Patch: https://github.com/kamailio/kamailio/commit/7251ba1fd6c888a2f352cf1763d2130… --- diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index 9c953d06d74..d3a36855e7c 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -55,7 +55,7 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"geoip_match", (cmd_function)w_geoip_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:8099e2d0: file_out: reformat exported structures
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 8099e2d0b9fdc8826e21013a3fa67d89ebdd88b2 URL: https://github.com/kamailio/kamailio/commit/8099e2d0b9fdc8826e21013a3fa67d8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 file_out: reformat exported structures --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/8099e2d0b9fdc8826e21013a3fa67d8… Patch: https://github.com/kamailio/kamailio/commit/8099e2d0b9fdc8826e21013a3fa67d8… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index a13d3531dde..1234827eab1 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -75,28 +75,28 @@ int *fo_number_of_files = NULL; time_t fo_current_timestamp = 0; +/* clang-format off */ static cmd_export_t cmds[] = { - {"file_out", (cmd_function)fo_write_to_file, 2, fo_fixup_int_pvar, - fo_fixup_free_int_pvar, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"file_out", (cmd_function)fo_write_to_file, 2, fo_fixup_int_pvar, fo_fixup_free_int_pvar, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = {{"base_folder", PARAM_STR, &fo_base_folder}, - {"file", PARAM_STR | PARAM_USE_FUNC, &fo_add_filename}, - {"worker_usleep", PARAM_INT, &fo_worker_usleep}, {0, 0, 0}}; + {"file", PARAM_STR | PARAM_USE_FUNC, &fo_add_filename}, + {"worker_usleep", PARAM_INT, &fo_worker_usleep}, {0, 0, 0}}; struct module_exports exports = { - "file_out", /* module name */ - 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 */ - child_init, /* per-child init function */ - destroy /* module destroy function */ + "file_out", /* module name */ + 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 */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; - +/* clang-format on */ static int mod_init(void) {

1 0

git:master:6232b8ae: exec: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 6232b8ae29988bfe17ddf6e0bd483eec854ab72b URL: https://github.com/kamailio/kamailio/commit/6232b8ae29988bfe17ddf6e0bd483ee… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 exec: add fixup_free* to exported functions --- Modified: src/modules/exec/exec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6232b8ae29988bfe17ddf6e0bd483ee… Patch: https://github.com/kamailio/kamailio/commit/6232b8ae29988bfe17ddf6e0bd483ee… --- diff --git a/src/modules/exec/exec_mod.c b/src/modules/exec/exec_mod.c index df5366e3ffa..0fd463de35a 100644 --- a/src/modules/exec/exec_mod.c +++ b/src/modules/exec/exec_mod.c @@ -56,6 +56,7 @@ static int w_exec_avp(struct sip_msg *msg, char *cmd, char *avpl); static int w_exec_cmd(struct sip_msg *msg, char *cmd, char *foo); static int exec_avp_fixup(void **param, int param_no); +static int exec_avp_fixup_free(void **param, int param_no); inline static void exec_shutdown(void); @@ -64,16 +65,11 @@ inline static void exec_shutdown(void); * Exported functions */ static cmd_export_t cmds[] = { - {"exec_dset", (cmd_function)w_exec_dset, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE}, - {"exec_msg", (cmd_function)w_exec_msg, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"exec_avp", (cmd_function)w_exec_avp, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"exec_avp", (cmd_function)w_exec_avp, 2, exec_avp_fixup, 0, - REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"exec_cmd", (cmd_function)w_exec_cmd, 1, fixup_spve_null, 0, - ANY_ROUTE}, + {"exec_dset", (cmd_function)w_exec_dset, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE}, + {"exec_msg", (cmd_function)w_exec_msg, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"exec_avp", (cmd_function)w_exec_avp, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"exec_avp", (cmd_function)w_exec_avp, 2, exec_avp_fixup, exec_avp_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"exec_cmd", (cmd_function)w_exec_cmd, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -268,6 +264,16 @@ static int exec_avp_fixup(void **param, int param_no) return 0; } +static int exec_avp_fixup_free(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } else if(param_no == 2) { + free_pvname_list((pvname_list_t *)param); + } + return 0; +} + static int ki_exec_cmd(sip_msg_t *msg, str *cmd) { int ret;

1 0

git:master:dd0a9624: evapi: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: dd0a9624660ea58aa6f97828ecd526fc7dba3a43 URL: https://github.com/kamailio/kamailio/commit/dd0a9624660ea58aa6f97828ecd526f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 evapi: add fixup_free* to exported functions --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dd0a9624660ea58aa6f97828ecd526f… Patch: https://github.com/kamailio/kamailio/commit/dd0a9624660ea58aa6f97828ecd526f…

1 0

git:master:03287733: enum: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 03287733434a6c2762ffad653917e15bbc462e0c URL: https://github.com/kamailio/kamailio/commit/03287733434a6c2762ffad653917e15… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 enum: add fixup_free* to exported functions --- Modified: src/modules/enum/enum_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/03287733434a6c2762ffad653917e15… Patch: https://github.com/kamailio/kamailio/commit/03287733434a6c2762ffad653917e15… --- diff --git a/src/modules/enum/enum_mod.c b/src/modules/enum/enum_mod.c index d7c3280841f..c1eb4a0359c 100644 --- a/src/modules/enum/enum_mod.c +++ b/src/modules/enum/enum_mod.c @@ -58,9 +58,9 @@ str service = {0, 0}; /* clang-format off */ static cmd_export_t cmds[] = { {"enum_query", (cmd_function)enum_query_0, 0, 0, 0, REQUEST_ROUTE}, - {"enum_query", (cmd_function)enum_query_1, 1, fixup_spve_null, 0, + {"enum_query", (cmd_function)enum_query_1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, - {"enum_query", (cmd_function)enum_query_2, 2, fixup_spve_spve, 0, + {"enum_query", (cmd_function)enum_query_2, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {"enum_pv_query", (cmd_function)enum_pv_query_1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, @@ -75,9 +75,9 @@ static cmd_export_t cmds[] = { {"is_from_user_enum", (cmd_function)is_from_user_enum_2, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {"i_enum_query", (cmd_function)i_enum_query_0, 0, 0, 0, REQUEST_ROUTE}, - {"i_enum_query", (cmd_function)i_enum_query_1, 1, fixup_spve_null, 0, + {"i_enum_query", (cmd_function)i_enum_query_1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, - {"i_enum_query", (cmd_function)i_enum_query_2, 2, fixup_spve_spve, 0, + {"i_enum_query", (cmd_function)i_enum_query_2, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -192,4 +192,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_enum_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:e7cecd66: dlgs: fix some fixup_free
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: e7cecd66a77669e32e5abc2ff4458e017c2a2f61 URL: https://github.com/kamailio/kamailio/commit/e7cecd66a77669e32e5abc2ff4458e0… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 dlgs: fix some fixup_free --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e7cecd66a77669e32e5abc2ff4458e0… Patch: https://github.com/kamailio/kamailio/commit/e7cecd66a77669e32e5abc2ff4458e0… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index e9821d05d4a..f06c9d0ceaa 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -71,11 +71,11 @@ static cmd_export_t cmds[]={ {"dlgs_count", (cmd_function)w_dlgs_count, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"dlgs_tags_add", (cmd_function)w_dlgs_tags_add, 1, fixup_spve_null, - fixup_spve_null, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {"dlgs_tags_rm", (cmd_function)w_dlgs_tags_rm, 1, fixup_spve_null, - fixup_spve_null, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {"dlgs_tags_count", (cmd_function)w_dlgs_tags_count, 1, fixup_spve_null, - fixup_spve_null, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:a05b1433: dispatcher: add fixup_free to several exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: a05b143385975f0cce349ff7ea1f4647f175cc3c URL: https://github.com/kamailio/kamailio/commit/a05b143385975f0cce349ff7ea1f464… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 dispatcher: add fixup_free to several exported functions --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/a05b143385975f0cce349ff7ea1f464… Patch: https://github.com/kamailio/kamailio/commit/a05b143385975f0cce349ff7ea1f464…

1 0

git:master:52f02ca5: crypto: add fixup_free function
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 52f02ca5f6d09c5323c582c9cf08990f0bc97ac5 URL: https://github.com/kamailio/kamailio/commit/52f02ca5f6d09c5323c582c9cf08990… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 crypto: add fixup_free function --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/52f02ca5f6d09c5323c582c9cf08990… Patch: https://github.com/kamailio/kamailio/commit/52f02ca5f6d09c5323c582c9cf08990… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index f3e644000f9..84f70813602 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -69,6 +69,7 @@ static int w_crypto_nio_decrypt(sip_msg_t *msg, char *p1, char *p2); static int w_crypto_hmac_sha256( sip_msg_t *msg, char *inb, char *keyb, char *outb); static int fixup_crypto_hmac(void **param, int param_no); +static int fixup_free_crypto_hmac(void **param, int param_no); static char *_crypto_salt_param = "k8hTm4aZ"; @@ -95,7 +96,7 @@ static cmd_export_t cmds[] = { {"crypto_netio_decrypt", (cmd_function)w_crypto_nio_decrypt, 0, 0, 0, ANY_ROUTE}, {"crypto_hmac_sha256", (cmd_function)w_crypto_hmac_sha256, 3, - fixup_crypto_hmac, 0, ANY_ROUTE}, + fixup_crypto_hmac, fixup_free_crypto_hmac, ANY_ROUTE}, {"load_crypto", (cmd_function)load_crypto, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; @@ -451,6 +452,19 @@ static int fixup_crypto_hmac(void **param, int param_no) return 0; } +/** + * + */ +static int fixup_free_crypto_hmac(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) { + fixup_free_spve_null(param, 1); + } else if(param_no == 3) { + fixup_free_pvar_null(param, 1); + } + return 0; +} + /** * */

1 0

git:master:82e653c0: corex: add fixup_free to file_read function
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 82e653c026219704a4c065e9a523f88c214b2faf URL: https://github.com/kamailio/kamailio/commit/82e653c026219704a4c065e9a523f88… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 corex: add fixup_free to file_read function --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82e653c026219704a4c065e9a523f88… Patch: https://github.com/kamailio/kamailio/commit/82e653c026219704a4c065e9a523f88… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index a6f06a2f26b..0fdf35060ea 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -79,6 +79,7 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2); static int fixup_file_op(void **param, int param_no); +static int fixup_free_file_op(void **param, int param_no); static sr_kemi_xval_t _sr_kemi_corex_xval = {0}; static str corex_evcb_reply_out = STR_NULL; @@ -148,7 +149,7 @@ static cmd_export_t cmds[] = { {"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"file_read", (cmd_function)w_file_read, 2, - fixup_file_op, 0, ANY_ROUTE}, + fixup_file_op, fixup_free_file_op, ANY_ROUTE}, {"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"setxflag", (cmd_function)w_setxflag, 1, @@ -911,6 +912,23 @@ static int fixup_file_op(void **param, int param_no) return -1; } +/** + * + */ +static int fixup_free_file_op(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } + + if(param_no == 2) { + return fixup_free_pvar_null(param, 1); + } + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + /** * */

1 0

git:master:ef84f28a: cnxcc: add fixup_free function
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: ef84f28a61b513a72f4abb96ec0fc1240223add1 URL: https://github.com/kamailio/kamailio/commit/ef84f28a61b513a72f4abb96ec0fc12… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 cnxcc: add fixup_free function --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ef84f28a61b513a72f4abb96ec0fc12… Patch: https://github.com/kamailio/kamailio/commit/ef84f28a61b513a72f4abb96ec0fc12… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index 0c59bb069b9..0f0fb7acf96 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -74,6 +74,7 @@ data_t _data; struct dlg_binds _dlgbinds; static int cnxcc_set_max_credit_fixup(void **param, int param_no); +static int cnxcc_set_max_credit_fixup_free(void **param, int param_no); /* * module core functions @@ -153,7 +154,7 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"cnxcc_set_max_credit", (cmd_function) __set_max_credit, 6, - cnxcc_set_max_credit_fixup, NULL, ANY_ROUTE}, + cnxcc_set_max_credit_fixup, cnxcc_set_max_credit_fixup_free, ANY_ROUTE}, {"cnxcc_set_max_time", (cmd_function) __set_max_time, 2, fixup_spve_igp, fixup_free_spve_igp, ANY_ROUTE}, {"cnxcc_update_max_time", (cmd_function) __update_max_time, 2, @@ -238,6 +239,23 @@ static int cnxcc_set_max_credit_fixup(void **param, int param_no) } } +static int cnxcc_set_max_credit_fixup_free(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + case 3: + case 4: + return fixup_free_spve_all(param, param_no); + case 5: + case 6: + return fixup_free_igp_all(param, param_no); + default: + LM_ERR("unexpected parameter number: %d\n", param_no); + return E_CFG; + } +} + static int __mod_init(void) { int len;

1 0

git:master:43563cf9: uid_avp_db: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 43563cf9888386aa0d7e4d5f63e9ee1147777e6c URL: https://github.com/kamailio/kamailio/commit/43563cf9888386aa0d7e4d5f63e9ee1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:16:50+01:00 uid_avp_db: add fixup_free* to exported functions --- Modified: src/modules/uid_avp_db/extra_attrs.c Modified: src/modules/uid_avp_db/extra_attrs.h Modified: src/modules/uid_avp_db/uid_avp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/43563cf9888386aa0d7e4d5f63e9ee1… Patch: https://github.com/kamailio/kamailio/commit/43563cf9888386aa0d7e4d5f63e9ee1… --- diff --git a/src/modules/uid_avp_db/extra_attrs.c b/src/modules/uid_avp_db/extra_attrs.c index c8fde1bb184..171ea041ac0 100644 --- a/src/modules/uid_avp_db/extra_attrs.c +++ b/src/modules/uid_avp_db/extra_attrs.c @@ -459,6 +459,14 @@ int extra_attrs_fixup(void **param, int param_no) return 0; } +int extra_attrs_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + return fixup_free_fparam_2(param, param_no); + } + return 0; +} + /******* locking *******/ #define LOCK_CNT 32 diff --git a/src/modules/uid_avp_db/extra_attrs.h b/src/modules/uid_avp_db/extra_attrs.h index bd5d1933c47..ba35d34bdfd 100644 --- a/src/modules/uid_avp_db/extra_attrs.h +++ b/src/modules/uid_avp_db/extra_attrs.h @@ -16,6 +16,7 @@ int save_extra_attrs(struct sip_msg *msg, char *_table, char *_id); int remove_extra_attrs(struct sip_msg *msg, char *_table, char *_id); int extra_attrs_fixup(void **param, int param_no); +int extra_attrs_fixup_free(void **param, int param_no); int lock_extra_attrs(struct sip_msg *msg, char *_table, char *_id); int unlock_extra_attrs(struct sip_msg *msg, char *_table, char *_id); diff --git a/src/modules/uid_avp_db/uid_avp_db.c b/src/modules/uid_avp_db/uid_avp_db.c index 20ffca560d3..372e898c51a 100644 --- a/src/modules/uid_avp_db/uid_avp_db.c +++ b/src/modules/uid_avp_db/uid_avp_db.c @@ -76,16 +76,16 @@ static cmd_export_t cmds[] = { {"load_attrs", load_attrs, 2, attrs_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, /* functions for loading/storing flagged attributes into DB */ - {"load_extra_attrs", load_extra_attrs, 2, extra_attrs_fixup, 0, + {"load_extra_attrs", load_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"save_extra_attrs", save_extra_attrs, 2, extra_attrs_fixup, 0, + {"save_extra_attrs", save_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"remove_extra_attrs", remove_extra_attrs, 2, extra_attrs_fixup, 0, + {"remove_extra_attrs", remove_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, /* locking attrs - needed for proper work! */ - {"lock_extra_attrs", lock_extra_attrs, 2, extra_attrs_fixup, 0, + {"lock_extra_attrs", lock_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"unlock_extra_attrs", unlock_extra_attrs, 2, extra_attrs_fixup, 0, + {"unlock_extra_attrs", unlock_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:5f78ba33: uid_avp_db: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 5f78ba3367cedcde0c0fb55b8aca6f37b8569e44 URL: https://github.com/kamailio/kamailio/commit/5f78ba3367cedcde0c0fb55b8aca6f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:07:24+01:00 uid_avp_db: reformat exported structures --- Modified: src/modules/uid_avp_db/uid_avp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5f78ba3367cedcde0c0fb55b8aca6f3… Patch: https://github.com/kamailio/kamailio/commit/5f78ba3367cedcde0c0fb55b8aca6f3…

1 0

git:master:d728b14b: uid_domain: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: d728b14bf2987b89ddfd131f66b62943424afa5f URL: https://github.com/kamailio/kamailio/commit/d728b14bf2987b89ddfd131f66b6294… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:57:59+01:00 uid_domain: add fixup_free* to exported functions --- Modified: src/modules/uid_domain/uid_domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d728b14bf2987b89ddfd131f66b6294… Patch: https://github.com/kamailio/kamailio/commit/d728b14bf2987b89ddfd131f66b6294… --- diff --git a/src/modules/uid_domain/uid_domain_mod.c b/src/modules/uid_domain/uid_domain_mod.c index eed0a27122d..e140e003d95 100644 --- a/src/modules/uid_domain/uid_domain_mod.c +++ b/src/modules/uid_domain/uid_domain_mod.c @@ -56,6 +56,7 @@ static int lookup_domain(struct sip_msg *msg, char *s1, char *s2); static int get_did(str *did, str *domain); static int lookup_domain_fixup(void **param, int param_no); +static int lookup_domain_fixup_free(void **param, int param_no); MODULE_VERSION @@ -121,8 +122,8 @@ static domain_t dom_buf[2]; * Exported functions */ static cmd_export_t cmds[] = { - {"is_local", is_local, 1, fixup_var_str_1, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"is_local", is_local, 1, fixup_var_str_1, fixup_free_fparam_1, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, lookup_domain_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"get_did", (cmd_function)get_did, 0, 0, 0, 0}, {"bind_domain", (cmd_function)bind_domain, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -569,3 +570,11 @@ static int lookup_domain_fixup(void **param, int param_no) return 0; } + +static int lookup_domain_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + return fixup_free_fparam_all(param, 2); + } + return 0; +}

1 0

git:master:f63e5488: uid_domain: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: f63e5488b713e1a98ced684d43e9a69e12160516 URL: https://github.com/kamailio/kamailio/commit/f63e5488b713e1a98ced684d43e9a69… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:53:01+01:00 uid_domain: reformat exported structures --- Modified: src/modules/uid_domain/uid_domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f63e5488b713e1a98ced684d43e9a69… Patch: https://github.com/kamailio/kamailio/commit/f63e5488b713e1a98ced684d43e9a69… --- diff --git a/src/modules/uid_domain/uid_domain_mod.c b/src/modules/uid_domain/uid_domain_mod.c index a75253c1473..eed0a27122d 100644 --- a/src/modules/uid_domain/uid_domain_mod.c +++ b/src/modules/uid_domain/uid_domain_mod.c @@ -116,52 +116,54 @@ domain_t **domains_2 = 0; /* List of domains 2 */ */ static domain_t dom_buf[2]; +/* clang-format off */ /* * Exported functions */ static cmd_export_t cmds[] = { - {"is_local", is_local, 1, fixup_var_str_1, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"get_did", (cmd_function)get_did, 0, 0, 0, 0}, - {"bind_domain", (cmd_function)bind_domain, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; - + {"is_local", is_local, 1, fixup_var_str_1, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"get_did", (cmd_function)get_did, 0, 0, 0, 0}, + {"bind_domain", (cmd_function)bind_domain, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"db_mode", PARAM_INT, &db_mode}, - {"domain_table", PARAM_STR, &domain_table}, - {"domain_col", PARAM_STR, &domain_col}, - {"did_col", PARAM_STR, &did_col}, {"flags_col", PARAM_STR, &flags_col}, - {"domattr_table", PARAM_STR, &domattr_table}, - {"domattr_did", PARAM_STR, &domattr_did}, - {"domattr_name", PARAM_STR, &domattr_name}, - {"domattr_type", PARAM_STR, &domattr_type}, - {"domattr_value", PARAM_STR, &domattr_value}, - {"domattr_flags", PARAM_STR, &domattr_flags}, - {"load_domain_attrs", PARAM_INT, &load_domain_attrs}, {0, 0, 0}}; - +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"db_mode", PARAM_INT, &db_mode}, + {"domain_table", PARAM_STR, &domain_table}, + {"domain_col", PARAM_STR, &domain_col}, + {"did_col", PARAM_STR, &did_col}, + {"flags_col", PARAM_STR, &flags_col}, + {"domattr_table", PARAM_STR, &domattr_table}, + {"domattr_did", PARAM_STR, &domattr_did}, + {"domattr_name", PARAM_STR, &domattr_name}, + {"domattr_type", PARAM_STR, &domattr_type}, + {"domattr_value", PARAM_STR, &domattr_value}, + {"domattr_flags", PARAM_STR, &domattr_flags}, + {"load_domain_attrs", PARAM_INT, &load_domain_attrs}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "uid_domain", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - domain_rpc, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - destroy /* module destroy function */ + "uid_domain", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + domain_rpc, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; - +/* clang-format off */ static int init_db(void) {

1 0

git:master:03af5047: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 03af5047a38c9df4fbc407505fd03467f1584977 URL: https://github.com/kamailio/kamailio/commit/03af5047a38c9df4fbc407505fd0346… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-20T13:46:10+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/03af5047a38c9df4fbc407505fd0346… Patch: https://github.com/kamailio/kamailio/commit/03af5047a38c9df4fbc407505fd0346…

1 0

git:master:ec783503: uuid_gflags: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: ec783503d3672a7c395894382de52e50f5fb8b91 URL: https://github.com/kamailio/kamailio/commit/ec783503d3672a7c395894382de52e5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:41:42+01:00 uuid_gflags: reformat exported structures --- Modified: src/modules/uid_gflags/uid_gflags.c --- Diff: https://github.com/kamailio/kamailio/commit/ec783503d3672a7c395894382de52e5… Patch: https://github.com/kamailio/kamailio/commit/ec783503d3672a7c395894382de52e5… --- diff --git a/src/modules/uid_gflags/uid_gflags.c b/src/modules/uid_gflags/uid_gflags.c index a61c66497e5..9e56845c869 100644 --- a/src/modules/uid_gflags/uid_gflags.c +++ b/src/modules/uid_gflags/uid_gflags.c @@ -77,39 +77,40 @@ static avp_list_t *avps_1; static avp_list_t *avps_2; static rpc_export_t rpc_methods[]; +/* clang-format off */ static cmd_export_t cmds[] = { - {"set_ugflag", set_gflag, 1, fixup_int_1, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, - {"reset_ugflag", reset_gflag, 1, fixup_int_1, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, - {"is_ugflag", is_gflag, 1, fixup_int_1, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, - {"flush_ugflags", flush_gflags, 0, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"initial", PARAM_INT, &initial}, - {"db_url", PARAM_STRING, &db_url}, - {"load_global_attrs", PARAM_INT, &load_global_attrs}, - {"global_attrs_table", PARAM_STRING, &attr_table}, - {"global_attrs_name", PARAM_STRING, &attr_name}, - {"global_attrs_type", PARAM_STRING, &attr_type}, - {"global_attrs_value", PARAM_STRING, &attr_value}, - {"global_attrs_flags", PARAM_STRING, &attr_flags}, {0, 0, 0}}; + {"set_ugflag", set_gflag, 1, fixup_int_1, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, + {"reset_ugflag", reset_gflag, 1, fixup_int_1, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, + {"is_ugflag", is_gflag, 1, fixup_int_1, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, + {"flush_ugflags", flush_gflags, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -struct module_exports exports = { - "uid_gflags", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - rpc_methods, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response handling function*/ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ +static param_export_t params[] = { + {"initial", PARAM_INT, &initial}, + {"db_url", PARAM_STRING, &db_url}, + {"load_global_attrs", PARAM_INT, &load_global_attrs}, + {"global_attrs_table", PARAM_STRING, &attr_table}, + {"global_attrs_name", PARAM_STRING, &attr_name}, + {"global_attrs_type", PARAM_STRING, &attr_type}, + {"global_attrs_value", PARAM_STRING, &attr_value}, + {"global_attrs_flags", PARAM_STRING, &attr_flags}, + {0, 0, 0} }; +struct module_exports exports = { + "uid_gflags", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + rpc_methods, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response handling function*/ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ +}; +/* clang-format on */ static int init_db(void) {

1 0

git:master:f4d841ef: uid_uri_db: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: f4d841ef01fd605a181879b23cbd7ccb179016fd URL: https://github.com/kamailio/kamailio/commit/f4d841ef01fd605a181879b23cbd7cc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:41:41+01:00 uid_uri_db: reformat exported structures --- Modified: src/modules/uid_uri_db/uid_uri_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f4d841ef01fd605a181879b23cbd7cc… Patch: https://github.com/kamailio/kamailio/commit/f4d841ef01fd605a181879b23cbd7cc… --- diff --git a/src/modules/uid_uri_db/uid_uri_db_mod.c b/src/modules/uid_uri_db/uid_uri_db_mod.c index 81b762d5112..98adf0a108a 100644 --- a/src/modules/uid_uri_db/uid_uri_db_mod.c +++ b/src/modules/uid_uri_db/uid_uri_db_mod.c @@ -96,46 +96,47 @@ static domain_get_did_t dm_get_did = NULL; /* default did value */ str default_did = STR_STATIC_INIT("_default"); +/* clang-format off */ /* * Exported functions */ -static cmd_export_t cmds[] = {{"lookup_user", lookup_user, 1, header_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"lookup_user", lookup_user_2, 2, lookup_user_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"check_uri", check_uri, 1, header_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - +static cmd_export_t cmds[] = { + {"lookup_user", lookup_user, 1, header_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"lookup_user", lookup_user_2, 2, lookup_user_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"check_uri", check_uri, 1, header_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"uri_table", PARAM_STR, &uri_table}, - {"uid_column", PARAM_STR, &uid_col}, - {"did_column", PARAM_STR, &did_col}, - {"username_column", PARAM_STR, &username_col}, - {"flags_column", PARAM_STR, &flags_col}, - {"scheme_column", PARAM_STR, &scheme_col}, {0, 0, 0}}; - +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"uri_table", PARAM_STR, &uri_table}, + {"uid_column", PARAM_STR, &uid_col}, + {"did_column", PARAM_STR, &did_col}, + {"username_column", PARAM_STR, &username_col}, + {"flags_column", PARAM_STR, &flags_col}, + {"scheme_column", PARAM_STR, &scheme_col}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "uid_uri_db", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* module init function */ - 0, /* response handling function */ - child_init, /* child init function */ - destroy /* destroy function */ + "uid_uri_db", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* module init function */ + 0, /* response handling function */ + child_init, /* child init function */ + destroy /* destroy function */ }; - +/* clang-format on */ /* * Module initialization function callee in each child separately

1 0

git:master:643f5065: ims_ipsec_pcscf: docs for ipsec_listen_name parameter
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 643f50656a3e06ef7342bebef952a6463f425c4b URL: https://github.com/kamailio/kamailio/commit/643f50656a3e06ef7342bebef952a64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T13:34:30+01:00 ims_ipsec_pcscf: docs for ipsec_listen_name parameter --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/643f50656a3e06ef7342bebef952a64… Patch: https://github.com/kamailio/kamailio/commit/643f50656a3e06ef7342bebef952a64… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index a8f075d93d6..e587a8dfc2f 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -115,6 +115,23 @@ modparam("ims_ipsec_pcscf", "ipsec_server_port", 5063) </example> </section> + <section> + <title><varname>ipsec_listen_name</varname> (string)</title> + + <para>Set a common prefix to build listen socket names. + Default value: not set.</para> + + <example> + <title><varname>ipsec_listen_name</varname> parameter usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_ipsec_pcscf", "ipsec_listen_name", "ims") +... + </programlisting> + </example> + </section> + <section> <title><varname>ipsec_listen_agname</varname> (string)</title>

1 0

git:master:219ebbd7: ims_ipsec_pcscf: added ipsec_listen_name param
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 219ebbd7d204687f42fc2ae6cf80f84f443ee467 URL: https://github.com/kamailio/kamailio/commit/219ebbd7d204687f42fc2ae6cf80f84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T13:34:30+01:00 ims_ipsec_pcscf: added ipsec_listen_name param - set a common prefix to build socket names --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/219ebbd7d204687f42fc2ae6cf80f84… Patch: https://github.com/kamailio/kamailio/commit/219ebbd7d204687f42fc2ae6cf80f84…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev