June 2018 - sr-dev - kamailio.org

[kamailio/kamailio] str_hash: Option to allocate hash in shm (#1535)
by Alfonso Pinto 03 Jul '18

03 Jul '18

Added an allocator function to allocate the hash in shared memory. Added also locking stuff   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Added a new allocator function to str_hash.h. This new function allows to allocate the hash table in shared memory. Changes to struct str_hash_table: - Added a gen_lock_set_t (locks) to hold the lock set - Added an int (locks_no) to hold the number of locks - Added an indicator (memory) to know if the table was allocated in private memory (p) or shared memory(s) Changes to struct str_hash_head: - Added an int(lock_idx) that hold the index of the lock when the head is locked. Changes to struct str_hash_entry: - Added a pointer to the head the entry belongs to. This allows to unlock the head when needed. Added functions to lock and unlock the head when needed. Modified functions str_hash_add and str_hash_get to lock the head when needed Added function str_hash_destroy to remove the hash table and all its contents from memory. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1535 -- Commit Summary -- * str_hash: Option to allocate hash in shm -- File Changes -- M src/core/str_hash.h (100) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1535.patch https://github.com/kamailio/kamailio/pull/1535.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/1535

3 6

TLS CRL configuration
by Amarnath Kanchivanam 03 Jul '18

03 Jul '18

Hi All, I'm trying to configured kamailio as TLS server with below configuration (tls.cfg) and TLS server is started successfully. [server:default] method = TLSv1+ verify_certificate = yes require_certificate = yes private_key = ./sip/server.key certificate = ./sip/server.crt ca_list = ./bundle.crt crl = ./sip_crl.pem verify_depth = 9 [client:default] verify_certificate = no require_certificate = no TLS connection works fine. Later i have updated the sip_crl.pem with server certificate revoked details and performed tls.reload command to load the latest update. After this I expect any TLS client trying to establish TLS connection should fail, as the client and server certificates are signed by same authority and server certificate is revoked. But the clients are able to establish TLS connection without any errors. I'm not getting any traces to confirm CRL validation has been performed before accepting the TLS connection. Any advice would be help to proceed with evaluating CRL functionality. -Amar

1 1

[kamailio/kamailio] continuously memory getting increases with app_lua (#1575)
by Surendra Tiwari 29 Jun '18

29 Jun '18

### Description  ### Troubleshooting #### Reproduction  load app_lua with kamailio route file. route file should load other lua module or custom modules #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, 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 on 11:06:51 May 10 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` Linux ip-172-31-4-160 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 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/1575

2 3

git:master:af9b6a47: dispatcher: small polishing of sample config file
by Daniel-Constantin Mierla 29 Jun '18

29 Jun '18

Module: kamailio Branch: master Commit: af9b6a47cc6600dc6d6036edda36d2ffc2de04d0 URL: https://github.com/kamailio/kamailio/commit/af9b6a47cc6600dc6d6036edda36d2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-29T09:56:41+02:00 dispatcher: small polishing of sample config file --- Modified: src/modules/dispatcher/doc/dispatcher.cfg --- Diff: https://github.com/kamailio/kamailio/commit/af9b6a47cc6600dc6d6036edda36d2f… Patch: https://github.com/kamailio/kamailio/commit/af9b6a47cc6600dc6d6036edda36d2f… --- diff --git a/src/modules/dispatcher/doc/dispatcher.cfg b/src/modules/dispatcher/doc/dispatcher.cfg index 7c2610ccf0..881cc10d1f 100644 --- a/src/modules/dispatcher/doc/dispatcher.cfg +++ b/src/modules/dispatcher/doc/dispatcher.cfg @@ -70,11 +70,12 @@ sip_warning=no ####### Modules Section ######## # set module path -mpath="/usr/local/lib/kamailio/modules/" +#mpath="/usr/local/lib/kamailio/modules/" loadmodule "db_mysql.so" loadmodule "jsonrpcs.so" loadmodule "kex.so" +loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" @@ -156,8 +157,9 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) + if (is_method("INVITE|SUBSCRIBE")) { record_route(); + } # account only INVITEs if (is_method("INVITE")) { @@ -239,6 +241,7 @@ route[WITHINDLG] { route[REGISTRAR] { if(!is_method("REGISTER")) return; + sl_send_reply("404", "No registrar"); exit; }

1 0

git:master:3e280360: sdpops: exported sdp_print() to kemi framework
by Daniel-Constantin Mierla 29 Jun '18

29 Jun '18

Module: kamailio Branch: master Commit: 3e2803602873f3151b568a3f1a0a998aa16634f2 URL: https://github.com/kamailio/kamailio/commit/3e2803602873f3151b568a3f1a0a998… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-29T09:56:41+02:00 sdpops: exported sdp_print() to kemi framework --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e2803602873f3151b568a3f1a0a998… Patch: https://github.com/kamailio/kamailio/commit/3e2803602873f3151b568a3f1a0a998… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 3987f9ac0b..8b28a35ddb 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -1554,29 +1554,35 @@ static int w_sdp_with_codecs_by_name(sip_msg_t* msg, char* codecs, char *bar) /** * */ -static int w_sdp_print(sip_msg_t* msg, char* level, char *bar) +static int ki_sdp_print(sip_msg_t* msg, int llevel) { sdp_info_t *sdp = NULL; - int llevel = L_DBG; if(parse_sdp(msg) < 0) { LM_ERR("Unable to parse sdp\n"); return -1; } - if(fixup_get_ivalue(msg, (gparam_p)level, &llevel)!=0) - { + print_sdp(sdp, llevel); + return 1; +} + + +/** + * + */ +static int w_sdp_print(sip_msg_t* msg, char* level, char *bar) +{ + int llevel = L_DBG; + + if(fixup_get_ivalue(msg, (gparam_p)level, &llevel)!=0) { LM_ERR("unable to get the debug level value\n"); return -1; } - sdp = (sdp_info_t*)msg->body; - - print_sdp(sdp, llevel); - return 1; + return ki_sdp_print(msg, llevel); } - /** * */ @@ -2022,6 +2028,11 @@ static sr_kemi_t sr_kemi_sdpops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sdpops"), str_init("sdp_print"), + SR_KEMIP_INT, ki_sdp_print, + { SR_KEMIP_INT, 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

Question on the new Kamailio v5.x Releases
by Ginhoux, Patrick 27 Jun '18

27 Jun '18

Hi, I always read your email regarding new stable releases. I am currently working on a project upgrade of multiples servers to the most recent OS (Windows, RedHat) and middleware. In this project, I have upgraded SIP Proxies server running on old version of Kamailio, to the 5.0.1 release (over RedHat 7.4). Effort to make that upgrade and tests have been done with success in the last months. So considering to upgrade to the 5.0.7 or 5.1.4 would be a subsequent work I need to evaluate. I could read all the release notes, but it is also a big challenge to determine if fixes are interesting for me. Based on your experience, is there particular cases, fixed in the new release I need to pay attention? Any comments are welcome. Regards Patrick GINHOUX

1 0

git:master:cf98d1fa: modules: readme files regenerated - auth_xkeys ... [skip ci]
by Kamailio Dev 27 Jun '18

27 Jun '18

Module: kamailio Branch: master Commit: cf98d1fa997e9b3e818c57d226613a50be0248b1 URL: https://github.com/kamailio/kamailio/commit/cf98d1fa997e9b3e818c57d226613a5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-27T10:46:54+02:00 modules: readme files regenerated - auth_xkeys ... [skip ci] --- Modified: src/modules/auth_xkeys/README --- Diff: https://github.com/kamailio/kamailio/commit/cf98d1fa997e9b3e818c57d226613a5… Patch: https://github.com/kamailio/kamailio/commit/cf98d1fa997e9b3e818c57d226613a5… --- diff --git a/src/modules/auth_xkeys/README b/src/modules/auth_xkeys/README index d9e7bb9162..effcb25e6f 100644 --- a/src/modules/auth_xkeys/README +++ b/src/modules/auth_xkeys/README @@ -171,7 +171,7 @@ auth_xkeys_add("X-My-Key", "abc", "sha256", "$Ri:$fu:$ru:$hdr(CSeq)"); Example 1.3. auth_xkeys_check usage ... -if(!auth_xkeys_add("X-My-Key", "abc", "sha256", "$si:$fu:$ru:$hdr(CSeq)")) { +if(!auth_xkeys_check("X-My-Key", "abc", "sha256", "$si:$fu:$ru:$hdr(CSeq)")) { send_reply("403", "Forbidden"); exit; }

1 0

git:master:0d4f48d1: auth_xkeys: docs - fixed name of the function in example
by Daniel-Constantin Mierla 27 Jun '18

27 Jun '18

Module: kamailio Branch: master Commit: 0d4f48d168167df5fc6be38721cab69115637dae URL: https://github.com/kamailio/kamailio/commit/0d4f48d168167df5fc6be38721cab69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-27T10:41:40+02:00 auth_xkeys: docs - fixed name of the function in example --- Modified: src/modules/auth_xkeys/doc/auth_xkeys_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0d4f48d168167df5fc6be38721cab69… Patch: https://github.com/kamailio/kamailio/commit/0d4f48d168167df5fc6be38721cab69… --- diff --git a/src/modules/auth_xkeys/doc/auth_xkeys_admin.xml b/src/modules/auth_xkeys/doc/auth_xkeys_admin.xml index 691465b90d..cafece42d4 100644 --- a/src/modules/auth_xkeys/doc/auth_xkeys_admin.xml +++ b/src/modules/auth_xkeys/doc/auth_xkeys_admin.xml @@ -192,7 +192,7 @@ auth_xkeys_add("X-My-Key", "abc", "sha256", "$Ri:$fu:$ru:$hdr(CSeq)"); <title><function>auth_xkeys_check</function> usage</title> <programlisting format="linespecific"> ... -if(!auth_xkeys_add("X-My-Key", "abc", "sha256", "$si:$fu:$ru:$hdr(CSeq)")) { +if(!auth_xkeys_check("X-My-Key", "abc", "sha256", "$si:$fu:$ru:$hdr(CSeq)")) { send_reply("403", "Forbidden"); exit; }

1 0

git:master:14180b44: auth_db: set id for section not title tag of is_subscriber()
by Daniel-Constantin Mierla 27 Jun '18

27 Jun '18

Module: kamailio Branch: master Commit: 14180b449d8feb9ae9adcb74926d64138b7cd750 URL: https://github.com/kamailio/kamailio/commit/14180b449d8feb9ae9adcb74926d641… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-27T00:31:26+02:00 auth_db: set id for section not title tag of is_subscriber() --- Modified: src/modules/auth_db/doc/auth_db_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/14180b449d8feb9ae9adcb74926d641… Patch: https://github.com/kamailio/kamailio/commit/14180b449d8feb9ae9adcb74926d641… --- diff --git a/src/modules/auth_db/doc/auth_db_admin.xml b/src/modules/auth_db/doc/auth_db_admin.xml index 62616b654b..654c889415 100644 --- a/src/modules/auth_db/doc/auth_db_admin.xml +++ b/src/modules/auth_db/doc/auth_db_admin.xml @@ -558,8 +558,8 @@ if (!auth_check("$fd", "subscriber", "1")) { </example> </section> - <section> - <title id="auth_db.f.is_subscriber"> + <section id="auth_db.f.is_subscriber"> + <title> <function moreinfo="none">is_subscriber(uri, dbtable, flags)</function> </title> <para>The function checks if there is a subscriber corresponding to

1 0

[kamailio/kamailio] tls: configuration override with multiple server roles on same socket (#1574)
by VolodyaIvanets 26 Jun '18

26 Jun '18

Hello, I'm using Kamailio v. 5.1.0-21 on CentOs 6 machine, installed from repository. It is running behind the NAT. I'm using Htek and Zoiper phones for testing. Below is content from my tls.cfg configuration file: ``` [server:default] method = TLSv1.2 method = SSLv23 require_certificate = yes verify_certificate = yes private_key = /var/kamailio/certificates/default/server/key.pem certificate = /var/kamailio/certificates/default/server/cert.pem ca_list = /var/kamailio/certificates/default/CA/cert.pem [server:172.16.30.205:5061] method = SSLv23 require_certificate = yes verify_certificate = yes private_key = /var/kamailio/certificates/first.my-domain.com/server/key.pem certificate = /var/kamailio/certificates/first.my-domain.com/server/cert.pem ca_list = /var/kamailio/certificates/first.my-domain.com/CA/cert.pem server_name = "first.my-domain.com" [server:172.16.30.205:5061] method = SSLv23 require_certificate = yes verify_certificate = yes private_key = /var/kamailio/certificates/second.my-domain.com/server/key.pem certificate = /var/kamailio/certificates/second.my-domain.com/server/cert.pem ca_list = /var/kamailio/certificates/second.my-domain.com/CA/cert.pem server_name = "second.my-domain.com" [client:default] verify_certificate = yes require_certificate = yes ``` My **first** phone is configured with certificate for _first.my-domain.com_ and **second** - for _second.my-domain.com_. When I try to connect with **first** phone, it fails. I get following output in Kamailio log file: ``` Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: <core> [core/ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: office_with_phones_public_ip_address Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: <core> [core/tcp_main.c:999]: tcpconn_new(): on port 5360, type 3 Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: <core> [core/tcp_main.c:1309]: tcpconn_add(): hashes: 480:2863:2253, 1 Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa4ea20, 55, 2, 0x7f605f124d10), fd_no=42 Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa4ea20, 55, -1, 0x0) fd_no=43 called Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: <core> [core/tcp_main.c:4196]: handle_tcpconn_ev(): sending to child, events 1 Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: <core> [core/tcp_main.c:3878]: send2child(): selected tcp worker 0 31(8168) for activity on [tls:172.16.30.205:5061], 0x7f605f124d10 Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_read.c:1740]: handle_io(): received n=8 con=0x7f605f124d10, fd=12 Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: tls [tls_server.c:199]: tls_complete_init(): completing tls connection initialization Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: tls [tls_server.c:228]: tls_complete_init(): Using initial TLS domain TLSs<172.16.30.205:5061> (dom 0x7f605eaa7f38 ctx 0x7f605ed545b0 sn [second.my-domain.com]) Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: tls [tls_domain.c:724]: sr_ssl_ctx_info_callback(): SSL handshake started Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: tls [tls_domain.c:927]: tls_server_name_cb(): SSL_get_servername returned NULL: return SSL_TLSEXT_ERR_NOACK Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_main.c:2460]: tcpconn_do_send(): sending... Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_main.c:2494]: tcpconn_do_send(): after real write: c= 0x7f605f124d10 n=2401 fd=12 Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_main.c:2495]: tcpconn_do_send(): buf= Jun 25 15:36:50 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa92cc0, 12, 2, 0x7f605f124d10), fd_no=1 Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_main.c:2460]: tcpconn_do_send(): sending... Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_main.c:2494]: tcpconn_do_send(): after real write: c= 0x7f605f124d10 n=7 fd=12 Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_main.c:2495]: tcpconn_do_send(): buf= Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8168]: ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS accept:error:140890B2:SSL routines:SSL3_GET_CLIENT_CERTIFICATE:no certificate returned Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8168]: ERROR: <core> [core/tcp_read.c:1485]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f605f124d10 r: 0x7f605f124d90 Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa92cc0, 12, -1, 0x10) fd_no=2 called Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_read.c:1664]: release_tcpconn(): releasing con 0x7f605f124d10, state -2, fd=12, id=1 ([office_with_phones_public_ip_address]:5360 -> [office_with_phones_public_ip_address]:5061) Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8168]: DEBUG: <core> [core/tcp_read.c:1665]: release_tcpconn(): extra_data 0x7f605f0bb8f8 Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: <core> [core/tcp_main.c:3308]: handle_tcp_child(): reader response= 7f605f124d10, -2 from 0 Jun 25 15:36:51 kamailio-dev /usr/sbin/kamailio[8180]: DEBUG: tls [tls_server.c:667]: tls_h_close(): Closing SSL connection 0x7f605f0bb8f8 ``` However **second** phone connects with no problems: ``` Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9155]: DEBUG: <core> [core/ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: office_with_phones_public_ip_address Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9155]: DEBUG: <core> [core/tcp_main.c:999]: tcpconn_new(): on port 53732, type 3 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9155]: DEBUG: <core> [core/tcp_main.c:1309]: tcpconn_add(): hashes: 1406:4017:3155, 1 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9155]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa4ea20, 55, 2, 0x7fa084d00d10), fd_no=42 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9155]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa4ea20, 55, -1, 0x0) fd_no=43 called Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9155]: DEBUG: <core> [core/tcp_main.c:4196]: handle_tcpconn_ev(): sending to child, events 1 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9155]: DEBUG: <core> [core/tcp_main.c:3878]: send2child(): selected tcp worker 0 31(9146) for activity on [tls:172.16.30.205:5061], 0x7fa084d00d10 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: <core> [core/tcp_read.c:1740]: handle_io(): received n=8 con=0x7fa084d00d10, fd=12 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_server.c:199]: tls_complete_init(): completing tls connection initialization Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_server.c:228]: tls_complete_init(): Using initial TLS domain TLSs<172.16.30.205:5061> (dom 0x7fa084683f38 ctx 0x7fa0849305b0 sn [second.my-domain.com]) Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_domain.c:724]: sr_ssl_ctx_info_callback(): SSL handshake started Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_domain.c:927]: tls_server_name_cb(): SSL_get_servername returned NULL: return SSL_TLSEXT_ERR_NOACK Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: <core> [core/tcp_main.c:2460]: tcpconn_do_send(): sending... Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: <core> [core/tcp_main.c:2494]: tcpconn_do_send(): after real write: c= 0x7fa084d00d10 n=2406 fd=12 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: <core> [core/tcp_main.c:2495]: tcpconn_do_send(): buf= Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa92cc0, 12, 2, 0x7fa084d00d10), fd_no=1 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_domain.c:736]: sr_ssl_ctx_info_callback(): SSL handshake done Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_domain.c:740]: sr_ssl_ctx_info_callback(): SSL disable renegotiation Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_server.c:415]: tls_accept(): TLS accept successful Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_server.c:422]: tls_accept(): tls_accept: new connection from office_with_phones_public_ip_address:53732 using TLSv1/SSLv3 AES256-GCM-SHA384 256 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_server.c:425]: tls_accept(): tls_accept: local socket: 172.16.30.205:5061 Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_server.c:372]: tls_dump_cert_info(): tls_accept: client certificate subject:/C=UA/ST=Lviv/O=Test/OU=Dev/CN=second.my-domain.com/emailAddress=vo… Jun 25 15:40:41 kamailio-dev /usr/sbin/kamailio[9146]: DEBUG: tls [tls_server.c:376]: tls_dump_cert_info(): tls_accept: client certificate issuer:/C=UA/ST=Lviv/L=Lviv/O=Test/OU=Dev/CN=second.my-domain.com/emailAddr… ``` After swapping `[server:172.16.30.205:5061]` sections in tls.cfg, **first** phone can connect: ``` Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9852]: DEBUG: <core> [core/ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: office_with_phones_public_ip_address Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9852]: DEBUG: <core> [core/tcp_main.c:999]: tcpconn_new(): on port 42055, type 3 Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9852]: DEBUG: <core> [core/tcp_main.c:1309]: tcpconn_add(): hashes: 54:2809:2331, 1 Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9852]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa4ea20, 55, 2, 0x7f5ce90d2eb0), fd_no=42 Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9852]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa4ea20, 55, -1, 0x0) fd_no=43 called Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9852]: DEBUG: <core> [core/tcp_main.c:4196]: handle_tcpconn_ev(): sending to child, events 1 Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9852]: DEBUG: <core> [core/tcp_main.c:3878]: send2child(): selected tcp worker 0 31(9842) for activity on [tls:172.16.30.205:5061], 0x7f5ce90d2eb0 Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: <core> [core/tcp_read.c:1740]: handle_io(): received n=8 con=0x7f5ce90d2eb0, fd=12 Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_server.c:199]: tls_complete_init(): completing tls connection initialization Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_server.c:228]: tls_complete_init(): Using initial TLS domain TLSs<172.16.30.205:5061> (dom 0x7f5ce8a55fd8 ctx 0x7f5ce8d025b0 sn [first.my-domain.com]) Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_domain.c:724]: sr_ssl_ctx_info_callback(): SSL handshake started Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_domain.c:927]: tls_server_name_cb(): SSL_get_servername returned NULL: return SSL_TLSEXT_ERR_NOACK Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: <core> [core/tcp_main.c:2460]: tcpconn_do_send(): sending... Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: <core> [core/tcp_main.c:2494]: tcpconn_do_send(): after real write: c= 0x7f5ce90d2eb0 n=2371 fd=12 Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: <core> [core/tcp_main.c:2495]: tcpconn_do_send(): buf= Jun 25 15:47:04 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa92cc0, 12, 2, 0x7f5ce90d2eb0), fd_no=1 Jun 25 15:47:05 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_domain.c:736]: sr_ssl_ctx_info_callback(): SSL handshake done Jun 25 15:47:05 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_domain.c:740]: sr_ssl_ctx_info_callback(): SSL disable renegotiation Jun 25 15:47:05 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_server.c:415]: tls_accept(): TLS accept successful Jun 25 15:47:05 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_server.c:422]: tls_accept(): tls_accept: new connection from office_with_phones_public_ip_address:42055 using TLSv1/SSLv3 AES128-SHA 128 Jun 25 15:47:05 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_server.c:425]: tls_accept(): tls_accept: local socket: 172.16.30.205:5061 Jun 25 15:47:05 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_server.c:372]: tls_dump_cert_info(): tls_accept: client certificate subject:/C=UA/ST=Lviv/O=Test/OU=Dev/CN=first.my-domain.com/emailAddress=vol… Jun 25 15:47:05 kamailio-dev /usr/sbin/kamailio[9842]: DEBUG: tls [tls_server.c:376]: tls_dump_cert_info(): tls_accept: client certificate issuer:/C=UA/ST=Lviv/L=Lviv/O=Test/OU=Dev/CN=first.my-domain.com/emailAddre… ``` ... but **second** phone can not: ``` Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: <core> [core/ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: office_with_phones_public_ip_address Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: <core> [core/tcp_main.c:999]: tcpconn_new(): on port 53873, type 3 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: <core> [core/tcp_main.c:1309]: tcpconn_add(): hashes: 1772:3107:4033, 1 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa4ea20, 55, 2, 0x7fc8bd364eb0), fd_no=42 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa4ea20, 55, -1, 0x0) fd_no=43 called Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: <core> [core/tcp_main.c:4196]: handle_tcpconn_ev(): sending to child, events 1 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: <core> [core/tcp_main.c:3878]: send2child(): selected tcp worker 0 31(9344) for activity on [tls:172.16.30.205:5061], 0x7fc8bd364eb0 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: <core> [core/tcp_read.c:1740]: handle_io(): received n=8 con=0x7fc8bd364eb0, fd=12 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: tls [tls_server.c:199]: tls_complete_init(): completing tls connection initialization Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: tls [tls_server.c:228]: tls_complete_init(): Using initial TLS domain TLSs<172.16.30.205:5061> (dom 0x7fc8bcce7fd8 ctx 0x7fc8bcf945b0 sn [first.my-domain.com]) Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: tls [tls_domain.c:724]: sr_ssl_ctx_info_callback(): SSL handshake started Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: tls [tls_domain.c:927]: tls_server_name_cb(): SSL_get_servername returned NULL: return SSL_TLSEXT_ERR_NOACK Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: <core> [core/tcp_main.c:2460]: tcpconn_do_send(): sending... Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: <core> [core/tcp_main.c:2494]: tcpconn_do_send(): after real write: c= 0x7fc8bd364eb0 n=2376 fd=12 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: <core> [core/tcp_main.c:2495]: tcpconn_do_send(): buf= Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa92cc0, 12, 2, 0x7fc8bd364eb0), fd_no=1 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS accept:error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: ERROR: <core> [core/tcp_read.c:1485]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7fc8bd364eb0 r: 0x7fc8bd364f30 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa92cc0, 12, -1, 0x10) fd_no=2 called Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: <core> [core/tcp_read.c:1664]: release_tcpconn(): releasing con 0x7fc8bd364eb0, state -2, fd=12, id=1 ([office_with_phones_public_ip_address]:53873 -> [office_with_phones_public_ip_address]:5061) Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9344]: DEBUG: <core> [core/tcp_read.c:1665]: release_tcpconn(): extra_data 0x7fc8bd168508 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: <core> [core/tcp_main.c:3308]: handle_tcp_child(): reader response= 7fc8bd364eb0, -2 from 0 Jun 25 15:43:51 kamailio-dev /usr/sbin/kamailio[9354]: DEBUG: tls [tls_server.c:667]: tls_h_close(): Closing SSL connection 0x7fc8bd168508 ``` 10-th line in each output from above shows that last server role which is configured for particular socket is used to establish connection, ignoring previous ones. Please let me know if my configuration is correct or it needs to be adjusted. Thank you very much! -- 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/1574

2 4

Planning next IRC devel meeting
by Daniel-Constantin Mierla 26 Jun '18

26 Jun '18

Hello, I thought of start planning the next IRC devel meeting, it is quite some time since the last one with a busy spring for most of us. Among the topics to be approached would be the roadmap to the next major release, then discuss what else we can do for or with the project. My proposal as a date is Tuesday, June 27, at 14:00 UTC -- I created a page for it: - https://www.kamailio.org/wiki/devel/irc-meetings/2018a List yourself if you can participate or you prefer a different date, as well as add new topics that you consider they should be approached. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

1 3

git:master:48de203f: app_python: support for functions with more combinations of 4 params
by Daniel-Constantin Mierla 25 Jun '18

25 Jun '18

Module: kamailio Branch: master Commit: 48de203fda213749ac1e6fdb081c22dd701f85c4 URL: https://github.com/kamailio/kamailio/commit/48de203fda213749ac1e6fdb081c22d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-25T17:33:29+02:00 app_python: support for functions with more combinations of 4 params --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/48de203fda213749ac1e6fdb081c22d… Patch: https://github.com/kamailio/kamailio/commit/48de203fda213749ac1e6fdb081c22d… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 520bbda52c..1e9fd23d48 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -607,6 +607,14 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) ret = ((sr_kemi_fmssnn_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + /* snnn */ + ret = ((sr_kemi_fmsnnn_f)(ket->func))(lmsg, + &vps[0].s, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_STR @@ -615,6 +623,30 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) ret = ((sr_kemi_fmnsss_f)(ket->func))(lmsg, vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + /* nnss */ + ret = ((sr_kemi_fmnnss_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, &vps[2].s, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + /* nnns */ + ret = ((sr_kemi_fmnnns_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, vps[2].n, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + /* nnnn */ + ret = ((sr_kemi_fmnnnn_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s);

1 0

git:master:08f942c9: app_sqlang: support functions with more combinations of 4 params
by Daniel-Constantin Mierla 25 Jun '18

25 Jun '18

Module: kamailio Branch: master Commit: 08f942c9efc4e898de3985d25379b88a9ffe73a4 URL: https://github.com/kamailio/kamailio/commit/08f942c9efc4e898de3985d25379b88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-25T17:24:09+02:00 app_sqlang: support functions with more combinations of 4 params --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/08f942c9efc4e898de3985d25379b88… Patch: https://github.com/kamailio/kamailio/commit/08f942c9efc4e898de3985d25379b88… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 27f4ac2f36..0d4672c32b 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1350,6 +1350,13 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) ret = ((sr_kemi_fmssnn_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_sqlang_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsnnn_f)(ket->func))(env_J->msg, + &vps[0].s, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_sqlang_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_STR @@ -1357,6 +1364,27 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) ret = ((sr_kemi_fmnsss_f)(ket->func))(env_J->msg, vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_sqlang_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnnss_f)(ket->func))(env_J->msg, + vps[0].n, vps[1].n, &vps[2].s, &vps[3].s); + return sr_kemi_sqlang_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnnns_f)(ket->func))(env_J->msg, + vps[0].n, vps[1].n, vps[2].n, &vps[3].s); + return sr_kemi_sqlang_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmnnnn_f)(ket->func))(env_J->msg, + vps[0].n, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_sqlang_return_int(J, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s);

1 0

git:master:734d0842: app_ruby: support for functions with more than 2 parameters
by Daniel-Constantin Mierla 25 Jun '18

25 Jun '18

Module: kamailio Branch: master Commit: 734d0842072ce5e99813591833364ddef0bebc64 URL: https://github.com/kamailio/kamailio/commit/734d0842072ce5e99813591833364dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-25T17:18:37+02:00 app_ruby: support for functions with more than 2 parameters --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/734d0842072ce5e99813591833364dd… Patch: https://github.com/kamailio/kamailio/commit/734d0842072ce5e99813591833364dd…

1 0

git:master:ef90af63: app_jsdt: support for more combinations of fuctions with 4 params
by Daniel-Constantin Mierla 25 Jun '18

25 Jun '18

Module: kamailio Branch: master Commit: ef90af6335d0f3d54686f6e039ff3bab4e5c4729 URL: https://github.com/kamailio/kamailio/commit/ef90af6335d0f3d54686f6e039ff3ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-25T17:07:30+02:00 app_jsdt: support for more combinations of fuctions with 4 params --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/ef90af6335d0f3d54686f6e039ff3ba… Patch: https://github.com/kamailio/kamailio/commit/ef90af6335d0f3d54686f6e039ff3ba… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 108b96896c..ff9f2ad19d 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1141,6 +1141,13 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) ret = ((sr_kemi_fmssnn_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsnnn_f)(ket->func))(env_J->msg, + &vps[0].s, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_jsdt_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_STR @@ -1148,6 +1155,27 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) ret = ((sr_kemi_fmnsss_f)(ket->func))(env_J->msg, vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnnss_f)(ket->func))(env_J->msg, + vps[0].n, vps[1].n, &vps[2].s, &vps[3].s); + return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnnns_f)(ket->func))(env_J->msg, + vps[0].n, vps[1].n, vps[2].n, &vps[3].s); + return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmnnnn_f)(ket->func))(env_J->msg, + vps[0].n, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_jsdt_return_int(J, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s);

1 0

git:master:94ec7c77: app_jsdt: updated duktape js engine to v2.2.1
by Daniel-Constantin Mierla 23 Jun '18

23 Jun '18

Module: kamailio Branch: master Commit: 94ec7c778f0a98b91b6518575748875b6034edf0 URL: https://github.com/kamailio/kamailio/commit/94ec7c778f0a98b91b6518575748875… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-23T13:09:52+02:00 app_jsdt: updated duktape js engine to v2.2.1 --- Modified: src/modules/app_jsdt/duk_config.h Modified: src/modules/app_jsdt/duktape.c Modified: src/modules/app_jsdt/duktape.h --- Diff: https://github.com/kamailio/kamailio/commit/94ec7c778f0a98b91b6518575748875… Patch: https://github.com/kamailio/kamailio/commit/94ec7c778f0a98b91b6518575748875…

1 0

git:master:bb14964d: jsonrpcc: init and update cfg framework for io handler process
by Daniel-Constantin Mierla 23 Jun '18

23 Jun '18

Module: kamailio Branch: master Commit: bb14964dd8337d0946c7e233ff3cc81f22e8e1bb URL: https://github.com/kamailio/kamailio/commit/bb14964dd8337d0946c7e233ff3cc81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T19:54:51+02:00 jsonrpcc: init and update cfg framework for io handler process - GH #1520 --- Modified: src/modules/jsonrpcc/jsonrpc_io.c Modified: src/modules/jsonrpcc/jsonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bb14964dd8337d0946c7e233ff3cc81… Patch: https://github.com/kamailio/kamailio/commit/bb14964dd8337d0946c7e233ff3cc81… --- diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c index cae18322ba..ebb93348ba 100644 --- a/src/modules/jsonrpcc/jsonrpc_io.c +++ b/src/modules/jsonrpcc/jsonrpc_io.c @@ -33,6 +33,8 @@ #include "../../core/route.h" #include "../../core/route_struct.h" #include "../../core/lvalue.h" +#include "../../core/cfg/cfg_struct.h" + #include "../tm/tm_load.h" #include "jsonrpc_io.h" @@ -156,6 +158,8 @@ void cmd_pipe_cb(int fd, short event, void *arg) return; } + cfg_update(); + params = json_tokener_parse(cmd->params); if (cmd->notify_only) { diff --git a/src/modules/jsonrpcc/jsonrpcc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c index 903b278447..2c3cce22db 100644 --- a/src/modules/jsonrpcc/jsonrpcc_mod.c +++ b/src/modules/jsonrpcc/jsonrpcc_mod.c @@ -28,6 +28,8 @@ #include "../../core/mod_fix.h" #include "../../core/trim.h" #include "../../core/sr_module.h" +#include "../../core/cfg/cfg_struct.h" + #include "../tm/tm_load.h" #include "jsonrpc_request.h" @@ -139,6 +141,9 @@ static int child_init(int rank) if(pid==0){ /* child */ close(pipe_fds[1]); + /* initialize the config framework */ + if (cfg_child_init()) + return -1; return jsonrpc_io_child_process(pipe_fds[0], servers_param); } return 0;

1 0

git:master:3e7ff1f3: app_python: support for more combinations of functions with 4 params
by Daniel-Constantin Mierla 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 3e7ff1f3613db1c5de559bbf259a621647a5424b URL: https://github.com/kamailio/kamailio/commit/3e7ff1f3613db1c5de559bbf259a621… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T13:30:09+02:00 app_python: support for more combinations of functions with 4 params --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3e7ff1f3613db1c5de559bbf259a621… Patch: https://github.com/kamailio/kamailio/commit/3e7ff1f3613db1c5de559bbf259a621… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 6a1d62d932..7110912b92 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -583,14 +583,46 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) ret = ((sr_kemi_fmssnn_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + /* snnn */ + ret = ((sr_kemi_fmsnnn_f)(ket->func))(lmsg, + &vps[0].s, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_STR && ket->ptypes[3]==SR_KEMIP_STR) { - /* ssnn */ + /* nsss */ ret = ((sr_kemi_fmnsss_f)(ket->func))(lmsg, vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + /* nnss */ + ret = ((sr_kemi_fmnnss_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, &vps[2].s, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + /* nnns */ + ret = ((sr_kemi_fmnnns_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, vps[2].n, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + /* nnnn */ + ret = ((sr_kemi_fmnnnn_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s);

1 0

git:master:8ff9f0dc: app_lua: support for more combinations of functions with 4 params
by Daniel-Constantin Mierla 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 8ff9f0dc0c00e80ad3a9add41823ca3dc101b94e URL: https://github.com/kamailio/kamailio/commit/8ff9f0dc0c00e80ad3a9add41823ca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T13:30:08+02:00 app_lua: support for more combinations of functions with 4 params --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/8ff9f0dc0c00e80ad3a9add41823ca3… Patch: https://github.com/kamailio/kamailio/commit/8ff9f0dc0c00e80ad3a9add41823ca3… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index c98830da5c..a72e657279 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1702,6 +1702,13 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) ret = ((sr_kemi_fmssnn_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsnnn_f)(ket->func))(env_L->msg, + &vps[0].s, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_STR @@ -1709,6 +1716,27 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) ret = ((sr_kemi_fmnsss_f)(ket->func))(env_L->msg, vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnnss_f)(ket->func))(env_L->msg, + vps[0].n, vps[1].n, &vps[2].s, &vps[3].s); + return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnnns_f)(ket->func))(env_L->msg, + vps[0].n, vps[1].n, vps[2].n, &vps[3].s); + return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmnnnn_f)(ket->func))(env_L->msg, + vps[0].n, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s);

1 0

[kamailio/kamailio] t_relay() sending packets from the wrong TCP socket (#1532)
by Jared Hull 22 Jun '18

22 Jun '18

### Description Kamailio is using the wrong source port when relaying INVITE packets with t_relay(). Another interesting thing is that while doing this, Kamailio reports to Homer via HEPv2 that it sent the packet from port 4242, but a tcpdump on the server shows this to be false so maybe homer was just looking at the R-URI port? There is a somewhat random element to this, so it is very difficult to reproduce. I will provide the scenario which led to this problem. #### Reproduction This is the code block which is responsible for relaying INVITEs to phone from our PBX servers, it is also the only instance of port 5062 being inserted into a SIP message. ``` if(is_method("INVITE")) { if(lookup("location", "sip:$rU@location")) { remove_hf("Contact"); append_hf("Contact: <sip:$sel(cfg_get.global.publicIP):5062>\r\n"); //A vendor's SIPIS server doesn't work on port 4242, does changing this port break SIP compliance? rtpproxy_manage("cow"); t_relay(); exit; } } ``` - Kamailio listens for UDP+TCP on ports 5060,5062, and 4242. - Phone A registers to tcp:KamailioIP:4242 from tcp:CustomerIP:10042 - Phone B registers to tcp:KamailioIP:4242 from tcp:CustomerIP:11042 - These phones have been re-registering from and to the same ports for a long time without problems with the same REGISTER callID (same transaction so nothing about the connection has changed). - At this point we have TCP connections `tcp:CustomerIP:10042 -> tcp:KamailioIP:4242` and `tcp:CustomerIP:11042 -> tcp:KamailioIP:4242` - Kamailio sends INVITEs from tcp:KamailioIP:4242 to the address of the registered phone with a contact header that tells the phones to send responses to tcp:KamailioIP:5062 (as seen in the above code block). This causes a new TCP connection to be made from the customer's router to Kamailio, just for this transaction. - All is well until phone A sends a response and the customer's router, by pure chance, decides to use port 11042 for the new TCP connection. `tcp:CustomerIP:11042 -> tcp:KamailioIP:5062` - From this point on Kamailio begins to route INVITEs, that were meant for phone B, to phone A using this TCP connection `tcp:CustomerIP:11042 -> tcp:KamailioIP:5062` (source port 5062!) rather than the connection that phone B is actually registered to `tcp:CustomerIP:11042 -> tcp:KamailioIP:4242`. - The customer's router sends packets from this TCP socket to phone A because the connection identified by the Kamailio source port had been created by phone A. - Kamailio is still routing other types of packets to phone B from port 4242 like NOTIFY in response to a subscription and OPTIONs keep alives, but INVITEs (which are an entirely new SIP transaction) are being sent from the wrong source port. ### Possible ~Solutions~ Problems I have the default tcp_accept_aliases=0, so ;alias in a Via header is not a problem. We are also not using force_send_socket. I've tried to figure out how Kamailio works, and I am wondering if this function might be adding the new TCP connection from phone A to port 5062 as an alias of the already existing TCP connection from phone B to port 4242. https://github.com/kamailio/kamailio/blob/cb7810c939da9c8f4385b530539487528… I also found these comments interesting. https://github.com/kamailio/kamailio/blob/52111974b4571e0562e8e731df80f48db… https://github.com/kamailio/kamailio/blob/52111974b4571e0562e8e731df80f48db… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, 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 on 04:38:13 Feb 2 2018 with gcc 4.8.5 ``` * **Operating System**: ``` Linux dallas-sip1-int 3.10.0-514.16.1.el7.x86_64 #1 SMP Wed Apr 12 15:04:24 UTC 2017 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/1532

3 12

git:master:13457759: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 134577590f1d3b18508119449198fb03d5c19b4f URL: https://github.com/kamailio/kamailio/commit/134577590f1d3b18508119449198fb0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-22T10:46:55+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/134577590f1d3b18508119449198fb0… Patch: https://github.com/kamailio/kamailio/commit/134577590f1d3b18508119449198fb0…

1 0

[kamailio/kamailio] tm: add relay_100 config parameter to support stateless operation (#1534)
by Armen Babikyan 22 Jun '18

22 Jun '18

#### Pre-Submission Checklist    - [ ] 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) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1534 -- Commit Summary -- * tm: add relay_100 config parameter to support stateless operation -- File Changes -- M src/modules/tm/config.c (5) M src/modules/tm/config.h (1) M src/modules/tm/t_reply.c (2) M src/modules/tm/tm.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1534.patch https://github.com/kamailio/kamailio/pull/1534.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/1534

3 4

git:master:8a12e15b: Merge pull request #1534 from armenb/armenb/relay_100
by GitHub 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 8a12e15b7a7c597f39a69f5bfdb265e42d5a778d URL: https://github.com/kamailio/kamailio/commit/8a12e15b7a7c597f39a69f5bfdb265e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-22T10:34:45+02:00 Merge pull request #1534 from armenb/armenb/relay_100 tm: add relay_100 config parameter to support stateless operation --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/8a12e15b7a7c597f39a69f5bfdb265e… Patch: https://github.com/kamailio/kamailio/commit/8a12e15b7a7c597f39a69f5bfdb265e… --- diff --git a/src/modules/tm/config.c b/src/modules/tm/config.c index 00f86b12b1..b5494fea50 100644 --- a/src/modules/tm/config.c +++ b/src/modules/tm/config.c @@ -93,8 +93,9 @@ struct cfg_group_tm default_tm_cfg = { 0, /* local_ack_mode, default 0 (rfc3261 conformant) */ 1, /* local_cancel_reason -- add Reason header to locally generated CANCELs; on by default */ - 1 /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs + 1, /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs into the corresp. hop-by-hop CANCELs, on by default */ + 0 /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ }; void *tm_cfg = &default_tm_cfg; @@ -204,5 +205,7 @@ cfg_def_t tm_cfg_def[] = { {"e2e_cancel_reason", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, Reason headers from received CANCELs are copied into" " the corresponding generated hop-by-hop CANCELs"}, + {"relay_100", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set to 1, relay SIP 100 messages as a stateless proxy"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/tm/config.h b/src/modules/tm/config.h index 963fea6ea0..d46f71f9f6 100644 --- a/src/modules/tm/config.h +++ b/src/modules/tm/config.h @@ -135,6 +135,7 @@ struct cfg_group_tm { int local_ack_mode; int local_cancel_reason; int e2e_cancel_reason; + unsigned int relay_100; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index d787447c40..3692dab0d4 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1454,6 +1454,33 @@ function ksr_tm_event(evname) return 1; end ... +</programlisting> + </example> + </section> + + <section id="tm.p.relay_100"> + <title><varname>relay_100</varname> (str)</title> + <para> + This parameter controls whether or not a SIP 100 response is proxied. + Note that this is not valid behavior when operating in stateful mode + per RFC 3261 Section 21.1.1, and therefore is useful only when + operating as a stateless proxy. + When using this feature, it is possible to control which 100 responses + are proxied and which are not by detecting whether they are part of + an existing transaction and setting up the appropriate logic in + onreply_route. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>relay_100</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("tm", "relay_100", 1) +... </programlisting> </example> </section> diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 8b94cec624..474851aa7c 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1494,9 +1494,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, #else *should_store=0; #endif - /* 1xx and 2xx except 100 will be relayed */ + /* By default, 1xx and 2xx (except 100) will be relayed. 100 relaying can be + * controlled via relay_100 parameter */ Trans->uac[branch].last_received=new_code; - *should_relay= new_code==100? -1 : branch; + *should_relay= (new_code==100 && !cfg_get(tm, tm_cfg, relay_100)) ? -1 : branch; if (new_code>=200 ) { prepare_to_cancel( Trans, &cancel_data->cancel_bitmap, 0); #ifdef CANCEL_REASON_SUPPORT diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 426898f314..68df52b5c1 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -474,6 +474,7 @@ static param_export_t params[]={ #endif /* CANCEL_REASON_SUPPORT */ {"xavp_contact", PARAM_STR, &ulattrs_xavp_name }, {"event_callback", PARAM_STR, &tm_event_callback }, + {"relay_100", PARAM_INT, &default_tm_cfg.relay_100 }, {0,0,0} };

1 0

git:master:926fbc97: tm: add relay_100 config parameter to support stateless operation
by Armen Babikyan 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 926fbc97643364f79d09bde290c39faa357d3a6f URL: https://github.com/kamailio/kamailio/commit/926fbc97643364f79d09bde290c39fa… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2018-06-21T23:50:09-07:00 tm: add relay_100 config parameter to support stateless operation --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/926fbc97643364f79d09bde290c39fa… Patch: https://github.com/kamailio/kamailio/commit/926fbc97643364f79d09bde290c39fa… --- diff --git a/src/modules/tm/config.c b/src/modules/tm/config.c index 00f86b12b1..b5494fea50 100644 --- a/src/modules/tm/config.c +++ b/src/modules/tm/config.c @@ -93,8 +93,9 @@ struct cfg_group_tm default_tm_cfg = { 0, /* local_ack_mode, default 0 (rfc3261 conformant) */ 1, /* local_cancel_reason -- add Reason header to locally generated CANCELs; on by default */ - 1 /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs + 1, /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs into the corresp. hop-by-hop CANCELs, on by default */ + 0 /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ }; void *tm_cfg = &default_tm_cfg; @@ -204,5 +205,7 @@ cfg_def_t tm_cfg_def[] = { {"e2e_cancel_reason", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, Reason headers from received CANCELs are copied into" " the corresponding generated hop-by-hop CANCELs"}, + {"relay_100", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set to 1, relay SIP 100 messages as a stateless proxy"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/tm/config.h b/src/modules/tm/config.h index 963fea6ea0..d46f71f9f6 100644 --- a/src/modules/tm/config.h +++ b/src/modules/tm/config.h @@ -135,6 +135,7 @@ struct cfg_group_tm { int local_ack_mode; int local_cancel_reason; int e2e_cancel_reason; + unsigned int relay_100; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index d787447c40..3692dab0d4 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1454,6 +1454,33 @@ function ksr_tm_event(evname) return 1; end ... +</programlisting> + </example> + </section> + + <section id="tm.p.relay_100"> + <title><varname>relay_100</varname> (str)</title> + <para> + This parameter controls whether or not a SIP 100 response is proxied. + Note that this is not valid behavior when operating in stateful mode + per RFC 3261 Section 21.1.1, and therefore is useful only when + operating as a stateless proxy. + When using this feature, it is possible to control which 100 responses + are proxied and which are not by detecting whether they are part of + an existing transaction and setting up the appropriate logic in + onreply_route. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>relay_100</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("tm", "relay_100", 1) +... </programlisting> </example> </section> diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 9958e70333..00691c0ff8 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1492,9 +1492,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, #else *should_store=0; #endif - /* 1xx and 2xx except 100 will be relayed */ + /* By default, 1xx and 2xx (except 100) will be relayed. 100 relaying can be + * controlled via relay_100 parameter */ Trans->uac[branch].last_received=new_code; - *should_relay= new_code==100? -1 : branch; + *should_relay= (new_code==100 && !cfg_get(tm, tm_cfg, relay_100)) ? -1 : branch; if (new_code>=200 ) { prepare_to_cancel( Trans, &cancel_data->cancel_bitmap, 0); #ifdef CANCEL_REASON_SUPPORT diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 426898f314..68df52b5c1 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -474,6 +474,7 @@ static param_export_t params[]={ #endif /* CANCEL_REASON_SUPPORT */ {"xavp_contact", PARAM_STR, &ulattrs_xavp_name }, {"event_callback", PARAM_STR, &tm_event_callback }, + {"relay_100", PARAM_INT, &default_tm_cfg.relay_100 }, {0,0,0} };

1 0

git:master:752e875f: Merge pull request #1563 from surendratiwari3/evapi_async_relay_kemi
by GitHub 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 752e875faece8233d39f8c91d7d553517ee94cd6 URL: https://github.com/kamailio/kamailio/commit/752e875faece8233d39f8c91d7d5535… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-22T10:32:49+02:00 Merge pull request #1563 from surendratiwari3/evapi_async_relay_kemi Modules: Evapi async_relay export to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/752e875faece8233d39f8c91d7d5535… Patch: https://github.com/kamailio/kamailio/commit/752e875faece8233d39f8c91d7d5535… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 7673cb262e..9ed8bd6d9a 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -591,6 +591,56 @@ static int ki_evapi_relay(sip_msg_t *msg, str *sdata) return evapi_relay(sdata); } +/** + * + */ +static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + + if(tmb.t_suspend==NULL) { + LM_ERR("evapi async relay is disabled - tm module not loaded\n"); + return -1; + } + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suspend request processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + + if(sdata->s==NULL || sdata->len == 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + + if(evapi_relay(sdata)<0) { + LM_ERR("failed to relay event: %.*s\n", sdata->len, sdata->s); + return -2; + } + return 1; +} + /** * */ @@ -637,7 +687,11 @@ static sr_kemi_t sr_kemi_evapi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - + { str_init("evapi"), str_init("async_relay"), + SR_KEMIP_INT, ki_evapi_async_relay, + { 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 } } }; /* clang-format on */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018