- sr-dev - kamailio.org

git:master:6b603c58: matrix: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 6b603c58be614fdf3798f29bff8dd8b5ebd4653e URL: https://github.com/kamailio/kamailio/commit/6b603c58be614fdf3798f29bff8dd8b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T17:13:29+01:00 matrix: reformat exported structures --- Modified: src/modules/matrix/matrix.c --- Diff: https://github.com/kamailio/kamailio/commit/6b603c58be614fdf3798f29bff8dd8b… Patch: https://github.com/kamailio/kamailio/commit/6b603c58be614fdf3798f29bff8dd8b… --- diff --git a/src/modules/matrix/matrix.c b/src/modules/matrix/matrix.c index d23369b7e12..271ab482c05 100644 --- a/src/modules/matrix/matrix.c +++ b/src/modules/matrix/matrix.c @@ -85,29 +85,33 @@ static int mod_init(void); static int child_init(int rank); static void mod_destroy(void); - +/* clang-format off */ static cmd_export_t cmds[] = { - {"matrix", (cmd_function)lookup_matrix, 3, matrix_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"matrix", (cmd_function)lookup_matrix, 3, + matrix_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {0, 0, 0, 0, 0, 0} + }; static param_export_t params[] = { - matrix_DB_URL matrix_DB_TABLE matrix_DB_COLS{0, 0, 0}}; - + matrix_DB_URL + matrix_DB_TABLE + matrix_DB_COLS + {0, 0, 0} +}; struct module_exports exports = { - "matrix", /* 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 */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "matrix", /* 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 */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ struct first_t

1 0

git:master:bb85dd83: maxfwd: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: bb85dd83c0ecd9877dd8dd8ad61fb38aa308c0ee URL: https://github.com/kamailio/kamailio/commit/bb85dd83c0ecd9877dd8dd8ad61fb38… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T17:11:11+01:00 maxfwd: reformat exported structures --- Modified: src/modules/maxfwd/maxfwd.c --- Diff: https://github.com/kamailio/kamailio/commit/bb85dd83c0ecd9877dd8dd8ad61fb38… Patch: https://github.com/kamailio/kamailio/commit/bb85dd83c0ecd9877dd8dd8ad61fb38… --- diff --git a/src/modules/maxfwd/maxfwd.c b/src/modules/maxfwd/maxfwd.c index 25e1d184a8c..1ddd162d20d 100644 --- a/src/modules/maxfwd/maxfwd.c +++ b/src/modules/maxfwd/maxfwd.c @@ -40,6 +40,12 @@ MODULE_VERSION +static int w_process_maxfwd_header(struct sip_msg *msg, char *str, char *str2); +static int is_maxfwd_lt(struct sip_msg *msg, char *slimit, char *foo); +static int mod_init(void); + +int bind_maxfwd(maxfwd_api_t *api); + /* clang-format off */ struct cfg_group_maxfwd { int max_limit; @@ -52,16 +58,10 @@ static struct cfg_group_maxfwd default_maxfwd_cfg = { static void *maxfwd_cfg = &default_maxfwd_cfg; static cfg_def_t maxfwd_cfg_def[] = { - {"max_limit", CFG_VAR_INT, 0, 255, 0, 0, "Max. maxfwd limit"}, - {0, 0, 0, 0, 0, 0} + {"max_limit", CFG_VAR_INT, 0, 255, 0, 0, "Max. maxfwd limit"}, + {0, 0, 0, 0, 0, 0} }; -static int w_process_maxfwd_header(struct sip_msg* msg,char* str,char* str2); -static int is_maxfwd_lt(struct sip_msg *msg, char *slimit, char *foo); -static int mod_init(void); - -int bind_maxfwd(maxfwd_api_t *api); - static cmd_export_t cmds[]={ {"maxfwd_process", (cmd_function)w_process_maxfwd_header, 1, fixup_var_int_1, 0, REQUEST_ROUTE}, @@ -69,7 +69,6 @@ static cmd_export_t cmds[]={ fixup_var_int_1, 0, REQUEST_ROUTE}, {"process_maxfwd", (cmd_function)w_process_maxfwd_header, 1, fixup_var_int_1, 0, REQUEST_ROUTE}, - {"is_maxfwd_lt", (cmd_function)is_maxfwd_lt, 1, fixup_var_int_1, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"maxfwd_at_least", (cmd_function)is_maxfwd_lt, 1, @@ -77,18 +76,15 @@ static cmd_export_t cmds[]={ {"mf_lowlimit", (cmd_function)is_maxfwd_lt, 1, fixup_var_int_1, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"bind_maxfwd", (cmd_function)bind_maxfwd, 0, - 0, 0, 0}, + {"bind_maxfwd", (cmd_function)bind_maxfwd, 0, 0, 0, 0}, {0,0,0,0,0,0} }; static param_export_t params[]={ - {"max_limit", PARAM_INT, &default_maxfwd_cfg.max_limit}, + {"max_limit", PARAM_INT, &default_maxfwd_cfg.max_limit}, {0,0,0} }; - - struct module_exports exports= { "maxfwd", DEFAULT_DLFLAGS, /* dlopen flags */

1 0

git:master:f5161b71: mediaproxy: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: f5161b71a36c433370a44ec6ef2973c5f93aa8c1 URL: https://github.com/kamailio/kamailio/commit/f5161b71a36c433370a44ec6ef2973c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T17:08:13+01:00 mediaproxy: reformat exported structures --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/f5161b71a36c433370a44ec6ef2973c… Patch: https://github.com/kamailio/kamailio/commit/f5161b71a36c433370a44ec6ef2973c… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 36070006f83..0ef21a955b4 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -219,35 +219,42 @@ static AVP_Param media_relay_avp = {str_init(MEDIA_RELAY_AVP_SPEC), {0}, 0}; // The AVP where the ICE candidate priority is stored (if defined) static AVP_Param ice_candidate_avp = {str_init(ICE_CANDIDATE_AVP_SPEC), {0}, 0}; -static cmd_export_t commands[] = { - {"engage_media_proxy", (cmd_function)w_EngageMediaProxy, 0, 0, 0, - REQUEST_ROUTE | BRANCH_ROUTE}, - {"use_media_proxy", (cmd_function)w_UseMediaProxy, 0, 0, 0, ANY_ROUTE}, - {"end_media_session", (cmd_function)w_EndMediaSession, 0, 0, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t parameters[] = { - {"disable", PARAM_INT, &mediaproxy_disabled}, - {"mediaproxy_socket", PARAM_STRING, &(mediaproxy_socket.name)}, - {"mediaproxy_timeout", PARAM_INT, &(mediaproxy_socket.timeout)}, - {"signaling_ip_avp", PARAM_STR, &(signaling_ip_avp.spec)}, - {"media_relay_avp", PARAM_STR, &(media_relay_avp.spec)}, - {"ice_candidate", PARAM_STR, &(ice_candidate)}, - {"ice_candidate_avp", PARAM_STR, &(ice_candidate_avp.spec)}, {0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"engage_media_proxy", (cmd_function)w_EngageMediaProxy, 0, + 0, 0, REQUEST_ROUTE | BRANCH_ROUTE}, + {"use_media_proxy", (cmd_function)w_UseMediaProxy, 0, + 0, 0, ANY_ROUTE}, + {"end_media_session", (cmd_function)w_EndMediaSession, 0, + 0, 0, ANY_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; + +static param_export_t params[] = { + {"disable", PARAM_INT, &mediaproxy_disabled}, + {"mediaproxy_socket", PARAM_STRING, &(mediaproxy_socket.name)}, + {"mediaproxy_timeout", PARAM_INT, &(mediaproxy_socket.timeout)}, + {"signaling_ip_avp", PARAM_STR, &(signaling_ip_avp.spec)}, + {"media_relay_avp", PARAM_STR, &(media_relay_avp.spec)}, + {"ice_candidate", PARAM_STR, &(ice_candidate)}, + {"ice_candidate_avp", PARAM_STR, &(ice_candidate_avp.spec)}, + {0, 0, 0} +}; struct module_exports exports = { - "mediaproxy", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - commands, /* cmd (cfg function) exports */ - parameters, /* 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 */ + "mediaproxy", /* 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 */ + 0 /* module destroy function */ }; +/* clang-format on */ // String processing functions

1 0

git:master:a47ebb63: memcached: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: a47ebb6349c40af7bbbc6dd90a3e8b05207c935c URL: https://github.com/kamailio/kamailio/commit/a47ebb6349c40af7bbbc6dd90a3e8b0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T17:04:34+01:00 memcached: reformat exported structures --- Modified: src/modules/memcached/memcached.c --- Diff: https://github.com/kamailio/kamailio/commit/a47ebb6349c40af7bbbc6dd90a3e8b0… Patch: https://github.com/kamailio/kamailio/commit/a47ebb6349c40af7bbbc6dd90a3e8b0… --- diff --git a/src/modules/memcached/memcached.c b/src/modules/memcached/memcached.c index 779b6ecceaf..bbb40a057b6 100644 --- a/src/modules/memcached/memcached.c +++ b/src/modules/memcached/memcached.c @@ -64,34 +64,48 @@ static void mod_destroy(void); /*! * Exported pseudo-variables */ +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"mct", sizeof("mct") - 1}, PVT_OTHER, pv_get_mcd_value, - pv_set_mcd_value, pv_parse_mcd_name, 0, 0, 0}, - {{"mcinc", sizeof("mcinc") - 1}, PVT_OTHER, pv_get_mcd_value, - pv_inc_mcd_value, pv_parse_mcd_name, 0, 0, 0}, - {{"mcdec", sizeof("mcdec") - 1}, PVT_OTHER, pv_get_mcd_value, - pv_dec_mcd_value, pv_parse_mcd_name, 0, 0, 0}, - {{"mctex", sizeof("mctex") - 1}, PVT_OTHER, pv_get_null, - pv_set_mcd_expire, pv_parse_mcd_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; - + {{"mct", sizeof("mct") - 1}, PVT_OTHER, pv_get_mcd_value, + pv_set_mcd_value, pv_parse_mcd_name, 0, 0, 0}, + {{"mcinc", sizeof("mcinc") - 1}, PVT_OTHER, pv_get_mcd_value, + pv_inc_mcd_value, pv_parse_mcd_name, 0, 0, 0}, + {{"mcdec", sizeof("mcdec") - 1}, PVT_OTHER, pv_get_mcd_value, + pv_dec_mcd_value, pv_parse_mcd_name, 0, 0, 0}, + {{"mctex", sizeof("mctex") - 1}, PVT_OTHER, pv_get_null, + pv_set_mcd_expire, pv_parse_mcd_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; /*! * Exported parameters */ -static param_export_t params[] = {{"servers", PARAM_STRING, &mcd_srv_str}, - {"expire", PARAM_INT, &mcd_expire}, - {"timeout", PARAM_INT, &mcd_timeout}, {"mode", PARAM_INT, &mcd_mode}, - {"memory", PARAM_INT, &mcd_memory}, - {"stringify", PARAM_INT, &mcd_stringify}, {0, 0, 0}}; - +static param_export_t params[] = { + {"servers", PARAM_STRING, &mcd_srv_str}, + {"expire", PARAM_INT, &mcd_expire}, + {"timeout", PARAM_INT, &mcd_timeout}, + {"mode", PARAM_INT, &mcd_mode}, + {"memory", PARAM_INT, &mcd_memory}, + {"stringify", PARAM_INT, &mcd_stringify}, + {0, 0, 0} +}; /*! * Module interface */ -struct module_exports exports = {"memcached", DEFAULT_DLFLAGS, 0, params, 0, - mod_pvs, 0, mod_init, 0, mod_destroy}; - +struct module_exports exports = { + "memcached", + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ +}; +/* clang-format on */ /*! * \brief Wrapper functions around our internal memory management for libmemcached (version >= 0.38) callback

1 0

git:master:552b8397: microhttpd: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 552b8397ecd110be3faf181f840803f6d8bf03dd URL: https://github.com/kamailio/kamailio/commit/552b8397ecd110be3faf181f840803f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T17:01:04+01:00 microhttpd: add fixup_free* to exported functions --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/552b8397ecd110be3faf181f840803f… Patch: https://github.com/kamailio/kamailio/commit/552b8397ecd110be3faf181f840803f… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index f1ee8334b8b..0ef4b36284e 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -52,7 +52,7 @@ static int w_mhttpd_send_reply( sip_msg_t *msg, char *pcode, char *preason, char *pctype, char *pbody); static int fixup_mhttpd_send_reply(void **param, int param_no); - +static int fixup_free_mhttpd_send_reply(void **param, int param_no); static int mod_init(void); static int child_init(int); @@ -70,8 +70,9 @@ static pv_export_t mod_pvs[] = { }; static cmd_export_t cmds[] = { - {"mhttpd_reply", (cmd_function)w_mhttpd_send_reply, - 4, fixup_mhttpd_send_reply, 0, REQUEST_ROUTE|EVENT_ROUTE}, + {"mhttpd_reply", (cmd_function)w_mhttpd_send_reply, 4, + fixup_mhttpd_send_reply, fixup_free_mhttpd_send_reply, + REQUEST_ROUTE|EVENT_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -432,6 +433,19 @@ static int fixup_mhttpd_send_reply(void **param, int param_no) return 0; } +static int fixup_free_mhttpd_send_reply(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_igp_null(param, 1); + } else if(param_no == 2) { + return fixup_free_spve_null(param, 1); + } else if(param_no == 3) { + return fixup_free_spve_null(param, 1); + } else if(param_no == 4) { + return fixup_free_spve_null(param, 1); + } + return 0; +} static enum MHD_Result ksr_microhttpd_request(void *cls, struct MHD_Connection *connection, const char *url, const char *method,

1 0

git:master:4ba15a7d: misc_radius: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 4ba15a7db033b699008885473a3f8c72811975ce URL: https://github.com/kamailio/kamailio/commit/4ba15a7db033b699008885473a3f8c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T16:51:26+01:00 misc_radius: add fixup_free* to exported functions --- Modified: src/modules/misc_radius/misc_radius.c --- Diff: https://github.com/kamailio/kamailio/commit/4ba15a7db033b699008885473a3f8c7… Patch: https://github.com/kamailio/kamailio/commit/4ba15a7db033b699008885473a3f8c7… --- diff --git a/src/modules/misc_radius/misc_radius.c b/src/modules/misc_radius/misc_radius.c index 9de465a2122..b0928bd62d8 100644 --- a/src/modules/misc_radius/misc_radius.c +++ b/src/modules/misc_radius/misc_radius.c @@ -79,26 +79,23 @@ struct val uri_vals[UV_STATIC_MAX]; /* clang-format off */ static cmd_export_t cmds[] = { {"radius_load_caller_avps", (cmd_function)radius_load_caller_avps, 1, - fixup_spve_null, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"radius_load_callee_avps", (cmd_function)radius_load_callee_avps, 1, - fixup_spve_null, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"radius_is_user_in", (cmd_function)radius_is_user_in, 2, - fixup_spve_spve, 0, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, - {"radius_does_uri_exist", (cmd_function)radius_does_uri_exist_0, - 0, 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"radius_does_uri_exist", (cmd_function)radius_does_uri_exist_1, - 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|LOCAL_ROUTE}, - {"radius_does_uri_user_exist", - (cmd_function)radius_does_uri_user_exist_0, - 0, 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"radius_does_uri_user_exist", - (cmd_function)radius_does_uri_user_exist_1, - 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|LOCAL_ROUTE}, + {"radius_does_uri_exist", (cmd_function)radius_does_uri_exist_0, 0, + 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"radius_does_uri_exist", (cmd_function)radius_does_uri_exist_1, 1, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|LOCAL_ROUTE}, + {"radius_does_uri_user_exist", (cmd_function)radius_does_uri_user_exist_0, 0, + 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"radius_does_uri_user_exist", (cmd_function)radius_does_uri_user_exist_1, 1, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0} }; - /* * Exported parameters */ @@ -117,7 +114,6 @@ static param_export_t params[] = { {0, 0, 0} }; - struct module_exports exports = { "misc_radius", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */

1 0

git:master:2b73d787: mohqueue: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 2b73d78789683388e5c93b4516e97b467178a25b URL: https://github.com/kamailio/kamailio/commit/2b73d78789683388e5c93b4516e97b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T16:45:46+01:00 mohqueue: add fixup_free* to exported functions --- Modified: src/modules/mohqueue/mohqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2b73d78789683388e5c93b4516e97b4… Patch: https://github.com/kamailio/kamailio/commit/2b73d78789683388e5c93b4516e97b4… --- diff --git a/src/modules/mohqueue/mohqueue_mod.c b/src/modules/mohqueue/mohqueue_mod.c index 1151b575786..b68e9a97794 100644 --- a/src/modules/mohqueue/mohqueue_mod.c +++ b/src/modules/mohqueue/mohqueue_mod.c @@ -32,7 +32,8 @@ MODULE_VERSION * local function declarations **********/ -int fixup_count(void **, int); +static int fixup_count(void **, int); +static int fixup_free_count(void **param, int param_no); static int mod_child_init(int); static void mod_destroy(void); static int mod_init(void); @@ -63,10 +64,10 @@ static cmd_export_t mod_cmds[] = { {"mohq_process", (cmd_function)mohq_process, 0, 0, 0, REQUEST_ROUTE}, {"mohq_retrieve", (cmd_function)mohq_retrieve, 2, - fixup_spve_spve, 0, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"mohq_send", (cmd_function)mohq_send, 1, - fixup_spve_spve, 0, REQUEST_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {NULL, NULL, -1, 0, 0}, }; @@ -131,7 +132,7 @@ str prtpstat[1] = {STR_STATIC_INIT("$rtpstat")}; * OUTPUT: -1 if failed; 0 if saved as pv_elem_t **********/ -int fixup_count(void **param, int param_no) +static int fixup_count(void **param, int param_no) { if(param_no == 1) { @@ -143,6 +144,18 @@ int fixup_count(void **param, int param_no) return 0; } +static int fixup_free_count(void **param, int param_no) + +{ + if(param_no == 1) { + return fixup_free_spve_spve(param, 1); + } + if(param_no == 2) { + return fixup_free_pvar_null(param, 1); + } + return 0; +} + /********** * Configuration Initialization *

1 0

git:master:155d6005: mohqueue: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 155d6005c52c85199deffd1357dc361af21e3862 URL: https://github.com/kamailio/kamailio/commit/155d6005c52c85199deffd1357dc361… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T16:43:01+01:00 mohqueue: reformat exported structures --- Modified: src/modules/mohqueue/mohqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/155d6005c52c85199deffd1357dc361… Patch: https://github.com/kamailio/kamailio/commit/155d6005c52c85199deffd1357dc361… --- diff --git a/src/modules/mohqueue/mohqueue_mod.c b/src/modules/mohqueue/mohqueue_mod.c index 09c74c0c475..1151b575786 100644 --- a/src/modules/mohqueue/mohqueue_mod.c +++ b/src/modules/mohqueue/mohqueue_mod.c @@ -47,19 +47,6 @@ pv_spec_t *prtp_pv; /********** * module exports **********/ - -/* COMMANDS */ -static cmd_export_t mod_cmds[] = { - {"mohq_count", (cmd_function)mohq_count, 2, fixup_count, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, - {"mohq_process", (cmd_function)mohq_process, 0, NULL, 0, REQUEST_ROUTE}, - {"mohq_retrieve", (cmd_function)mohq_retrieve, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, - {"mohq_send", (cmd_function)mohq_send, 1, fixup_spve_spve, 0, - REQUEST_ROUTE}, - {NULL, NULL, -1, 0, 0}, -}; - /* PARAMETERS */ str db_url = str_init(DEFAULT_DB_URL); str db_ctable = str_init("mohqcalls"); @@ -67,43 +54,63 @@ str db_qtable = str_init("mohqueues"); char *mohdir = ""; int moh_maxcalls = 50; +/* clang-format off */ +/* COMMANDS */ +static cmd_export_t mod_cmds[] = { + {"mohq_count", (cmd_function)mohq_count, 2, + fixup_count, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, + {"mohq_process", (cmd_function)mohq_process, 0, + 0, 0, REQUEST_ROUTE}, + {"mohq_retrieve", (cmd_function)mohq_retrieve, 2, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, + {"mohq_send", (cmd_function)mohq_send, 1, + fixup_spve_spve, 0, REQUEST_ROUTE}, + {NULL, NULL, -1, 0, 0}, +}; + static param_export_t mod_parms[] = { - {"db_url", PARAM_STR, &db_url}, - {"db_ctable", PARAM_STR, &db_ctable}, - {"db_qtable", PARAM_STR, &db_qtable}, - {"mohdir", PARAM_STRING, &mohdir}, - {"moh_maxcalls", PARAM_INT, &moh_maxcalls}, - {NULL, 0, NULL}, + {"db_url", PARAM_STR, &db_url}, + {"db_ctable", PARAM_STR, &db_ctable}, + {"db_qtable", PARAM_STR, &db_qtable}, + {"mohdir", PARAM_STRING, &mohdir}, + {"moh_maxcalls", PARAM_INT, &moh_maxcalls}, + {NULL, 0, NULL}, }; static const char *mohqueue_rpc_debug_doc[] = { - "Toggle mohqueue debug mode. Parameters: queue name, state (0=off, " - "<>0=on)", - 0}; + "Toggle mohqueue debug mode. Parameters: queue name, state (0=off, <>0=on)", + 0 +}; static const char *mohqueue_rpc_drop_call_doc[] = { - "Drop a mohqueue call. Parameters: queue name, callID (*=all)", 0}; + "Drop a mohqueue call. Parameters: queue name, callID (*=all)", + 0 +}; /* RPC COMMANDS */ rpc_export_t mohqueue_rpc[] = { - {"mohqueue.debug", mohqueue_rpc_debug, mohqueue_rpc_debug_doc, 0}, - {"mohqueue.drop_call", mohqueue_rpc_drop_call, - mohqueue_rpc_drop_call_doc, 0}, - {0, 0, 0, 0}}; + {"mohqueue.debug", mohqueue_rpc_debug, mohqueue_rpc_debug_doc, 0}, + {"mohqueue.drop_call", mohqueue_rpc_drop_call, + mohqueue_rpc_drop_call_doc, 0}, + {0, 0, 0, 0} +}; /* MODULE EXPORTS */ struct module_exports exports = { - "mohqueue", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - mod_cmds, /* exported functions */ - mod_parms, /* exported parameters */ - 0, /* RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - mod_child_init, /* per-child initialization function */ - mod_destroy /* destructor function */ + "mohqueue", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + mod_cmds, /* exported functions */ + mod_parms, /* exported parameters */ + 0, /* RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child initialization function */ + mod_destroy /* destructor function */ }; +/* clang-format on */ /********** * local constants

1 0

git:master:039a79a0: mqtt: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 039a79a00e2eb34b9e61e30848f4d1bb07d68f4c URL: https://github.com/kamailio/kamailio/commit/039a79a00e2eb34b9e61e30848f4d1b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T16:40:27+01:00 mqtt: add fixup_free* to exported functions --- Modified: src/modules/mqtt/mqtt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/039a79a00e2eb34b9e61e30848f4d1b… Patch: https://github.com/kamailio/kamailio/commit/039a79a00e2eb34b9e61e30848f4d1b… --- diff --git a/src/modules/mqtt/mqtt_mod.c b/src/modules/mqtt/mqtt_mod.c index f332263983f..2ce4c4772bb 100644 --- a/src/modules/mqtt/mqtt_mod.c +++ b/src/modules/mqtt/mqtt_mod.c @@ -57,10 +57,12 @@ static int child_init(int); static int cmd_mqtt_publish( sip_msg_t *msg, char *topic, char *payload, char *qos); static int fixup_mqtt_publish(void **param, int param_no); +static int fixup_free_mqtt_publish(void **param, int param_no); static int ki_mqtt_publish(sip_msg_t *msg, str *topic, str *payload, int qos); static int cmd_mqtt_subscribe(sip_msg_t *msg, char *topic, char *qos); static int fixup_mqtt_subscribe(void **param, int param_no); +static int fixup_free_mqtt_subscribe(void **param, int param_no); static int ki_mqtt_subscribe(sip_msg_t *msg, str *topic, int qos); static int cmd_mqtt_unsubscribe(sip_msg_t *msg, char *topic); @@ -69,11 +71,11 @@ static int ki_mqtt_unsubscribe(sip_msg_t *msg, str *topic); /* clang-format off */ static cmd_export_t cmds[] = { {"mqtt_publish", (cmd_function)cmd_mqtt_publish, 3, - fixup_mqtt_publish, 0, ANY_ROUTE}, + fixup_mqtt_publish, fixup_free_mqtt_publish, ANY_ROUTE}, {"mqtt_subscribe", (cmd_function)cmd_mqtt_subscribe, 2, - fixup_mqtt_subscribe, 0, ANY_ROUTE}, + fixup_mqtt_subscribe, fixup_free_mqtt_subscribe, ANY_ROUTE}, {"mqtt_unsubscribe", (cmd_function)cmd_mqtt_unsubscribe, 1, - fixup_spve_all, 0, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -289,6 +291,20 @@ static int fixup_mqtt_publish(void **param, int param_no) } } +static int fixup_free_mqtt_publish(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_free_spve_spve(param, param_no); + case 2: + return fixup_free_spve_spve(param, param_no); + case 3: + return 0; + default: + return -1; + } +} + /** * Subscribe to the given topic. * Mqtt qos levels 0, 1 and 2 can be used. @@ -353,6 +369,18 @@ static int fixup_mqtt_subscribe(void **param, int param_no) } } +static int fixup_free_mqtt_subscribe(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_free_spve_spve(param, param_no); + case 2: + return 0; + default: + return -1; + } +} + /** * Unsubscribe to a previously subscribed topic. * Used in cfg script.

1 0

git:master:89af5be1: mqtt: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 89af5be1124faade9aa33e58b7bf199ef2af3865 URL: https://github.com/kamailio/kamailio/commit/89af5be1124faade9aa33e58b7bf199… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T16:36:20+01:00 mqtt: reformat exported structures --- Modified: src/modules/mqtt/mqtt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/89af5be1124faade9aa33e58b7bf199… Patch: https://github.com/kamailio/kamailio/commit/89af5be1124faade9aa33e58b7bf199… --- diff --git a/src/modules/mqtt/mqtt_mod.c b/src/modules/mqtt/mqtt_mod.c index ca7d2009d90..f332263983f 100644 --- a/src/modules/mqtt/mqtt_mod.c +++ b/src/modules/mqtt/mqtt_mod.c @@ -66,49 +66,58 @@ static int ki_mqtt_subscribe(sip_msg_t *msg, str *topic, int qos); static int cmd_mqtt_unsubscribe(sip_msg_t *msg, char *topic); static int ki_mqtt_unsubscribe(sip_msg_t *msg, str *topic); -static cmd_export_t cmds[] = {{"mqtt_publish", (cmd_function)cmd_mqtt_publish, - 3, fixup_mqtt_publish, 0, ANY_ROUTE}, - {"mqtt_subscribe", (cmd_function)cmd_mqtt_subscribe, 2, - fixup_mqtt_subscribe, 0, ANY_ROUTE}, - {"mqtt_unsubscribe", (cmd_function)cmd_mqtt_unsubscribe, 1, - fixup_spve_all, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"host", PARAM_STRING, &_mqtt_host}, - {"port", PARAM_INT, &_mqtt_port}, {"id", PARAM_STRING, &_mqtt_id}, - {"username", PARAM_STRING, &_mqtt_username}, - {"password", PARAM_STRING, &_mqtt_password}, - {"will_topic", PARAM_STRING, &_mqtt_willtopic}, - {"will", PARAM_STRING, &_mqtt_will}, - {"keepalive", PARAM_INT, &_mqtt_keepalive}, - {"event_callback", PARAM_STR, &_mqtt_event_callback}, - {"tls_method", PARAM_STRING, &_mqtt_tls_method}, - {"tls_alpn", PARAM_STRING, &_mqtt_tls_alpn}, - {"ca_file", PARAM_STRING, &_mqtt_ca_file}, - {"ca_path", PARAM_STRING, &_mqtt_ca_path}, - {"certificate", PARAM_STRING, &_mqtt_certificate}, - {"private_key", PARAM_STRING, &_mqtt_private_key}, - {"verify_certificate", PARAM_INT, &_mqtt_verify_certificate}, - {"cipher_list", PARAM_STRING, &_mqtt_cipher_list}, {0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"mqtt_publish", (cmd_function)cmd_mqtt_publish, 3, + fixup_mqtt_publish, 0, ANY_ROUTE}, + {"mqtt_subscribe", (cmd_function)cmd_mqtt_subscribe, 2, + fixup_mqtt_subscribe, 0, ANY_ROUTE}, + {"mqtt_unsubscribe", (cmd_function)cmd_mqtt_unsubscribe, 1, + fixup_spve_all, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; + +static param_export_t params[] = { + {"host", PARAM_STRING, &_mqtt_host}, + {"port", PARAM_INT, &_mqtt_port}, + {"id", PARAM_STRING, &_mqtt_id}, + {"username", PARAM_STRING, &_mqtt_username}, + {"password", PARAM_STRING, &_mqtt_password}, + {"will_topic", PARAM_STRING, &_mqtt_willtopic}, + {"will", PARAM_STRING, &_mqtt_will}, + {"keepalive", PARAM_INT, &_mqtt_keepalive}, + {"event_callback", PARAM_STR, &_mqtt_event_callback}, + {"tls_method", PARAM_STRING, &_mqtt_tls_method}, + {"tls_alpn", PARAM_STRING, &_mqtt_tls_alpn}, + {"ca_file", PARAM_STRING, &_mqtt_ca_file}, + {"ca_path", PARAM_STRING, &_mqtt_ca_path}, + {"certificate", PARAM_STRING, &_mqtt_certificate}, + {"private_key", PARAM_STRING, &_mqtt_private_key}, + {"verify_certificate", PARAM_INT, &_mqtt_verify_certificate}, + {"cipher_list", PARAM_STRING, &_mqtt_cipher_list}, + {0, 0, 0} +}; static pv_export_t mod_pvs[] = { - {{"mqtt", (sizeof("mqtt") - 1)}, PVT_OTHER, pv_get_mqtt, pv_set_mqtt, - pv_parse_mqtt_name, 0, 0, 0}, + {{"mqtt", (sizeof("mqtt") - 1)}, PVT_OTHER, pv_get_mqtt, pv_set_mqtt, + pv_parse_mqtt_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "mqtt", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "mqtt", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /*! * \brief Module initialization function

1 0

git:master:0fd77b10: mqueue: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 0fd77b10b758d685b3ae27d0435e6b9d4bba82f5 URL: https://github.com/kamailio/kamailio/commit/0fd77b10b758d685b3ae27d0435e6b9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T16:05:51+01:00 mqueue: add fixup_free* to exported functions --- Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0fd77b10b758d685b3ae27d0435e6b9… Patch: https://github.com/kamailio/kamailio/commit/0fd77b10b758d685b3ae27d0435e6b9… --- diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 035b66015ff..f100091844e 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -52,6 +52,7 @@ static int w_mq_pv_free(struct sip_msg *msg, char *mq, char *str2); int mq_param(modparam_t type, void *val); int mq_param_name(modparam_t type, void *val); static int fixup_mq_add(void **param, int param_no); +static int fixup_free_mq_add(void **param, int param_no); static int bind_mq(mq_api_t *api); static int mqueue_rpc_init(void); @@ -72,13 +73,13 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"mq_fetch", (cmd_function)w_mq_fetch, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"mq_add", (cmd_function)w_mq_add, 3, - fixup_mq_add, 0, ANY_ROUTE}, + fixup_mq_add, fixup_free_mq_add, ANY_ROUTE}, {"mq_pv_free", (cmd_function)w_mq_pv_free, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"mq_size", (cmd_function)w_mq_size, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"bind_mq", (cmd_function)bind_mq, 1, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -312,6 +313,16 @@ static int fixup_mq_add(void **param, int param_no) return E_UNSPEC; } +static int fixup_free_mq_add(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2 || param_no == 3) { + return fixup_free_spve_null(param, 1); + } + + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; +} + static int bind_mq(mq_api_t *api) { if(!api)

1 0

git:master:704ca582: mqueue: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 704ca58226e63d90f8cd7ddc7b4f06efe8f18756 URL: https://github.com/kamailio/kamailio/commit/704ca58226e63d90f8cd7ddc7b4f06e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T16:04:34+01:00 mqueue: reformat exported structures --- Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/704ca58226e63d90f8cd7ddc7b4f06e… Patch: https://github.com/kamailio/kamailio/commit/704ca58226e63d90f8cd7ddc7b4f06e… --- diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 20a7b0b14b2..035b66015ff 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -59,42 +59,49 @@ static int mqueue_rpc_init(void); static int mqueue_size = 0; int mqueue_addmode = 0; - +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"mqk", sizeof("mqk") - 1}, PVT_OTHER, pv_get_mqk, 0, pv_parse_mq_name, - 0, 0, 0}, - {{"mqv", sizeof("mqv") - 1}, PVT_OTHER, pv_get_mqv, 0, pv_parse_mq_name, - 0, 0, 0}, - {{"mq_size", sizeof("mq_size") - 1}, PVT_OTHER, pv_get_mq_size, 0, - pv_parse_mq_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; - - -static cmd_export_t cmds[] = {{"mq_fetch", (cmd_function)w_mq_fetch, 1, - fixup_spve_null, 0, ANY_ROUTE}, - {"mq_add", (cmd_function)w_mq_add, 3, fixup_mq_add, 0, ANY_ROUTE}, - {"mq_pv_free", (cmd_function)w_mq_pv_free, 1, fixup_spve_null, 0, - ANY_ROUTE}, - {"mq_size", (cmd_function)w_mq_size, 1, fixup_spve_null, 0, ANY_ROUTE}, - {"bind_mq", (cmd_function)bind_mq, 1, 0, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"db_url", PARAM_STR, &mqueue_db_url}, - {"mqueue", PARAM_STRING | PARAM_USE_FUNC, (void *)mq_param}, - {"mqueue_name", PARAM_STRING | PARAM_USE_FUNC, (void *)mq_param_name}, - {"mqueue_size", PARAM_INT, &mqueue_size}, - {"mqueue_addmode", PARAM_INT, &mqueue_addmode}, {0, 0, 0}}; + {{"mqk", sizeof("mqk") - 1}, PVT_OTHER, pv_get_mqk, 0, pv_parse_mq_name, + 0, 0, 0}, + {{"mqv", sizeof("mqv") - 1}, PVT_OTHER, pv_get_mqv, 0, pv_parse_mq_name, + 0, 0, 0}, + {{"mq_size", sizeof("mq_size") - 1}, PVT_OTHER, pv_get_mq_size, 0, + pv_parse_mq_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; -struct module_exports exports = { - "mqueue", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, params, 0, /* exported RPC methods */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - 0, /* per child init function */ - mod_destroy /* destroy function */ +static cmd_export_t cmds[] = { + {"mq_fetch", (cmd_function)w_mq_fetch, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"mq_add", (cmd_function)w_mq_add, 3, + fixup_mq_add, 0, ANY_ROUTE}, + {"mq_pv_free", (cmd_function)w_mq_pv_free, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"mq_size", (cmd_function)w_mq_size, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"bind_mq", (cmd_function)bind_mq, 1, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} }; +static param_export_t params[] = { + {"db_url", PARAM_STR, &mqueue_db_url}, + {"mqueue", PARAM_STRING | PARAM_USE_FUNC, (void *)mq_param}, + {"mqueue_name", PARAM_STRING | PARAM_USE_FUNC, (void *)mq_param_name}, + {"mqueue_size", PARAM_INT, &mqueue_size}, + {"mqueue_addmode", PARAM_INT, &mqueue_addmode}, + {0, 0, 0} +}; + +struct module_exports exports = { + "mqueue", DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, params, 0, /* exported RPC methods */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + 0, /* per child init function */ + mod_destroy /* destroy function */ +}; +/* clang-format on */ /** * init module function

1 0

git:master:1a88127e: msrp: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 1a88127ede8245a96f469d7719a92ddd917a530e URL: https://github.com/kamailio/kamailio/commit/1a88127ede8245a96f469d7719a92dd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:56:09+01:00 msrp: add fixup_free* to exported functions --- Modified: src/modules/msrp/msrp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1a88127ede8245a96f469d7719a92dd… Patch: https://github.com/kamailio/kamailio/commit/1a88127ede8245a96f469d7719a92dd… --- diff --git a/src/modules/msrp/msrp_mod.c b/src/modules/msrp/msrp_mod.c index e468c7411ae..314d502a28f 100644 --- a/src/modules/msrp/msrp_mod.c +++ b/src/modules/msrp/msrp_mod.c @@ -96,25 +96,25 @@ static cmd_export_t cmds[] = { {"msrp_forward", (cmd_function)w_msrp_forward, 0, 0, 0, ANY_ROUTE}, {"msrp_forward", (cmd_function)w_msrp_forward1, 1, - fixup_spve_all, 0, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"msrp_forward", (cmd_function)w_msrp_forward2, 2, - fixup_spve_all, 0, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"msrp_relay", (cmd_function)w_msrp_relay, 0, 0, 0, ANY_ROUTE}, {"msrp_reply", (cmd_function)w_msrp_reply2, 2, fixup_spve_spve, 0, ANY_ROUTE}, {"msrp_reply", (cmd_function)w_msrp_reply3, 3, - fixup_spve_all, 0, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"msrp_is_request", (cmd_function)w_msrp_is_request, 0, 0, 0, ANY_ROUTE}, {"msrp_is_reply", (cmd_function)w_msrp_is_reply, 0, 0, 0, ANY_ROUTE}, {"msrp_set_dst", (cmd_function)w_msrp_set_dst, 2, - fixup_spve_all, 0, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"msrp_relay_flags", (cmd_function)w_msrp_relay_flags, 1, - fixup_igp_null, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"msrp_reply_flags", (cmd_function)w_msrp_reply_flags, 1, - fixup_igp_null, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"msrp_cmap_save", (cmd_function)w_msrp_cmap_save, 0, 0, 0, ANY_ROUTE}, {"msrp_cmap_lookup", (cmd_function)w_msrp_cmap_lookup, 0,

1 0

git:master:e658599e: msrp: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: e658599e737c9f2a5eb4384eebd119627a176cdb URL: https://github.com/kamailio/kamailio/commit/e658599e737c9f2a5eb4384eebd1196… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:55:08+01:00 msrp: reformat exported structures --- Modified: src/modules/msrp/msrp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e658599e737c9f2a5eb4384eebd1196… Patch: https://github.com/kamailio/kamailio/commit/e658599e737c9f2a5eb4384eebd1196…

1 0

git:master:2a8df7f1: mtree: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 2a8df7f1e7f77bcfac49a85d0d8c7b283de13be8 URL: https://github.com/kamailio/kamailio/commit/2a8df7f1e7f77bcfac49a85d0d8c7b2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:51:15+01:00 mtree: add fixup_free* to exported functions --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2a8df7f1e7f77bcfac49a85d0d8c7b2… Patch: https://github.com/kamailio/kamailio/commit/2a8df7f1e7f77bcfac49a85d0d8c7b2… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 2b8d2adc750..cc3f68d4a7e 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -108,6 +108,7 @@ static volatile int mt_reload_flag = 0; int mt_param(modparam_t type, void *val); static int fixup_mt_match(void **param, int param_no); +static int fixup_free_mt_match(void **param, int param_no); static int w_mt_match(struct sip_msg *msg, char *str1, char *str2, char *str3); static int mod_init(void); @@ -124,7 +125,7 @@ static int mt_load_db_trees(); /* clang-format off */ static cmd_export_t cmds[] = { {"mt_match", (cmd_function)w_mt_match, 3, - fixup_mt_match, 0, + fixup_mt_match, fixup_free_mt_match, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, {"bind_mtree", (cmd_function)bind_mtree, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -336,6 +337,17 @@ static int fixup_mt_match(void **param, int param_no) return fixup_igp_null(param, 1); } +static int fixup_free_mt_match(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) { + return fixup_free_spve_null(param, 1); + } + if(param_no != 3) { + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; + } + return fixup_free_igp_null(param, 1); +} /* use tree tn, match var, by mode, output in avp params */ static int mt_match(sip_msg_t *msg, str *tname, str *tomatch, int mval)

1 0

git:master:a7a38605: mtree: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: a7a386056040db183abdeff6492773141ca9a92c URL: https://github.com/kamailio/kamailio/commit/a7a386056040db183abdeff64927731… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:50:13+01:00 mtree: reformat exported structures --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a7a386056040db183abdeff64927731… Patch: https://github.com/kamailio/kamailio/commit/a7a386056040db183abdeff64927731… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index ca180d8b534..2b8d2adc750 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -121,40 +121,48 @@ static int mt_match(sip_msg_t *msg, str *tname, str *tomatch, int mval); static int mt_load_db(m_tree_t *pt); static int mt_load_db_trees(); +/* clang-format off */ static cmd_export_t cmds[] = { - {"mt_match", (cmd_function)w_mt_match, 3, fixup_mt_match, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, - {"bind_mtree", (cmd_function)bind_mtree, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"mt_match", (cmd_function)w_mt_match, 3, + fixup_mt_match, 0, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, + {"bind_mtree", (cmd_function)bind_mtree, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"mtree", PARAM_STRING | PARAM_USE_FUNC, (void *)mt_param}, - {"db_url", PARAM_STR, &db_url}, {"db_table", PARAM_STR, &db_table}, - {"tname_column", PARAM_STR, &tname_column}, - {"tprefix_column", PARAM_STR, &tprefix_column}, - {"tvalue_column", PARAM_STR, &tvalue_column}, - {"char_list", PARAM_STR, &mt_char_list}, - {"fetch_rows", PARAM_INT, &mt_fetch_rows}, - {"pv_value", PARAM_STR, &value_param}, - {"pv_values", PARAM_STR, &values_param}, - {"pv_dstid", PARAM_STR, &dstid_param}, - {"pv_weight", PARAM_STR, &weight_param}, - {"pv_count", PARAM_STR, &count_param}, - {"mt_tree_type", PARAM_INT, &_mt_tree_type}, - {"mt_ignore_duplicates", PARAM_INT, &_mt_ignore_duplicates}, - {"mt_allow_duplicates", PARAM_INT, &_mt_allow_duplicates}, {0, 0, 0}}; + {"mtree", PARAM_STRING | PARAM_USE_FUNC, (void *)mt_param}, + {"db_url", PARAM_STR, &db_url}, + {"db_table", PARAM_STR, &db_table}, + {"tname_column", PARAM_STR, &tname_column}, + {"tprefix_column", PARAM_STR, &tprefix_column}, + {"tvalue_column", PARAM_STR, &tvalue_column}, + {"char_list", PARAM_STR, &mt_char_list}, + {"fetch_rows", PARAM_INT, &mt_fetch_rows}, + {"pv_value", PARAM_STR, &value_param}, + {"pv_values", PARAM_STR, &values_param}, + {"pv_dstid", PARAM_STR, &dstid_param}, + {"pv_weight", PARAM_STR, &weight_param}, + {"pv_count", PARAM_STR, &count_param}, + {"mt_tree_type", PARAM_INT, &_mt_tree_type}, + {"mt_ignore_duplicates", PARAM_INT, &_mt_ignore_duplicates}, + {"mt_allow_duplicates", PARAM_INT, &_mt_allow_duplicates}, + {0, 0, 0} +}; struct module_exports exports = { - "mtree", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /*��exported��functions��*/ - params, /*��exported��functions��*/ - 0, /*��exported��RPC��methods��*/ - 0, /* exported pseudo-variables */ - 0, /* response��function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "mtree", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /*��exported��functions��*/ + params, /*��exported��functions��*/ + 0, /*��exported��RPC��methods��*/ + 0, /* exported pseudo-variables */ + 0, /* response��function */ + mod_init, /* module initialization function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; - +/* clang-format on */ /** * init module function

1 0

git:master:259935c2: nat_traversal: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 259935c2a2d5c367ef4773826bb69faec8256dee URL: https://github.com/kamailio/kamailio/commit/259935c2a2d5c367ef4773826bb69fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:23:15+01:00 nat_traversal: add fixup_free* to exported functions --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/259935c2a2d5c367ef4773826bb69fa… Patch: https://github.com/kamailio/kamailio/commit/259935c2a2d5c367ef4773826bb69fa… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index f3d687ff1d6..0f952f01d66 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -285,7 +285,7 @@ static cmd_export_t commands[] = { {"fix_contact", (cmd_function)w_FixContact, 0, 0, 0, ANY_ROUTE}, {"client_nat_test", (cmd_function)w_ClientNatTest, 1, - fixup_igp_null, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:0ebc38a4: nat_traversal: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 0ebc38a4834d74dfee8ff7326e516c01d7273472 URL: https://github.com/kamailio/kamailio/commit/0ebc38a4834d74dfee8ff7326e516c0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:22:53+01:00 nat_traversal: reformat exported structures --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/0ebc38a4834d74dfee8ff7326e516c0… Patch: https://github.com/kamailio/kamailio/commit/0ebc38a4834d74dfee8ff7326e516c0…

1 0

git:master:9dc92332: nathelper: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 9dc9233289d2518419438d38ac7d7b0abf4862a1 URL: https://github.com/kamailio/kamailio/commit/9dc9233289d2518419438d38ac7d7b0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:18:46+01:00 nathelper: add fixup_free* to exported functions --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/9dc9233289d2518419438d38ac7d7b0… Patch: https://github.com/kamailio/kamailio/commit/9dc9233289d2518419438d38ac7d7b0… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 6673370a5a8..ec543079f31 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -125,7 +125,9 @@ static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int fix_nated_register_f(struct sip_msg *, char *, char *); static int fixup_fix_nated_register(void **param, int param_no); static int fixup_fix_sdp(void **param, int param_no); +static int fixup_free_fix_sdp(void **param, int param_no); static int fixup_add_contact_alias(void **param, int param_no); +static int fixup_free_add_contact_alias(void **param, int param_no); static int add_rcv_param_f(struct sip_msg *, char *, char *); static int nh_sip_reply_received(sip_msg_t *msg); static int test_sdp_cline(struct sip_msg *msg); @@ -214,7 +216,7 @@ static cmd_export_t cmds[] = { 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"add_contact_alias", (cmd_function)add_contact_alias_3_f, 3, - fixup_add_contact_alias, 0, + fixup_add_contact_alias, fixup_free_add_contact_alias, REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"set_contact_alias", (cmd_function)set_contact_alias_f, 0, 0, 0, @@ -228,13 +230,13 @@ static cmd_export_t cmds[] = { fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"fix_nated_sdp", (cmd_function)fix_nated_sdp_f, 1, - fixup_fix_sdp, 0, + fixup_fix_sdp, fixup_free_fix_sdp, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"fix_nated_sdp", (cmd_function)fix_nated_sdp_f, 2, - fixup_fix_sdp, 0, + fixup_fix_sdp, fixup_free_fix_sdp, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"nat_uac_test", (cmd_function)nat_uac_test_f, 1, - fixup_igp_null, 0, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"fix_nated_register", (cmd_function)fix_nated_register_f, 0, fixup_fix_nated_register, 0, @@ -243,10 +245,10 @@ static cmd_export_t cmds[] = { 0, 0, REQUEST_ROUTE }, {"add_rcv_param", (cmd_function)add_rcv_param_f, 1, - fixup_igp_null, 0, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE }, {"is_rfc1918", (cmd_function)is_rfc1918_f, 1, - fixup_spve_null, 0, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE }, {"set_alias_to_pv", (cmd_function)w_set_alias_to_pv, 1, 0, 0, ANY_ROUTE }, @@ -333,6 +335,20 @@ static int fixup_fix_sdp(void **param, int param_no) return -1; } +static int fixup_free_fix_sdp(void **param, int param_no) +{ + if(param_no == 1) { + /* flags */ + return fixup_free_igp_null(param, param_no); + } + if(param_no == 2) { + /* new IP */ + return fixup_free_spve_all(param, param_no); + } + LM_ERR("unexpected param no: %d\n", param_no); + return -1; +} + static int fixup_fix_nated_register(void **param, int param_no) { if(rcv_avp_name.n == 0) { @@ -352,6 +368,15 @@ static int fixup_add_contact_alias(void **param, int param_no) return -1; } +static int fixup_free_add_contact_alias(void **param, int param_no) +{ + if((param_no >= 1) && (param_no <= 3)) + return fixup_free_spve_null(param, 1); + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + static void nathelper_rpc_enable_ping(rpc_t *rpc, void *ctx) { int value = 0;

1 0

git:master:6ca7a392: ndb_cassandra: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 6ca7a392708a1ea6a38c791591272bdf5b299832 URL: https://github.com/kamailio/kamailio/commit/6ca7a392708a1ea6a38c791591272bd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:14:30+01:00 ndb_cassandra: add fixup_free* to exported functions --- Modified: src/modules/ndb_cassandra/ndb_cassandra.c --- Diff: https://github.com/kamailio/kamailio/commit/6ca7a392708a1ea6a38c791591272bd… Patch: https://github.com/kamailio/kamailio/commit/6ca7a392708a1ea6a38c791591272bd… --- diff --git a/src/modules/ndb_cassandra/ndb_cassandra.c b/src/modules/ndb_cassandra/ndb_cassandra.c index 7de3d608fda..375e8bf3fd8 100644 --- a/src/modules/ndb_cassandra/ndb_cassandra.c +++ b/src/modules/ndb_cassandra/ndb_cassandra.c @@ -55,7 +55,7 @@ static void destroy(void); /* Fixups functions */ static int fixup_cass_insert(void **param, int param_no); - +static int fixup_free_cass_insert(void **param, int param_no); static int fixup_cass_retrieve(void **param, int param_no); static int free_fixup_cass_retrieve(void **param, int param_no); @@ -69,7 +69,7 @@ static int cass_retrieve_f(struct sip_msg *msg, char *keyspace, /* Exported functions */ static cmd_export_t cmds[] = { {"cass_insert", (cmd_function)cass_insert_f, 5, - fixup_cass_insert, 0, + fixup_cass_insert, fixup_free_cass_insert, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, {"cass_retrieve", (cmd_function)cass_retrieve_f, 5, fixup_cass_retrieve, free_fixup_cass_retrieve, @@ -137,6 +137,28 @@ static int fixup_cass_insert(void **param, int param_no) LM_ERR("invalid parameter number <%d>\n", param_no); return -1; } + +static int fixup_free_cass_insert(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } + if(param_no == 2) { + return fixup_free_spve_null(param, 1); + } + if(param_no == 3) { + return fixup_free_spve_null(param, 1); + } + if(param_no == 4) { + return fixup_free_spve_null(param, 1); + } + if(param_no == 5) { + return fixup_free_spve_null(param, 1); + } + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + /**/ static int fixup_cass_retrieve(void **param, int param_no) { @@ -171,20 +193,16 @@ static int fixup_cass_retrieve(void **param, int param_no) static int free_fixup_cass_retrieve(void **param, int param_no) { if(param_no == 1) { - LM_WARN("free function has not been defined for spve\n"); - return 0; + return fixup_free_spve_null(param, 1); } if(param_no == 2) { - LM_WARN("free function has not been defined for spve\n"); - return 0; + return fixup_free_spve_null(param, 1); } if(param_no == 3) { - LM_WARN("free function has not been defined for spve\n"); - return 0; + return fixup_free_spve_null(param, 1); } if(param_no == 4) { - LM_WARN("free function has not been defined for spve\n"); - return 0; + return fixup_free_spve_null(param, 1); } if(param_no == 5) { return fixup_free_pvar_null(param, 1);

1 0

git:master:8e2a41e5: ndb_cassandra: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 8e2a41e57ab428f64cc78a76ea4716186357b9d5 URL: https://github.com/kamailio/kamailio/commit/8e2a41e57ab428f64cc78a76ea47161… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:14:11+01:00 ndb_cassandra: reformat exported structures --- Modified: src/modules/ndb_cassandra/ndb_cassandra.c --- Diff: https://github.com/kamailio/kamailio/commit/8e2a41e57ab428f64cc78a76ea47161… Patch: https://github.com/kamailio/kamailio/commit/8e2a41e57ab428f64cc78a76ea47161… --- diff --git a/src/modules/ndb_cassandra/ndb_cassandra.c b/src/modules/ndb_cassandra/ndb_cassandra.c index eb748c914f9..7de3d608fda 100644 --- a/src/modules/ndb_cassandra/ndb_cassandra.c +++ b/src/modules/ndb_cassandra/ndb_cassandra.c @@ -65,31 +65,39 @@ static int cass_insert_f(struct sip_msg *msg, char *keyspace, static int cass_retrieve_f(struct sip_msg *msg, char *keyspace, char *column_family, char *key, char *column, char *value); +/* clang-format off */ /* Exported functions */ static cmd_export_t cmds[] = { - {"cass_insert", (cmd_function)cass_insert_f, 5, fixup_cass_insert, 0, - REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"cass_retrieve", (cmd_function)cass_retrieve_f, 5, fixup_cass_retrieve, - free_fixup_cass_retrieve, - REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"cass_insert", (cmd_function)cass_insert_f, 5, + fixup_cass_insert, 0, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"cass_retrieve", (cmd_function)cass_retrieve_f, 5, + fixup_cass_retrieve, free_fixup_cass_retrieve, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* Exported parameters */ static param_export_t params[] = { - {"host", PARAM_STR, &host}, {"port", PARAM_INT, &port}, {0, 0, 0}}; + {"host", PARAM_STR, &host}, + {"port", PARAM_INT, &port}, + {0, 0, 0} +}; /* Module interface */ struct module_exports exports = { - "ndb_cassandra", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function*/ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - destroy /* destroy function */ + "ndb_cassandra", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* Exported functions */ + params, /* Exported parameters */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function*/ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + destroy /* destroy function */ }; +/* clang-format on */ /* Module initialization function */ static int mod_init(void)

1 0

git:master:2e341d4d: ndb_mongodb: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 2e341d4d89f228e4f6910c564c16fde1d9a64b1a URL: https://github.com/kamailio/kamailio/commit/2e341d4d89f228e4f6910c564c16fde… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:01:30+01:00 ndb_mongodb: add fixup_free* to exported functions --- Modified: src/modules/ndb_mongodb/ndb_mongodb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2e341d4d89f228e4f6910c564c16fde… Patch: https://github.com/kamailio/kamailio/commit/2e341d4d89f228e4f6910c564c16fde… --- diff --git a/src/modules/ndb_mongodb/ndb_mongodb_mod.c b/src/modules/ndb_mongodb/ndb_mongodb_mod.c index 46cb8ec5045..6babeeaccd6 100644 --- a/src/modules/ndb_mongodb/ndb_mongodb_mod.c +++ b/src/modules/ndb_mongodb/ndb_mongodb_mod.c @@ -50,6 +50,7 @@ static int w_mongodb_cmd_simple(sip_msg_t *msg, char *ssrv, char *sdname, static int w_mongodb_cmd(sip_msg_t *msg, char *ssrv, char *sdname, char *scname, char *scmd, char *sres); static int fixup_mongodb_cmd(void **param, int param_no); +static int fixup_free_mongodb_cmd(void **param, int param_no); static int w_mongodb_free_reply(struct sip_msg *msg, char *res); static int w_mongodb_next_reply(struct sip_msg *msg, char *res); @@ -69,17 +70,17 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"mongodb_find", (cmd_function)w_mongodb_find, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, + fixup_mongodb_cmd, fixup_free_mongodb_cmd, ANY_ROUTE}, {"mongodb_find_one", (cmd_function)w_mongodb_find_one, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, + fixup_mongodb_cmd, fixup_free_mongodb_cmd, ANY_ROUTE}, {"mongodb_cmd_simple", (cmd_function)w_mongodb_cmd_simple, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, + fixup_mongodb_cmd, fixup_free_mongodb_cmd, ANY_ROUTE}, {"mongodb_cmd", (cmd_function)w_mongodb_cmd, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, + fixup_mongodb_cmd, fixup_free_mongodb_cmd, ANY_ROUTE}, {"mongodb_free", (cmd_function)w_mongodb_free_reply, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"mongodb_next", (cmd_function)w_mongodb_next_reply, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"bind_ndb_mongodb", (cmd_function)bind_ndb_mongodb, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -250,6 +251,11 @@ static int fixup_mongodb_cmd(void **param, int param_no) return fixup_spve_null(param, 1); } +static int fixup_free_mongodb_cmd(void **param, int param_no) +{ + return fixup_free_spve_null(param, 1); +} + /** * */

1 0

git:master:e5c7b4ea: ndb_mongodb: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: e5c7b4ea8246f11815ab49fa0219ce2a7be3dd65 URL: https://github.com/kamailio/kamailio/commit/e5c7b4ea8246f11815ab49fa0219ce2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:59:53+01:00 ndb_mongodb: reformat exported structures --- Modified: src/modules/ndb_mongodb/ndb_mongodb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e5c7b4ea8246f11815ab49fa0219ce2… Patch: https://github.com/kamailio/kamailio/commit/e5c7b4ea8246f11815ab49fa0219ce2… --- diff --git a/src/modules/ndb_mongodb/ndb_mongodb_mod.c b/src/modules/ndb_mongodb/ndb_mongodb_mod.c index a778a492f38..46cb8ec5045 100644 --- a/src/modules/ndb_mongodb/ndb_mongodb_mod.c +++ b/src/modules/ndb_mongodb/ndb_mongodb_mod.c @@ -60,44 +60,48 @@ static int pv_get_mongodb( struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_mongodb_name(pv_spec_p sp, str *in); +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"mongodb", sizeof("mongodb") - 1}, PVT_OTHER, pv_get_mongodb, 0, - pv_parse_mongodb_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; - - -static cmd_export_t cmds[] = {{"mongodb_find", (cmd_function)w_mongodb_find, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, - {"mongodb_find_one", (cmd_function)w_mongodb_find_one, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, - {"mongodb_cmd_simple", (cmd_function)w_mongodb_cmd_simple, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, - {"mongodb_cmd", (cmd_function)w_mongodb_cmd, 5, fixup_mongodb_cmd, 0, - ANY_ROUTE}, - {"mongodb_free", (cmd_function)w_mongodb_free_reply, 1, fixup_spve_null, - 0, ANY_ROUTE}, - {"mongodb_next", (cmd_function)w_mongodb_next_reply, 1, fixup_spve_null, - 0, ANY_ROUTE}, - {"bind_ndb_mongodb", (cmd_function)bind_ndb_mongodb, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; + {{"mongodb", sizeof("mongodb") - 1}, PVT_OTHER, pv_get_mongodb, 0, + pv_parse_mongodb_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; + +static cmd_export_t cmds[] = { + {"mongodb_find", (cmd_function)w_mongodb_find, 5, + fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_find_one", (cmd_function)w_mongodb_find_one, 5, + fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_cmd_simple", (cmd_function)w_mongodb_cmd_simple, 5, + fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_cmd", (cmd_function)w_mongodb_cmd, 5, + fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_free", (cmd_function)w_mongodb_free_reply, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"mongodb_next", (cmd_function)w_mongodb_next_reply, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"bind_ndb_mongodb", (cmd_function)bind_ndb_mongodb, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)mongodb_srv_param}, - {0, 0, 0}}; + {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)mongodb_srv_param}, + {0, 0, 0} +}; struct module_exports exports = { - "ndb_mongodb", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /*��exported��functions��*/ - params, /*��exported��params��*/ - 0, /*��exported��RPC��methods��*/ - mod_pvs, /* exported pseudo-variables */ - 0, /* response function */ - 0, /* module��initialization��function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "ndb_mongodb", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /*��exported��functions��*/ + params, /*��exported��params��*/ + 0, /*��exported��RPC��methods��*/ + mod_pvs, /* exported pseudo-variables */ + 0, /* response function */ + 0, /* module��initialization��function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; - +/* clang-format on */ /* each child get a new connection to the database */ static int child_init(int rank)

1 0

git:master:a166327a: ndb_redis: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: a166327a4fbd77a71f88085474eba85fe7ebdf32 URL: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:56:22+01:00 ndb_redis: add fixup_free* to exported functions --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… Patch: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 13b188ee266..c3ac9eb3cfa 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -77,6 +77,7 @@ static int w_redis_pipe_cmd5(struct sip_msg *msg, char *ssrv, char *scmd, static int w_redis_pipe_cmd6(struct sip_msg *msg, char *ssrv, char *scmd, char *sargv1, char *sargv2, char *sargv3, char *sres); static int fixup_redis_cmd6(void **param, int param_no); +static int fixup_free_redis_cmd6(void **param, int param_no); static int w_redis_execute(struct sip_msg *msg, char *ssrv); static int w_redis_free_reply(struct sip_msg *msg, char *res); @@ -103,28 +104,27 @@ static pv_export_t mod_pvs[] = { {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; - static cmd_export_t cmds[] = { {"redis_cmd", (cmd_function)w_redis_cmd3, 3, - fixup_redis_cmd6, 0, ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd4, 4, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd5, 5, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd6, 6, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd3, 3, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd4, 4, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd5, 5, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd6, 6, fixup_redis_cmd6, - 0, ANY_ROUTE}, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd4, 4, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd5, 5, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd6, 6, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd3, 3, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd4, 4, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd5, 5, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd6, 6, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, {"redis_execute", (cmd_function)w_redis_execute, 1, fixup_redis_cmd6, 0, ANY_ROUTE}, - {"redis_free", (cmd_function)w_redis_free_reply, 1, fixup_spve_null, 0, - ANY_ROUTE}, + {"redis_free", (cmd_function)w_redis_free_reply, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"bind_ndb_redis", (cmd_function)bind_ndb_redis, 0, 0, 0, 0}, @@ -562,6 +562,10 @@ static int fixup_redis_cmd6(void **param, int param_no) return fixup_spve_null(param, 1); } +static int fixup_free_redis_cmd6(void **param, int param_no) +{ + return fixup_free_spve_null(param, 1); +} /** *

1 0

git:master:793a494f: outbound: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 793a494f5b23f2ef5e82664924c3bed3893105bb URL: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:50:42+01:00 outbound: reformat exported structures --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… Patch: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 3ca15b38bdd..f64e2dfbe28 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -61,25 +61,32 @@ static unsigned int ob_force_no_flag = (unsigned int)-1; static str ob_key = {0, 0}; static str flow_token_secret = {0, 0}; +/* clang-format off */ static cmd_export_t cmds[] = { - {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"force_outbound_flag", PARAM_INT, &ob_force_flag}, - {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, {0, 0, 0}}; + {"force_outbound_flag", PARAM_INT, &ob_force_flag}, + {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, + {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {0, 0, 0} +}; struct module_exports exports = { - "outbound", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported��RPC��methods */ - 0, /* exported pseudo-variables */ - 0, /* response��function */ - mod_init, /* module initialization function */ - 0, /* per-child initialization function */ - destroy /* destroy function */ + "outbound", + 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 */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static void mod_init_openssl(void) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev