sr-dev

sr-dev@lists.kamailio.org

22 participants
45190 discussions

git:5.6:21fc0e01: ndb_redis: break on finding a server via sentinel
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

Module: kamailio Branch: 5.6 Commit: 21fc0e010ef97d86093d7673b5038b2e65f839cb URL: https://github.com/kamailio/kamailio/commit/21fc0e010ef97d86093d7673b5038b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:53:12+02:00 ndb_redis: break on finding a server via sentinel (cherry picked from commit cc9501663d6dd0fa91aef23ce00a7cdf86319201) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/21fc0e010ef97d86093d7673b5038b2… Patch: https://github.com/kamailio/kamailio/commit/21fc0e010ef97d86093d7673b5038b2… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index c26154930b9..88a13477758 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -155,6 +155,7 @@ int redisc_init(void) for(i= 0; i< sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -176,9 +177,9 @@ int redisc_init(void) res->element[0]->len + 1); port = atoi(res->element[1]->str); LM_DBG("sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } - } - else { + } else { res = redisCommand(redis, "SENTINEL slaves %s", sentinel_group); if( res && (res->type == REDIS_REPLY_ARRAY) ) { @@ -200,9 +201,13 @@ int redisc_init(void) } LM_DBG("slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound==1) { + break; + } } }

1 0

git:master:5c8eed0c: ndb_redis: fix index on parsing sentinel address
by Daniel-Constantin Mierla 30 Mar '23

30 Mar '23

Module: kamailio Branch: master Commit: 5c8eed0ce78d029f28a1819262516940b7dd749e URL: https://github.com/kamailio/kamailio/commit/5c8eed0ce78d029f28a181926251694… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:49:27+02:00 ndb_redis: fix index on parsing sentinel address --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/5c8eed0ce78d029f28a181926251694… Patch: https://github.com/kamailio/kamailio/commit/5c8eed0ce78d029f28a181926251694… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index a3ee1c332d..08f6ad8fc6 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -163,7 +163,7 @@ int redisc_init(void) port = 6379; if( (pos = strchr(sentinelAddr, ':')) != NULL ) { port = atoi(pos+1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:master:2c540b67: Revert "pike: use pkg_malloc/pkg_free instead of system malloc"
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 2c540b67a8a3f15835583926bfdef7cf6b71b4bf URL: https://github.com/kamailio/kamailio/commit/2c540b67a8a3f15835583926bfdef7c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T13:44:44Z Revert "pike: use pkg_malloc/pkg_free instead of system malloc" This reverts commit 6492a6f905075fa73d911c345fe784f2d3c085e5. --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/2c540b67a8a3f15835583926bfdef7c… Patch: https://github.com/kamailio/kamailio/commit/2c540b67a8a3f15835583926bfdef7c… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index c7894604b6..6940e84ca6 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -79,10 +79,10 @@ int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned int expires, pike_node_status_t status ) { struct TopListItem_t *new_item - = (struct TopListItem_t *)pkg_malloc(sizeof(struct TopListItem_t)); + = (struct TopListItem_t *)malloc(sizeof(struct TopListItem_t)); if(!new_item) { - PKG_MEM_ERROR; + SYS_MEM_ERROR; return -1; } print_addr(ip_addr, addr_len); @@ -119,7 +119,7 @@ void pike_top_list_clear() top_list_iter = top_list_root; while (top_list_iter) { ptr = top_list_iter->next; - pkg_free(top_list_iter); + free(top_list_iter); top_list_iter = ptr; } top_list_root = 0;

1 0

Re: [kamailio/kamailio] pike: use pkg_malloc/pkg_free instead of system malloc (6492a6f)
by Daniel-Constantin Mierla 29 Mar '23

29 Mar '23

Probably this has to reverted, several rpc commands use system malloc on purpose if they might be returning a lot of data. Otherwise they will fail and allocating a lot of pkg at startup just for punctual needs of rpc commands is not recommended. So, do not blindly replace system malloc/free with pkg variants if it is about rpc. jsonrpcs also uses system malloc, ctl as well, iirc ... -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f2d3c085e5/106580236(a)github.com>

2 1

git:master:18698fa9: gzcompress: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 18698fa9f8e242cf59273538baca448ea68d6194 URL: https://github.com/kamailio/kamailio/commit/18698fa9f8e242cf59273538baca448… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T11:36:15Z gzcompress: convert to memory logging helper --- Modified: src/modules/gzcompress/gzcompress_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18698fa9f8e242cf59273538baca448… Patch: https://github.com/kamailio/kamailio/commit/18698fa9f8e242cf59273538baca448… --- diff --git a/src/modules/gzcompress/gzcompress_mod.c b/src/modules/gzcompress/gzcompress_mod.c index 3ff22d723de..4d7e24870f3 100644 --- a/src/modules/gzcompress/gzcompress_mod.c +++ b/src/modules/gzcompress/gzcompress_mod.c @@ -222,7 +222,7 @@ int gzc_set_msg_body(sip_msg_t *msg, str *obody, str *nbody) buf=pkg_malloc(nbody->len * sizeof(char)); if (buf==0) { - LM_ERR("out of pkg memory\n"); + PKG_MEM_ERROR; return -1; } memcpy(buf, nbody->s, nbody->len);

1 0

git:master:246e25f0: nathelper: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 246e25f0e8c6ca933accf1bd57fea1f43e8346f5 URL: https://github.com/kamailio/kamailio/commit/246e25f0e8c6ca933accf1bd57fea1f… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T11:27:56Z nathelper: convert to memory logging helper --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/246e25f0e8c6ca933accf1bd57fea1f… Patch: https://github.com/kamailio/kamailio/commit/246e25f0e8c6ca933accf1bd57fea1f…

1 0

git:master:41c814b7: imc: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 41c814b7cfbed2d89099840c29580d99b2a3cc47 URL: https://github.com/kamailio/kamailio/commit/41c814b7cfbed2d89099840c29580d9… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T11:32:56Z imc: convert to memory logging helper --- Modified: src/modules/imc/imc_cmd.c Modified: src/modules/imc/imc_mng.c --- Diff: https://github.com/kamailio/kamailio/commit/41c814b7cfbed2d89099840c29580d9… Patch: https://github.com/kamailio/kamailio/commit/41c814b7cfbed2d89099840c29580d9… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index ea76e79816..4e0925ac6b 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -172,7 +172,7 @@ static int build_uri(str *res, str value, struct sip_uri *template) } if ((res->s = (char*)pkg_malloc(len)) == NULL) { - LM_ERR("No memory left\n"); + PKG_MEM_ERROR; return -1; } res->len = len; @@ -716,7 +716,7 @@ int imc_handle_invite(struct sip_msg* msg, imc_cmd_t *cmd, LM_ERR("Truncated message '%.*s'\n", STR_FMT(&body)); if ((cback_param = (del_member_t*)shm_malloc(sizeof(del_member_t))) == NULL) { - LM_ERR("No shared memory left\n"); + SHM_MEM_ERROR; goto error; } memset(cback_param, 0, sizeof(del_member_t)); diff --git a/src/modules/imc/imc_mng.c b/src/modules/imc/imc_mng.c index 73c2d68caf..89c32c80cb 100644 --- a/src/modules/imc/imc_mng.c +++ b/src/modules/imc/imc_mng.c @@ -56,7 +56,7 @@ int imc_htable_init(void) _imc_htable = (imc_hentry_p)shm_malloc(imc_hash_size*sizeof(imc_hentry_t)); if(_imc_htable == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(_imc_htable, 0, imc_hash_size*sizeof(imc_hentry_t)); @@ -494,7 +494,7 @@ imc_room_p imc_add_room(str* name, str* domain, int flags) irp = (imc_room_p)shm_malloc(size); if(irp==NULL) { - LM_ERR("no more shm memory left\n"); + SHM_MEM_ERROR; return NULL; } memset(irp, 0, size); @@ -671,7 +671,7 @@ imc_member_p imc_add_member(imc_room_p room, str* user, str* domain, int flags) imp = (imc_member_p)shm_malloc(size); if(imp== NULL) { - LM_ERR("out of shm memory\n"); + SHM_MEM_ERROR; return NULL; } memset(imp, 0, size);

1 0

git:master:93011f82: misctest: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 93011f8292c568f67bf5127ae7e092ec773df1a7 URL: https://github.com/kamailio/kamailio/commit/93011f8292c568f67bf5127ae7e092e… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T11:34:50Z misctest: convert to memory logging helper --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/93011f8292c568f67bf5127ae7e092e… Patch: https://github.com/kamailio/kamailio/commit/93011f8292c568f67bf5127ae7e092e… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index e0108b5a76b..575bc618e8b 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -244,7 +244,11 @@ static int misctest_memory_init(void) { alloc_lst = shm_malloc(sizeof(*alloc_lst)); if(alloc_lst == 0) + { + SHM_MEM_ERROR; goto error; + } + alloc_lst->chunks = 0; atomic_set_long(&alloc_lst->size, 0); atomic_set_int(&alloc_lst->no, 0); @@ -252,7 +256,10 @@ static int misctest_memory_init(void) goto error; rndt_lst = shm_malloc(sizeof(*rndt_lst)); if(rndt_lst == 0) + { + SHM_MEM_ERROR; goto error; + } rndt_lst->tests = 0; atomic_set_int(&rndt_lst->last_id, 0); if(lock_init(&rndt_lst->lock) == 0) @@ -469,7 +476,10 @@ static int mem_track(void *addr, unsigned long size) mc = shm_malloc(sizeof(*mc)); if(mc == 0) + { + SHM_MEM_ERROR; goto error; + } mc->addr = addr; mc->size = size; mc->flags = 0; @@ -782,7 +792,10 @@ static int mem_leak_time_test(unsigned long min, unsigned long max, tst = shm_malloc(sizeof(*tst)); if(tst == 0) + { + SHM_MEM_ERROR; goto error; + } memset(tst, 0, sizeof(*tst)); id = tst->id = atomic_add_int(&rndt_lst->last_id, 1); tst->min = min;

1 0

git:master:7be6d78f: msrp: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 7be6d78f5f9ee7aacef1a73321d4a384a7722077 URL: https://github.com/kamailio/kamailio/commit/7be6d78f5f9ee7aacef1a73321d4a38… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:52:04Z msrp: convert to memory logging helper --- Modified: src/modules/msrp/msrp_cmap.c Modified: src/modules/msrp/msrp_parser.c Modified: src/modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/7be6d78f5f9ee7aacef1a73321d4a38… Patch: https://github.com/kamailio/kamailio/commit/7be6d78f5f9ee7aacef1a73321d4a38… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index 2fc6a8d740b..42100f4f905 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -73,7 +73,7 @@ int msrp_cmap_init(int msize) _msrp_cmap_head = (msrp_cmap_t*)shm_malloc(sizeof(msrp_cmap_t)); if(_msrp_cmap_head==NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(_msrp_cmap_head, 0, sizeof(msrp_cmap_t)); @@ -83,7 +83,7 @@ int msrp_cmap_init(int msize) _msrp_cmap_head->mapsize*sizeof(msrp_centry_t) ); if(_msrp_cmap_head->cslots==NULL) { - LM_ERR("no more shm.\n"); + SHM_MEM_ERROR; shm_free(_msrp_cmap_head); _msrp_cmap_head = NULL; return -1; @@ -234,7 +234,7 @@ int msrp_cmap_save(msrp_frame_t *mf) it = (msrp_citem_t*)shm_malloc(msize); if(it==NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(it, 0, msize); diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index c701d6a6cad..0b36288b67c 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -270,7 +270,7 @@ int msrp_parse_headers(msrp_frame_t *mf) hdr = (msrp_hdr_t*)pkg_malloc(sizeof(msrp_hdr_t)); if(hdr==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } memset(hdr, 0, sizeof(msrp_hdr_t)); @@ -636,7 +636,7 @@ int msrp_explode_str(str_array_t *arr, str *in, str *del) larr = pkg_mallocxz(n * sizeof(str)); if(larr==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } @@ -712,7 +712,7 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) arr = pkg_mallocxz(sizeof(str_array_t)); if(arr==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } diff --git a/src/modules/msrp/msrp_vars.c b/src/modules/msrp/msrp_vars.c index 8384ff09107..b9d14b03b7a 100644 --- a/src/modules/msrp/msrp_vars.c +++ b/src/modules/msrp/msrp_vars.c @@ -339,7 +339,7 @@ int tr_msrp_eval_msrpuri(struct sip_msg *msg, tr_param_t *tp, int subtype, _tr_msrpuri.s = (char*)pkg_malloc((val->rs.len+1)*sizeof(char)); if(_tr_msrpuri.s==NULL) { - LM_ERR("no more private memory\n"); + PKG_MEM_ERROR; memset(&_tr_msrpuri, 0, sizeof(str)); memset(&_tr_parsed_msrpuri, 0, sizeof(msrp_uri_t)); return -1;

1 0

git:master:0f559ea7: ipops: convert to memory logging helper, add missing error logging
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 0f559ea761e2b1b140096d414b6f3d624068366b URL: https://github.com/kamailio/kamailio/commit/0f559ea761e2b1b140096d414b6f3d6… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T10:40:16Z ipops: convert to memory logging helper, add missing error logging --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0f559ea761e2b1b140096d414b6f3d6… Patch: https://github.com/kamailio/kamailio/commit/0f559ea761e2b1b140096d414b6f3d6… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 4eabbcac86c..c8cd5994063 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -117,14 +117,14 @@ sr_dns_item_t *sr_dns_add_item(str *name) it = (sr_dns_item_t*)pkg_malloc(sizeof(sr_dns_item_t)); if(it==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return NULL; } memset(it, 0, sizeof(sr_dns_item_t)); it->name.s = (char*)pkg_malloc(name->len+1); if(it->name.s==NULL) { - LM_ERR("no more pkg.\n"); + PKG_MEM_ERROR; pkg_free(it); return NULL; } @@ -154,8 +154,10 @@ int pv_parse_dns_name(pv_spec_t *sp, str *in) dpv = (dns_pv_t*)pkg_malloc(sizeof(dns_pv_t)); if(dpv==NULL) + { + PKG_MEM_ERROR; return -1; - + } memset(dpv, 0, sizeof(dns_pv_t)); p = in->s; @@ -473,7 +475,7 @@ int hn_pv_data_init(void) _hn_data = (struct _hn_pv_data*)pkg_malloc(sizeof(struct _hn_pv_data)+46+2*(hlen+1)); if(_hn_data==NULL) { - LM_ERR("no more pkg to init hostname data\n"); + PKG_MEM_ERROR; return -1; } memset(_hn_data, 0, sizeof(struct _hn_pv_data)+46+2*(hlen+1)); @@ -672,13 +674,13 @@ sr_srv_item_t *sr_srv_add_item (str *pvid, int findflg) pitem = (sr_srv_item_t *) pkg_malloc (sizeof (sr_srv_item_t)); if (!pitem) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; return NULL; } memset (pitem, 0, sizeof (sr_srv_item_t)); pitem->pvid.s = (char *) pkg_malloc (pvid->len + 1); if (!pitem->pvid.s) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; pkg_free (pitem); return NULL; } @@ -879,7 +881,7 @@ int pv_parse_srv_name (pv_spec_t *sp, str *in) return -1; dpv = (srv_pv_t *) pkg_malloc (sizeof (srv_pv_t)); if (!dpv) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; return -1; } memset (dpv, 0, sizeof (srv_pv_t)); @@ -1227,14 +1229,14 @@ sr_naptr_item_t *sr_naptr_add_item(str *pvid, int findflg) pitem = (sr_naptr_item_t *)pkg_malloc(sizeof (sr_naptr_item_t)); if (!pitem) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; return NULL; } memset(pitem, 0, sizeof(sr_naptr_item_t)); pitem->pvid.s = (char *)pkg_malloc(pvid->len + 1); if (!pitem->pvid.s) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; pkg_free(pitem); return NULL; } @@ -1314,7 +1316,7 @@ int pv_parse_naptr_name(pv_spec_t *sp, str *in) /* alloc/init pvid structure */ dpv = (naptr_pv_t *)pkg_malloc(sizeof(naptr_pv_t)); if (!dpv) { - LM_ERR ("No more pkg memory!\n"); + PKG_MEM_ERROR; return -1; } memset(dpv, 0, sizeof(naptr_pv_t));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev