- sr-dev - kamailio.org

git:master:31377b16: core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: master Commit: 31377b160df563a222bec5a1bf92590635429240 URL: https://github.com/kamailio/kamailio/commit/31377b160df563a222bec5a1bf92590… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T07:03:45+02:00 core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps - besides comparing the protos of rcv and snd sockets --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/31377b160df563a222bec5a1bf92590… Patch: https://github.com/kamailio/kamailio/commit/31377b160df563a222bec5a1bf92590… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 0f82033c9f..9fd5635655 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -513,7 +513,8 @@ static inline int lump_check_opt( struct lump *l, } else return 0; case COND_IF_DIFF_PROTO: get_ip_port_proto; - if (proto!=snd_i->send_sock->proto) { + if ((proto!=snd_i->send_sock->proto) + || (msg->rcv.proto!=snd_i->proto)) { LUMP_SET_COND_TRUE(l); return 1; } else return 0;

1 0

git:master:ec3f9634: ruxc: added modparams to set libruxc logtype and debug
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: master Commit: ec3f9634c8474ff4dc9e5cb0ac451064e912734d URL: https://github.com/kamailio/kamailio/commit/ec3f9634c8474ff4dc9e5cb0ac45106… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T08:01:25+02:00 ruxc: added modparams to set libruxc logtype and debug --- Modified: src/modules/ruxc/doc/ruxc_admin.xml Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec3f9634c8474ff4dc9e5cb0ac45106… Patch: https://github.com/kamailio/kamailio/commit/ec3f9634c8474ff4dc9e5cb0ac45106… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index d0cd3bf7f7..2c1aec6285 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -140,6 +140,45 @@ modparam("ruxc", "http_reuse", 1) ... modparam("ruxc", "http_retry", 2) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_logtype"> + <title><varname>http_logtype</varname> (int)</title> + <para> + Set the log type for libruxc http functions: 0 - stdout; 1 - syslog. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>http_logtype</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_logtype", 1) +... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_debug"> + <title><varname>http_debug</varname> (int)</title> + <para> + Set the debug mode for libruxc http functions: 0 - no debug; 1 - errors; + 2 - debug. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>http_debug</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_debug", 1) +... </programlisting> </example> </section> diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 13c4a54b52..a31f650873 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -42,6 +42,8 @@ static int _ruxc_http_timeout = 5000; static int _ruxc_http_tlsmode = 0; static int _ruxc_http_reuse = 0; static int _ruxc_http_retry = 0; +static int _ruxc_http_logtype = 0; +static int _ruxc_http_debug = 0; static int mod_init(void); static int child_init(int); @@ -77,6 +79,8 @@ static param_export_t params[]={ {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, {"http_retry", PARAM_INT, &_ruxc_http_retry}, + {"http_logtype", PARAM_INT, &_ruxc_http_logtype}, + {"http_debug", PARAM_INT, &_ruxc_http_debug}, {0, 0, 0} }; @@ -101,6 +105,13 @@ struct module_exports exports = { */ static int mod_init(void) { + if(_ruxc_http_logtype==1 && log_stderr==1) { + LM_INFO("setting http logtype to 0\n"); + _ruxc_http_logtype = 0; + } else if(_ruxc_http_logtype==0 && log_stderr==0) { + LM_INFO("setting http logtype to 1\n"); + _ruxc_http_logtype = 1; + } return 0; } @@ -138,6 +149,8 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; v_http_request.retry = _ruxc_http_retry; + v_http_request.logtype = _ruxc_http_logtype; + v_http_request.debug = _ruxc_http_debug; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -237,6 +250,8 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; v_http_request.retry = _ruxc_http_retry; + v_http_request.logtype = _ruxc_http_logtype; + v_http_request.debug = _ruxc_http_debug; v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

[kamailio/kamailio] kamcmd drouting.reload bug (#2827)
by ShadoWalkeR31 19 Aug '21

19 Aug '21

Every time when i call kamcmd drouting.reload in log i get message CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x7f7ea7c127d0 (out of memory block!) called from core: core/utils/tmrec.c: tmrec_free(393) - ignoring Tested on Centos 7, kamailio 5.4/5.5 from repo in kamailio wiki -- 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/2827

2 5

git:master:871f8113: core: check message rcv and snd proto for diff realms lump conditions
by Daniel-Constantin Mierla 19 Aug '21

19 Aug '21

Module: kamailio Branch: master Commit: 871f8113612148a49e69218e70ed7f475fb665db URL: https://github.com/kamailio/kamailio/commit/871f8113612148a49e69218e70ed7f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T18:14:50+02:00 core: check message rcv and snd proto for diff realms lump conditions - in addition to receive socket and send socket protos, which may be the same in cases of tcp/tls+ws/wss using same ports --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/871f8113612148a49e69218e70ed7f4… Patch: https://github.com/kamailio/kamailio/commit/871f8113612148a49e69218e70ed7f4… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index a2f6505e83..0f82033c9f 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -493,8 +493,9 @@ static inline int lump_check_opt( struct lump *l, case COND_IF_DIFF_REALMS: get_ip_port_proto; /* faster tests first */ - if ((port==snd_i->send_sock->port_no) && + if ((port==snd_i->send_sock->port_no) && (proto==snd_i->send_sock->proto) && + (msg->rcv.proto==snd_i->proto) && #ifdef USE_COMP (msg->rcv.comp==snd_i->comp) && #endif

1 0

[kamailio/kamailio] Missing lwsc.so (#2749)
by Váradi Richárd 19 Aug '21

19 Aug '21

### Description I wanted to use the rtpengine module wiith websockets, so I installed the kamailio-lwsc-modules debian package. The problem is when I want to load the lwsc module it fails, because there is no lwsc.so file in /usr/lib/x86_64-linux-gnu/kamailio/modules/. I installed the libwebsockets-dev library, reinstalled the lwsc module, but I experience the same issue.  ### Troubleshooting #### Reproduction I installed kamailio on Ubuntu 20.04 and simply tried to load lwsc.so with this line `loadmodule "lwsc.so"`  #### Log Messages  ``` Starting Kamailio - the Open Source SIP Server... May 27 11:23:06 kamailio kamailio[3387]: ERROR: <core> [core/sr_module.c:504]: ksr_locate_module(): could not find module <lwsc> in </usr/lib/x86_64-linux-gnu/kamailio/modules> May 27 11:23:06 kamailio kamailio[3387]: CRITICAL: <core> [core/cfg.y:3683]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 308, column 12-20: failed to load module May 27 11:23:06 kamailio kamailio[3387]: ERROR: <core> [core/modparam.c:178]: set_mod_param_regex(): No module matching <lwsc> found May 27 11:23:06 kamailio kamailio[3387]: CRITICAL: <core> [core/cfg.y:3686]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 460, column 35: Can't set module parameter May 27 11:23:06 kamailio kamailio[3387]: ERROR: bad config file (2 errors) (parsing code: 0) May 27 11:23:06 kamailio kamailio[3387]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized May 27 11:23:06 kamailio systemd[1]: kamailio.service: Control process exited, code=exited, status=255/EXCEPTION May 27 11:23:06 kamailio systemd[1]: kamailio.service: Failed with result 'exit-code'. May 27 11:23:06 kamailio systemd[1]: Failed to start Kamailio - the Open Source SIP Server. May 27 11:23:06 kamailio systemd[1]: kamailio.service: Scheduled restart job, restart counter is at 5. May 27 11:23:06 kamailio systemd[1]: Stopped Kamailio - the Open Source SIP Server. May 27 11:23:06 kamailio systemd[1]: kamailio.service: Start request repeated too quickly. May 27 11:23:06 kamailio systemd[1]: kamailio.service: Failed with result 'exit-code'. May 27 11:23:06 kamailio systemd[1]: Failed to start Kamailio - the Open Source SIP Server. ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0 (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 9.3.0 ``` * **Operating System**:  Ubuntu 20.04 ``` Linux kamailio 5.4.0-73-generic #82-Ubuntu SMP Wed Apr 14 17:39:42 UTC 2021 x86_64 x86_64 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/2749

5 9

git:master:fcfa9aab: modules: readme files regenerated - lwsc ... [skip ci]
by Kamailio Dev 19 Aug '21

19 Aug '21

Module: kamailio Branch: master Commit: fcfa9aab7f6d360134c4bb882188dda9ccf6b4cb URL: https://github.com/kamailio/kamailio/commit/fcfa9aab7f6d360134c4bb882188dda… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-19T15:01:19+02:00 modules: readme files regenerated - lwsc ... [skip ci] --- Modified: src/modules/lwsc/README --- Diff: https://github.com/kamailio/kamailio/commit/fcfa9aab7f6d360134c4bb882188dda… Patch: https://github.com/kamailio/kamailio/commit/fcfa9aab7f6d360134c4bb882188dda… --- diff --git a/src/modules/lwsc/README b/src/modules/lwsc/README index d7ae1e48b9..4c310529ee 100644 --- a/src/modules/lwsc/README +++ b/src/modules/lwsc/README @@ -87,8 +87,7 @@ Chapter 1. Admin Guide external systems, similar to http client. It is not for routing SIP traffic. - It relies on libwebsockets (tested with v3.1.0) library - (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). 2. Dependencies @@ -104,7 +103,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libwebsockets - probably v3.1.0 or newer. + * libwebsockets - probably v2.0 or newer. 3. Parameters

1 0

git:master:01afcc7f: lwsc: docs - updated references to libwebsockets version
by Daniel-Constantin Mierla 19 Aug '21

19 Aug '21

Module: kamailio Branch: master Commit: 01afcc7fb2468c21a8e1cfb1a717fa96299794fa URL: https://github.com/kamailio/kamailio/commit/01afcc7fb2468c21a8e1cfb1a717fa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T14:56:50+02:00 lwsc: docs - updated references to libwebsockets version - GH #2749 --- Modified: src/modules/lwsc/doc/lwsc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01afcc7fb2468c21a8e1cfb1a717fa9… Patch: https://github.com/kamailio/kamailio/commit/01afcc7fb2468c21a8e1cfb1a717fa9… --- diff --git a/src/modules/lwsc/doc/lwsc_admin.xml b/src/modules/lwsc/doc/lwsc_admin.xml index 2f00c8fbd6..3e82f4b52b 100644 --- a/src/modules/lwsc/doc/lwsc_admin.xml +++ b/src/modules/lwsc/doc/lwsc_admin.xml @@ -20,7 +20,7 @@ external systems, similar to http client. It is not for routing SIP traffic. </para> <para> - It relies on libwebsockets (tested with v3.1.0) library (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). </para> </section> @@ -47,7 +47,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libwebsockets</emphasis> - probably v3.1.0 or newer. + <emphasis>libwebsockets</emphasis> - probably v2.0 or newer. </para> </listitem> </itemizedlist>

1 0

git:master:43154486: cplc: use cpl_ prefix for internal time recurrence functions
by Daniel-Constantin Mierla 18 Aug '21

18 Aug '21

Module: kamailio Branch: master Commit: 431544864c97d1848db1c0c42a03251a214f04cd URL: https://github.com/kamailio/kamailio/commit/431544864c97d1848db1c0c42a03251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-18T18:08:38+02:00 cplc: use cpl_ prefix for internal time recurrence functions - avoid global symbol conflicts with core tmrec.c - GH #2827 --- Modified: src/modules/cplc/cpl_switches.h Modified: src/modules/cplc/cpl_time.c Modified: src/modules/cplc/cpl_time.h --- Diff: https://github.com/kamailio/kamailio/commit/431544864c97d1848db1c0c42a03251… Patch: https://github.com/kamailio/kamailio/commit/431544864c97d1848db1c0c42a03251…

1 0

[kamailio/kamailio] Force_send_socket doesn't work in kemi framework. (#2829)
by Zhan Bazarov 18 Aug '21

18 Aug '21

### Description Hello, I didn't find force_send_socket function in kemi, so, I've tried to execute it like this: KSR.x.modf("force_send_socket", "udp:10.199.240.166:5099") and it doesn't work for me and I'm getting this error in output: #### Log Messages ``` 2(23767) ERROR: {1 21 INVITE mPXgy6eqY2} app_python [python_support.c:154]: python_handle_exception(): apy_exec: ksr_branch_manage((null)): Unhandled exception in the Python code: RuntimeError: self is NULL 2(23767) ERROR: {1 21 INVITE MwD6tWSuw6} app_python [python_support.c:154]: python_handle_exception(): apy_exec: ksr_branch_manage((null)): Unhandled exception in the Python code: ``` ### Possible Solutions When I comment this code - I don't have this error. ### Additional Information ``` version: kamailio 5.4.5 (x86_64/linux) c46342 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_BLACKLIST, 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: c46342 compiled on 12:05:00 Jul 23 2021 with gcc 7.5.0 ``` Is there any way how to use force_send_socket mechanism in kemi? Thank you! -- 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/2829

2 2

git:master:33ea38f3: drouting: added dr_ prefix to internal time recurrence functions
by Daniel-Constantin Mierla 18 Aug '21

18 Aug '21

Module: kamailio Branch: master Commit: 33ea38f35f9911a26a757dbfa22065eb80a9a24a URL: https://github.com/kamailio/kamailio/commit/33ea38f35f9911a26a757dbfa22065e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-18T17:39:25+02:00 drouting: added dr_ prefix to internal time recurrence functions - avoids symbol conflicts with the core tmrec.c - GH #2828 --- Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h Modified: src/modules/drouting/prefix_tree.c Modified: src/modules/drouting/prefix_tree.h Modified: src/modules/drouting/routing.c Modified: src/modules/drouting/routing.h --- Diff: https://github.com/kamailio/kamailio/commit/33ea38f35f9911a26a757dbfa22065e… Patch: https://github.com/kamailio/kamailio/commit/33ea38f35f9911a26a757dbfa22065e…

1 0

[kamailio/kamailio] 39chr long ipv6 issue ? (#2823)
by Tristan Mahé 18 Aug '21

18 Aug '21

### Description When receiving packets from an ipv6 full length, $si is empty When trying to listen to an ipv6 full length, kamailio refuses to start, trying to resolve the ipv6 instead of parsing it as an IPv6 There's no problem if the ipv6 in question is not maximum length. ### Troubleshooting It seems like ip_addr2a() fails to properly parse a 39b length ipv6. #### Reproduction reproduced easily by placing calls from an ipv6 containing no 0 or trying to listen to an ipv6 full length. #### Log Messages Example packet and log associated: Aug 13 01:06:42 test-1 /usr/sbin/kamailio[25890]: DEBUG: tls [tls_server.c:477]: tls_accept(): tls_accept: new connection from :52524 using TLSv1.0 ECDHE-RSA-AES256-SHA 256 => The empty string before the port in that log should be a 39chr long ipv6 Aug 13 01:06:42 test-1 /usr/sbin/kamailio[25890]: WARNING: [INVITE|FROM|TO|/[]:57677=>2600:aaaa:aaaa:aaaa:aa:aa:aa:146:443/tls/22] 610:Empty source ip ?! => That is a log generated from the config, which should be $si/$siz before the port 57677 and is empty. There's a test before that log line if ($si == "") { log } #### SIP Traffic ( Anonymized ) INVITE sip:+TO@DOMAIN;transport=tls SIP/2.0 Via: SIP/2.0/TLS [2607:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:d5c1]:57677;branch=z9hG4bK.5SSv~9uQw;rport From: "FROM" <sip:FROM@DOMAIN>;tag=8sei4EB40 To: "TO" <sip:+TO@DOMAIN>#015#012CSeq: 20 INVITE Call-ID: mA5D5fcZdt#015#012Max-Forwards: 70 Route: <sip:DOMAIN:443;lr> Supported: replaces, outbound Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO, UPDATE Content-Type: application/sdp Content-Length: 529 Contact: <sip:ua@[2607:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:d5c1]:57677;transport=tls>;+sip.instance="<urn:uuid:2a1a2139-8ed6-40bd-9352-d804d331a098>" User-Agent: UA v=0 o=#191026873 3487 1810 IN IP6 2607:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:d5c1 s=Talk c=IN IP6 2607:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:d5c1 b=AS:380 t=0 0 a=rtcp-xr:rcvr-rtt=all:10000 stat-summary=loss,dup,jitt,TTL voip-metrics m=audio 10712 RTP/AVP 124 117 115 0 101 96 97 a=rtpmap:124 opus/48000/2 a=fmtp:124 useinbandfec=1 a=rtpmap:117 SILK/16000 a=rtpmap:115 SILK/8000 a=rtpmap:101 telephone-event/48000 a=rtpmap:96 telephone-event/16000 a=rtpmap:97 telephone-event/8000 a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr#015 ### Possible Solutions Patching src/core/ip_addr.h to change IP6_MAX_STR_SIZE from 39 to 40 fix the issue. ### Additional Information version: kamailio 5.5.1 (x86_64/linux) ( commit 5ecf17bc2d308141534bdaf3a312704daf0db850 ) * **Operating System**: * Debian 10.10 -- 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/2823

2 4

git:master:155b5d09: textopsx: added kemi functions to return hf iterator name and body
by Daniel-Constantin Mierla 18 Aug '21

18 Aug '21

Module: kamailio Branch: master Commit: 155b5d0953cd9f5effff974d2ba9fca44da42059 URL: https://github.com/kamailio/kamailio/commit/155b5d0953cd9f5effff974d2ba9fca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-18T07:55:06+02:00 textopsx: added kemi functions to return hf iterator name and body --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/155b5d0953cd9f5effff974d2ba9fca… Patch: https://github.com/kamailio/kamailio/commit/155b5d0953cd9f5effff974d2ba9fca… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 5e62546fcd..a9a60f9ed8 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2277,6 +2277,47 @@ static int w_hf_iterator_insert(sip_msg_t *msg, char *piname, char *phtext) return ki_hf_iterator_insert(msg, &iname, &htext); } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_hf_iterator_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_hf_iterator_hname(sip_msg_t *msg, str *iname) +{ + int k; + + memset(&_sr_kemi_hf_iterator_xval, 0, sizeof(sr_kemi_xval_t)); + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + sr_kemi_xval_null(&_sr_kemi_hf_iterator_xval, 0); + return &_sr_kemi_hf_iterator_xval; + } + _sr_kemi_hf_iterator_xval.vtype = SR_KEMIP_STR; + _sr_kemi_hf_iterator_xval.v.s = _hf_iterators[k].it->name; + return &_sr_kemi_hf_iterator_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_hf_iterator_hbody(sip_msg_t *msg, str *iname) +{ + int k; + + memset(&_sr_kemi_hf_iterator_xval, 0, sizeof(sr_kemi_xval_t)); + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + sr_kemi_xval_null(&_sr_kemi_hf_iterator_xval, 0); + return &_sr_kemi_hf_iterator_xval; + } + _sr_kemi_hf_iterator_xval.vtype = SR_KEMIP_STR; + _sr_kemi_hf_iterator_xval.v.s = _hf_iterators[k].it->body; + return &_sr_kemi_hf_iterator_xval; +} + /** * */ @@ -3347,6 +3388,16 @@ 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("hf_iterator_hname"), + SR_KEMIP_XVAL, ki_hf_iterator_hname, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_hbody"), + SR_KEMIP_XVAL, ki_hf_iterator_hbody, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textopsx"), str_init("bl_iterator_start"), SR_KEMIP_INT, ki_bl_iterator_start, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

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

17 Aug '21

Module: kamailio Branch: master Commit: c61b6eef809af690cfd53efa4054a0c547e93584 URL: https://github.com/kamailio/kamailio/commit/c61b6eef809af690cfd53efa4054a0c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-17T21:31:16+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/c61b6eef809af690cfd53efa4054a0c… Patch: https://github.com/kamailio/kamailio/commit/c61b6eef809af690cfd53efa4054a0c… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index 45b80a85c5..6bade01585 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -29,6 +29,7 @@ Daniel-Constantin Mierla 3.1. http_timeout (int) 3.2. http_tlsmode (int) 3.3. http_reuse (int) + 3.4. http_retry (int) 4. Functions @@ -42,9 +43,10 @@ Daniel-Constantin Mierla 1.1. Set http_timeout parameter 1.2. Set http_tlsmode parameter 1.3. Set http_reuse parameter - 1.4. ruxc_http_get() usage - 1.5. ruxc_http_post() usage - 1.6. Libruxc Usage + 1.4. Set http_retry parameter + 1.5. ruxc_http_get() usage + 1.6. ruxc_http_post() usage + 1.7. Libruxc Usage Chapter 1. Admin Guide @@ -61,6 +63,7 @@ Chapter 1. Admin Guide 3.1. http_timeout (int) 3.2. http_tlsmode (int) 3.3. http_reuse (int) + 3.4. http_retry (int) 4. Functions @@ -99,6 +102,7 @@ Chapter 1. Admin Guide 3.1. http_timeout (int) 3.2. http_tlsmode (int) 3.3. http_reuse (int) + 3.4. http_retry (int) 3.1. http_timeout (int) @@ -142,6 +146,18 @@ modparam("ruxc", "http_tlsmode", 1) modparam("ruxc", "http_reuse", 1) ... +3.4. http_retry (int) + + How many times to retry if the HTTP request does not get a 200ok + response. + + Default value is 0 (no retry). + + Example 1.4. Set http_retry parameter +... +modparam("ruxc", "http_retry", 2) +... + 4. Functions 4.1. ruxc_http_get(url, hdrs, respv) @@ -159,7 +175,7 @@ modparam("ruxc", "http_reuse", 1) This function can be used from ANY_ROUTE. - Example 1.4. ruxc_http_get() usage + Example 1.5. ruxc_http_get() usage ... ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s .escape.param})", @@ -182,7 +198,7 @@ switch ($rc) { This function can be used from ANY_ROUTE. - Example 1.5. ruxc_http_post() usage + Example 1.6. ruxc_http_post() usage ... ruxc_http_post("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{ s.escape.param})", @@ -205,7 +221,7 @@ switch ($rc) { installed and its environment configured, then run the following commands: - Example 1.6. Libruxc Usage + Example 1.7. Libruxc Usage ... git clone https://github.com/miconda/ruxc cd ruxc

1 0

git:master:6da06e26: ruxc: added http_retry modparam
by Daniel-Constantin Mierla 17 Aug '21

17 Aug '21

Module: kamailio Branch: master Commit: 6da06e2683b484c19eac27b757c1f2e565aa2e5d URL: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-17T21:27:36+02:00 ruxc: added http_retry modparam --- Modified: src/modules/ruxc/doc/ruxc_admin.xml Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… Patch: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index 794301bc06..d0cd3bf7f7 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -121,6 +121,25 @@ modparam("ruxc", "http_tlsmode", 1) ... modparam("ruxc", "http_reuse", 1) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_retry"> + <title><varname>http_retry</varname> (int)</title> + <para> + How many times to retry if the HTTP request does not get a 200ok response. + </para> + <para> + <emphasis> + Default value is 0 (no retry). + </emphasis> + </para> + <example> + <title>Set <varname>http_retry</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_retry", 2) +... </programlisting> </example> </section> diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 02fa278859..13c4a54b52 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -41,6 +41,7 @@ MODULE_VERSION static int _ruxc_http_timeout = 5000; static int _ruxc_http_tlsmode = 0; static int _ruxc_http_reuse = 0; +static int _ruxc_http_retry = 0; static int mod_init(void); static int child_init(int); @@ -75,6 +76,7 @@ static param_export_t params[]={ {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, + {"http_retry", PARAM_INT, &_ruxc_http_retry}, {0, 0, 0} }; @@ -135,6 +137,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; + v_http_request.retry = _ruxc_http_retry; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -233,6 +236,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; + v_http_request.retry = _ruxc_http_retry; v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

uac_reg module use of l_uuid in Contact header
by Ross McKillop 17 Aug '21

17 Aug '21

I've been trying to work out how to set the username element of the contact header in uac_reg outbound REGISTER requests and it seems it's hard coded in the source (uac_reg.c:990) to use the l_uuid. I'm curious why l_uuid is used here and not l_username which feels like it should be more consistent with the use of r_username? My C skills are sufficient to let me patch this locally for my application, but I wondered what the reason for this design decision is or if it's actually a very long lived 'bug' as it feels like l_username is the 'right' thing to use here? Alternatively, perhaps this would be considered a feature request to make it configurable via another parameter in the database (probably beyond my C unless I modelled it on the pull request that added contact_addr (#2470) Ross

2 2

[kamailio/kamailio] kazoo : fix routing of reply events (#2786)
by kageds 16 Aug '21

16 Aug '21

success events should be routed to onreply_route[] failure events should be routed to failure_route[]   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [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 Kazoo cfg files use onreply_route[] and failure_route[] to handle the replies from AMQP and the module was sending the replies to the main route and therefore the scripts were not receiving the responses You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2786 -- Commit Summary -- * kazoo : fix routing of reply events -- File Changes -- M src/modules/kazoo/kz_amqp.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2786.patch https://github.com/kamailio/kamailio/pull/2786.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/2786

5 9

git:master:fb2eee3e: kazoo : fix routing of reply events
by Daniel-Constantin Mierla 16 Aug '21

16 Aug '21

Module: kamailio Branch: master Commit: fb2eee3e175040fef5e76cbed11430976f62df32 URL: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… Author: Alan Evans <alan(a)kageds.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-16T20:08:11+02:00 kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… Patch: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 8076315dfd..5685f5a845 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2498,24 +2498,24 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->cb_route); + int n = route_lookup(&onreply_rt, cmd->cb_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = onreply_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->err_route); + int n = route_lookup(&failure_rt, cmd->err_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = failure_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); }

1 0

[kamailio/kamailio] TLSA Undefined Symbol __dlclose (#2815)
by Tim Chubb 13 Aug '21

13 Aug '21

### Description Building TLSA module on ubuntu 18.04 results in a compiler warning and an undefined symbol error when attempting to load module. ### Troubleshooting #### Reproduction Make module and attempt to load it  #### Debugging Data  ``` N/A ``` #### Log Messages  Compiler output ``` CC (gcc) [M tlsa.so] tls_util.o CC (gcc) [M tlsa.so] tls_domain.o CC (gcc) [M tlsa.so] tls_locking.o CC (gcc) [M tlsa.so] tls_rand.o CC (gcc) [M tlsa.so] tls_map.o CC (gcc) [M tlsa.so] tls_cfg.o CC (gcc) [M tlsa.so] tls_select.o CC (gcc) [M tlsa.so] tls_server.o CC (gcc) [M tlsa.so] tls_dump_vf.o CC (gcc) [M tlsa.so] tls_init.o CC (gcc) [M tlsa.so] tls_rpc.o CC (gcc) [M tlsa.so] tls_config.o CC (gcc) [M tlsa.so] tls_bio.o CC (gcc) [M tlsa.so] tls_ct_wrq.o CC (gcc) [M tlsa.so] tlsa_mod.o CC (gcc) [M tlsa.so] tls_verify.o LD (gcc) [M tlsa.so] tlsa.so /usr/lib/gcc/x86_64-linux-gnu/7/../../../x86_64-linux-gnu/libcrypto.a(dso_dlfcn.o): In function `dlfcn_globallookup': (.text+0x11): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking ``` Kamailio Log ``` Aug 9 11:21:04 kamtest kamailio: ERROR: <core> [core/sr_module.c:570]: load_module(): could not open module </usr/local/lib64/kamailio/modules/tlsa.so>: /usr/local/lib64/kamailio/modules/tlsa.so: undefined symbol: __dlclose Aug 9 11:21:04 kamtest kamailio: CRITICAL: <core> [core/cfg.y:3683]: yyerror_at(): parse error in config file /etc/kamailio/parameters/modules.cfg, line 7, column 12-20: failed to load module Aug 9 11:21:04 kamtest kamailio: ERROR: <core> [core/modparam.c:181]: set_mod_param_regex(): No module matching <tlsa> found ``` #### SIP Traffic  ``` N/A ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.0-dev0 (x86_64/linux) 0a5307-dirty 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: 0a5307 -dirty compiled on 10:36:16 Aug 9 2021 with gcc 7.5.0 ``` * **Operating System**:  ``` Linux kamtest 4.15.0-144-generic #148-Ubuntu SMP Sat May 8 02:33:43 UTC 2021 x86_64 x86_64 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/2815

2 5

git:master:22a72f3a: core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes
by Daniel-Constantin Mierla 13 Aug '21

13 Aug '21

Module: kamailio Branch: master Commit: 22a72f3a7725d56f00e22bdc52d44bd53da7c091 URL: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-13T08:57:10+02:00 core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes - set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them, if defined, or to 15 and 45 - cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2) - cover the requirements of using inet_ntop() - GH #2823 --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… Patch: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 546c822423..132f653255 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -510,8 +510,20 @@ int hostent2su(union sockaddr_union* su, /* maximum size of a str returned by ip_addr2str */ -#define IP6_MAX_STR_SIZE 39 /*1234:5678:9012:3456:7890:1234:5678:9012*/ -#define IP4_MAX_STR_SIZE 15 /*123.456.789.012*/ +/* POSIX INET6_ADDRSTRLEN (RFC 4291 section 2.2) - IPv6 with IPv4 tunneling + * (39): 1234:5678:9012:3456:7890:1234:5678:9012 + * (45): ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255 */ +#ifdef INET6_ADDRSTRLEN +#define IP6_MAX_STR_SIZE (INET6_ADDRSTRLEN-1) +#else +#define IP6_MAX_STR_SIZE 45 +#endif +/*123.456.789.123*/ +#ifdef INET_ADDRSTRLEN +#define IP4_MAX_STR_SIZE (INET_ADDRSTRLEN-1) +#else +#define IP4_MAX_STR_SIZE 15 +#endif /* converts a raw ipv6 addr (16 bytes) to ascii */ int ip6tosbuf(unsigned char* ip6, char* buff, int len);

1 0

[kamailio/kamailio] Kami Lua retrieving variable in configuration file (#2822)
by jpskriver 12 Aug '21

12 Aug '21

### Description Suppose that there is an variable define in `kamailio-basic-kemi.cfg` with: ``` #!define MYVAR 1.2.3.4 ``` Then in the `kamailio-basic-kemi-lua.lua` - How can we get that variable? ### Possible Solutions Is there any alternative solution like set global via app_lua parameter, example: ``` modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") modparam("app_lua", "varset", "pstngw=s:sip:10.10.10.10") ``` -- 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/2822

3 3

[kamailio/kamailio] Kamailio unable to relay ACK (response to 200 OK) with TCP connection (#2814)
by jpskriver 12 Aug '21

12 Aug '21

### Description The ACK that response to 200 OK was NAT relayed by Kamailio if using TCP protocol, then got this issue from log ```pending write on new connection 0x14a595095d40 sock 16 (-1/539 bytes written) (err: 11 - Resource temporarily unavailable)```  ### Troubleshooting #### Reproduction * Using KAMI with Lua for routing config. * make call between 2 sip clients, the receiver has been registered with TCP #### Debugging Data * With the same scenario with UDP, it work fine. *  ``` (paste your debugging data here) ``` #### Log Messages  ``` Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <script>: ROUTE RELAY BEGIN:----------------------------------------------------------- Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:1327]: t_newtran(): msg (0x14a5999f0b38) id=3/4784 global id=2/4784 T start=0xffffffffffffffff Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:497]: t_lookup_request(): start searching: hash=41830, isACK=1 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:455]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bKQe8H61SrNcaXD] Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:675]: t_lookup_request(): no transaction found Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_funcs.c:286]: t_relay_to(): forwarding ACK statelessly Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/crypto/md5utils.c:67]: MD5StringArray(): MD5 calculated: 66c47e5249a7009267e0cd264863c247 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/msg_translator.c:1797]: check_boundaries(): no multi-part body Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/forward.c:577]: forward_request(): Sending:#012ACK sip:Joe%20Biden@14.186.XXX.XX:60791;transport=TCP SIP/2.0#015#012Via: SIP/2.0/TCP 188.166.XXX.XX:5060;branch=z9hG4bK663a.66c47e5249a7009267e0cd264863c247.0#015#012Via: SIP/2.0/UDP 127.0.0.2;received=127.0.0.2;rport=5060;branch=z9hG4bKQe8H61SrNcaXD#015#012Max-Forwards: 69#015#012From: "Donald Trump" <sip:33123456789@127.0.0.2>;tag=mUNavKm60XZte#015#012To: <sip:5512345@127.0.0.3:5060;transport=udp>;tag=bd21bf6b#015#012Call-ID: 0e846d85-720e-123a-45a5-ea0e9328da5f#015#012CSeq: 39612479 ACK#015#012Contac t: <sip:gw+KamGW@127.0.0.2:5060;transport=udp;gw=KamGW>#015#012Content-Length: 0#015#012#015#012. Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/forward.c:578]: forward_request(): orig. len=557, new_len=539, proto=2 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:489]: sr_lua_reload_script(): No need to reload [/path-to-lua/routing.lua] is version 0 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:673]: app_lua_run_ex(): executing Lua function: [[ksr_onsend_route]] Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:675]: app_lua_run_ex(): lua top index is: 0 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1993]: tcp_send(): no open tcp connection found, opening new one Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/ip_addr.c:577]: print_ip(): tcpconn_new: new tcp connection: 14.186.47.222 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1175]: tcpconn_new(): on port 60791, type 2, socket -1 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1494]: tcpconn_add(): hashes: 1566:2785:0, 4 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:2886]: tcpconn_1st_send(): pending write on new connection 0x14a595095d40 sock 16 (-1/539 bytes written) (err: 11 - Resource temporar ily unavailable) Aug 7 10:35:53 testnode1 /usr/local/sbin/kamailio[4806]: DEBUG: <core> [core/tcp_main.c:3792]: handle_ser_child(): read response= 14a595095d40, 5, fd 55 from 12 (4784) Aug 7 10:35:53 testnode1 /usr/local/sbin/kamailio[4806]: DEBUG: <core> [core/io_wait.h:375]: io_watch_add(): DBG: io_watch_add(0x55f0338266a0, 55, 2, 0x14a595095d40), fd_no=41 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:1003]: sr_kemi_lua_exec_func_ex(): param[0] for: xdbg is str: ROUTE RELAY END:-------------------------------------------------------- --- ``` #### SIP Traffic ![image](https://user-images.githubusercontent.com/85822466/128597726-0f64fdec-9b45-4ef6-b480-f5c0b3f21600.png) ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.5.1 (x86_64/linux) 7abebb 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: 7abebb compiled on 07:46:14 Jun 27 2021 with gcc 8.3.0 ``` * **Operating System**:  Debian 10.10 ``` root@testnode1:~# uname -a Linux testnode1 4.19.0-12-cloud-amd64 #1 SMP Debian 4.19.152-1 (2020-10-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/2814

2 2

[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: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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev