sr-dev March 2023

sr-dev@lists.kamailio.org

14 participants
250 discussions

[kamailio/kamailio] uac_redirect: Module fails to load [regression] (Issue #3188)

by Alex Hermann

The uac_redirect fails to load in 5.6. It used to load fine before. It is complaining about the acc API, which it never did before. I don't use the acc module and fail to see why uac_redirect would need it. ``` 2022-07-15T14:41:43.813169+02:00 pc1 proxy1[381424]: ERROR: uac_redirect [../../modules/acc/acc_api.h:191]: acc_load_api(): cannot find bind_acc 2022-07-15T14:41:43.813232+02:00 pc1 proxy1[381424]: ERROR: uac_redirect [uac_redirect.c:254]: redirect_init(): cannot bind to ACC API 2022-07-15T14:41:43.813283+02:00 pc1 proxy1[381424]: ERROR: <core> [core/sr_module.c:971]: init_mod(): Error while initializing module uac_redirect (/usr/lib/x86_64-linux-gnu/kamailio/modules/uac_redirect.so) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3188 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3188(a)github.com>

1 year, 8 months

[kamailio/kamailio] core:tcp allow to handle TCP connections with tcp_accept_haproxy=yes flag even message does not contain PROXY protocol header (#2206)

by ovoshlook

Covers setups when kamailio behind the service with HAPROXY protocol support but in other hand it also serves requests from other services that available per direct connection (such as B2BUA in the same local network). #### Pre-Submission Checklist - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [*] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [*] PR should be backported to stable branches - [*] Tested changes locally #### Description - function tcpconn_read_haproxy() returns 2 if PROXY header NOT found. - Message about no header shown at the debug level. - No errors - TCP connection successfully establishes You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2206 -- Commit Summary -- * handle tcp request with tcp_accept_haproxy even no PROXY header found * core:tcp allow to handle TCP connections even message does not contain PROXY protocol header * core:tcp allow to handle TCP connections even message does not contain PROXY protocol header -- File Changes -- M src/core/tcp_main.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2206.patch https://github.com/kamailio/kamailio/pull/2206.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2206

1 year, 8 months

git:5.5:bbb40895: ndb_redis: fix index on parsing sentinel address

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: bbb40895bc74810b37df2760bee309025fca27af URL: https://github.com/kamailio/kamailio/commit/bbb40895bc74810b37df2760bee3090… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:54:26+02:00 ndb_redis: fix index on parsing sentinel address (cherry picked from commit 5c8eed0ce78d029f28a1819262516940b7dd749e) (cherry picked from commit d4ff1550a7c7f9647236f03559dc2fc3106a2b8d) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/bbb40895bc74810b37df2760bee3090… Patch: https://github.com/kamailio/kamailio/commit/bbb40895bc74810b37df2760bee3090… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index fd6e124bdc..50efb1906e 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -160,7 +160,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 year, 8 months

git:5.5:31e116cc: ndb_redis: break on finding a server via sentinel

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 31e116ccf0ad444cef81d47f123a73038453667a URL: https://github.com/kamailio/kamailio/commit/31e116ccf0ad444cef81d47f123a730… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:54:21+02:00 ndb_redis: break on finding a server via sentinel (cherry picked from commit cc9501663d6dd0fa91aef23ce00a7cdf86319201) (cherry picked from commit 21fc0e010ef97d86093d7673b5038b2e65f839cb) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/31e116ccf0ad444cef81d47f123a730… Patch: https://github.com/kamailio/kamailio/commit/31e116ccf0ad444cef81d47f123a730… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index ccdff060bfd..fd6e124bdc0 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -153,6 +153,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; @@ -174,9 +175,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) ) { @@ -198,9 +199,13 @@ int redisc_init(void) } LM_DBG("slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound==1) { + break; + } } }

1 year, 8 months

git:5.6:d4ff1550: ndb_redis: fix index on parsing sentinel address

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: d4ff1550a7c7f9647236f03559dc2fc3106a2b8d URL: https://github.com/kamailio/kamailio/commit/d4ff1550a7c7f9647236f03559dc2fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-30T12:53:27+02:00 ndb_redis: fix index on parsing sentinel address (cherry picked from commit 5c8eed0ce78d029f28a1819262516940b7dd749e) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/d4ff1550a7c7f9647236f03559dc2fc… Patch: https://github.com/kamailio/kamailio/commit/d4ff1550a7c7f9647236f03559dc2fc… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 88a1347775..5c5ad3343a 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -162,7 +162,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 year, 8 months

git:5.6:21fc0e01: ndb_redis: break on finding a server via sentinel

by Daniel-Constantin Mierla

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 year, 8 months

git:master:5c8eed0c: ndb_redis: fix index on parsing sentinel address

by Daniel-Constantin Mierla

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 year, 8 months

git:master:2c540b67: Revert "pike: use pkg_malloc/pkg_free instead of system malloc"

by Henning Westerholt

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 year, 8 months

Re: [kamailio/kamailio] pike: use pkg_malloc/pkg_free instead of system malloc (6492a6f)

by Daniel-Constantin Mierla

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>

1 year, 8 months

git:master:18698fa9: gzcompress: convert to memory logging helper

by Henning Westerholt

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 year, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2023