- sr-dev - kamailio.org

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev