sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
372 discussions

git:master:451066e8: xlog: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 451066e8e1b98c4c2a59827a661b18155515399d URL: https://github.com/kamailio/kamailio/commit/451066e8e1b98c4c2a59827a661b181… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T11:04:37+01:00 xlog: reformat exported structures --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/451066e8e1b98c4c2a59827a661b181… Patch: https://github.com/kamailio/kamailio/commit/451066e8e1b98c4c2a59827a661b181…

1 0

git:master:36824d8d: lib/xcap: relocated to archive
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 36824d8daf84369f6428643aee7837cf095cf4cf URL: https://github.com/kamailio/kamailio/commit/36824d8daf84369f6428643aee7837c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T10:48:14+01:00 lib/xcap: relocated to archive - new location: https://github.com/kamailio/kamailio-archive --- Removed: src/lib/xcap/ChangeLog Removed: src/lib/xcap/Makefile Removed: src/lib/xcap/Makefile.nonser Removed: src/lib/xcap/common_policy.c Removed: src/lib/xcap/common_policy.h Removed: src/lib/xcap/doc/Makefile Removed: src/lib/xcap/doc/xcap.xml Removed: src/lib/xcap/msg_rules.c Removed: src/lib/xcap/msg_rules.h Removed: src/lib/xcap/parse_common_rules.c Removed: src/lib/xcap/parse_common_rules.h Removed: src/lib/xcap/parse_msg_rules.c Removed: src/lib/xcap/parse_msg_rules.h Removed: src/lib/xcap/parse_pres_rules.c Removed: src/lib/xcap/parse_pres_rules.h Removed: src/lib/xcap/pres_rules.c Removed: src/lib/xcap/pres_rules.h Removed: src/lib/xcap/resource_list.c Removed: src/lib/xcap/resource_list.h Removed: src/lib/xcap/resource_lists_parser.c Removed: src/lib/xcap/resource_lists_parser.h Removed: src/lib/xcap/rls_services_parser.c Removed: src/lib/xcap/rls_services_parser.h Removed: src/lib/xcap/xcap_client.c Removed: src/lib/xcap/xcap_client.h Removed: src/lib/xcap/xcap_result_codes.h Removed: src/lib/xcap/xml_utils.c Removed: src/lib/xcap/xml_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/36824d8daf84369f6428643aee7837c… Patch: https://github.com/kamailio/kamailio/commit/36824d8daf84369f6428643aee7837c…

1 0

git:master:9cba8b05: lib/shm_regex: relocated to archive
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 9cba8b050e45749307fbcbb75abc1d91fc06b917 URL: https://github.com/kamailio/kamailio/commit/9cba8b050e45749307fbcbb75abc1d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T10:48:14+01:00 lib/shm_regex: relocated to archive - new location: https://github.com/kamailio/kamailio-archive --- Removed: src/lib/shm_regex/Makefile Removed: src/lib/shm_regex/README Removed: src/lib/shm_regex/shm_regex.c Removed: src/lib/shm_regex/shm_regex.h --- Diff: https://github.com/kamailio/kamailio/commit/9cba8b050e45749307fbcbb75abc1d9… Patch: https://github.com/kamailio/kamailio/commit/9cba8b050e45749307fbcbb75abc1d9…

1 0

git:master:54a9e584: lib/presence: relocated to archive
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 54a9e5843739968c34c23391d66de58d3815d165 URL: https://github.com/kamailio/kamailio/commit/54a9e5843739968c34c23391d66de58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T10:48:14+01:00 lib/presence: relocated to archive - new location: https://github.com/kamailio/kamailio-archive --- Removed: src/lib/presence/.cvsignore Removed: src/lib/presence/ChangeLog Removed: src/lib/presence/Makefile Removed: src/lib/presence/Makefile.nonser Removed: src/lib/presence/doc/Makefile Removed: src/lib/presence/doc/presence.xml Removed: src/lib/presence/domain_maintainer.c Removed: src/lib/presence/domain_maintainer.h Removed: src/lib/presence/lpidf.c Removed: src/lib/presence/lpidf.h Removed: src/lib/presence/notifier.h Removed: src/lib/presence/notifier_domain.c Removed: src/lib/presence/notifier_domain.h Removed: src/lib/presence/pidf.c Removed: src/lib/presence/pidf.h Removed: src/lib/presence/pres_doc.c Removed: src/lib/presence/pres_doc.h Removed: src/lib/presence/qsa.c Removed: src/lib/presence/qsa.h Removed: src/lib/presence/qsa_params.c Removed: src/lib/presence/qsa_params.h Removed: src/lib/presence/subscriber.h Removed: src/lib/presence/subscription_info.h Removed: src/lib/presence/utils.c Removed: src/lib/presence/utils.h Removed: src/lib/presence/xml_utils.c Removed: src/lib/presence/xml_utils.h Removed: src/lib/presence/xpidf.c Removed: src/lib/presence/xpidf.h --- Diff: https://github.com/kamailio/kamailio/commit/54a9e5843739968c34c23391d66de58… Patch: https://github.com/kamailio/kamailio/commit/54a9e5843739968c34c23391d66de58…

1 0

git:master:d93c7505: lib/cds: relocated to archive
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: d93c750537a7084782b173edde0b16b81516fc60 URL: https://github.com/kamailio/kamailio/commit/d93c750537a7084782b173edde0b16b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T10:48:14+01:00 lib/cds: relocated to archive - new location: https://github.com/kamailio/kamailio-archive --- Removed: src/lib/cds/.cvsignore Removed: src/lib/cds/ChangeLog Removed: src/lib/cds/Makefile Removed: src/lib/cds/Makefile.nonser Removed: src/lib/cds/base64.c Removed: src/lib/cds/base64.h Removed: src/lib/cds/cds.c Removed: src/lib/cds/cds.h Removed: src/lib/cds/dbid.c Removed: src/lib/cds/dbid.h Removed: src/lib/cds/doc/Makefile Removed: src/lib/cds/doc/cds.xml Removed: src/lib/cds/doc/cds_free.xml Removed: src/lib/cds/doc/cds_free_ptr.xml Removed: src/lib/cds/doc/cds_malloc.xml Removed: src/lib/cds/doc/cds_malloc_ptr.xml Removed: src/lib/cds/doc/cds_mutex_destroy.xml Removed: src/lib/cds/doc/cds_mutex_init.xml Removed: src/lib/cds/doc/cds_mutex_lock.xml Removed: src/lib/cds/doc/cds_mutex_t.xml Removed: src/lib/cds/doc/cds_mutex_unlock.xml Removed: src/lib/cds/doc/create_message.xml Removed: src/lib/cds/doc/create_message_ex.xml Removed: src/lib/cds/doc/destroy_sstream.xml Removed: src/lib/cds/doc/dstr_append.xml Removed: src/lib/cds/doc/dstr_get_data.xml Removed: src/lib/cds/doc/dstr_init.xml Removed: src/lib/cds/doc/dstring.xml Removed: src/lib/cds/doc/dstring_t.xml Removed: src/lib/cds/doc/free_message.xml Removed: src/lib/cds/doc/get_serialized_sstream.xml Removed: src/lib/cds/doc/init_input_sstream.xml Removed: src/lib/cds/doc/init_message_ex.xml Removed: src/lib/cds/doc/init_output_sstream.xml Removed: src/lib/cds/doc/is_msg_queue_empty.xml Removed: src/lib/cds/doc/memory.xml Removed: src/lib/cds/doc/mq_message_t.xml Removed: src/lib/cds/doc/msg_queue.xml Removed: src/lib/cds/doc/msg_queue_destroy.xml Removed: src/lib/cds/doc/msg_queue_init.xml Removed: src/lib/cds/doc/msg_queue_init_ex.xml Removed: src/lib/cds/doc/msg_queue_t.xml Removed: src/lib/cds/doc/pop_message.xml Removed: src/lib/cds/doc/push_message.xml Removed: src/lib/cds/doc/serialization.xml Removed: src/lib/cds/doc/serialize_char.xml Removed: src/lib/cds/doc/serialize_int.xml Removed: src/lib/cds/doc/serialize_str.xml Removed: src/lib/cds/doc/serialize_uchar.xml Removed: src/lib/cds/doc/serialize_uint.xml Removed: src/lib/cds/doc/set_data_destroy_function.xml Removed: src/lib/cds/doc/sstr.xml Removed: src/lib/cds/doc/sstream_get.xml Removed: src/lib/cds/doc/sstream_get_str.xml Removed: src/lib/cds/doc/sstream_get_str_ex.xml Removed: src/lib/cds/doc/sstream_put.xml Removed: src/lib/cds/doc/sstream_put_str.xml Removed: src/lib/cds/doc/sstream_put_zt.xml Removed: src/lib/cds/doc/sstream_t.xml Removed: src/lib/cds/doc/str_clear.xml Removed: src/lib/cds/doc/str_dup.xml Removed: src/lib/cds/doc/str_free.xml Removed: src/lib/cds/doc/str_free_content.xml Removed: src/lib/cds/doc/str_other.xml Removed: src/lib/cds/doc/str_t.xml Removed: src/lib/cds/doc/sync.xml Removed: src/lib/cds/dstring.c Removed: src/lib/cds/dstring.h Removed: src/lib/cds/hash_table.c Removed: src/lib/cds/hash_table.h Removed: src/lib/cds/list.h Removed: src/lib/cds/logger.h Removed: src/lib/cds/memory.c Removed: src/lib/cds/memory.h Removed: src/lib/cds/msg_queue.c Removed: src/lib/cds/msg_queue.h Removed: src/lib/cds/ptr_vector.c Removed: src/lib/cds/ptr_vector.h Removed: src/lib/cds/ref_cntr.c Removed: src/lib/cds/ref_cntr.h Removed: src/lib/cds/rr_serialize.c Removed: src/lib/cds/rr_serialize.h Removed: src/lib/cds/ser_profile.c Removed: src/lib/cds/ser_profile.h Removed: src/lib/cds/serialize.c Removed: src/lib/cds/serialize.h Removed: src/lib/cds/simple_profile.c Removed: src/lib/cds/simple_profile.h Removed: src/lib/cds/sip_utils.c Removed: src/lib/cds/sip_utils.h Removed: src/lib/cds/sstr.c Removed: src/lib/cds/sstr.h Removed: src/lib/cds/sync.h Removed: src/lib/cds/vector.c Removed: src/lib/cds/vector.h --- Diff: https://github.com/kamailio/kamailio/commit/d93c750537a7084782b173edde0b16b… Patch: https://github.com/kamailio/kamailio/commit/d93c750537a7084782b173edde0b16b…

