sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
343 discussions

git:master:bab82a2b: uac/docs: Update docs for uac_reg_send_register/unregister and rpc command

by Henning Westerholt

Module: kamailio Branch: master Commit: bab82a2ba751a1138db48074692e953bbf7be9a8 URL: https://github.com/kamailio/kamailio/commit/bab82a2ba751a1138db48074692e953… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-12-12T17:36:21+01:00 uac/docs: Update docs for uac_reg_send_register/unregister and rpc command --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bab82a2ba751a1138db48074692e953… Patch: https://github.com/kamailio/kamailio/commit/bab82a2ba751a1138db48074692e953… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index a84c5fa6c66..80486d6dab5 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1024,6 +1024,55 @@ uac_req_send(); </programlisting> </example> </section> + + <section id="uac.f.uac_reg_send_register"> + <title> + <function moreinfo="none">uac_reg_send_register(atttr,value)</function> + </title> + <para> + This function sends a REGISTER request for the registration + based on a filter specified by attribute and value. The attribute can be: l_uuid, l_username, + r_username or auth_username. The value is what should be matched + against the value of the attribute in the remote registration record. + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + BRANCH_ROUTE, ONREPLY_ROUTE, LOCAL_ROUTE. + </para> + <example> + <title><function>uac_reg_send_register</function> usage</title> + <programlisting format="linespecific"> +... +uac_reg_send_register("l_uuid", "account123"); +... + </programlisting> + </example> + </section> + + <section id="uac.f.uac_reg_send_unregister"> + <title> + <function moreinfo="none">uac_reg_send_unregister(atttr,value)</function> + </title> + <para> + This function sends a REGISTER request with expires 0 for the registration + based on a filter specified by attribute and value. The attribute can be: l_uuid, l_username, + r_username or auth_username. The value is what should be matched + against the value of the attribute in the remote registration record. + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + BRANCH_ROUTE, ONREPLY_ROUTE, LOCAL_ROUTE. + </para> + <example> + <title><function>uac_reg_send_unregister</function> usage</title> + <programlisting format="linespecific"> +... +uac_reg_send_unregister("l_uuid", "account123"); +... + </programlisting> + </example> + </section> + <section id="uac.f.uac_reg_lookup"> <title> <function moreinfo="none">uac_reg_lookup(uuid, dst)</function> @@ -1420,6 +1469,28 @@ event_route[uac:reply] { </example> </section> + <section id="uac.r.uac.reg_register"> + <title> + <function moreinfo="none">uac.reg_register</function> + </title> + <para> + Send a REGISTER for the matching record based on a filter. + The command has two parameters: attribute and value. + The attribute can be: l_uuid, l_username, r_username or auth_username. + The value is what should be matched against the value of the attribute + in the remote registration record. + </para> + <example> + <title><function>uac.reg_register</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_register l_uuid account123 + kamcmd uac.reg_register l_uuid s:12345678 +... + </programlisting> + </example> + </section> + <section id="uac.r.uac.reg_unregister"> <title> <function moreinfo="none">uac.reg_unregister</function> @@ -1686,4 +1757,3 @@ event_route[uac:reply] { </example> </section> </chapter> -

1 month, 3 weeks

git:master:66caed28: uac: Export two new functions for reg/unreg and rpc for reg

by Henning Westerholt

Module: kamailio Branch: master Commit: 66caed28aa5bc978c280b37be18e09381c1b5c66 URL: https://github.com/kamailio/kamailio/commit/66caed28aa5bc978c280b37be18e093… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-12-12T17:36:21+01:00 uac: Export two new functions for reg/unreg and rpc for reg - uac.reg_register: Register from kamcmd - uac_reg_send_register: Function to register immediately without waiting for timer - uac_reg_send_unregister: Funtion to unregister immediately without waiting for timer - Move required structures/functions to .h for --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/66caed28aa5bc978c280b37be18e093… Patch: https://github.com/kamailio/kamailio/commit/66caed28aa5bc978c280b37be18e093…

1 month, 3 weeks

git:master:bd7e4dc5: math: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: bd7e4dc5eec2425ab96434eac434ff095ca9856a URL: https://github.com/kamailio/kamailio/commit/bd7e4dc5eec2425ab96434eac434ff0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T17:16:36+01:00 math: add fixup_free* to exported functions --- Modified: src/modules/math/math_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bd7e4dc5eec2425ab96434eac434ff0… Patch: https://github.com/kamailio/kamailio/commit/bd7e4dc5eec2425ab96434eac434ff0… --- diff --git a/src/modules/math/math_mod.c b/src/modules/math/math_mod.c index 67986f0e80a..36809626c0c 100644 --- a/src/modules/math/math_mod.c +++ b/src/modules/math/math_mod.c @@ -41,21 +41,23 @@ static int w_math_log2(sip_msg_t *msg, char *v1, char *r); static int w_math_log10(sip_msg_t *msg, char *v1, char *r); static int w_math_sqrt(sip_msg_t *msg, char *v1, char *r); static int fixup_math_p2(void **param, int param_no); +static int fixup_free_math_p2(void **param, int param_no); static int fixup_math_p3(void **param, int param_no); +static int fixup_free_math_p3(void **param, int param_no); /* clang-format off */ static cmd_export_t cmds[]={ - {"math_pow", (cmd_function)w_math_pow, 3, fixup_math_p3, - 0, ANY_ROUTE}, - {"math_logN", (cmd_function)w_math_logN, 2, fixup_math_p2, - 0, ANY_ROUTE}, - {"math_log2", (cmd_function)w_math_log2, 2, fixup_math_p2, - 0, ANY_ROUTE}, - {"math_log10", (cmd_function)w_math_log10, 2, fixup_math_p2, - 0, ANY_ROUTE}, - {"math_sqrt", (cmd_function)w_math_sqrt, 2, fixup_math_p2, - 0, ANY_ROUTE}, + {"math_pow", (cmd_function)w_math_pow, 3, + fixup_math_p3, fixup_free_math_p3, ANY_ROUTE}, + {"math_logN", (cmd_function)w_math_logN, 2, + fixup_math_p2, fixup_free_math_p2, ANY_ROUTE}, + {"math_log2", (cmd_function)w_math_log2, 2, + fixup_math_p2, fixup_math_p2, ANY_ROUTE}, + {"math_log10", (cmd_function)w_math_log10, 2, + fixup_math_p2, fixup_math_p2, ANY_ROUTE}, + {"math_sqrt", (cmd_function)w_math_sqrt, 2, + fixup_math_p2, fixup_math_p2, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -233,6 +235,16 @@ static int fixup_math_p2(void **param, int param_no) return 0; } +static int fixup_free_math_p2(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_igp_igp(param, param_no); + } else if(param_no == 2) { + return fixup_free_pvar_null(param, 1); + } + return 0; +} + /** * */ @@ -245,3 +257,13 @@ static int fixup_math_p3(void **param, int param_no) } return 0; } + +static int fixup_free_math_p3(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) { + return fixup_free_igp_igp(param, param_no); + } else if(param_no == 3) { + return fixup_free_pvar_null(param, 1); + } + return 0; +}

1 month, 3 weeks

git:master:6b603c58: matrix: reformat exported structures

by Victor Seva

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 month, 3 weeks

git:master:bb85dd83: maxfwd: reformat exported structures

by Victor Seva

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 month, 3 weeks

git:master:f5161b71: mediaproxy: reformat exported structures

by Victor Seva

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 month, 3 weeks

git:master:a47ebb63: memcached: reformat exported structures

by Victor Seva

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 month, 3 weeks

git:master:552b8397: microhttpd: add fixup_free* to exported functions

by Victor Seva

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 month, 3 weeks

git:master:4ba15a7d: misc_radius: add fixup_free* to exported functions

by Victor Seva

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 month, 3 weeks

git:master:2b73d787: mohqueue: add fixup_free* to exported functions

by Victor Seva

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 month, 3 weeks

← Newer
1
...
15
16
17
18
19
20
21
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024