sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
367 discussions

git:master:5b852254: core: framework to execute async event route with type-key-value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5b852254e75365c2886baf1e4be8829ac10b9917 URL: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T13:28:20+01:00 core: framework to execute async event route with type-key-value - execute event_route[core:tkv] in async fashion, with data passed in the form of [type, key, value] - the events have to be emitted from parts of the code and the execution of the event route should not block the emitting process --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… Patch: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index bce7ed51faa..17c385a51fd 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -34,11 +34,15 @@ #include <arpa/inet.h> #include <fcntl.h> #include <errno.h> +#include <stdarg.h> #include "dprint.h" #include "sr_module.h" #include "ut.h" #include "pt.h" +#include "kemi.h" +#include "fmsg.h" +#include "receive.h" #include "cfg/cfg_struct.h" #include "parser/parse_param.h" @@ -525,3 +529,126 @@ int async_task_run(async_wgroup_t *awg, int idx) return 0; } + + +/** + * + */ +static async_wgroup_t *_async_tkv_awg = NULL; +static async_tkv_param_t *_ksr_async_tkv_param = NULL; +static int _ksr_async_tkv_ridx = -1; + +/** + * + */ +void async_tkv_init(void) +{ + str gname = str_init("tkv"); + str evname = str_init("core:tkv"); + + _async_tkv_awg = async_task_group_find(&gname); + + _ksr_async_tkv_ridx = route_lookup(&event_rt, evname.s); + if(_ksr_async_tkv_ridx <= 0 + || event_rt.rlist[_ksr_async_tkv_ridx] == NULL) { + LM_DBG("event_route[%s] not defined - skipping\n", evname.s); + _ksr_async_tkv_ridx = -2; + return; + } +} + +/** + * + */ +void async_exec_tkv(void *param) +{ + async_tkv_param_t *adp; + sr_kemi_eng_t *keng = NULL; + sip_msg_t *fmsg = NULL; + str evname = str_init("core:tkv"); + str cbname = str_init("ksr_core_tkv"); + int rtype = 0; + + adp = (async_tkv_param_t *)param; + fmsg = faked_msg_next(); + rtype = get_route_type(); + _ksr_async_tkv_param = adp; + set_route_type(REQUEST_ROUTE); + keng = sr_kemi_eng_get(); + if(keng != NULL) { + if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, &cbname, &evname) < 0) { + LM_ERR("error running event route kemi callback [%.*s]\n", + cbname.len, cbname.s); + } + } else { + if(_ksr_async_tkv_ridx >= 0) { + run_top_route(event_rt.rlist[_ksr_async_tkv_ridx], fmsg, 0); + } + } + ksr_msg_env_reset(); + set_route_type(rtype); + _ksr_async_tkv_param = NULL; + /* param is freed along with the async task strucutre in core */ +} + +/** + * + */ +int async_tkv_emit(int dtype, char *pkey, char *fmt, ...) +{ + async_task_t *at = NULL; + int dsize = 0; + async_tkv_param_t *adp; + va_list va; + char buf[KSR_ASYNC_TKV_SIZE]; + int n = 0; + int klen = 0; + sr_kemi_eng_t *keng = NULL; + + if(_async_tkv_awg == NULL) { + LM_DBG("the async group has not been set\n"); + return -1; + } + keng = sr_kemi_eng_get(); + if(keng == NULL && _ksr_async_tkv_ridx == -2) { + LM_DBG("the event_route[core:tkv] has not been defined\n"); + return -1; + } + + va_start(va, fmt); + n = vsnprintf(buf, KSR_ASYNC_TKV_SIZE, fmt, va); + va_end(va); + + if(n < 0 || n > KSR_ASYNC_TKV_SIZE) { + LM_ERR("failed to print the arguments for key: %s\n", pkey); + return -1; + } + + klen = strlen(pkey); + dsize = sizeof(async_task_t) + sizeof(async_tkv_param_t) + klen + 1 + n + 1; + at = (async_task_t *)shm_malloc(dsize); + if(at == NULL) { + SHM_MEM_ERROR; + return -1; + } + memset(at, 0, dsize); + at->exec = async_exec_tkv; + at->param = (char *)at + sizeof(async_task_t); + adp = (async_tkv_param_t *)at->param; + adp->dtype = dtype; + adp->skey.s = (char *)adp + sizeof(async_tkv_param_t); + adp->skey.len = klen; + memcpy(adp->skey.s, pkey, klen); + adp->skey.len = klen; + adp->sval.s = (char *)adp->skey.s + klen + 1; + memcpy(adp->sval.s, buf, n); + adp->sval.len = n; + + if(async_task_group_send(_async_tkv_awg, at) < 0) { + LM_ERR("failed to send task with key: %s\n", pkey); + shm_free(at); + return -1; + } + + return 0; +} diff --git a/src/core/async_task.h b/src/core/async_task.h index 58386bba8bd..b4276c2d27c 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -58,4 +58,15 @@ async_wgroup_t *async_task_group_find(str *gname); int async_task_group_push(str *gname, async_task_t *task); int async_task_group_send(async_wgroup_t *awg, async_task_t *task); +typedef struct async_tkv_param +{ + int dtype; + str skey; + str sval; +} async_tkv_param_t; + +#define KSR_ASYNC_TKV_SIZE 512 +void async_tkv_init(void); +int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); + #endif

1 month

git:master:ecb99f2f: jwt: add fixup_free* to exported functions

by Federico Cabiddu

Module: kamailio Branch: master Commit: ecb99f2ff1babe3871af5fba7d7f94e8b0df68cd URL: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:37:09+01:00 jwt: add fixup_free* to exported functions --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… Patch: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 90d8fa5bd03..64c78e63555 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -65,39 +65,45 @@ typedef struct jwt_fcache static jwt_fcache_t *_jwt_fcache_list = NULL; -static cmd_export_t cmds[] = {{"jwt_generate", (cmd_function)w_jwt_generate_4, - 4, fixup_spve_all, 0, ANY_ROUTE}, - {"jwt_generate", (cmd_function)w_jwt_generate_3, 3, fixup_spve_all, 0, - ANY_ROUTE}, - {"jwt_verify", (cmd_function)w_jwt_verify, 4, fixup_spve_all, 0, - ANY_ROUTE}, - {"jwt_verify_key", (cmd_function)w_jwt_verify_key, 4, fixup_spve_all, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"key_mode", PARAM_INT, &_jwt_key_mode}, +/* clang-format off */ +static cmd_export_t cmds[] = { + {"jwt_generate", (cmd_function)w_jwt_generate_4, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_generate", (cmd_function)w_jwt_generate_3, 3, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_verify", (cmd_function)w_jwt_verify, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_verify_key", (cmd_function)w_jwt_verify_key, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; - {0, 0, 0}}; +static param_export_t params[] = { + {"key_mode", PARAM_INT, &_jwt_key_mode}, + {0, 0, 0} +}; static int jwt_pv_get(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int jwt_pv_parse_name(pv_spec_t *sp, str *in); static pv_export_t mod_pvs[] = { - {{"jwt", sizeof("jwt") - 1}, PVT_OTHER, jwt_pv_get, 0, - jwt_pv_parse_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"jwt", sizeof("jwt") - 1}, PVT_OTHER, jwt_pv_get, 0, + jwt_pv_parse_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "jwt", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - mod_pvs, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "jwt", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + mod_pvs, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 month

git:master:20a2d57e: jsonrpcs: add fixup_free* to exported functions

by Federico Cabiddu

Module: kamailio Branch: master Commit: 20a2d57e295c6329c0f8358f36915cd6a4cd5783 URL: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:33:45+01:00 jsonrpcs: add fixup_free* to exported functions --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… Patch: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index ec8c8f4ad17..3400869249a 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -141,34 +141,38 @@ static rpc_t func_param; char jsonrpc_error_buf[JSONRPC_ERROR_REASON_BUF_LEN]; +/* clang-format off */ static cmd_export_t cmds[] = { - {"jsonrpc_dispatch", (cmd_function)jsonrpc_dispatch, 0, 0, 0, - REQUEST_ROUTE}, - {"jsonrpc_exec", (cmd_function)jsonrpc_exec, 1, fixup_spve_null, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"jsonrpc_dispatch", (cmd_function)jsonrpc_dispatch, 0, 0, 0, + REQUEST_ROUTE}, + {"jsonrpc_exec", (cmd_function)jsonrpc_exec, 1, fixup_spve_null, fixup_free_spve_null, + ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"pretty_format", PARAM_INT, &jsonrpc_pretty_format}, - {"transport", PARAM_INT, &jsonrpc_transport}, - {"fifo_name", PARAM_STRING, &jsonrpc_fifo}, - {"fifo_mode", PARAM_INT, &jsonrpc_fifo_mode}, - {"fifo_group", PARAM_STRING, &jsonrpc_fifo_gid_s}, - {"fifo_group", PARAM_INT, &jsonrpc_fifo_gid}, - {"fifo_user", PARAM_STRING, &jsonrpc_fifo_uid_s}, - {"fifo_user", PARAM_INT, &jsonrpc_fifo_uid}, - {"fifo_reply_dir", PARAM_STRING, &jsonrpc_fifo_reply_dir}, - {"dgram_socket", PARAM_STRING, &jsonrpc_dgram_socket}, - {"dgram_workers", PARAM_INT, &jsonrpc_dgram_workers}, - {"dgram_timeout", PARAM_INT, &jsonrpc_dgram_timeout}, - {"dgram_mode", PARAM_INT, &jsonrpc_dgram_unix_socket_mode}, - {"dgram_group", PARAM_STRING, &jsonrpc_dgram_unix_socket_gid_s}, - {"dgram_group", PARAM_INT, &jsonrpc_dgram_unix_socket_gid}, - {"dgram_user", PARAM_STRING, &jsonrpc_dgram_unix_socket_uid_s}, - {"dgram_user", PARAM_INT, &jsonrpc_dgram_unix_socket_uid}, - {"tcp_socket", PARAM_STRING, &jsonrpc_tcp_socket}, - - {0, 0, 0}}; + {"pretty_format", PARAM_INT, &jsonrpc_pretty_format}, + {"transport", PARAM_INT, &jsonrpc_transport}, + {"fifo_name", PARAM_STRING, &jsonrpc_fifo}, + {"fifo_mode", PARAM_INT, &jsonrpc_fifo_mode}, + {"fifo_group", PARAM_STRING, &jsonrpc_fifo_gid_s}, + {"fifo_group", PARAM_INT, &jsonrpc_fifo_gid}, + {"fifo_user", PARAM_STRING, &jsonrpc_fifo_uid_s}, + {"fifo_user", PARAM_INT, &jsonrpc_fifo_uid}, + {"fifo_reply_dir", PARAM_STRING, &jsonrpc_fifo_reply_dir}, + {"dgram_socket", PARAM_STRING, &jsonrpc_dgram_socket}, + {"dgram_workers", PARAM_INT, &jsonrpc_dgram_workers}, + {"dgram_timeout", PARAM_INT, &jsonrpc_dgram_timeout}, + {"dgram_mode", PARAM_INT, &jsonrpc_dgram_unix_socket_mode}, + {"dgram_group", PARAM_STRING, &jsonrpc_dgram_unix_socket_gid_s}, + {"dgram_group", PARAM_INT, &jsonrpc_dgram_unix_socket_gid}, + {"dgram_user", PARAM_STRING, &jsonrpc_dgram_unix_socket_uid_s}, + {"dgram_user", PARAM_INT, &jsonrpc_dgram_unix_socket_uid}, + {"tcp_socket", PARAM_STRING, &jsonrpc_tcp_socket}, + + {0, 0, 0} +}; +/* clang-format on */ static int jsonrpc_pv_get_jrpl( sip_msg_t *msg, pv_param_t *param, pv_value_t *res);

1 month

git:master:436e7921: jsonrpcc: reformat exported structures

by Federico Cabiddu

Module: kamailio Branch: master Commit: 436e79216a448b0a270a53f867d89b84269557d9 URL: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:31:36+01:00 jsonrpcc: reformat exported structures --- Modified: src/modules/jsonrpcc/jsonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… Patch: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… --- diff --git a/src/modules/jsonrpcc/jsonrpcc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c index f374cf4f8c8..308c0f6432e 100644 --- a/src/modules/jsonrpcc/jsonrpcc_mod.c +++ b/src/modules/jsonrpcc/jsonrpcc_mod.c @@ -55,15 +55,16 @@ extern int _jsonrpcc_max_conn_retry; /* max retries to connect */ struct tm_binds tmb; +/* clang-format off */ /* * Exported Functions */ static cmd_export_t cmds[] = { - {"jsonrpc_request", (cmd_function)jsonrpc_request, 5, fixup_request, - fixup_request_free, ANY_ROUTE}, - {"jsonrpc_notification", (cmd_function)jsonrpc_notification, 2, - fixup_notification, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"jsonrpc_request", (cmd_function)jsonrpc_request, 5, fixup_request, + fixup_request_free, ANY_ROUTE}, + {"jsonrpc_notification", (cmd_function)jsonrpc_notification, 2, fixup_notification, + fixup_free_spve_null, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; /* @@ -77,17 +78,18 @@ static param_export_t mod_params[] = {{"servers", PARAM_STRING, &servers_param}, * Exports */ struct module_exports exports = { - "jsonrpcc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - mod_params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "jsonrpcc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + mod_params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format off */ static int mod_init(void)

1 month

git:master:a9acbdd9: json: reformat exported structures

by Federico Cabiddu

Module: kamailio Branch: master Commit: a9acbdd92032dc8adf2f2aa5a584a8a188bc9e7a URL: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:26:40+01:00 json: reformat exported structures --- Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… Patch: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… --- diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 89b5d580fe1..d267e5029c7 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -38,33 +38,35 @@ static int fixup_get_field_free(void **param, int param_no); str tr_json_escape_str = str_init("%"); char tr_json_escape_char = '%'; +/* clang-format off */ /* Exported functions */ static tr_export_t mod_trans[] = { - {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; + {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; static cmd_export_t cmds[] = { - {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, - fixup_get_field_free, ANY_ROUTE}, - {"json_get_string", (cmd_function)json_get_string, 3, fixup_get_field, - fixup_get_field_free, ANY_ROUTE}, - {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"json_get_string", (cmd_function)json_get_string, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; struct module_exports exports = { - "json", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - 0, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "json", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ int _json_extract_field(struct json_object *json_obj, char *json_name, str *val) {

1 month

git:master:8328024c: janssonrpcc: reformat exported structures

by Federico Cabiddu

Module: kamailio Branch: master Commit: 8328024cd41b2c8a3cffa69db28ab21eed47b2c5 URL: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T11:57:40+01:00 janssonrpcc: reformat exported structures --- Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… Patch: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… --- diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index 703f055a9cf..d36b0193878 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -71,56 +71,57 @@ jansson_to_val_f jsontoval; pv_spec_t jsonrpc_result_pv; #endif + +/* clang-format off */ /* * Exported Functions */ -int jsonrpc_request_no_options( - struct sip_msg *msg, char *conn, char *method, char *params) -{ +int jsonrpc_request_no_options(struct sip_msg *msg, char *conn, char *method, char *params) { return jsonrpc_request(msg, conn, method, params, NULL); } static cmd_export_t cmds[] = { - {"janssonrpc_request", (cmd_function)jsonrpc_request, 4, fixup_req, - fixup_req_free, ANY_ROUTE}, - {"jsansonrpc_request", (cmd_function)jsonrpc_request_no_options, 3, - fixup_req, fixup_req_free, ANY_ROUTE}, - {"janssonrpc_notification", (cmd_function)jsonrpc_notification, 3, - fixup_notify, fixup_notify_free, ANY_ROUTE}, - {"mod_janssonrpc_request", (cmd_function)mod_jsonrpc_request, 0, 0, 0, - 0}, - {0, 0, 0, 0, 0, 0}}; + {"janssonrpc_request", (cmd_function)jsonrpc_request, 4, fixup_req, + fixup_req_free, ANY_ROUTE}, + {"jsansonrpc_request", (cmd_function)jsonrpc_request_no_options, 3, + fixup_req, fixup_req_free, ANY_ROUTE}, + {"janssonrpc_notification", (cmd_function)jsonrpc_notification, 3, + fixup_notify, fixup_notify_free, ANY_ROUTE}, + {"mod_janssonrpc_request", (cmd_function)mod_jsonrpc_request, 0, 0, 0, + 0}, + {0, 0, 0, 0, 0, 0}}; /* * Script Parameters */ static param_export_t mod_params[] = { - {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)parse_server_param}, - {"retry_codes", PARAM_STRING | PARAM_USE_FUNC, - (void *)parse_retry_codes_param}, - {"min_srv_ttl", PARAM_INT | PARAM_USE_FUNC, - (void *)parse_min_ttl_param}, - {"result_pv", PARAM_STRING, &result_pv_str.s}, - {"keep_alive", PARAM_INT | PARAM_USE_FUNC, - (void *)parse_keep_alive_param}, - {0, 0, 0}}; + {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)parse_server_param}, + {"retry_codes", PARAM_STRING | PARAM_USE_FUNC, + (void *)parse_retry_codes_param}, + {"min_srv_ttl", PARAM_INT | PARAM_USE_FUNC, + (void *)parse_min_ttl_param}, + {"result_pv", PARAM_STRING, &result_pv_str.s}, + {"keep_alive", PARAM_INT | PARAM_USE_FUNC, + (void *)parse_keep_alive_param}, + {0, 0, 0}}; /* * Exports */ struct module_exports exports = { - "janssonrpcc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - mod_params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "janssonrpcc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + mod_params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 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 mod_init(void) {

1 month

git:master:e742232a: influxdb: add fixup_free* to exported functions

by Federico Cabiddu

Module: kamailio Branch: master Commit: e742232ab6646ced170ccda5209a4d3ca46103bc URL: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T11:47:05+01:00 influxdb: add fixup_free* to exported functions --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… Patch: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 5261b5ea5c4..0b6f2c53874 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -63,21 +63,21 @@ static void mod_destroy(void); /* clang-format off */ static cmd_export_t cmds[] = { {"influxdbc_measure", (cmd_function)w_influxdbc_measure, - 1, fixup_spve_null, 0, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"influxdbc_measureend", (cmd_function)w_influxdbc_measureend, 0, 0, 0, ANY_ROUTE}, {"influxdbc_sub", (cmd_function)w_influxdbc_sub, - 1, fixup_spve_null, 0, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"influxdbc_subend", (cmd_function)w_influxdbc_subend, 0, 0, 0, ANY_ROUTE}, {"influxdbc_push", (cmd_function)w_influxdbc_push, 0, 0, 0, ANY_ROUTE}, {"influxdbc_long", (cmd_function)w_influxdbc_long, - 2, fixup_spve_igp, 0, ANY_ROUTE}, + 2, fixup_spve_igp, fixup_free_spve_igp, ANY_ROUTE}, {"influxdbc_string", (cmd_function)w_influxdbc_string, - 2, fixup_spve_spve, 0, ANY_ROUTE}, + 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"influxdbc_double", (cmd_function)w_influxdbc_double, - 2, fixup_spve_spve, 0, ANY_ROUTE}, + 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"influxdbc_division", (cmd_function)w_influxdbc_division, 3, fixup_sii, fixup_free_sii, ANY_ROUTE},

1 month

[kamailio/kamailio] rtpengine: use to-tag for NG message when rtpp-flags (PR #4036)

by Donat Zenichev

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] 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:  - [X] PR should be backported to stable branches (v5.8.2, v5.8.3, v5.8.4) - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Always use to-tag for NG message with rtpp-flags, if presented. This change is caused by the processing logic being moved to rtpengine with rtpp-flags. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4036 -- Commit Summary -- * rtpengine: use to-tag for NG message when rtpp-flags -- File Changes -- M src/modules/rtpengine/rtpengine.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4036.patch https://github.com/kamailio/kamailio/pull/4036.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4036 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4036(a)github.com>

1 month

git:master:d92d12c0: rtpengine: use to-tag for NG message when rtpp-flags

by Victor Seva

Module: kamailio Branch: master Commit: d92d12c055d23c167d5caa38511e5ad3b0a06148 URL: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:19:49+01:00 rtpengine: use to-tag for NG message when rtpp-flags Always use to-tag for NG message with rtpp-flags, if presented. This change is caused by the processing logic being moved to rtpengine with rtpp-flags. --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… Patch: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7626af31f88..1d710b30324 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3187,7 +3187,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, */ /* affects to-tag parsing */ - ng_flags.to = (op == OP_DELETE) ? 0 : 1; + ng_flags.to = (!parse_by_module || op != OP_DELETE) ? 1 : 0; /* module specific parsing */ if(parse_by_module && flags && parse_flags(&ng_flags, msg, &op, flags->s))

1 month

git:master:8a46cb6b: async: removed unused param from async data processing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8a46cb6babed5384d09b3dfc07fe15940128d1a3 URL: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T11:16:18+01:00 async: removed unused param from async data processing --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… Patch: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 9d6b5da3cca..bd31880064f 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -577,7 +577,7 @@ int ki_async_task_group_data(sip_msg_t *msg, str *rn, str *gn, str *sdata) } } - if(async_send_data(msg, act, rn, gn, sdata) < 0) + if(async_send_data(act, rn, gn, sdata) < 0) return -1; /* ok */ return 1; diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 605118be3da..5fb8861a861 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -603,8 +603,7 @@ void async_exec_data(void *param) /** * */ -int async_send_data( - sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, str *sdata) +int async_send_data(cfg_action_t *act, str *cbname, str *gname, str *sdata) { async_task_t *at; int dsize; diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index 0dd268889a5..0b5466f8331 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -51,8 +51,7 @@ int async_ms_sleep( void async_mstimer_exec(unsigned int ticks, void *param); int async_send_task(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname); -int async_send_data( - sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, str *sdata); +int async_send_data(cfg_action_t *act, str *cbname, str *gname, str *sdata); int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_parse_async_name(pv_spec_t *sp, str *in);

1 month

← Newer
1
...
8
9
10
11
12
13
14
...
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