- sr-dev - kamailio.org

git:master:cb92b6a2: topos: prefix global variable
by Daniel-Constantin Mierla 12 Jan '24

12 Jan '24

Module: kamailio Branch: master Commit: cb92b6a23d622b06bcb18195b5c0525fcd273e7a URL: https://github.com/kamailio/kamailio/commit/cb92b6a23d622b06bcb18195b5c0525… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T19:53:57+01:00 topos: prefix global variable --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cb92b6a23d622b06bcb18195b5c0525… Patch: https://github.com/kamailio/kamailio/commit/cb92b6a23d622b06bcb18195b5c0525… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 7bcb2fea3c9..e37ca847beb 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -134,7 +134,7 @@ str _tps_xavu_field_contact_host = STR_NULL; str _tps_context_param = STR_NULL; str _tps_context_value = STR_NULL; -sanity_api_t scb; +static sanity_api_t _tps_scb; int tps_msg_received(sr_event_param_t *evp); int tps_msg_sent(sr_event_param_t *evp); @@ -297,7 +297,7 @@ static int mod_init(void) } if(_tps_sanity_checks != 0) { - if(sanity_load_api(&scb) < 0) { + if(sanity_load_api(&_tps_scb) < 0) { LM_ERR("cannot bind to sanity module\n"); goto error; } @@ -539,7 +539,7 @@ int tps_msg_received(sr_event_param_t *evp) if(msg.first_line.type == SIP_REQUEST) { if(_tps_sanity_checks != 0) { - if(scb.check_defaults(&msg) < 1) { + if(_tps_scb.check_defaults(&msg) < 1) { LM_ERR("sanity checks failed\n"); goto done; }

1 0

git:master:987e21a9: xhttp: prefix for global variable
by Daniel-Constantin Mierla 12 Jan '24

12 Jan '24