1 0

git:master:d1101632: xmlrpc: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: d11016326effb138372ac3ba97340a140c147546 URL: https://github.com/kamailio/kamailio/commit/d11016326effb138372ac3ba97340a1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T10:41:50+01:00 xmlrpc: reformat exported structures --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/d11016326effb138372ac3ba97340a1… Patch: https://github.com/kamailio/kamailio/commit/d11016326effb138372ac3ba97340a1… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 347af5658da..a2db03420e1 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -408,41 +408,44 @@ static regex_t xmlrpc_url_skip_regexp; static str xmlrpc_event_callback = STR_NULL; +/* clang-format off */ /* * Exported functions */ static cmd_export_t cmds[] = { - {"dispatch_rpc", w_dispatch_rpc, 0, 0, 0, REQUEST_ROUTE}, - {"xmlrpc_reply", w_xmlrpc_reply, 2, fixup_xmlrpc_reply, 0, - REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"dispatch_rpc", w_dispatch_rpc, 0, 0, 0, REQUEST_ROUTE}, + {"xmlrpc_reply", w_xmlrpc_reply, 2, fixup_xmlrpc_reply, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"route", PARAM_STRING, &xmlrpc_route}, - {"autoconversion", PARAM_INT, &autoconvert}, - {"escape_cr", PARAM_INT, &escape_cr}, - {"double_lf_to_crlf", PARAM_INT, &lflf2crlf}, - {"mode", PARAM_INT, &xmlrpc_mode}, - {"url_match", PARAM_STRING, &xmlrpc_url_match}, - {"url_skip", PARAM_STRING, &xmlrpc_url_skip}, - {"event_callback", PARAM_STR, &xmlrpc_event_callback}, {0, 0, 0}}; - +static param_export_t params[] = { + {"route", PARAM_STRING, &xmlrpc_route}, + {"autoconversion", PARAM_INT, &autoconvert}, + {"escape_cr", PARAM_INT, &escape_cr}, + {"double_lf_to_crlf", PARAM_INT, &lflf2crlf}, + {"mode", PARAM_INT, &xmlrpc_mode}, + {"url_match", PARAM_STRING, &xmlrpc_url_match}, + {"url_skip", PARAM_STRING, &xmlrpc_url_skip}, + {"event_callback", PARAM_STR, &xmlrpc_event_callback}, + {0, 0, 0} +}; struct module_exports exports = { - "xmlrpc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pv exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "xmlrpc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pv exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /* XML-RPC reply helper functions */

1 0

git:master:c34bce14: xmpp: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: c34bce14a7dfba19bec7e46705eda3cf5f4298dd URL: https://github.com/kamailio/kamailio/commit/c34bce14a7dfba19bec7e46705eda3c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T10:23:17+01:00 xmpp: reformat exported structures --- Modified: src/modules/xmpp/xmpp.c --- Diff: https://github.com/kamailio/kamailio/commit/c34bce14a7dfba19bec7e46705eda3c… Patch: https://github.com/kamailio/kamailio/commit/c34bce14a7dfba19bec7e46705eda3c… --- diff --git a/src/modules/xmpp/xmpp.c b/src/modules/xmpp/xmpp.c index 3d292e9ea39..92a2ef9c673 100644 --- a/src/modules/xmpp/xmpp.c +++ b/src/modules/xmpp/xmpp.c @@ -160,43 +160,48 @@ param_t *_xmpp_gwmap_list = NULL; #define DEFAULT_COMPONENT_PORT 5347 #define DEFAULT_SERVER_PORT 5269 +/* clang-format off */ /* * Exported functions */ static cmd_export_t cmds[] = { - {"xmpp_send_message", (cmd_function)cmd_send_message, 0, 0, 0, - REQUEST_ROUTE}, - {"bind_xmpp", (cmd_function)bind_xmpp, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"xmpp_send_message", (cmd_function)cmd_send_message, 0, 0, 0, REQUEST_ROUTE}, + {"bind_xmpp", (cmd_function)bind_xmpp, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"backend", PARAM_STRING, &backend}, - {"domain_separator", PARAM_STRING, &domain_sep_str}, - {"gateway_domain", PARAM_STRING, &gateway_domain}, - {"xmpp_domain", PARAM_STRING, &xmpp_domain}, - {"xmpp_host", PARAM_STRING, &xmpp_host}, - {"xmpp_port", PARAM_INT, &xmpp_port}, - {"xmpp_password", PARAM_STRING, &xmpp_password}, - {"outbound_proxy", PARAM_STR, &outbound_proxy}, - {"gwmap", PARAM_STRING | PARAM_USE_FUNC, (void *)xmpp_gwmap_param}, - {0, 0, 0}}; +static param_export_t params[] = { + {"backend", PARAM_STRING, &backend}, + {"domain_separator", PARAM_STRING, &domain_sep_str}, + {"gateway_domain", PARAM_STRING, &gateway_domain}, + {"xmpp_domain", PARAM_STRING, &xmpp_domain}, + {"xmpp_host", PARAM_STRING, &xmpp_host}, + {"xmpp_port", PARAM_INT, &xmpp_port}, + {"xmpp_password", PARAM_STRING, &xmpp_password}, + {"outbound_proxy", PARAM_STR, &outbound_proxy}, + {"gwmap", PARAM_STRING | PARAM_USE_FUNC, (void *)xmpp_gwmap_param}, + {0, 0, 0} +}; /* * Module description */ struct module_exports exports = { - "xmpp", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* child init function */ - 0 /* module destroy function */ + "xmpp", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /* * initialize module

1 0

git:master:1bbb1472: cnxcc: fix possible mem leaks on errors
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 1bbb1472d8d940814e4658ac0adcdf809ac7f5ab URL: https://github.com/kamailio/kamailio/commit/1bbb1472d8d940814e4658ac0adcdf8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T09:49:05+01:00 cnxcc: fix possible mem leaks on errors --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1bbb1472d8d940814e4658ac0adcdf8… Patch: https://github.com/kamailio/kamailio/commit/1bbb1472d8d940814e4658ac0adcdf8… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index 4b278a540b0..0c59bb069b9 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -120,6 +120,7 @@ static call_t *__alloc_new_call_by_money(credit_data_t *credit_data, struct sip_msg *msg, double credit, double connect_cost, double cost_per_second, int initial_pulse, int final_pulse); static void __notify_call_termination(sip_msg_t *msg); +static void __free_call_t(call_t *call); static void __free_call(call_t *call); static void __delete_call(call_t *call, credit_data_t *credit_data); static int __has_to_tag(struct sip_msg *msg); @@ -897,7 +898,8 @@ static void __free_credit_data(credit_data_t *credit_data, hash_tables_t *hts, // Free client_id in list's root shm_free(credit_data->call_list->client_id.s); - shm_free(credit_data->call_list); + __free_call_t(credit_data->call_list); + credit_data->call_list = NULL; // Release the lock since we are going to free the entry down below cnxcc_unlock(credit_data->lock); @@ -975,6 +977,17 @@ void terminate_all_calls(credit_data_t *credit_data) } } +static void __free_call_t(call_t *call) +{ + str_shm_free_if_not_null(call->sip_data.callid); + str_shm_free_if_not_null(call->sip_data.to_uri); + str_shm_free_if_not_null(call->sip_data.to_tag); + str_shm_free_if_not_null(call->sip_data.from_uri); + str_shm_free_if_not_null(call->sip_data.from_tag); + + shm_free(call); +} + /* * WARNING: When calling this function, the proper lock should have been acquired */ @@ -1012,13 +1025,7 @@ static void __free_call(call_t *call) shm_free(e->key.s); shm_free(e); - str_shm_free_if_not_null(call->sip_data.callid); - str_shm_free_if_not_null(call->sip_data.to_uri); - str_shm_free_if_not_null(call->sip_data.to_tag); - str_shm_free_if_not_null(call->sip_data.from_uri); - str_shm_free_if_not_null(call->sip_data.from_tag); - - shm_free(call); + __free_call_t(call); } /* @@ -1126,14 +1133,18 @@ static credit_data_t *__get_or_create_credit_data_entry( if(e == NULL) goto no_memory; - if(shm_str_dup(&e->key, client_id) != 0) + if(shm_str_dup(&e->key, client_id) != 0) { + shm_free(e); goto no_memory; + } e->u.p = credit_data = __alloc_new_credit_data(client_id, type); e->flags = 0; - if(credit_data == NULL) + if(credit_data == NULL) { + shm_free(e); goto no_memory; + } cnxcc_lock(ht->lock); str_hash_add(sht, e); @@ -1162,7 +1173,7 @@ static credit_data_t *__alloc_new_credit_data( credit_data->call_list = shm_malloc(sizeof(call_t)); if(credit_data->call_list == NULL) goto no_memory; - + memset(credit_data->call_list, 0, sizeof(data_t)); clist_init(credit_data->call_list, next, prev); /* @@ -1195,6 +1206,13 @@ static credit_data_t *__alloc_new_credit_data( no_memory: SHM_MEM_ERROR; error: + if(credit_data) { + if(credit_data->call_list) { + str_shm_free_if_not_null(credit_data->call_list->client_id); + __free_call_t(credit_data->call_list); + } + shm_free(credit_data); + } return NULL; } @@ -1263,6 +1281,8 @@ static call_t *__alloc_new_call_by_money(credit_data_t *credit_data, error: cnxcc_unlock(credit_data->lock); + if(call) + __free_call_t(call); return NULL; } @@ -1324,6 +1344,8 @@ static call_t *__alloc_new_call_by_time( error: cnxcc_unlock(credit_data->lock); + if(call) + __free_call_t(call); return NULL; } @@ -1386,6 +1408,8 @@ static call_t *alloc_new_call_by_channel( error: cnxcc_unlock(credit_data->lock); + if(call) + __free_call_t(call); return NULL; } @@ -1443,9 +1467,10 @@ static int __add_call_by_cid(str *cid, call_t *call, credit_type_t type) SHM_MEM_ERROR; return -1; } - + memset(e, 0, sizeof(struct str_hash_entry)); if(shm_str_dup(&e->key, cid) != 0) { SHM_MEM_ERROR; + shm_free(e); return -1; }

1 0

[kamailio/kamailio] db_redis: hiredis-cluster build fix (PR #4015)
by Roman Pertsev 20 Nov '24

20 Nov '24

fix: hiredis-cluster build with or without TLS enabled Kamailio db_redis module can't be build while WITH_HIREDIS_CLUSTER is enabled. This reproducible for WITH_SSL defined or not. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4015 -- Commit Summary -- * db_redis: fix: hiredis-cluster build -- File Changes -- M src/modules/db_redis/redis_connection.h (4) M src/modules/db_redis/redis_dbase.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4015.patch https://github.com/kamailio/kamailio/pull/4015.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4015 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4015(a)github.com>

2 9

git:master:b14044fa: db_redis: fix: hiredis-cluster build fix
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: b14044fac93ef4b43584dd0e14f2b985d41745d6 URL: https://github.com/kamailio/kamailio/commit/b14044fac93ef4b43584dd0e14f2b98… Author: PertsevRoman <pertsev.roman(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T09:11:14+01:00 db_redis: fix: hiredis-cluster build fix - fixed preprocessing issues if WITH_HIREDIS_CLUSTER specified - GH #4015 --- Modified: src/modules/db_redis/Makefile Modified: src/modules/db_redis/redis_connection.h Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/b14044fac93ef4b43584dd0e14f2b98… Patch: https://github.com/kamailio/kamailio/commit/b14044fac93ef4b43584dd0e14f2b98… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index 85d9b9a956f..d5e304cc28c 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -64,9 +64,9 @@ ifneq ($(HIREDIS_CLUSTER_BUILDER),) HIREDISCLUSTERDEFS = $(shell $(HIREDIS_CLUSTER_BUILDER) --cflags) HIREDISCLUSTERLIBS = $(shell $(HIREDIS_CLUSTER_BUILDER) --libs) HIREDISCLUSTERLIBSPATH = $(shell $(HIREDIS_CLUSTER_BUILDER) --libs-only-L | cut -c 3-) - ifneq ($(shell ls $(HIREDISCLUSTERLIBSPATH) | grep libhiredis_ssl.so),) + ifneq ($(shell ls $(HIREDISCLUSTERLIBSPATH) | grep libhiredis_cluster_ssl.so),) HIREDISCLUSTERDEFS += -DWITH_SSL - HIREDISCLUSTERLIBS += -lhiredis_ssl + HIREDISCLUSTERLIBS += -lhiredis_cluster_ssl endif DEFS+=-DWITH_HIREDIS_CLUSTER DEFS+=$(HIREDISCLUSTERDEFS) diff --git a/src/modules/db_redis/redis_connection.h b/src/modules/db_redis/redis_connection.h index 62bb81f40f2..5b6f819c08b 100644 --- a/src/modules/db_redis/redis_connection.h +++ b/src/modules/db_redis/redis_connection.h @@ -25,6 +25,9 @@ #ifdef WITH_HIREDIS_CLUSTER #include <hircluster.h> +#ifdef WITH_SSL +#include <hircluster_ssl.h> +#endif #else #ifdef WITH_HIREDIS_PATH #include <hiredis/hiredis.h> diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index b3624975cf4..062911b2e10 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1020,43 +1020,51 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con, #endif #ifdef WITH_HIREDIS_CLUSTER + return 0; +err: + if(reply) + db_redis_free_reply(&reply); + return -1; } -#endif +#else -// for full table scans, we have to manually match all given keys -// but only do this once for repeated invocations -if(!*manual_keys) { - *manual_keys_count = _n; - *manual_keys = (int *)pkg_malloc(*manual_keys_count * sizeof(int)); - if(!*manual_keys) { - LM_ERR("Failed to allocate memory for manual keys\n"); - goto err; - } - memset(*manual_keys, 0, *manual_keys_count * sizeof(int)); - for(l = 0; l < _n; ++l) { - (*manual_keys)[l] = l; - } -} + // for full table scans, we have to manually match all given keys + // but only do this once for repeated invocations + if(!*manual_keys) { + *manual_keys_count = _n; + *manual_keys = (int *)pkg_malloc(*manual_keys_count * sizeof(int)); + if(!*manual_keys) { + LM_ERR("Failed to allocate memory for manual keys\n"); + goto err; + } + memset(*manual_keys, 0, *manual_keys_count * sizeof(int)); + for(l = 0; l < _n; ++l) { + (*manual_keys)[l] = l; + } + } -if(reply) { - db_redis_free_reply(&reply); -} + if(reply) { + db_redis_free_reply(&reply); + } -db_redis_key_free(&query_v); + db_redis_key_free(&query_v); -LM_DBG("got %lu entries by scan\n", (unsigned long)i); -return 0; + LM_DBG("got %lu entries by scan\n", (unsigned long)i); + return 0; -err : if(reply) db_redis_free_reply(&reply); -db_redis_key_free(&query_v); -db_redis_key_free(query_keys); -*query_keys_count = 0; -if(*manual_keys) { - pkg_free(*manual_keys); - *manual_keys = NULL; -} -return -1; -} + err: + if(reply) + db_redis_free_reply(&reply); + db_redis_key_free(&query_v); + db_redis_key_free(query_keys); + *query_keys_count = 0; + if(*manual_keys) { + pkg_free(*manual_keys); + *manual_keys = NULL; + } + return -1; + } +#endif static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, const int _n, redis_key_t **query_keys, int *query_keys_count,

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024