- sr-dev - kamailio.org

[kamailio/kamailio] crash in ims_usrloc_scscf.so (#1600)
by Sergey Zyrianov 01 Aug '18

01 Aug '18

### Description IMS reregistration triggers core dump on 5.1.4. 1) Create IMS registration 2) Put IMS terminal offline 3) Put it back online to update IMS registration 4) Register requests time out on s-cscf ### Troubleshooting This seems to be related to the cleaning up contacts during registration/re-registration. Related to the https://github.com/kamailio/kamailio/pull/1562. This PR did not make it to 5.1.4 but affected code was clearly involved according to the logs. #### Reproduction #### Debugging Data #### Log Messages ``` Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [impurecord.c:451]: process_impurecord(): There are 2 contacts to expire/unlink Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [impurecord.c:454]: process_impurecord(): expiring contact 0: [sip:XXXYY4000013362@10.110.1 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [impurecord.c:1237]: unlink_contact_from_impu(): asked to unlink contact [0x7f7141cf29a0] => [sip:XXXYY4000 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [impurecord.c:1106]: remove_impucontact_from_list(): deleting mid list Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [usrloc_db.c:1130]: db_unlink_contact_from_impu(): DB: un-linking contact to IMPU Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: <core> [db_res.c:120]: db_new_result(): allocate 56 bytes for result set at 0x7f714ba6e620 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 0 columns Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7f714ba6e620 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [usrloc_db.c:1155]: db_unlink_contact_from_impu(): Delete query success Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [udomain.c:852]: unref_contact_unsafe(): decrementing ref count on contact [sip:XXXYY4000013362@10.110.1.69 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [udomain.c:855]: unref_contact_unsafe(): contact [sip:XXXYY4000013362@10.110.1.69:5060;alias=10.110.1.69~50 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [impurecord.c:1263]: unlink_contact_from_impu(): unlinking contact [0x7f7141cf29a0] => [sip:XXXYY4000013362 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [impurecord.c:454]: process_impurecord(): expiring contact 1: [sip:XXXYY4000013362@10.110.1 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [impurecord.c:1237]: unlink_contact_from_impu(): asked to unlink contact [0x7f7141cfc878] => [sip:XXXYY4000 Jul 24 07:21:00 scscf scscfXXXYYY-ecs[798]: 1(6) DEBUG: ims_usrloc_scscf [impurecord.c:1103]: remove_impucontact_from_list(): **deleting tail** Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_registrar_scscf [save.c:840]: update_contacts(): updating contacts in RE-REGISTRATION state Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_registrar_scscf [save.c:519]: update_contacts_helper(): updating the contacts for IMPU <sip:XXXYY4000013362@ims.mnc006. Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: <core> [ims_getters.c:812]: cscf_get_sos_uri_param(): cscf_get_sos_uri_param: searching through the uri parameters:alias=10 Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: <core> [ims_getters.c:823]: cscf_get_sos_uri_param(): cscf_get_sos_uri_param:name: alias body: 10.110.1.71~5060~1 Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_registrar_scscf [save.c:137]: calc_contact_expires(): Calculated expires for contact is 600000 Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_registrar_scscf [save.c:548]: update_contacts_helper(): Need to update contact: <sip:XXXYY4000013362@10.110.1.71:5060;a Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_registrar_scscf [save.c:550]: update_contacts_helper(): packing contact information Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_registrar_scscf [save.c:556]: update_contacts_helper(): adding/updating contact based on prior existence Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_usrloc_scscf [impurecord.c:748]: get_scontact(): looking for contact [sip:XXXYY8000099992@10.110.1.71:5060;alias=10.110 Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_registrar_scscf [save.c:562]: update_contacts_helper(): inserting new contact Jul 24 07:22:21 scscf scscfXXXYYY-ecs[798]: 15(20) DEBUG: ims_usrloc_scscf [impurecord.c:562]: insert_scontact(): INSERTing ucontact in usrloc module Jul 24 07:22:21 scscf kernel: traps: kamailio[7186] general protection ip:7f7146511000 sp:7ffc9f3719a0 error:0 in ims_usrloc_scscf.so[7f71464e7000+8f000] ``` #### SIP Traffic ![image](https://user-images.githubusercontent.com/1636682/43138556-8dc89988-8f4f-11e8-887a-53c4fb7805e1.png) ``` (paste your sip traffic here) ``` ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.4 (x86_64/linux) ``` * **Operating System**: ``` Linux scscf 4.14.48-coreos-r2 #1 SMP Thu Jun 14 08:23:03 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/1600

2 4

Need to use kamailio as rtp proxy with sip proxy.
by ANOOP V M 01 Aug '18

01 Aug '18

I am totally tired of searching through all your documents for enabling rtp proxy. My use case is, i want to use kamailio as a rtp proxy also with sip proxy. The sip proxy is working good. But for enabling rtp proxy it is returning -3 on rtpproxy_offer and -1 on rtpengine_offer. I have tried both rtp_engine and rtp_proxy. Only thing i need to do is audio between asterisk and twilio trunk should also go through kamailio server. For sip proxy, it is working as expected. Can you just guide me to set up the rtp proxy and complete my project. I will provide my kamailio.cfg file for rtp_proxy(not for rtp_engine). i did not install rtp proxy manually. Should i? i have run this command in terminal. service kamailio restart kamcmd rtpproxy.enable udp:localhost:12221 1 kamcmd rtpproxy.list

1 0

git:master:a1627221: modules: readme files regenerated - carrierroute ... [skip ci]
by Kamailio Dev 31 Jul '18

31 Jul '18

Module: kamailio Branch: master Commit: a1627221ba6dc2921356c691ca51e3dea3f9e82f URL: https://github.com/kamailio/kamailio/commit/a1627221ba6dc2921356c691ca51e3d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-31T14:17:02+02:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/a1627221ba6dc2921356c691ca51e3d… Patch: https://github.com/kamailio/kamailio/commit/a1627221ba6dc2921356c691ca51e3d…

1 0

git:master:a1f5fbe2: dmq: release resources instead of just doing continue to next job
by Daniel-Constantin Mierla 31 Jul '18

31 Jul '18

Module: kamailio Branch: master Commit: a1f5fbe2c18246d4afefa44fd8a52612a5182a46 URL: https://github.com/kamailio/kamailio/commit/a1f5fbe2c18246d4afefa44fd8a5261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-31T13:59:44+02:00 dmq: release resources instead of just doing continue to next job - for cases when processing of the job is not fully completed --- Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/a1f5fbe2c18246d4afefa44fd8a5261… Patch: https://github.com/kamailio/kamailio/commit/a1f5fbe2c18246d4afefa44fd8a5261… --- diff --git a/src/modules/dmq/worker.c b/src/modules/dmq/worker.c index 9c7873560c..14aadfc998 100644 --- a/src/modules/dmq/worker.c +++ b/src/modules/dmq/worker.c @@ -114,7 +114,7 @@ void worker_loop(int id) current_job->msg, &peer_response, dmq_node); if(ret_value < 0) { LM_ERR("running job failed\n"); - continue; + goto nextjob; } /* add the body to the reply */ if(peer_response.body.s) { @@ -122,7 +122,7 @@ void worker_loop(int id) &peer_response.content_type) < 0) { LM_ERR("error adding lumps\n"); - continue; + goto nextjob; } } /* send the reply */ @@ -130,8 +130,12 @@ void worker_loop(int id) &peer_response.reason) < 0) { LM_ERR("error sending reply\n"); + } else { + LM_DBG("done sending reply\n"); } + worker->jobs_processed++; +nextjob: /* if body given, free the lumps and free the body */ if(peer_response.body.s) { del_nonshm_lump_rpl(&current_job->msg->reply_lump); @@ -141,10 +145,8 @@ void worker_loop(int id) free_to(current_job->msg->from->parsed); } - LM_DBG("sent reply\n"); shm_free(current_job->msg); shm_free(current_job); - worker->jobs_processed++; } } }

1 0

git:master:4a64fb95: carrierroute: docs - removed mi commands section
by Daniel-Constantin Mierla 31 Jul '18

31 Jul '18

Module: kamailio Branch: master Commit: 4a64fb95680b9efac47c79888f2a68bdcfb29ad6 URL: https://github.com/kamailio/kamailio/commit/4a64fb95680b9efac47c79888f2a68b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-31T13:58:29+02:00 carrierroute: docs - removed mi commands section --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a64fb95680b9efac47c79888f2a68b… Patch: https://github.com/kamailio/kamailio/commit/4a64fb95680b9efac47c79888f2a68b…

1 0

git:master:de429e10: topos: docs - ids for sections with event routes
by Daniel-Constantin Mierla 29 Jul '18

29 Jul '18

Module: kamailio Branch: master Commit: de429e10eab9154eb1935d08537db6757dcd2b70 URL: https://github.com/kamailio/kamailio/commit/de429e10eab9154eb1935d08537db67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-29T23:32:45+02:00 topos: docs - ids for sections with event routes --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/de429e10eab9154eb1935d08537db67… Patch: https://github.com/kamailio/kamailio/commit/de429e10eab9154eb1935d08537db67… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 8a423fdc84..4c87d371c6 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -281,7 +281,7 @@ modparam("topos", "event_mode", 2) </section> <section> <title>Event Routes</title> - <section> + <section id="topos.e.msg_outgoing"> <title>event_route[topos:msg-outgoing]</title> <para> It is executed before doing topology stripping processing for an outgoing @@ -308,7 +308,7 @@ event_route[topos:msg-outgoing] { </programlisting> </example> </section> - <section> + <section id="topos.e.msg_sending"> <title>event_route[topos:msg-sending]</title> <para> It is executed before doing topology stripping processing for a SIP

1 0

git:master:674ab074: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 27 Jul '18

27 Jul '18

Module: kamailio Branch: master Commit: 674ab0749960398fdddfde3772376b1b2461c107 URL: https://github.com/kamailio/kamailio/commit/674ab0749960398fdddfde3772376b1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-27T22:17:20+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/674ab0749960398fdddfde3772376b1… Patch: https://github.com/kamailio/kamailio/commit/674ab0749960398fdddfde3772376b1… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index dae255ee37..b833372b6a 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -840,8 +840,11 @@ failure_route[REMOTE_AUTH] { 6.1. event_route[uac:reply] - Event route executed for the final reply to the request set with - uac_req_send(). The associated $uac_req(evroute) has to be set to 1. + Event route executed for the final reply of the branch for the request + sent with uac_req_send(). The associated $uac_req(evroute) has to be + set to 1. If the request is challenged for authentication with 401/407, + then the event_route is executed twice, first for 401/407 and second + for final reply of the transaction. Example 1.33. event_route[uac:reply] usage ...

1 0

git:master:f8c46e63: modules: readme files regenerated - pipelimit ... [skip ci]
by The Root 27 Jul '18

27 Jul '18

Module: kamailio Branch: master Commit: f8c46e6395ed9cc4cbcf062a823a9530bdec62c9 URL: https://github.com/kamailio/kamailio/commit/f8c46e6395ed9cc4cbcf062a823a953… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2018-07-27T22:17:10+02:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/f8c46e6395ed9cc4cbcf062a823a953… Patch: https://github.com/kamailio/kamailio/commit/f8c46e6395ed9cc4cbcf062a823a953… --- diff --git a/src/modules/pipelimit/README b/src/modules/pipelimit/README index 974eaed33b..3b48f2e0d6 100644 --- a/src/modules/pipelimit/README +++ b/src/modules/pipelimit/README @@ -51,12 +51,13 @@ Daniel-Constantin Mierla 5. RPC Commands - 5.1. pl.stats - 5.2. pl.set_pipe - 5.3. pl.get_pipes - 5.4. pl.set_pid - 5.5. pl.get_pid - 5.6. pl.push_load + 5.1. pl.list + 5.2. pl.stats + 5.3. pl.set_pipe + 5.4. pl.get_pipes + 5.5. pl.set_pid + 5.6. pl.get_pid + 5.7. pl.push_load List of Examples @@ -106,12 +107,13 @@ Chapter 1. Admin Guide 5. RPC Commands - 5.1. pl.stats - 5.2. pl.set_pipe - 5.3. pl.get_pipes - 5.4. pl.set_pid - 5.5. pl.get_pid - 5.6. pl.push_load + 5.1. pl.list + 5.2. pl.stats + 5.3. pl.set_pipe + 5.4. pl.get_pipes + 5.5. pl.set_pid + 5.6. pl.get_pid + 5.7. pl.push_load 1. Overview @@ -441,14 +443,30 @@ with unexpected retcode=$var(check_result)\n"); 5. RPC Commands - 5.1. pl.stats - 5.2. pl.set_pipe - 5.3. pl.get_pipes - 5.4. pl.set_pid - 5.5. pl.get_pid - 5.6. pl.push_load + 5.1. pl.list + 5.2. pl.stats + 5.3. pl.set_pipe + 5.4. pl.get_pipes + 5.5. pl.set_pid + 5.6. pl.get_pid + 5.7. pl.push_load -5.1. pl.stats +5.1. pl.list + + Lists the details of one or all pipes, respectively the attributes pipe + name (id), algorithm, limit and counter. + + Name: pl.list + + Parameters: name - (optional) pipe name + + RPC Command Format: +... +kamctl rpc pl.list +kamctl rpc pl.list testid +... + +5.2. pl.stats Lists the parameters and variables in the pipelimit module: pipe id, pipe load and pipe counter. @@ -458,9 +476,11 @@ with unexpected retcode=$var(check_result)\n"); Parameters: none RPC Command Format: - kamcmd pl.stats +... +kamcmd pl.stats +... -5.2. pl.set_pipe +5.3. pl.set_pipe Sets the pipe parameters for the given pipe id. @@ -472,9 +492,11 @@ with unexpected retcode=$var(check_result)\n"); * pipe_limit - the limit assigned to the given pipe id. RPC Command Format: - kamcmd pl.set_pipe 2 RED 10 +... +kamcmd pl.set_pipe 2 RED 10 +... -5.3. pl.get_pipes +5.4. pl.get_pipes Gets the list of in use pipes. @@ -483,9 +505,11 @@ with unexpected retcode=$var(check_result)\n"); Parameters: none RPC Command Format: - kamcmd pl.get_pipes +... +kamcmd pl.get_pipes +... -5.4. pl.set_pid +5.5. pl.set_pid Sets the PID Controller parameters for the Feedback Algorithm. @@ -497,9 +521,11 @@ with unexpected retcode=$var(check_result)\n"); * kd - the derivative parameter. RPC Command Format: - kamcmd pl.set_pid 0.5 0.5 0.5 +... +kamcmd pl.set_pid 0.5 0.5 0.5 +... -5.5. pl.get_pid +5.6. pl.get_pid Gets the list of in use PID Controller parameters. @@ -508,9 +534,11 @@ with unexpected retcode=$var(check_result)\n"); Parameters: none RPC Command Format: - kamcmd pl.get_pid +... +kamcmd pl.get_pid +... -5.6. pl.push_load +5.7. pl.push_load Force the value of the load parameter. This command is useful for testing the Feedback algorithm. @@ -522,4 +550,6 @@ with unexpected retcode=$var(check_result)\n"); smaller then 1.0). RPC Command Format: - kamcmd pl.push_load 0.85 +... +kamcmd pl.push_load 0.85 +...

1 0

git:master:1cec5e80: uac: docs - more details about execution of event_route[uac:reply]
by Daniel-Constantin Mierla 27 Jul '18

27 Jul '18

Module: kamailio Branch: master Commit: 1cec5e80036808badf19c8c72ec243b504f56e28 URL: https://github.com/kamailio/kamailio/commit/1cec5e80036808badf19c8c72ec243b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-27T22:00:47+02:00 uac: docs - more details about execution of event_route[uac:reply] --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1cec5e80036808badf19c8c72ec243b… Patch: https://github.com/kamailio/kamailio/commit/1cec5e80036808badf19c8c72ec243b… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 162f491b31..8047c67c2b 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -985,9 +985,11 @@ failure_route[REMOTE_AUTH] { <function moreinfo="none">event_route[uac:reply]</function> </title> <para> - Event route executed for the final reply to the request set with - uac_req_send(). The associated $uac_req(evroute) has to be set to - 1. + Event route executed for the final reply of the branch for the + request sent with uac_req_send(). The associated $uac_req(evroute) + has to be set to 1. If the request is challenged for authentication + with 401/407, then the event_route is executed twice, first for + 401/407 and second for final reply of the transaction. </para> <example> <title><function>event_route[uac:reply]</function> usage</title>

1 0

[kamailio/kamailio] topos_redis not included in debian packages for kamailio-redis-modules (#1603)
by William King 27 Jul '18

27 Jul '18

### Description Installing new instance on Debian Stretch, using 5.1 release repo the module topos_redis is not built in the available packages. #### Reproduction root@sbc1-1:~# apt-file update Hit:1 http://security.debian.org stretch/updates InRelease Ign:2 http://deb.debian.org/debian stretch InRelease Hit:3 http://deb.debian.org/debian stretch-updates InRelease Hit:4 http://deb.debian.org/debian stretch Release Hit:5 http://packages.treasuredata.com/3/debian/stretch stretch InRelease Hit:7 http://deb.kamailio.org/kamailiodev-nightly stretch InRelease Hit:8 http://deb.kamailio.org/kamailio51 stretch InRelease Reading package lists... Done Building dependency tree Reading state information... Done root@sbc1-1:~# apt-file search topos_redis root@sbc1-1:~# -- 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/1603

3 3

topos is masking the contact in 302 redirect response from outside
by Andrew Pogrebennyk 27 Jul '18

27 Jul '18

Hello, using kamailio 5.1.4: the topos is changing the Contact in 302 response from the UA. Has anyone else observed it so it's a known issue or should I file a proper bugreport? At a glance, I don't see any related fixes in master, so i guess i will do it anyway this week.. In meantime I'll try to workaround it for my purpose using new even route [topos:msg-sending] Thanks in advance for your hints. Regards, Andrew

2 3

git:5.1:e2eda137: dialog: unset DMQ flag on replicated dialog removal
by Charles Chance 26 Jul '18

26 Jul '18

Module: kamailio Branch: 5.1 Commit: e2eda1376def48ab1c78db7a766c1811d19205be URL: https://github.com/kamailio/kamailio/commit/e2eda1376def48ab1c78db7a766c181… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-26T13:54:31+01:00 dialog: unset DMQ flag on replicated dialog removal - prevents looping back to other nodes - reported by Patrick Murphy on sr-users list (cherry picked from commit a84a3ea618f0e602a8892c37fce7f4e72ab7371c) --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e2eda1376def48ab1c78db7a766c181… Patch: https://github.com/kamailio/kamailio/commit/e2eda1376def48ab1c78db7a766c181… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 8ed9dce1d3..0cfd8a522e 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -365,6 +365,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; + dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC; unref++; break;

1 0

git:master:487fbf45: Merge pull request #1601 from kamailio/cchance/dlg_dmq
by GitHub 26 Jul '18

26 Jul '18

Module: kamailio Branch: master Commit: 487fbf45cea288e743cbb87e352e76bb1bc05b87 URL: https://github.com/kamailio/kamailio/commit/487fbf45cea288e743cbb87e352e76b… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2018-07-26T13:51:21+01:00 Merge pull request #1601 from kamailio/cchance/dlg_dmq dialog: unset DMQ flag on replicated dialog removal --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/487fbf45cea288e743cbb87e352e76b… Patch: https://github.com/kamailio/kamailio/commit/487fbf45cea288e743cbb87e352e76b… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 8ed9dce1d3..0cfd8a522e 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -365,6 +365,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; + dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC; unref++; break;

1 0

[kamailio/kamailio] dialog: unset DMQ flag on replicated dialog removal (#1601)
by Charles Chance 26 Jul '18

26 Jul '18

- prevents looping back to other nodes - reported by Patrick Murphy on sr-users list (https://lists.kamailio.org/pipermail/sr-users/2018-July/102322.html) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1601 -- Commit Summary -- * dialog: unset DMQ flag on replicated dialog removal -- File Changes -- M src/modules/dialog/dlg_dmq.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1601.patch https://github.com/kamailio/kamailio/pull/1601.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/1601

2 3

git:master:a84a3ea6: dialog: unset DMQ flag on replicated dialog removal
by Charles Chance 26 Jul '18

26 Jul '18

Module: kamailio Branch: master Commit: a84a3ea618f0e602a8892c37fce7f4e72ab7371c URL: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-26T12:07:33+01:00 dialog: unset DMQ flag on replicated dialog removal - prevents looping back to other nodes - reported by Patrick Murphy on sr-users list --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e… Patch: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 8ed9dce1d3..0cfd8a522e 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -365,6 +365,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; + dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC; unref++; break;

1 0

[kamailio/kamailio] coredumps possibly generated by DMQ in kamailio v5.1.4 (#1594)
by Joel Serrano 25 Jul '18

25 Jul '18

### Description Not sure, found 2 cores generated today, only suggesting it's DMQ related by what I see in the backtrace. They could have been generated during a restart of kamailio, not 100% sure though. ### Troubleshooting TBD #### Reproduction TBD #### Debugging Data Attaching *bt full*, *info locals* and *list* from: ``` -rw------- 1 root kamailio 549019648 Jul 13 16:29 core.kamailio.22907.sbc01.1531517373 -rw------- 1 root kamailio 549019648 Jul 13 17:13 core.kamailio.777.sbc01.1531520031 ``` [core1__bt_full.txt](https://github.com/kamailio/kamailio/files/2194484/core… [core1__info_locals.txt](https://github.com/kamailio/kamailio/files/2194485/… [core1__list.txt](https://github.com/kamailio/kamailio/files/2194486/core1__… [core2__bt_full.txt](https://github.com/kamailio/kamailio/files/2194487/core… [core2__info_locals.txt](https://github.com/kamailio/kamailio/files/2194488/… [core2__list.txt](https://github.com/kamailio/kamailio/files/2194489/core2__… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@sbc01:~# kamailio -V version: kamailio 5.1.4 (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 with gcc 6.3.0 root@sbc01:~# ``` * **Operating System**: ``` root@sbc01:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 9.4 (stretch) Release: 9.4 Codename: stretch root@sbc01:~# root@sbc01:~# uname -a Linux sbc01 4.9.0-6-amd64 #1 SMP Debian 4.9.88-1+deb9u1 (2018-05-07) x86_64 GNU/Linux root@sbc01:~# ``` -- 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/1594

3 14

git:master:b0e5768e: dmq: allow startup even if initial nodelist is empty
by Charles Chance 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: b0e5768ebc62bcf1f08246ec613de1ba71d6365e URL: https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1b… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-25T14:01:19+01:00 dmq: allow startup even if initial nodelist is empty --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1b… Patch: https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1b… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index f1e9090afa..b374b8de31 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -301,9 +301,8 @@ static int child_init(int rank) notification_node = add_server_and_notify(&dmq_notification_address); if(!notification_node) { - LM_ERR("cannot retrieve initial nodelist from %.*s\n", + LM_WARN("cannot retrieve initial nodelist from %.*s\n", STR_FMT(&dmq_notification_address)); - return -1; } } return 0;

1 0

git:master:bca756f8: dmq: include non-active nodes when requesting initial node list
by Charles Chance 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: bca756f88ce36ab3c7297c7bc4d2cab9009b09fe URL: https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-25T14:01:19+01:00 dmq: include non-active nodes when requesting initial node list --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab… Patch: https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index c8e659c721..c1deb80536 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -570,8 +570,8 @@ int request_nodelist(dmq_node_t *node, int forward) LM_ERR("no notification body\n"); return -1; } - ret = bcast_dmq_message(dmq_notification_peer, body, NULL, - &notification_callback, forward, &notification_content_type); + ret = bcast_dmq_message1(dmq_notification_peer, body, NULL, + &notification_callback, forward, &notification_content_type, 1); pkg_free(body->s); pkg_free(body); return ret;

1 0

git:master:3d2b3868: dmq: improve bus stability and reduce unnecessary state transfer
by Charles Chance 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: 3d2b3868e01bab478408d9f0619db2c9918b72b0 URL: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-25T14:01:19+01:00 dmq: improve bus stability and reduce unnecessary state transfer - prevents split cluster in certain scenarios (e.g. GH issue #1349) - add 'pending' state for new, locally added nodes, until confirmed - continue to probe nodes marked as inactive/disabled so that they are eventually removed (but still exclude from normal replication) --- Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmq_funcs.h Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c… Patch: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c…

1 0

git:master:173f4e90: pipelimit: documentation for rpc command pl.list
by Daniel-Constantin Mierla 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: 173f4e901f0c0e4671965514cb39146eb652f100 URL: https://github.com/kamailio/kamailio/commit/173f4e901f0c0e4671965514cb39146… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-25T14:56:13+02:00 pipelimit: documentation for rpc command pl.list --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/173f4e901f0c0e4671965514cb39146… Patch: https://github.com/kamailio/kamailio/commit/173f4e901f0c0e4671965514cb39146… --- diff --git a/src/modules/pipelimit/doc/pipelimit_admin.xml b/src/modules/pipelimit/doc/pipelimit_admin.xml index e30d197ca5..554c5d5e3b 100644 --- a/src/modules/pipelimit/doc/pipelimit_admin.xml +++ b/src/modules/pipelimit/doc/pipelimit_admin.xml @@ -487,6 +487,28 @@ with unexpected retcode=$var(check_result)\n"); <section> <title>RPC Commands</title> + <section id="pipelimit.r.pl.list"> + <title> + <function moreinfo="none">pl.list</function> + </title> + <para> + Lists the details of one or all pipes, respectively the attributes + pipe name (id), algorithm, limit and counter. + </para> + <para> + Name: <emphasis>pl.list</emphasis> + </para> + <para>Parameters: <emphasis>name</emphasis> - (optional) pipe name</para> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc pl.list +kamctl rpc pl.list testid +... + </programlisting> + </section> <section id="pipelimit.r.pl.stats"> <title> <function moreinfo="none">pl.stats</function> @@ -503,7 +525,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.stats +... +kamcmd pl.stats +... </programlisting> </section> <section id="pipelimit.r.pl.set_pipe"> @@ -534,7 +558,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.set_pipe 2 RED 10 +... +kamcmd pl.set_pipe 2 RED 10 +... </programlisting> </section> <section id="pipelimit.r.pl.get_pipes"> @@ -552,7 +578,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.get_pipes +... +kamcmd pl.get_pipes +... </programlisting> </section> <section id="pipelimit.r.pl.set_pid"> @@ -581,7 +609,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.set_pid 0.5 0.5 0.5 +... +kamcmd pl.set_pid 0.5 0.5 0.5 +... </programlisting> </section> <section id="pipelimit.r.pl.get_pid"> @@ -599,7 +629,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.get_pid +... +kamcmd pl.get_pid +... </programlisting> </section> <section id="pipelimit.r.pl.push_load"> @@ -624,7 +656,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.push_load 0.85 +... +kamcmd pl.push_load 0.85 +... </programlisting> </section> </section>

1 0

git:master:d5b65685: pipelimit: added rpc command pl.list
by Daniel-Constantin Mierla 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: d5b6568529a26fb21b0aef9634354ade63aee802 URL: https://github.com/kamailio/kamailio/commit/d5b6568529a26fb21b0aef9634354ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-25T14:48:29+02:00 pipelimit: added rpc command pl.list - get the details of one or all pipes in json format - old pl.stats and pl.get_pipes print details in a string --- Modified: src/modules/pipelimit/pipelimit.c Modified: src/modules/pipelimit/pl_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/d5b6568529a26fb21b0aef9634354ad… Patch: https://github.com/kamailio/kamailio/commit/d5b6568529a26fb21b0aef9634354ad… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index da30bcbd31..ce7935afb0 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -734,15 +734,19 @@ static ticks_t pl_timer_handle(ticks_t ticks, struct timer_ln* tl, void* data) /* rpc function documentation */ const char *rpc_pl_stats_doc[2] = { - "Print pipelimit statistics: \ + "Print pipelimit statistics (string output): \ <id> <load> <counter>", 0 }; const char *rpc_pl_get_pipes_doc[2] = { - "Print pipes info: \ + "Print pipes info (string output): \ <id> <algorithm> <limit> <counter>", 0 }; +const char *rpc_pl_list_doc[2] = { + "List details for one or all pipes", 0 +}; + const char *rpc_pl_set_pipe_doc[2] = { "Sets a pipe params: <pipe_id> <pipe_algorithm> <pipe_limit>", 0 }; @@ -764,6 +768,7 @@ const char *rpc_pl_push_load_doc[2] = { /* rpc function implementations */ void rpc_pl_stats(rpc_t *rpc, void *c); +void rpc_pl_list(rpc_t *rpc, void *c); void rpc_pl_get_pipes(rpc_t *rpc, void *c); void rpc_pl_set_pipe(rpc_t *rpc, void *c); @@ -804,6 +809,7 @@ void rpc_pl_push_load(rpc_t *rpc, void *c) { static rpc_export_t rpc_methods[] = { {"pl.stats", rpc_pl_stats, rpc_pl_stats_doc, RET_ARRAY}, + {"pl.list", rpc_pl_list, rpc_pl_list_doc, RET_ARRAY}, {"pl.get_pipes", rpc_pl_get_pipes, rpc_pl_get_pipes_doc, RET_ARRAY}, {"pl.set_pipe", rpc_pl_set_pipe, rpc_pl_set_pipe_doc, 0}, {"pl.get_pid", rpc_pl_get_pid, rpc_pl_get_pid_doc, 0}, diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index f23414c29a..07f69f666d 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -444,6 +444,76 @@ void rpc_pl_get_pipes(rpc_t *rpc, void *c) } } +int rpc_pl_list_pipe(rpc_t *rpc, void *c, pl_pipe_t *it) +{ + str algo; + void* th; + + if (it->algo == PIPE_ALGO_NOP) { + return 0; + } + + if (str_map_int(algo_names, it->algo, &algo)) { + return -1; + } + /* add structure node */ + if (rpc->add(c, "{", &th) < 0) { + rpc->fault(c, 500, "Internal pipe structure"); + return -1; + } + if(rpc->struct_add(th, "ssdd", + "name", it->name.s, + "algorithm", algo.s, + "limit", it->limit, + "counter", it->counter)<0) { + rpc->fault(c, 500, "Internal error address list structure"); + return -1; + } + return 0; +} + +void rpc_pl_list(rpc_t *rpc, void *c) +{ + int i; + pl_pipe_t *it; + str pipeid = STR_NULL; + int ret; + + if (rpc->scan(c, "*S", &pipeid) < 1) { + pipeid.s = NULL; + pipeid.len = 0; + } + + if(pipeid.len>0) { + it = pl_pipe_get(&pipeid, 1); + if (it==NULL) { + LM_ERR("no pipe: %.*s\n", pipeid.len, pipeid.s); + rpc->fault(c, 400, "Unknown pipe id %.*s", pipeid.len, pipeid.s); + return; + } + if(rpc_pl_list_pipe(rpc, c, it)<0) { + LM_DBG("failed to list pipe: %.*s\n", it->name.len, it->name.s); + } + pl_pipe_release(&pipeid); + return; + } + + for(i=0; i<_pl_pipes_ht->htsize; i++) + { + lock_get(&_pl_pipes_ht->slots[i].lock); + it = _pl_pipes_ht->slots[i].first; + while(it) { + if(rpc_pl_list_pipe(rpc, c, it)<0) { + LM_DBG("failed to list pipe: %.*s\n", it->name.len, it->name.s); + lock_release(&_pl_pipes_ht->slots[i].lock); + return; + } + it = it->next; + } + lock_release(&_pl_pipes_ht->slots[i].lock); + } +} + void rpc_pl_set_pipe(rpc_t *rpc, void *c) { unsigned int algo_id, limit = 0;

1 0

git:master:79aa7201: core: removed unused MAX_LISTEN
by Daniel-Constantin Mierla 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: 79aa72011ae551c6f82816f352fce7582e371f93 URL: https://github.com/kamailio/kamailio/commit/79aa72011ae551c6f82816f352fce75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-25T14:10:00+02:00 core: removed unused MAX_LISTEN - it was printed in version output, not having any relevance anymore --- Modified: src/core/config.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/79aa72011ae551c6f82816f352fce75… Patch: https://github.com/kamailio/kamailio/commit/79aa72011ae551c6f82816f352fce75… --- diff --git a/src/core/config.h b/src/core/config.h index 91d15fa335..e87288f730 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -45,8 +45,6 @@ #define TLS_CA_FILE 0 /*!< no CA list file by default */ #define TLS_CRL_FILE 0 /*!< no CRL by default */ -#define MAX_LISTEN 16 /*!< maximum number of addresses on which we will listen */ - #define CHILD_NO 8 /*!< default number of child processes started */ #define RT_NO 2 /*!< routing tables number */ diff --git a/src/main.c b/src/main.c index 1830b9628f..2062f4a745 100644 --- a/src/main.c +++ b/src/main.c @@ -228,9 +228,9 @@ void print_ct_constants(void) printf("SHM_MEM_SIZE=%d, ", SHM_MEM_SIZE); #endif */ - printf("MAX_RECV_BUFFER_SIZE %d, MAX_LISTEN %d," + printf("MAX_RECV_BUFFER_SIZE %d" " MAX_URI_SIZE %d, BUF_SIZE %d, DEFAULT PKG_SIZE %uMB\n", - MAX_RECV_BUFFER_SIZE, MAX_LISTEN, MAX_URI_SIZE, + MAX_RECV_BUFFER_SIZE, MAX_URI_SIZE, BUF_SIZE, PKG_MEM_SIZE); #ifdef USE_TCP printf("poll method support: %s.\n", poll_support); @@ -246,7 +246,6 @@ void print_internals(void) printf(" Default paths to modules: %s\n", MODS_DIR); printf(" Compile flags: %s\n", ver_flags ); printf(" MAX_RECV_BUFFER_SIZE=%d\n", MAX_RECV_BUFFER_SIZE); - printf(" MAX_LISTEN=%d\n", MAX_LISTEN); printf(" MAX_URI_SIZE=%d\n", MAX_URI_SIZE); printf(" BUF_SIZE=%d\n", BUF_SIZE); printf(" DEFAULT PKG_SIZE=%uMB\n", PKG_MEM_SIZE); @@ -422,12 +421,6 @@ int pmtu_discovery = 0; int auto_bind_ipv6 = 0; -#if 0 -char* names[MAX_LISTEN]; /* our names */ -int names_len[MAX_LISTEN]; /* lengths of the names*/ -struct ip_addr addresses[MAX_LISTEN]; /* our ips */ -int addresses_no=0; /* number of names/ips */ -#endif struct socket_info* udp_listen=0; #ifdef USE_TCP int tcp_main_pid=0; /* set after the tcp main process is started */

1 0

git:5.1:bf6468f7: rtpengine: fixed rtpp_node permanent deletion causing PDD
by Victor Seva 25 Jul '18

25 Jul '18

Module: kamailio Branch: 5.1 Commit: bf6468f7a4a54600e04dc6fd8aab537bde5ee464 URL: https://github.com/kamailio/kamailio/commit/bf6468f7a4a54600e04dc6fd8aab537… Author: Muhammad Zaka <muhammad.zaka(a)synety.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-07-25T09:47:17+02:00 rtpengine: fixed rtpp_node permanent deletion causing PDD rtpp_node->rn_recheck_ticks was never set this means in-memory rtpengine were never permanently deletion causing PDD for the calls requiring rtpengine (cherry picked from commit 0771960358b6450af8e1f75f838915f366f04a95) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/bf6468f7a4a54600e04dc6fd8aab537… Patch: https://github.com/kamailio/kamailio/commit/bf6468f7a4a54600e04dc6fd8aab537… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f2ca1a9f2e..21f981080d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -450,7 +450,8 @@ static int is_queried_node(struct rtpp_node *node, struct rtpp_node **queried_no int rtpengine_delete_node(struct rtpp_node *rtpp_node) { rtpp_node->rn_displayed = 0; - rtpp_node->rn_disabled = RTPENGINE_MAX_RECHECK_TICKS; + rtpp_node->rn_disabled = 1; + rtpp_node->rn_recheck_ticks = RTPENGINE_MAX_RECHECK_TICKS; return 1; }

1 0

git:master:fcf1d3d7: topos: keep original contact in 3xx responses sent out
by Daniel-Constantin Mierla 24 Jul '18

24 Jul '18

Module: kamailio Branch: master Commit: fcf1d3d778a903852b6e21103a23bd7fd6e3bbc9 URL: https://github.com/kamailio/kamailio/commit/fcf1d3d778a903852b6e21103a23bd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-24T16:10:16+02:00 topos: keep original contact in 3xx responses sent out - reported by Andrew Pogrebennyk --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/fcf1d3d778a903852b6e21103a23bd7… Patch: https://github.com/kamailio/kamailio/commit/fcf1d3d778a903852b6e21103a23bd7… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 41cb7ef416..b349865262 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1074,12 +1074,17 @@ int tps_response_sent(sip_msg_t *msg) mtsd.direction = direction; tps_remove_headers(msg, HDR_RECORDROUTE_T); - tps_remove_headers(msg, HDR_CONTACT_T); - if(direction==TPS_DIR_DOWNSTREAM) { - tps_reinsert_contact(msg, &stsd, &stsd.as_contact); - } else { - tps_reinsert_contact(msg, &stsd, &stsd.bs_contact); + /* keep contact without updates for redirect responses sent out */ + if(msg->first_line.u.reply.statuscode<300 + || msg->first_line.u.reply.statuscode>=400) { + tps_remove_headers(msg, HDR_CONTACT_T); + + if(direction==TPS_DIR_DOWNSTREAM) { + tps_reinsert_contact(msg, &stsd, &stsd.as_contact); + } else { + tps_reinsert_contact(msg, &stsd, &stsd.bs_contact); + } } tps_reappend_rr(msg, &btsd, &btsd.x_rr);

1 0

git:master:2dfe895f: modules: readme files regenerated - http_async_client ... [skip ci]
by Kamailio Dev 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: 2dfe895f52b2eac95dc0a9721bdb94225f28e827 URL: https://github.com/kamailio/kamailio/commit/2dfe895f52b2eac95dc0a9721bdb942… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-23T23:16:36+02:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/2dfe895f52b2eac95dc0a9721bdb942… Patch: https://github.com/kamailio/kamailio/commit/2dfe895f52b2eac95dc0a9721bdb942… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index e1b307ae76..635e6207b2 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ...

1 0

git:5.0:7571fa3c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 23 Jul '18

23 Jul '18

Module: kamailio Branch: 5.0 Commit: 7571fa3c85badec8bcf8bbda28842f6daa5ea0a5 URL: https://github.com/kamailio/kamailio/commit/7571fa3c85badec8bcf8bbda28842f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-23T23:01:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/7571fa3c85badec8bcf8bbda28842f6… Patch: https://github.com/kamailio/kamailio/commit/7571fa3c85badec8bcf8bbda28842f6… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index d61ae9c305..9e7ba1fafb 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ...

1 0

git:5.0:84f1f516: http_async_client: fix doc example regarding http_req_id
by Henning Westerholt 23 Jul '18

23 Jul '18

Module: kamailio Branch: 5.0 Commit: 84f1f516fa4d62ba556d67006288af8c018b0dd2 URL: https://github.com/kamailio/kamailio/commit/84f1f516fa4d62ba556d67006288af8… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-07-23T23:00:48+02:00 http_async_client: fix doc example regarding http_req_id (cherry picked from commit 45874202fd76f70c601b7ee7e22e950d06968d87) --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/84f1f516fa4d62ba556d67006288af8… Patch: https://github.com/kamailio/kamailio/commit/84f1f516fa4d62ba556d67006288af8… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 8629edabac..7131a71dfb 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ... </programlisting>

1 0

git:5.1:9e6f1362: http_async_client: fix doc example regarding http_req_id
by Henning Westerholt 23 Jul '18

23 Jul '18

Module: kamailio Branch: 5.1 Commit: 9e6f1362d4b7374a8f48b362128b9082a6a18482 URL: https://github.com/kamailio/kamailio/commit/9e6f1362d4b7374a8f48b362128b908… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-07-23T23:00:23+02:00 http_async_client: fix doc example regarding http_req_id (cherry picked from commit 45874202fd76f70c601b7ee7e22e950d06968d87) --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9e6f1362d4b7374a8f48b362128b908… Patch: https://github.com/kamailio/kamailio/commit/9e6f1362d4b7374a8f48b362128b908… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 8629edabac..7131a71dfb 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ... </programlisting>

1 0

git:master:45874202: http_async_client: fix doc example regarding http_req_id
by Henning Westerholt 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: 45874202fd76f70c601b7ee7e22e950d06968d87 URL: https://github.com/kamailio/kamailio/commit/45874202fd76f70c601b7ee7e22e950… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-07-23T22:58:23+02:00 http_async_client: fix doc example regarding http_req_id --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/45874202fd76f70c601b7ee7e22e950… Patch: https://github.com/kamailio/kamailio/commit/45874202fd76f70c601b7ee7e22e950… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 6752b12d04..605964e268 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ... </programlisting>

1 0

[kamailio/kamailio] Reply code in $uac_req(evcode) remains 401 instead of 200 when using uac_req_send() with authentication (#1598)
by Joel Serrano 23 Jul '18

23 Jul '18

### Description Following this scenario: Softphone <-> Kamailio <-> Asterisk 1- Softphone registers with kamailio (REGISTER) 2- Kamailio challenges... (401) 3- Softphone registers with kamailio (REGISTER + Auth info) 4- Kamailio accepts (200) 5- If Kamailio accepted, it sends a REGISTER to asterisk (REGISTER) 6- Asterisk challenges... (401) 7- Kamailio authenticates (REGISTER + Auth info) 8- Asterisk accepts (200) (NOTE: I know you can avoid Asterisk re-requesting for authentication, but in this case it's mandatory.) kamailio.cfg has this: ``` $var(rip) = $(avp(s:dsp_uri_list){uri.host}); $var(rip_port) = $(avp(s:dsp_uri_list){uri.port}); $uac_req(method)="REGISTER"; $uac_req(auser)=$avp(customer_user); $uac_req(apasswd)=$avp(customer_pass); $uac_req(ruri)="sip:" + $var(rip) + ":" + $var(rip_port); $uac_req(furi)="sip:" + $au + "@" + $var(rip); $uac_req(turi)="sip:" + $au + "@" + $var(rip); $uac_req(hdrs)="Contact: <sip:" + $au + "@X.X.X.X:5060>\r\n"; $uac_req(evroute)=1; if ($sel(contact.expires) != $null) { $uac_req(hdrs)= $uac_req(hdrs) + "Expires: " + $sel(contact.expires) + "\r\n"; } else { $uac_req(hdrs)= $uac_req(hdrs) + "Expires: " + $hdr(Expires) + "\r\n"; } uac_req_send(); ``` and this: ``` # Log replies from uac_req_send() event_route[uac:reply] { xlog("L_NOTICE", "[UAC] - $uac_req(method) request from user $uac_req(auser) to $uac_req(ruri) completed with code: $uac_req(evcode)\n"); } ``` The result: ![image](https://user-images.githubusercontent.com/16212586/43027222-0a32bd48-8c2e-11e8-8038-16d0dba00dec.png) ``` Jul 20 16:49:42 sbc01 sbc[5236]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 Jul 20 16:51:05 sbc01 sbc[5240]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 Jul 20 16:51:49 sbc01 sbc[5241]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 Jul 20 17:00:06 sbc01 sbc[5239]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 Jul 20 17:09:06 sbc01 sbc[5240]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 ``` I was expecting for `$uac_req(evcode)` to be 200, but it's 401. #### Reproduction Generate a REGISTER using uaq_send_req() with `auser` and `apasswd` set, and then print the `$uac_req(evcode)` from the corresponding `event_route[]`. ### Possible Solutions Not sure if the 401 is expected because it was the *first* final response, period. Or, (when using authentication), it should be updated to 200 or whatever the reply is after sending the REGISTER with auth info. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.1.4 (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 with gcc 6.3.0 ``` * **Operating System**: ``` OS: Debian stretch 9.4 Kernel: Linux kamailio 4.9.0-6-amd64 #1 SMP Debian 4.9.88-1+deb9u1 (2018-05-07) 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/1598

3 8

git:master:ab6e63dc: misc/examples: added minimal config sample for anycast
by Daniel-Constantin Mierla 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: ab6e63dcb31551a9b534f26eeae883153fd1af39 URL: https://github.com/kamailio/kamailio/commit/ab6e63dcb31551a9b534f26eeae8831… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-23T14:08:38+02:00 misc/examples: added minimal config sample for anycast --- Added: misc/examples/mixed/kamailio-minimal-anycast.cfg --- Diff: https://github.com/kamailio/kamailio/commit/ab6e63dcb31551a9b534f26eeae8831… Patch: https://github.com/kamailio/kamailio/commit/ab6e63dcb31551a9b534f26eeae8831…

1 0

git:master:5c3df566: uac: call event route for uac_req_send() for second response
by Daniel-Constantin Mierla 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: 5c3df566887e8c37d3144d4191b36fc9eba24c34 URL: https://github.com/kamailio/kamailio/commit/5c3df566887e8c37d3144d4191b36fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-23T13:59:28+02:00 uac: call event route for uac_req_send() for second response - done in case the request is resent after a 401/407 - GH #1598 --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/5c3df566887e8c37d3144d4191b36fc… Patch: https://github.com/kamailio/kamailio/commit/5c3df566887e8c37d3144d4191b36fc… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 5db66bd1a2..1d939dc815 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -656,7 +656,35 @@ void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) } /** - * TM callback function + * TM resend callback function + */ +void uac_resend_tm_callback(struct cell *t, int type, struct tmcb_params *ps) +{ + uac_send_info_t *tp = NULL; + + LM_DBG("tm callback with status %d\n", ps->code); + + if(ps->param==NULL || *ps->param==0) + { + LM_DBG("callback param with message id not received\n"); + goto done; + } + tp = (uac_send_info_t*)(*ps->param); + + if(tp->evroute!=0) { + uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, + tp, ps->code); + } + +done: + if(tp!=NULL) + shm_free(tp); + return; + +} + +/** + * TM send callback function */ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) { @@ -753,6 +781,12 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) uac_r.ssock = (tp->s_sock.len <= 0) ? NULL : &tp->s_sock; uac_r.dialog = &tmdlg; uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + if(tp->evroute!=0) { + /* Callback function */ + uac_r.cb = uac_resend_tm_callback; + /* Callback parameter */ + uac_r.cbp = (void*)tp; + } ret = tmb.t_request_within(&uac_r); if(ret<0) { @@ -760,6 +794,10 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) goto error; } + if(tp->evroute!=0) { + return; + } + done: error: if(tp!=NULL)

1 0

git:master:1ac4527a: uac: uac_send - small bits of formatting
by Daniel-Constantin Mierla 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: 1ac4527ac8f05dbb48e3ab9e2aa9790ae86f179f URL: https://github.com/kamailio/kamailio/commit/1ac4527ac8f05dbb48e3ab9e2aa9790… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-23T13:59:28+02:00 uac: uac_send - small bits of formatting --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/1ac4527ac8f05dbb48e3ab9e2aa9790… Patch: https://github.com/kamailio/kamailio/commit/1ac4527ac8f05dbb48e3ab9e2aa9790… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 78dc725453..5db66bd1a2 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -499,12 +499,12 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "all", 3)==0) sp->pvp.pvn.u.isname.name.n = 0; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "ruri", 4)==0) sp->pvp.pvn.u.isname.name.n = 1; else if(strncmp(in->s, "turi", 4)==0) @@ -526,7 +526,7 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break; - case 6: + case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 7; else if(strncmp(in->s, "callid", 6)==0) @@ -537,7 +537,7 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 16; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "evroute", 7)==0) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "apasswd", 7)==0) @@ -655,7 +655,7 @@ void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) set_route_type(backup_rt); } -/** +/** * TM callback function */ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps)

1 0

Kamailio 5.2 stable release
by Saurabh Kumar 22 Jul '18

22 Jul '18

Hi Miconda, We are using Kamailio 5.0.2 right now. We want to use recently introduced db_redis for location queries. So, can you confirm please when kamailio 5.2 stable (with db_redis) will be released (rough expectation). -- Regards, Saurabh Kumar VOIP Application Developer

3 3

how to make non compliant and custom SIP implementation works with Kamailio
by Victor Velo 22 Jul '18

22 Jul '18

Hello, I have Aastra phone that doesn't seems to get new firmware and most importantly NEC Hybrid IP phones. My question is, how can I "adjust" Kamailio to get these phones behave like SIP compliant phone. Which kind of Module do I have to develop? For the NEC story, I will actually dedicate a separate Kamailio instance if some workaround is possible. Someone offer me a complete NEC system to do this: NEC phone system + plus some NEC IP Phones for the "reverse engineering" task. So I will be able to see all the SIP traffic on the NEC system and will adjust Kamailio to handle them. Possible??? Thanks, Vic

2 1

git:master:25e4ac2e: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 20 Jul '18

20 Jul '18

Module: kamailio Branch: master Commit: 25e4ac2e60eb13116960c3824a5eefa896b6774d URL: https://github.com/kamailio/kamailio/commit/25e4ac2e60eb13116960c3824a5eefa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-20T19:46:44+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/25e4ac2e60eb13116960c3824a5eefa… Patch: https://github.com/kamailio/kamailio/commit/25e4ac2e60eb13116960c3824a5eefa… --- diff --git a/src/modules/kex/README b/src/modules/kex/README index 8012752527..3b58fbae06 100644 --- a/src/modules/kex/README +++ b/src/modules/kex/README @@ -376,7 +376,9 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); 3.11. is_myself(uri) Check if the parameter matches the 'myself' condition (i.e., is a local - IP or domain). + IP or domain). Note that if the port is missing in the URI, then no + port matching is done (in other words, port matching is skipped -- it + does not use default SIP ports 5060 or 5061 for matching). Meaning of the parameters is as follows: * uri - Valid SIP URI or IP address to check against the list of

1 0

git:master:d2841c66: kex: docs - note that is_myself() does not match with default ports
by Daniel-Constantin Mierla 20 Jul '18

20 Jul '18

Module: kamailio Branch: master Commit: d2841c66304196cbe73c76517f284e49aa0c76b9 URL: https://github.com/kamailio/kamailio/commit/d2841c66304196cbe73c76517f284e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-20T19:40:42+02:00 kex: docs - note that is_myself() does not match with default ports --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d2841c66304196cbe73c76517f284e4… Patch: https://github.com/kamailio/kamailio/commit/d2841c66304196cbe73c76517f284e4… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index b55bfa4be4..9d2a203425 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -350,7 +350,10 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); <title><function moreinfo="none">is_myself(uri)</function></title> <para> Check if the parameter matches the 'myself' condition (i.e., is - a local IP or domain). + a local IP or domain). Note that if the port is missing in the URI, + then no port matching is done (in other words, port matching is + skipped -- it does not use default SIP ports 5060 or 5061 for + matching). </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

1 0

git:master:44c9bba8: misc/examples: added a minimal proxy sample config
by Daniel-Constantin Mierla 20 Jul '18

20 Jul '18

Module: kamailio Branch: master Commit: 44c9bba899f7c66f54605c5ba20adaadd6c3e065 URL: https://github.com/kamailio/kamailio/commit/44c9bba899f7c66f54605c5ba20adaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-20T18:06:34+02:00 misc/examples: added a minimal proxy sample config --- Added: misc/examples/mixed/kamailio-minimal-proxy.cfg --- Diff: https://github.com/kamailio/kamailio/commit/44c9bba899f7c66f54605c5ba20adaa… Patch: https://github.com/kamailio/kamailio/commit/44c9bba899f7c66f54605c5ba20adaa…

1 0

git:master:df817340: pv: using * for header name matches any header for $hdr(name)
by Daniel-Constantin Mierla 20 Jul '18

20 Jul '18

Module: kamailio Branch: master Commit: df817340df65abd116e6f9d49a3a32b4d1c0d470 URL: https://github.com/kamailio/kamailio/commit/df817340df65abd116e6f9d49a3a32b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-20T17:59:36+02:00 pv: using * for header name matches any header for $hdr(name) - e.g., $hdr(*) is body of first header, $(hdr(*)[-1]) is body of last header --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/df817340df65abd116e6f9d49a3a32b… Patch: https://github.com/kamailio/kamailio/commit/df817340df65abd116e6f9d49a3a32b… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8957098895..65e9491b93 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1900,6 +1900,8 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if (tv.ri==hf->type) break; } else { + if(tv.rs.len==1 && tv.rs.s[0]=='*') + break; if (cmp_hdrname_str(&hf->name, &tv.rs)==0) break; } @@ -1953,8 +1955,10 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if (tv.ri==hf->type) break; } else { + if(tv.rs.len==1 && tv.rs.s[0]=='*') + break; if (cmp_hdrname_str(&hf->name, &tv.rs)==0) - break; + break; } } } while (hf); @@ -1976,8 +1980,11 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if (tv.ri==hf0->type) n++; } else { - if (cmp_hdrname_str(&hf0->name, &tv.rs)==0) + if(tv.rs.len==1 && tv.rs.s[0]=='*') { n++; + } else if (cmp_hdrname_str(&hf0->name, &tv.rs)==0) { + n++; + } } } idx = -idx; @@ -2003,8 +2010,11 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if (tv.ri==hf0->type) n++; } else { - if (cmp_hdrname_str(&hf0->name, &tv.rs)==0) + if(tv.rs.len==1 && tv.rs.s[0]=='*') { + n++; + } else if (cmp_hdrname_str(&hf0->name, &tv.rs)==0) { n++; + } } if(n==idx) break; @@ -3114,6 +3124,14 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in) return 0; } + if(in->len==1 && in->s[0]=='*') { + /* match any header name */ + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + } + if(in->len>=pv_get_buffer_size()-1) { LM_ERR("name too long\n");

1 0

git:master:4f13c9a2: dialog: safety check for dialog hash table inside dlg_get()
by Daniel-Constantin Mierla 19 Jul '18

19 Jul '18

Module: kamailio Branch: master Commit: 4f13c9a291eeeb2f3d3b7654308b13396fe020af URL: https://github.com/kamailio/kamailio/commit/4f13c9a291eeeb2f3d3b7654308b133… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-19T10:29:05+02:00 dialog: safety check for dialog hash table inside dlg_get() - GH #1594 --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/4f13c9a291eeeb2f3d3b7654308b133… Patch: https://github.com/kamailio/kamailio/commit/4f13c9a291eeeb2f3d3b7654308b133… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 23955eaf5e..a6c8cdeb7b 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -801,6 +801,10 @@ struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir) struct dlg_cell *dlg; unsigned int he; + if(d_table==NULL) { + LM_ERR("dialog hash table not available\n"); + return 0; + } he = core_hash(callid, 0, d_table->size); dlg = internal_get_dlg(he, callid, ftag, ttag, dir, 0);

1 0

[kamailio/kamailio] kamailio always retries deleted RTPEngine Nodes which generates PDD (#1593)
by adil-mafzool 18 Jul '18

18 Jul '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/1593 -- Commit Summary -- * kamailio always retries deleted RTPEngine Nodes which generates PDD -- File Changes -- M src/modules/rtpengine/rtpengine.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1593.patch https://github.com/kamailio/kamailio/pull/1593.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/1593

3 5

git:master:6c94217d: Merge pull request #1593 from adil-mafzool/master
by GitHub 18 Jul '18

18 Jul '18

Module: kamailio Branch: master Commit: 6c94217d68bdde980bd4b77bdc6d22062bd650ee URL: https://github.com/kamailio/kamailio/commit/6c94217d68bdde980bd4b77bdc6d220… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-07-18T12:03:59+02:00 Merge pull request #1593 from adil-mafzool/master kamailio always retries deleted RTPEngine Nodes which generates PDD --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/6c94217d68bdde980bd4b77bdc6d220… Patch: https://github.com/kamailio/kamailio/commit/6c94217d68bdde980bd4b77bdc6d220… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7ce81f7de6..0b52e239e0 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -454,7 +454,8 @@ static int is_queried_node(struct rtpp_node *node, struct rtpp_node **queried_no int rtpengine_delete_node(struct rtpp_node *rtpp_node) { rtpp_node->rn_displayed = 0; - rtpp_node->rn_disabled = RTPENGINE_MAX_RECHECK_TICKS; + rtpp_node->rn_disabled = 1; + rtpp_node->rn_recheck_ticks = RTPENGINE_MAX_RECHECK_TICKS; return 1; }

1 0

git:master:07719603: rtpenegine: fixed rtpp_node permanent deletion causing PDD
by Muhammad Zaka 18 Jul '18

18 Jul '18

Module: kamailio Branch: master Commit: 0771960358b6450af8e1f75f838915f366f04a95 URL: https://github.com/kamailio/kamailio/commit/0771960358b6450af8e1f75f838915f… Author: Muhammad Zaka <muhammad.zaka(a)synety.com> Committer: Muhammad Zaka <muhammad.zaka(a)synety.com> Date: 2018-07-13T18:17:54+01:00 rtpenegine: fixed rtpp_node permanent deletion causing PDD rtpp_node->rn_recheck_ticks was never set this means in-memory rtpengine were never permanently deletion causing PDD for the calls requiring rtpengine --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/0771960358b6450af8e1f75f838915f… Patch: https://github.com/kamailio/kamailio/commit/0771960358b6450af8e1f75f838915f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7ce81f7de6..0b52e239e0 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -454,7 +454,8 @@ static int is_queried_node(struct rtpp_node *node, struct rtpp_node **queried_no int rtpengine_delete_node(struct rtpp_node *rtpp_node) { rtpp_node->rn_displayed = 0; - rtpp_node->rn_disabled = RTPENGINE_MAX_RECHECK_TICKS; + rtpp_node->rn_disabled = 1; + rtpp_node->rn_recheck_ticks = RTPENGINE_MAX_RECHECK_TICKS; return 1; }

1 0

git:master:5054ddf7: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 17 Jul '18

17 Jul '18

Module: kamailio Branch: master Commit: 5054ddf7e9b28a67ad3809e2363d7af2302dc0c0 URL: https://github.com/kamailio/kamailio/commit/5054ddf7e9b28a67ad3809e2363d7af… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-17T08:31:33+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/5054ddf7e9b28a67ad3809e2363d7af… Patch: https://github.com/kamailio/kamailio/commit/5054ddf7e9b28a67ad3809e2363d7af… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index bdc5eb95c6..de3ce988ea 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -433,7 +433,7 @@ replace_body("openser", "Kamailio SIP Proxy"); Example 1.8. replace_hdrs usage ... -replace_body("Kamailio", "Kamailio SIP Proxy"); +replace_hdrs("Kamailio", "Kamailio SIP Proxy"); ... 4.9. replace_all(re, txt)

1 0

git:master:81889c76: textops: docs - fixed function name in example for replace_hdrs()
by Daniel-Constantin Mierla 17 Jul '18

17 Jul '18

Module: kamailio Branch: master Commit: 81889c76a6c2023f580225fda4905a1106bf779a URL: https://github.com/kamailio/kamailio/commit/81889c76a6c2023f580225fda4905a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-17T08:17:35+02:00 textops: docs - fixed function name in example for replace_hdrs() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81889c76a6c2023f580225fda4905a1… Patch: https://github.com/kamailio/kamailio/commit/81889c76a6c2023f580225fda4905a1… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 0984e003c8..cfcca4daf6 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -327,7 +327,7 @@ replace_body("openser", "&kamailio; SIP Proxy"); <title><function>replace_hdrs</function> usage</title> <programlisting format="linespecific"> ... -replace_body("&kamailio;", "&kamailio; SIP Proxy"); +replace_hdrs("&kamailio;", "&kamailio; SIP Proxy"); ... </programlisting> </example>

1 0

git:master:fc412f96: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 17 Jul '18

17 Jul '18

Module: kamailio Branch: master Commit: fc412f96b8fa13561c8ddd0df259754ffe3a9b20 URL: https://github.com/kamailio/kamailio/commit/fc412f96b8fa13561c8ddd0df259754… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-17T08:16:57+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/fc412f96b8fa13561c8ddd0df259754… Patch: https://github.com/kamailio/kamailio/commit/fc412f96b8fa13561c8ddd0df259754…

1 0

git:master:c1a7be3f: textops: docs for replace_hdrs()
by Daniel-Constantin Mierla 17 Jul '18

17 Jul '18

Module: kamailio Branch: master Commit: c1a7be3f793b49c6df202502de23873099c88b9b URL: https://github.com/kamailio/kamailio/commit/c1a7be3f793b49c6df202502de23873… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-17T08:03:02+02:00 textops: docs for replace_hdrs() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c1a7be3f793b49c6df202502de23873… Patch: https://github.com/kamailio/kamailio/commit/c1a7be3f793b49c6df202502de23873… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 6be825efc9..0984e003c8 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -301,6 +301,38 @@ replace_body("openser", "&kamailio; SIP Proxy"); </example> </section> + <section id="textops.f.replace_hdrs"> + <title> + <function moreinfo="none">replace_hdrs(re, txt)</function> + </title> + <para> + Replaces the first occurrence of re in the SIP headers of the message + with txt. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>re</emphasis> - Regular expression. + </para> + </listitem> + <listitem> + <para><emphasis>txt</emphasis> - String. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>replace_hdrs</function> usage</title> + <programlisting format="linespecific"> +... +replace_body("&kamailio;", "&kamailio; SIP Proxy"); +... +</programlisting> + </example> + </section> + <section id="textops.f.replace_all"> <title> <function moreinfo="none">replace_all(re, txt)</function>

1 0

git:master:21ad31f7: textops: added replace_hdrs(re, sval)
by Daniel-Constantin Mierla 17 Jul '18

17 Jul '18

Module: kamailio Branch: master Commit: 21ad31f75e11adf2789c387b356cc5af5d29e3b4 URL: https://github.com/kamailio/kamailio/commit/21ad31f75e11adf2789c387b356cc5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-17T07:50:50+02:00 textops: added replace_hdrs(re, sval) - replace matching regexp with sval inside sip headers part --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/21ad31f75e11adf2789c387b356cc5a… Patch: https://github.com/kamailio/kamailio/commit/21ad31f75e11adf2789c387b356cc5a… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index a986f78ed3..8da8998803 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -91,6 +91,7 @@ static int replace_f(struct sip_msg*, char*, char*); static int replace_str_f(struct sip_msg*, char*, char*, char*); static int replace_body_f(struct sip_msg*, char*, char*); static int replace_body_str_f(struct sip_msg*, char*, char*, char*); +static int replace_hdrs_f(struct sip_msg*, char*, char*); static int replace_hdrs_str_f(struct sip_msg*, char*, char*, char*); static int replace_all_f(struct sip_msg*, char*, char*); static int replace_body_all_f(struct sip_msg*, char*, char*); @@ -190,6 +191,9 @@ static cmd_export_t cmds[]={ {"replace_body_str", (cmd_function)replace_body_str_f,3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"replace_hdrs", (cmd_function)replace_hdrs_f, 2, + fixup_regexp_none, fixup_free_regexp_none, + ANY_ROUTE}, {"replace_hdrs_str", (cmd_function)replace_hdrs_str_f,3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, @@ -1014,6 +1018,87 @@ static int replace_body_str_f(sip_msg_t* msg, char* pmkey, char* prval, char* pr return ki_replace_body_str(msg, &mkey, &rval, &rmode); } +static int replace_hdrs_helper(sip_msg_t* msg, regex_t *re, str *val) +{ + struct lump* l; + regmatch_t pmatch; + char* s; + int off; + str lbuf; + char bk; + + if ( parse_headers(msg, HDR_EOH_F, 0)==-1 ) { + LM_ERR("failed to parse to end of headers\n"); + return -1; + } + + lbuf.s = get_header(msg); + lbuf.len = (int)(msg->unparsed - lbuf.s); + + if (lbuf.len==0) { + LM_DBG("message headers part has zero length\n"); + return -1; + } + + bk = lbuf.s[lbuf.len]; + lbuf.s[lbuf.len] = '\0'; + if (regexec(re, lbuf.s, 1, &pmatch, 0)!=0) { + lbuf.s[lbuf.len] = bk; + return -1; + } + lbuf.s[lbuf.len] = bk; + + off=lbuf.s-msg->buf; + + if (pmatch.rm_so!=-1){ + if ((l=del_lump(msg, pmatch.rm_so+off, + pmatch.rm_eo-pmatch.rm_so, 0))==0) + return -1; + s=pkg_malloc(val->len+1); + if (s==0){ + LM_ERR("memory allocation failure\n"); + return -1; + } + memcpy(s, val->s, val->len); + if (insert_new_lump_after(l, s, val->len, 0)==0){ + LM_ERR("could not insert new lump\n"); + pkg_free(s); + return -1; + } + + return 1; + } + return -1; +} + +static int replace_hdrs_f(struct sip_msg* msg, char* key, char* str2) +{ + str val; + + val.s = str2; + val.len = strlen(val.s); + + return replace_hdrs_helper(msg, (regex_t*)key, &val); +} + +static int ki_replace_hdrs(sip_msg_t* msg, str* sre, str* sval) +{ + regex_t mre; + int ret; + + memset(&mre, 0, sizeof(regex_t)); + if (regcomp(&mre, sre->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)!=0) { + LM_ERR("failed to compile regex: %.*s\n", sre->len, sre->s); + return -1; + } + + ret = replace_hdrs_helper(msg, &mre, sval); + + regfree(&mre); + + return ret; +} + static int ki_replace_hdrs_str(sip_msg_t* msg, str* mkey, str* rval, str *rmode) { str lbuf; @@ -4468,6 +4553,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("replace_hdrs"), + SR_KEMIP_INT, ki_replace_hdrs, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("replace_hdrs_str"), SR_KEMIP_INT, ki_replace_hdrs_str, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

1 0

[kamailio/kamailio] Kamailio returns "interesting" json string when querying statistics (#1595)
by Sebastian Damm 16 Jul '18

16 Jul '18

### Description When querying Kamailio 5.1 for statistics via JSON, we get back a string like this (shortened): ``` kamailio:~# curl -X POST -d '{ "jsonrpc": "2.0", "method": "stats.get_statistics", "params": ["all"],"id": 1 }' http://172.20.21.3:15060/jsonrpc { "jsonrpc": "2.0", "result": ["core:bad_URIs_rcvd = 0", "core:bad_msg_hdr = 0", "core:drop_replies = 0", "core:drop_requests = 4", "core:err_replies = 0", "core:err_requests = 0", "core:fwd_replies = 2252", "core:fwd_requests = 16153", "core:rcv_replies = 393994", "core:rcv_replies_18x = 0"], "id": 1 } ``` We want to graph some of the values returned by the statistics module. But the format makes it a bit hard. I would expect the format to be like this: ``` { "jsonrpc": "2.0", "result": {"core:bad_URIs_rcvd" : 0, "core:bad_msg_hdr" : 0, "core:drop_replies" : 0, "core:drop_requests" : 4, "core:err_replies" : 0, "core:err_requests" : 0, "core:fwd_replies" : 2252, "core:fwd_requests" : 16153, "core:rcv_replies" : 393994, "core:rcv_replies_18x" : 0}, "id": 1 } ``` With a result like this, one could access the result["core:bad_URIs_rcvd"] item. The way it is returned now, one has to iterate through all values and to a string comparison for the desired item. Is there a reason, why the output is as it is? ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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 with gcc 4.7.2 ``` * **Operating System**:  ``` Debian Wheezy Linux hostname 3.2.0-5-amd64 #1 SMP Debian 3.2.96-3 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/1595

2 4

git:master:9c7f22a2: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 16 Jul '18

16 Jul '18

Module: kamailio Branch: master Commit: 9c7f22a2df8ac5469cee82a7fd94d87029fc5046 URL: https://github.com/kamailio/kamailio/commit/9c7f22a2df8ac5469cee82a7fd94d87… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-16T14:17:04+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/9c7f22a2df8ac5469cee82a7fd94d87… Patch: https://github.com/kamailio/kamailio/commit/9c7f22a2df8ac5469cee82a7fd94d87… --- diff --git a/src/modules/kex/README b/src/modules/kex/README index cd61ff61a9..8012752527 100644 --- a/src/modules/kex/README +++ b/src/modules/kex/README @@ -633,6 +633,11 @@ kamcmd core.modules Print the list of available internal statistics. + NOTE: the result is an array of strings that have the list of + statistics formated like "name = value", being propagated over the time + from the MI variant. Use "stats.fetch" command to have a more + JSON-friendly output. + Parameters: statsid - which statistics to be printed. If set to 'all' then all statistics are printed; if set to 'statsgroup:' then all statistics in the group are printed; if set to 'statsname' then the

1 0

git:master:1cad8353: kex: docs - note about stats.fetch in the section for stats.get_statistics
by Daniel-Constantin Mierla 16 Jul '18

16 Jul '18

Module: kamailio Branch: master Commit: 1cad8353e3fc04b2b8486fd490b57591a2cc0a9a URL: https://github.com/kamailio/kamailio/commit/1cad8353e3fc04b2b8486fd490b5759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-16T14:03:43+02:00 kex: docs - note about stats.fetch in the section for stats.get_statistics --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1cad8353e3fc04b2b8486fd490b5759… Patch: https://github.com/kamailio/kamailio/commit/1cad8353e3fc04b2b8486fd490b5759… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 8fe4e84ba8..b55bfa4be4 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -735,11 +735,15 @@ resetdebug(); <function moreinfo="none">stats.get_statistics</function> </title> <para>Print the list of available internal statistics.</para> + <para>NOTE: the result is an array of strings that have the list of + statistics formated like "name = value", being propagated over the time + from the MI variant. Use "stats.fetch" command to have a more + JSON-friendly output.</para> <para>Parameters: <emphasis>statsid</emphasis> - which statistics to - be printed. If set to 'all' then all statistics are printed; if - set to 'statsgroup:' then all statistics in the group are printed; - if set to 'statsname' then the statistics identified by the name - is printed.</para> + be printed. If set to 'all' then all statistics are printed; if + set to 'statsgroup:' then all statistics in the group are printed; + if set to 'statsname' then the statistics identified by the name + is printed.</para> <para>Examples:</para> <programlisting format="linespecific"> &kamcmd; stats.get_statistics all @@ -757,11 +761,11 @@ resetdebug(); structure: {"statsgroup.statsname" : "statsvalue"}. The value is represented as string to accomodate large numbers.</para> <para>Parameters: <emphasis>statsid</emphasis> - which statistics to - be printed. If set to 'all' then all statistics are printed; if - set to 'statsgroup:' then all statistics in the group are printed; - if set to 'statsname' then the statistics identified by the name - is printed (can be also 'statsgroup.stastname' or - 'statsgroup:statsname').</para> + be printed. If set to 'all' then all statistics are printed; if + set to 'statsgroup:' then all statistics in the group are printed; + if set to 'statsname' then the statistics identified by the name + is printed (can be also 'statsgroup.stastname' or + 'statsgroup:statsname').</para> <para>Examples:</para> <programlisting format="linespecific"> &kamcmd; stats.fetch all

1 0

[kamailio/kamailio] re.subst cannot process sdp content-length of 2978 (#1592)
by adil-mafzool 16 Jul '18

16 Jul '18

While trying the following code with sdp content-length of 2978 : - $var(telephone-event) = $(avp(sdp){re.subst,/.*a=rtpmap:([0-9]+) telephone-event.*/\1/s}); kamailio -v version: kamailio 5.1.4 (x86_64/linux) got the following errors: - ERROR: textops [txt_var.c:80]: tr_txt_eval_re(): PV value too big 2978, increase buffer size ERROR: <core> [core/lvalue.c:346]: lval_pvar_assign(): non existing right pvar ERROR: <core> [core/lvalue.c:404]: lval_assign(): assignment failed at pos: (424,27-424,91) ERROR: <script>: telephone-event: 0 This is due to the fixed size of 2048 modules/textops/txt_var.c at line 48 : - '''#define TR_TXT_BUF_SIZE 2048 static char tr_txt_buf[TR_TXT_BUF_SIZE];''' Please can anybody check.. -- 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/1592

2 3

[kamailio/kamailio] 200 OK & ACK & topoh issues (#1541)
by Alexandru Pirvulescu 14 Jul '18

14 Jul '18

### Description A certain inbound provider does not return ACK R-URI as an exact copy of contact. A parameter is appended to it, like below: 200 OK Contact: `Contact: <sip:35.197.205.XXX:5060;line=sr-N6IAzJd4WxFLWxVlz.jwWB0yM.y7MlV7zGZlMlvuMx3A>` ACK R-URI: `ACK sip:35.197.205.XXX:5060;line=sr-N6IAzJd4WxFLWxVlz.jwWB0yM.y7MlV7zGZlMlvuMx3A;user=phone SIP/2.0` As you can see, the `user=phone` is appended along with `line=` put by topoh. ### Troubleshooting #### Reproduction I am not sure how this can be reproductible. I've put the URI with and without `user=phone` part in a small C app that calls kamailio's `parse_params` function and both resolved to one and two params, as expected, so the problem must come from `parse_uri`. See the debug logs below that show the difference between a "good" ACK and a "bad" ACK. `topoh` doesn't get its `line=` param, so it doesn't perform the `Contact` header rewrite. The ACK does not match a dialog/transaction and it is forwarded to itself (from internal IP to external IP, this being a kamailio behind NAT, but that's not the problem). #### Debugging Data #### Log Messages This is the "good" call, with ACK R-URI identical to Contact header. See the "+decoded" line: ``` 13(40) DEBUG: topoh [topoh_mod.c:249]: th_prepare_msg(): no second via in this message 13(40) DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=as496aacd0 13(40) DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 13(40) DEBUG: topoh [th_msg.c:1165]: th_route_direction(): ftag match 13(40) DEBUG: topoh [th_msg.c:763]: th_unmask_ruri(): +decoded: 34: [sip:+441274957XXX@10.32.2.133:5060] 13(40) DEBUG: topoh [topoh_mod.c:358]: th_msg_received(): adding cookie: dc 13(40) DEBUG: topoh [th_msg.c:997]: th_add_hdr_cookie(): added cookie header [TH: dch ``` This is the "bad" call, with ACK R-URI having a `user=phone` param appended to original Contact contents: ``` 10(37) DEBUG: topoh [topoh_mod.c:249]: th_prepare_msg(): no second via in this message 10(37) DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=3735986184-753647 10(37) DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 10(37) DEBUG: topoh [th_msg.c:1165]: th_route_direction(): ftag match 10(37) DEBUG: <core> [core/parser/parse_param.c:580]: parse_params2(): empty uri params, skipping 10(37) DEBUG: topoh [topoh_mod.c:358]: th_msg_received(): adding cookie: dc 10(37) DEBUG: topoh [th_msg.c:997]: th_add_hdr_cookie(): added cookie header [TH: dch ``` #### SIP Traffic ``` U 2018/05/21 10:22:53.206320 35.197.205.XXX:5060 -> 88.215.58.YYY:5060 SIP/2.0 200 OK. Via: SIP/2.0/UDP 88.215.58.YYY:5060;rport=5060;branch=z9hG4bK469d20c71c138e366475cd537dc0c68b. Record-Route: <sip:35.197.205.XXX;lr;ftag=3735908572-610467;vsf=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7dXNlcj1waG9uZQ--;vst=AAAAAAAAAAAAAAAAAAAAAAAACQgAAQMbFhsLHTE1OjUwNjA7dXNlcj1waG9uZQ--;did=f17.b7f>. From: <sip:+16098378XXX@88.215.58.YYY;user=phone>;tag=3735908572-610467. To: <sip:+441242395XXX@88.215.58.YYY:5060;user=phone>;tag=as3147fc45. Call-ID: 5577511-3735908572-610459(a)MSX163.XXX.com. CSeq: 1 INVITE. Server: Asterisk PBX 1.8.28-cert5. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE. Supported: replaces. Contact: <sip:35.197.205.XXX:5060;line=sr-N6IAzJd4WxFLWxVlz.jwWB0yM.y7MlV7zGZlMlvuMx3A>. Content-Type: application/sdp. Content-Length: 259. . v=0. o=root 1611167628 1611167628 IN IP4 35.197.206.251. s=Asterisk PBX 1.8.28-cert5. c=IN IP4 35.197.206.251. t=0 0. m=audio 10948 RTP/AVP 8 101. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=ptime:20. a=sendrecv. a=rtcp:10949. U 2018/05/21 10:22:53.206827 88.215.58.YYY:5060 -> 35.197.205.XXX:5060 ACK sip:35.197.205.XXX:5060;line=sr-N6IAzJd4WxFLWxVlz.jwWB0yM.y7MlV7zGZlMlvuMx3A;user=phone SIP/2.0. Max-Forwards: 68. Route: <sip:35.197.205.XXX;lr;ftag=3735908572-610467;vsf=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7dXNlcj1waG9uZQ--;vst=AAAAAAAAAAAAAAAAAAAAAAAACQgAAQMbFhsLHTE1OjUwNjA7dXNlcj1waG9uZQ--;did=f17.b7f>. To: <sip:+441242395XXX@88.215.58.YYY:5060;user=phone>;tag=as3147fc45. From: <sip:+16098378XXX@88.215.58.YYY;user=phone>;tag=3735908572-610467. Call-ID: 5577511-3735908572-610459(a)MSX163.XXX.com. CSeq: 1 ACK. Allow: PUBLISH,MESSAGE,UPDATE,SUBSCRIBE,REFER,INFO,NOTIFY,OPTIONS,BYE,INVITE,ACK,CANCEL. Via: SIP/2.0/UDP 88.215.58.15:5060;branch=z9hG4bK6c862e8111736dc6d7d22479393d1f2d. Contact: <sip:+16098378YYY@88.215.58.YYY:5060>. Content-Length: 0. ``` ### Possible Solutions Changed the provider to avoid downtime, but the `empty uri params, skipping` error from `parse_params2` is strange, considering that we do not have a single param but 2. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.4 (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 with gcc 5.4.0 ``` * **Operating System**: ``` Linux gke-lon-1-sbc-in-082a7447-9rll 4.13.0-1011-gcp #15-Ubuntu SMP Mon Feb 12 16:29:04 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/1541

2 7

git:master:951df23f: topoh: try to use sip uri parameters for decoding
by Daniel-Constantin Mierla 14 Jul '18

14 Jul '18

Module: kamailio Branch: master Commit: 951df23f8ab9f4428e143949f1e580f76b4d8fc9 URL: https://github.com/kamailio/kamailio/commit/951df23f8ab9f4428e143949f1e580f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-14T09:20:29+02:00 topoh: try to use sip uri parameters for decoding - when UA adds user=phone, turns the uri type in tel mapped over sip uri, default params pointing to tel params - reported by GH #1541 --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/951df23f8ab9f4428e143949f1e580f… Patch: https://github.com/kamailio/kamailio/commit/951df23f8ab9f4428e143949f1e580f… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 8f46382c8e..2ba5688395 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -108,17 +108,25 @@ int th_get_param_value(str *in, str *name, str *value) int th_get_uri_param_value(str *uri, str *name, str *value) { - struct sip_uri puri; + sip_uri_t puri; memset(value, 0, sizeof(str)); if(parse_uri(uri->s, uri->len, &puri)<0) return -1; + + LM_DBG("uri params: [%.*s] - sip uri params: [%.*s]\n", + puri.params.len, (puri.params.s)?puri.params.s:"", + puri.sip_params.len, (puri.sip_params.s)?puri.sip_params.s:""); + + if(puri.sip_params.len>0) + return th_get_param_value(&puri.sip_params, name, value); + return th_get_param_value(&puri.params, name, value); } int th_get_uri_type(str *uri, int *mode, str *value) { - struct sip_uri puri; + sip_uri_t puri; int ret; str r2 = {"r2", 2};

1 0

git:master:464bf617: textops: set the buffer size for re transformation to 8196
by Daniel-Constantin Mierla 14 Jul '18

14 Jul '18

Module: kamailio Branch: master Commit: 464bf61788e86551509c08e07f9eed2a9bba0b58 URL: https://github.com/kamailio/kamailio/commit/464bf61788e86551509c08e07f9eed2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-14T08:14:07+02:00 textops: set the buffer size for re transformation to 8196 - 2048 is rather small for handlin message body - reported by #1592 --- Modified: src/modules/textops/txt_var.c --- Diff: https://github.com/kamailio/kamailio/commit/464bf61788e86551509c08e07f9eed2… Patch: https://github.com/kamailio/kamailio/commit/464bf61788e86551509c08e07f9eed2… --- diff --git a/src/modules/textops/txt_var.c b/src/modules/textops/txt_var.c index 6970b66bc7..c4d777e6a6 100644 --- a/src/modules/textops/txt_var.c +++ b/src/modules/textops/txt_var.c @@ -45,13 +45,13 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, struct subst_expr *se = NULL; int nmatches; str* result; -#define TR_TXT_BUF_SIZE 2048 +#define TR_TXT_BUF_SIZE 8192 static char tr_txt_buf[TR_TXT_BUF_SIZE]; pv_value_t v; if(val==NULL || (!(val->flags&PV_VAL_STR)) || val->rs.len<=0) return -1; - + switch(subtype) { case TR_TXT_RE_SUBST:

1 0

git:master:1a20bcaa: core: mem - added shm_address_in(p)
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: 1a20bcaa35db4aa80d6460dfb0fb9c70026248c9 URL: https://github.com/kamailio/kamailio/commit/1a20bcaa35db4aa80d6460dfb0fb9c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T14:05:27+02:00 core: mem - added shm_address_in(p) - return 1 if pointer p is inside shared memory zone, 0 otherwise --- Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/1a20bcaa35db4aa80d6460dfb0fb9c7… Patch: https://github.com/kamailio/kamailio/commit/1a20bcaa35db4aa80d6460dfb0fb9c7… --- diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index 3dbc34f11a..2cecb1110e 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -165,6 +165,28 @@ void* shm_core_get_pool(void) return _shm_core_pools_mem[0]; } +/** + * + */ +int shm_address_in(void *p) +{ + int i; + + for(i = 0; i < _shm_core_pools_num; i++) { + if(_shm_core_pools_mem[i] == (void *)-1) { + continue; + } + if(((char*)p >= (char*)_shm_core_pools_mem[i]) + && ((char*)p < ((char*)_shm_core_pools_mem[i]) + shm_mem_size)) { + /* address in shm zone */ + return 1; + } + } + + /* address not in shm zone */ + return 0; +} + /** * */ diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 5d58071359..e36a94accc 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -86,6 +86,8 @@ int shm_init_manager(char *name); void shm_destroy_manager(void); void shm_print_manager(void); +int shm_address_in(void *p); + #define shm_available_safe() shm_available() #define shm_malloc_on_fork() do{}while(0)

1 0

git:master:74dcbe87: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: 74dcbe875d3978ba7e16bb346ea8c034468237e0 URL: https://github.com/kamailio/kamailio/commit/74dcbe875d3978ba7e16bb346ea8c03… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-13T13:01:44+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/74dcbe875d3978ba7e16bb346ea8c03… Patch: https://github.com/kamailio/kamailio/commit/74dcbe875d3978ba7e16bb346ea8c03…

1 0

git:master:8dd610ed: dialog: removed invalid closing section tag from previous commit
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: 8dd610eddca40810af92d2d7131e7e3dd8323554 URL: https://github.com/kamailio/kamailio/commit/8dd610eddca40810af92d2d7131e7e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T12:47:53+02:00 dialog: removed invalid closing section tag from previous commit --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8dd610eddca40810af92d2d7131e7e3… Patch: https://github.com/kamailio/kamailio/commit/8dd610eddca40810af92d2d7131e7e3… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 18a0e9b0a8..2240a72c85 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2601,7 +2601,6 @@ if(has_totag()) { ... </programlisting> </section> - </section> <section id="dlg.r.stats_active"> <title>dlg.stats_active</title>

1 0

git:master:3577cc94: textops: new function replace_hdrs_str()
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: 3577cc9497a0fcde5a3d004c74281bfbe75d8923 URL: https://github.com/kamailio/kamailio/commit/3577cc9497a0fcde5a3d004c74281bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T12:46:45+02:00 textops: new function replace_hdrs_str() - replace the matched string in the headers zone --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/3577cc9497a0fcde5a3d004c74281bf… Patch: https://github.com/kamailio/kamailio/commit/3577cc9497a0fcde5a3d004c74281bf… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cc08a96089..a986f78ed3 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -91,6 +91,7 @@ static int replace_f(struct sip_msg*, char*, char*); static int replace_str_f(struct sip_msg*, char*, char*, char*); static int replace_body_f(struct sip_msg*, char*, char*); static int replace_body_str_f(struct sip_msg*, char*, char*, char*); +static int replace_hdrs_str_f(struct sip_msg*, char*, char*, char*); static int replace_all_f(struct sip_msg*, char*, char*); static int replace_body_all_f(struct sip_msg*, char*, char*); static int replace_body_atonce_f(struct sip_msg*, char*, char*); @@ -189,6 +190,9 @@ static cmd_export_t cmds[]={ {"replace_body_str", (cmd_function)replace_body_str_f,3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"replace_hdrs_str", (cmd_function)replace_hdrs_str_f,3, + fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, {"replace_all", (cmd_function)replace_all_f, 2, fixup_regexp_none, fixup_free_regexp_none, ANY_ROUTE}, @@ -1010,6 +1014,50 @@ static int replace_body_str_f(sip_msg_t* msg, char* pmkey, char* prval, char* pr return ki_replace_body_str(msg, &mkey, &rval, &rmode); } +static int ki_replace_hdrs_str(sip_msg_t* msg, str* mkey, str* rval, str *rmode) +{ + str lbuf; + + if ( parse_headers(msg, HDR_EOH_F, 0)==-1 ) { + LM_ERR("failed to parse to end of headers\n"); + return -1; + } + + lbuf.s = get_header(msg); + lbuf.len = (int)(msg->unparsed - lbuf.s); + + if (lbuf.len==0) { + LM_DBG("message headers part has zero length\n"); + return -1; + } + + return ki_replace_str_helper(msg, &lbuf, mkey, rval, rmode); +} + +static int replace_hdrs_str_f(sip_msg_t* msg, char* pmkey, char* prval, char* prmode) +{ + str mkey; + str rval; + str rmode; + + if(fixup_get_svalue(msg, (gparam_t*)pmkey, &mkey)<0) { + LM_ERR("failed to get the matching string parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)prval, &rval)<0) { + LM_ERR("failed to get the replacement string parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)prmode, &rmode)<0) { + LM_ERR("failed to get the replacement mode parameter\n"); + return -1; + } + + return ki_replace_hdrs_str(msg, &mkey, &rval, &rmode); +} + /* sed-perl style re: s/regular expression/replacement/flags */ static int subst_helper_f(sip_msg_t* msg, struct subst_expr* se) { @@ -4420,6 +4468,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("replace_hdrs_str"), + SR_KEMIP_INT, ki_replace_hdrs_str, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("replace_body_all"), SR_KEMIP_INT, ki_replace_body_all, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:6c06e84d: textops: docs for replace_hdrs_str()
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: 6c06e84db693698dde6b7cd50aeffc111073f1a3 URL: https://github.com/kamailio/kamailio/commit/6c06e84db693698dde6b7cd50aeffc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T12:46:45+02:00 textops: docs for replace_hdrs_str() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c06e84db693698dde6b7cd50aeffc1… Patch: https://github.com/kamailio/kamailio/commit/6c06e84db693698dde6b7cd50aeffc1… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 7d7f2d62ce..6be825efc9 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -476,6 +476,44 @@ replace_body_str("&kamailio;", "&kamailio; SIP Proxy", "a"); </example> </section> + <section id="textops.f.replace_hdrs_str"> + <title> + <function moreinfo="none">replace_hdrs_str(match, repl, mode)</function> + </title> + <para> + Replaces the first or all occurrence of 'match' with 'repl' by doing + string comparison for matching. It is applied over the part with headers + of the SIP message. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>match</emphasis> - string to be matched. + </para> + </listitem> + <listitem> + <para><emphasis>repl</emphasis> - string to be used as replacement. + </para> + </listitem> + <listitem> + <para><emphasis>mode</emphasis> - 'f' - replace only first match; + 'a' - replace all matches. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>replace_hdrs_str</function> usage</title> + <programlisting format="linespecific"> +... +replace_hdrs_str("&kamailio;", "&kamailio; SIP Proxy", "a"); +... +</programlisting> + </example> + </section> + <section id="textops.f.subst"> <title> <function moreinfo="none">subst('/re/repl/flags')</function>

1 0

git:master:6d87a1ab: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: 6d87a1abacc1383c241f1aa9d3c6f1a182213273 URL: https://github.com/kamailio/kamailio/commit/6d87a1abacc1383c241f1aa9d3c6f1a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-13T12:31:43+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/6d87a1abacc1383c241f1aa9d3c6f1a… Patch: https://github.com/kamailio/kamailio/commit/6d87a1abacc1383c241f1aa9d3c6f1a…

1 0

git:master:ebb14906: dialog: new rpc command dlg.stats_active
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: ebb149066690f7d96f45e1639e0c5ca9616bbbe0 URL: https://github.com/kamailio/kamailio/commit/ebb149066690f7d96f45e1639e0c5ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T12:17:04+02:00 dialog: new rpc command dlg.stats_active - return stats about active dialogs by scanning internal hash table --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/ebb149066690f7d96f45e1639e0c5ca… Patch: https://github.com/kamailio/kamailio/commit/ebb149066690f7d96f45e1639e0c5ca… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7f6e692125..84262ea25f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2324,6 +2324,7 @@ static void rpc_profile_print_dlgs(rpc_t *rpc, void *c) { } return; } + static void rpc_dlg_bridge(rpc_t *rpc, void *c) { str from = {NULL,0}; str to = {NULL,0}; @@ -2362,6 +2363,60 @@ static void rpc_dlg_bridge(rpc_t *rpc, void *c) { dlg_bridge(&from, &to, &op, &bd); } +static const char *rpc_dlg_stats_active_doc[2] = { + "Get stats about active dialogs", 0 +}; + +/*! + * \brief Print stats of active dialogs + */ +static void rpc_dlg_stats_active(rpc_t *rpc, void *c) +{ + dlg_cell_t *dlg; + unsigned int i; + int dlg_starting = 0; + int dlg_connecting = 0; + int dlg_answering = 0; + int dlg_ongoing = 0; + void *h; + + for( i=0 ; i<d_table->size ; i++ ) { + dlg_lock( d_table, &(d_table->entries[i]) ); + + for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + switch(dlg->state) { + case DLG_STATE_UNCONFIRMED: + dlg_starting++; + break; + case DLG_STATE_EARLY: + dlg_connecting++; + break; + case DLG_STATE_CONFIRMED_NA: + dlg_answering++; + break; + case DLG_STATE_CONFIRMED: + dlg_ongoing++; + break; + default: + LM_DBG("not active - state: %d\n", dlg->state); + } + } + dlg_unlock( d_table, &(d_table->entries[i]) ); + } + + if (rpc->add(c, "{", &h) < 0) { + rpc->fault(c, 500, "Server failure"); + return; + } + + rpc->struct_add(h, "ddddd", + "starting", dlg_starting, + "connecting", dlg_connecting, + "answering", dlg_answering, + "ongoing", dlg_ongoing, + "all", dlg_starting + dlg_connecting + dlg_answering + dlg_ongoing); +} + static rpc_export_t rpc_methods[] = { {"dlg.list", rpc_print_dlgs, rpc_print_dlgs_doc, RET_ARRAY}, {"dlg.list_ctx", rpc_print_dlgs_ctx, rpc_print_dlgs_ctx_doc, RET_ARRAY}, @@ -2372,5 +2427,6 @@ static rpc_export_t rpc_methods[] = { {"dlg.profile_list", rpc_profile_print_dlgs, rpc_profile_print_dlgs_doc, RET_ARRAY}, {"dlg.bridge_dlg", rpc_dlg_bridge, rpc_dlg_bridge_doc, 0}, {"dlg.terminate_dlg", rpc_dlg_terminate_dlg, rpc_dlg_terminate_dlg_doc, 0}, + {"dlg.stats_active", rpc_dlg_stats_active, rpc_dlg_stats_active_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:c005354f: dialog: docs for rpc command dlg.stats_active
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: c005354f58c493250a3428c58ebeb8fc46e6a0b2 URL: https://github.com/kamailio/kamailio/commit/c005354f58c493250a3428c58ebeb8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T12:25:05+02:00 dialog: docs for rpc command dlg.stats_active --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c005354f58c493250a3428c58ebeb8f… Patch: https://github.com/kamailio/kamailio/commit/c005354f58c493250a3428c58ebeb8f… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 6d936491cb..18a0e9b0a8 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2603,6 +2603,45 @@ if(has_totag()) { </section> </section> + <section id="dlg.r.stats_active"> + <title>dlg.stats_active</title> + <para> + Get stats about active dialogs by scanning internal list of dialogs + (not relying on core stats framework). + </para> + <para>Name: <emphasis>dlg.stats_active</emphasis></para> + <para>Parameters: none.</para> + <para>Returned fields</para> + <itemizedlist> + <listitem><para> + <emphasis>starting</emphasis> - initial INVITE has been processed, + no ringing or 1xx has been received. + </para></listitem> + <listitem><para> + <emphasis>connecting</emphasis> - initial INVITE was forwarded + and rining or 1xx has been received. + </para></listitem> + <listitem><para> + <emphasis>answering</emphasis> - initial INVITE received 200ok, + but ACK was not handled yet. + </para></listitem> + <listitem><para> + <emphasis>ongoing</emphasis> - ongoing active dialog, after the + ACK was processed. + </para></listitem> + <listitem><para> + <emphasis>all</emphasis> - all active dialogs, respectively the + sum of the above values. + </para></listitem> + </itemizedlist> + <para>RPC Command Format:</para> + <programlisting format="linespecific"> +... +&kamcmd; dlg.stats_active +... + </programlisting> + </section> + </section> <section> <title>Exported Variables</title>

1 0

git:5.0:2e2c07a6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 Jul '18

13 Jul '18

Module: kamailio Branch: 5.0 Commit: 2e2c07a6340c4109f86afca277f9a01e8101adcb URL: https://github.com/kamailio/kamailio/commit/2e2c07a6340c4109f86afca277f9a01… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-13T11:46:35+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth_xkeys/README Modified: src/modules/dialog/README Modified: src/modules/mqueue/README Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/2e2c07a6340c4109f86afca277f9a01… Patch: https://github.com/kamailio/kamailio/commit/2e2c07a6340c4109f86afca277f9a01…

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

- URL: https://github.com/kamailio/kamailio/commit/605cf8658e4814ab09b708228618e69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:36:47+02:00 rtpengine: docs - updated some of rtpproxy occurences to rtpengine (cherry picked from commit 9383174b32b6b49dd9f0757450abadb45690515f) (cherry picked from commit 00419fbc81795564f5e5a5363b6c081c02a9ad8d) - URL: https://github.com/kamailio/kamailio/commit/a87cf53c03736d1950715985e45e707… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:37:03+02:00 dispatcher: safety check for null value of attrs field in database (cherry picked from commit f3f14c6d85a7055c3a729ec46b83ff2a179ac397) (cherry picked from commit 9ee7fc5767ffe77932c30962be934a0fb62d22bc) - URL: https://github.com/kamailio/kamailio/commit/6c47da40f0fde86eaf31e763663fe80… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-07-13T11:37:17+02:00 rtpproxy: mark RPC call with proper tag and small typo fix (cherry picked from commit 21c219bcdd3f74a029582cd353c5f91d91a46f3d) (cherry picked from commit a878d5f332688c19d027fc2d085d7221441f0017) - URL: https://github.com/kamailio/kamailio/commit/46257a48187dd5459763a6d3dd824c3… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-07-13T11:37:26+02:00 mqueue: fix typo in variable name documentation (cherry picked from commit 9ba37fd602a67066bd49f6959350ea1fd72d5e47) (cherry picked from commit a85f6b5e0918ee6ae3f9dabab185cc415c9bac13) - URL: https://github.com/kamailio/kamailio/commit/515f8867adc160b664d4b401e782d97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:37:43+02:00 jsonrpcc: init and update cfg framework for io handler process - GH #1520 (cherry picked from commit bb14964dd8337d0946c7e233ff3cc81f22e8e1bb) (cherry picked from commit 16071968ed45f7eaa9108c7148500c4d3964b744) - URL: https://github.com/kamailio/kamailio/commit/6cb0416d6239fd78d28a7d9b72858e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:37:58+02:00 auth_db: set id for section not title tag of is_subscriber() (cherry picked from commit 14180b449d8feb9ae9adcb74926d64138b7cd750) (cherry picked from commit 1da0a1b06a726e9e4e730f60a53975dcdab01e3e) - URL: https://github.com/kamailio/kamailio/commit/d9b90bfa5a7f20210fe50d631ee770c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:38:12+02:00 auth_xkeys: docs - fixed name of the function in example (cherry picked from commit 0d4f48d168167df5fc6be38721cab69115637dae) (cherry picked from commit 89f2e86bb2ace38b530b136edecae69052d3188a) - URL: https://github.com/kamailio/kamailio/commit/9fe2240fc100c51b7b4a483cb71b915… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:38:32+02:00 tm: more explicit debug message when not matching reply to transaction (cherry picked from commit 961c2b3df008bb6df78c2e62dc943ebacd4db9b2) (cherry picked from commit 269b338ab8aa5b9cbce236d2984d39d0e3930c75) - URL: https://github.com/kamailio/kamailio/commit/7003e7aea505e20fc5a8822ec083900… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:38:43+02:00 core: test if address for IPv6 is IP format in lump substitutions - reported by GH #1581 (cherry picked from commit 1d78456562418b785126af09761c12571ef2394d) (cherry picked from commit 0a0a1f4866c4e056b443546eda0c57437580e4cb) - URL: https://github.com/kamailio/kamailio/commit/73b749815cb8f9a8a5270128e820279… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:39:12+02:00 app_java: Makefile - condition on USE_GCJ to compile with gcc or not - GH #1487, patch built reusing part of the one from A. Messina - set USE_GCJ=yes if OS has GCC with Java compiler, by default it is USE_GCJ=no (gcc 7 has removed gcj) (cherry picked from commit 3422f3c87b9d19444723cf59d30665cb49019127) (cherry picked from commit e109819479b633e750a51006ec9fd4d14df35dcf) - URL: https://github.com/kamailio/kamailio/commit/645696a67b159d29e1fd5b475fc1989… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:39:21+02:00 app_java: Makefile - USE_GCJ set to yes - be compatible with current behavior to avoid breaking CI and package building procedures (cherry picked from commit 450649c417a4b1c149185d7d0bdac35e392a89c3) (cherry picked from commit d86806fbede06730c7a11dc8c0ad4b039dc77877) - URL: https://github.com/kamailio/kamailio/commit/ed100adc095487e9180b26502f9181a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:40:32+02:00 app_lua: restore top index to lua stack after executing a function - could be related to GH #1577 (cherry picked from commit eb96593d0f1bb60fe6e955daa1a1b91ef65c69bd) (cherry picked from commit e872f707b1dc92de2a1c45ccb7eb028eb84cf9f4) - URL: https://github.com/kamailio/kamailio/commit/47f13ee48960edb6f605459d092ee1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:40:47+02:00 app_jsdt: restore JS stack after executing a function (cherry picked from commit acb90b6634e65a21c655e9bb94c1af00c138e6d4) (cherry picked from commit 484d096020440fc0ee092e90639443846258ac89) - URL: https://github.com/kamailio/kamailio/commit/0c4ed189b94c4c28f95175b8467fc8a… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-07-13T11:41:24+02:00 app_lua: fixing bug for setting global table lua (cherry picked from commit ea390d69d946314f93bfeeef77b4421f0c04cba3) (cherry picked from commit 26d2c501a3dc101edb050ae59923c949c5dd8141) - URL: https://github.com/kamailio/kamailio/commit/4725253328cb49834824a18498f05cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:41:33+02:00 dialog: handle . for optional body parameter for rpc dlg.bridge_dlg - consider as parameter not provided and use the default SDP string - "" or "_" behaves as provided body is empty string and the request has no body (cherry picked from commit 832fcfd839a193e5631df6c8ff1d2a84565d3822) (cherry picked from commit 361d952da6878e236effa07c4f9ea484a8caa831) - URL: https://github.com/kamailio/kamailio/commit/0f41977dab41ae367ef1ba4b6ec53f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:41:44+02:00 dialog: docs - notes about special values for optional parameters (cherry picked from commit c0aa8ab52e635c8b3173fdef77b25925e44cd4d4) (cherry picked from commit dbeab12f6ebe7a5f5b03c283d86fff6257c781a3)

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

- URL: https://github.com/kamailio/kamailio/commit/00419fbc81795564f5e5a5363b6c081… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:00:57+02:00 rtpengine: docs - updated some of rtpproxy occurences to rtpengine (cherry picked from commit 9383174b32b6b49dd9f0757450abadb45690515f) - URL: https://github.com/kamailio/kamailio/commit/9ee7fc5767ffe77932c30962be934a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:04:35+02:00 dispatcher: safety check for null value of attrs field in database (cherry picked from commit f3f14c6d85a7055c3a729ec46b83ff2a179ac397) - URL: https://github.com/kamailio/kamailio/commit/a878d5f332688c19d027fc2d085d722… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-07-13T11:08:48+02:00 rtpproxy: mark RPC call with proper tag and small typo fix (cherry picked from commit 21c219bcdd3f74a029582cd353c5f91d91a46f3d) - URL: https://github.com/kamailio/kamailio/commit/a85f6b5e0918ee6ae3f9dabab185cc4… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-07-13T11:08:58+02:00 mqueue: fix typo in variable name documentation (cherry picked from commit 9ba37fd602a67066bd49f6959350ea1fd72d5e47) - URL: https://github.com/kamailio/kamailio/commit/c9e1fa657a58e0da9ad1261a8e6d832… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:15:06+02:00 topos: print warn message of missing record-route only for initial requests (cherry picked from commit ecfb1b6c9abcaa662155f67b56516fd2d0750fe7) - URL: https://github.com/kamailio/kamailio/commit/f9468e261824d340e6b3c7d3e1a9c2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:15:25+02:00 topos: debug log messages with linked contact addresses (cherry picked from commit 5bafb32fa3dd0aefdb5e0c1a8bbd94638fe1022d) - URL: https://github.com/kamailio/kamailio/commit/5223c83f255cf8a5333563cd954dde7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:15:57+02:00 app_lua: support for more combinations of functions with 4 params (cherry picked from commit 8ff9f0dc0c00e80ad3a9add41823ca3dc101b94e) - URL: https://github.com/kamailio/kamailio/commit/d305cffd0e688a22ea67bcdcfb00db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:08+02:00 app_python: support for more combinations of functions with 4 params (cherry picked from commit 3e7ff1f3613db1c5de559bbf259a621647a5424b) - URL: https://github.com/kamailio/kamailio/commit/16071968ed45f7eaa9108c7148500c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:21+02:00 jsonrpcc: init and update cfg framework for io handler process - GH #1520 (cherry picked from commit bb14964dd8337d0946c7e233ff3cc81f22e8e1bb) - URL: https://github.com/kamailio/kamailio/commit/6649720935317c128f3480929186baa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:32+02:00 app_jsdt: updated duktape js engine to v2.2.1 (cherry picked from commit 94ec7c778f0a98b91b6518575748875b6034edf0) - URL: https://github.com/kamailio/kamailio/commit/c9cf7771ff8745cfe7b18405079ec77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:42+02:00 app_jsdt: support for more combinations of fuctions with 4 params (cherry picked from commit ef90af6335d0f3d54686f6e039ff3bab4e5c4729) - URL: https://github.com/kamailio/kamailio/commit/2aa70f9669525354128a0d0010e5a0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:54+02:00 app_sqlang: support functions with more combinations of 4 params (cherry picked from commit 08f942c9efc4e898de3985d25379b88a9ffe73a4) - URL: https://github.com/kamailio/kamailio/commit/1da0a1b06a726e9e4e730f60a53975d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:17:35+02:00 auth_db: set id for section not title tag of is_subscriber() (cherry picked from commit 14180b449d8feb9ae9adcb74926d64138b7cd750) - URL: https://github.com/kamailio/kamailio/commit/89f2e86bb2ace38b530b136edecae69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:17:46+02:00 auth_xkeys: docs - fixed name of the function in example (cherry picked from commit 0d4f48d168167df5fc6be38721cab69115637dae) - URL: https://github.com/kamailio/kamailio/commit/269b338ab8aa5b9cbce236d2984d39d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:18:52+02:00 tm: more explicit debug message when not matching reply to transaction (cherry picked from commit 961c2b3df008bb6df78c2e62dc943ebacd4db9b2) - URL: https://github.com/kamailio/kamailio/commit/0a0a1f4866c4e056b443546eda0c574… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:19:52+02:00 core: test if address for IPv6 is IP format in lump substitutions - reported by GH #1581 (cherry picked from commit 1d78456562418b785126af09761c12571ef2394d) - URL: https://github.com/kamailio/kamailio/commit/40722d5ee5a31f60d3949d22fed02a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:20:56+02:00 INSTALL: removed notes for gentoo - GH #1530 (cherry picked from commit 94902f678ffa31fbb6f3a0231730d7d6bd2239a1) - URL: https://github.com/kamailio/kamailio/commit/e109819479b633e750a51006ec9fd4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:21:14+02:00 app_java: Makefile - condition on USE_GCJ to compile with gcc or not - GH #1487, patch built reusing part of the one from A. Messina - set USE_GCJ=yes if OS has GCC with Java compiler, by default it is USE_GCJ=no (gcc 7 has removed gcj) (cherry picked from commit 3422f3c87b9d19444723cf59d30665cb49019127) - URL: https://github.com/kamailio/kamailio/commit/d86806fbede06730c7a11dc8c0ad4b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:21:22+02:00 app_java: Makefile - USE_GCJ set to yes - be compatible with current behavior to avoid breaking CI and package building procedures (cherry picked from commit 450649c417a4b1c149185d7d0bdac35e392a89c3) - URL: https://github.com/kamailio/kamailio/commit/e2dc8ba6aa8be0a7074cecb5fc490fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:21:35+02:00 nat_traversal: use ipv6 address with surrounding square brackets in pv value (cherry picked from commit 7f034bf845eb65beaf2dc09594ab496998aa97a7) - URL: https://github.com/kamailio/kamailio/commit/e872f707b1dc92de2a1c45ccb7eb028… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:22:39+02:00 app_lua: restore top index to lua stack after executing a function - could be related to GH #1577 (cherry picked from commit eb96593d0f1bb60fe6e955daa1a1b91ef65c69bd) - URL: https://github.com/kamailio/kamailio/commit/484d096020440fc0ee092e906394438… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:22:50+02:00 app_jsdt: restore JS stack after executing a function (cherry picked from commit acb90b6634e65a21c655e9bb94c1af00c138e6d4) - URL: https://github.com/kamailio/kamailio/commit/3528c383f5288317ae6ec25fb0007c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:23:42+02:00 nathelper: safety check for sipping_from when building SIP keepalive request - reported by GH #1587 (cherry picked from commit ade1cad69b659e5b0923e548d3c04f550204e793) - URL: https://github.com/kamailio/kamailio/commit/2ef1a93369f8029e0f8afa16b6fa2cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:23:53+02:00 nathelper: send always SIP ping if ping_nated_only=0 and sipping_flag is set - reported by GH #1587 (cherry picked from commit 1be693d432cd0ec3ce2cd68847791689143ae351) - URL: https://github.com/kamailio/kamailio/commit/40b58e21d70689ed2cab45bf2788f19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:24:03+02:00 nathelper: docs - note about the behavior of ping_nated_only=0 with sipping_flag set (cherry picked from commit 8f7eca3cdadd42ae2bf30a603b5b50c95f33937e) - URL: https://github.com/kamailio/kamailio/commit/26d2c501a3dc101edb050ae59923c94… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-07-13T11:24:17+02:00 app_lua: fixing bug for setting global table lua (cherry picked from commit ea390d69d946314f93bfeeef77b4421f0c04cba3) - URL: https://github.com/kamailio/kamailio/commit/361d952da6878e236effa07c4f9ea48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:24:33+02:00 dialog: handle . for optional body parameter for rpc dlg.bridge_dlg - consider as parameter not provided and use the default SDP string - "" or "_" behaves as provided body is empty string and the request has no body (cherry picked from commit 832fcfd839a193e5631df6c8ff1d2a84565d3822) - URL: https://github.com/kamailio/kamailio/commit/dbeab12f6ebe7a5f5b03c283d86fff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:24:56+02:00 dialog: docs - notes about special values for optional parameters (cherry picked from commit c0aa8ab52e635c8b3173fdef77b25925e44cd4d4)

1 0

git:master:ce0a16b3: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: ce0a16b3426f500d66eb987ea9c0dd59f25018a4 URL: https://github.com/kamailio/kamailio/commit/ce0a16b3426f500d66eb987ea9c0dd5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-13T11:02:19+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/ce0a16b3426f500d66eb987ea9c0dd5… Patch: https://github.com/kamailio/kamailio/commit/ce0a16b3426f500d66eb987ea9c0dd5… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index a3baacf621..2a29057b6b 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2018,8 +2018,15 @@ kamcmd dlg.profile_list inbound_calls Parameters: * from - SIP address to initiate the call * to - SIP address to refer 'from' to - * op (optional) - outbound proxy SIP address - * body (optional) - SDP body for initial INVITE + * op (optional) - outbound proxy SIP address. If its value is set to + '.' (dot), then it is ignored (like it would not have been + provided). + * body (optional) - SDP body for initial INVITE. If its value is set + to '.' (dot), then it is ignored (like it would not have been + provided). If body is not set via RPC command parameter, then an + internal generated SDP with G711a and G711u is used. If its value + is set to '' (empty string) or '_' (underline), then the INVITE is + sent without an SDP body. RPC Command Format: ...

1 0

git:master:c0aa8ab5: dialog: docs - notes about special values for optional parameters
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: c0aa8ab52e635c8b3173fdef77b25925e44cd4d4 URL: https://github.com/kamailio/kamailio/commit/c0aa8ab52e635c8b3173fdef77b2592… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T10:46:48+02:00 dialog: docs - notes about special values for optional parameters --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c0aa8ab52e635c8b3173fdef77b2592… Patch: https://github.com/kamailio/kamailio/commit/c0aa8ab52e635c8b3173fdef77b2592… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index e1d2bc275d..6d936491cb 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2581,11 +2581,17 @@ if(has_totag()) { <emphasis>to</emphasis> - SIP address to refer 'from' to </para></listitem> <listitem><para> - <emphasis>op</emphasis> (optional) - outbound proxy SIP address + <emphasis>op</emphasis> (optional) - outbound proxy SIP address. + If its value is set to '.' (dot), then it is ignored (like it + would not have been provided). </para></listitem> <listitem><para> <emphasis>body</emphasis> (optional) - SDP body for initial - INVITE + INVITE. If its value is set to '.' (dot), then it is ignored + (like it would not have been provided). If body is not set via + RPC command parameter, then an internal generated SDP with G711a + and G711u is used. If its value is set to '' (empty string) or + '_' (underline), then the INVITE is sent without an SDP body. </para></listitem> </itemizedlist> <para>RPC Command Format:</para>

1 0

git:master:832fcfd8: dialog: handle . for optional body parameter for rpc dlg.bridge_dlg
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: 832fcfd839a193e5631df6c8ff1d2a84565d3822 URL: https://github.com/kamailio/kamailio/commit/832fcfd839a193e5631df6c8ff1d2a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T10:39:29+02:00 dialog: handle . for optional body parameter for rpc dlg.bridge_dlg - consider as parameter not provided and use the default SDP string - "" or "_" behaves as provided body is empty string and the request has no body --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_transfer.c --- Diff: https://github.com/kamailio/kamailio/commit/832fcfd839a193e5631df6c8ff1d2a8… Patch: https://github.com/kamailio/kamailio/commit/832fcfd839a193e5631df6c8ff1d2a8… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 83883a4fac..7f6e692125 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2348,6 +2348,14 @@ static void rpc_dlg_bridge(rpc_t *rpc, void *c) { if(rpc->scan(c, "*S", &bd)<1) { bd.s = NULL; bd.len = 0; + } else { + if(bd.len==1 && *bd.s=='.') { + bd.s = NULL; + bd.len = 0; + } else if(bd.len==1 && *bd.s=='_') { + bd.s = ""; + bd.len = 0; + } } } diff --git a/src/modules/dialog/dlg_transfer.c b/src/modules/dialog/dlg_transfer.c index 74d43726ad..f3e594bcbe 100644 --- a/src/modules/dialog/dlg_transfer.c +++ b/src/modules/dialog/dlg_transfer.c @@ -357,7 +357,7 @@ int dlg_bridge(str *from, str *to, str *op, str *bd) LM_DBG("bridge <%.*s> to <%.*s>\n", dtc->from.len, dtc->from.s, dtc->to.len, dtc->to.s); - if(bd!=NULL && bd->s!=NULL && bd->len>0) { + if(bd!=NULL && bd->s!=NULL) { s_body.s = bd->s; s_body.len = bd->len; } else {

1 0

git:master:ab6f9d54: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: ab6f9d54084d8c91939864c758ffd2fcb750c8f9 URL: https://github.com/kamailio/kamailio/commit/ab6f9d54084d8c91939864c758ffd2f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-12T19:31:28+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/ab6f9d54084d8c91939864c758ffd2f… Patch: https://github.com/kamailio/kamailio/commit/ab6f9d54084d8c91939864c758ffd2f…

1 0

git:master:b1535317: textops: docs for replace_body_str(...)
by Daniel-Constantin Mierla 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: b15353177f9acb8a52941f073c360753f0138145 URL: https://github.com/kamailio/kamailio/commit/b15353177f9acb8a52941f073c36075… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-12T16:27:24+02:00 textops: docs for replace_body_str(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b15353177f9acb8a52941f073c36075… Patch: https://github.com/kamailio/kamailio/commit/b15353177f9acb8a52941f073c36075… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 3e62d7ac44..7d7f2d62ce 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -439,6 +439,43 @@ replace_str("&kamailio;", "&kamailio; SIP Proxy", "a"); </example> </section> + <section id="textops.f.replace_body_str"> + <title> + <function moreinfo="none">replace_body_str(match, repl, mode)</function> + </title> + <para> + Replaces the first or all occurrence of 'match' with 'repl' by doing + string comparison for matching. It is applied over the message body. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>match</emphasis> - string to be matched. + </para> + </listitem> + <listitem> + <para><emphasis>repl</emphasis> - string to be used as replacement. + </para> + </listitem> + <listitem> + <para><emphasis>mode</emphasis> - 'f' - replace only first match; + 'a' - replace all matches. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>replace_body_str</function> usage</title> + <programlisting format="linespecific"> +... +replace_body_str("&kamailio;", "&kamailio; SIP Proxy", "a"); +... +</programlisting> + </example> + </section> + <section id="textops.f.subst"> <title> <function moreinfo="none">subst('/re/repl/flags')</function>

1 0

git:master:6c1ec5fd: textops: new function replace_body_str(mkey, rval, rmode)
by Daniel-Constantin Mierla 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: 6c1ec5fd0bb9abcfefd14a46ad3801cfb2ba36a3 URL: https://github.com/kamailio/kamailio/commit/6c1ec5fd0bb9abcfefd14a46ad3801c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-12T16:24:30+02:00 textops: new function replace_body_str(mkey, rval, rmode) - replace a string inside message body --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/6c1ec5fd0bb9abcfefd14a46ad3801c… Patch: https://github.com/kamailio/kamailio/commit/6c1ec5fd0bb9abcfefd14a46ad3801c…

1 0

git:master:48524f0c: permissions: exported allow_address_group() to kemi framework
by Daniel-Constantin Mierla 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: 48524f0ce8934c4f6a46b38a1af1fff92078eb3d URL: https://github.com/kamailio/kamailio/commit/48524f0ce8934c4f6a46b38a1af1fff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-12T15:58:13+02:00 permissions: exported allow_address_group() to kemi framework --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/address.h Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/48524f0ce8934c4f6a46b38a1af1fff… Patch: https://github.com/kamailio/kamailio/commit/48524f0ce8934c4f6a46b38a1af1fff… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 141806edf0..cc447deaf6 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -565,50 +565,37 @@ int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2) * subnet table in any group. If yes, returns that group. If not returns -1. * Port value 0 in cached address and group table matches any port. */ -int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port) +int ki_allow_address_group(sip_msg_t* _msg, str* _addr, int _port) { int group = -1; - unsigned int port; - str ips; ip_addr_t *ipa; - if (_addr==NULL - || (fixup_get_svalue(_msg, (gparam_p)_addr, &ips) < 0)) { - LM_ERR("cannot get value of address pvar\n"); - return -1; - } - if (_port==NULL - || (fixup_get_ivalue(_msg, (gparam_p)_port, (int*)&port) < 0)) { - LM_ERR("cannot get value of port pvar\n"); - return -1; - } - - ipa=strtoipX(&ips); + ipa=strtoipX(_addr); if ( ipa ) { LM_DBG("looking for <%.*s, %u> in address table\n", - ips.len, ips.s, port); + _addr->len, _addr->s, (unsigned int)_port); if(addr_hash_table) { group = find_group_in_addr_hash_table(*addr_hash_table, - ipa, port); + ipa, (unsigned int)_port); LM_DBG("Found address in group <%d>\n", group); if (group != -1) return group; } if(subnet_table) { LM_DBG("looking for <%.*s, %u> in subnet table\n", - ips.len, ips.s, port); + _addr->len, _addr->s, _port); group = find_group_in_subnet_table(*subnet_table, - ipa, port); + ipa, (unsigned int)_port); LM_DBG("Found a match of subnet in group <%d>\n", group); } } else { LM_DBG("looking for <%.*s, %u> in domain_name table\n", - ips.len, ips.s, port); + _addr->len, _addr->s, (unsigned int)_port); if(domain_list_table) { group = find_group_in_domain_name_table(*domain_list_table, - &ips, port); + _addr, (unsigned int)_port); LM_DBG("Found a match of domain_name in group <%d>\n", group); } } @@ -616,3 +603,22 @@ int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port) LM_DBG("Found <%d>\n", group); return group; } + +int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port) +{ + int port; + str ips; + + if (_addr==NULL + || (fixup_get_svalue(_msg, (gparam_p)_addr, &ips) < 0)) { + LM_ERR("cannot get value of address pvar\n"); + return -1; + } + if (_port==NULL + || (fixup_get_ivalue(_msg, (gparam_p)_port, &port) < 0)) { + LM_ERR("cannot get value of port pvar\n"); + return -1; + } + + return ki_allow_address_group(_msg, &ips, port); +} \ No newline at end of file diff --git a/src/modules/permissions/address.h b/src/modules/permissions/address.h index cc4652a0bc..5693ce14ce 100644 --- a/src/modules/permissions/address.h +++ b/src/modules/permissions/address.h @@ -97,4 +97,6 @@ int ki_allow_source_address_group(sip_msg_t* _msg); */ int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port); +int ki_allow_address_group(sip_msg_t* _msg, str* _addr, int _port); + #endif /* ADDRESS_H */ diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 822aad5e91..7f2194d595 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1041,6 +1041,11 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("permissions"), str_init("allow_address_group"), + SR_KEMIP_INT, ki_allow_address_group, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:e7734e60: Merge pull request #1590 from surendratiwari3/app_lua_child_fix
by GitHub 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: e7734e604fc7b0e6cc24454b53c9670c91ce5c05 URL: https://github.com/kamailio/kamailio/commit/e7734e604fc7b0e6cc24454b53c9670… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-07-12T15:47:09+02:00 Merge pull request #1590 from surendratiwari3/app_lua_child_fix app_lua : fixing bug for setting set SR lib version for lua 52 --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e7734e604fc7b0e6cc24454b53c9670… Patch: https://github.com/kamailio/kamailio/commit/e7734e604fc7b0e6cc24454b53c9670… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 97d141cd22..8fe8a22569 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -297,8 +297,8 @@ int lua_sr_init_child(void) /* set SR lib version */ #if LUA_VERSION_NUM >= 502 - lua_pushstring(_sr_L_env.L, SRVERSION); - lua_setglobal(_sr_L_env.L, "SRVERSION"); + lua_pushstring(_sr_L_env.LL, SRVERSION); + lua_setglobal(_sr_L_env.LL, "SRVERSION"); #else lua_pushstring(_sr_L_env.LL, "SRVERSION"); lua_pushstring(_sr_L_env.LL, SRVERSION);

1 0

[kamailio/kamailio] app_lua : fixing bug for setting set SR lib version for lua 52 (#1590)
by Surendra Tiwari 12 Jul '18

12 Jul '18

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1590 -- Commit Summary -- * fixing bug for setting global table lua -- File Changes -- M src/modules/app_lua/app_lua_api.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1590.patch https://github.com/kamailio/kamailio/pull/1590.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/1590

2 4

git:master:ea390d69: app_lua: fixing bug for setting global table lua
by surendratiwari3 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: ea390d69d946314f93bfeeef77b4421f0c04cba3 URL: https://github.com/kamailio/kamailio/commit/ea390d69d946314f93bfeeef77b4421… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Committer: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-07-12T13:07:09Z app_lua: fixing bug for setting global table lua --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/ea390d69d946314f93bfeeef77b4421… Patch: https://github.com/kamailio/kamailio/commit/ea390d69d946314f93bfeeef77b4421… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 7f0fd1fbc0..122c212da3 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -297,8 +297,8 @@ int lua_sr_init_child(void) /* set SR lib version */ #if LUA_VERSION_NUM >= 502 - lua_pushstring(_sr_L_env.L, SRVERSION); - lua_setglobal(_sr_L_env.L, "SRVERSION"); + lua_pushstring(_sr_L_env.LL, SRVERSION); + lua_setglobal(_sr_L_env.LL, "SRVERSION"); #else lua_pushstring(_sr_L_env.LL, "SRVERSION"); lua_pushstring(_sr_L_env.LL, SRVERSION);

1 0

[kamailio/kamailio] nathelper always sends SIP pings in IPv6 scenario (#1587)
by Sebastian Damm 12 Jul '18

12 Jul '18

### Description We upgraded from Kamailio 4.4.5 to 5.1.4 today. We have a IPv6-to-v4 loadbalancer which sends out NAT pings to keep the connection through routers alive. So it is not a real NAT scenario. Kamailio 4.4.5 sent out dummy 4-byte UDP packets. Kamailio 5.1.4 sends out SIP OPTIONS although we didn't even configure sipping_from. Our configuration: ``` loadmodule "nathelper.so" modparam("nathelper", "received_avp", "$(avp(i:801))") modparam("nathelper", "natping_interval" , 14) modparam("nathelper", "ping_nated_only" , 0) ``` When looking into the code, Kamailio should not even be able to send out OPTIONS without sipping_from being configured. It does anyhow. This results in broken keepalive packets. ``` OPTIONS sip:foobar@[2003:a:c6b:8400:204:aaaa:bbbb:cccc]:6060;transport=udp;line=s4cqtu SIP/2.0. Via: SIP/2.0/UDP [2001:AB7:0:0:0:0:0:1]:5060;branch=z9hG4bK9474521. From: ;tag=uloc-5b2b6211-355f-81fc4-3f1f9b57-6a9dc2. To: sip:foobar@[2003:a:c6b:8400:204:aaaa:bbbb:cccc]:6060;transport=udp;line=s4cqtu. Call-ID: -6a9dc2-cac4404@2001:AB7:0:0:0:0:0:1. CSeq: 1 OPTIONS. Content-Length: 0. .``` Those packets get rejected by some clients, bringing them offline, effectively. After adding the sipping_from modparam, those OPTIONS get sent with a correct From header. ### Troubleshooting #### Reproduction Our v4-only SIP proxies don't show the behavior, our v6-to-v4 loadbalancers do. I don't know if this can be reproduced with a default installation on a IPv6 setup. #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions Setting the sipping_from parameter at least fixes the OPTIONS packet. But we found no way to send those dummy UDP packets instead of full OPTIONS. ### Additional Information Kamailio branch 5.1 pulled yesterday, 5.1.4 * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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 with gcc 4.7.2 ``` * **Operating System**:  ``` Debian Wheezy, Linux hostname 3.2.0-5-amd64 #1 SMP Debian 3.2.96-3 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/1587

2 4

[kamailio/kamailio] Problem with IPv6, TLS and advertise param (#1581)
by Joel Serrano 11 Jul '18

11 Jul '18

### Description We want to be able to handle reINVITEs over TLS so calls can reconnect when they switch networks (for example from wifi to mobile data). We have the following config in kamailio.cfg: ``` listen=tls:1.1.1.1:443 advertise sbc01.domain.com:443 listen=tls:[AAAA:BBBB:CCCC:DDDD:EEEE:FFFF:GGGG:HHHH]:443 advertise sbc01.domain.com:443 listen=udp:1.1.1.1:5060 ``` In order to not break TLS validation (certs) we set the advertise to the FQDN so all headers are set with the FQDN and not the IP address, also notice no `[]` in the FQDN part of advertise IPv6 line. We do this, because we found that without the advertise, all headers have the IP address, which is also OK, but if the TCP connection breaks and the client reconnects, it will send the connection to the top request-route header, if it's an IP, the TLS validation will beak because the cn= doesn't match, having the FQDN there, the cn= will match and the request will continue. Example scenario: * IPv4 call: Our public domain is `sip.domain.com` that has SRV records pointing to `sbc01.domain.com` and `sbc02.domain.com`. For this example let's stick to `sbc01.domain.com`. Kamailio: 1.1.1.1 / sbc01.domain.com Media server: 2.2.2.2 Client <---TLS 443---> Kamailio <---UDP 5060---> Media server Example call: ![image](https://user-images.githubusercontent.com/16212586/42248688-cce7915c-7edb-11e8-84e8-f1917a6da7a4.png) Let's focus on the INVITE that Kamailio sends to the media server (the *blue* INVITE in the screenshot) The headers look like this: ``` INVITE sip:test@2.2.2.2:5060 SIP/2.0 Record-Route: <sip:1.1.1.1;r2=on;lr=on;ftag=eTdR161Ub;did=916.2391;nat=yes> Record-Route: <sip:sbc01.domain.com:443;transport=tls;r2=on;lr=on;ftag=eTdR161Ub;did=916.2391;nat=yes> ... ``` Which is correct, if the client has to send a reINVITE, it will do a DNS request to sbc01.domain.com and depending if it has AAAA and A records, and what the client's current transport is (ipv6/ipv4) it will select and use what it needs. ..Now let's say the same scenario, but origin transport is IPv6 this time.. * IPv6 call: Same scenario as above, same invite, this time the headers look like this: ``` INVITE sip:test@2.2.2.2:5060 SIP/2.0 Record-Route: <sip:1.1.1.1;r2=on;lr=on;ftag=iMwhZbnTA;did=fda.2803> Record-Route: <sip:[sbc01.domain.com]:443;transport=tls;r2=on;lr=on;ftag=iMwhZbnTA;did=fda.2803> ``` (notice the FQDN surrounded by `[]`) #### Reproduction Add the `advertise` option on a `listen=` param with transport tls and using an IPv6. Observe the format of the headers the `record_route()` function adds to the request. ### Possible Solutions When setting a FQDN instead of an IP address (v4/v6) in the `advertise` option; never enclose it with `[]` ? It's a suggestion, maybe what I'm saying is completely nuts. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.1.4 (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 with gcc 6.3.0 ``` * **Operating System**: ``` OS: Debian stretch 9.4 Kernel: Linux kamailio 4.9.0-6-amd64 #1 SMP Debian 4.9.88-1+deb9u1 (2018-05-07) 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/1581

2 4

[kamailio/kamailio] tls: much faster startup using shared SSL_CTX (#1585)
by Julien Chavanton 11 Jul '18

11 Jul '18

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) - [x] Optimization #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Kamailio TLS mod_init is creating one SSL_CTX, per process, some of the fonctions are taking between 1-3 seconds to execute, this is slowing down the startup sequence greatly. ``` SSL_CTX_load_verify_locations SSL_CTX_set_client_CA_list // list sent to the client SSL_load_client_CA_file SSL_CTX_get_client_CA_list ``` In fact it is safe to share the SSL_CTX since it is only used to store settings that will be used to internalize new structure, see the documentation reference : ``` tls: faster startup using shared SSL_CTX https://www.openssl.org/docs/man1.1.1/man7/ssl.html SSL_CTX (SSL Context) This is the global context structure which is created by a server or client once per program life-time and which holds mainly default values for the SSL structures which are later created for the connections. ``` I load tested this with 1000 TLS connections. We could push the refactoring further, this simple modification as a huge impact since the functions are now called only once per SSL / SNI, not per process ... You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1585 -- Commit Summary -- * tls: faster startup using shared SSL_CTX -- File Changes -- M src/modules/tls/tls_domain.c (29) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1585.patch https://github.com/kamailio/kamailio/pull/1585.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/1585

2 6

git:master:ab118fab: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: ab118fab76bc38abf245f7e3f19741489201defc URL: https://github.com/kamailio/kamailio/commit/ab118fab76bc38abf245f7e3f197414… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-11T18:46:24+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/ab118fab76bc38abf245f7e3f197414… Patch: https://github.com/kamailio/kamailio/commit/ab118fab76bc38abf245f7e3f197414… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index f21f198336..2e09145288 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -279,8 +279,12 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) - If this variable is set then only contacts that have “behind_NAT” flag - in user location database set will get ping. + If this parameter is set to 1 then only contacts that have “behind_NAT” + flag in user location database set will get ping. + + If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is + sent to all contacts. If it is 0 and sipping_flag parameter is set, + then SIP-request-based pinging is sent to all contacts. Default value is 0.

1 0

git:master:8f7eca3c: nathelper: docs - note about the behavior of ping_nated_only=0 with sipping_flag set
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 8f7eca3cdadd42ae2bf30a603b5b50c95f33937e URL: https://github.com/kamailio/kamailio/commit/8f7eca3cdadd42ae2bf30a603b5b50c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T18:39:19+02:00 nathelper: docs - note about the behavior of ping_nated_only=0 with sipping_flag set --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8f7eca3cdadd42ae2bf30a603b5b50c… Patch: https://github.com/kamailio/kamailio/commit/8f7eca3cdadd42ae2bf30a603b5b50c… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 975f579d93..e3c47e2d70 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -172,11 +172,16 @@ modparam("nathelper", "natping_interval", 10) <section id="nathelper.p.ping_nated_only"> <title><varname>ping_nated_only</varname> (integer)</title> <para> - If this variable is set then only contacts that have - <quote>behind_NAT</quote> flag in user location database set will + If this parameter is set to 1 then only contacts that have + <quote>behind_NAT</quote> flag in user location database set will get ping. </para> <para> + If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is + sent to all contacts. If it is 0 and sipping_flag parameter is set, then + SIP-request-based pinging is sent to all contacts. + </para> + <para> <emphasis> Default value is 0. </emphasis>

1 0

git:master:1be693d4: nathelper: send always SIP ping if ping_nated_only=0 and sipping_flag is set
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 1be693d432cd0ec3ce2cd68847791689143ae351 URL: https://github.com/kamailio/kamailio/commit/1be693d432cd0ec3ce2cd6884779168… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T18:27:08+02:00 nathelper: send always SIP ping if ping_nated_only=0 and sipping_flag is set - reported by GH #1587 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/1be693d432cd0ec3ce2cd6884779168… Patch: https://github.com/kamailio/kamailio/commit/1be693d432cd0ec3ce2cd6884779168… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 5382d4c6b8..b9d9d622b3 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1921,7 +1921,7 @@ static void nh_timer(unsigned int ticks, void *timer_idx) unsigned int path_ip = 0; unsigned short path_port = 0; int options = 0; - int should_send_ping = 0; + int send_sip_ping = 0; if((*natping_state) == 0) goto done; @@ -2060,9 +2060,11 @@ static void nh_timer(unsigned int ticks, void *timer_idx) dst.proto = PROTO_UDP; dst.send_sock = send_sock; - should_send_ping = (flags & sipping_flag) != 0 || ping_nated_only == 0; + send_sip_ping = ((flags & sipping_flag) != 0) + || (ping_nated_only == 0 && sipping_flag != 0); - if ( should_send_ping && (opt.s = build_sipping(&c, send_sock, &path, &ruid, aorhash, &opt.len)) != 0) { + if ( send_sip_ping && (opt.s = build_sipping(&c, send_sock, &path, + &ruid, aorhash, &opt.len)) != 0) { if(udp_send(&dst, opt.s, opt.len) < 0) { LM_ERR("sip udp_send failed\n"); }

1 0

[kamailio/kamailio] Modules: Evapi async_relay export to kemi (#1563)
by Surendra Tiwari 11 Jul '18

11 Jul '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 evapi_async_relay is exported to kemi interface You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1563 -- Commit Summary -- * Modules: Evapi async_relay export to kemi -- File Changes -- M src/modules/evapi/evapi_mod.c (56) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1563.patch https://github.com/kamailio/kamailio/pull/1563.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/1563

2 6

[kamailio/kamailio] Module: rr adding is_direction to kemi (#1589)
by Surendra Tiwari 11 Jul '18

11 Jul '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 is_direction("string") method added to kemi.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1589 -- Commit Summary -- * adding is_direction to kemi -- File Changes -- M src/modules/rr/rr_mod.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1589.patch https://github.com/kamailio/kamailio/pull/1589.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/1589

2 3

[kamailio/kamailio] Modules: sdpops export sdp_get_line_startswith (#1558)
by Surendra Tiwari 11 Jul '18

11 Jul '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 Exporting the sdp_get_line_startswith function to KSR You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1558 -- Commit Summary -- * Modules: sdpops export sdp_get_line_startswith -- File Changes -- M src/modules/sdpops/sdpops_mod.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1558.patch https://github.com/kamailio/kamailio/pull/1558.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/1558

2 5

git:master:3806ca12: rr: exported is_direction() to kemi framework
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 3806ca121194d54bbd03ff257ec62505b15d0941 URL: https://github.com/kamailio/kamailio/commit/3806ca121194d54bbd03ff257ec6250… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T18:01:48+02:00 rr: exported is_direction() to kemi framework - rework of the patch from GH #1589 --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3806ca121194d54bbd03ff257ec6250… Patch: https://github.com/kamailio/kamailio/commit/3806ca121194d54bbd03ff257ec6250… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index eac10d272b..36b1c046a8 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -418,6 +418,28 @@ static int w_is_direction(struct sip_msg *msg,char *dir, char *foo) return ((is_direction(msg,(int)(long)dir)==0)?1:-1); } +static int ki_is_direction(sip_msg_t *msg, str *dir) +{ + int n; + + if (!append_fromtag) { + LM_ERR("usage of \"is_direction\" function requires parameter" + "\"append_fromtag\" enabled!!"); + return E_CFG; + } + + if (dir->len==10 && strncasecmp(dir->s, "downstream", 10)==0) { + n = RR_FLOW_DOWNSTREAM; + } else if (dir->len==8 && strncasecmp(dir->s, "upstream", 8)==0) { + n = RR_FLOW_UPSTREAM; + } else { + LM_ERR("unknown direction '%.*s' - use 'downstream' or 'upstream'\n", + dir->len, dir->s); + return E_CFG; + } + + return ((is_direction(msg,n)==0)?1:-1); +} /* * Return the URI of the topmost Route-Header. @@ -720,7 +742,11 @@ static sr_kemi_t sr_kemi_rr_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - + { str_init("rr"), str_init("is_direction"), + SR_KEMIP_INT, ki_is_direction, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:20ebfcf3: permissions: exported allow_source_address_group() to kemi framework
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 20ebfcf3156912d83c087156ec3e8eb15ae26c25 URL: https://github.com/kamailio/kamailio/commit/20ebfcf3156912d83c087156ec3e8eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T15:25:56+02:00 permissions: exported allow_source_address_group() to kemi framework --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/address.h Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/20ebfcf3156912d83c087156ec3e8eb… Patch: https://github.com/kamailio/kamailio/commit/20ebfcf3156912d83c087156ec3e8eb… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 42418b96f8..141806edf0 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -525,7 +525,7 @@ int w_allow_source_address(struct sip_msg* _msg, char* _addr_group, char* _str2) * subnet table in any group. If yes, returns that group. If not returns -1. * Port value 0 in cached address and group table matches any port. */ -int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2) +int ki_allow_source_address_group(sip_msg_t* _msg) { int group = -1; @@ -550,6 +550,16 @@ int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2) } +/* + * Checks if source address/port is found in cached address or + * subnet table in any group. If yes, returns that group. If not returns -1. + * Port value 0 in cached address and group table matches any port. + */ +int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2) +{ + return ki_allow_source_address_group(_msg); +} + /* * Checks if address/port is found in cached address or * subnet table in any group. If yes, returns that group. If not returns -1. diff --git a/src/modules/permissions/address.h b/src/modules/permissions/address.h index a4d12b8350..cc4652a0bc 100644 --- a/src/modules/permissions/address.h +++ b/src/modules/permissions/address.h @@ -88,6 +88,7 @@ int w_allow_source_address(struct sip_msg* _msg, char* _addr_group, char* _str2) */ int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2); +int ki_allow_source_address_group(sip_msg_t* _msg); /* * Checks if address/port is found in cached address or diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 707ccd315b..822aad5e91 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1036,6 +1036,11 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("permissions"), str_init("allow_source_address_group"), + SR_KEMIP_INT, ki_allow_source_address_group, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:ade1cad6: nathelper: safety check for sipping_from when building SIP keepalive request
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: ade1cad69b659e5b0923e548d3c04f550204e793 URL: https://github.com/kamailio/kamailio/commit/ade1cad69b659e5b0923e548d3c04f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T15:25:56+02:00 nathelper: safety check for sipping_from when building SIP keepalive request - reported by GH #1587 --- Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/ade1cad69b659e5b0923e548d3c04f5… Patch: https://github.com/kamailio/kamailio/commit/ade1cad69b659e5b0923e548d3c04f5… --- diff --git a/src/modules/nathelper/sip_pinger.h b/src/modules/nathelper/sip_pinger.h index 4277b407e2..23ea633d03 100644 --- a/src/modules/nathelper/sip_pinger.h +++ b/src/modules/nathelper/sip_pinger.h @@ -127,6 +127,10 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, str vaddr; str vport; + if(sipping_from.s==NULL || sipping_from.len<=0) { + LM_WARN("SIP ping enabled but no SIP ping From address\n"); + return NULL; + } if(s->useinfo.name.len > 0) vaddr = s->useinfo.name; else @@ -206,4 +210,4 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, return buf; } -#endif \ No newline at end of file +#endif

1 0

[kamailio/kamailio] Modules: rr adding is_direction to kemi (#1588)
by Surendra Tiwari 11 Jul '18

11 Jul '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 is_direction(string) method is imported to kemi app_lua. this method will help to identify the direction of subsequent request.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1588 -- Commit Summary -- * Modules: rr adding is_direction to kemi -- File Changes -- M src/modules/rr/rr_mod.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1588.patch https://github.com/kamailio/kamailio/pull/1588.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/1588

1 1

git:5.1:933660b7: usrloc: fix RPC ul.add optional received param value when unset
by Victor Seva 11 Jul '18

11 Jul '18

Module: kamailio Branch: 5.1 Commit: 933660b707b6b31272a3ca93cba67e3c2798b708 URL: https://github.com/kamailio/kamailio/commit/933660b707b6b31272a3ca93cba67e3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-07-11T11:48:42+02:00 usrloc: fix RPC ul.add optional received param value when unset fix #1586 (cherry picked from commit 9ede3f273b4e478b875369da5b92ff963ee21573) --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/933660b707b6b31272a3ca93cba67e3… Patch: https://github.com/kamailio/kamailio/commit/933660b707b6b31272a3ca93cba67e3… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 1231d4fc8a..ead017a590 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -600,6 +600,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) str aor = {0, 0}; str contact = {0, 0}; str path = {0, 0}; + str received = {0, 0}; str socket = {0, 0}; str temp = {0, 0}; double dtemp; @@ -612,7 +613,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) memset(&ci, 0, sizeof(ucontact_info_t)); ret = rpc->scan(ctx, "SSSdfSddd*SS", &table, &aor, &contact, &ci.expires, - &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &ci.received, + &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &received, &socket); if (ret < 9) { LM_ERR("not enough parameters - read so far: %d\n", ret); @@ -626,9 +627,9 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } if(ret>9) { /* received parameter */ - if(!ul_rpc_is_param_set(&ci.received)) { - ci.received.s = 0; - ci.received.len = 0; + if(ul_rpc_is_param_set(&received)) { + ci.received.s = received.s; + ci.received.len = received.len; } } if(ret>10) {

1 0

git:master:a9a1dfb7: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: a9a1dfb7bdfab175153d1d0778752e6096651fe0 URL: https://github.com/kamailio/kamailio/commit/a9a1dfb7bdfab175153d1d0778752e6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-11T11:46:41+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/a9a1dfb7bdfab175153d1d0778752e6… Patch: https://github.com/kamailio/kamailio/commit/a9a1dfb7bdfab175153d1d0778752e6… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 6e2e3b972d..8452d58fac 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -78,7 +78,7 @@ Emmanuel Schmidbauer 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, furi_pvar]) 5. RPC Commands @@ -183,7 +183,7 @@ Chapter 1. Admin Guide 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, furi_pvar]) 5. RPC Commands @@ -715,7 +715,7 @@ modparam("permissions", "load_backends", 1) 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, furi_pvar]) 4.1. allow_routing() @@ -948,19 +948,24 @@ if ($var(group) != -1) { }; ... -4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) +4.11. allow_trusted([src_ip_pvar, proto_pvar, furi_pvar]) Checks based either on request's source address and transport protocol or source address and transport protocol given in pvar arguments, and - From URI of request (or uri_pvar if provided) if request can be trusted - without authentication. Returns “1” if a match is found as described in - Section 1.5, “Trusted Requests” and “-1” otherwise. If a match is found - and peer_tag_avp has been defined, adds a non-NULL tag column value of - the matching peer to AVP peer_tag_avp. + From URI of request (or furi_pvar if provided) if request can be + trusted without authentication. Returns “1” if a match is found as + described in Section 1.5, “Trusted Requests” and “-1” otherwise. If a + match is found and peer_tag_avp has been defined, adds a non-NULL tag + column value of the matching peer to AVP peer_tag_avp. - Source address, transport protocol and uri given in pvar arguments must - be in string format. Valid transport protocol values are (ignoring - case) "any", "udp, "tcp", "tls", "ws", "wss" and "sctp". + NOTE: source IP is matched using string comparison. Be careful if the + IP can have different forms, for a safer alternative for matching IP + addresses, look at allow_source_address or allow_address(). + + Source address, transport protocol and uri given in the arguments must + be in string format and they can contain script variables. Valid + transport protocol values are (ignoring case) "any", "udp, "tcp", + "tls", "ws", "wss" and "sctp". This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. @@ -968,11 +973,15 @@ if ($var(group) != -1) { ... if (allow_trusted()) { t_relay(); -}; +} ... if (allow_trusted("$si", "$proto")) { t_relay(); -}; +} +... +if (allow_trusted("$si", "any", "$ai")) { + t_relay(); +} ... 5. RPC Commands

1 0

[kamailio/kamailio] usrloc: `received` optional parameter of RPC ul.add command has garbage if not set (#1586)
by Victor Seva 11 Jul '18

11 Jul '18

``` kamcmd> ul.add location 1002-test1 sip:1002-test1@192.168.89.82 0 -1.0 . 0 0 0 kamcmd> ul.lookup location 1002-test1 { AoR: 1002-test1 Contacts: { Contact: { Address: sip:1002-test1@192.168.89.82 Expires: permanent Q: -1.000000 Call-ID: dfjrewr12386fd6-343(a)kamailio.rpc CSeq: 1 User-Agent: kamailio SIP Router - RPC Server Received: if you get this string, you don'tcheck rpc_scan return code !!! (very bad) Path: [not set] State: CS_SYNC Flags: 0 CFlags: 0 Socket: [not set] Methods: 0 Ruid: ulcx-5b448e81-e67-5 Instance: [not set] Reg-Id: 0 Server-Id: 0 Tcpconn-Id: 0 Keepalive: 0 Last-Keepalive: 0 Last-Modified: 0 } } } kamcmd> ul.add location 1002-test1 sip:1002-test1@192.168.89.82 0 -1.0 . 0 0 0 . . kamcmd> ul.lookup location 1002-test1 { AoR: 1002-test1 Contacts: { Contact: { Address: sip:1002-test1@192.168.89.82 Expires: permanent Q: -1.000000 Call-ID: dfjrewr12386fd6-343(a)kamailio.rpc CSeq: 1 User-Agent: kamailio SIP Router - RPC Server Received: [not set] Path: [not set] State: CS_SYNC Flags: 0 CFlags: 0 Socket: [not set] Methods: 0 Ruid: ulcx-5b448e81-e67-5 Instance: [not set] Reg-Id: 0 Server-Id: 0 Tcpconn-Id: 0 Keepalive: 0 Last-Keepalive: 0 Last-Modified: 0 } } } ``` ``` version: kamailio 5.1.4 (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 with gcc 4.8.2 ``` -- 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/1586

1 1

git:master:9ede3f27: usrloc: fix RPC ul.add optional received param value when unset
by Victor Seva 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 9ede3f273b4e478b875369da5b92ff963ee21573 URL: https://github.com/kamailio/kamailio/commit/9ede3f273b4e478b875369da5b92ff9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-07-11T11:44:51+02:00 usrloc: fix RPC ul.add optional received param value when unset fix #1586 --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9ede3f273b4e478b875369da5b92ff9… Patch: https://github.com/kamailio/kamailio/commit/9ede3f273b4e478b875369da5b92ff9… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 1231d4fc8a..ead017a590 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -600,6 +600,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) str aor = {0, 0}; str contact = {0, 0}; str path = {0, 0}; + str received = {0, 0}; str socket = {0, 0}; str temp = {0, 0}; double dtemp; @@ -612,7 +613,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) memset(&ci, 0, sizeof(ucontact_info_t)); ret = rpc->scan(ctx, "SSSdfSddd*SS", &table, &aor, &contact, &ci.expires, - &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &ci.received, + &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &received, &socket); if (ret < 9) { LM_ERR("not enough parameters - read so far: %d\n", ret); @@ -626,9 +627,9 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } if(ret>9) { /* received parameter */ - if(!ul_rpc_is_param_set(&ci.received)) { - ci.received.s = 0; - ci.received.len = 0; + if(ul_rpc_is_param_set(&received)) { + ci.received.s = received.s; + ci.received.len = received.len; } } if(ret>10) {

1 0

git:master:85270635: permissions: docs - elaborated more the help for allow_trusted()
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 852706359470d586238e7df2c1aec2511e272d04 URL: https://github.com/kamailio/kamailio/commit/852706359470d586238e7df2c1aec25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T11:38:58+02:00 permissions: docs - elaborated more the help for allow_trusted() --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/852706359470d586238e7df2c1aec25… Patch: https://github.com/kamailio/kamailio/commit/852706359470d586238e7df2c1aec25… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 500dc48627..935620c0df 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -1185,12 +1185,12 @@ if ($var(group) != -1) { </section> <section id ="permissions.f.allow_trusted"> <title> - <function moreinfo="none">allow_trusted([src_ip_pvar, proto_pvar, uri_pvar])</function> + <function moreinfo="none">allow_trusted([src_ip_pvar, proto_pvar, furi_pvar])</function> </title> <para> Checks based either on request's source address and transport protocol or source address and transport protocol given - in pvar arguments, and From URI of request (or uri_pvar if provided) + in pvar arguments, and From URI of request (or furi_pvar if provided) if request can be trusted without authentication. Returns <quote>1</quote> if a match is found as described in <xref linkend="sec-trusted-requests"/> @@ -1200,9 +1200,14 @@ if ($var(group) != -1) { matching peer to AVP peer_tag_avp. </para> <para> - Source address, transport protocol and uri given in pvar - arguments must be in string format. Valid transport - protocol values are (ignoring case) "any", "udp, "tcp", "tls", + NOTE: source IP is matched using string comparison. Be careful if the + IP can have different forms, for a safer alternative for matching IP + addresses, look at allow_source_address or allow_address(). + </para> + <para> + Source address, transport protocol and uri given in the + arguments must be in string format and they can contain script variables. + Valid transport protocol values are (ignoring case) "any", "udp, "tcp", "tls", "ws", "wss" and "sctp". </para> <para> @@ -1214,11 +1219,15 @@ if ($var(group) != -1) { ... if (allow_trusted()) { t_relay(); -}; +} ... if (allow_trusted("$si", "$proto")) { t_relay(); -}; +} +... +if (allow_trusted("$si", "any", "$ai")) { + t_relay(); +} ... </programlisting> </example>

1 0

git:master:a9dbc22d: permissions: set from uri buffer to empty if not a sip message
by Daniel-Constantin Mierla 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: a9dbc22d9203a91b8eb465fea3b897f38593383a URL: https://github.com/kamailio/kamailio/commit/a9dbc22d9203a91b8eb465fea3b897f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T11:30:48+02:00 permissions: set from uri buffer to empty if not a sip message - adjustments after merging GH #1584 - avoid using garbage content from the declaration of the buffer - renamed parameter name to properly suggest is From header URI, given that R-URI is also part of matching --- Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/a9dbc22d9203a91b8eb465fea3b897f… Patch: https://github.com/kamailio/kamailio/commit/a9dbc22d9203a91b8eb465fea3b897f…

1 0

git:master:581f80a0: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: 581f80a09af73fd917834b5bcbca6143016b419d URL: https://github.com/kamailio/kamailio/commit/581f80a09af73fd917834b5bcbca614… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-11T10:47:04+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/581f80a09af73fd917834b5bcbca614… Patch: https://github.com/kamailio/kamailio/commit/581f80a09af73fd917834b5bcbca614… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 631fdeae79..6e2e3b972d 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -78,7 +78,7 @@ Emmanuel Schmidbauer 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) 5. RPC Commands @@ -183,7 +183,7 @@ Chapter 1. Admin Guide 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) 5. RPC Commands @@ -342,7 +342,7 @@ Chapter 1. Admin Guide * transport protocol is either "ANY" or equal to the transport protocol of request or the transport protocol given in pvar, and * regular expression is either empty (NULL in database) or matches - the From URI of request. + the request's From (or optionally provided) URI. Otherwise the request is rejected. @@ -715,7 +715,7 @@ modparam("permissions", "load_backends", 1) 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) 4.1. allow_routing() @@ -948,19 +948,19 @@ if ($var(group) != -1) { }; ... -4.11. allow_trusted([src_ip_pvar, proto_pvar]) +4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) Checks based either on request's source address and transport protocol or source address and transport protocol given in pvar arguments, and - From URI of request if request can be trusted without authentication. - Returns “1” if a match is found as described in Section 1.5, “Trusted - Requests” and “-1” otherwise. If a match is found and peer_tag_avp has - been defined, adds a non-NULL tag column value of the matching peer to - AVP peer_tag_avp. - - Source address and transport protocol given in pvar arguments must be - in string format. Valid transport protocol values are (ignoring case) - "any", "udp, "tcp", "tls", "ws", "wss" and "sctp". + From URI of request (or uri_pvar if provided) if request can be trusted + without authentication. Returns “1” if a match is found as described in + Section 1.5, “Trusted Requests” and “-1” otherwise. If a match is found + and peer_tag_avp has been defined, adds a non-NULL tag column value of + the matching peer to AVP peer_tag_avp. + + Source address, transport protocol and uri given in pvar arguments must + be in string format. Valid transport protocol values are (ignoring + case) "any", "udp, "tcp", "tls", "ws", "wss" and "sctp". This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.

1 0

git:master:ad2425c3: Merge pull request #1584 from rromrrom/allow_trusted_3
by GitHub 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: ad2425c34e1ced6e044db28d996d1211cd75e294 URL: https://github.com/kamailio/kamailio/commit/ad2425c34e1ced6e044db28d996d121… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-07-11T10:41:54+02:00 Merge pull request #1584 from rromrrom/allow_trusted_3 permissions: Improve From pattern matching in kamailio permissions moâ¦ --- Modified: src/modules/permissions/doc/permissions_admin.xml Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/hash.h Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/ad2425c34e1ced6e044db28d996d121… Patch: https://github.com/kamailio/kamailio/commit/ad2425c34e1ced6e044db28d996d121…

1 0

git:master:caaef045: permissions: Improve From pattern matching in kamailio permissions module
by Roman Romanchenko 11 Jul '18

11 Jul '18

Module: kamailio Branch: master Commit: caaef0457e3c5e061ee961588394a1105e0c5850 URL: https://github.com/kamailio/kamailio/commit/caaef0457e3c5e061ee961588394a11… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Committer: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2018-07-11T11:17:49+03:00 permissions: Improve From pattern matching in kamailio permissions module - allow_trusted() now can take optional parameter of value to match. - provided parameter will be used instead of From header in match_res() and match_hash_table() - documentation extended with 3-arguments allow_trusted() function description --- Modified: src/modules/permissions/doc/permissions_admin.xml Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/hash.h Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/caaef0457e3c5e061ee961588394a11… Patch: https://github.com/kamailio/kamailio/commit/caaef0457e3c5e061ee961588394a11…

1 0

[kamailio/kamailio] permissions: Improve From pattern matching in kamailio permissions mo… (#1584)
by rromrrom 11 Jul '18

11 Jul '18

…dule - allow_trusted() now can take optional parameter of value to match. - provided parameter will be used instead of From header in match_res() and match_hash_table() - documentation extended with 3-arguments allow_trusted() function description   #### 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/1584 -- Commit Summary -- * permissions: Improve From pattern matching in kamailio permissions module -- File Changes -- M src/modules/permissions/doc/permissions_admin.xml (8) M src/modules/permissions/hash.c (22) M src/modules/permissions/hash.h (4) M src/modules/permissions/permissions.c (2) M src/modules/permissions/trusted.c (98) M src/modules/permissions/trusted.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1584.patch https://github.com/kamailio/kamailio/pull/1584.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/1584

2 4

git:master:bfb1f5a6: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 10 Jul '18

10 Jul '18

Module: kamailio Branch: master Commit: bfb1f5a6879cc35ff638987bd2552ee1a24904c7 URL: https://github.com/kamailio/kamailio/commit/bfb1f5a6879cc35ff638987bd2552ee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-10T10:17:10+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/bfb1f5a6879cc35ff638987bd2552ee… Patch: https://github.com/kamailio/kamailio/commit/bfb1f5a6879cc35ff638987bd2552ee…

1 0

git:master:a60734e5: textops: documentation for replace_str(...)
by Daniel-Constantin Mierla 10 Jul '18

10 Jul '18

Module: kamailio Branch: master Commit: a60734e552d2520fdd0253d5413c507c2e2974d7 URL: https://github.com/kamailio/kamailio/commit/a60734e552d2520fdd0253d5413c507… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-10T10:03:14+02:00 textops: documentation for replace_str(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a60734e552d2520fdd0253d5413c507… Patch: https://github.com/kamailio/kamailio/commit/a60734e552d2520fdd0253d5413c507… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 966169d2dd..3e62d7ac44 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -395,7 +395,45 @@ replace_body_all("openser", "&kamailio; SIP Proxy"); ... # strip the whole body from the message: if(has_body() && replace_body_atonce("^.+$", "")) - remove_hf("Content-Type"); + remove_hf("Content-Type"); +... +</programlisting> + </example> + </section> + + <section id="textops.f.replace_str"> + <title> + <function moreinfo="none">replace_str(match, repl, mode)</function> + </title> + <para> + Replaces the first or all occurrence of 'match' with 'repl' by doing + string comparison for matching. It is applied over headers and message + body (not over the first line). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>match</emphasis> - string to be matched. + </para> + </listitem> + <listitem> + <para><emphasis>repl</emphasis> - string to be used as replacement. + </para> + </listitem> + <listitem> + <para><emphasis>mode</emphasis> - 'f' - replace only first match; + 'a' - replace all matches. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>replace_str</function> usage</title> + <programlisting format="linespecific"> +... +replace_str("&kamailio;", "&kamailio; SIP Proxy", "a"); ... </programlisting> </example>

1 0

git:master:5cdf195d: textops: added replace_str(match, repl, mode)
by Daniel-Constantin Mierla 10 Jul '18

10 Jul '18

Module: kamailio Branch: master Commit: 5cdf195d709dc0235170961af2003b70bcc2ecb6 URL: https://github.com/kamailio/kamailio/commit/5cdf195d709dc0235170961af2003b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-10T09:56:02+02:00 textops: added replace_str(match, repl, mode) - replace a string with another in the message buffer after the first line. The parameter mode coltrols if first ("f") match or all ("a") should be replaced - alternative to replace() that avoids regexp overhead when bare string can be matched --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/5cdf195d709dc0235170961af2003b7… Patch: https://github.com/kamailio/kamailio/commit/5cdf195d709dc0235170961af2003b7… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index b4b3de4e11..c2c43ce284 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -88,6 +88,7 @@ MODULE_VERSION static int search_body_f(struct sip_msg*, char*, char*); static int search_hf_f(struct sip_msg*, char*, char*, char*); static int replace_f(struct sip_msg*, char*, char*); +static int replace_str_f(struct sip_msg*, char*, char*, char*); static int replace_body_f(struct sip_msg*, char*, char*); static int replace_all_f(struct sip_msg*, char*, char*); static int replace_body_all_f(struct sip_msg*, char*, char*); @@ -178,6 +179,9 @@ static cmd_export_t cmds[]={ {"replace", (cmd_function)replace_f, 2, fixup_regexp_none, fixup_free_regexp_none, ANY_ROUTE}, + {"replace_str", (cmd_function)replace_str_f, 3, + fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, {"replace_body", (cmd_function)replace_body_f, 2, fixup_regexp_none, fixup_free_regexp_none, ANY_ROUTE}, @@ -779,6 +783,99 @@ static int ki_replace(sip_msg_t* msg, str* sre, str* sval) return ret; } +static char *textops_strfind(str *mbuf, str *mkey) +{ + char *sp; + + // Sanity check + if(!(mbuf && mkey && mbuf->len >= mkey->len)) + return NULL; + + for(sp = mbuf->s; sp <= mbuf->s + mbuf->len - mkey->len; sp++) { + if(*sp == mkey->s[0] && strncmp(sp, mkey->s, mkey->len) == 0) { + return sp; + } + } + + return NULL; +} + +static int ki_replace_str(sip_msg_t* msg, str* mkey, str* rval, str *rmode) +{ + sr_lump_t* l; + char* s; + str mbuf; + char *mp; + char rpos; + + if(mkey==NULL || rval==NULL) { + return -1; + } + if(mkey->s==NULL || mkey->len<=0) { + return 1; + } + + if(rmode==NULL || rmode->s==NULL || rmode->s[0]=='f' || rmode->s[0]=='F') { + rpos = 'f'; + } else { + rpos = 'a'; + } + + mbuf.s = get_header(msg); + mbuf.len = msg->len - (mbuf.s - msg->buf); + + while((mp=textops_strfind(&mbuf, mkey))!=NULL) { + + if ((l=del_lump(msg, mp - msg->buf, mkey->len, 0))==0) { + return -1; + } + s=pkg_malloc(rval->len+1); + if (s==0){ + LM_ERR("memory allocation failure\n"); + return -1; + } + memcpy(s, rval->s, rval->len); + if (insert_new_lump_after(l, s, rval->len, 0)==0){ + LM_ERR("could not insert new lump\n"); + pkg_free(s); + return -1; + } + + if(rpos=='f') { + return 1; + } + + mbuf.s = mp + mkey->len; + mbuf.len = msg->len - (mbuf.s - msg->buf); + } + + return 1; +} + +static int replace_str_f(sip_msg_t* msg, char* pmkey, char* prval, char* prmode) +{ + str mkey; + str rval; + str rmode; + + if(fixup_get_svalue(msg, (gparam_t*)pmkey, &mkey)<0) { + LM_ERR("failed to get the matching string parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)prval, &rval)<0) { + LM_ERR("failed to get the replacement string parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)prmode, &rmode)<0) { + LM_ERR("failed to get the replacement mode parameter\n"); + return -1; + } + + return ki_replace_str(msg, &mkey, &rval, &rmode); +} + static int replace_body_helper(sip_msg_t* msg, regex_t *re, str *val) { struct lump* l; @@ -4243,6 +4340,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("replace_str"), + SR_KEMIP_INT, ki_replace_str, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("replace_all"), SR_KEMIP_INT, ki_replace_all, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:acb90b66: app_jsdt: restore JS stack after executing a function
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: acb90b6634e65a21c655e9bb94c1af00c138e6d4 URL: https://github.com/kamailio/kamailio/commit/acb90b6634e65a21c655e9bb94c1af0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T15:41:59+02:00 app_jsdt: restore JS stack after executing a function --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/acb90b6634e65a21c655e9bb94c1af0… Patch: https://github.com/kamailio/kamailio/commit/acb90b6634e65a21c655e9bb94c1af0… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ff9f2ad19d..224d54bfe6 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -770,6 +770,7 @@ int app_jsdt_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, int ret; str txt; sip_msg_t *bmsg; + duk_idx_t jtop; if(_sr_J_env.JJ==NULL) { LM_ERR("js loading state not initialized (call: %s)\n", func); @@ -779,7 +780,8 @@ int app_jsdt_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, jsdt_kemi_reload_script(); LM_DBG("executing js function: [[%s]]\n", func); - LM_DBG("js top index is: %d\n", duk_get_top(_sr_J_env.JJ)); + jtop = duk_get_top(_sr_J_env.JJ); + LM_DBG("js top index is: %d\n", (int)jtop); duk_get_global_string(_sr_J_env.JJ, func); if(!duk_is_function(_sr_J_env.JJ, -1)) { @@ -789,8 +791,10 @@ int app_jsdt_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, duk_get_type(_sr_J_env.JJ, -1)); txt.s = (char*)duk_to_string(_sr_J_env.JJ, -1); LM_ERR("error from JS: %s\n", (txt.s)?txt.s:"unknown"); + duk_set_top(_sr_J_env.JJ, jtop); return -1; } else { + duk_set_top(_sr_J_env.JJ, jtop); return 1; } } @@ -840,15 +844,16 @@ int app_jsdt_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, LM_ERR("error from js: unknown\n"); } } - duk_pop(_sr_J_env.JJ); if(n==1) { + duk_set_top(_sr_J_env.JJ, jtop); return 1; } else { LM_ERR("error executing: %s (err: %d)\n", func, ret); + duk_set_top(_sr_J_env.JJ, jtop); return -1; } } - duk_pop(_sr_J_env.JJ); + duk_set_top(_sr_J_env.JJ, jtop); return 1; }

1 0

git:master:fee61089: modules: readme files regenerated - sanity ... [skip ci]
by Kamailio Dev 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: fee610899711cc9e2accd777250e1983b9282737 URL: https://github.com/kamailio/kamailio/commit/fee610899711cc9e2accd777250e198… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-09T15:31:42+02:00 modules: readme files regenerated - sanity ... [skip ci] --- Modified: src/modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/fee610899711cc9e2accd777250e198… Patch: https://github.com/kamailio/kamailio/commit/fee610899711cc9e2accd777250e198… --- diff --git a/src/modules/sanity/README b/src/modules/sanity/README index 14aa8462cc..588f53deae 100644 --- a/src/modules/sanity/README +++ b/src/modules/sanity/README @@ -183,6 +183,9 @@ modparam("sanity", "autodrop", 1) module sends a precise error reply via SL send_reply(). Thus there is no need to reply with a generic error message. + The parameters can be static integers or variables holding integer + values. + Example 1.5. sanity_check usage ... if (!sanity_check()) {

1 0

git:master:eb96593d: app_lua: restore top index to lua stack after executing a function
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: eb96593d0f1bb60fe6e955daa1a1b91ef65c69bd URL: https://github.com/kamailio/kamailio/commit/eb96593d0f1bb60fe6e955daa1a1b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T15:25:43+02:00 app_lua: restore top index to lua stack after executing a function - could be related to GH #1577 --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/eb96593d0f1bb60fe6e955daa1a1b91… Patch: https://github.com/kamailio/kamailio/commit/eb96593d0f1bb60fe6e955daa1a1b91… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 7f0fd1fbc0..97d141cd22 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -646,6 +646,7 @@ int app_lua_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, int ret; str txt; sip_msg_t *bmsg; + int ltop; if(_sr_L_env.LL==NULL) { @@ -663,7 +664,8 @@ int app_lua_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, } else LM_DBG("reload deactivated\n"); LM_DBG("executing Lua function: [[%s]]\n", func); - LM_DBG("lua top index is: %d\n", lua_gettop(_sr_L_env.LL)); + ltop = lua_gettop(_sr_L_env.LL); + LM_DBG("lua top index is: %d\n", ltop); lua_getglobal(_sr_L_env.LL, func); if(!lua_isfunction(_sr_L_env.LL, -1)) { @@ -674,8 +676,12 @@ int app_lua_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, lua_typename(_sr_L_env.LL,lua_type(_sr_L_env.LL, -1))); txt.s = (char*)lua_tostring(_sr_L_env.LL, -1); LM_ERR("error from Lua: %s\n", (txt.s)?txt.s:"unknown"); + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); return -1; } else { + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); return 1; } } @@ -721,13 +727,20 @@ int app_lua_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, } lua_pop(_sr_L_env.LL, 1); if(n==1) { + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); return 1; } else { LM_ERR("error executing: %s (err: %d)\n", func, ret); + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); return -1; } } + /* restores the original stack size */ + lua_settop(_sr_L_env.LL, ltop); + return 1; }

1 0

git:master:3ddf9de8: sanity: note that params for sanity_check(...) can be vars
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: 3ddf9de8f0345db6a5fb0c632784b38482687891 URL: https://github.com/kamailio/kamailio/commit/3ddf9de8f0345db6a5fb0c632784b38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T10:26:11+02:00 sanity: note that params for sanity_check(...) can be vars --- Modified: src/modules/sanity/doc/sanity_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3ddf9de8f0345db6a5fb0c632784b38… Patch: https://github.com/kamailio/kamailio/commit/3ddf9de8f0345db6a5fb0c632784b38… --- diff --git a/src/modules/sanity/doc/sanity_admin.xml b/src/modules/sanity/doc/sanity_admin.xml index f951ca0031..dec9d79a86 100644 --- a/src/modules/sanity/doc/sanity_admin.xml +++ b/src/modules/sanity/doc/sanity_admin.xml @@ -244,6 +244,9 @@ modparam("sanity", "autodrop", 1) reply via SL <function>send_reply()</function>. Thus there is no need to reply with a generic error message. </para> + <para> + The parameters can be static integers or variables holding integer values. + </para> <example> <title><function>sanity_check</function> usage</title> <programlisting>

1 0

git:5.0:f310c738: usrloc: test if path value for rpc ul.add is .
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: 5.0 Commit: f310c7384cd6233f9af835d7dff63738d07f0b15 URL: https://github.com/kamailio/kamailio/commit/f310c7384cd6233f9af835d7dff6373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T10:46:31+02:00 usrloc: test if path value for rpc ul.add is . - char usually used for setting no value --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/f310c7384cd6233f9af835d7dff6373… Patch: https://github.com/kamailio/kamailio/commit/f310c7384cd6233f9af835d7dff6373… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 6133db8acd..c3e5a99405 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -580,7 +580,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) ret = rpc->scan(ctx, "SSSdfSddd", &table, &aor, &contact, &ci.expires, &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods); - if(path.len==1 && (strncmp(path.s, "0", 1)==0)) { + if(path.len==1 && (strncmp(path.s, "0", 1)==0 || strncmp(path.s, ".", 1)==0)) { LM_DBG("path == 0 -> unset\n"); } else {

1 0

git:master:7bc82ef8: core: cfg struct - pack structures that use a dynamic array at the end
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: 7bc82ef842316449cbebeddf594a0e2975855242 URL: https://github.com/kamailio/kamailio/commit/7bc82ef842316449cbebeddf594a0e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T10:20:42+02:00 core: cfg struct - pack structures that use a dynamic array at the end - compiler padding to alling fields results in wrong offset for last field which is computed as `sizeof(struct) - 1 - GH #1583 --- Modified: src/core/cfg/cfg_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/7bc82ef842316449cbebeddf594a0e2… Patch: https://github.com/kamailio/kamailio/commit/7bc82ef842316449cbebeddf594a0e2… --- diff --git a/src/core/cfg/cfg_struct.h b/src/core/cfg/cfg_struct.h index 6436eed677..e03024e700 100644 --- a/src/core/cfg/cfg_struct.h +++ b/src/core/cfg/cfg_struct.h @@ -40,22 +40,24 @@ * When the config is shmzied, these variables are combined in * an array. */ +#pragma pack(push, 1) typedef struct _cfg_add_var { struct _cfg_add_var *next; unsigned int type; /*!< type == 0 is also valid, it indicates that the group must be created with the default values */ + unsigned int group_id; /*!< Id of the group instance */ union { char *ch; str s; int i; } val; - unsigned int group_id; /*!< Id of the group instance */ int name_len; /*!< Name of the variable. The variable may not be known, for example the additional group value is set in the script before the cfg group is declared. Hence, the pointer cannot be stored here. */ char name[1]; } cfg_add_var_t; +#pragma pack(pop) /*! \brief structure used for variable - pointer mapping */ typedef struct _cfg_mapping { @@ -72,6 +74,7 @@ typedef struct _cfg_mapping { enum { CFG_GROUP_UNKNOWN = 0, CFG_GROUP_DYNAMIC, CFG_GROUP_STATIC }; /*! \brief linked list of registered groups */ +#pragma pack(push, 1) typedef struct _cfg_group { int num; /*!< number of variables within the group */ cfg_mapping_t *mapping; /*!< describes the mapping betweeen @@ -103,9 +106,11 @@ typedef struct _cfg_group { int name_len; char name[1]; } cfg_group_t; +#pragma pack(pop) /*! \brief One instance of the cfg group variables which stores * the additional values. These values can overwrite the default values. */ +#pragma pack(push, 1) typedef struct _cfg_group_inst { unsigned int id; /*!< identifier of the group instance */ unsigned int set[CFG_MAX_VAR_NUM/(sizeof(int)*8)]; @@ -114,6 +119,7 @@ typedef struct _cfg_group_inst { then the default value is used, and copied into this instance. */ unsigned char vars[1]; /*!< block for the values */ } cfg_group_inst_t; +#pragma pack(pop) /*! \brief Meta-data which is stored before each variable group * within the blob. This structure is used to handle the multivalue @@ -125,6 +131,7 @@ typedef struct _cfg_group_meta { } cfg_group_meta_t; /*! \brief single memoy block that contains all the cfg values */ +#pragma pack(push, 1) typedef struct _cfg_block { atomic_t refcnt; /*!< reference counter, the block is automatically deleted @@ -132,6 +139,7 @@ typedef struct _cfg_block { int _pad; /*!< force 8 byte alignment */ unsigned char vars[1]; /*!< blob that contains the values */ } cfg_block_t; +#pragma pack(pop) /*! \brief Linked list of per-child process callbacks. * Each child process has a local pointer, and executes the callbacks

1 0

git:master:f66bbb5b: sanity: allow vars in params
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: f66bbb5b6da13ad627bf0c8ee50bdbad9c93b43c URL: https://github.com/kamailio/kamailio/commit/f66bbb5b6da13ad627bf0c8ee50bdba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-09T08:54:47+02:00 sanity: allow vars in params --- Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f66bbb5b6da13ad627bf0c8ee50bdba… Patch: https://github.com/kamailio/kamailio/commit/f66bbb5b6da13ad627bf0c8ee50bdba… --- diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index a425da7646..6d8de764bc 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -27,6 +27,7 @@ #include "../../core/sr_module.h" #include "../../core/ut.h" #include "../../core/error.h" +#include "../../core/mod_fix.h" #include "../../core/kemi.h" MODULE_VERSION @@ -44,8 +45,7 @@ strl* proxyrequire_list = NULL; sl_api_t slb; static int mod_init(void); -static int sanity_fixup(void** param, int param_no); -static int w_sanity_check(struct sip_msg* _msg, char* _foo, char* _bar); +static int w_sanity_check(sip_msg_t* _msg, char* _msg_check, char* _uri_check); static int bind_sanity(sanity_api_t* api); /* @@ -54,9 +54,9 @@ static int bind_sanity(sanity_api_t* api); static cmd_export_t cmds[] = { {"sanity_check", (cmd_function)w_sanity_check, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_check, 1, sanity_fixup, + {"sanity_check", (cmd_function)w_sanity_check, 1, fixup_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_check, 2, sanity_fixup, + {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0}, {0, 0, 0, 0} @@ -116,40 +116,6 @@ static int mod_init(void) { return 0; } -static int sanity_fixup(void** param, int param_no) { - int checks; - str in; - - if (param_no == 1) { - in.s = (char*)*param; - in.len = strlen(in.s); - if (str2int(&in, (unsigned int*)&checks) < 0) { - LM_ERR("failed to convert input integer\n"); - return E_UNSPEC; - } - if ((checks < 1) || (checks >= (SANITY_MAX_CHECKS))) { - LM_ERR("input parameter (%i) outside of valid range <1-%i)\n", - checks, SANITY_MAX_CHECKS); - return E_UNSPEC; - } - *param = (void*)(long)checks; - } - if (param_no == 2) { - in.s = (char*)*param; - in.len = strlen(in.s); - if (str2int(&in, (unsigned int*)&checks) < 0) { - LM_ERR("failed to convert second integer argument\n"); - return E_UNSPEC; - } - if ((checks < 1) || (checks >= (SANITY_URI_MAX_CHECKS))) { - LM_ERR("second input parameter (%i) outside of valid range <1-%i\n", - checks, SANITY_URI_MAX_CHECKS); - return E_UNSPEC; - } - *param = (void*)(long)checks; - } - return 0; -} /** * perform SIP message sanity check @@ -236,23 +202,39 @@ int sanity_check_defaults(struct sip_msg* msg) /** * wrapper for sanity_check() to be used from config file */ -static int w_sanity_check(struct sip_msg* _msg, char* _number, char* _arg) { - int ret, check, arg; - - if (_number == NULL) { - check = default_msg_checks; +static int w_sanity_check(sip_msg_t* _msg, char* _msg_check, char* _uri_check) +{ + int ret, msg_check, uri_check; + + if (_msg_check == NULL) { + msg_check = default_msg_checks; + } else { + if(fixup_get_ivalue(_msg, (gparam_t*)_msg_check, &msg_check)<0) { + LM_ERR("failed to get msg check flags parameter\n"); + return -1; + } } - else { - check = (int)(long)_number; + if (_uri_check == NULL) { + uri_check = default_uri_checks; + } else { + if(fixup_get_ivalue(_msg, (gparam_t*)_uri_check, &uri_check)<0) { + LM_ERR("failed to get uri check flags parameter\n"); + return -1; + } } - if (_arg == NULL) { - arg = default_uri_checks; + + if ((msg_check < 1) || (msg_check >= (SANITY_MAX_CHECKS))) { + LM_ERR("input parameter (%i) outside of valid range <1-%i)\n", + msg_check, SANITY_MAX_CHECKS); + return -1; } - else { - arg = (int)(long)_arg; + if ((uri_check < 1) || (uri_check >= (SANITY_URI_MAX_CHECKS))) { + LM_ERR("second input parameter (%i) outside of valid range <1-%i\n", + uri_check, SANITY_URI_MAX_CHECKS); + return -1; } - ret = sanity_check(_msg, check, arg); + ret = sanity_check(_msg, msg_check, uri_check); LM_DBG("sanity checks result: %d\n", ret); if(_sanity_drop!=0) return ret;

1 0

git:master:9a3bb8d2: core: added config defines for application version
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: 9a3bb8d2141c67ec1147085948ea38103ca6090d URL: https://github.com/kamailio/kamailio/commit/9a3bb8d2141c67ec1147085948ea381… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-07T09:08:18+02:00 core: added config defines for application version - three tokens are defined for version X.Y.Z: * KAMAILIO_X, KAMAILIO_X_Y, KAMAILIO_X_Y_Z --- Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9a3bb8d2141c67ec1147085948ea381… Patch: https://github.com/kamailio/kamailio/commit/9a3bb8d2141c67ec1147085948ea381… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index f8688988aa..d15e0f899e 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -225,4 +225,56 @@ void pp_ifdef_level_check(void) } } +/** + * + */ +void pp_define_core(void) +{ + char defval[64]; + char *p; + int n; + + strcpy(defval, NAME); + p = defval; + while(*p) { + *p = (char)toupper(*p); + p++; + } + + n = snprintf(p, 64 - (int)(p-defval), "_%d", VERSIONVAL/1000000); + if(n<0 || n>=64 - (int)(p-defval)) { + LM_ERR("faild to build define token\n"); + return; + } + pp_define_set_type(0); + if(pp_define(strlen(defval), defval)<0) { + LM_ERR("unable to set cfg define: %s\n", defval); + return; + } + + n = snprintf(p, 64 - (int)(p-defval), "_%d_%d", VERSIONVAL/1000000, + (VERSIONVAL%1000000)/1000); + if(n<0 || n>=64 - (int)(p-defval)) { + LM_ERR("faild to build define token\n"); + return; + } + pp_define_set_type(0); + if(pp_define(strlen(defval), defval)<0) { + LM_ERR("unable to set cfg define: %s\n", defval); + return; + } + + n = snprintf(p, 64 - (int)(p-defval), "_%d_%d_%d", VERSIONVAL/1000000, + (VERSIONVAL%1000000)/1000, VERSIONVAL%1000); + if(n<0 || n>=64 - (int)(p-defval)) { + LM_ERR("faild to build define token\n"); + return; + } + pp_define_set_type(0); + if(pp_define(strlen(defval), defval)<0) { + LM_ERR("unable to set cfg define: %s\n", defval); + return; + } +} + /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 5524b9fd58..432d76bcfb 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -45,6 +45,8 @@ int pp_define_set_type(int type); void pp_ifdef_level_update(int val); void pp_ifdef_level_check(void); +void pp_define_core(void); + #endif /*_PPCFG_H_*/ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/src/main.c b/src/main.c index 30f659c8c1..846e35970d 100644 --- a/src/main.c +++ b/src/main.c @@ -2155,6 +2155,7 @@ int main(int argc, char** argv) } if (debug_flag) default_core_cfg.debug = debug_save; pp_ifdef_level_check(); + pp_define_core(); print_rls(); if(init_dst_set()<0) {

1 0

git:master:95fc59a0: core: define core tokens before parsing config file
by Daniel-Constantin Mierla 09 Jul '18

09 Jul '18

Module: kamailio Branch: master Commit: 95fc59a0bcddae3e174c4baf3f47a6cd2a15791b URL: https://github.com/kamailio/kamailio/commit/95fc59a0bcddae3e174c4baf3f47a6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-07T10:01:09+02:00 core: define core tokens before parsing config file --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/95fc59a0bcddae3e174c4baf3f47a6c… Patch: https://github.com/kamailio/kamailio/commit/95fc59a0bcddae3e174c4baf3f47a6c… --- diff --git a/src/main.c b/src/main.c index 846e35970d..1830b9628f 100644 --- a/src/main.c +++ b/src/main.c @@ -1952,6 +1952,8 @@ int main(int argc, char** argv) init_tcp_options(); /* set the defaults before the config */ #endif + pp_define_core(); + /* process command line (cfg. file path etc) */ optind = 1; /* reset getopt */ /* switches required before script processing */ @@ -2155,7 +2157,6 @@ int main(int argc, char** argv) } if (debug_flag) default_core_cfg.debug = debug_save; pp_ifdef_level_check(); - pp_define_core(); print_rls(); if(init_dst_set()<0) {

1 0

RFC: database unsigned number types
by Daniel-Constantin Mierla 07 Jul '18

07 Jul '18

Hello, starting here a discussion about an issue with the database API and signed/unsigned number type to see how to address it. So far, the database API supported only signed types for numbers, respectively DB1_INT (int in c) and DB1_BIGINT (long long in c). However, many database table columns are defined as UNSIGNED INT or UNSIGNED BIGINT. The database connector modules are mapping UNSIGED values retrieved from database over signed fields in DB API structure. The other way around is done as well: signed values are the inserted in the unsigned columns. There is no issue if the value in C is a positive number, however, if the value goes over MAX_UINT/2 (over 2147483647), it becomes negative and inserting the value in database results in an exception and 0 being stored instead. So far, I guess the issue was rarely exposed, if at all, because no report on it, even these data types for DB1 are since the SER project was started in 2001. As I looked at database definition schema, most of unsigned columns are for internal flags or ids (e.g., lcr_id), where I guess no large values were used or needed so far. However, it can bite at any time and needs to be addressed. So far, two solutions come in mind: 1) drop using UNSIGNED INT for those db columns, use only INT and do unsigned cast in the C code when reading and cast to int when writing. 2) update the db connector modules to support unsigned types -- I added support for them in DB API, but each db_* module has to be updated. The also each module that uses UNSIGNED DB columns must be updated 1) should be simpler, 2) more work but better in long term Any other ideas? Which of the options you prefer to go for? Not to forget: somehow related, probably we have to switch from int to long for PV number values, otherwise timestamp variables can go negative once unix timestamp approaches MAX_UINT/2 (still plenty of time, but should not be delayed for long ...). Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

2 1

git:master:4c52bd84: pv: new class of variables - $ksr(attr)
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: 4c52bd84068ca48a09bc971f32fdf028a889ee96 URL: https://github.com/kamailio/kamailio/commit/4c52bd84068ca48a09bc971f32fdf02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T16:01:18+02:00 pv: new class of variables - $ksr(attr) - get attributes of kamailio sip router instance - implemented attributes: * ver - return version string * verval - return version value --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/4c52bd84068ca48a09bc971f32fdf02… Patch: https://github.com/kamailio/kamailio/commit/4c52bd84068ca48a09bc971f32fdf02… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 096b253b30..ee455ca219 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -511,6 +511,8 @@ static pv_export_t mod_pvs[] = { pv_parse_expires_name, 0, 0, 0 }, { {"msg", (sizeof("msg")-1)}, PVT_OTHER, pv_get_msg_attrs, 0, pv_parse_msg_attrs_name, 0, 0, 0 }, + { {"ksr", (sizeof("ksr")-1)}, PVT_OTHER, pv_get_ksr_attrs, 0, + pv_parse_ksr_attrs_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8d8f35f250..8957098895 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3522,6 +3522,58 @@ int pv_get_msg_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } +/** + * + */ +int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 3: + if(strncmp(in->s, "ver", 3)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else goto error; + break; + case 6: + if(strncmp(in->s, "verval", 6)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV ksr key: %.*s\n", in->len, in->s); + return -1; +} + + +/** + * + */ +int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if(param==NULL) + return pv_get_null(msg, param, res); + + switch(param->pvn.u.isname.name.n) { + case 0: /* version */ + return pv_get_strzval(msg, param, res, VERSION); + case 1: /* version value */ + return pv_get_uintval(msg, param, res, VERSIONVAL); + + default: + return pv_get_null(msg, param, res); + } +} + int pv_parse_env_name(pv_spec_p sp, str *in) { char *csname; diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 453c1c3197..411f2f8aac 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -373,5 +373,11 @@ int pv_get_msg_attrs(sip_msg_t *msg, pv_param_t *param, int pv_parse_env_name(pv_spec_p sp, str *in); int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + +int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); + +int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); + #endif

1 0

git:master:7c1b33cf: mohqueue: replaced SER_VER with VERSIONVAL
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: 7c1b33cfdc8f2c613644d561dc3738c697217efb URL: https://github.com/kamailio/kamailio/commit/7c1b33cfdc8f2c613644d561dc3738c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T15:18:00+02:00 mohqueue: replaced SER_VER with VERSIONVAL --- Modified: src/modules/mohqueue/mohq_common.h --- Diff: https://github.com/kamailio/kamailio/commit/7c1b33cfdc8f2c613644d561dc3738c… Patch: https://github.com/kamailio/kamailio/commit/7c1b33cfdc8f2c613644d561dc3738c… --- diff --git a/src/modules/mohqueue/mohq_common.h b/src/modules/mohqueue/mohq_common.h index 1f1c349666..ed6adf8044 100644 --- a/src/modules/mohqueue/mohq_common.h +++ b/src/modules/mohqueue/mohq_common.h @@ -27,7 +27,7 @@ #include "../rr/api.h" -#if SER_VER < 5000000 +#if VERSIONVAL < 5000000 #include "../../data_lump.h" #include "../../data_lump_rpl.h" #include "../../dprint.h" @@ -127,4 +127,4 @@ #define MOHQ_HEADER_EMPTY( hdr1 ) \ ((hdr1) == NULL || MOHQ_STR_EMPTY( &(hdr1)->body )) -#endif /* MOHQ_COMMON_H */ \ No newline at end of file +#endif /* MOHQ_COMMON_H */

1 0

git:master:df947964: Makefile.defs: renamed define name SER_VER to VERSIONVAL
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: df9479643d43adf7a657a6b39371142d1d8a702e URL: https://github.com/kamailio/kamailio/commit/df9479643d43adf7a657a6b39371142… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T15:15:05+02:00 Makefile.defs: renamed define name SER_VER to VERSIONVAL - the value is the number computed by the rule: $(VERSION) * 1000000 + $(PATCHLEVEL) * 1000 + $(SUBLEVEL) Example: for kamailio 5.1.4, that is 5001004 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/df9479643d43adf7a657a6b39371142… Patch: https://github.com/kamailio/kamailio/commit/df9479643d43adf7a657a6b39371142… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 8e76de7687..a114c8ae0f 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -119,7 +119,7 @@ MEMMNG ?= 0 # 1 - on (debug mode) MEMDBG ?= 1 -SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ +VERSIONVAL = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) ) RELEASE:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) OS := $(shell uname -s | sed -e s/SunOS/solaris/ -e s/CYGWIN.*/cygwin/ \ @@ -653,7 +653,7 @@ C_DEFS= $(extra_defs) \ -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ -D__CPU_$(ARCH) $(os_defs) \ - -DSER_VER=$(SER_VER) \ + -DVERSIONVAL=$(VERSIONVAL) \ -DCFG_DIR='"$(cfg_target)"'\ -DRUN_DIR='"$(run_target)"'

1 0

git:master:b1cfec77: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: b1cfec77e66cb0221dca4c6acea4d3fbb26e0f97 URL: https://github.com/kamailio/kamailio/commit/b1cfec77e66cb0221dca4c6acea4d3f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-06T10:32:09+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/b1cfec77e66cb0221dca4c6acea4d3f… Patch: https://github.com/kamailio/kamailio/commit/b1cfec77e66cb0221dca4c6acea4d3f…

1 0

git:master:d369e0dc: uac: documentation for uac_reg_refresh()
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: d369e0dc61148937a7f565e5b9fbb3d93d6397ac URL: https://github.com/kamailio/kamailio/commit/d369e0dc61148937a7f565e5b9fbb3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T10:25:55+02:00 uac: documentation for uac_reg_refresh() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d369e0dc61148937a7f565e5b9fbb3d… Patch: https://github.com/kamailio/kamailio/commit/d369e0dc61148937a7f565e5b9fbb3d… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 0daac1bdd2..162f491b31 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -942,6 +942,25 @@ failure_route[REMOTE_AUTH] { <programlisting format="linespecific"> ... uac_reg_disable("l_uuid", "account123"); +... + </programlisting> + </example> + </section> + + <section id="uac.f.uac_reg_refresh"> + <title> + <function moreinfo="none">uac_reg_refresh(luuid)</function> + </title> + <para> + Refresh the uac remote registration record based on local uuid. If + the record was already loaded, new values are taken from database, + otherwise a new record is created. + </para> + <example> + <title><function>uac_reg_refresh</function> usage</title> + <programlisting format="linespecific"> +... + uac_reg_refresh("account123"); ... </programlisting> </example>

1 0

git:master:f5628c8c: uac: exported cfg function uac_reg_refresh(luuid)
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: f5628c8cb2d0d0603d56487ce47350914869ec1e URL: https://github.com/kamailio/kamailio/commit/f5628c8cb2d0d0603d56487ce473509… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T10:21:27+02:00 uac: exported cfg function uac_reg_refresh(luuid) --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/f5628c8cb2d0d0603d56487ce473509… Patch: https://github.com/kamailio/kamailio/commit/f5628c8cb2d0d0603d56487ce473509… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 812602e7ef..3b3e22c0a5 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -101,6 +101,7 @@ static int w_uac_reg_status(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); static int w_uac_reg_enable(struct sip_msg* msg, char* pfilter, char* pval); static int w_uac_reg_disable(struct sip_msg* msg, char* pfilter, char* pval); +static int w_uac_reg_refresh(struct sip_msg* msg, char* pluuid, char* p2); static int mod_init(void); static void mod_destroy(void); static int child_init(int rank); @@ -136,10 +137,12 @@ static cmd_export_t cmds[]={ {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, fixup_spve_igp, fixup_free_spve_igp, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE }, - {"uac_reg_enable", (cmd_function)w_uac_reg_enable, 1, fixup_spve_spve, + {"uac_reg_enable", (cmd_function)w_uac_reg_enable, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE }, - {"uac_reg_disable", (cmd_function)w_uac_reg_disable, 1, fixup_spve_spve, + {"uac_reg_disable", (cmd_function)w_uac_reg_disable, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE }, + {"uac_reg_refresh", (cmd_function)w_uac_reg_refresh, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE }, {"bind_uac", (cmd_function)bind_uac, 1, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -659,6 +662,17 @@ static int w_uac_reg_disable(struct sip_msg* msg, char* pfilter, char* pval) return uac_reg_disable(msg, &sfilter, &sval); } +static int w_uac_reg_refresh(struct sip_msg* msg, char* pluuid, char* p2) +{ + str sluuid; + + if(fixup_get_svalue(msg, (gparam_t*)pluuid, &sluuid)<0) { + LM_ERR("cannot get the local uuid parameter\n"); + return -1; + } + return uac_reg_refresh(msg, &sluuid); +} + static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* pmode) { str sval; @@ -775,6 +789,11 @@ static sr_kemi_t sr_kemi_uac_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("uac"), str_init("uac_reg_refresh"), + SR_KEMIP_INT, uac_reg_refresh, + { 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 } } }; diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 456d725cf4..559e6bd74a 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1483,6 +1483,31 @@ int uac_reg_db_refresh(str *pl_uuid) return -1; } +/** + * + */ +int uac_reg_refresh(sip_msg_t *msg, str *l_uuid) +{ + int ret; + + if(l_uuid==NULL || l_uuid->s==NULL || l_uuid->len<=0) { + LM_ERR("invalid parameters\n"); + return -1; + } + + ret = uac_reg_db_refresh(l_uuid); + if(ret==0) { + LM_WARN("record not found: %.*s\n", l_uuid->len, l_uuid->s); + return -1; + } else if(ret<0) { + LM_WARN("failed to refresh record: %.*s - check log messages\n", + l_uuid->len, l_uuid->s); + return -1; + } + + return 1; +} + /** * */ diff --git a/src/modules/uac/uac_reg.h b/src/modules/uac/uac_reg.h index f8d40b7e14..769966009b 100644 --- a/src/modules/uac/uac_reg.h +++ b/src/modules/uac/uac_reg.h @@ -57,5 +57,6 @@ int uac_reg_request_to(struct sip_msg *msg, str *src, unsigned int mode); int uac_reg_enable(sip_msg_t *msg, str *attr, str *val); int uac_reg_disable(sip_msg_t *msg, str *attr, str *val); +int uac_reg_refresh(sip_msg_t *msg, str *l_uuid); #endif

1 0

git:master:e62355f2: lib/srdb1: support types for unsigned int and unsigned long long
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: e62355f21538f679c56261db155939ec5dc38559 URL: https://github.com/kamailio/kamailio/commit/e62355f21538f679c56261db155939e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T13:21:22+02:00 lib/srdb1: support types for unsigned int and unsigned long long - defined db types DB1_UINT and DB1_UBIGINT --- Modified: src/lib/srdb1/db_ut.c Modified: src/lib/srdb1/db_ut.h Modified: src/lib/srdb1/db_val.c Modified: src/lib/srdb1/db_val.h --- Diff: https://github.com/kamailio/kamailio/commit/e62355f21538f679c56261db155939e… Patch: https://github.com/kamailio/kamailio/commit/e62355f21538f679c56261db155939e…

1 0

git:master:92bff1de: modules: readme files regenerated - blst ... [skip ci]
by Kamailio Dev 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: 92bff1de198bef619809bc008c809148b7129c8b URL: https://github.com/kamailio/kamailio/commit/92bff1de198bef619809bc008c80914… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-05T12:32:04+02:00 modules: readme files regenerated - blst ... [skip ci] --- Modified: src/modules/blst/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/92bff1de198bef619809bc008c80914… Patch: https://github.com/kamailio/kamailio/commit/92bff1de198bef619809bc008c80914…

1 0

git:master:aec6e777: uac: docs for uac_reg_enable() and uac_reg_disable()
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: aec6e77727ffccb5708f03c019aa95d54de66dbb URL: https://github.com/kamailio/kamailio/commit/aec6e77727ffccb5708f03c019aa95d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T12:27:00+02:00 uac: docs for uac_reg_enable() and uac_reg_disable() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aec6e77727ffccb5708f03c019aa95d… Patch: https://github.com/kamailio/kamailio/commit/aec6e77727ffccb5708f03c019aa95d… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 07d5467596..0daac1bdd2 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -901,6 +901,51 @@ failure_route[REMOTE_AUTH] { </programlisting> </example> </section> + <section id="uac.f.uac_reg_enable"> + <title> + <function moreinfo="none">uac_reg_enable(attr, val)</function> + </title> + <para> + Enable a remote registration record based on a filter specified by + attribute and value. The attribute can be: l_uuid, l_username, + r_username or auth_username. The value is what should be matched + against the value of the attribute in the remote registration record. + </para> + <para> + The SIP processing is done on the next timer routine. + </para> + <example> + <title><function>uac_reg_enable</function> usage</title> + <programlisting format="linespecific"> +... + uac_reg_enable("l_uuid", "account123"); +... + </programlisting> + </example> + </section> + + <section id="uac.f.uac_reg_disable"> + <title> + <function moreinfo="none">uac_reg_disable(attr, val)</function> + </title> + <para> + Disable a remote registration record based on a filter specified by + attribute and value. The attribute can be: l_uuid, l_username, + r_username or auth_username. The value is what should be matched + against the value of the attribute in the remote registration record. + </para> + <para> + The SIP processing is done on the next timer routine. + </para> + <example> + <title><function>uac_reg_disable</function> usage</title> + <programlisting format="linespecific"> +... + uac_reg_disable("l_uuid", "account123"); +... + </programlisting> + </example> + </section> </section> <section> <title>Pseudo Variables</title>

1 0

git:master:79e28447: uac: remote registrations - added uac_reg_enable() and uac_reg_disable()
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: 79e2844744a3ab17f4ef6d33d4877048fec4e53d URL: https://github.com/kamailio/kamailio/commit/79e2844744a3ab17f4ef6d33d487704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T12:13:02+02:00 uac: remote registrations - added uac_reg_enable() and uac_reg_disable() - alternatives to the RPC commands to enable/disable remote registrations from kamailio.cfg (e.g., when receiving a registration from upstream) --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/79e2844744a3ab17f4ef6d33d487704… Patch: https://github.com/kamailio/kamailio/commit/79e2844744a3ab17f4ef6d33d487704…

1 0

git:master:3c1b7f5b: blst: docs - better highlighting of examples in readme
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: 3c1b7f5bdfe8d1b99aa314573b73597ba8f5a657 URL: https://github.com/kamailio/kamailio/commit/3c1b7f5bdfe8d1b99aa314573b73597… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T01:43:57+02:00 blst: docs - better highlighting of examples in readme --- Modified: src/modules/blst/doc/blst_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c1b7f5bdfe8d1b99aa314573b73597… Patch: https://github.com/kamailio/kamailio/commit/3c1b7f5bdfe8d1b99aa314573b73597… --- diff --git a/src/modules/blst/doc/blst_functions.xml b/src/modules/blst/doc/blst_functions.xml index d0dd749fe3..0161f688df 100644 --- a/src/modules/blst/doc/blst_functions.xml +++ b/src/modules/blst/doc/blst_functions.xml @@ -152,7 +152,9 @@ if (msg_status==503){ # blacklist 503 source for Retry-After seconds <example> <title><function>blst_set_ignore</function> usage</title> <programlisting> +... blst_set_ignore(6); # ignore send and connect errors +... </programlisting> </example> </section> @@ -181,7 +183,9 @@ if (msg_status==503){ # blacklist 503 source for Retry-After seconds <example> <title><function>blst_clear_ignore</function> usage</title> <programlisting> +... blst_clear_ignore(4); # ignore connect errors +... </programlisting> </example> </section>

1 0

git:master:7f034bf8: nat_traversal: use ipv6 address with surrounding square brackets in pv value
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: 7f034bf845eb65beaf2dc09594ab496998aa97a7 URL: https://github.com/kamailio/kamailio/commit/7f034bf845eb65beaf2dc09594ab496… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T01:16:57+02:00 nat_traversal: use ipv6 address with surrounding square brackets in pv value --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/7f034bf845eb65beaf2dc09594ab496… Patch: https://github.com/kamailio/kamailio/commit/7f034bf845eb65beaf2dc09594ab496… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d8b2c0bf2d..7f4fc059c4 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -2094,15 +2094,15 @@ static int pv_get_keepalive_socket( } -static int pv_get_source_uri( - struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +static int pv_get_source_uri(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { static char uri[128]; if(msg == NULL || res == NULL) return -1; - snprintf(uri, 64, "sip:%s:%d", ip_addr2a(&msg->rcv.src_ip), + uri[0] = '\0'; + snprintf(uri, 64, "sip:%s:%d", ip_addr2strz(&msg->rcv.src_ip), msg->rcv.src_port); switch(msg->rcv.proto) {

1 0

git:master:1d53ea3d: sdpops: exported sdp with media functions to kemi framework
by Daniel-Constantin Mierla 04 Jul '18

04 Jul '18

Module: kamailio Branch: master Commit: 1d53ea3dba4e59b05b2e92ecc973c44159b9bb36 URL: https://github.com/kamailio/kamailio/commit/1d53ea3dba4e59b05b2e92ecc973c44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-04T13:06:48+02:00 sdpops: exported sdp with media functions to kemi framework --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1d53ea3dba4e59b05b2e92ecc973c44… Patch: https://github.com/kamailio/kamailio/commit/1d53ea3dba4e59b05b2e92ecc973c44… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 8b28a35ddb..b47f824e33 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2013,6 +2013,16 @@ static sr_kemi_t sr_kemi_sdpops_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sdpops"), str_init("sdp_with_media"), + SR_KEMIP_INT, sdp_with_media, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("sdp_with_active_media"), + SR_KEMIP_INT, sdp_with_active_media, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sdpops"), str_init("sdp_get"), SR_KEMIP_INT, ki_sdp_get, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:450649c4: app_java: Makefile - USE_GCJ set to yes
by Daniel-Constantin Mierla 04 Jul '18

04 Jul '18

Module: kamailio Branch: master Commit: 450649c417a4b1c149185d7d0bdac35e392a89c3 URL: https://github.com/kamailio/kamailio/commit/450649c417a4b1c149185d7d0bdac35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-04T10:26:56+02:00 app_java: Makefile - USE_GCJ set to yes - be compatible with current behavior to avoid breaking CI and package building procedures --- Modified: src/modules/app_java/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/450649c417a4b1c149185d7d0bdac35… Patch: https://github.com/kamailio/kamailio/commit/450649c417a4b1c149185d7d0bdac35… --- diff --git a/src/modules/app_java/Makefile b/src/modules/app_java/Makefile index 57cbbec757..75128a61d8 100644 --- a/src/modules/app_java/Makefile +++ b/src/modules/app_java/Makefile @@ -7,7 +7,7 @@ include ../../Makefile.defs auto_gen= NAME=app_java.so -USE_GCJ=?no +USE_GCJ ?= yes #DEFS += -DEXTRA_DEBUG

1 0

[kamailio/kamailio] app_java: gcj is been removed from gcc since gcc7 (#1487)
by Victor Seva 04 Jul '18

04 Jul '18

>From debian bugreport https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892538 ``` Source: kamailio Severity: serious Tags: sid buster User: debian-gcc(a)lists.debian.org Usertags: gcj-rm Hi, kamailio depends or build-depends on GCJ. GCJ has been dropped upstream since GCC 7, so we are dropping it from Debian. Thus please either drop support for GCJ if you are just building an alternative package with GCJ support (e.g. ant-gcj, ecj-gcj) or switch to default-jdk / default-jre as appropriate. Cheers, Emilio ``` >From https://gcc.gnu.org/gcc-7/changes.html ``` Java (GCJ) The GCC Java frontend and associated libjava runtime library have been removed from GCC. ``` Can the ``app_java`` module be built with openjdk-9-jdk? -- 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/1487

3 4

git:master:3422f3c8: app_java: Makefile - condition on USE_GCJ to compile with gcc or not
by Daniel-Constantin Mierla 04 Jul '18

04 Jul '18

Module: kamailio Branch: master Commit: 3422f3c87b9d19444723cf59d30665cb49019127 URL: https://github.com/kamailio/kamailio/commit/3422f3c87b9d19444723cf59d30665c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-04T10:21:25+02:00 app_java: Makefile - condition on USE_GCJ to compile with gcc or not - GH #1487, patch built reusing part of the one from A. Messina - set USE_GCJ=yes if OS has GCC with Java compiler, by default it is USE_GCJ=no (gcc 7 has removed gcj) --- Modified: src/modules/app_java/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3422f3c87b9d19444723cf59d30665c… Patch: https://github.com/kamailio/kamailio/commit/3422f3c87b9d19444723cf59d30665c… --- diff --git a/src/modules/app_java/Makefile b/src/modules/app_java/Makefile index c925b41fee..57cbbec757 100644 --- a/src/modules/app_java/Makefile +++ b/src/modules/app_java/Makefile @@ -7,6 +7,8 @@ include ../../Makefile.defs auto_gen= NAME=app_java.so +USE_GCJ=?no + #DEFS += -DEXTRA_DEBUG DIST = $(shell if [ -f "/etc/redhat-release" ]; then cat /etc/redhat-release | sed "s/.*$[0-9]$\.[0-9].*/\1/g"; fi) @@ -16,20 +18,39 @@ DEFS += $(shell pkg-config libgcj-4.4 --cflags) LIBS += $(shell pkg-config libgcj-4.4 --cflags) -L$(JVM_PATH) -ljvm else # try to detect JAVA_HOME +ifeq ($(USE_GCJ),yes) JAVA_HOME ?= $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::") DEFS += $(shell pkg-config libgcj --cflags) -I$(JAVA_HOME)/include LIBS += $(shell pkg-config libgcj --libs) -L$(JAVA_HOME)/lib -ljvm +else +ifeq ($(ARCH),i386) +ATYPE=i386 +else ifeq ($(ARCH),x86_64) +ATYPE=amd64 +endif +JAVA_HOME ?= /usr/lib/jvm/java +DEFS += -I$(JAVA_HOME)/include +LIBS += -L$(JAVA_HOME)/jre/lib/$(ATYPE)/server -ljvm +endif # On Debian 7.5 there is a bug with JAVA_HOME detection. # $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::") points to perl wrapper script (/usr/bin/gcj-wrapper-4.7) # whereas the real compiler is at /usr/bin/gcj-4.7. As the result, JAVA_HOME will not be a directory, that is incorrect. # At this point I don't see any universal method as explicit setting this variable at the compile phase. # -- ez +ifeq ($(USE_GCJ),yes) ifeq ($(shell [ -d "${JAVA_HOME}" -a -f "$(JAVA_HOME)/include/jni.h" -a -f "$(JAVA_HOME)/lib/libjvm.so" ] && echo 1 || echo 0),0) ifneq ($(DOCBUILD),yes) $(error Cannot locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java) endif endif +else +ifeq ($(shell [ -d "${JAVA_HOME}" -a -f "$(JAVA_HOME)/include/jni.h" -a -f "$(JAVA_HOME)/jre/lib/$(ATYPE)/server/libjvm.so" ] && echo 1 || echo 0),0) +ifneq ($(DOCBUILD),yes) +$(error Cannot locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java) +endif +endif +endif ifeq ($(OS), freebsd) LIBS+=-pthread @@ -40,8 +61,10 @@ endif endif # disable optimisation for segfaults debugging +ifeq ($(USE_GCJ),yes) INCLUDE += -O0 -g INCLUDES += -O0 -g +endif DEFS+=-DKAMAILIO_MOD_INTERFACE

1 0

[kamailio/kamailio] when using jsonrpcc module it reports as follow (#1520)
by theblackworld 04 Jul '18

04 Jul '18

May 3 20:18:09 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:488]: connect_servers(): Connecting to servers for priority 2: May 3 20:18:09 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:494]: connect_servers(): Connected to host 219.216.65.195 on port 9999 May 3 20:18:09 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46726]: INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46708]: INFO: jsonrpc-c [jsonrpc_request.c:66]: jsonrpc_request(): jsonrp_requestctmb address is 0x7f741674e440 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46708]: ERROR: jsonrpc-c [jsonrpc_request.c:94]: jsonrpc_request(): START TM MODULE May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46708]: ERROR: jsonrpc-c [jsonrpc_request.c:95]: jsonrpc_request(): hash is 4976 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46708]: ERROR: jsonrpc-c [jsonrpc_request.c:96]: jsonrpc_request(): label is 181128518 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:189]: cmd_pipe_cb(): SEND STRING IS87:{ "id": 2, "jsonrpc": "2.0", "method": "start", "params": { "sdp": "aa", "id": 1000 } }, May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: ERROR: jsonrpc-c [netstring.c:73]: netstring_read_fd(): bytes is 99 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: ERROR: jsonrpc-c [netstring.c:74]: netstring_read_fd(): read_len is 99 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:281]: socket_cb(): NETSTRING IS{"jsonrpc":"2.0","id":2,"result":"This is result!","params":{"sdpAnswer":"This is sdpAnswer!"}} May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc.c:96]: handle_jsonrpc_response(): id is 2 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc.c:105]: handle_jsonrpc_response(): GET THE RESULT step one May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc.c:107]: handle_jsonrpc_response(): PROCESS THE STEP TWO May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:130]: result_cb(): 2 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:134]: result_cb(): action s address 0x7f741b3b73c0 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:135]: result_cb(): action ss adress 0x7ffe40907dd0 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:136]: result_cb(): t_hash4976 May 3 20:18:19 lwm-PowerEdge-R720 kernel: [4074069.476634] kamailio[46727]: segfault at 38 ip 00007f7418b148a0 sp 00007ffe40907580 error 4 in tm.so[7f7418a50000+11e000] May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:137]: result_cb(): t_label181128518 May 3 20:18:19 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46727]: INFO: jsonrpc-c [jsonrpc_io.c:140]: result_cb(): tmb address is 0x7f741674e440 May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46745]: CRITICAL: <core> [pass_fd.c:277]: receive_fd(): EOF on 5 May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46694]: ALERT: <core> [main.c:727]: handle_sigs(): child process 46727 exited by a signal 11 May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46694]: ALERT: <core> [main.c:730]: handle_sigs(): core was generated May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46694]: INFO: <core> [main.c:743]: handle_sigs(): terminating due to SIGCHLD May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46745]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46743]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46741]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46726]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46700]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46699]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46697]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46701]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46712]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46703]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46708]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46716]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46702]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46695]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46704]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46698]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46710]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46731]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46733]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received May 3 20:18:20 lwm-PowerEdge-R720 /usr/local/sbin/kamailio[46696]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received -- 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/1520

2 10

[kamailio/kamailio] gentoo can be removed from the install documentation (#1530)
by noci2012 04 Jul '18

04 Jul '18

AFAICT kamailio ebuild was removed from net-misc quite some time ago. -- 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/1530

2 2

git:master:94902f67: INSTALL: removed notes for gentoo
by Daniel-Constantin Mierla 04 Jul '18

04 Jul '18

Module: kamailio Branch: master Commit: 94902f678ffa31fbb6f3a0231730d7d6bd2239a1 URL: https://github.com/kamailio/kamailio/commit/94902f678ffa31fbb6f3a0231730d7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-04T10:06:16+02:00 INSTALL: removed notes for gentoo - GH #1530 --- Modified: INSTALL --- Diff: https://github.com/kamailio/kamailio/commit/94902f678ffa31fbb6f3a0231730d7d… Patch: https://github.com/kamailio/kamailio/commit/94902f678ffa31fbb6f3a0231730d7d… --- diff --git a/INSTALL b/INSTALL index 7b0b68342a..9ebac8abe2 100644 --- a/INSTALL +++ b/INSTALL @@ -545,14 +545,6 @@ C) Quick Start rpm -i <package_name> debian: dpkg -i <package_name> - gentoo: - emerge kamailio - (or if use only stable packets: - ACCEPT_KEYWORDS="~x86" emerge kamailio ) - tar.gz: - cd /; tar zxvf <package_name>_os_arch.tar.gz - (it will install in /usr/local/, and the configuration file in - /usr/local/etc/kamailio/kamailio.cfg) Solaris: gunzip <package_name>.gz ; pkgadd -d <package_name> *BSD: @@ -560,7 +552,7 @@ C) Quick Start 3) Start the server - RPM + gentoo: + RPM: /etc/init.d/kamailio start debian: Kamailio is started automatically after the install @@ -621,8 +613,6 @@ D) Kamailio With Persistent Data Storage (rpm and deb provided, most of the binary tar.gz distributions and the solaris package include it; if it is not present you'll have to rebuild from the source). - For gentoo please include 'mysql' to your USE variable in /etc/make.conf - or give it as variable to the emerge command. 2) install the package rpm -i <package_name>

1 0

[kamailio/kamailio] Problem with re-invite and bye from uas when re-invite fail using topos module (#1571)
by giupand 04 Jul '18

04 Jul '18

### Description Using an instance of Kamailio with topos module loaded in a simple call scenario beetwin UA. When UAS side sends a re-invite to UAC side and UAC refuse the re-invite, the subsequent re-invite or Bye from UAS will be send by kamailio to UAS and not to UAC. #### Reproduction 1. Entablish a call from two kamailio clients with topos module loaded 2. In stable state, UAS side send a re-Invite and UAC Side refuse it with 488 status code. 3. the UAS send another re-Invite but kamailio forward it to UAS ad not to UAC (??????) 4. the UAS send Bye but kamailio forward it to UAS (??????) Without topos the scenario it's ok. #### Log Messages Below syslog with topos grep. Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (0, 0) Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0](76) - x_via2: [SIP/2.0/UDP 10.10.10.133:5060;received=10.10.10.133;branch=z9hG4bK7d5f371d;rport=5060](85) - x_vbranch1: [z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0](46) Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:435]: tps_pack_message(): single record routing by proxy Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [<sip:10.10.10.1;lr>](19) Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [sip:10.10.10.1;lr](17) - bs_contact: [sip:10.10.10.1;lr](17) Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:967]: tps_db_load_branch(): no stored record for <z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0> Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(1) - [Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0#015#012] Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:07:47 kamailio[15385]: {1 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_msg.c:868]: tps_response_received(): handling incoming response Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0](76) - x_via2: [](0) - x_vbranch1: [z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0](46) Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_msg.c:889]: tps_response_received(): loaded dialog a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Via: SIP/2.0/UDP 10.10.10.133:5060;received=10.10.10.133;branch=z9hG4bK7d5f371d;rport=5060#015#012] Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Record-Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:07:47 kamailio[15382]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XBranch: z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0#015#012] Jun 20 14:07:47 kamailio[15382]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:1031]: tps_response_sent(): handling outgoing response Jun 20 14:07:47 kamailio[15382]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.133:5060;received=10.10.10.133;branch=z9hG4bK7d5f371d;rport=5060](85) - x_via2: [](0) - x_vbranch1: [z9hG4bK7d5f371d](15) Jun 20 14:07:47 kamailio[15382]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [<sip:10.10.10.1;lr>](19) - s_rr: [](0) Jun 20 14:07:47 kamailio[15382]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:47 kamailio[15382]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:47 kamailio[15382]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:1061]: tps_response_sent(): loaded branch a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:07:47 kamailio[15382]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:47 kamailio[15382]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_msg.c:868]: tps_response_received(): handling incoming response Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0](76) - x_via2: [](0) - x_vbranch1: [z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0](46) Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_msg.c:889]: tps_response_received(): loaded dialog a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Via: SIP/2.0/UDP 10.10.10.133:5060;received=10.10.10.133;branch=z9hG4bK7d5f371d;rport=5060#015#012] Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Record-Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:07:49 kamailio[15387]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XBranch: z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0#015#012] Jun 20 14:07:49 kamailio[15387]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:1031]: tps_response_sent(): handling outgoing response Jun 20 14:07:49 kamailio[15387]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.133:5060;received=10.10.10.133;branch=z9hG4bK7d5f371d;rport=5060](85) - x_via2: [](0) - x_vbranch1: [z9hG4bK7d5f371d](15) Jun 20 14:07:49 kamailio[15387]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [<sip:10.10.10.1;lr>](19) - s_rr: [](0) Jun 20 14:07:49 kamailio[15387]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:49 kamailio[15387]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:49 kamailio[15387]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:1061]: tps_response_sent(): loaded branch a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:07:49 kamailio[15387]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:49 kamailio[15387]: {2 102 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.133:5060;branch=z9hG4bK6b403646;rport](58) - x_via2: [](0) - x_vbranch1: [z9hG4bK6b403646](15) Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:called@10.10.10.84] Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:07:49 kamailio[15383]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b2a435e-3c19-1#015#012] Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 0) Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.7bf8866b5be3a47127fef55db63f6475.0](76) - x_via2: [SIP/2.0/UDP 10.10.10.133:5060;received=10.10.10.133;branch=z9hG4bK6b403646;rport=5060](85) - x_vbranch1: [z9hG4bK688b.7bf8866b5be3a47127fef55db63f6475.0](46) Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:967]: tps_db_load_branch(): no stored record for <z9hG4bK688b.7bf8866b5be3a47127fef55db63f6475.0> Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} WARNING: topos [tps_storage.c:400]: tps_storage_record(): no local address - do record routing for all initial requests Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(1) - [Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.7bf8866b5be3a47127fef55db63f6475.0#015#012] Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:07:49 kamailio[15383]: {1 102 ACK 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK1068e7dd1B99AC24](54) - x_via2: [](0) - x_vbranch1: [z9hG4bK1068e7dd1B99AC24](23) Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:calling@10.10.10.133] Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:07:54 kamailio[15384]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b2a435e-3c19-1#015#012] Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 0) Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0](76) - x_via2: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK1068e7dd1B99AC24](54) - x_vbranch1: [z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0](46) Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:967]: tps_db_load_branch(): no stored record for <z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0> Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} WARNING: topos [tps_storage.c:400]: tps_storage_record(): no local address - do record routing for all initial requests Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(1) - [Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0#015#012] Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:07:54 kamailio[15384]: {1 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:868]: tps_response_received(): handling incoming response Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0;received=10.10.10.1](96) - x_via2: [](0) - x_vbranch1: [z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0](46) Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:889]: tps_response_received(): loaded dialog a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK1068e7dd1B99AC24#015#012] Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XBranch: z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0#015#012] Jun 20 14:07:54 kamailio[15389]: {2 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 1) Jun 20 14:07:54 kamailio[15389]: {2 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0](76) - x_via2: [](0) - x_vbranch1: [z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0](46) Jun 20 14:07:54 kamailio[15389]: {2 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:54 kamailio[15389]: {2 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:54 kamailio[15389]: {2 1 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:948]: tps_request_sent(): no x-uuid header - nothing to do Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:1031]: tps_response_sent(): handling outgoing response Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK1068e7dd1B99AC24](54) - x_via2: [](0) - x_vbranch1: [z9hG4bK1068e7dd1B99AC24](23) Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:1061]: tps_response_sent(): loaded branch a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:54 kamailio[15389]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK1068e7dd1B99AC24](54) - x_via2: [](0) - x_vbranch1: [z9hG4bK1068e7dd1B99AC24](23) Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:called@10.10.10.84] Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:07:54 kamailio[15388]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b2a435e-3c19-1#015#012] Jun 20 14:07:54 kamailio[15400]: DEBUG: topos [tps_storage.c:813]: tps_db_clean_branches(): cleaning expired branch records Jun 20 14:07:54 kamailio[15400]: DEBUG: topos [tps_storage.c:626]: tps_db_clean_dialogs(): cleaning expired dialog records Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK612ee13388A83F02](54) - x_via2: [](0) - x_vbranch1: [z9hG4bK612ee13388A83F02](23) Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:called@10.10.10.84] Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:08:02 kamailio[15386]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b2a435e-3c19-1#015#012] Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 0) Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKae99.388ff26219073099b423cdf9b636e486.0](76) - x_via2: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK612ee13388A83F02](54) - x_vbranch1: [z9hG4bKae99.388ff26219073099b423cdf9b636e486.0](46) Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:967]: tps_db_load_branch(): no stored record for <z9hG4bKae99.388ff26219073099b423cdf9b636e486.0> Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} WARNING: topos [tps_storage.c:400]: tps_storage_record(): no local address - do record routing for all initial requests Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(1) - [Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKae99.388ff26219073099b423cdf9b636e486.0#015#012] Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:08:02 kamailio[15386]: {1 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:868]: tps_response_received(): handling incoming response Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKae99.388ff26219073099b423cdf9b636e486.0](76) - x_via2: [](0) - x_vbranch1: [z9hG4bKae99.388ff26219073099b423cdf9b636e486.0](46) Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:889]: tps_response_received(): loaded dialog a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK612ee13388A83F02#015#012] Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XBranch: z9hG4bKae99.388ff26219073099b423cdf9b636e486.0#015#012] Jun 20 14:08:02 kamailio[15382]: {2 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 1) Jun 20 14:08:02 kamailio[15382]: {2 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKae99.388ff26219073099b423cdf9b636e486.0](76) - x_via2: [](0) - x_vbranch1: [z9hG4bKae99.388ff26219073099b423cdf9b636e486.0](46) Jun 20 14:08:02 kamailio[15382]: {2 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15382]: {2 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15382]: {2 2 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:948]: tps_request_sent(): no x-uuid header - nothing to do Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:1031]: tps_response_sent(): handling outgoing response Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK612ee13388A83F02](54) - x_via2: [](0) - x_vbranch1: [z9hG4bK612ee13388A83F02](23) Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:1061]: tps_response_sent(): loaded branch a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15382]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK612ee13388A83F02](54) - x_via2: [](0) - x_vbranch1: [z9hG4bK612ee13388A83F02](23) Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:called@10.10.10.84] Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:08:02 kamailio[15387]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b2a435e-3c19-1#015#012] Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK4ee32027442C666](53) - x_via2: [](0) - x_vbranch1: [z9hG4bK4ee32027442C666](22) Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:called@10.10.10.84] Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:08:02 kamailio[15383]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b2a435e-3c19-1#015#012] Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 0) Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0](76) - x_via2: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK4ee32027442C666](53) - x_vbranch1: [z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0](46) Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:967]: tps_db_load_branch(): no stored record for <z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0> Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} WARNING: topos [tps_storage.c:400]: tps_storage_record(): no local address - do record routing for all initial requests Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(1) - [Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0#015#012] Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:08:02 kamailio[15383]: {1 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:868]: tps_response_received(): handling incoming response Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0](76) - x_via2: [](0) - x_vbranch1: [z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0](46) Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:889]: tps_response_received(): loaded dialog a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK4ee32027442C666#015#012] Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XBranch: z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0#015#012] Jun 20 14:08:02 kamailio[15384]: {2 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 1) Jun 20 14:08:02 kamailio[15384]: {2 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0](76) - x_via2: [](0) - x_vbranch1: [z9hG4bKbe99.7954cb39228dc2201c69259c871a3ff5.0](46) Jun 20 14:08:02 kamailio[15384]: {2 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15384]: {2 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15384]: {2 3 INVITE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:948]: tps_request_sent(): no x-uuid header - nothing to do Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:1031]: tps_response_sent(): handling outgoing response Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK4ee32027442C666](53) - x_via2: [](0) - x_vbranch1: [z9hG4bK4ee32027442C666](22) Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:1061]: tps_response_sent(): loaded branch a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15384]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK4ee32027442C666](53) - x_via2: [](0) - x_vbranch1: [z9hG4bK4ee32027442C666](22) Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:called@10.10.10.84] Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:08:02 kamailio[15389]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b2a435e-3c19-1#015#012] Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bKb237f85bB8D0E60A](54) - x_via2: [](0) - x_vbranch1: [z9hG4bKb237f85bB8D0E60A](23) Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:called@10.10.10.84] Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.10.10.1;lr>#015#012] Jun 20 14:08:05 kamailio[15388]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b2a435e-3c19-1#015#012] Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 0) Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK8e99.a500333534052b9c12d899269c955aec.0](76) - x_via2: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bKb237f85bB8D0E60A](54) - x_vbranch1: [z9hG4bK8e99.a500333534052b9c12d899269c955aec.0](46) Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:967]: tps_db_load_branch(): no stored record for <z9hG4bK8e99.a500333534052b9c12d899269c955aec.0> Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} WARNING: topos [tps_storage.c:400]: tps_storage_record(): no local address - do record routing for all initial requests Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(1) - [Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK8e99.a500333534052b9c12d899269c955aec.0#015#012] Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] Jun 20 14:08:05 kamailio[15388]: {1 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_msg.c:868]: tps_response_received(): handling incoming response Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK8e99.a500333534052b9c12d899269c955aec.0](76) - x_via2: [](0) - x_vbranch1: [z9hG4bK8e99.a500333534052b9c12d899269c955aec.0](46) Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_msg.c:889]: tps_response_received(): loaded dialog a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bKb237f85bB8D0E60A#015#012] Jun 20 14:08:06 kamailio[15385]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XBranch: z9hG4bK8e99.a500333534052b9c12d899269c955aec.0#015#012] Jun 20 14:08:06 kamailio[15385]: {2 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:1031]: tps_response_sent(): handling outgoing response Jun 20 14:08:06 kamailio[15385]: {2 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.10.10.84;branch=z9hG4bKb237f85bB8D0E60A](54) - x_via2: [](0) - x_vbranch1: [z9hG4bKb237f85bB8D0E60A](23) Jun 20 14:08:06 kamailio[15385]: {2 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 14:08:06 kamailio[15385]: {2 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 14:08:06 kamailio[15385]: {2 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 438 Jun 20 14:08:06 kamailio[15385]: {2 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:1061]: tps_response_sent(): loaded branch a_uuid [atpsh-5b2a435e-3c19-1] Jun 20 14:08:06 kamailio[15385]: {2 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 438 Jun 20 14:08:06 kamailio[15385]: {2 4 BYE 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133} DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1>#015#012] #### SIP Traffic ##### UAC to kamailio INVITE sip:called@10.10.10.1 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.133:5060;branch=z9hG4bK7d5f371d;rport Max-Forwards: 70 From: <sip:calling@10.10.10.1>;tag=as5018bebf To: <sip:called@10.10.10.1> Contact: <sip:calling@10.10.10.133> Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 CSeq: 102 INVITE User-Agent: abcd UA Date: Thu, 01 Jan 1970 03:07:53 GMT Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, UPDATE Supported: replaces Content-Type: application/sdp Content-Length: 315 ##### kamailio to UAS INVITE sip:called@10.10.10.84 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0 Max-Forwards: 69 From: <sip:calling@10.10.10.1>;tag=as5018bebf To: <sip:called@10.10.10.1> Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 CSeq: 102 INVITE User-Agent: abcd UA Date: Thu, 01 Jan 1970 03:07:53 GMT Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, UPDATE Supported: replaces Content-Type: application/sdp Content-Length: 315 Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1> ##### UAS to Kamailio SIP/2.0 180 Ringing Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0 From: <sip:calling@10.10.10.1>;tag=as5018bebf To: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA CSeq: 102 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Contact: <sip:called@10.10.10.84> User-Agent: zzzzzz UA Allow-Events: conference,talk,hold Accept-Language: it-it,it;q=0.9,en;q=0.8 Content-Length: 0 ##### kamailio to UAC SIP/2.0 180 Ringing From: <sip:calling@10.10.10.1>;tag=as5018bebf To: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA CSeq: 102 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 User-Agent: zzzzzz UA Allow-Events: conference,talk,hold Accept-Language: it-it,it;q=0.9,en;q=0.8 Content-Length: 0 Via: SIP/2.0/UDP 10.10.10.133:5060;received=10.10.10.133;branch=z9hG4bK7d5f371d;rport=5060 Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1> ##### UAS to kamailio SIP/2.0 200 OK Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.276da23c28cfe8037e9da9bbf23e252a.0 From: <sip:calling@10.10.10.1>;tag=as5018bebf To: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA CSeq: 102 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Contact: <sip:called@10.10.10.84> Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER Supported: replaces,100rel User-Agent: zzzzzz UA Allow-Events: conference,talk,hold Accept-Language: it-it,it;q=0.9,en;q=0.8 Content-Type: application/sdp Content-Length: 232 ##### kamailio to UAC SIP/2.0 200 OK From: <sip:calling@10.10.10.1>;tag=as5018bebf To: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA CSeq: 102 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER Supported: replaces,100rel User-Agent: zzzzzz UA Allow-Events: conference,talk,hold Accept-Language: it-it,it;q=0.9,en;q=0.8 Content-Type: application/sdp Content-Length: 232 Via: SIP/2.0/UDP 10.10.10.133:5060;received=10.10.10.133;branch=z9hG4bK7d5f371d;rport=5060 Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1> ##### UAC to kamailio ACK sip:atpsh-5b2a435e-3c19-1@10.10.10.1 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.133:5060;branch=z9hG4bK6b403646;rport Max-Forwards: 70 From: <sip:calling@10.10.10.1>;tag=as5018bebf To: <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA Contact: <sip:calling@10.10.10.133> Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 CSeq: 102 ACK User-Agent: abcd UA Content-Length: 0 ##### kamailio to UAS ACK sip:called@10.10.10.84 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK688b.7bf8866b5be3a47127fef55db63f6475.0 Max-Forwards: 69 From: <sip:calling@10.10.10.1>;tag=as5018bebf To: <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 CSeq: 102 ACK User-Agent: abcd UA Content-Length: 0 Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1> ##### re-invite from UAS to Kamailio INVITE sip:btpsh-5b2a435e-3c19-1@10.10.10.1;transport=udp SIP/2.0 Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK1068e7dd1B99AC24 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 1 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Contact: <sip:called@10.10.10.84> Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Supported: replaces,100rel Allow-Events: conference,talk,hold Max-Forwards: 70 Content-Type: application/sdp Content-Length: 232 ##### re-invite from kamailio to UAC INVITE sip:calling@10.10.10.133 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 1 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Supported: replaces,100rel Allow-Events: conference,talk,hold Max-Forwards: 69 Content-Type: application/sdp Content-Length: 232 Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1> ##### UAC to kamailio SIP/2.0 488 Not acceptable here Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0;received=10.10.10.1 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 CSeq: 1 INVITE Server: abcd UA Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, UPDATE Supported: replaces Content-Length: 0 ##### kamailio to UAC ACK sip:calling@10.10.10.133 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKde99.8bda9a7ca0c860e6d97665f911df7c67.0 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 1 ACK Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Max-Forwards: 69 Content-Length: 0 ##### Kamailio to UAS SIP/2.0 488 Not acceptable here From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 CSeq: 1 INVITE Server: abcd UA Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, UPDATE Supported: replaces Content-Length: 0 Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK1068e7dd1B99AC24 Contact: <sip:btpsh-5b2a435e-3c19-1@10.10.10.1> ##### UAS to Kamailio ACK sip:btpsh-5b2a435e-3c19-1@10.10.10.1;transport=udp SIP/2.0 Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK1068e7dd1B99AC24 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 1 ACK Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Contact: <sip:called@10.10.10.84> Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Max-Forwards: 70 Content-Length: 0 ##### Re-inivte from UAS to Kamailio INVITE sip:btpsh-5b2a435e-3c19-1@10.10.10.1;transport=udp SIP/2.0 Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bK612ee13388A83F02 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 2 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Contact: <sip:called@10.10.10.84> Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Supported: replaces,100rel Allow-Events: conference,talk,hold Max-Forwards: 70 Content-Type: application/sdp Content-Length: 390 ##### Kamailio forward re-invite to UAS ?????? INVITE sip:called@10.10.10.84 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKae99.388ff26219073099b423cdf9b636e486.0 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 2 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Supported: replaces,100rel Allow-Events: conference,talk,hold Max-Forwards: 69 Content-Type: application/sdp Content-Length: 390 Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1> ##### UAS send fail to Kamailio SIP/2.0 491 Request Pending Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bKae99.388ff26219073099b423cdf9b636e486.0 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 2 INVITE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Content-Length: 0 ##### UAS sends Bye to kamailio BYE sip:btpsh-5b2a435e-3c19-1@10.10.10.1;transport=udp SIP/2.0 Via: SIP/2.0/UDP 10.10.10.84;branch=z9hG4bKb237f85bB8D0E60A From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 4 BYE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 Contact: <sip:called@10.10.10.84> User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Max-Forwards: 70 Content-Length: 0 ##### kamailio forward bye to UAS ????? BYE sip:called@10.10.10.84 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK8e99.a500333534052b9c12d899269c955aec.0 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 4 BYE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Max-Forwards: 69 Content-Length: 0 Contact: <sip:atpsh-5b2a435e-3c19-1@10.10.10.1> ##### UAS sends fail to kamailio SIP/2.0 481 Call Leg/Transaction Does Not Exist Via: SIP/2.0/UDP 10.10.10.1;branch=z9hG4bK8e99.a500333534052b9c12d899269c955aec.0 From: "kamailio-pc" <sip:called@10.10.10.1>;tag=2AFD9F0B-7120A8FA To: <sip:calling@10.10.10.1>;tag=as5018bebf CSeq: 4 BYE Call-ID: 4fbdd2941ef56f9d552456304e557e46(a)10.10.10.133 User-Agent: zzzzzz UA Accept-Language: it-it,it;q=0.9,en;q=0.8 Content-Length: 0 ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.2.0-dev6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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 14:05:06 Jun 20 2018 with gcc 5.4.0 -- 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/1571

2 8

git:master:1d784565: core: test if address for IPv6 is IP format in lump substitutions
by Daniel-Constantin Mierla 04 Jul '18

04 Jul '18

Module: kamailio Branch: master Commit: 1d78456562418b785126af09761c12571ef2394d URL: https://github.com/kamailio/kamailio/commit/1d78456562418b785126af09761c125… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-04T09:18:52+02:00 core: test if address for IPv6 is IP format in lump substitutions - reported by GH #1581 --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/1d78456562418b785126af09761c125… Patch: https://github.com/kamailio/kamailio/commit/1d78456562418b785126af09761c125… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 88019b869b..f82d72c3cb 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -646,7 +646,10 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case SUBST_RCV_ALL: \ if (msg->rcv.bind_address){ \ new_len+=recv_address_str->len; \ - if (msg->rcv.bind_address->address.af!=AF_INET) \ + if ((msg->rcv.bind_address->address.af==AF_INET6)\ + && (recv_address_str->s[0]!='[')\ + && (memchr(recv_address_str->s, ':',\ + recv_address_str->len)!=NULL))\ new_len+=2; \ if (recv_port_no!=SIP_PORT){ \ /* add :port_no */ \ @@ -732,7 +735,9 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, if (send_sock){ \ new_len+=send_address_str->len; \ if ((send_sock->address.af==AF_INET6) && \ - (send_address_str->s[0]!='[')) \ + (send_address_str->s[0]!='[')\ + && (memchr(send_address_str->s, ':',\ + send_address_str->len)!=NULL)) \ new_len+=2; \ if ((send_sock->port_no!=SIP_PORT) || \ (send_port_str!=&(send_sock->port_no_str))){ \ @@ -1000,13 +1005,19 @@ void process_lumps( struct sip_msg* msg, case SUBST_RCV_ALL: \ if (msg->rcv.bind_address){ \ /* address */ \ - if (msg->rcv.bind_address->address.af!=AF_INET){\ + if ((msg->rcv.bind_address->address.af==AF_INET6)\ + && (recv_address_str->s[0]!='[')\ + && (memchr(recv_address_str->s, ':',\ + recv_address_str->len)!=NULL)){\ new_buf[offset]='['; offset++; \ }\ memcpy(new_buf+offset, recv_address_str->s, \ recv_address_str->len); \ offset+=recv_address_str->len; \ - if (msg->rcv.bind_address->address.af!=AF_INET){\ + if ((msg->rcv.bind_address->address.af==AF_INET6)\ + && (recv_address_str->s[0]!='[')\ + && (memchr(recv_address_str->s, ':',\ + recv_address_str->len)!=NULL)){\ new_buf[offset]=']'; offset++; \ }\ /* :port */ \ @@ -1092,15 +1103,19 @@ void process_lumps( struct sip_msg* msg, case SUBST_SND_ALL: \ if (send_sock){ \ /* address */ \ - if ((send_sock->address.af!=AF_INET) && \ - (send_address_str->s[0]!='[')){\ + if ((send_sock->address.af==AF_INET6)\ + && (send_address_str->s[0]!='[')\ + && (memchr(send_address_str->s, ':',\ + send_address_str->len)!=NULL)){\ new_buf[offset]='['; offset++; \ }\ memcpy(new_buf+offset, send_address_str->s, \ send_address_str->len); \ offset+=send_address_str->len; \ - if ((send_sock->address.af!=AF_INET) && \ - (send_address_str->s[0]!='[')){\ + if ((send_sock->address.af==AF_INET6)\ + && (send_address_str->s[0]!='[')\ + && (memchr(send_address_str->s, ':',\ + send_address_str->len)!=NULL)){\ new_buf[offset]=']'; offset++; \ }\ /* :port */ \

1 0

git:master:4e2290fa: blst: removed unused parameter
by Daniel-Constantin Mierla 04 Jul '18

04 Jul '18

Module: kamailio Branch: master Commit: 4e2290facad0768daa636df387e438d4ff931588 URL: https://github.com/kamailio/kamailio/commit/4e2290facad0768daa636df387e438d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-04T08:34:06+02:00 blst: removed unused parameter --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/4e2290facad0768daa636df387e438d… Patch: https://github.com/kamailio/kamailio/commit/4e2290facad0768daa636df387e438d… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index e3c5226b91..5fd654feba 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -399,7 +399,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) /** * */ -static int ki_blst_rpl_set_ignore_all(sip_msg_t* msg, int mask) +static int ki_blst_rpl_set_ignore_all(sip_msg_t* msg) { return ki_blst_rpl_set_ignore(msg, 0xff); }

1 0

[kamailio/kamailio] Enhancement on phonenum module: add CountryCode (string) (#1576)
by Joel Serrano 04 Jul '18

04 Jul '18

Currently you have the following information available when using `phonenum_match(num, pvc)` from the `phonenum` module: * number - phone number that is matched * valid - 1 if the matched number has a valid result; 0 otherwise * normalized - normalized phone number * cctel - country code for phone number * ltype - local network type * ndesc - phone number description * error - error string if phone number matching fails. It would be useful to have access also to the `cc` information. Right now, `cctel` outputs the country code (digits) for the number. Example: +34123456789 --> cctel = 34 The enhancement would be to add the country code (string) for the number (maybe in the `cc` position?): +34123456789 --> cc = ES Having a look at the phonenum module code (`cphonenumber.cpp`), I understand (with my very little idea of C) that country code (string) information is in fact used to get the country code (digits). So I think it would be only a matter of returning one more key:value: https://github.com/kamailio/kamailio/blob/master/src/modules/phonenum/cphon… ``` string regionCode; _phoneUtil.GetRegionCodeForNumber(parsedNumber, &regionCode); res->cctel = _phoneUtil.GetCountryCodeForRegion(regionCode); ``` Something like (pseudocode, this obviously doesn't work but gives the idea): ``` string regionCode; _phoneUtil.GetRegionCodeForNumber(parsedNumber, &regionCode); res->cctel = _phoneUtil.GetCountryCodeForRegion(regionCode); res->cc = regionCode; ``` So then later in kamailio you can do for example: ```xlog("L_INFO", "Call from $phn(src=>cc) to $phn(dst=>cc)\n");``` I have also seen that a function to provide this info exists in the module level, but I haven't seen it used anywhere else but the declaration: https://github.com/kamailio/kamailio/blob/master/src/modules/phonenum/cphon… This feels like a really easy change and I tried to do it myself, but I didn't manage to get through the complete path from "getting the info" to "making it available in the pvc" so here I am asking for help. Thanks! -- 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/1576

2 3

git:master:f5ef3919: blst: more functions exported to kemi framework
by Daniel-Constantin Mierla 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: f5ef3919b42541ac6daa1c3ea2ed7c1707f4dd01 URL: https://github.com/kamailio/kamailio/commit/f5ef3919b42541ac6daa1c3ea2ed7c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-03T15:59:48+02:00 blst: more functions exported to kemi framework --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/f5ef3919b42541ac6daa1c3ea2ed7c1… Patch: https://github.com/kamailio/kamailio/commit/f5ef3919b42541ac6daa1c3ea2ed7c1…

1 0

git:master:b87b6523: modules: readme files regenerated - benchmark ... [skip ci]
by Kamailio Dev 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: b87b65237401420328b2afccdec69f45f1ada826 URL: https://github.com/kamailio/kamailio/commit/b87b65237401420328b2afccdec69f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-03T15:01:37+02:00 modules: readme files regenerated - benchmark ... [skip ci] --- Modified: src/modules/benchmark/README --- Diff: https://github.com/kamailio/kamailio/commit/b87b65237401420328b2afccdec69f4… Patch: https://github.com/kamailio/kamailio/commit/b87b65237401420328b2afccdec69f4… --- diff --git a/src/modules/benchmark/README b/src/modules/benchmark/README index c69987a9af..425324d110 100644 --- a/src/modules/benchmark/README +++ b/src/modules/benchmark/README @@ -52,6 +52,8 @@ Bastian Friedrich 6.2. benchmark.enable_timer 6.3. benchmark.granularity 6.4. benchmark.loglevel + 6.5. benchmark.timer_list + 6.6. benchmark.timer_name_list 7. Example of usage @@ -74,7 +76,9 @@ Bastian Friedrich 1.5. bm_start_timer usage 1.6. bm_log_timer usage 1.7. Enabling a timer - 1.8. benchmark usage + 1.8. List all timers + 1.9. List one timer + 1.10. benchmark usage 2.1. Using the benchmark module's API from another module Chapter 1. Admin Guide @@ -109,6 +113,8 @@ Chapter 1. Admin Guide 6.2. benchmark.enable_timer 6.3. benchmark.granularity 6.4. benchmark.loglevel + 6.5. benchmark.timer_list + 6.6. benchmark.timer_name_list 7. Example of usage @@ -276,6 +282,8 @@ bm_log_timer("test"); 6.2. benchmark.enable_timer 6.3. benchmark.granularity 6.4. benchmark.loglevel + 6.5. benchmark.timer_list + 6.6. benchmark.timer_name_list 6.1. benchmark.enable_global @@ -300,11 +308,80 @@ kamcmd benchmark.enable_timer test 1 Modifies the module log level. See "loglevel" variable. +6.5. benchmark.timer_list + + List data for all timers (Last complete period and global data) + Displays info close to the one output in the log by using a RPC + structure. period_sum, period_min and period_media show data for last + granularity period already completed. + + Example 1.8. List all timers +... +kamcmd benchmark.timer_list +{ + name: test + state: enabled + id: 0 + granularity: 2 + period_sum: 69 + period_min: 22 + period_max: 47 + period_media: 34.500000 + calls: 4 + sum: 217 + global_min: 22 + global_max: 88 + global_media: 54.250000 +} +{ + name: test2 + state: enabled + id: 1 + granularity: 2 + period_sum: 122 + period_min: 25 + period_max: 97 + period_media: 61.000000 + calls: 4 + sum: 349 + global_min: 25 + global_max: 151 + global_media: 87.250000 +} +... + +6.6. benchmark.timer_name_list + + List data for one timer based on its name (Last complete period and + global data) It displays info close to the one output in the log by + using a RPC structure. period_sum, period_min and period_media show + data for last granularity period already completed. + + Example 1.9. List one timer +... +kamcmd benchmark.timer_name_list test +{ + name: test + state: enabled + id: 0 + granularity: 2 + period_sum: 69 + period_min: 22 + period_max: 47 + period_media: 34.500000 + calls: 4 + sum: 217 + global_min: 22 + global_max: 88 + global_media: 54.250000 +} +... + 7. Example of usage Measure the duration of user location lookup. - Example 1.8. benchmark usage + Example 1.10. benchmark usage ... bm_start_timer("usrloc-lookup"); lookup("location");

1 0

[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

[kamailio/kamailio] Bench branch pull (#1580)
by vhernando 03 Jul '18

03 Jul '18

#### 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 two RPC functions to benchmark module: timer_list and timer_name_list timer_list shows info for every timer (last complete period and global data) timer_name_list shows same info as timer_list but for a timer selected by its name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1580 -- Commit Summary -- * benchmark: RPC commands timer_list and timer_name_list * benchmark: documentation for RPC functions timer_list and timer_name_list -- File Changes -- M src/modules/benchmark/benchmark.c (185) M src/modules/benchmark/benchmark.h (3) M src/modules/benchmark/doc/benchmark_admin.xml (80) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1580.patch https://github.com/kamailio/kamailio/pull/1580.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/1580

2 2

git:master:4ccbb45e: Merge pull request #1580 from kamailio/bench_branch_pull
by GitHub 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: 4ccbb45ecfe5d691ee2a423ffa21f1586ae0cf1b URL: https://github.com/kamailio/kamailio/commit/4ccbb45ecfe5d691ee2a423ffa21f15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-07-03T14:51:18+02:00 Merge pull request #1580 from kamailio/bench_branch_pull Bench branch pull --- Modified: src/modules/benchmark/benchmark.c Modified: src/modules/benchmark/benchmark.h Modified: src/modules/benchmark/doc/benchmark_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ccbb45ecfe5d691ee2a423ffa21f15… Patch: https://github.com/kamailio/kamailio/commit/4ccbb45ecfe5d691ee2a423ffa21f15…

1 0

git:master:71d1c721: benchmark: documentation for RPC functions timer_list and timer_name_list
by Vicente Hernando 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: 71d1c721321d523553ac4975e6c2df95cc56a197 URL: https://github.com/kamailio/kamailio/commit/71d1c721321d523553ac4975e6c2df9… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-07-02T12:33:43+02:00 benchmark: documentation for RPC functions timer_list and timer_name_list --- Modified: src/modules/benchmark/doc/benchmark_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/71d1c721321d523553ac4975e6c2df9… Patch: https://github.com/kamailio/kamailio/commit/71d1c721321d523553ac4975e6c2df9… --- diff --git a/src/modules/benchmark/doc/benchmark_admin.xml b/src/modules/benchmark/doc/benchmark_admin.xml index d01bbc81ee..10f94b2b5c 100644 --- a/src/modules/benchmark/doc/benchmark_admin.xml +++ b/src/modules/benchmark/doc/benchmark_admin.xml @@ -332,6 +332,86 @@ bm_log_timer("test"); Modifies the module log level. See "loglevel" variable. </para> </section> + <section id="benchmark.rpc.timer_list"> + <title><function moreinfo="none">benchmark.timer_list</function></title> + <para> + List data for all timers (Last complete period and global data) + Displays info close to the one output in the log by using a RPC structure. + period_sum, period_min and period_media show data for last granularity + period already completed. + </para> + <example> + <title>List all timers</title> + <programlisting format="linespecific"> +... +&kamcmd; benchmark.timer_list +{ + name: test + state: enabled + id: 0 + granularity: 2 + period_sum: 69 + period_min: 22 + period_max: 47 + period_media: 34.500000 + calls: 4 + sum: 217 + global_min: 22 + global_max: 88 + global_media: 54.250000 +} +{ + name: test2 + state: enabled + id: 1 + granularity: 2 + period_sum: 122 + period_min: 25 + period_max: 97 + period_media: 61.000000 + calls: 4 + sum: 349 + global_min: 25 + global_max: 151 + global_media: 87.250000 +} +... +</programlisting> + </example> + </section> + <section id="benchmark.rpc.timer_name_list"> + <title><function moreinfo="none">benchmark.timer_name_list</function></title> + <para> + List data for one timer based on its name (Last complete period and global data) + It displays info close to the one output in the log by using a RPC structure. + period_sum, period_min and period_media show data for last granularity + period already completed. + </para> + <example> + <title>List one timer</title> + <programlisting format="linespecific"> +... +&kamcmd; benchmark.timer_name_list test +{ + name: test + state: enabled + id: 0 + granularity: 2 + period_sum: 69 + period_min: 22 + period_max: 47 + period_media: 34.500000 + calls: 4 + sum: 217 + global_min: 22 + global_max: 88 + global_media: 54.250000 +} +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:91e84d94: benchmark: RPC commands timer_list and timer_name_list
by Vicente Hernando 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: 91e84d94cb267bf6f16e97b535433fee19a184a6 URL: https://github.com/kamailio/kamailio/commit/91e84d94cb267bf6f16e97b535433fe… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-07-02T11:17:22+02:00 benchmark: RPC commands timer_list and timer_name_list --- Modified: src/modules/benchmark/benchmark.c Modified: src/modules/benchmark/benchmark.h --- Diff: https://github.com/kamailio/kamailio/commit/91e84d94cb267bf6f16e97b535433fe… Patch: https://github.com/kamailio/kamailio/commit/91e84d94cb267bf6f16e97b535433fe…

1 0

git:master:a8d4ca29: topos: detect first direction for dlg requests before linking contact
by Daniel-Constantin Mierla 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: a8d4ca293dba19b4b44110e9e7f5be71ce3c090b URL: https://github.com/kamailio/kamailio/commit/a8d4ca293dba19b4b44110e9e7f5be7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-03T09:50:46+02:00 topos: detect first direction for dlg requests before linking contact - related to GH #1571 --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/a8d4ca293dba19b4b44110e9e7f5be7… Patch: https://github.com/kamailio/kamailio/commit/a8d4ca293dba19b4b44110e9e7f5be7… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 0027a08203..41cb7ef416 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -936,7 +936,7 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) memset(&mtsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t)); memset(&stsd, 0, sizeof(tps_data_t)); - ptsd = &mtsd; + ptsd = NULL; if(tps_pack_message(msg, &mtsd)<0) { LM_ERR("failed to extract and pack the headers\n"); @@ -956,14 +956,6 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) tps_storage_lock_get(&lkey); - if(tps_storage_load_branch(msg, &mtsd, &btsd, 0)!=0) { - if(tps_storage_record(msg, ptsd, dialog)<0) { - goto error; - } - } else { - ptsd = &btsd; - } - if(dialog!=0) { if(tps_storage_load_dialog(msg, &mtsd, &stsd)==0) { ptsd = &stsd; @@ -975,6 +967,16 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) mtsd.direction = direction; } + if(tps_storage_load_branch(msg, &mtsd, &btsd, 0)!=0) { + if(tps_storage_record(msg, &mtsd, dialog, direction)<0) { + goto error; + } + } else { + if(ptsd==NULL) ptsd = &btsd; + } + + if(ptsd==NULL) ptsd = &mtsd; + /* local generated requests */ if(local) { /* ACK and CANCEL go downstream */ diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 5e0e87b249..08bf15ec8a 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -360,7 +360,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) } } - LM_DBG("downstream: %s acontact: [%.*s] bcontact: [%.*s]\n", + LM_DBG("downstream: %s - acontact: [%.*s] - bcontact: [%.*s]\n", (dir==TPS_DIR_DOWNSTREAM)?"yes":"no", td->a_contact.len, (td->a_contact.len>0)?td->a_contact.s:"", td->b_contact.len, (td->b_contact.len>0)?td->b_contact.s:""); @@ -374,7 +374,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) /** * */ -int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) +int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog, int dir) { int ret = -1; /* error if dialog == 0 */ str suid; @@ -399,7 +399,7 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) ret = tps_storage_fill_contact(msg, td, &suid, TPS_DIR_UPSTREAM); if(ret<0) goto error; - ret = tps_storage_link_msg(msg, td, TPS_DIR_DOWNSTREAM); + ret = tps_storage_link_msg(msg, td, dir); if(ret<0) goto error; if(dialog==0) { if(td->as_contact.len <= 0 && td->bs_contact.len <= 0) { diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index c10c3f2699..fc69ccca4c 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -87,7 +87,7 @@ int tps_storage_branch_find(sip_msg_t *msg, tps_data_t *td); int tps_storage_branch_save(sip_msg_t *msg, tps_data_t *td); int tps_storage_branch_rm(sip_msg_t *msg, tps_data_t *td); -int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog); +int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog, int dir); int tps_storage_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, uint32_t mode); int tps_storage_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd,

1 0

git:master:3c12f9da: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: 3c12f9dacab41ef38dec5c4f53732f8e03308ea0 URL: https://github.com/kamailio/kamailio/commit/3c12f9dacab41ef38dec5c4f53732f8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-03T09:01:40+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/3c12f9dacab41ef38dec5c4f53732f8… Patch: https://github.com/kamailio/kamailio/commit/3c12f9dacab41ef38dec5c4f53732f8… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 4a6f4d7183..de5363ea56 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -33,10 +33,12 @@ Daniel-Constantin Mierla 3.6. dialog_expire (int) 3.7. clean_interval (int) 3.8. event_callback (str) + 3.9. event_mode (int) 4. Event Routes 4.1. event_route[topos:msg-outgoing] + 4.2. event_route[topos:msg-sending] List of Examples @@ -48,7 +50,9 @@ Daniel-Constantin Mierla 1.6. Set dialog_expire parameter 1.7. Set clean_interval parameter 1.8. Set event_callback parameter - 1.9. Usage of event_route[topos:msg-outgoing] + 1.9. Set event_mode parameter + 1.10. Usage of event_route[topos:msg-outgoing] + 1.11. Usage of event_route[topos:msg-sending] Chapter 1. Admin Guide @@ -70,10 +74,12 @@ Chapter 1. Admin Guide 3.6. dialog_expire (int) 3.7. clean_interval (int) 3.8. event_callback (str) + 3.9. event_mode (int) 4. Event Routes 4.1. event_route[topos:msg-outgoing] + 4.2. event_route[topos:msg-sending] 1. Overview @@ -119,6 +125,7 @@ Chapter 1. Admin Guide 3.6. dialog_expire (int) 3.7. clean_interval (int) 3.8. event_callback (str) + 3.9. event_mode (int) 3.1. storage (str) @@ -227,9 +234,23 @@ function ksr_topos_event(evname) end ... +3.9. event_mode (int) + + Control what event_route blocks to be executed. It is a bitmask of: 1 - + execute event_route[topos:outgoing]; 2 - execute + event_route[topos:sending]. + + Default value is 3 (execute both event_route blocks). + + Example 1.9. Set event_mode parameter +... +modparam("topos", "event_mode", 2) +... + 4. Event Routes 4.1. event_route[topos:msg-outgoing] + 4.2. event_route[topos:msg-sending] 4.1. event_route[topos:msg-outgoing] @@ -243,7 +264,7 @@ end reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.9. Usage of event_route[topos:msg-outgoing] + Example 1.10. Usage of event_route[topos:msg-outgoing] ... event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -251,3 +272,22 @@ event_route[topos:msg-outgoing] { } } ... + +4.2. event_route[topos:msg-sending] + + It is executed before doing topology stripping processing for a SIP + message to be sent out, being executed after + event_route[topos:sending]. + + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is the one to + be sent out. + + Example 1.11. Usage of event_route[topos:msg-sending] +... +event_route[topos:msg-sending] { + if(is_request() and $fU=="alice") { + drop; + } +} +...

1 0

git:master:8505c9ea: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: 8505c9eacdd95f21600ba1c45d7e746eb1c6b980 URL: https://github.com/kamailio/kamailio/commit/8505c9eacdd95f21600ba1c45d7e746… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-03T08:32:08+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/8505c9eacdd95f21600ba1c45d7e746… Patch: https://github.com/kamailio/kamailio/commit/8505c9eacdd95f21600ba1c45d7e746… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 90f06f2a92..fe7cf03ec7 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -165,6 +165,7 @@ if(phonenum_match_cn("1-484-555-8888", "US", "src")) { otherwise + normalized - normalized phone number + cctel - country code for phone number + + ccname - country code name + ltype - local network type + ndesc - phone number description + error - error string if phone number matching fails.

1 0

git:master:675f2d6e: phonenum: added ccname attribute
by Daniel-Constantin Mierla 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: 675f2d6eef14bc77e82fc9677208a7f507236f33 URL: https://github.com/kamailio/kamailio/commit/675f2d6eef14bc77e82fc9677208a7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-02T21:51:26+02:00 phonenum: added ccname attribute - get code for country name - GH #1576 --- Modified: src/modules/phonenum/cphonenumber.cpp Modified: src/modules/phonenum/cphonenumber.h Modified: src/modules/phonenum/phonenum_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/675f2d6eef14bc77e82fc9677208a7f… Patch: https://github.com/kamailio/kamailio/commit/675f2d6eef14bc77e82fc9677208a7f… --- diff --git a/src/modules/phonenum/cphonenumber.cpp b/src/modules/phonenum/cphonenumber.cpp index b723543f55..60f5039c88 100644 --- a/src/modules/phonenum/cphonenumber.cpp +++ b/src/modules/phonenum/cphonenumber.cpp @@ -138,6 +138,7 @@ telnum_t* telnum_parse(char* number, char* region) string regionCode; _phoneUtil.GetRegionCodeForNumber(parsedNumber, &regionCode); res->cctel = _phoneUtil.GetCountryCodeForRegion(regionCode); + res->ccname = strdup(regionCode.c_str()); return res; } @@ -154,6 +155,7 @@ telnum_t* telnum_new(char* number) tn->normalized = NULL; tn->ltype = NULL; tn->ndesc = NULL; + tn->ccname = NULL; tn->error = NULL; return tn; } @@ -178,5 +180,8 @@ void telnum_free(telnum_t* tn) if (tn->ndesc) { free(tn->ndesc); } + if (tn->ccname) { + free(tn->ccname); + } free(tn); } diff --git a/src/modules/phonenum/cphonenumber.h b/src/modules/phonenum/cphonenumber.h index 7ac06ab1da..ab73b938fd 100644 --- a/src/modules/phonenum/cphonenumber.h +++ b/src/modules/phonenum/cphonenumber.h @@ -34,6 +34,7 @@ typedef struct telnum { char* normalized; char* ltype; char* ndesc; + char* ccname; char* error; int cctel; int valid; diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index 31f60a6428..a34382239a 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -181,6 +181,8 @@ int pv_parse_phonenum_name(pv_spec_p sp, str *in) case 6: if(strncmp(pvs.s, "number", 6) == 0) gpv->type = 0; + else if(strncmp(pvs.s, "ccname", 6) == 0) + gpv->type = 7; else goto error; break; @@ -255,6 +257,10 @@ int pv_get_phonenum(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, gpv->item->r.record->cctel); case 6: /* valid */ return pv_get_sintval(msg, param, res, gpv->item->r.record->valid); + case 7: /* ccname */ + if(gpv->item->r.record->ccname==NULL) + return pv_get_null(msg, param, res); + return pv_get_strzval(msg, param, res, gpv->item->r.record->ccname); default: /* number */ if(gpv->item->r.record->number==NULL) return pv_get_null(msg, param, res);

1 0

git:master:a6c5ec17: phonenum: listed ccname attribute for cfg variable
by Daniel-Constantin Mierla 03 Jul '18

03 Jul '18

Module: kamailio Branch: master Commit: a6c5ec17ed37e901b6d2a01e691e130a8a96e3c2 URL: https://github.com/kamailio/kamailio/commit/a6c5ec17ed37e901b6d2a01e691e130… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-03T08:22:19+02:00 phonenum: listed ccname attribute for cfg variable --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a6c5ec17ed37e901b6d2a01e691e130… Patch: https://github.com/kamailio/kamailio/commit/a6c5ec17ed37e901b6d2a01e691e130… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index 8715e821c1..ab62660ccf 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -178,6 +178,9 @@ if(phonenum_match_cn("1-484-555-8888", "US", "src")) { <listitem><para> <emphasis>cctel</emphasis> - country code for phone number </para></listitem> + <listitem><para> + <emphasis>ccname</emphasis> - country code name + </para></listitem> <listitem><para> <emphasis>ltype</emphasis> - local network type </para></listitem>

1 0

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] Additional dispatcher RPC calls (#1578)
by alexsosic 02 Jul '18

02 Jul '18

Hi, we were wondering if it's possible to have additional RPC calls for the dispatcher module in order to be able to: - add a new dispatcher - delete an existing dispatcher - modify an existing dispatcher (optional) Kind regards, Alex -- 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/1578

2 2

git:master:961c2b3d: tm: more explicit debug message when not matching reply to transaction
by Daniel-Constantin Mierla 02 Jul '18

02 Jul '18

Module: kamailio Branch: master Commit: 961c2b3df008bb6df78c2e62dc943ebacd4db9b2 URL: https://github.com/kamailio/kamailio/commit/961c2b3df008bb6df78c2e62dc943eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-02T12:53:04+02:00 tm: more explicit debug message when not matching reply to transaction --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/961c2b3df008bb6df78c2e62dc943eb… Patch: https://github.com/kamailio/kamailio/commit/961c2b3df008bb6df78c2e62dc943eb… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 494afd457c..dde02343cb 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -882,13 +882,13 @@ int t_reply_matching( struct sip_msg *p_msg , int *p_branch ) /* sanity check */ if (unlikely(reverse_hex2int(hashi, hashl, &hash_index)<0 - ||hash_index>=TABLE_ENTRIES + || hash_index>=TABLE_ENTRIES || reverse_hex2int(branchi, branchl, &branch_id)<0 || branch_id>=sr_dst_max_branches || loopl!=MD5_LEN) ) { - LM_DBG("poor reply labels %d label %d branch %d\n", - hash_index, entry_label, branch_id ); + LM_DBG("poor reply ids - index %d label %d branch %d loopl %d/%d\n", + hash_index, entry_label, branch_id, loopl, MD5_LEN); goto nomatch2; }

1 0

git:master:30745c2b: blst: exported several functions to kemi framework
by Daniel-Constantin Mierla 02 Jul '18

02 Jul '18

Module: kamailio Branch: master Commit: 30745c2b92e526d7f352a56bc4e292fe2d36ee92 URL: https://github.com/kamailio/kamailio/commit/30745c2b92e526d7f352a56bc4e292f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-02T10:02:50+02:00 blst: exported several functions to kemi framework --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/30745c2b92e526d7f352a56bc4e292f… Patch: https://github.com/kamailio/kamailio/commit/30745c2b92e526d7f352a56bc4e292f…

1 0

git:master:aa4f8532: blst: export functions to ANY_ROUTE
by Daniel-Constantin Mierla 02 Jul '18

02 Jul '18

Module: kamailio Branch: master Commit: aa4f8532ea5a85245216bf4e8fb4e07e37db76ed URL: https://github.com/kamailio/kamailio/commit/aa4f8532ea5a85245216bf4e8fb4e07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-02T09:42:15+02:00 blst: export functions to ANY_ROUTE - simplified from masking route types --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/aa4f8532ea5a85245216bf4e8fb4e07… Patch: https://github.com/kamailio/kamailio/commit/aa4f8532ea5a85245216bf4e8fb4e07…

1 0

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

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

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

git:master:99472814: Modules: Evapi async_relay export to kemi
by surendratiwari3 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 99472814b19f50e30beda1840c5e969938027cac URL: https://github.com/kamailio/kamailio/commit/99472814b19f50e30beda1840c5e969… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Committer: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-06-13T03:08:52Z Modules: Evapi async_relay export to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/99472814b19f50e30beda1840c5e969… Patch: https://github.com/kamailio/kamailio/commit/99472814b19f50e30beda1840c5e969… --- 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

git:5.1:e8b2bf9d: Merge pull request #1572 from christoph-v/bugfix_prm18_0001045_contact_remove_5.1
by GitHub 22 Jun '18

22 Jun '18

Module: kamailio Branch: 5.1 Commit: e8b2bf9deedfd83d38996d8c5c37761e0e5dcde2 URL: https://github.com/kamailio/kamailio/commit/e8b2bf9deedfd83d38996d8c5c37761… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-22T10:28:36+02:00 Merge pull request #1572 from christoph-v/bugfix_prm18_0001045_contact_remove_5.1 ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/e8b2bf9deedfd83d38996d8c5c37761… Patch: https://github.com/kamailio/kamailio/commit/e8b2bf9deedfd83d38996d8c5c37761… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 6510d85aa1..20c8a64154 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1102,10 +1102,11 @@ int remove_impucontact_from_list(impurecord_t* impu, impu_contact_t *impucontact } else if (contact == impu->linked_contacts.tail->contact) { LM_DBG("deleting tail\n"); impu->linked_contacts.tail = impu->linked_contacts.tail->prev; + impu->linked_contacts.tail->next = 0; } else { LM_DBG("deleting mid list\n"); impucontact->prev->next = impucontact->next; - impucontact->prev = impucontact->next->prev; + impucontact->next->prev = impucontact->prev; } impu->linked_contacts.numcontacts--;

1 0

git:5.1:4e90aea7: ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact
by Christoph Valentin 22 Jun '18

22 Jun '18

Module: kamailio Branch: 5.1 Commit: 4e90aea7f06595d253c2f69b178ca7a2ce415aca URL: https://github.com/kamailio/kamailio/commit/4e90aea7f06595d253c2f69b178ca7a… Author: frie <peter.friedrich(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-06-20T17:49:10+02:00 ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact impurecord.c: corrected small bug in remove_impucontact_from_list() --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/4e90aea7f06595d253c2f69b178ca7a… Patch: https://github.com/kamailio/kamailio/commit/4e90aea7f06595d253c2f69b178ca7a… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 6510d85aa1..20c8a64154 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1102,10 +1102,11 @@ int remove_impucontact_from_list(impurecord_t* impu, impu_contact_t *impucontact } else if (contact == impu->linked_contacts.tail->contact) { LM_DBG("deleting tail\n"); impu->linked_contacts.tail = impu->linked_contacts.tail->prev; + impu->linked_contacts.tail->next = 0; } else { LM_DBG("deleting mid list\n"); impucontact->prev->next = impucontact->next; - impucontact->prev = impucontact->next->prev; + impucontact->next->prev = impucontact->prev; } impu->linked_contacts.numcontacts--;

1 0

[kamailio/kamailio] ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact (#1572)
by Christoph VALENTIN 22 Jun '18

22 Jun '18

impurecord.c: corrected small bug in remove_impucontact_from_list()   #### 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 against Version 5.1.0 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This is the branch 5.1 pull request, created by cherry-pick from https://github.com/kamailio/kamailio/pull/1562 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1572 -- Commit Summary -- * ims_usrloc_scscf:bugfix erraneous unlinking of deleted contact -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1572.patch https://github.com/kamailio/kamailio/pull/1572.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/1572

2 1

[kamailio/kamailio] app_python3: fix kemi function call argument type checks (#1568)
by kmduk 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The kemi function argument type checks before the arguments are extracted from the python tuple were not strict enough, resulting in the wrong value being passed to the functions. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1568 -- Commit Summary -- * app_python3: fix kemi function argument checking and add support for nsss calls (as used by xhttp_reply) -- File Changes -- M src/modules/app_python3/apy_kemi.c (59) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1568.patch https://github.com/kamailio/kamailio/pull/1568.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/1568

3 3

git:master:3c4bc85f: Merge pull request #1568 from kmduk/py3_kemi_function_calls
by GitHub 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 3c4bc85f6ded3e5d123bf057c716c86ff0da8d9f URL: https://github.com/kamailio/kamailio/commit/3c4bc85f6ded3e5d123bf057c716c86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-22T10:28:07+02:00 Merge pull request #1568 from kmduk/py3_kemi_function_calls app_python3: fix kemi function call argument type checks --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3c4bc85f6ded3e5d123bf057c716c86… Patch: https://github.com/kamailio/kamailio/commit/3c4bc85f6ded3e5d123bf057c716c86…

1 0

git:master:faafff58: app_python3: fix kemi function argument checking and add support for nsss calls (as used by xhttp_reply)
by Kevin Dempsey 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: faafff585f5726ae2c27e247cb2d9e216840552b URL: https://github.com/kamailio/kamailio/commit/faafff585f5726ae2c27e247cb2d9e2… Author: kmduk <kmdgithub(a)gmail.com> Committer: Kevin Dempsey <kmdgithub(a)gmail.com> Date: 2018-06-19T17:18:22+01:00 app_python3: fix kemi function argument checking and add support for nsss calls (as used by xhttp_reply) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/faafff585f5726ae2c27e247cb2d9e2… Patch: https://github.com/kamailio/kamailio/commit/faafff585f5726ae2c27e247cb2d9e2…

1 0

[kamailio/kamailio] TOPOS with event_route filter fails with BYE message (#1569)
by Joonas Keskitalo 22 Jun '18

22 Jun '18

### Description I have a following problem with TOPOS module. I am trying to achieve a scenario where TOPOS will be activated in all other target peers but one and I managed to do this with event_route as described in TOPOS documentation: ``` event_route[topos:msg-outgoing] { if($sndto(ip)=="10.20.234.47") { drop; } } ``` This seems to work fine and when a call is coming from this peer, since 10.20.234.47 is not a target peer, TOPOS will be activated. However when call is terminated from the receiving end and BYE message is destined to peer 10.20.234.47, kamailio at 10.30.160.60 answers '404 Not Here message'. I believe this has something to do with event_route below since this problem does not occur when I am not using event_route. ### Troubleshooting I have debug logs from two examples, one with event_route enabled and another without event_route. For some reason when event_route is activated, topos will not populate BYE request with correct record routes but tries to find a branch from topos, which does not exist. #### Reproduction This issue can be reproduced with clean install of latest Kamailio dev from github. #### Debugging Data With event_route enabled ``` Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/udp_server.c:491]: udp_rcv_loop(): received on udp socket: (112/100/501) [[BYE sip:btpsh-5b29f766-6a9d-1@10.30.160.60 SIP/2.0 0D 0A Max-Forwards: 68 0D 0A Via: SIP/2.0/UDP 10.20.234.25]] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): SIP Request: Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): method: <BYE> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:608]: parse_msg(): uri: <sip:btpsh-5b29f766-6a9d-1@10.30.160.60> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): version: <SIP/2.0> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK1ddd.efe198483f089826149438b9f015168d.0>; state=16 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKiwfg921gzhgpevsckfsgwvhgs>; state=16 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=4 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:505]: parse_headers(): this is the second via Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=as0af8e4f1 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [69]; uri=[sip:+358900000002@pbx.example.com] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body ["Joonas Keskitalo" <sip:+358900000002@pbx.example.com>] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <1> <BYE> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:183]: get_hdr_field(): content_length=0 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=h7g4Esbg_12001692187037 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.20.234.25;branch=z9hG4bK1ddd.efe198483f089826149438b9f015168d.0](78) - x_via2: [SIP/2.0/UDP 212.146.3.173:5060;branch=z9hG4bKiwfg921gzhgpevsckfsgwvhgs](70) - x_vbranch1: [z9hG4bK1ddd.efe198483f089826149438b9f015168d.0](46) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 410 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:301]: redisc_get_server(): Hash 2100282977 (srv8) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:305]: redisc_get_server(): Entry 2100282977 (srv8) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:962]: tps_redis_load_dialog(): loading dialog record for [d:z:atpsh-5b29f766-6a9d-1] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:943]: redisc_exec_argv(): rsrv->ctxRedis = 0x5621e54bde90 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[1]: s[<sip:btpsh-5b29f766-6a9d-1@10.30.160.60>] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[3]: s[sip:+358900000002@10.20.234.47:5060;transport=TCP] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[5]: s[INVITE] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[7]: s[btpsh-5b29f766-6a9d-1] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[9]: s[as0af8e4f1] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[11]: s[102] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[13]: s[atpsh-5b29f766-6a9d-1] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[15]: s[<sip:212.146.3.173;transport=udp;lr>,<sip:10.20.234.25;lr;pm>] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[17]: s[<sip:atpsh-5b29f766-6a9d-1@10.30.160.60;transport=tcp>] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[19]: s[<sip:10.30.160.60;r2=on;lr>,<sip:10.30.160.60;transport=tcp;r2=on;lr>] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[21]: s[h7g4Esbg_12001692187037] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[23]: s[1529476980] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[25]: s[2] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[27]: s[02fc9c2217271d3b1195aa686164b509(a)pbx.example.com] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:301]: redisc_get_server(): Hash 2100282977 (srv8) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:305]: redisc_get_server(): Entry 2100282977 (srv8) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:301]: redisc_get_server(): Hash 2100282977 (srv8) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:305]: redisc_get_server(): Entry 2100282977 (srv8) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:610]: tps_redis_load_invite_branch(): loading branch record for [b:x:INVITE:02fc9c2217271d3b1195aa686164b509@pbx.example.com:as0af8e4f1] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:943]: redisc_exec_argv(): rsrv->ctxRedis = 0x5621e54bde90 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:628]: tps_redis_load_invite_branch(): hmap with key [b:x:INVITE:02fc9c2217271d3b1195aa686164b509@pbx.example.com:as0af8e4f1] not found Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:759]: tps_redis_load_branch(): loading branch record for [b:x:] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: ndb_redis [redis_client.c:943]: redisc_exec_argv(): rsrv->ctxRedis = 0x5621e54bde90 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos_redis [topos_redis_storage.c:777]: tps_redis_load_branch(): hmap with key [b:x:] not found Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 410 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): SIP Request: Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): method: <BYE> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:608]: parse_msg(): uri: <sip:btpsh-5b29f766-6a9d-1@10.30.160.60> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): version: <SIP/2.0> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK1ddd.efe198483f089826149438b9f015168d.0>; state=16 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKiwfg921gzhgpevsckfsgwvhgs>; state=16 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=78 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:505]: parse_headers(): this is the second via Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=as0af8e4f1 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [69]; uri=[sip:+358900000002@pbx.example.com] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body ["Joonas Keskitalo" <sip:+358900000002@pbx.example.com>] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <1> <BYE> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/receive.c:200]: receive_msg(): --- received sip message - request - call-id: [02fc9c2217271d3b1195aa686164b509(a)pbx.example.com] - cseq: [1 BYE] Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:183]: get_hdr_field(): content_length=0 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: <core> [core/receive.c:248]: receive_msg(): preparing to run routing scripts... Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: pv [pv_core.c:966]: pv_get_useragent(): no User-Agent header Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: maxfwd [mf_funcs.c:74]: is_maxfwd_present(): value = 68 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=h7g4Esbg_12001692187037 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: sanity [sanity_mod.c:256]: w_sanity_check(): sanity checks result: 1 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} INFO: <script>: Received BYE from 10.20.234.25 to local IP 10.30.160.60, will do the needful. Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: tm [t_lookup.c:1018]: t_check_msg(): msg (0x7f3ab052c930) id=1 global id=0 T start=0xffffffffffffffff Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: tm [t_lookup.c:476]: t_lookup_request(): start searching: hash=56785, isACK=0 Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: tm [t_lookup.c:435]: matching_3261(): RFC3261 transaction matching failed Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: tm [t_lookup.c:659]: t_lookup_request(): no transaction found Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: tm [t_lookup.c:1087]: t_check_msg(): msg (0x7f3ab052c930) id=1 global id=1 T end=(nil) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: siputils [checks.c:123]: has_totag(): totag found Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: rr [loose.c:113]: find_first_route(): No Route headers found Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: rr [loose.c:960]: loose_route(): There is no Route HF Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: <core> [core/msg_translator.c:159]: check_via_address(): (10.20.234.25, 10.20.234.25, 0) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: topos [topos_mod.c:460]: tps_execute_event_route(): executing event_route[topos:...] (1) Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: <core> [core/parser/msg_parser.c:614]: parse_msg(): SIP Reply (status): Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: <core> [core/parser/msg_parser.c:616]: parse_msg(): version: <SIP/2.0> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: <core> [core/parser/msg_parser.c:618]: parse_msg(): status: <404> Jun 20 09:43:11 edge3 /usr/local/sbin/kamailio[26884]: {1 1 BYE 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com} DEBUG: <core> [core/parser/msg_parser.c:620]: parse_msg(): reason: <Not here> ``` Without event_route ``` Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/udp_server.c:491]: udp_rcv_loop(): received on udp socket: (112/100/501) [[BYE sip:btpsh-5b29f51c-68b4-1@10.30.160.60 SIP/2.0 0D 0A Max-Forwards: 68 0D 0A Via: SIP/2.0/UDP 10.20.234.25]] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): SIP Request: Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): method: <BYE> Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:608]: parse_msg(): uri: <sip:btpsh-5b29f51c-68b4-1@10.30.160.60> Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): version: <SIP/2.0> Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKc0da.006a721652ca40dc9f2f4d5d8eb387c0.0>; state=16 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKmozhccfz7thfkrmo7uikimq16>; state=16 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=4 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:505]: parse_headers(): this is the second via Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=as1e60e740 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [69]; uri=[sip:+35890000002@pbx.example.com] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body ["Joonas Keskitalo" <sip:+35890000002@pbx.example.com>] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <1> <BYE> Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:183]: get_hdr_field(): content_length=0 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=h7g4Esbg_14000437127532 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_msg.c:742]: tps_request_received(): handling incoming request Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 10.20.234.25;branch=z9hG4bKc0da.006a721652ca40dc9f2f4d5d8eb387c0.0](78) - x_via2: [SIP/2.0/UDP 212.146.3.165:5060;branch=z9hG4bKmozhccfz7thfkrmo7uikimq16](70) - x_vbranch1: [z9hG4bKc0da.006a721652ca40dc9f2f4d5d8eb387c0.0](46) Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_storage.c:124]: tps_storage_lock_get(): tps lock get: 213 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: ndb_redis [redis_client.c:301]: redisc_get_server(): Hash 2100282977 (srv8) Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: ndb_redis [redis_client.c:305]: redisc_get_server(): Entry 2100282977 (srv8) Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:962]: tps_redis_load_dialog(): loading dialog record for [d:z:atpsh-5b29f51c-68b4-1] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: ndb_redis [redis_client.c:943]: redisc_exec_argv(): rsrv->ctxRedis = 0x561a7d6dbe90 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[1]: s[sip:sgc_c@212.146.3.165;transport=udp] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[3]: s[<sip:btpsh-5b29f51c-68b4-1@10.30.160.60>] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[5]: s[sip:+35890000002@10.20.234.47:5060;transport=TCP] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[7]: s[INVITE] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[9]: s[btpsh-5b29f51c-68b4-1] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[11]: s[as1e60e740] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[13]: s[102] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[15]: s[atpsh-5b29f51c-68b4-1] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[17]: s[<sip:212.146.3.165;transport=udp;lr>,<sip:10.20.234.25;lr;pm>] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[19]: s[<sip:atpsh-5b29f51c-68b4-1@10.30.160.60;transport=tcp>] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[21]: s[<sip:10.30.160.60;r2=on;lr>,<sip:10.30.160.60;transport=tcp;r2=on;lr>] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[23]: s[h7g4Esbg_14000437127532] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[25]: s[1529476419] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[27]: s[0] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos_redis [topos_redis_storage.c:1008]: tps_redis_load_dialog(): r[29]: s[415ec07600838eb414117d5c66d67717(a)pbx.example.com] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_storage.c:136]: tps_storage_lock_release(): tps lock release: 213 Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_msg.c:816]: tps_request_received(): r-uri updated to: [sip:+35890000002@10.20.234.47:5060;transport=TCP] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Route: <sip:10.30.160.60;r2=on;lr>,<sip:10.30.160.60;transport=tcp;r2=on;lr>#015#012] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-5b29f51c-68b4-1#015#012] Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): SIP Request: Jun 20 09:33:57 edge3 /usr/local/sbin/kamailio[26395]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): method: <BYE> ... <After this normal message parsing happens and BYE is routed to 10.20.234.47> ``` #### Log Messages There is nothing related to this issue on normal logging. #### SIP Traffic Only event_route case is available, but basically it is the same case. ``` T 2018/06/20 06:42:59.980340 10.20.234.47:35408 -> 10.30.160.60:5060 [AP] INVITE sip:+358000000001@10.30.160.60 SIP/2.0. Via: SIP/2.0/TCP 10.20.234.47:5060;branch=z9hG4bK2ef81edd. Max-Forwards: 70. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. To: <sip:+358000000001@10.30.160.60>. Contact: <sip:+358900000002@10.20.234.47:5060;transport=TCP>. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. User-Agent: nmc. Date: Wed, 20 Jun 2018 06:42:59 GMT. Session-Expires: 1800. Min-SE: 90. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH. Supported: replaces, timer. P-Asserted-Identity: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>. Content-Type: application/sdp. Content-Length: 266. . v=0. o=noc 1822366190 1822366190 IN IP4 10.20.234.47. s=nmc. c=IN IP4 10.20.234.47. t=0 0. m=audio 18644 RTP/AVP 8 9 0 101. a=rtpmap:8 PCMA/8000. a=rtpmap:9 G722/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=ptime:20. a=sendrecv. T 2018/06/20 06:43:00.005934 10.30.160.60:5060 -> 10.20.234.47:35408 [AP] SIP/2.0 100 trying -- your call is important to us. Via: SIP/2.0/TCP 10.20.234.47:5060;branch=z9hG4bK2ef81edd;rport=35408. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. To: <sip:+358000000001@10.30.160.60>. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. Server: kamailio (5.2.0-dev4 (x86_64/linux)). Content-Length: 0. . U 2018/06/20 06:43:00.008814 10.30.160.60:5060 -> 10.20.234.25:5060 INVITE sip:+358000000001@10.20.234.25 SIP/2.0. Via: SIP/2.0/UDP 10.30.160.60;branch=z9hG4bK96cf.e1a6c393f0e655e25dec09a13d5463ab.0;i=1. Max-Forwards: 69. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. To: <sip:+358000000001@10.30.160.60>. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. User-Agent: nmc. Date: Wed, 20 Jun 2018 06:42:59 GMT. Session-Expires: 1800. Min-SE: 90. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH. Supported: replaces, timer. P-Asserted-Identity: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>. Content-Type: application/sdp. Content-Length: 266. P-hint: outbound. Contact: <sip:btpsh-5b29f766-6a9d-1@10.30.160.60>. . v=0. o=noc 1822366190 1822366190 IN IP4 10.20.234.47. s=nmc. c=IN IP4 10.20.234.47. t=0 0. m=audio 18644 RTP/AVP 8 9 0 101. a=rtpmap:8 PCMA/8000. a=rtpmap:9 G722/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=ptime:20. a=sendrecv. U 2018/06/20 06:43:00.010152 10.20.234.25:5060 -> 10.30.160.60:5060 SIP/2.0 100 Trying. Via: SIP/2.0/UDP 10.30.160.60;branch=z9hG4bK96cf.e1a6c393f0e655e25dec09a13d5463ab.0;i=1. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. To: <sip:+358000000001@10.30.160.60>. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. Content-Length: 0. . U 2018/06/20 06:43:03.101376 10.20.234.25:5060 -> 10.30.160.60:5060 SIP/2.0 183 Session Progress. Via: SIP/2.0/UDP 10.30.160.60;branch=z9hG4bK96cf.e1a6c393f0e655e25dec09a13d5463ab.0;i=1. To: <sip:+358000000001@mrandom.example.com;user=phone>;tag=h7g4Esbg_12001692187037. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. Contact: <sip:sgc_c@212.146.3.173;transport=udp>. Record-Route: <sip:212.146.3.173;transport=udp;lr>. Record-Route: <sip:10.20.234.25;lr;pm>. Content-Type: application/sdp. Content-Length: 251. Allow: INVITE,ACK,OPTIONS,BYE,CANCEL,PRACK,UPDATE. . v=0. o=- 2372765 2372765 IN IP4 212.146.3.173. s=-. c=IN IP4 10.20.232.34. t=0 0. a=sendrecv. m=audio 10810 RTP/AVP 8 101. c=IN IP4 10.20.232.34. b=RR:0. b=RS:0. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-15. a=maxptime:40. T 2018/06/20 06:43:03.105310 10.30.160.60:5060 -> 10.20.234.47:35408 [AP] SIP/2.0 183 Session Progress. To: <sip:+358000000001@mrandom.example.com;user=phone>;tag=h7g4Esbg_12001692187037. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. Contact: <sip:sgc_c@212.146.3.173;transport=udp>. Record-Route: <sip:212.146.3.173;transport=udp;lr>. Record-Route: <sip:10.20.234.25;lr;pm>. Content-Type: application/sdp. Content-Length: 251. Allow: INVITE,ACK,OPTIONS,BYE,CANCEL,PRACK,UPDATE. Via: SIP/2.0/TCP 10.20.234.47:5060;rport=35408;branch=z9hG4bK2ef81edd. Record-Route: <sip:10.30.160.60;r2=on;lr>,<sip:10.30.160.60;transport=tcp;r2=on;lr>. P-SR-XBranch: z9hG4bK96cf.e1a6c393f0e655e25dec09a13d5463ab.0. . v=0. o=- 2372765 2372765 IN IP4 212.146.3.173. s=-. c=IN IP4 10.20.232.34. t=0 0. a=sendrecv. m=audio 10810 RTP/AVP 8 101. c=IN IP4 10.20.232.34. b=RR:0. b=RS:0. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-15. a=maxptime:40. U 2018/06/20 06:43:04.030579 10.20.234.25:5060 -> 10.30.160.60:5060 SIP/2.0 180 Ringing. Via: SIP/2.0/UDP 10.30.160.60;branch=z9hG4bK96cf.e1a6c393f0e655e25dec09a13d5463ab.0;i=1. To: <sip:+358000000001@mrandom.example.com;user=phone>;tag=h7g4Esbg_12001692187037. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. Contact: <sip:sgc_c@212.146.3.173;transport=udp>. Record-Route: <sip:212.146.3.173;transport=udp;lr>. Record-Route: <sip:10.20.234.25;lr;pm>. Content-Length: 0. . T 2018/06/20 06:43:04.034058 10.30.160.60:5060 -> 10.20.234.47:35408 [AP] SIP/2.0 180 Ringing. To: <sip:+358000000001@mrandom.example.com;user=phone>;tag=h7g4Esbg_12001692187037. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. Contact: <sip:sgc_c@212.146.3.173;transport=udp>. Record-Route: <sip:212.146.3.173;transport=udp;lr>. Record-Route: <sip:10.20.234.25;lr;pm>. Content-Length: 0. Via: SIP/2.0/TCP 10.20.234.47:5060;rport=35408;branch=z9hG4bK2ef81edd. Record-Route: <sip:10.30.160.60;r2=on;lr>,<sip:10.30.160.60;transport=tcp;r2=on;lr>. P-SR-XBranch: z9hG4bK96cf.e1a6c393f0e655e25dec09a13d5463ab.0. . U 2018/06/20 06:43:07.037526 10.20.234.25:5060 -> 10.30.160.60:5060 SIP/2.0 200 OK. Via: SIP/2.0/UDP 10.30.160.60;branch=z9hG4bK96cf.e1a6c393f0e655e25dec09a13d5463ab.0;i=1. To: <sip:+358000000001@mrandom.example.com;user=phone>;tag=h7g4Esbg_12001692187037. From: "Joonas Keskitalo" <sip:+358900000002@212.146.3.173>;tag=as0af8e4f1. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. Contact: <sip:sgc_c@212.146.3.173;transport=udp>. Record-Route: <sip:212.146.3.173;transport=udp;lr>. Record-Route: <sip:10.20.234.25;lr;pm>. Content-Type: application/sdp. Content-Length: 251. Allow: INVITE,ACK,OPTIONS,BYE,CANCEL,PRACK,UPDATE. Accept: application/sdp. . v=0. o=- 2372765 2372765 IN IP4 212.146.3.173. s=-. c=IN IP4 10.20.232.34. t=0 0. a=sendrecv. m=audio 10810 RTP/AVP 8 101. c=IN IP4 10.20.232.34. b=RR:0. b=RS:0. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-15. a=maxptime:40. T 2018/06/20 06:43:07.041369 10.30.160.60:5060 -> 10.20.234.47:35408 [AP] SIP/2.0 200 OK. To: <sip:+358000000001@mrandom.example.com;user=phone>;tag=h7g4Esbg_12001692187037. From: "Joonas Keskitalo" <sip:+358900000002@212.146.3.173>;tag=as0af8e4f1. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 INVITE. Contact: <sip:sgc_c@212.146.3.173;transport=udp>. Record-Route: <sip:212.146.3.173;transport=udp;lr>. Record-Route: <sip:10.20.234.25;lr;pm>. Content-Type: application/sdp. Content-Length: 251. Allow: INVITE,ACK,OPTIONS,BYE,CANCEL,PRACK,UPDATE. Accept: application/sdp. Via: SIP/2.0/TCP 10.20.234.47:5060;rport=35408;branch=z9hG4bK2ef81edd. Record-Route: <sip:10.30.160.60;r2=on;lr>,<sip:10.30.160.60;transport=tcp;r2=on;lr>. P-SR-XBranch: z9hG4bK96cf.e1a6c393f0e655e25dec09a13d5463ab.0. . v=0. o=- 2372765 2372765 IN IP4 212.146.3.173. s=-. c=IN IP4 10.20.232.34. t=0 0. a=sendrecv. m=audio 10810 RTP/AVP 8 101. c=IN IP4 10.20.232.34. b=RR:0. b=RS:0. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-15. a=maxptime:40. T 2018/06/20 06:43:07.042687 10.20.234.47:35408 -> 10.30.160.60:5060 [AP] ACK sip:sgc_c@212.146.3.173;transport=udp SIP/2.0. Via: SIP/2.0/TCP 10.20.234.47:5060;branch=z9hG4bK76432850. Route: <sip:10.30.160.60;transport=tcp;r2=on;lr>,<sip:10.30.160.60;r2=on;lr>,<sip:10.20.234.25;lr;pm>,<sip:212.146.3.173;transport=udp;lr>. Max-Forwards: 70. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. To: <sip:+358000000001@10.30.160.60>;tag=h7g4Esbg_12001692187037. Contact: <sip:+358900000002@10.20.234.47:5060;transport=TCP>. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 ACK. User-Agent: nmc. Content-Length: 0. . U 2018/06/20 06:43:07.140001 10.30.160.60:5060 -> 10.20.234.25:5060 ACK sip:sgc_c@212.146.3.173;transport=udp SIP/2.0. Via: SIP/2.0/UDP 10.30.160.60;branch=z9hG4bK96cf.d1c298d0a34b6f6327f0e0c15abced89.0;i=1. Via: SIP/2.0/TCP 10.20.234.47:5060;rport=35408;branch=z9hG4bK76432850. Route: <sip:10.20.234.25;lr;pm>,<sip:212.146.3.173;transport=udp;lr>. Max-Forwards: 69. From: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. To: <sip:+358000000001@10.30.160.60>;tag=h7g4Esbg_12001692187037. Contact: <sip:+358900000002@10.20.234.47:5060;transport=TCP>. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 102 ACK. User-Agent: nmc. Content-Length: 0. . U 2018/06/20 06:43:11.802426 10.20.234.25:5060 -> 10.30.160.60:5060 BYE sip:btpsh-5b29f766-6a9d-1@10.30.160.60 SIP/2.0. Max-Forwards: 68. Via: SIP/2.0/UDP 10.20.234.25;branch=z9hG4bK1ddd.efe198483f089826149438b9f015168d.0. Via: SIP/2.0/UDP 212.146.3.173:5060;branch=z9hG4bKiwfg921gzhgpevsckfsgwvhgs. To: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. From: <sip:+358000000001@212.146.3.173;user=phone>;tag=h7g4Esbg_12001692187037. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 1 BYE. Reason: Q.850;cause=16. Content-Length: 0. . U 2018/06/20 06:43:11.806533 10.30.160.60:5060 -> 10.20.234.25:5060 SIP/2.0 404 Not here. Via: SIP/2.0/UDP 10.20.234.25;branch=z9hG4bK1ddd.efe198483f089826149438b9f015168d.0;rport=5060. Via: SIP/2.0/UDP 212.146.3.173:5060;branch=z9hG4bKiwfg921gzhgpevsckfsgwvhgs. To: "Joonas Keskitalo" <sip:+358900000002@pbx.example.com>;tag=as0af8e4f1. From: <sip:+358000000001@212.146.3.173;user=phone>;tag=h7g4Esbg_12001692187037. Call-ID: 02fc9c2217271d3b1195aa686164b509(a)pbx.example.com. CSeq: 1 BYE. Server: kamailio (5.2.0-dev4 (x86_64/linux)). Content-Length: 0. ``` ### Possible Solutions No idea ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.0-dev4 (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 14:01:18 Mar 9 2018 with gcc 6.3.0 ``` * **Operating System**: ``` Linux edge3 4.9.0-6-amd64 #1 SMP Debian 4.9.82-1+deb9u3 (2018-03-02) 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/1569

2 7

git:5.1:fc5c5f56: topos: fix warning about uninitialized variable
by Daniel-Constantin Mierla 22 Jun '18

22 Jun '18

Module: kamailio Branch: 5.1 Commit: fc5c5f56c08766415e8a13b9e86e405bc504d695 URL: https://github.com/kamailio/kamailio/commit/fc5c5f56c08766415e8a13b9e86e405… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T10:21:55+02:00 topos: fix warning about uninitialized variable (cherry picked from commit e7ee14f0d168c36c62cd6bef58334db1f0871470) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fc5c5f56c08766415e8a13b9e86e405… Patch: https://github.com/kamailio/kamailio/commit/fc5c5f56c08766415e8a13b9e86e405… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index da141888c3..66169f7b02 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -371,7 +371,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) */ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) { - int ret; + int ret = -1; /* error if dialog == 0 */ str suid; if(dialog==0) {

1 0

git:master:5bafb32f: topos: debug log messages with linked contact addresses
by Daniel-Constantin Mierla 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: 5bafb32fa3dd0aefdb5e0c1a8bbd94638fe1022d URL: https://github.com/kamailio/kamailio/commit/5bafb32fa3dd0aefdb5e0c1a8bbd946… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T10:11:56+02:00 topos: debug log messages with linked contact addresses --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5bafb32fa3dd0aefdb5e0c1a8bbd946… Patch: https://github.com/kamailio/kamailio/commit/5bafb32fa3dd0aefdb5e0c1a8bbd946… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index fb159d4dac..5e0e87b249 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -360,6 +360,11 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) } } + LM_DBG("downstream: %s acontact: [%.*s] bcontact: [%.*s]\n", + (dir==TPS_DIR_DOWNSTREAM)?"yes":"no", + td->a_contact.len, (td->a_contact.len>0)?td->a_contact.s:"", + td->b_contact.len, (td->b_contact.len>0)?td->b_contact.s:""); + return 0; error:

1 0

git:master:ecfb1b6c: topos: print warn message of missing record-route only for initial requests
by Daniel-Constantin Mierla 22 Jun '18

22 Jun '18

Module: kamailio Branch: master Commit: ecfb1b6c9abcaa662155f67b56516fd2d0750fe7 URL: https://github.com/kamailio/kamailio/commit/ecfb1b6c9abcaa662155f67b56516fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T09:23:01+02:00 topos: print warn message of missing record-route only for initial requests --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/ecfb1b6c9abcaa662155f67b56516fd… Patch: https://github.com/kamailio/kamailio/commit/ecfb1b6c9abcaa662155f67b56516fd… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 66169f7b02..fb159d4dac 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -396,10 +396,10 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) ret = tps_storage_link_msg(msg, td, TPS_DIR_DOWNSTREAM); if(ret<0) goto error; - if(td->as_contact.len <= 0 && td->bs_contact.len <= 0) { - LM_WARN("no local address - do record routing for all initial requests\n"); - } if(dialog==0) { + if(td->as_contact.len <= 0 && td->bs_contact.len <= 0) { + LM_WARN("no local address - do record routing for all initial requests\n"); + } ret = _tps_storage_api.insert_dialog(td); if(ret<0) goto error; }

1 0

Kamailio v5.0.7 Released
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Hello, Kamailio SIP Server v5.0.7 stable release is out. This is a maintenance release of the previous stable branch, 5.0, that includes fixes since the release of v5.0.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.0.x. Deployments running previous v5.0.x versions are strongly recommended to be upgraded to v5.0.7 or v5.1.x. For more details about version 5.0.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2018/06/kamailio-v5-0-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the latest stable branch is 5.1, at this moment with its latest release v5.1.4. See more details about it at: * https://www.kamailio.org/w/kamailio-v5-1-0-release-notes/ Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com

1 0

git:5.0:743c2d71: ChangeLog: content updated for v5.0.7
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.0 Commit: 743c2d71beda536be3dd3b07b0f9b1d4b7e42743 URL: https://github.com/kamailio/kamailio/commit/743c2d71beda536be3dd3b07b0f9b1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T12:15:53+02:00 ChangeLog: content updated for v5.0.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/743c2d71beda536be3dd3b07b0f9b1d… Patch: https://github.com/kamailio/kamailio/commit/743c2d71beda536be3dd3b07b0f9b1d…

1 0

git:5.0:c2df2b16: Makefile.defs: version set to 5.0.7
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.0 Commit: c2df2b16f7ff5e16271140a0a06a4977510f2e7c URL: https://github.com/kamailio/kamailio/commit/c2df2b16f7ff5e16271140a0a06a497… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T12:10:14+02:00 Makefile.defs: version set to 5.0.7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c2df2b16f7ff5e16271140a0a06a497… Patch: https://github.com/kamailio/kamailio/commit/c2df2b16f7ff5e16271140a0a06a497… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index dbf6191e8c..12d84f3c15 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 0 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:5.0:88894a97: pkg/kamailio/deb: set version to 5.0.7
by Victor Seva 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.0 Commit: 88894a977ccea42bb72b20d44fd4187112ff45ce URL: https://github.com/kamailio/kamailio/commit/88894a977ccea42bb72b20d44fd4187… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-21T09:48:59+02:00 pkg/kamailio/deb: set version to 5.0.7 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/88894a977ccea42bb72b20d44fd4187… Patch: https://github.com/kamailio/kamailio/commit/88894a977ccea42bb72b20d44fd4187… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 7036610249..f919a6cd8e 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.7) unstable; urgency=medium + + * version set to 5.0.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 21 Jun 2018 09:48:20 +0200 + kamailio (5.0.6) unstable; urgency=medium * version set to 5.0.6 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 7036610249..f919a6cd8e 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.7) unstable; urgency=medium + + * version set to 5.0.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 21 Jun 2018 09:48:20 +0200 + kamailio (5.0.6) unstable; urgency=medium * version set to 5.0.6 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 7036610249..f919a6cd8e 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.7) unstable; urgency=medium + + * version set to 5.0.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 21 Jun 2018 09:48:20 +0200 + kamailio (5.0.6) unstable; urgency=medium * version set to 5.0.6 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 7036610249..f919a6cd8e 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.7) unstable; urgency=medium + + * version set to 5.0.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 21 Jun 2018 09:48:20 +0200 + kamailio (5.0.6) unstable; urgency=medium * version set to 5.0.6 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 7036610249..f919a6cd8e 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.7) unstable; urgency=medium + + * version set to 5.0.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 21 Jun 2018 09:48:20 +0200 + kamailio (5.0.6) unstable; urgency=medium * version set to 5.0.6 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 7036610249..f919a6cd8e 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.7) unstable; urgency=medium + + * version set to 5.0.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 21 Jun 2018 09:48:20 +0200 + kamailio (5.0.6) unstable; urgency=medium * version set to 5.0.6 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 7036610249..f919a6cd8e 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.7) unstable; urgency=medium + + * version set to 5.0.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 21 Jun 2018 09:48:20 +0200 + kamailio (5.0.6) unstable; urgency=medium * version set to 5.0.6 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 7036610249..f919a6cd8e 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.7) unstable; urgency=medium + + * version set to 5.0.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 21 Jun 2018 09:48:20 +0200 + kamailio (5.0.6) unstable; urgency=medium * version set to 5.0.6

1 0

git:5.0:24db4d0b: pkg/rpm: set version to 5.0.7 in spec files
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.0 Commit: 24db4d0b59fae0b8315d770af245de8a3d13864a URL: https://github.com/kamailio/kamailio/commit/24db4d0b59fae0b8315d770af245de8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T09:21:41+02:00 pkg/rpm: set version to 5.0.7 in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/24db4d0b59fae0b8315d770af245de8… Patch: https://github.com/kamailio/kamailio/commit/24db4d0b59fae0b8315d770af245de8… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 2357758712..02613b2513 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.6 +%define ver 5.0.7 %define rel dev0.0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 9babcd6cff..81714e906f 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.6 +%define ver 5.0.7 %define rel dev7.2%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 00c4600971..c8ae154912 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.6 +%define ver 5.0.7 %define rel dev0.0%{dist} %if 0%{?fedora} == 24 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 9094f37a75..2a7f86c504 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.6 +%define ver 5.0.7 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index a0f4a8b598..cc98d428f6 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.6 +%define ver 5.0.7 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index d9ca097568..41a589f462 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.6 +%define ver 5.0.7 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 2ab1b69c73..a1bf9e3b41 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.6 +%define ver 5.0.7 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 0aa7bae351..81146e02ab 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.6 +%define ver 5.0.7 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

Releasing v5.0.7
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Hello, I am considering to release Kamailio v5.0.7, out of git branch 5.0, sometime next week, likely to happen on Thursday, June 21. As usual, if there is any issue not reported yet on github, do it a soon as possible to have a chance to investigate. Soon I will review and backport the commits that apply from branch 5.1 back to 5.0, so keep an eye and notify us if a patch you expect to be in 5.0 is not backported. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

1 1

git:master:31deafda: rtpengine: print warning message if setting TOS for socket fails
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: master Commit: 31deafdab78c8852fd419109fde5e2eb0898f27a URL: https://github.com/kamailio/kamailio/commit/31deafdab78c8852fd419109fde5e2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T09:08:29+02:00 rtpengine: print warning message if setting TOS for socket fails --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/31deafdab78c8852fd419109fde5e2e… Patch: https://github.com/kamailio/kamailio/commit/31deafdab78c8852fd419109fde5e2e… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 5e2c1f7dc8..7ce81f7de6 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1696,14 +1696,15 @@ static int build_rtpp_socks() { if((0 <= control_cmd_tos) && (control_cmd_tos < 256)) { unsigned char tos = control_cmd_tos; if (pnode->rn_umode == 6) { - setsockopt(rtpp_socks[pnode->idx], IPPROTO_IPV6, + if(setsockopt(rtpp_socks[pnode->idx], IPPROTO_IPV6, IPV6_TCLASS, &control_cmd_tos, - sizeof(control_cmd_tos)); + sizeof(control_cmd_tos))) + LM_WARN("Failed to set IPv6 TOS socket option\n"); } else { - setsockopt(rtpp_socks[pnode->idx], IPPROTO_IP, - IP_TOS, &tos, - sizeof(tos)); + if(setsockopt(rtpp_socks[pnode->idx], IPPROTO_IP, + IP_TOS, &tos, sizeof(tos))) + LM_WARN("Failed to set IPv4 TOS socket option\n"); } }

1 0

git:5.0:40c4c5c5: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.0 Commit: 40c4c5c5607d754475332b46f731b4b90d6a33e6 URL: https://github.com/kamailio/kamailio/commit/40c4c5c5607d754475332b46f731b4b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-21T08:46:36+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/async/README Modified: src/modules/db_perlvdb/README Modified: src/modules/dialog/README Modified: src/modules/p_usrloc/README Modified: src/modules/sanity/README Modified: src/modules/speeddial/README Modified: src/modules/uri_db/README --- Diff: https://github.com/kamailio/kamailio/commit/40c4c5c5607d754475332b46f731b4b… Patch: https://github.com/kamailio/kamailio/commit/40c4c5c5607d754475332b46f731b4b…

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

- URL: https://github.com/kamailio/kamailio/commit/acaac73e3b52fc6dc14db1af462b740… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:40:38+02:00 db_text: small updates to sample config used in docs (cherry picked from commit 7738461dda1595ee71cbda47bd129e3f13ebc77d) (cherry picked from commit 63aca341454d29c5820a3cbd055fc19ad0c2e5d4) - URL: https://github.com/kamailio/kamailio/commit/ae57faaa862b1922453020cfafdbf1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:41:07+02:00 async: docs - some improvements to examples (cherry picked from commit 15731d40ff1af78bf568d19bdbe4704d35931afd) (cherry picked from commit 20fa560da4868eb454c064baad397975d25c4098) - URL: https://github.com/kamailio/kamailio/commit/8c756acd626b7829234905bdad6ea94… Author: AntonyA <ascanio.alba7(a)gmail.com> Date: 2018-06-20T08:41:55+02:00 core: invoke KEMI ksr_onsend_route() This will invoke ksr_onsend_route() unconditionally in the cfgengine. (cherry picked from commit 4494b60c430f5e5c6a3a3eb4c025f206a9c3a1f7) (cherry picked from commit 6275646db39c9c6b48eb4afffd1e71b89ea3e504) - URL: https://github.com/kamailio/kamailio/commit/e711e047f3a7dfc42f08dfaaadf52e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:42:49+02:00 core: small improvements to help text (cherry picked from commit 31e21ff23a0d8bff1f7a88a56aa4ab01d93e2cf3) (cherry picked from commit 26c623ee6ffe35098c5edc109a16711cc487204a) - URL: https://github.com/kamailio/kamailio/commit/422f10f0a4df5885a6839463cecac2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:46:38+02:00 auth_diameter: updated application name (cherry picked from commit 7228a9e413f7d51411961b8ece7281ecf597a9e2) (cherry picked from commit fff68b42d62f9e5d1ef28f06a1f84e493c50280b) - URL: https://github.com/kamailio/kamailio/commit/c7fa893ea986ffb93f63cf2edc14968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:46:49+02:00 cnxcc: updated application name in example (cherry picked from commit bb0940fd01a0188bc82d0608ac054fec5715ac56) (cherry picked from commit d6aabb749d1be55ae2f2b4c6584024244f541edc) - URL: https://github.com/kamailio/kamailio/commit/c9580596a34901732b0e8163dd460af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:46:59+02:00 p_usrloc: updated path to db scripts in docs (cherry picked from commit a8827449e4c3c43e3f25abb7f5b27b2e1d1ab1b7) (cherry picked from commit 70dc29bffaa92d06edb84891f9e548bc8c86ab99) - URL: https://github.com/kamailio/kamailio/commit/37ff34eb8b04ff1c362f08bcf53d3d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:47:08+02:00 rtpproxy: small updates to example cfg (cherry picked from commit 6162a74ad858c6a7421f461cd1483cc8d69c12c1) (cherry picked from commit e160730c2b6d2ec69ece0ac5d560d0ef35447491) - URL: https://github.com/kamailio/kamailio/commit/56b0f60d2a612ab74a94beeba763778… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:47:20+02:00 speeddial: updates to db url example (cherry picked from commit ea18525e27120943204a75470855a35fbc8cc46a) (cherry picked from commit 87fb715ff3a0d687aefba01567f08e54e87fe897) - URL: https://github.com/kamailio/kamailio/commit/a51a29bff85f60e8fb9231f78d35455… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:47:36+02:00 uri_db: updated database name in docs (cherry picked from commit ae1367bf3a6706b9db742ff6e20e6d11f79d5b02) (cherry picked from commit c459054927fd0c805d7d090c363660094ef30f63) - URL: https://github.com/kamailio/kamailio/commit/b3d019a1db05db7ab8e8204700aa780… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:52:29+02:00 cfgutils: update route_if_exists() to have same behaviour as route() - do not run the route block as a top route - related to GH #1503 (cherry picked from commit 9670bd80550b9e0c2af1d5d61df618292346ba28) (cherry picked from commit cefd474c13756b2a37b5969620ab8c0153fa9ed8) - URL: https://github.com/kamailio/kamailio/commit/f959aeb1774ce856323072f3b39812a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:54:17+02:00 core: rpc dns.view returns an array of records (cherry picked from commit 648dd937831654d40a9d615319693b87db31ef94) (cherry picked from commit e4cca93ff255b391ae5c4cfedf3ccc5f0b41456c) - URL: https://github.com/kamailio/kamailio/commit/81a2125388bea1ca5fa4662fd177609… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:54:58+02:00 db_perlvdb: proper lookup for app_perl module - reported by shaheryarkh(a)gmail.com (cherry picked from commit 1226ae471627547ef00c651b78b37e1c397adc23) (cherry picked from commit e86116142f4c30ba5f9afbeebf558506e775986f) - URL: https://github.com/kamailio/kamailio/commit/1e2bc68cb0c82bcf0fd515ea549622b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:55:07+02:00 db_perlvdb: updated the db api exported fields (cherry picked from commit c7aa0a9e3796b1fcd70305a2878d62bf251a9b5e) (cherry picked from commit 7998b253bd6ed2e589f94d18a85aec99914a31ce) - URL: https://github.com/kamailio/kamailio/commit/df077622bacaea552909279b8f3d3d7… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-06-20T08:55:25+02:00 misc:kemi_lua append_hf to append (cherry picked from commit 5ceb3b857d448fed1e819812dcb4a9724243cdb8) (cherry picked from commit 1cac068d1acdd44081a1c4e65a317a4b208a08bb) - URL: https://github.com/kamailio/kamailio/commit/9a339fc528184fbc323f0046e68610e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:55:37+02:00 core: dns cache - print status as field in rpc structure (cherry picked from commit 1822d974ff1704cca3a1db5fce0507be47af3928) (cherry picked from commit 052cfbd844b662cac17910f55111ad8c4388fd44) - URL: https://github.com/kamailio/kamailio/commit/178081fb62407080ada5b25607cd9dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:55:46+02:00 db_perlvdb: added const specifiers to get rid of warnings (cherry picked from commit 6a152024a40abdb89842aaee418088fe3fb23ae2) (cherry picked from commit fcd3974e85b549c85cb7fb3a11e9d019b6adaf1d) - URL: https://github.com/kamailio/kamailio/commit/37792846b49ba7e2ca9ef01caf093fc… Author: uts09 <uttamhoode(a)gmail.com> Date: 2018-06-20T08:55:59+02:00 misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs - submitted via PR #1524 (cherry picked from commit e17853d8804fa7f10688676d313014ac6e313215) (cherry picked from commit 256d06bc1902f59354fb0bee37a1e34510714318) - URL: https://github.com/kamailio/kamailio/commit/f619126938e409ad4f2a13e82570738… Author: Muhammad Shahzad <shaheryarkh(a)gmail.com> Date: 2018-06-20T08:56:09+02:00 db_perlvdb: updated code and documentation for latest db api - GH #1525 (cherry picked from commit 1a15e985de8cc4a5c836dacd0df4afdb6b6efb1b) (cherry picked from commit e5745ca3d058f82e957a761b4b800f869a7ca2a9) - URL: https://github.com/kamailio/kamailio/commit/28f5fef894ba63d92b9c818a9fbd248… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-20T08:56:27+02:00 db_perlvdb: fix compilation warning > db_perlvdb.c: In function 'db_perlvdb_bind_api': > db_perlvdb.c:98:24: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] > dbb->replace = perlvdb_db_replace; > ^ (cherry picked from commit dbae2561720c97200d8e58e1e6c408a943e3c07b) (cherry picked from commit 0c04b6f8b7f532147e03c1c4bb706e4a6501ab35) - URL: https://github.com/kamailio/kamailio/commit/64b1b891b20a07f1e68501bff6decc2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-20T08:56:46+02:00 db2_ldap: fix compilation warning > ld_fld.c:831:19: warning: unused function 'db_double2ldap_str' [-Wunused-function] > static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) > ^ > 1 warning generated. (cherry picked from commit 5b1355aa3d9404a5165b0afbfdac384fe9cf785a) (cherry picked from commit 91649cd46bf88d80f4fbcaccecb03e3a8fbae577) - URL: https://github.com/kamailio/kamailio/commit/da4615d15377964acfd776953e6040a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:57:05+02:00 topoh: more verbose debug messages when decoding r-uri (cherry picked from commit 5a0086fb5d54cf0411180a8426ea49ad440f147a) (cherry picked from commit ad9817f9d6df0aabe4888b8b2d489a5ca061bd14) - URL: https://github.com/kamailio/kamailio/commit/fd1e6aa946f68485e09314911ca2808… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:57:31+02:00 tm: set msg for log_prefix before running failure_route - reported by GH #1531 (cherry picked from commit eb2f25ca0810f966d089da3aa1e32e3e98a4ab16) (cherry picked from commit cc1ff15335a81971aa891231cbea7c8fd03261e0) - URL: https://github.com/kamailio/kamailio/commit/08ffae5f5774425528ef84cf89ab211… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:57:46+02:00 sanity: updated docs to reflect default value for default_checks param - reported by GH #1542 (cherry picked from commit 6ff985605b3fbb6aa350af4c21fc73afb8cf122f) (cherry picked from commit a1a397bbf6cd6a01ccd505b7b85d448478d27cbe) - URL: https://github.com/kamailio/kamailio/commit/bcab1e760377a9fc070dc02311ff1b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:58:04+02:00 rls: allocate size for normalized uri for cloning buffer - it can be longer than pres uri, when proto prefix needs to be added (cherry picked from commit 93932a4ff18760d8fc8c59bd08984fd00cfd7759) (cherry picked from commit 96eec5f5aaa99288ef59097cc39c6322993521ab) - URL: https://github.com/kamailio/kamailio/commit/4212e5086454bb798a604d12cfb258e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:58:18+02:00 lib/srdb1: increased the safety check for max db url to 1023 - was 255, too small for large connection strings needed for no-sql - reported by GH #1545 (cherry picked from commit 0a9ebbbdfe0cd4c137338adbacf5c5890222708a) (cherry picked from commit 7e763c727076af3a3a35db4fc840e857ba00ae46) - URL: https://github.com/kamailio/kamailio/commit/a43fb8cafeb947a179272146c8d491e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:58:30+02:00 stun: catch udp ping 0000 when trying to parse stun headers - avoid useless debug message - info message made debug if the size of received packet is too small for a stun header (cherry picked from commit 7e08fc8d2b74657d6e6171effbab2770482d693e) (cherry picked from commit 7d6dddfbf2ccadaf749496a4288f176b191350f2) - URL: https://github.com/kamailio/kamailio/commit/3d08b554ffec71976b1ef922a7106ab… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2018-06-20T08:58:52+02:00 db_cluster remove old svn ID tags (cherry picked from commit be82892a68342287d37de90ddb74c1f66a37e28f) (cherry picked from commit 0c17c1c8ba43967025f13a87507e6877490ed229) - URL: https://github.com/kamailio/kamailio/commit/968b32c7593897ab4cf98962bddf92e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:59:10+02:00 carrierroute: rename boolean type conflicting with clang sdtbool In file included from carrierroute.c:51: ./cr_db.h:92:2: error: expected identifier false = 0, ^ /usr/lib/clang/9.1.0/include/stdbool.h:33:15: note: expanded from macro 'false' #define false 0 (cherry picked from commit 0a14914fc1f98c18b9b75f66fe2e71f15147c9bf) (cherry picked from commit 9aee0374e1db8733a220d37fbc53517353aee4dd) - URL: https://github.com/kamailio/kamailio/commit/270b99711fcf01f7dfe0a40d841f661… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-06-20T08:59:38+02:00 dialog: check CSeq careful with track_cseq_updates to avoid null pointer access for malformed messages (cherry picked from commit 59c7bf4f43a8cd5dcb0555835a064d88679956c5) (cherry picked from commit 12ddd127343f1be98a4556aadd9ccfeafc3fbdc7) - URL: https://github.com/kamailio/kamailio/commit/a90bd2e71840baaf7a704a6bcd67ca9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T08:59:52+02:00 pv: debug message with intermediate message to evaluate by pv_evalx() (cherry picked from commit 03698a4b2ec49896c08a3989403d7e33ff9fb844) (cherry picked from commit 574a0d245bf1864ca6b855081fd76c721fd19532) - URL: https://github.com/kamailio/kamailio/commit/28bf80cda3ba8508ae42fc47992c8fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-20T09:00:20+02:00 examples: remove execute mode from text file (cherry picked from commit 226a6aa06fc46ead24e262afd382af64452ae080) (cherry picked from commit 6bff7a4172df898483dfc928c19a26ec1c6a6f0f) - URL: https://github.com/kamailio/kamailio/commit/f27bfe646e35320edc5391ae324e882… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-20T09:00:42+02:00 tm: free new tm cell in case of error if it was not referenced - part of t_uac_prepare(), reported by GH #1554 (cherry picked from commit f94770840029c1c73ab129f4b71fcb0cf146d808) (cherry picked from commit 3da0bcb4b4e27d115a2d6eb47cd0cebc33d34a61) - URL: https://github.com/kamailio/kamailio/commit/5c89c5be613fd15638d2cbd8869ca84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:39:16+02:00 core: pv - default number of buffer slots set to 40 - it was 10 - allow handling more chained evaluations in large strings (cherry picked from commit c087b1d1dd06a1fd417998fe0a51dedcfe02e8c6) (cherry picked from commit 352af1b5a878daf90e16f5ae012f5ecb87fabbff) - URL: https://github.com/kamailio/kamailio/commit/ba1c1f73c107b9692632910077b53fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:39:26+02:00 kazoo: replaced obsolete json is_error() macro (cherry picked from commit 7d3766614832ef22433e36ef0791fa41796829a2) (cherry picked from commit 53f46ab7b6eb311137033f6cdb27ef73d87cb3f2) - URL: https://github.com/kamailio/kamailio/commit/d65e06f97d0e971d2caec1f02f5d5bb… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-21T08:40:01+02:00 src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again (cherry picked from commit 7585a57037f6ef21cda376b16b0077fa981eceac) (cherry picked from commit a026856140a66d9edf4f81c133431d93c2e3392e) - URL: https://github.com/kamailio/kamailio/commit/b052ede56c7f7abd3d15e37f588893e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:40:11+02:00 sqlops: increased the length of printed query part in case of errors (cherry picked from commit 5f7eee55c648cfa1b5b5662648fc9133daa6d6b6) (cherry picked from commit 9459e4ae1d9599b04ca67f88191cc9a73106965b) - URL: https://github.com/kamailio/kamailio/commit/d53d92fcdc1089356d3038a131ab2da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:40:20+02:00 dialog: docs - fixed example for rpc dlg.terminate_dlg (cherry picked from commit a10d04ddca3a357e8e589a4c3eaba7989dce7de9) (cherry picked from commit 4169c9ab6c4f0636a0a5dcdf77b1a032a7d9d5f6) - URL: https://github.com/kamailio/kamailio/commit/6b5b04e071712d67ad12110a4d6ba3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:40:33+02:00 core: raw sock - reset the rcv_msg and proper test for totlen (cherry picked from commit 145e3a1e461dd53fb1e06bae619d20a09dcffe75) (cherry picked from commit 6bf6cfbb90c3fd29cb0c5c079b0eef44892690bf) - URL: https://github.com/kamailio/kamailio/commit/735044314f822f793d1f6ca9a0324dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:40:47+02:00 log_custom: check return code for udp send (cherry picked from commit 5f91017c0393faa02201ccc3693fee6381ea691a) (cherry picked from commit 0b9755011687685467e2d53cb4dcb0c58ea28688) - URL: https://github.com/kamailio/kamailio/commit/b8ab414948a80e191df29fcd0f72acc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:43:43+02:00 tm: t_serial - safety checks for xavp search result (cherry picked from commit 67d5aac30d7e44f0d19e41df88fce39f67192483) (cherry picked from commit e2aa0e44b3e8d283b6be87c8858e384b40fe63db)

1 0

git:5.1:5abf68b4: db_perlvdb: unref in case of error
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 5abf68b4d9afc8bf0cd71727b7e71d966a67b165 URL: https://github.com/kamailio/kamailio/commit/5abf68b4d9afc8bf0cd71727b7e71d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:30:50+02:00 db_perlvdb: unref in case of error (cherry picked from commit 927ddcf084b637385df103fb489d843e0255f4f8) --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/5abf68b4d9afc8bf0cd71727b7e71d9… Patch: https://github.com/kamailio/kamailio/commit/5abf68b4d9afc8bf0cd71727b7e71d9… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index 677f09a850..f263774658 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -263,9 +263,9 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { /* Fetch column definitions */ colarrayref = perlvdb_perlmethod(perlres, PERL_VDB_COLDEFSMETHOD, NULL, NULL, NULL, NULL); - if (!(SvROK(colarrayref))) goto error; + if (colarrayref==NULL || !(SvROK(colarrayref))) goto error; colarray = (AV *)SvRV(colarrayref); - if (!(SvTYPE(colarray) == SVt_PVAV)) goto error; + if (colarray==NULL || !(SvTYPE(colarray) == SVt_PVAV)) goto error; colcount = av_len(colarray) + 1; @@ -305,7 +305,7 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { } rowarray = (AV *)SvRV(rowarrayref); - if (!(SvTYPE(rowarray) == SVt_PVAV)) goto error; + if (rowarray == NULL || !(SvTYPE(rowarray) == SVt_PVAV)) goto error; rowcount = av_len(rowarray) + 1; @@ -403,10 +403,12 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { } end: - if (colarray) av_undef(colarray); + if(colarray) av_undef(colarray); if (rowarray) av_undef(rowarray); return retval; error: + if(colarray) av_undef(colarray); + if (rowarray) av_undef(rowarray); LM_CRIT("broken result set. Exiting, leaving Kamailio in unknown state.\n"); return -1; }

1 0

git:5.1:e2aa0e44: tm: t_serial - safety checks for xavp search result
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: e2aa0e44b3e8d283b6be87c8858e384b40fe63db URL: https://github.com/kamailio/kamailio/commit/e2aa0e44b3e8d283b6be87c8858e384… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:30:37+02:00 tm: t_serial - safety checks for xavp search result (cherry picked from commit 67d5aac30d7e44f0d19e41df88fce39f67192483) --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/e2aa0e44b3e8d283b6be87c8858e384… Patch: https://github.com/kamailio/kamailio/commit/e2aa0e44b3e8d283b6be87c8858e384… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 019b35dbb4..8f8ee0646d 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -642,7 +642,11 @@ int ki_t_next_contacts(struct sip_msg* msg) } vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + if (vavp != NULL) { + flags = vavp->val.v.i; + } else { + flags = 0; + } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); if (vavp != NULL) { @@ -774,8 +778,7 @@ int ki_t_next_contact_flow(struct sip_msg* msg) /* Load Request-URI and branches */ t_get_this_branch_instance(msg, &this_instance); - if (this_instance.len == 0) - { + if (this_instance.len == 0) { LM_DBG("No instance on this branch\n"); return -2; } @@ -792,13 +795,10 @@ int ki_t_next_contact_flow(struct sip_msg* msg) next_xavp = xavp_get_next(xavp); vavp = xavp_get(&instance_name, xavp->val.v.xavp); - if (vavp == NULL) - { + if (vavp == NULL) { /* Does not match this instance */ goto next_xavp; - } - else - { + } else { instance = vavp->val.v.s; if ((instance.len != this_instance.len) || (strncmp(instance.s, this_instance.s, instance.len) != 0)) @@ -807,7 +807,11 @@ int ki_t_next_contact_flow(struct sip_msg* msg) } vavp = xavp_get(&uri_name, xavp->val.v.xavp); - uri = vavp->val.v.s; + if (vavp == NULL) { + goto next_xavp; + } else { + uri = vavp->val.v.s; + } vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); if (vavp != NULL) { @@ -842,13 +846,27 @@ int ki_t_next_contact_flow(struct sip_msg* msg) } vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + if (vavp != NULL) { + flags = vavp->val.v.i; + } else { + flags = 0; + } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); - ruid = vavp->val.v.s; + if (vavp != NULL) { + ruid = vavp->val.v.s; + } else { + ruid.s = ""; + ruid.len = 0; + } vavp = xavp_get(&ua_name, xavp->val.v.xavp); - location_ua = vavp->val.v.s; + if (vavp != NULL) { + location_ua = vavp->val.v.s; + } else { + location_ua.s = ""; + location_ua.len = 0; + } LM_DBG("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s'" " inst-'%.*s' ruid-'%.*s' location_ua-'%.*s'\n",

1 0

git:5.1:6bf6cfbb: core: raw sock - reset the rcv_msg and proper test for totlen
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 6bf6cfbb90c3fd29cb0c5c079b0eef44892690bf URL: https://github.com/kamailio/kamailio/commit/6bf6cfbb90c3fd29cb0c5c079b0eef4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:29:56+02:00 core: raw sock - reset the rcv_msg and proper test for totlen (cherry picked from commit 145e3a1e461dd53fb1e06bae619d20a09dcffe75) --- Modified: src/core/raw_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/6bf6cfbb90c3fd29cb0c5c079b0eef4… Patch: https://github.com/kamailio/kamailio/commit/6bf6cfbb90c3fd29cb0c5c079b0eef4… --- diff --git a/src/core/raw_sock.c b/src/core/raw_sock.c index a8beb6691e..9dd65d2340 100644 --- a/src/core/raw_sock.c +++ b/src/core/raw_sock.c @@ -228,6 +228,7 @@ int recvpkt4(int sock, char* buf, int len, union sockaddr_union* from, iov[0].iov_base=buf; iov[0].iov_len=len; + memset(&rcv_msg, 0, sizeof(struct msghdr)); rcv_msg.msg_name=from; rcv_msg.msg_namelen=sockaddru_len(*from); rcv_msg.msg_control=msg_ctrl_buf; @@ -603,7 +604,7 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, int ret; totlen = len + sizeof(hdr); - if (unlikely(totlen) > 65535) + if (unlikely(totlen > 65535)) return -2; memset(&snd_msg, 0, sizeof(snd_msg)); snd_msg.msg_name=&to->sin;

1 0

git:5.1:0b975501: log_custom: check return code for udp send
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 0b9755011687685467e2d53cb4dcb0c58ea28688 URL: https://github.com/kamailio/kamailio/commit/0b9755011687685467e2d53cb4dcb0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:30:22+02:00 log_custom: check return code for udp send (cherry picked from commit 5f91017c0393faa02201ccc3693fee6381ea691a) --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0b9755011687685467e2d53cb4dcb0c… Patch: https://github.com/kamailio/kamailio/commit/0b9755011687685467e2d53cb4dcb0c… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index f88a783b7c..e635baf75e 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -148,7 +148,9 @@ void _lc_core_log_udp(int lpriority, const char *format, ...) n += snprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, "(%d) ", my_pid()); n += vsnprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, format, arglist); va_end(arglist); - udp_send(&_lc_udp_dst, obuf, n); + if(udp_send(&_lc_udp_dst, obuf, n)!=0) { + LM_DBG("udp send returned non zero\n"); + } } int ki_log_udp(sip_msg_t *msg, str *txt)

1 0

git:5.1:4169c9ab: dialog: docs - fixed example for rpc dlg.terminate_dlg
by Daniel-Constantin Mierla 21 Jun '18

21 Jun '18

Module: kamailio Branch: 5.1 Commit: 4169c9ab6c4f0636a0a5dcdf77b1a032a7d9d5f6 URL: https://github.com/kamailio/kamailio/commit/4169c9ab6c4f0636a0a5dcdf77b1a03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-21T08:29:30+02:00 dialog: docs - fixed example for rpc dlg.terminate_dlg (cherry picked from commit a10d04ddca3a357e8e589a4c3eaba7989dce7de9) --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4169c9ab6c4f0636a0a5dcdf77b1a03… Patch: https://github.com/kamailio/kamailio/commit/4169c9ab6c4f0636a0a5dcdf77b1a03… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 07287abc4a..2a63adf863 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2354,7 +2354,7 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { <emphasis>from_tag</emphasis> - from tag of the dialog to terminated </para></listitem> <listitem><para> - <emphasis>totag</emphasis> - to tag of the dialog to terminated + <emphasis>to_tag</emphasis> - to tag of the dialog to terminated </para></listitem> </itemizedlist> <para> @@ -2362,7 +2362,7 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { </para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - kamcmd dlg.dlg_terminate_dlg callid12345 fromtag123 totag123 + kamcmd dlg.terminate_dlg callid12345 fromtag123 totag123 </programlisting> </section> <section>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev