sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
351 discussions

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 week, 1 day

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 week, 1 day

git:master:aaf32a47: uac_redirect: reformat exported structures

by Victor Seva

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 week, 1 day

git:master:96e98152: uid_auth_db: add fixup_free* to exported functions

by Victor Seva

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 week, 1 day

git:master:985193bd: uid_auth_db: reformat exported structures

by Victor Seva

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 week, 1 day

git:master:20bf9c83: ims_auth: add fixup_free* to exported functions

by Federico Cabiddu

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 week, 1 day

[kamailio/kamailio] Add missing fixup_free* to exported functions (PR #4031)

by Federico Cabiddu

#### 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 week, 1 day

git:master:b3d64393: http_async_client: add fixup_free* to exported functions

by Federico Cabiddu

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 week, 1 day

git:master:ff6e7d6d: htable: add fixup_free* to exported functions

by Federico Cabiddu

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 week, 1 day

git:master:59ec3f21: h350: add fixup_free to exported function

by Federico Cabiddu

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 week, 1 day

← Newer
1
...
14
15
16
17
18
19
20
...
36
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