sr-dev August 2021

sr-dev@lists.kamailio.org

19 participants
268 discussions

[kamailio/kamailio] tm: restore xavps & flags after rebuilding message (#2821)
by lazedo 11 Aug '21

11 Aug '21

#### 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 setting via xavp in tm:local-request has no effect ``` xavp_via_params = "via" event_route[tm:local-request] { $xavp(via=>xi) = "something" via_add_xavp_params("1"); } reply_route { $var(vd) = $sel(via.params["xi"]); xlog("L_INFO", "$ci|log|core|reply $rm this should be true => ('$var(vd)' == 'something')\n"); } ``` #### Changes changed t_run_local_req and moved restore xavps & flags to the end, after the messages changes are applied. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2821 -- Commit Summary -- * tm: restore xavps & flags after rebuilding message -- File Changes -- M src/modules/tm/uac.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2821.patch https://github.com/kamailio/kamailio/pull/2821.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/2821

2 2

git:master:7ee642c5: tm: restore xavps & flags after rebuilding message
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 7ee642c58991e594f38247ab0751fadd07ce758c URL: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:44:40+02:00 tm: restore xavps & flags after rebuilding message --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… Patch: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ad6a74c8cb..9cbc9d5f88 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -300,10 +300,6 @@ static inline int t_run_local_req( set_route_type( backup_route_type ); p_onsend=0; - /* restore original environment */ - tm_xdata_swap(new_cell, &backup_xd, 1); - setsflagsval(sflag_bk); - if (unlikely(ra_ctx.run_flags&DROP_R_F)) { LM_DBG("tm:local-request dropped msg. to %.*s\n", lreq.dst_uri.len, lreq.dst_uri.s); @@ -372,6 +368,10 @@ static inline int t_run_local_req( } clean: + /* restore original environment */ + tm_xdata_swap(new_cell, &backup_xd, 1); + setsflagsval(sflag_bk); + /* clean local msg structure */ if (unlikely(lreq.new_uri.s)) {

1 0

[kamailio/kamailio] Rfc3264 on session (#2813)
by lazedo 11 Aug '21

11 Aug '21

#### 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  some user agents send a=sendonly as a session attribute and is_audio_on_hold() returns false when it should return true. #### Changes - changed sdp_session_cell struct in sdp.h to add sendrecv_mode and is_on_hold - changed parse_sdp_session in sdp.c to iterate session attributes and call extract_sendrecv_mode for assigment to session - changed ki_is_audio_on_hold in textops.c to look for session sendrecv_mode if its not set in media You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2813 -- Commit Summary -- * core: parse session sendrecv_mode in sdp * textops: check session sendrecv_mode in is_audio_on_hold -- File Changes -- M src/core/parser/sdp/sdp.c (12) M src/core/parser/sdp/sdp.h (2) M src/modules/textops/textops.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2813.patch https://github.com/kamailio/kamailio/pull/2813.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/2813

2 2

git:master:cbcc27ef: textops: check session sendrecv_mode in is_audio_on_hold
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: cbcc27ef8b1674448bd8b1c45f03388e36f65f51 URL: https://github.com/kamailio/kamailio/commit/cbcc27ef8b1674448bd8b1c45f03388… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:38:16+02:00 textops: check session sendrecv_mode in is_audio_on_hold - if sendrecv_mode is not set in media, check if its set in session --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/cbcc27ef8b1674448bd8b1c45f03388… Patch: https://github.com/kamailio/kamailio/commit/cbcc27ef8b1674448bd8b1c45f03388… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 05491ab184..84e93f30ed 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4517,8 +4517,15 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; + if(sdp_stream->media.len==AUDIO_STR_LEN && + strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + !sdp_stream->sendrecv_mode.len && + sdp_session->sendrecv_mode.len && + sdp_session->is_on_hold) + return sdp_session->is_on_hold; sdp_stream_num++; } sdp_session_num++;

1 0

git:master:8da4477f: core: parse session sendrecv_mode in sdp
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 8da4477fd6d9590b9946071b9ac2a778b1d55d01 URL: https://github.com/kamailio/kamailio/commit/8da4477fd6d9590b9946071b9ac2a77… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:38:16+02:00 core: parse session sendrecv_mode in sdp - some user agents send a=sendonly as session attribute which apply to all media streams --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h --- Diff: https://github.com/kamailio/kamailio/commit/8da4477fd6d9590b9946071b9ac2a77… Patch: https://github.com/kamailio/kamailio/commit/8da4477fd6d9590b9946071b9ac2a77… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index d5e4f0695b..14779e4d12 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -453,6 +453,18 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ extract_bwidth(&tmpstr1, &session->bw_type, &session->bw_width); } + /* Find sendrecv_mode between session begin and first media. + * parse session attributes to check is_on_hold for a= for all medias. */ + a1p = find_first_sdp_line(o1p, m1p, 'a', NULL); + while (a1p) { + tmpstr1.s = a1p; + tmpstr1.len = m1p - a1p; + if (extract_sendrecv_mode(&tmpstr1, &session->sendrecv_mode, &session->is_on_hold) == 0) { + break; + } + a1p = find_next_sdp_line(a1p, m1p, 'a', NULL); + } + /* Have session. Iterate media descriptions in session */ m2p = m1p; stream_num = 0; diff --git a/src/core/parser/sdp/sdp.h b/src/core/parser/sdp/sdp.h index 84ebcfc8a2..d8c1b15b66 100644 --- a/src/core/parser/sdp/sdp.h +++ b/src/core/parser/sdp/sdp.h @@ -111,6 +111,8 @@ typedef struct sdp_session_cell { AS - application specific */ str bw_width; /**< The <bandwidth> is interpreted as kilobits per second by default */ int streams_num; /**< number of streams inside a session */ + str sendrecv_mode; + int is_on_hold; /**< flag indicating if this session is on hold */ struct sdp_stream_cell* streams; } sdp_session_cell_t;

1 0

[kamailio/kamailio] tm: enhance fr/retr timers logging (#2818)
by Maksym Rudenko 11 Aug '21

11 Aug '21

- Mention when FR timeout is reached, and which of FR timers expired - Log when starting FR/RETR timers - log when changing default timeouts to user-set values - log when resetting fr/retr timers on provisional replies   #### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The main reason for these changes is that we haven't found any possibility to distinguish which of `fr` timeouts expires. The rest of the logs are also helpful, but secondary. As they all are under `ifdef TIMEOUT_DEBUG` I hope it is not a big deal. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2818 -- Commit Summary -- * tm: enhance fr/retr timers logging -- File Changes -- M src/modules/tm/t_lookup.c (6) M src/modules/tm/t_reply.c (3) M src/modules/tm/t_suspend.c (3) M src/modules/tm/timer.c (7) M src/modules/tm/timer.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2818.patch https://github.com/kamailio/kamailio/pull/2818.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/2818

3 3

git:master:05577d19: tm: enhance fr/retr timers logging
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 05577d19f21eeeaa416c17e4fd554dfd18fd9ce1 URL: https://github.com/kamailio/kamailio/commit/05577d19f21eeeaa416c17e4fd554df… Author: mrudenko <m.rudenko(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:35:42+02:00 tm: enhance fr/retr timers logging - Mention when FR timeout is reached, and which of FR timers expired - Log when starting FR/RETR timers - log when changing default timeouts to user set values - log when resetting fr/retr timers on provisional replies --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h --- Diff: https://github.com/kamailio/kamailio/commit/05577d19f21eeeaa416c17e4fd554df… Patch: https://github.com/kamailio/kamailio/commit/05577d19f21eeeaa416c17e4fd554df… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 4ccdee7574..1ee57c995c 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1818,6 +1818,9 @@ int t_set_fr(struct sip_msg* msg, unsigned int fr_inv_to, unsigned int fr_to) set_msgid_val(user_fr_inv_timeout, msg->id, int, (int)fr_inv); set_msgid_val(user_fr_timeout, msg->id, int, (int)fr); }else{ +#ifdef TIMER_DEBUG + LM_DBG("changing default FR timeout values: (\"fr_inv_timeout\": %d, \"fr_timeout\": %d)\n", fr_inv, fr); +#endif change_fr(t, fr_inv, fr); /* change running uac timers */ } return 1; @@ -1880,6 +1883,9 @@ int t_set_retr(struct sip_msg* msg, unsigned int t1_ms, unsigned int t2_ms) set_msgid_val(user_rt_t1_timeout_ms, msg->id, int, (int)t1_ms); set_msgid_val(user_rt_t2_timeout_ms, msg->id, int, (int)t2_ms); }else{ +#ifdef TIMER_DEBUG + LM_DBG("changing default RETR timeout values to: (\"retr_t1_interval\": %d, \"retr_t2_interval\": %d)\n", t1_ms, t2_ms); +#endif change_retr(t, 1, t1_ms, t2_ms); /* change running uac timers */ } return 1; diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 306ed8f872..509cbcb950 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2718,6 +2718,9 @@ int reply_received( struct sip_msg *p_msg ) ( (last_uac_status<msg_status) && ((msg_status>=180) || (last_uac_status==0)) ) ) ) { /* provisional now */ +#ifdef TIMER_DEBUG + LM_DBG("updating FR/RETR timers, \"fr_inv_timeout\": %d\n", t->fr_inv_timeout); +#endif restart_rb_fr(& uac->request, t->fr_inv_timeout); uac->request.flags|=F_RB_FR_INV; /* mark fr_inv */ } /* provisional replies */ diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 826307d20a..bae9747282 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -486,6 +486,9 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, ( (last_uac_status<msg_status) && ((msg_status>=180) || (last_uac_status==0)) ) ) ) { /* provisional now */ +#ifdef TIMER_DEBUG + LM_DBG("updating FR/RETR timers, \"fr_inv_timeout\": %d\n", t->fr_inv_timeout); +#endif restart_rb_fr(& t->uac[branch].request, t->fr_inv_timeout); t->uac[branch].request.flags|=F_RB_FR_INV; /* mark fr_inv */ } diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 26734df2ee..a662920cab 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -510,6 +510,13 @@ ticks_t retr_buf_handler(ticks_t ticks, struct timer_ln *tl, void *p) a little race risk, but nothing bad would happen */ rbuf->flags |= F_RB_TIMEOUT; +#ifdef TIMER_DEBUG + if (rbuf->flags & F_RB_FR_INV) { + LM_DBG("reached the \"fr_inv_timeout\"\n"); + } else { + LM_DBG("reached the \"fr_timeout\"\n"); + } +#endif /* WARNING: the next line depends on taking care not to start the * wait timer before finishing with t (if this is not * guaranteed then comment the timer_allow_del() line) */ diff --git a/src/modules/tm/timer.h b/src/modules/tm/timer.h index 10a6e952a4..fa96beb90e 100644 --- a/src/modules/tm/timer.h +++ b/src/modules/tm/timer.h @@ -168,6 +168,10 @@ inline static int _set_fr_retr(struct retr_buf *rb, unsigned retr_ms) ticks_t retr_ticks; int ret; +#ifdef TIMER_DEBUG + LM_DBG("starting FR/RETR timers\n"); +#endif + ticks = get_ticks_raw(); timeout = rb->my_T->fr_timeout; eol = rb->my_T->end_of_life;

1 0

git:master:dd632331: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: dd632331315801f9d1d22c42881b07fd005b8f47 URL: https://github.com/kamailio/kamailio/commit/dd632331315801f9d1d22c42881b07f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-11T18:16:13+02:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/dd632331315801f9d1d22c42881b07f… Patch: https://github.com/kamailio/kamailio/commit/dd632331315801f9d1d22c42881b07f… --- diff --git a/src/modules/sqlops/README b/src/modules/sqlops/README index ed2bf0279d..d840f9e85a 100644 --- a/src/modules/sqlops/README +++ b/src/modules/sqlops/README @@ -216,7 +216,7 @@ modparam("sqlops", "connect_mode", 1) Example 1.5. Set results_maxsize parameter ... -modparam("sqlops", "results_maxsize", 4096) +modparam("sqlops", "results_maxsize", 64) ... 4. Functions

1 0

git:master:606679fc: sqlops: use a better value in the result_maxsize parameter example
by Henning Westerholt 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 606679fc195825db1f8c74c8225f936fb8b79faa URL: https://github.com/kamailio/kamailio/commit/606679fc195825db1f8c74c8225f936… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-08-11T16:10:57Z sqlops: use a better value in the result_maxsize parameter example --- Modified: src/modules/sqlops/doc/sqlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/606679fc195825db1f8c74c8225f936… Patch: https://github.com/kamailio/kamailio/commit/606679fc195825db1f8c74c8225f936… --- diff --git a/src/modules/sqlops/doc/sqlops_admin.xml b/src/modules/sqlops/doc/sqlops_admin.xml index ef7756b9a5..8d92c60c8e 100644 --- a/src/modules/sqlops/doc/sqlops_admin.xml +++ b/src/modules/sqlops/doc/sqlops_admin.xml @@ -236,7 +236,7 @@ modparam("sqlops", "connect_mode", 1) <title>Set <varname>results_maxsize</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sqlops", "results_maxsize", 4096) +modparam("sqlops", "results_maxsize", 64) ... </programlisting> </example>

1 0

[kamailio/kamailio] ruxc automatic retry (#2820)
by Tim Chubb 11 Aug '21

11 Aug '21

### Description Could a module parameter be added to retry a request _n_ number of times in the event of a connection or server failure, without having to write a tedious bit of boiler plate config to catch failure response codes and retry. ### Expected behavior A http(s) post or get is performed and the returned code is < 0 but > -20 (null url return code in libruxc) or is a 5xx or 6xx http error code. The module will reattempt the request up to the number of attempts defined in a module parameter. By default this behaviour is disabled and would require explicitly defining the module parameter to enable it. Requests could be exempted from automatic retries by either adding an additional argument to the function called in config, or a http header could be supplied `X-RUXC-NORETRY` for example using the existing function signature to exclude the request. The header name could also be defined as a module parameter. -- 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/issues/2820

2 5

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2021