Module: kamailio Branch: master Commit: 987e21a914edcebc9eafe21af19c8a476bf73b06 URL: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T19:50:28+01:00 xhttp: prefix for global variable --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… Patch: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index 0660d409af6..af27baffa41 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -65,7 +65,7 @@ static char *xhttp_url_skip = NULL; static regex_t xhttp_url_skip_regexp; /** SL API structure */ -sl_api_t slb; +static sl_api_t _xhttp_slb; static str xhttp_event_callback = STR_NULL; @@ -149,7 +149,7 @@ static int mod_init(void) } /* bind the SL API */ - if(sl_load_api(&slb) != 0) { + if(sl_load_api(&_xhttp_slb) != 0) { LM_ERR("cannot bind to SL API\n"); return -1; } @@ -424,7 +424,7 @@ static int xhttp_send_reply( LM_DBG("response with body: %.*s\n", body->len, body->s); } LM_DBG("sending out response: %d %.*s\n", code, reason->len, reason->s); - if(slb.sreply(msg, code, reason) < 0) { + if(_xhttp_slb.sreply(msg, code, reason) < 0) { LM_ERR("Error while sending reply\n"); return -1; }

1 0

git:master:0479c40f: mohqueue: rename local variables to prevent shadowing the global
by Daniel-Constantin Mierla 12 Jan '24

12 Jan '24

Module: kamailio Branch: master Commit: 0479c40fe6fd6765de92eea8f9e0bf04dea8cbd0 URL: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T14:37:02+01:00 mohqueue: rename local variables to prevent shadowing the global --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… Patch: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 75130381746..599e5eb8a1a 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -1278,17 +1278,17 @@ int form_rtp_SDP(str *pstr, call_lst *pcall, char *pSDP) **********/ char *pfncname = "form_rtp_SDP: "; - rtpmap **pmohfiles = + rtpmap **lpmohfiles = find_MOH(pcall->pmohq->mohq_mohdir, pcall->pmohq->mohq_mohfile); - if(!pmohfiles[0]) { + if(!lpmohfiles[0]) { LM_ERR("%sUnable to find any MOH files for queue (%s)!\n", pfncname, pcall->pmohq->mohq_name); return 0; } int nsize = strlen(pSDP) + 2; int nidx; - for(nidx = 0; pmohfiles[nidx]; nidx++) { - nsize += strlen(pmohfiles[nidx]->pencode) // encode length + for(nidx = 0; lpmohfiles[nidx]; nidx++) { + nsize += strlen(lpmohfiles[nidx]->pencode) // encode length + 19; // space, type number, "a=rtpmap:%d ", EOL } @@ -1707,7 +1707,7 @@ void reinvite_msg(sip_msg_t *pmsg, call_lst *pcall) * o look for hold condition and matching payload type **********/ - rtpmap **pmohfiles = + rtpmap **lpmohfiles = find_MOH(pcall->pmohq->mohq_mohdir, pcall->pmohq->mohq_mohfile); int bhold = 0; int bmatch = 0; @@ -1749,8 +1749,8 @@ void reinvite_msg(sip_msg_t *pmsg, call_lst *pcall) ppayload = ppayload->next) { int ntype = atoi(ppayload->rtp_payload.s); int nidx; - for(nidx = 0; pmohfiles[nidx]; nidx++) { - if(pmohfiles[nidx]->ntype == ntype) { + for(nidx = 0; lpmohfiles[nidx]; nidx++) { + if(lpmohfiles[nidx]->ntype == ntype) { bmatch = 1; break; }

1 0

git:master:0ea60341: avp: rename local variable to prevent shadowing the global structure
by Daniel-Constantin Mierla 12 Jan '24

12 Jan '24

Module: kamailio Branch: master Commit: 0ea603413de9505b5312e5930168102e816dced3 URL: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T13:10:33+01:00 avp: rename local variable to prevent shadowing the global structure --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… Patch: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index 38fa08fe1cb..d04fe47f880 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1454,7 +1454,7 @@ static int attr_hdr_body2attrs2( static int attr_hdr_body2attrs_fixup(void **param, int param_no) { - char *c, *params; + char *c, *sparams; hdr_name_t *h = NULL; int n; str *s; @@ -1467,9 +1467,9 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) c); return E_CFG; } else { - params = strchr(c, PARAM_DELIM); - if(params) - n = params - c; + sparams = strchr(c, PARAM_DELIM); + if(sparams) + n = sparams - c; else n = strlen(c); if(n == 0) { @@ -1486,10 +1486,10 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) h->name.s.s = (char *)h + sizeof(hdr_name_t); memcpy(h->name.s.s, c, n + 1); } - if(params) { + if(sparams) { h->val_types = 0; - while(*params) { - switch(*params) { + while(*sparams) { + switch(*sparams) { case 'i': case 'I': h->val_types = VAL_TYPE_INT; @@ -1504,11 +1504,11 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", - params); + sparams); pkg_free(h); return E_CFG; } - params++; + sparams++; } if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier "

1 0

[kamailio/kamailio] Rtpengine fixes (PR #3710)
by Xenofon Karamanos 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR add support for the `codec-accept` and `codec-consume` flags of rtpengine (supported since [mr9.2.1](https://github.com/sipwise/rtpengine/commit/336cb5b280079b0e7b2412…). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3710 -- Commit Summary -- * rtpengine: Add support for codec-accept and codec-consume * rtpengine/docs: Add codec-consume docs -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (5) M src/modules/rtpengine/rtpengine.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3710.patch https://github.com/kamailio/kamailio/pull/3710.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3710 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3710(a)github.com>

4 7

git:master:1671c964: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: 1671c96462f76d902b4c331c2f51e99cd2e33af1 URL: https://github.com/kamailio/kamailio/commit/1671c96462f76d902b4c331c2f51e99… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-11T17:17:12+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/1671c96462f76d902b4c331c2f51e99… Patch: https://github.com/kamailio/kamailio/commit/1671c96462f76d902b4c331c2f51e99… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 96693dcd018..7cfc4772863 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2419,6 +2419,9 @@ rtpengine_offer(); still be accepted towards the original offerer and then used for transcoding. It is a more selective version of what the `always transcode` flag does. + + codec-consume=... - Identical to mask but enables the + transcoding engine even if no other transcoding related + options are given. + T.38=decode - If the offered SDP contains a media section advertising T.38 over UDPTL, translate it to a regular audio media section over RTP. By default, PCMU and PCMA will be used

1 0

git:master:1aec0c13: rtpengine/docs: Add codec-consume docs
by Victor Seva 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: 1aec0c1397e4230e52f2b9427fdb32b10f649ecb URL: https://github.com/kamailio/kamailio/commit/1aec0c1397e4230e52f2b9427fdb32b… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-11T17:04:07+01:00 rtpengine/docs: Add codec-consume docs --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1aec0c1397e4230e52f2b9427fdb32b… Patch: https://github.com/kamailio/kamailio/commit/1aec0c1397e4230e52f2b9427fdb32b… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 1e394453493..fea67a665a2 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2746,6 +2746,11 @@ rtpengine_offer(); version of what the `always transcode` flag does. </para></listitem> + <listitem><para> + <emphasis>codec-consume=...</emphasis> - Identical to mask but enables the transcoding engine even if no other transcoding + related options are given. + </para></listitem> + <listitem><para> <emphasis>T.38=decode</emphasis> - If the offered &sdp; contains a media section advertising T.38 over UDPTL, translate it to a regular audio media section

1 0

git:master:a40d5b7d: rtpengine: Add support for codec-accept and codec-consume
by Victor Seva 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: a40d5b7d65394606f2200a5932284b874e196063 URL: https://github.com/kamailio/kamailio/commit/a40d5b7d65394606f2200a5932284b8… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-11T17:04:07+01:00 rtpengine: Add support for codec-accept and codec-consume --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a40d5b7d65394606f2200a5932284b8… Patch: https://github.com/kamailio/kamailio/commit/a40d5b7d65394606f2200a5932284b8… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 11745d6b863..e3e4c6e1d50 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -126,7 +126,8 @@ struct ng_flags_parse { int via, to, packetize, transport, directional; bencode_item_t *dict, *flags, *direction, *replace, *rtcp_mux, *sdes, *t38, *received_from, *codec, *codec_strip, *codec_offer, - *codec_transcode, *codec_mask, *codec_set, *codec_except; + *codec_transcode, *codec_mask, *codec_set, *codec_except, *codec_accept, + *codec_consume; str call_id, from_tag, to_tag; }; @@ -2735,6 +2736,12 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, if(parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, "except", &ng_flags->codec_except)) goto next; + if(parse_codec_flag(ng_flags, &key, &val, "codec-accept", NULL, + "accept", &ng_flags->codec_accept)) + goto next; + if(parse_codec_flag(ng_flags, &key, &val, "codec-consume", NULL, + "consume", &ng_flags->codec_consume)) + goto next; /* check for specially handled items */ switch(key.len) {

1 0

[kamailio/kamailio] UAC module ：uac_reg_tm_callback(): got sip response 408 (Issue #3707)
by QWERTY 11 Jan '24

11 Jan '24

Register with remote，if there is no response to request，get in the logs an error message like: ERROR: uac [uac_reg.c:1001]: uac_reg_tm_callback(): got sip response 408 while registering How to get this timeout information in routing ? event_route[ ] ？ -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3707 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3707(a)github.com>

2 2

git:master:b678e66a: p_usrloc: rename short global variable
by Daniel-Constantin Mierla 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: b678e66a974f3f88f5ed05e57e5d898e4715fe0a URL: https://github.com/kamailio/kamailio/commit/b678e66a974f3f88f5ed05e57e5d898… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-11T15:34:33+01:00 p_usrloc: rename short global variable --- Modified: src/modules/p_usrloc/ul_db_handle.c --- Diff: https://github.com/kamailio/kamailio/commit/b678e66a974f3f88f5ed05e57e5d898… Patch: https://github.com/kamailio/kamailio/commit/b678e66a974f3f88f5ed05e57e5d898…

1 0

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/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;

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>

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/72595fe42d28d3e4a12341b405af63d… Patch: https://github.com/kamailio/kamailio/commit/72595fe42d28d3e4a12341b405af63d… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index e9f6cb0d26b..983a9e387f1 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -294,7 +294,7 @@ static int mod_init(void) } if(load_tm_api(&tmb) < 0) { - LM_INFO("cannot load the TM-functions - async relay disabled\n"); + LM_ERR("cannot load the TM-functions - async relay disabled\n"); return -1; }

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 the listen, which resulted in unexpected runtime list of sockets --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/b50036200c5bc09fd2d412a18585b42… Patch: https://github.com/kamailio/kamailio/commit/b50036200c5bc09fd2d412a18585b42… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 3f67f16981b..e048e0e2c4b 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -361,11 +361,13 @@ static inline struct socket_info *new_sock_info(char *name, he = resolvehost(si->useinfo.name.s); if(he == 0) { - LM_ERR("unable to resolve advertised name %s\n", + LM_WARN("unable to resolve advertised name %s\n", si->useinfo.name.s); - goto error; + si->useinfo.address.len = 0; + si->useinfo.address.af = 0; + } else { + hostent2ip_addr(&si->useinfo.address, he, 0); } - hostent2ip_addr(&si->useinfo.address, he, 0); } return si; error:

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")) { 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>

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/kamailio/kamailio/commit/c5ed0e65b2530443b1367986dac2b3d… Patch: https://github.com/kamailio/kamailio/commit/c5ed0e65b2530443b1367986dac2b3d… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 7cad1b046e4..beaf1b7b70b 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -433,6 +433,16 @@ static int tls_engine_init(); int tls_fix_engine_keys(tls_domains_cfg_t *, tls_domain_t *, tls_domain_t *); #endif +/* + * OpenSSL 1.1.1+: SSL_CTX is repeated in each worker + * + * OpenSSL RSA blinding works in single-process multi-threaded mode + * and depends on pthread_self() to separate threads. In Kamailio multi-process workers + * pthread_self() will not necessarily be unique, this will result in incorrect BN + * operations��hence we create a separate SSL_CTX for each worker + * + * EC operations do not use pthread_self(), so could use shared SSL_CTX + */ static int mod_child(int rank) { if(tls_disable || (tls_domains_cfg == 0))

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… Patch: https://github.com/kamailio/kamailio/commit/29007ada5bc9e07ede3cdbce285f04d… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 7cad1b046e4..beaf1b7b70b 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -433,6 +433,16 @@ static int tls_engine_init(); int tls_fix_engine_keys(tls_domains_cfg_t *, tls_domain_t *, tls_domain_t *); #endif +/* + * OpenSSL 1.1.1+: SSL_CTX is repeated in each worker + * + * OpenSSL RSA blinding works in single-process multi-threaded mode + * and depends on pthread_self() to separate threads. In Kamailio multi-process workers + * pthread_self() will not necessarily be unique, this will result in incorrect BN + * operations��hence we create a separate SSL_CTX for each worker + * + * EC operations do not use pthread_self(), so could use shared SSL_CTX + */ static int mod_child(int rank) { if(tls_disable || (tls_domains_cfg == 0))

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/42bae2a634249fe7d8ba174eaffff0e… Patch: https://github.com/kamailio/kamailio/commit/42bae2a634249fe7d8ba174eaffff0e… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index 9ef2c37db47..69e8606fbc1 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -48,15 +48,17 @@ static struct hdr_field *act_contact; */ static inline int randomize_expires(int expires, int range) { - int range_min; + float range_min; /* if no range is given just return expires */ if(range == 0) return expires; - range_min = expires - (float)range / 100 * expires; + range_min = (float)expires * (1.0 - ((float)range / 100)); - return range_min + (float)(kam_rand() % 100) / 100 * (expires - range_min); + return (int)(range_min + + ((float)(kam_rand() % 100) / 100) + * ((float)expires - range_min)); }

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/403ed48995e5eec5a795edd1748f9fe… Patch: https://github.com/kamailio/kamailio/commit/403ed48995e5eec5a795edd1748f9fe…

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", "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>

2 4

git:master:bbb81e5f: usrloc: docs for ka_randomize parameter
by Daniel-Constantin Mierla 10 Jan '24

10 Jan '24

Module: kamailio Branch: master Commit: bbb81e5f6ef5744cc9b74302e8ecee6687199872 URL: https://github.com/kamailio/kamailio/commit/bbb81e5f6ef5744cc9b74302e8ecee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T13:20:34+01:00 usrloc: docs for ka_randomize parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bbb81e5f6ef5744cc9b74302e8ecee6… Patch: https://github.com/kamailio/kamailio/commit/bbb81e5f6ef5744cc9b74302e8ecee6… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 77b18989b4b..d7d78ae7b00 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1481,6 +1481,31 @@ modparam("usrloc", "ka_interval", 30) </example> </section> + <section id="usrloc.p.ka_randomize"> + <title><varname>ka_randomize</varname> (int)</title> + <para> + The parameter sets the the upper limit to the range of random seconds + to be added to ka_interval before checking if a new keepalive request + has to be sent. It should help to distribute better the sending of + keepalive requests. The keepalive for a location record is going to be + sent in a random fashion between (ka_interval + 0) and + (ka_interval + ka_randomize). + </para> + <para> + <emphasis> + Default value is <quote>20</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ka_randomize</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_interval", 30) +... +</programlisting> + </example> + </section> + <section id="usrloc.p.ka_loglevel"> <title><varname>ka_loglevel</varname> (int)</title> <para>

1 0

git:master:5bf1a7ab: usrloc: option to randomize when keepalive is sent
by Daniel-Constantin Mierla 10 Jan '24

10 Jan '24

Module: kamailio Branch: master Commit: 5bf1a7ab30f14d989ab185585427c868429224fa URL: https://github.com/kamailio/kamailio/commit/5bf1a7ab30f14d989ab185585427c86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T13:20:34+01:00 usrloc: option to randomize when keepalive is sent - default adds a range from 0 to 20 seconds to ka_interval --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5bf1a7ab30f14d989ab185585427c86… Patch: https://github.com/kamailio/kamailio/commit/5bf1a7ab30f14d989ab185585427c86… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 435f84d7c71..eba6bec5c0d 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -44,6 +44,7 @@ extern int ul_keepalive_timeout; extern int ul_ka_interval; +extern int ul_ka_randomize; static int ul_ka_send(str *kamsg, dest_info_t *kadst); @@ -110,6 +111,7 @@ int ul_ka_urecord(urecord_t *ur) int i; struct timeval tv; time_t tnow = 0; + int ka_limit = 0; if(ul_ka_mode == ULKA_NONE) { return 0; @@ -160,10 +162,12 @@ int ul_ka_urecord(urecord_t *ur) } } } - if(ul_ka_interval > 0 && uc->last_keepalive > 0 - && (uc->last_keepalive + ul_ka_interval) < tnow) { - /* not yet the time for keepalive */ - continue; + if(ul_ka_interval > 0 && uc->last_keepalive > 0) { + ka_limit = ul_ka_interval - (fastrand() % ul_ka_randomize); + if((uc->last_keepalive + ka_limit) < tnow) { + /* not yet the time for keepalive */ + continue; + } } if(uc->received.len > 0) { sdst = uc->received; diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index f493915a564..b14fe7273e1 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -128,6 +128,7 @@ str ul_ka_method = str_init("OPTIONS"); int ul_ka_mode = 0; int ul_ka_filter = 0; int ul_ka_interval = 40; +int ul_ka_randomize = 20; int ul_ka_loglevel = 255; str ul_ka_logmsg = str_init(" to-uri: [$tu] remote-addr: [$sas]"); pv_elem_t *ul_ka_logfmt = NULL; @@ -302,6 +303,7 @@ static param_export_t params[] = { {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, {"ka_interval", PARAM_INT, &ul_ka_interval}, + {"ka_randomize", PARAM_INT, &ul_ka_randomize}, {"ka_timeout", PARAM_INT, &ul_keepalive_timeout}, {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg},

1 0

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

10 Jan '24

Module: kamailio Branch: master Commit: 03f939e3d1a0dbf56791943f90942984984f2d72 URL: https://github.com/kamailio/kamailio/commit/03f939e3d1a0dbf56791943f9094298… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-10T12:47:06+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/03f939e3d1a0dbf56791943f9094298… Patch: https://github.com/kamailio/kamailio/commit/03f939e3d1a0dbf56791943f9094298…

1 0

git:master:36608af8: usrloc: docs for ka_interval parameter
by Daniel-Constantin Mierla 10 Jan '24

10 Jan '24

Module: kamailio Branch: master Commit: 36608af81b3ed64b3800be1625647ed0a9e5031d URL: https://github.com/kamailio/kamailio/commit/36608af81b3ed64b3800be1625647ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T12:42:43+01:00 usrloc: docs for ka_interval parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/36608af81b3ed64b3800be1625647ed… Patch: https://github.com/kamailio/kamailio/commit/36608af81b3ed64b3800be1625647ed… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 5c0796935c7..77b18989b4b 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1460,6 +1460,27 @@ modparam("usrloc", "ka_timeout", 120) </example> </section> + <section id="usrloc.p.ka_interval"> + <title><varname>ka_interval</varname> (int)</title> + <para> + The parameter sets the interval in seconds after which a new keepalive + request should be sent for a location record. + </para> + <para> + <emphasis> + Default value is <quote>40</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ka_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_interval", 30) +... +</programlisting> + </example> + </section> + <section id="usrloc.p.ka_loglevel"> <title><varname>ka_loglevel</varname> (int)</title> <para>

1 0

git:master:53ace443: usrloc: added keepalive interval to set the step for sending
by Daniel-Constantin Mierla 10 Jan '24

10 Jan '24

Module: kamailio Branch: master Commit: 53ace443020075f7ecd12c72f154193c6cfa6af3 URL: https://github.com/kamailio/kamailio/commit/53ace443020075f7ecd12c72f154193… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T12:42:43+01:00 usrloc: added keepalive interval to set the step for sending - the keepalive is not going to be sent before the interval elapsed - the keepalive is no longer sent on every timer callback - default 40 seconds --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/53ace443020075f7ecd12c72f154193… Patch: https://github.com/kamailio/kamailio/commit/53ace443020075f7ecd12c72f154193… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 02c21c0837e..435f84d7c71 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -43,6 +43,7 @@ #include "ul_keepalive.h" extern int ul_keepalive_timeout; +extern int ul_ka_interval; static int ul_ka_send(str *kamsg, dest_info_t *kadst); @@ -159,6 +160,11 @@ int ul_ka_urecord(urecord_t *ur) } } } + if(ul_ka_interval > 0 && uc->last_keepalive > 0 + && (uc->last_keepalive + ul_ka_interval) < tnow) { + /* not yet the time for keepalive */ + continue; + } if(uc->received.len > 0) { sdst = uc->received; } else { diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index e6aa591bbce..f493915a564 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -127,6 +127,7 @@ str ul_ka_domain = str_init("kamailio.org"); str ul_ka_method = str_init("OPTIONS"); int ul_ka_mode = 0; int ul_ka_filter = 0; +int ul_ka_interval = 40; int ul_ka_loglevel = 255; str ul_ka_logmsg = str_init(" to-uri: [$tu] remote-addr: [$sas]"); pv_elem_t *ul_ka_logfmt = NULL; @@ -300,6 +301,7 @@ static param_export_t params[] = { {"ka_domain", PARAM_STR, &ul_ka_domain}, {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, + {"ka_interval", PARAM_INT, &ul_ka_interval}, {"ka_timeout", PARAM_INT, &ul_keepalive_timeout}, {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg},

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev