- sr-dev - kamailio.org

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

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

20 Nov '24

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

1 0

git:master:4917045c: uri_db: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 4917045cf2c8a2ab29c82a1b2bb811dc2c645b76 URL: https://github.com/kamailio/kamailio/commit/4917045cf2c8a2ab29c82a1b2bb811d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:33:52+01:00 uri_db: add fixup_free* to exported functions --- Modified: src/modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/4917045cf2c8a2ab29c82a1b2bb811d… Patch: https://github.com/kamailio/kamailio/commit/4917045cf2c8a2ab29c82a1b2bb811d… --- diff --git a/src/modules/uri_db/uri_db.c b/src/modules/uri_db/uri_db.c index 8c4f3e57d8c..e94ae0a269d 100644 --- a/src/modules/uri_db/uri_db.c +++ b/src/modules/uri_db/uri_db.c @@ -73,8 +73,8 @@ static int w_check_uri1(struct sip_msg *_m, char *_uri, char *_s); static cmd_export_t cmds[] = { {"check_to", (cmd_function)check_to, 0, 0, 0, REQUEST_ROUTE}, {"check_from", (cmd_function)check_from, 0, 0, 0, REQUEST_ROUTE}, - {"check_uri", (cmd_function)w_check_uri1, 1, fixup_spve_null, 0, REQUEST_ROUTE}, - {"check_uri", (cmd_function)check_uri, 3, fixup_spve_all, 0, REQUEST_ROUTE}, + {"check_uri", (cmd_function)w_check_uri1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, + {"check_uri", (cmd_function)check_uri, 3, fixup_spve_all, fixup_free_spve_all, REQUEST_ROUTE}, {"does_uri_exist", (cmd_function)does_uri_exist, 0, 0, fixup_exist, REQUEST_ROUTE | LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:90ecec7e: uri_db: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 90ecec7e15a961d1ced11ba320ced037677ac61f URL: https://github.com/kamailio/kamailio/commit/90ecec7e15a961d1ced11ba320ced03… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:32:38+01:00 uri_db: reformat exported structures --- Modified: src/modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/90ecec7e15a961d1ced11ba320ced03… Patch: https://github.com/kamailio/kamailio/commit/90ecec7e15a961d1ced11ba320ced03… --- diff --git a/src/modules/uri_db/uri_db.c b/src/modules/uri_db/uri_db.c index ecda1303b73..8c4f3e57d8c 100644 --- a/src/modules/uri_db/uri_db.c +++ b/src/modules/uri_db/uri_db.c @@ -66,49 +66,49 @@ static int fixup_exist(void **param, int param_no); static int w_check_uri1(struct sip_msg *_m, char *_uri, char *_s); +/* clang-format off */ /* * Exported functions */ static cmd_export_t cmds[] = { - {"check_to", (cmd_function)check_to, 0, 0, 0, REQUEST_ROUTE}, - {"check_from", (cmd_function)check_from, 0, 0, 0, REQUEST_ROUTE}, - {"check_uri", (cmd_function)w_check_uri1, 1, fixup_spve_null, 0, - REQUEST_ROUTE}, - {"check_uri", (cmd_function)check_uri, 3, fixup_spve_all, 0, - REQUEST_ROUTE}, - {"does_uri_exist", (cmd_function)does_uri_exist, 0, 0, fixup_exist, - REQUEST_ROUTE | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"check_to", (cmd_function)check_to, 0, 0, 0, REQUEST_ROUTE}, + {"check_from", (cmd_function)check_from, 0, 0, 0, REQUEST_ROUTE}, + {"check_uri", (cmd_function)w_check_uri1, 1, fixup_spve_null, 0, REQUEST_ROUTE}, + {"check_uri", (cmd_function)check_uri, 3, fixup_spve_all, 0, REQUEST_ROUTE}, + {"does_uri_exist", (cmd_function)does_uri_exist, 0, 0, fixup_exist, REQUEST_ROUTE | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"db_table", PARAM_STR, &db_table}, - {"user_column", PARAM_STR, &uridb_user_col}, - {"domain_column", PARAM_STR, &uridb_domain_col}, - {"uriuser_column", PARAM_STR, &uridb_uriuser_col}, - {"use_uri_table", PARAM_INT, &use_uri_table}, - {"use_domain", PARAM_INT, &use_domain}, {0, 0, 0}}; - +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"db_table", PARAM_STR, &db_table}, + {"user_column", PARAM_STR, &uridb_user_col}, + {"domain_column", PARAM_STR, &uridb_domain_col}, + {"uriuser_column", PARAM_STR, &uridb_uriuser_col}, + {"use_uri_table", PARAM_INT, &use_uri_table}, + {"use_domain", PARAM_INT, &use_domain}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "uri_db", /* 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, /* child init function */ - destroy /* module destroy function */ + "uri_db", /* 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, /* child init function */ + destroy /* module destroy function */ }; - +/* clang-format on */ /** * Module initialization function callee in each child separately

1 0

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

20 Nov '24

Module: kamailio Branch: master Commit: a72f2f01235af073f4aa74e5380136006e568a6e URL: https://github.com/kamailio/kamailio/commit/a72f2f01235af073f4aa74e53801360… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:29:47+01:00 userblocklist: add fixup_free* to exported functions --- Modified: src/modules/userblocklist/userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/a72f2f01235af073f4aa74e53801360… Patch: https://github.com/kamailio/kamailio/commit/a72f2f01235af073f4aa74e53801360… --- diff --git a/src/modules/userblocklist/userblocklist.c b/src/modules/userblocklist/userblocklist.c index 7d63835cb9e..b9b93238a8a 100644 --- a/src/modules/userblocklist/userblocklist.c +++ b/src/modules/userblocklist/userblocklist.c @@ -87,6 +87,7 @@ static struct dtrie_node_t *gnode = NULL; /* ---- fixup functions: */ static int check_blocklist_fixup(void **param, int param_no); +static int check_blocklist_fixup_free(void **arg, int arg_no); static int check_user_blocklist_fixup(void **param, int param_no); static int check_globalblocklist_fixup(void **param, int param_no); @@ -115,21 +116,21 @@ static void mod_destroy(void); /* clang-format off */ static cmd_export_t cmds[] = { {"check_user_blocklist", (cmd_function)check_user_blocklist2, 2, - check_user_blocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + check_user_blocklist_fixup, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"check_user_allowlist", (cmd_function)check_user_allowlist2, 2, - check_user_blocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + check_user_blocklist_fixup, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"check_user_blocklist", (cmd_function)check_user_blocklist3, 3, - check_user_blocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + check_user_blocklist_fixup, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"check_user_allowlist", (cmd_function)check_user_allowlist3, 3, - check_user_blocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + check_user_blocklist_fixup, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"check_user_blocklist", (cmd_function)check_user_blocklist, 4, - check_user_blocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + check_user_blocklist_fixup, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"check_user_allowlist", (cmd_function)check_user_allowlist, 4, - check_user_blocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + check_user_blocklist_fixup, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"check_blocklist", (cmd_function)check_blocklist, 1, - check_blocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + check_blocklist_fixup, check_blocklist_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"check_allowlist", (cmd_function)check_allowlist, 1, - check_blocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + check_blocklist_fixup, check_blocklist_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"check_blocklist", (cmd_function)check_globalblocklist, 0, check_globalblocklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -614,6 +615,12 @@ static int check_blocklist_fixup(void **arg, int arg_no) return 0; } +static int check_blocklist_fixup_free(void **arg, int arg_no) +{ + pkg_free(*arg); + return 0; +} + static int ki_check_blocklist(sip_msg_t *msg, str *stable) { struct dtrie_node_t *node = NULL;

1 0

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

20 Nov '24

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

1 0

git:master:ef23393b: ims_ipsec_pcscf: docs for ipsec_listen_agname parameter
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: ef23393b657d186eab67738f26ad93379b4c6cca URL: https://github.com/kamailio/kamailio/commit/ef23393b657d186eab67738f26ad933… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T12:28:50+01:00 ims_ipsec_pcscf: docs for ipsec_listen_agname parameter --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef23393b657d186eab67738f26ad933… Patch: https://github.com/kamailio/kamailio/commit/ef23393b657d186eab67738f26ad933… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index f4a388ee777..a8f075d93d6 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -115,6 +115,23 @@ modparam("ims_ipsec_pcscf", "ipsec_server_port", 5063) </example> </section> + <section> + <title><varname>ipsec_listen_agname</varname> (string)</title> + + <para>Set async (action) workers group name for udp sockets for + multi-threaded reading. Default value: not set.</para> + + <example> + <title><varname>ipsec_listen_agname</varname> parameter usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_ipsec_pcscf", "ipsec_listen_agname", "imsudp") +... + </programlisting> + </example> + </section> + <section> <title><varname>ipsec_max_connections</varname> (int)</title>

1 0

git:master:c8900d8c: ims_ipsec_pcscf: added ipsec_listen_agname parameter
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: c8900d8c4fd129e3486507673b4f10809c5dbf30 URL: https://github.com/kamailio/kamailio/commit/c8900d8c4fd129e3486507673b4f108… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T12:28:49+01:00 ims_ipsec_pcscf: added ipsec_listen_agname parameter - set async (action) workers group name for udp sockets for multi-threaded reading --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c8900d8c4fd129e3486507673b4f108… Patch: https://github.com/kamailio/kamailio/commit/c8900d8c4fd129e3486507673b4f108… --- diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index df451694458..b4d0bc0e0d1 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -40,6 +40,7 @@ str ipsec_listen_addr = STR_NULL; str ipsec_listen_addr6 = STR_NULL; int ipsec_client_port = 5062; int ipsec_server_port = 5063; +str ipsec_listen_agname = STR_NULL; int ipsec_reuse_server_port = 1; int ipsec_max_connections = 2; int spi_id_start = 100; @@ -105,6 +106,7 @@ static param_export_t params[] = { {"ipsec_listen_addr6", PARAM_STR, &ipsec_listen_addr6 }, {"ipsec_client_port", PARAM_INT, &ipsec_client_port }, {"ipsec_server_port", PARAM_INT, &ipsec_server_port }, + {"ipsec_listen_agname", PARAM_STR, &ipsec_listen_agname }, {"ipsec_reuse_server_port", PARAM_INT, &ipsec_reuse_server_port }, {"ipsec_max_connections", PARAM_INT, &ipsec_max_connections }, {"ipsec_spi_id_start", PARAM_INT, &spi_id_start }, @@ -232,6 +234,7 @@ static int ipsec_add_listen_ifaces() // add listen interfaces for IPv4 memset(&sa, 0, sizeof(socket_attrs_t)); sa.bindaddr = ipsec_listen_addr; + sa.agname = ipsec_listen_agname; sa.bindproto = PROTO_TCP; sa.bindport = ipsec_client_port; sa.bindportend = ipsec_client_port + ipsec_max_connections - 1; @@ -264,6 +267,7 @@ static int ipsec_add_listen_ifaces() // add listen interfaces for IPv6 memset(&sa, 0, sizeof(socket_attrs_t)); sa.bindaddr = ipsec_listen_addr6; + sa.agname = ipsec_listen_agname; sa.bindproto = PROTO_TCP; sa.bindport = ipsec_client_port; sa.bindportend = ipsec_client_port + ipsec_max_connections - 1;

1 0

git:master:d465ac36: userblocklist: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: d465ac36e39f8d1f79365ff929499b4ecb5c4ae8 URL: https://github.com/kamailio/kamailio/commit/d465ac36e39f8d1f79365ff929499b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T12:27:00+01:00 userblocklist: reformat exported structures --- Modified: src/modules/userblocklist/userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/d465ac36e39f8d1f79365ff929499b4… Patch: https://github.com/kamailio/kamailio/commit/d465ac36e39f8d1f79365ff929499b4…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev