sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
367 discussions

git:master:d984ba4a: pv: reset buf.s to avoid double free on error for pv_set_xto_attr()

by Daniel-Constantin Mierla

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 month

git:master:8cf59e2b: textopsx: add fixup_free* to exported functions

by Victor Seva

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 month

git:master:55216ee0: tsilo: add fixup_free* to exported functions

by Federico Cabiddu

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 month

[kamailio/kamailio] topos: add enable_register_publish (PR #3766)

by Harish S

Added enable_register_publish parameter to enable REGISTER and PUBLISH method for topos If set to 1 REGISTER and PUBLISH will be enabled for topos Currently only via header will be applied for topos and if mask_callid is set to 1 call-ID will be masked. Other headers should be manged by the user as required.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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/3766 -- Commit Summary -- * add enable_register_publish -- File Changes -- M src/modules/topos/topos_mod.c (2) M src/modules/topos/tps_msg.c (132) M src/modules/topos/tps_msg.h (2) M src/modules/topos/tps_storage.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3766.patch https://github.com/kamailio/kamailio/pull/3766.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3766 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3766(a)github.com>

1 month

git:master:c499dac3: tmrec: reformat exported structures

by Victor Seva

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 month

git:master:f1ce7400: tmx: reformat exported structures

by Victor Seva

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 month

git:master:a4a1f9d1: topos_redis: reformat exported structures

by Victor Seva

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 month

git:master:8f4e66d3: tsilo: reformat exported structures

by Victor Seva

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 month

git:master:24961934: ims_charging: add fixup_free* to exported functions

by Federico Cabiddu

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 month

git:master:065987e8: uac_redirect: add fixup_free* to exported functions

by Victor Seva

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 month

← Newer
1
...
16
17
18
19
20
21
22
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024