- sr-dev - kamailio.org

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

[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

[kamailio/kamailio] ruxc connection debugging messages (#2819)
by Tim Chubb 11 Aug '21

11 Aug '21

### Description Would it be possible to have the debug messages from libruxc entered into the kamailio logs, as thats much more useful than -1 for diagnosing connection failures, as well as the uri of the failing request? ### Expected behavior Some diagnostic data passed up from libruxc detailing connection failure. #### Actual observed behavior `ERROR: ruxc [ruxc_mod.c:151]: ki_ruxc_http_get_helper(): failed to perform http get - retcode: -1 uri: https://someservice.somewhere.com` -- 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/2819

2 2

[kamailio/kamailio] filter_body() fails when there isn't a space after "Content-Type:" (#2748)
by duarterocha91 11 Aug '21

11 Aug '21

I've made some testing and found that filter_body() fails when body is something like "Content-Type:application\/sdp\r\n\r\n". If i use this correction to add a space the filter works correctly : replace_body_all("Content-Type:application\/sdp\r\n\r\n","Content-Type: application/sdp\r\n\r\n"); #Makes the changes to the message persistent, returns 1 if sucessful, 0 if it fails if(msg_apply_changes()) { xnotice("Kamailio_Log : reply_route : Changes to message applied"); } I looked into the textops.c and found this line which i think might be the problem : while (find_line_start("Content-Type: ", 14, &start, &len)) If more info is needed please let me know. Cheers -- 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/2748

2 21

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

11 Aug '21

Module: kamailio Branch: master Commit: 1c9fa44521106968a0c68b2dba96a421ad523fda URL: https://github.com/kamailio/kamailio/commit/1c9fa44521106968a0c68b2dba96a42… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-11T10:16:23+02:00 modules: readme files regenerated - tlsa ... [skip ci] --- Modified: src/modules/tlsa/README --- Diff: https://github.com/kamailio/kamailio/commit/1c9fa44521106968a0c68b2dba96a42… Patch: https://github.com/kamailio/kamailio/commit/1c9fa44521106968a0c68b2dba96a42… --- diff --git a/src/modules/tlsa/README b/src/modules/tlsa/README index 100da0fed4..ed29072e58 100644 --- a/src/modules/tlsa/README +++ b/src/modules/tlsa/README @@ -53,3 +53,8 @@ Chapter 1. Admin Guide not support same static linking options. Also, some operating systems may provide only dynamic libssl and libcrypto libraries via their packages. + + NOTE: edit the Makefile in the module folder and update it accordingly + to set the path to libssl and libcrypto libraries specific to own + system when not wanting to use "pkg-config" (e.g., when having these + libraries compiled from sources).

1 0

git:master:db77d45e: tls: docs - note about path to libraries in the Makefile
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: db77d45e03792f73982861dcf30bad8d94bd7453 URL: https://github.com/kamailio/kamailio/commit/db77d45e03792f73982861dcf30bad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T10:05:31+02:00 tls: docs - note about path to libraries in the Makefile --- Modified: src/modules/tlsa/doc/tlsa.xml --- Diff: https://github.com/kamailio/kamailio/commit/db77d45e03792f73982861dcf30bad8… Patch: https://github.com/kamailio/kamailio/commit/db77d45e03792f73982861dcf30bad8… --- diff --git a/src/modules/tlsa/doc/tlsa.xml b/src/modules/tlsa/doc/tlsa.xml index eecc5f9ab1..d17c509813 100644 --- a/src/modules/tlsa/doc/tlsa.xml +++ b/src/modules/tlsa/doc/tlsa.xml @@ -72,6 +72,12 @@ systems may provide only dynamic libssl and libcrypto libraries via their packages. </para> + <para> + NOTE: edit the Makefile in the module folder and update it accordingly + to set the path to libssl and libcrypto libraries specific to own + system when not wanting to use "pkg-config" (e.g., when having + these libraries compiled from sources). + </para> </section> </chapter> </book>

1 0

git:master:162c1d8f: tlsa: Makefile - comment to set lib path to installation folder
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 162c1d8f1d3522fa937bc1869fe65ad87d4e3680 URL: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T09:59:40+02:00 tlsa: Makefile - comment to set lib path to installation folder - GH #2815 --- Modified: src/modules/tlsa/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… Patch: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… --- diff --git a/src/modules/tlsa/Makefile b/src/modules/tlsa/Makefile index eb01df99aa..9295898aad 100644 --- a/src/modules/tlsa/Makefile +++ b/src/modules/tlsa/Makefile @@ -12,6 +12,8 @@ NAME=tlsa.so LIBSSL_STATIC_SRCLIB ?= no # set to the path of the folder with static libraries compiled from source LIBSSL_STATIC_SRCPATH ?= /usr/local/src/openssl +# or set to the path where the static libraries are installed, for example: +# LIBSSL_STATIC_SRCPATH ?= /usr/lib/x86_64-linux-gnu/ ifeq ($(CROSS_COMPILE),) SSL_BUILDER=$(shell \

1 0

[kamailio/kamailio] TLS module missing from 5.5 Debian repository (#2816)
by Simone de Blasiis 11 Aug '21

11 Aug '21

### Description I've installed Kamailio 5.5 from the Debian 10 repository and added the WITH_TLS flag to default config file but Kamailio refuses to start. Looking at the logs I found out that the tls.so file in the modules folder is missing. I checked the docs and it seems that the package has been compiled with the right flags but I'm no Kamailio expert so I decided to open this issue to have it checked. #### Log Messages ``` kamailio kamailio: ERROR: <core> [core/sr_module.c:504]: ksr_locate_module(): could not find module <tls> in </usr/lib/x86_64-linux-gnu/kamailio/modules> ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.1 (x86_64/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, 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 8.3.0 ``` * **Operating System**: ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Linux kamailio 4.19.0-17-amd64 #1 SMP Debian 4.19.194-3 (2021-07-18) x86_64 GNU/Linux ``` -- 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/2816

3 3

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

10 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/2817 -- 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/2817.patch https://github.com/kamailio/kamailio/pull/2817.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/2817

1 1

git:master:28c0e78f: pv: removed unused code in parsing paramlist transformation name
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 28c0e78f8f866c971172d0cdc55cfd963a0d29be URL: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:36:00+02:00 pv: removed unused code in parsing paramlist transformation name --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… Patch: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 9a9a66bb47..b63ad022f8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -3460,8 +3460,6 @@ char* tr_parse_paramlist(str* in, trans_t *t) LM_ERR("unknown transformation: %.*s/%.*s!\n", in->len, in->s, name.len, name.s); error: - if(tp) - tr_param_free(tp); if(spec) pv_spec_free(spec); return NULL;

1 0

git:master:52cb53b2: nathelper: better condition for no more params in handle_ruri_alias_mode()
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 52cb53b29a5a624031a7d06504afecca7c25511e URL: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:31:10+02:00 nathelper: better condition for no more params in handle_ruri_alias_mode() --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… Patch: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index bdf1b7777a..bd71eaafc4 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1156,9 +1156,9 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) rest_len = rest_len - ALIAS_LEN; } sep = memchr(rest, 59 /* ; */, rest_len); - if(sep == NULL && start == NULL) { - LM_DBG("no alias param\n"); - return 2; + if(sep == NULL) { + /* no other parameters */ + break; } else { rest_len = rest_len - (sep - rest + 1); rest = sep + 1;

1 0

git:master:0046f35f: pv: added breaks in case of mismatching via var name
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 0046f35f37a84afef9999e53c122dafa42876c69 URL: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:11:16+02:00 pv: added breaks in case of mismatching via var name --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… Patch: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 44cc551212..352114d259 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4488,6 +4488,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) if(in->s[0]=='i') sp->pvp.pvn.u.isname.name.n = 7; else goto error; + break; case 4: if(strncmp(in->s, "host", 4)==0) sp->pvp.pvn.u.isname.name.n = 0; @@ -4511,6 +4512,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) if(strncmp(in->s, "protoid", 7)==0) sp->pvp.pvn.u.isname.name.n = 3; else goto error; + break; case 8: if(strncmp(in->s, "received", 8)==0) sp->pvp.pvn.u.isname.name.n = 6;

1 0

git:master:d4d6fd43: ISSUE_TEMPLATE/bug_report.md: list lsb_release -a in comments for OS details
by GitHub 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: d4d6fd431adb94f591e6035f2fa76eff8f728a8f URL: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-08-10T09:16:17+02:00 ISSUE_TEMPLATE/bug_report.md: list lsb_release -a in comments for OS details --- Modified: .github/ISSUE_TEMPLATE/bug_report.md --- Diff: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… Patch: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… --- diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8132d74350..50a94c08bc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -95,7 +95,7 @@ If you found a solution or workaround for the issue, describe it. Ideally, provi  ```

1 0

git:master:4e5c1ddd: textopsx: kemi functions to get body line iterator value
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 4e5c1ddd996d60382fd6a2d549cb18e2a1657b0d URL: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-09T20:54:32+02:00 textopsx: kemi functions to get body line iterator value --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… Patch: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 8d106a0704..5e62546fcd 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2718,6 +2718,32 @@ static int w_bl_iterator_insert(sip_msg_t *msg, char *piname, char *ptext) return ki_bl_iterator_insert(msg, &iname, &text); } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_bl_iterator_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_bl_iterator_value(sip_msg_t *msg, str *iname) +{ + int k; + + memset(&_sr_kemi_bl_iterator_xval, 0, sizeof(sr_kemi_xval_t)); + k = ki_bl_iterator_index(msg, iname); + if(k<0 || _bl_iterators[k].it.s==NULL || _bl_iterators[k].it.len<=0) { + sr_kemi_xval_null(&_sr_kemi_bl_iterator_xval, 0); + return &_sr_kemi_bl_iterator_xval; + } + if(_bl_iterators[k].it.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_bl_iterator_xval, 0); + return &_sr_kemi_bl_iterator_xval; + } + _sr_kemi_bl_iterator_xval.vtype = SR_KEMIP_STR; + _sr_kemi_bl_iterator_xval.v.s = _bl_iterators[k].it; + return &_sr_kemi_bl_iterator_xval; +} /** * @@ -3351,6 +3377,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("bl_iterator_value"), + SR_KEMIP_XVAL, ki_bl_iterator_value, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:51a77408: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: 51a774089c59a3861063ee4e9b4e21051c2bf192 URL: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-06T09:01:22+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… Patch: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e437234139..45b80a85c5 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -131,6 +131,10 @@ modparam("ruxc", "http_tlsmode", 1) (and TLS handshake) when all requests are performed against the same HTTP/S server. + Set to 2 in order to keep connections per base URL (scheme://host:port) + indexed in a hash map. Useful when doing HTTP/S requests to many + servers. + Default value is 0 (new connection for each request). Example 1.3. Set http_reuse parameter

1 0

git:master:21b187f5: ruxc: docs for reuse mode 2
by Daniel-Constantin Mierla 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: 21b187f57a092f8ed9f51a62786a98c910b1febf URL: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-06T08:54:29+02:00 ruxc: docs for reuse mode 2 --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… Patch: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index e07c05c9f1..794301bc06 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -106,6 +106,11 @@ modparam("ruxc", "http_tlsmode", 1) handshake) when all requests are performed against the same HTTP/S server. </para> <para> + Set to 2 in order to keep connections per base URL (scheme://host:port) + indexed in a hash map. Useful when doing HTTP/S requests to many + servers. + </para> + <para> <emphasis> Default value is 0 (new connection for each request). </emphasis>

1 0

git:master:fa728b90: ruxc: Makefile - set local paths for include and libs
by Daniel-Constantin Mierla 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: fa728b906ec2667891fb964e21785b12a68c0173 URL: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-06T08:26:29+02:00 ruxc: Makefile - set local paths for include and libs --- Modified: src/modules/ruxc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… Patch: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… --- diff --git a/src/modules/ruxc/Makefile b/src/modules/ruxc/Makefile index ae33b008bb..d11e7758e2 100644 --- a/src/modules/ruxc/Makefile +++ b/src/modules/ruxc/Makefile @@ -18,8 +18,8 @@ endif endif ifeq ($(BUILDER),) - DEFS+= -I. - LIBS = -L. -lruxc + DEFS+= -I. -I$(LOCALBASE)/include -I$(SYSBASE)/include + LIBS = -L. -L$(LOCALBASE)/lib -lruxc else DEFS+= $(shell pkg-config --cflags libruxc) LIBS = $(shell pkg-config --libs libruxc)

1 0

Usage of /proc/net/tcp
by Helio 04 Aug '21

04 Aug '21

Hello, I noticed that some Kamailio modules use /proc/net/tcp for statistics (ratelimit, pipelimit, snmpstats) but it seems to be deprecated (See https://www.kernel.org/doc/html/latest/networking/proc_net_tcp.html). Is the data from that reliable? My question is because we used the module ratelimit for a long time and after Kernel upgrades it was verified that the network limit is triggering with low traffic. Thanks

1 0

git:master:e3875c01: misc/tools/protoshoot: removed svn id and history
by Daniel-Constantin Mierla 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: e3875c01adf576f179374a926e69e99c0094e5b4 URL: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T14:15:38+02:00 misc/tools/protoshoot: removed svn id and history --- Modified: misc/tools/protoshoot/protoshoot.c --- Diff: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… Patch: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… --- diff --git a/misc/tools/protoshoot/protoshoot.c b/misc/tools/protoshoot/protoshoot.c index 352e1018a6..6eced5fc2b 100644 --- a/misc/tools/protoshoot/protoshoot.c +++ b/misc/tools/protoshoot/protoshoot.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * * Copyright (C) 2001-2003 FhG Fokus @@ -20,14 +19,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * History: - * 2005-09-09 basic tcp support added (andrei) - */ @@ -50,7 +45,6 @@ #include <signal.h> -static char *id="$Id$"; static char *version="protoshoot 0.4"; static char* help_msg="\ Usage: protoshoot -f file -d address -p port -c count [-v]\n\ @@ -87,7 +81,7 @@ int main (int argc, char** argv) char buf[BUF_SIZE]; struct hostent* he; struct sockaddr_in addr; - + int count; int verbose; char *fname; @@ -104,7 +98,7 @@ int main (int argc, char** argv) struct linger t_linger; int k; int err; - + /* init */ count=1; verbose=0; @@ -190,7 +184,6 @@ int main (int argc, char** argv) break; case 'V': printf("version: %s\n", version); - printf("%s\n",id); exit(0); break; case 'h': @@ -213,7 +206,7 @@ int main (int argc, char** argv) abort(); } } - + /* check if all the required params are present */ if (fname==0){ fprintf(stderr, "Missing -f file\n"); @@ -238,13 +231,13 @@ int main (int argc, char** argv) exit(-1); } if (proto==PROTO_UDP || (proto==PROTO_SCTP && !sctp_o2o)) con_no=1; - + /* ignore sigpipe */ if (signal(SIGPIPE, SIG_IGN)==SIG_ERR){ fprintf(stderr, "failed to ignore SIGPIPE: %s\n", strerror(errno)); exit(-1); } - + /* open packet file */ fd=open(fname, O_RDONLY); if (fd<0){ @@ -274,7 +267,7 @@ int main (int argc, char** argv) addr.sin_len=sizeof(struct sockaddr_in); #endif memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); - + for (k=0; k<con_no; k++){ switch(proto){ case PROTO_UDP: @@ -285,7 +278,7 @@ int main (int argc, char** argv) break; #ifdef USE_SCTP case PROTO_SCTP: - sock = socket(he->h_addrtype, + sock = socket(he->h_addrtype, sctp_o2o?SOCK_STREAM:SOCK_SEQPACKET, IPPROTO_SCTP); break; @@ -333,8 +326,7 @@ int main (int argc, char** argv) fprintf(stderr, "ERROR: connect: %s\n", strerror(errno)); goto error; } - - + /* flood loop */ t=throttle; for (r=0; r<count; r++){ @@ -366,7 +358,7 @@ int main (int argc, char** argv) } } } - + close(sock); if ((verbose) && (k%1000==999)) { putchar('#'); fflush(stdout); } }

1 0

new master branch compiler warnings (Debian Buster)
by Juha Heinanen 04 Aug '21

04 Aug '21

C (gcc) [M outbound.so] outbound_mod.o outbound_mod.c: In function 'mod_init': outbound_mod.c:112:25: warning: pointer targets in passing argument 1 of 'SHA1' differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~~~~~~~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected 'const unsigned char *' but argument is of type 'char *' unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~ outbound_mod.c:112:58: warning: pointer targets in passing argument 3 of 'SHA1' differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected 'unsigned char *' but argument is of type 'char *' unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~

2 2

[kamailio/kamailio] outbound: fix compiler warning on SHA1() call (#2812)
by Michael Furmur 04 Aug '21

04 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description explicit types cast to fix compiler warning: https://lists.kamailio.org/pipermail/sr-dev/2021-August/063482.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2812 -- Commit Summary -- * outbound: fix compiler warning on SHA1() call -- File Changes -- M src/modules/outbound/outbound_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2812.patch https://github.com/kamailio/kamailio/pull/2812.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/2812

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev