sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
316 discussions

git:master:302231bf: ratelimit: rename variables to prevent global structure shadowing
by Daniel-Constantin Mierla 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: 302231bf2262ef73a6aad4a2f476df7c9a3c05f0 URL: https://github.com/kamailio/kamailio/commit/302231bf2262ef73a6aad4a2f476df7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-11T15:23:55+01:00 ratelimit: rename variables to prevent global structure shadowing --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]302231bf2262ef73a6aad4a2f476df7… Patch: https://github.com/kamailio/kamailio/commit/302231bf2262ef73a6aad4a2f476df7… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 4e327460044..5cac92464db 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -924,7 +924,7 @@ static int init_params(void) * parses a "pipe_no:algorithm:bandwidth" line * \return 0 on success */ -static int parse_pipe_params(char *line, pipe_params_t *params) +static int parse_pipe_params(char *line, pipe_params_t *pparams) { regmatch_t m[4]; str algo_str; @@ -938,12 +938,12 @@ static int parse_pipe_params(char *line, pipe_params_t *params) LM_DBG("pipe: [%.*s|%.*s|%.*s]\n", RXLS(m, line, 1), RXLS(m, line, 2), RXLS(m, line, 3)); - params->no = atoi(RXS(m, line, 1)); - params->limit = atoi(RXS(m, line, 3)); + pparams->no = atoi(RXS(m, line, 1)); + pparams->limit = atoi(RXS(m, line, 3)); algo_str.s = RXS(m, line, 2); algo_str.len = RXL(m, line, 2); - if(str_map_str(algo_names, &algo_str, &params->algo)) + if(str_map_str(algo_names, &algo_str, &pparams->algo)) return -1; return 0; @@ -953,7 +953,7 @@ static int parse_pipe_params(char *line, pipe_params_t *params) * parses a "pipe_no:method" line * \return 0 on success */ -static int parse_queue_params(char *line, rl_queue_params_t *params) +static int parse_queue_params(char *line, rl_queue_params_t *qparams) { regmatch_t m[3]; int len; @@ -966,16 +966,16 @@ static int parse_queue_params(char *line, rl_queue_params_t *params) } LM_DBG("queue: [%.*s|%.*s]\n", RXLS(m, line, 1), RXLS(m, line, 2)); - params->pipe = atoi(RXS(m, line, 1)); + qparams->pipe = atoi(RXS(m, line, 1)); len = RXL(m, line, 2); - params->method.s = (char *)pkg_malloc(len + 1); - if(params->method.s == 0) { + qparams->method.s = (char *)pkg_malloc(len + 1); + if(qparams->method.s == 0) { LM_ERR("no memory left for method in params\n"); return -1; } - params->method.len = len; - memcpy(params->method.s, RXS(m, line, 2), len + 1); + qparams->method.len = len; + memcpy(qparams->method.s, RXS(m, line, 2), len + 1); return 0; } @@ -1017,19 +1017,19 @@ static int check_feedback_setpoints(int modparam) static int add_pipe_params(modparam_t type, void *val) { char *param_line = val; - pipe_params_t params; + pipe_params_t pparams; - if(parse_pipe_params(param_line, &params)) + if(parse_pipe_params(param_line, &pparams)) return -1; - if(params.no < 0 || params.no >= MAX_PIPES) { + if(pparams.no < 0 || pparams.no >= MAX_PIPES) { LM_ERR("pipe number %d not allowed (MAX_PIPES=%d, 0-based)\n", - params.no, MAX_PIPES); + pparams.no, MAX_PIPES); return -1; } - pipes[params.no].algo_mp = params.algo; - pipes[params.no].limit_mp = params.limit; + pipes[pparams.no].algo_mp = pparams.algo; + pipes[pparams.no].limit_mp = pparams.limit; return check_feedback_setpoints(1); } @@ -1037,24 +1037,24 @@ static int add_pipe_params(modparam_t type, void *val) static int add_queue_params(modparam_t type, void *val) { char *param_line = val; - rl_queue_params_t params; + rl_queue_params_t qparams; if(nqueues_mp >= MAX_QUEUES) { LM_ERR("MAX_QUEUES reached (%d)\n", MAX_QUEUES); return -1; } - if(parse_queue_params(param_line, &params)) + if(parse_queue_params(param_line, &qparams)) return -1; - if(params.pipe >= MAX_PIPES) { + if(qparams.pipe >= MAX_PIPES) { LM_ERR("pipe number %d not allowed (MAX_PIPES=%d, 0-based)\n", - params.pipe, MAX_PIPES); + qparams.pipe, MAX_PIPES); return -1; } - queues[nqueues_mp].pipe_mp = params.pipe; - queues[nqueues_mp].method_mp = params.method; + queues[nqueues_mp].pipe_mp = qparams.pipe; + queues[nqueues_mp].method_mp = qparams.method; nqueues_mp++; return 0; [View Less]

1 0

[kamailio/kamailio] http_async_client: exit mod_init if tm is not loaded (PR #3706)
by Federico Cabiddu 11 Jan '24

11 Jan '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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 - [X] 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3706 -- Commit Summary -- * http_async_client: exit mod_init if tm is not loaded -- File Changes -- M src/modules/http_async_client/http_async_client_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3706.patch https://github.com/kamailio/kamailio/pull/3706.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3706 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3706(a)github.com> [View Less]

3 4

git:master:72595fe4: http_async_client: use error log level (GH #3706)
by Henning Westerholt 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: 72595fe42d28d3e4a12341b405af63d41f827dc4 URL: https://github.com/kamailio/kamailio/commit/72595fe42d28d3e4a12341b405af63d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-11T10:30:40Z http_async_client: use error log level (GH #3706) --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:b5003620: core: keep listen socket even if advertise address does not resolve
by Daniel-Constantin Mierla 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: b50036200c5bc09fd2d412a18585b42d63763b27 URL: https://github.com/kamailio/kamailio/commit/b50036200c5bc09fd2d412a18585b42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-11T08:21:00+01:00 core: keep listen socket even if advertise address does not resolve - the core advertise_address parameter works in the same fashion - previously it was starting by skipping … [View More]

1 0

[kamailio/kamailio] rtp_media_server module hard codes contact header to "rms" (Issue #3380)
by Daniel Donoghue 11 Jan '24

11 Jan '24

### Description when using rtp_media_server module in my kamailio configuration, the `rms_answer` function generates a "200 OK" with a hard-coded Contact header user. I believe it would make more sense for this to use the To user (`$tU`) as that should be who is answering. #### Reproduction ``` route { if (t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); if (is_method("INVITE") && !has_totag()) { if (!rms_answer("rms:start_long")) { … [View More] t_reply("503", "server error"); } exit; } if (rms_dialog_check()) { rms_sip_request(); } } ``` #### Debugging Data n/a #### Log Messages n/a #### SIP Traffic ``` INVITE sip:+461812345678@123.123.example.com SIP/2.0. Via: SIP/2.0/UDP 172.21.0.3:6060;branch=z9hG4bK6810d54f. Max-Forwards: 70. From: <sip:+461812345677@172.21.0.3:6060>;tag=as21f01093. To: <sip:+461812345678@123.123.example.com>. Contact: <sip:+461812345677@172.21.0.3:6060>. Call-ID: 4f56bf7336a114d75402e30f47013748@172.21.0.3:6060. CSeq: 102 INVITE. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE. Supported: replaces, timer. Content-Type: application/sdp. Content-Length: 248. .. v=0. o=root 1511071437 1511071437 IN IP4 172.21.0.3. s=Asterisk PBX 18.10.0. c=IN IP4 172.21.0.3. t=0 0. m=audio 26516 RTP/AVP 8 101. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=ptime:20. a=maxptime:150. a=sendrecv. SIP/2.0 200 OK. Via: SIP/2.0/UDP 172.21.0.2;branch=z9hG4bK09e2.aa4ab6455ca95a0ee95268497e877cc4.2;rport=5060. Via: SIP/2.0/UDP 172.21.0.3:6060;rport=6060;branch=z9hG4bK6810d54f. From: <sip:+461812345677@172.21.0.3:6060>;tag=as21f01093. To: <sip:+461812345678@123.123.example.com>;tag=f46321019d9527ace4b30f86d231e4a2-cafc0000. Call-ID: 4f56bf7336a114d75402e30f47013748@172.21.0.3:6060. CSeq: 102 INVITE. Contact: <sip:rms@172.21.0.4:5060>. Content-Type: application/sdp. Server: kamailio (5.6.3 (aarch64/linux)). Content-Length: 99. .. v=0. o=- 1028316687 1 IN IP4 172.21.0.4. s=-. c=IN IP4 172.21.0.4. t=0 0. m=audio 51900 RTP/AVP 8. ``` ### Possible Solutions n/a ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.3 (aarch64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 ``` * **Operating System**: ``` debian bookworm ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3380 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3380(a)github.com> [View Less]

4 6

git:5.7:c5ed0e65: tls: historical code comment on repeating SSL_CTX per worker
by S-P Chan 11 Jan '24

11 Jan '24

Module: kamailio Branch: 5.7 Commit: c5ed0e65b2530443b1367986dac2b3da111c0701 URL: https://github.com/kamailio/kamailio/commit/c5ed0e65b2530443b1367986dac2b3d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-11T08:04:58+08:00 tls: historical code comment on repeating SSL_CTX per worker (cherry-pick from 29007ada5bc9e07ede3cdbce285f04d1298c0612) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/… [View More]

1 0

git:master:29007ada: tls: historical code comment on repeating SSL_CTX per worker
by S-P Chan 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: 29007ada5bc9e07ede3cdbce285f04d1298c0612 URL: https://github.com/kamailio/kamailio/commit/29007ada5bc9e07ede3cdbce285f04d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-11T08:03:07+08:00 tls: historical code comment on repeating SSL_CTX per worker --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/29007ada5bc9e07ede3cdbce285f04d… … [View More]

1 0

git:master:42bae2a6: registrar: cumpute randmized-range expire value as float and then cast
by Daniel-Constantin Mierla 10 Jan '24

10 Jan '24

Module: kamailio Branch: master Commit: 42bae2a634249fe7d8ba174eaffff0ee547f6d2b URL: https://github.com/kamailio/kamailio/commit/42bae2a634249fe7d8ba174eaffff0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T13:45:30+01:00 registrar: cumpute randmized-range expire value as float and then cast --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:403ed489: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 10 Jan '24

10 Jan '24

Module: kamailio Branch: master Commit: 403ed48995e5eec5a795edd1748f9fe8a9ee520d URL: https://github.com/kamailio/kamailio/commit/403ed48995e5eec5a795edd1748f9fe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-10T13:32:13+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] htable dmq can not get the expected result (Issue #3674)
by sznoname 10 Jan '24

10 Jan '24

### Description I have Kam207(192.168.100.207) and Kam208(192.168.100.208) here is Kam207 route: ```cfg debug=2 log_stderror=yes # mpath="/usr/local/lib/kamailio/modules/" loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "textops.so" loadmodule "dmq.so" loadmodule "htable.so" modparam("tm", "failure_reply_mode", 3) modparam("tm", "fr_timer", 30000) modparam("tm", "fr_inv_timer", 120000) modparam("dmq", "… [View More]server_address", "sip:192.168.100.207:5060") modparam("dmq", "notification_address", "sip:192.168.100.208:5060") modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 4) modparam("dmq", "ping_interval", 15) modparam("htable", "htable", "bancc=>size=10;autoexpire=3600;dmqreplicate=1;") modparam("htable", "enable_dmq", 1) modparam("htable", "dmq_init_sync", 1) request_route { # xinfo("*** $sel(msg)\n"); if(is_method("KDMQ")) { dmq_handle_message(); exit; } sl_send_reply("404", "Not here"); exit; } ``` and here is Kam208 route: ```cfg debug=2 log_stderror=yes # mpath="/usr/local/lib/kamailio/modules/" loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "textops.so" loadmodule "dmq.so" loadmodule "htable.so" modparam("tm", "failure_reply_mode", 3) modparam("tm", "fr_timer", 30000) modparam("tm", "fr_inv_timer", 120000) modparam("dmq", "server_address", "sip:192.168.100.208:5060") modparam("dmq", "notification_address", "sip:192.168.100.207:5060") modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 4) modparam("dmq", "ping_interval", 15) modparam("htable", "htable", "bancc=>size=10;autoexpire=3600;dmqreplicate=1;") modparam("htable", "enable_dmq", 1) modparam("htable", "dmq_init_sync", 1) request_route { # xinfo("*** $sel(msg)\n"); if(is_method("KDMQ")) { dmq_handle_message(); exit; } sl_send_reply("404", "Not here"); exit; } ``` at Kam207 run `kamcmd htable.seti bancc TW 1` at Kam208 run `kamcmd htable.dump bancc`, and got: ``` { entry: 779 size: 1 slot: { { name: TW value: -2147483648 type: int } } } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.7.3 (x86_64/linux) ``` * **Operating System**:  ``` Debian11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3674 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3674(a)github.com> [View Less]

2 4

← Newer
1
...
21
22
23
24
25
26
27
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2024