sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
367 discussions

git:master:1189f487: siputils: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: 1189f4874ab3e7ec2c2d1389d1e6ca466c2b8785 URL: https://github.com/kamailio/kamailio/commit/1189f4874ab3e7ec2c2d1389d1e6ca4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T21:06:47+01:00 siputils: add fixup_free* to exported functions --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/1189f4874ab3e7ec2c2d1389d1e6ca4… Patch: https://github.com/kamailio/kamailio/commit/1189f4874ab3e7ec2c2d1389d1e6ca4…

1 month

git:master:d598d05c: sl: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: d598d05cd076a0b36d63899270a9a5405f15a7b4 URL: https://github.com/kamailio/kamailio/commit/d598d05cd076a0b36d63899270a9a54… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T21:06:47+01:00 sl: add fixup_free* to exported functions --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/d598d05cd076a0b36d63899270a9a54… Patch: https://github.com/kamailio/kamailio/commit/d598d05cd076a0b36d63899270a9a54… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 945538a82c3..1f465d6e2d1 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -84,6 +84,7 @@ static int child_init(int rank); static void mod_destroy(); static int fixup_sl_reply(void **param, int param_no); static int fixup_sl_reply_mode(void **param, int param_no); +static int fixup_free_sl_reply_mode(void **param, int param_no); static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_ltt_name(pv_spec_p sp, str *in); @@ -98,21 +99,18 @@ static pv_export_t mod_pvs[] = { }; static cmd_export_t cmds[] = { - {"sl_send_reply", w_sl_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE}, - {"sl_reply", w_sl_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE}, - {"send_reply", w_send_reply, 2, fixup_sl_reply, 0, + {"sl_send_reply", w_sl_send_reply, 2, fixup_sl_reply, fixup_free_fparam_all, REQUEST_ROUTE}, + {"sl_reply", w_sl_send_reply, 2, fixup_sl_reply, fixup_free_fparam_all, REQUEST_ROUTE}, + {"send_reply", w_send_reply, 2, fixup_sl_reply, fixup_free_fparam_all, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, - fixup_sl_reply_mode, 0, + {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, fixup_sl_reply_mode, fixup_free_sl_reply_mode, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"send_reply_error", w_send_reply_error, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, 0, ONREPLY_ROUTE}, - {"sl_forward_reply", w_sl_forward_reply1, 1, fixup_spve_all, 0, - ONREPLY_ROUTE}, - {"sl_forward_reply", w_sl_forward_reply2, 2, fixup_spve_all, 0, - ONREPLY_ROUTE}, + {"sl_forward_reply", w_sl_forward_reply1, 1, fixup_spve_all, fixup_free_spve_all, ONREPLY_ROUTE}, + {"sl_forward_reply", w_sl_forward_reply2, 2, fixup_spve_all, fixup_free_spve_all, ONREPLY_ROUTE}, {"bind_sl", (cmd_function)bind_sl, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -469,6 +467,16 @@ static int fixup_sl_reply_mode(void **param, int param_no) return 0; } +static int fixup_free_sl_reply_mode(void **param, int param_no) +{ + if(param_no == 1 || param_no == 3) { + fixup_free_fparam_all(param, 1); + } else { + fixup_free_fparam_all(param, param_no); + } + return 0; +} + /** * @brief forward SIP reply statelessly with different code and reason text */

1 month

git:master:73ba0266: pike: disable destroy of internal tree on mod-destroy callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 73ba0266cf76083b51e85d877f04f4a3da67d207 URL: https://github.com/kamailio/kamailio/commit/73ba0266cf76083b51e85d877f04f4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-21T20:37:31+01:00 pike: disable destroy of internal tree on mod-destroy callback - it is safer and faster to be removed at once by core or OS when application context is destroyed --- Modified: src/modules/pike/pike.c --- Diff: https://github.com/kamailio/kamailio/commit/73ba0266cf76083b51e85d877f04f4a… Patch: https://github.com/kamailio/kamailio/commit/73ba0266cf76083b51e85d877f04f4a… --- diff --git a/src/modules/pike/pike.c b/src/modules/pike/pike.c index c256049e7d5..e4791dd2046 100644 --- a/src/modules/pike/pike.c +++ b/src/modules/pike/pike.c @@ -145,10 +145,12 @@ static int pike_init(void) void pike_exit(void) { +#if 0 /* destroy semaphore */ if(pike_timer_lock) { lock_destroy(pike_timer_lock); lock_dealloc(pike_timer_lock); + pike_timer_lock = 0; } /* empty the timer list head */ @@ -159,6 +161,9 @@ void pike_exit(void) /* destroy the IP tree */ destroy_ip_tree(); +#endif + + LM_DBG("done\n"); return; }

1 month

git:master:26d6a518: core: ppcfg - use define for size of the buffer for core defined values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 26d6a518c974cfe509d23e41fe9db6b02f357930 URL: https://github.com/kamailio/kamailio/commit/26d6a518c974cfe509d23e41fe9db6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-21T20:00:22+01:00 core: ppcfg - use define for size of the buffer for core defined values --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/26d6a518c974cfe509d23e41fe9db6b… Patch: https://github.com/kamailio/kamailio/commit/26d6a518c974cfe509d23e41fe9db6b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 407918aca72..db574ddf769 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -290,7 +290,8 @@ void pp_ifdef_level_error(void) */ void pp_define_core(void) { - char defval[64]; +#define PP_DEFINE_COREVAL_SIZE 64 + char defval[PP_DEFINE_COREVAL_SIZE]; char *p; int n; str_list_t *sb; @@ -302,8 +303,9 @@ void pp_define_core(void) p++; } - n = snprintf(p, 64 - (int)(p - defval), "_%u", VERSIONVAL / 1000000); - if(n < 0 || n >= 64 - (int)(p - defval)) { + n = snprintf(p, PP_DEFINE_COREVAL_SIZE - (int)(p - defval), "_%u", + VERSIONVAL / 1000000); + if(n < 0 || n >= PP_DEFINE_COREVAL_SIZE - (int)(p - defval)) { LM_ERR("failed to build define token\n"); return; } @@ -313,9 +315,9 @@ void pp_define_core(void) return; } - n = snprintf(p, 64 - (int)(p - defval), "_%u_%u", VERSIONVAL / 1000000, - (VERSIONVAL % 1000000) / 1000); - if(n < 0 || n >= 64 - (int)(p - defval)) { + n = snprintf(p, PP_DEFINE_COREVAL_SIZE - (int)(p - defval), "_%u_%u", + VERSIONVAL / 1000000, (VERSIONVAL % 1000000) / 1000); + if(n < 0 || n >= PP_DEFINE_COREVAL_SIZE - (int)(p - defval)) { LM_ERR("failed to build define token\n"); return; } @@ -325,9 +327,10 @@ void pp_define_core(void) return; } - n = snprintf(p, 64 - (int)(p - defval), "_%u_%u_%u", VERSIONVAL / 1000000, - (VERSIONVAL % 1000000) / 1000, VERSIONVAL % 1000); - if(n < 0 || n >= 64 - (int)(p - defval)) { + n = snprintf(p, PP_DEFINE_COREVAL_SIZE - (int)(p - defval), "_%u_%u_%u", + VERSIONVAL / 1000000, (VERSIONVAL % 1000000) / 1000, + VERSIONVAL % 1000); + if(n < 0 || n >= PP_DEFINE_COREVAL_SIZE - (int)(p - defval)) { LM_ERR("failed to build define token\n"); return; } @@ -344,8 +347,8 @@ void pp_define_core(void) return; } - n = snprintf(defval, 64, "%u", VERSIONVAL); - if(n < 0 || n >= 64) { + n = snprintf(defval, PP_DEFINE_COREVAL_SIZE, "%u", VERSIONVAL); + if(n < 0 || n >= PP_DEFINE_COREVAL_SIZE) { LM_ERR("failed to build version define value\n"); return; }

1 month

git:master:790bf50f: slack: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: 790bf50f5ec5a08f6fa0d1bd3c2732fb1317cdd0 URL: https://github.com/kamailio/kamailio/commit/790bf50f5ec5a08f6fa0d1bd3c2732f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:43:58+01:00 slack: add fixup_free* to exported functions --- Modified: src/modules/slack/slack.c Modified: src/modules/slack/slack.h --- Diff: https://github.com/kamailio/kamailio/commit/790bf50f5ec5a08f6fa0d1bd3c2732f… Patch: https://github.com/kamailio/kamailio/commit/790bf50f5ec5a08f6fa0d1bd3c2732f… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index 1ffcfbc1572..3835c13deff 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -41,7 +41,7 @@ static char *slack_icon = SLACK_DEFAULT_ICON; * Exported functions */ static cmd_export_t cmds[] = { - {"slack_send", (cmd_function)slack_send1, 1, slack_fixup, 0, ANY_ROUTE}, + {"slack_send", (cmd_function)slack_send1, 1, slack_fixup, slack_fixup_free, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -241,6 +241,20 @@ static int slack_fixup(void **param, int param_no) return slack_fixup_helper(param, param_no); } +static int slack_fixup_free(void **param, int param_no) +{ + sl_msg_t *sm; + if(param_no != 1 || param == NULL || *param == NULL) { + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; + } + + sm = *param; + pv_elem_free_all(sm->m); + pkg_free(sm); + return 0; +} + /** * send text message to slack */ diff --git a/src/modules/slack/slack.h b/src/modules/slack/slack.h index 8537cf07772..e4f02fd5fc9 100644 --- a/src/modules/slack/slack.h +++ b/src/modules/slack/slack.h @@ -55,6 +55,7 @@ static int _slack_parse_url_param(char *val); static int _slack_url_param(modparam_t type, void *val); static int slack_fixup(void **param, int param_no); +static int slack_fixup_free(void **param, int param_no); static int slack_send1(struct sip_msg *msg, char *frm, char *str2); static int slack_fixup_helper(void **param, int param_no);

1 month

git:master:9a5000ed: slack: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 9a5000edf4d57ab3ecdcf12d6473b6e876dcf1f5 URL: https://github.com/kamailio/kamailio/commit/9a5000edf4d57ab3ecdcf12d6473b6e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:35:59+01:00 slack: reformat exported structures --- Modified: src/modules/slack/slack.c --- Diff: https://github.com/kamailio/kamailio/commit/9a5000edf4d57ab3ecdcf12d6473b6e… Patch: https://github.com/kamailio/kamailio/commit/9a5000edf4d57ab3ecdcf12d6473b6e… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index 6b886996a10..1ffcfbc1572 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -36,38 +36,42 @@ static char *slack_channel = SLACK_DEFAULT_CHANNEL; static char *slack_username = SLACK_DEFAULT_USERNAME; static char *slack_icon = SLACK_DEFAULT_ICON; +/* clang-format off */ /** * Exported functions */ static cmd_export_t cmds[] = { - {"slack_send", (cmd_function)slack_send1, 1, slack_fixup, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"slack_send", (cmd_function)slack_send1, 1, slack_fixup, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /** * Exported parameters */ static param_export_t mod_params[] = { - {"slack_url", PARAM_STRING | PARAM_USE_FUNC, (void *)_slack_url_param}, - {"channel", PARAM_STRING, &slack_channel}, // channel starts with # - {"username", PARAM_STRING, &slack_username}, - {"icon_emoji", PARAM_STRING, &slack_icon}, {0, 0, 0}}; + {"slack_url", PARAM_STRING | PARAM_USE_FUNC, (void *)_slack_url_param}, + {"channel", PARAM_STRING, &slack_channel}, // channel starts with # + {"username", PARAM_STRING, &slack_username}, + {"icon_emoji", PARAM_STRING, &slack_icon}, + {0, 0, 0} +}; /** * Module description */ struct module_exports exports = { - "slack", /* 1 module name */ - DEFAULT_DLFLAGS, /* 2 dlopen flags */ - cmds, /* 3 exported functions */ - mod_params, /* 4 exported parameters */ - 0, /* 5 exported RPC functions */ - 0, /* 6 exported pseudo-variables */ - 0, /* 7 response function */ - mod_init, /* 8 module initialization function */ - 0, /* 9 per-child init function */ - mod_destroy /* 0 destroy function */ + "slack", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /** * Module init

1 month

git:master:48d4f936: sms: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 48d4f936f95ba2acfeb59211420cb2165716984a URL: https://github.com/kamailio/kamailio/commit/48d4f936f95ba2acfeb59211420cb21… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:33:00+01:00 sms: reformat exported structures --- Modified: src/modules/sms/sms.c --- Diff: https://github.com/kamailio/kamailio/commit/48d4f936f95ba2acfeb59211420cb21… Patch: https://github.com/kamailio/kamailio/commit/48d4f936f95ba2acfeb59211420cb21… --- diff --git a/src/modules/sms/sms.c b/src/modules/sms/sms.c index ea4ba7f1d98..7a4726f03dd 100644 --- a/src/modules/sms/sms.c +++ b/src/modules/sms/sms.c @@ -64,37 +64,38 @@ int *queued_msgs = 0; int use_contact = 0; int sms_report_type = NO_REPORT; - +/* clang-format off */ static cmd_export_t cmds[] = { - {"sms_send_msg_to_net", w_sms_send_msg_to_net, 1, - fixup_sms_send_msg_to_net, 0, REQUEST_ROUTE}, - {"sms_send_msg", w_sms_send_msg, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - - -static param_export_t params[] = {{"networks", PARAM_STRING, &networks_config}, - {"modems", PARAM_STRING, &modems_config}, - {"links", PARAM_STRING, &links_config}, - {"default_net", PARAM_STRING, &default_net_str}, - {"max_sms_parts", PARAM_INT, &max_sms_parts}, - {"domain", PARAM_STR, &_sms_domain}, - {"use_contact", PARAM_INT, &use_contact}, - {"sms_report_type", PARAM_INT, &sms_report_type}, {0, 0, 0}}; + {"sms_send_msg_to_net", w_sms_send_msg_to_net, 1, fixup_sms_send_msg_to_net, 0, REQUEST_ROUTE}, + {"sms_send_msg", w_sms_send_msg, 0, 0, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; +static param_export_t params[] = { + {"networks", PARAM_STRING, &networks_config}, + {"modems", PARAM_STRING, &modems_config}, + {"links", PARAM_STRING, &links_config}, + {"default_net", PARAM_STRING, &default_net_str}, + {"max_sms_parts", PARAM_INT, &max_sms_parts}, + {"domain", PARAM_STR, &_sms_domain}, + {"use_contact", PARAM_INT, &use_contact}, + {"sms_report_type", PARAM_INT, &sms_report_type}, + {0, 0, 0} +}; struct module_exports exports = { - "sms", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response handling function*/ - sms_init, /* module init function */ - sms_child_init, /* per-child init function */ - sms_exit /* module destroy function */ + "sms", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + sms_init, /* module init function */ + sms_child_init, /* per-child init function */ + sms_exit /* module destroy function */ }; - +/* clang-format on */ static int fixup_sms_send_msg_to_net(void **param, int param_no) {

1 month

git:master:4a9867fa: snmpstats: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 4a9867faab4e290c3953d8d9ba2d50b3908a48b5 URL: https://github.com/kamailio/kamailio/commit/4a9867faab4e290c3953d8d9ba2d50b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:32:49+01:00 snmpstats: reformat exported structures --- Modified: src/modules/snmpstats/snmpstats.c --- Diff: https://github.com/kamailio/kamailio/commit/4a9867faab4e290c3953d8d9ba2d50b… Patch: https://github.com/kamailio/kamailio/commit/4a9867faab4e290c3953d8d9ba2d50b… --- diff --git a/src/modules/snmpstats/snmpstats.c b/src/modules/snmpstats/snmpstats.c index adf25a73d0d..d17c0730d26 100644 --- a/src/modules/snmpstats/snmpstats.c +++ b/src/modules/snmpstats/snmpstats.c @@ -127,42 +127,37 @@ static int mod_child_init(int rank); * log a useful message and kill the AgentX Sub-Agent child process */ static void mod_destroy(void); +/* clang-format off */ /*! * This structure defines the SNMPStats parameters that can be configured * through the kamailio.cfg configuration file. */ static param_export_t mod_params[] = { - {"sipEntityType", PARAM_STRING | PARAM_USE_FUNC, - (void *)handleSipEntityType}, - {"MsgQueueMinorThreshold", PARAM_INT | PARAM_USE_FUNC, - (void *)set_queue_minor_threshold}, - {"MsgQueueMajorThreshold", PARAM_INT | PARAM_USE_FUNC, - (void *)set_queue_major_threshold}, - {"dlg_minor_threshold", PARAM_INT | PARAM_USE_FUNC, - (void *)set_dlg_minor_threshold}, - {"dlg_major_threshold", PARAM_INT | PARAM_USE_FUNC, - (void *)set_dlg_major_threshold}, - {"snmpgetPath", PARAM_STRING | PARAM_USE_FUNC, - (void *)set_snmpget_path}, - {"snmpCommunity", PARAM_STRING | PARAM_USE_FUNC, - (void *)set_snmp_community}, - {"snmpVersion", PARAM_STRING | PARAM_USE_FUNC, - (void *)set_snmp_version}, - {"export_registrar", PARAM_INT, &snmp_export_registrar}, {0, 0, 0}}; - + {"sipEntityType", PARAM_STRING | PARAM_USE_FUNC, (void *)handleSipEntityType}, + {"MsgQueueMinorThreshold", PARAM_INT | PARAM_USE_FUNC, (void *)set_queue_minor_threshold}, + {"MsgQueueMajorThreshold", PARAM_INT | PARAM_USE_FUNC, (void *)set_queue_major_threshold}, + {"dlg_minor_threshold", PARAM_INT | PARAM_USE_FUNC, (void *)set_dlg_minor_threshold}, + {"dlg_major_threshold", PARAM_INT | PARAM_USE_FUNC, (void *)set_dlg_major_threshold}, + {"snmpgetPath", PARAM_STRING | PARAM_USE_FUNC, (void *)set_snmpget_path}, + {"snmpCommunity", PARAM_STRING | PARAM_USE_FUNC, (void *)set_snmp_community}, + {"snmpVersion", PARAM_STRING | PARAM_USE_FUNC, (void *)set_snmp_version}, + {"export_registrar", PARAM_INT, &snmp_export_registrar}, + {0, 0, 0} +}; struct module_exports exports = { - SNMPSTATS_MODULE_NAME, /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - mod_params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* reply processing function */ - mod_init, /* module init function */ - mod_child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + SNMPSTATS_MODULE_NAME, /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + mod_child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /*! * The module will fork off a child process to run an snmp command via execve().

1 month

git:master:4e88b059: speeddial: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: 4e88b0592299e69c4d20981d20a23e667268c7c0 URL: https://github.com/kamailio/kamailio/commit/4e88b0592299e69c4d20981d20a23e6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:22:38+01:00 speeddial: add fixup_free* to exported functions --- Modified: src/modules/speeddial/speeddial.c --- Diff: https://github.com/kamailio/kamailio/commit/4e88b0592299e69c4d20981d20a23e6… Patch: https://github.com/kamailio/kamailio/commit/4e88b0592299e69c4d20981d20a23e6… --- diff --git a/src/modules/speeddial/speeddial.c b/src/modules/speeddial/speeddial.c index 0b1b66523d3..cc479213a0a 100644 --- a/src/modules/speeddial/speeddial.c +++ b/src/modules/speeddial/speeddial.c @@ -66,8 +66,8 @@ db1_con_t *db_handle = 0; /* Database connection handle */ /* clang-format off */ /* Exported functions */ static cmd_export_t cmds[] = { - {"sd_lookup", (cmd_function)w_sd_lookup, 1, fixup_spve_null, 0, REQUEST_ROUTE}, - {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, REQUEST_ROUTE}, + {"sd_lookup", (cmd_function)w_sd_lookup, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, + {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 month

git:master:50e48d73: speeddial: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 50e48d73df63a002d42fc1446ac90949475276aa URL: https://github.com/kamailio/kamailio/commit/50e48d73df63a002d42fc1446ac9094… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:21:53+01:00 speeddial: reformat exported structures --- Modified: src/modules/speeddial/speeddial.c --- Diff: https://github.com/kamailio/kamailio/commit/50e48d73df63a002d42fc1446ac9094… Patch: https://github.com/kamailio/kamailio/commit/50e48d73df63a002d42fc1446ac9094… --- diff --git a/src/modules/speeddial/speeddial.c b/src/modules/speeddial/speeddial.c index 6b7252e0e33..0b1b66523d3 100644 --- a/src/modules/speeddial/speeddial.c +++ b/src/modules/speeddial/speeddial.c @@ -63,40 +63,41 @@ str dstrip_s = {NULL, 0}; db_func_t db_funcs; /* Database functions */ db1_con_t *db_handle = 0; /* Database connection handle */ - +/* clang-format off */ /* Exported functions */ -static cmd_export_t cmds[] = {{"sd_lookup", (cmd_function)w_sd_lookup, 1, - fixup_spve_null, 0, REQUEST_ROUTE}, - {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, - REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - +static cmd_export_t cmds[] = { + {"sd_lookup", (cmd_function)w_sd_lookup, 1, fixup_spve_null, 0, REQUEST_ROUTE}, + {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"user_column", PARAM_STR, &user_column}, - {"domain_column", PARAM_STR, &domain_column}, - {"sd_user_column", PARAM_STR, &sd_user_column}, - {"sd_domain_column", PARAM_STR, &sd_domain_column}, - {"new_uri_column", PARAM_STR, &new_uri_column}, - {"use_domain", PARAM_INT, &use_domain}, - {"domain_prefix", PARAM_STR, &domain_prefix}, {0, 0, 0}}; - +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"user_column", PARAM_STR, &user_column}, + {"domain_column", PARAM_STR, &domain_column}, + {"sd_user_column", PARAM_STR, &sd_user_column}, + {"sd_domain_column", PARAM_STR, &sd_domain_column}, + {"new_uri_column", PARAM_STR, &new_uri_column}, + {"use_domain", PARAM_INT, &use_domain}, + {"domain_prefix", PARAM_STR, &domain_prefix}, + {0, 0, 0} +}; /* Module interface */ struct module_exports exports = { - "speeddial", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* child initialization function */ - destroy /* destroy function */ + "speeddial", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; - +/* clang-format on */ /** *

1 month

← Newer
1
...
12
13
14
15
16
17
18
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024