sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:master:7f205a7b: - lib: use new introduced socket_len in topos and uacreg DB scheme (no actual change in definition)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 7f205a7bee0df7f1966f77250f765e5947fcd4dc URL: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:41:33+02:00 - lib: use new introduced socket_len in topos and uacreg DB scheme (no actual change in definition) --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… Patch: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 5b13333d62..e544bdd0db 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -202,7 +202,7 @@ <column id="a_socket"> <name>a_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - A side</description> </column> @@ -210,7 +210,7 @@ <column id="b_socket"> <name>b_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - B side</description> </column> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index c6bc095aeb..ca7eab9d5f 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -209,7 +209,7 @@ <column id="a_socket"> <name>a_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - A side</description> </column> @@ -217,7 +217,7 @@ <column id="b_socket"> <name>b_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - B side</description> </column> diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index 985b27f8ec..d6257d0cf4 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -137,7 +137,7 @@ <column id="socket"> <name>socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Used socket for sending out requests</description> </column>

1 0

git:master:ab3ad7ed: lib: add new DB scheme entity 'socket_len' with length 128 to prepare the change of uri_len
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: ab3ad7ed318f3b76c75c716ad1c0e280bb478262 URL: https://github.com/kamailio/kamailio/commit/ab3ad7ed318f3b76c75c716ad1c0e28… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:38:14+02:00 lib: add new DB scheme entity 'socket_len' with length 128 to prepare the change of uri_len --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/ab3ad7ed318f3b76c75c716ad1c0e28… Patch: https://github.com/kamailio/kamailio/commit/ab3ad7ed318f3b76c75c716ad1c0e28… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 17a47baf83..933777de2d 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -1,5 +1,6 @@ <!ENTITY user_len "64"> <!ENTITY domain_len "64"> +<!ENTITY socket_len "128"> <!ENTITY from_tag_len "128"> <!ENTITY to_tag_len "128"> <!ENTITY password_len "64">

1 0

git:master:c5bd1556: lib: use domain_len for dialog socket in database scheme (no change in table definitions)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: c5bd15567e56c4798aa15e670550e313bb0bf7c4 URL: https://github.com/kamailio/kamailio/commit/c5bd15567e56c4798aa15e670550e31… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:37:49+02:00 lib: use domain_len for dialog socket in database scheme (no change in table definitions) --- Modified: src/lib/srdb1/schema/dialog.xml --- Diff: https://github.com/kamailio/kamailio/commit/c5bd15567e56c4798aa15e670550e31… Patch: https://github.com/kamailio/kamailio/commit/c5bd15567e56c4798aa15e670550e31… --- diff --git a/src/lib/srdb1/schema/dialog.xml b/src/lib/srdb1/schema/dialog.xml index 8ff717b364..272b60d17a 100644 --- a/src/lib/srdb1/schema/dialog.xml +++ b/src/lib/srdb1/schema/dialog.xml @@ -136,14 +136,14 @@ <column> <name>caller_sock</name> <type>string</type> - <size>64</size> + <size>&domain_len;</size> <description>Local socket used to communicate with caller</description> </column> <column> <name>callee_sock</name> <type>string</type> - <size>64</size> + <size>&domain_len;</size> <description>Local socket used to communicate with callee</description> </column>

1 0

controlling presence with new module `pua_json`
by Bill Neely 27 Aug '19

27 Aug '19

Has anyone been successful in using this procedure with Grandstream phones behind NAT?

1 0

RFC: about sl and tm local-response event routes
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Hello, just discovered what I consider to be an inconsistency in naming and behaviour for event_route blocks for local-request and local-response and starting a discussion here to see how to move on. The event_route[tm:local-request] is executed before sending there local generated request out (allowing also to change its content, drop, etc...). This event route is quite popular event route used when the local generated requests need to be checked or updates. The event_route[tm:local-response] is executed after the response is sent out, obviously no possibility to change anymore the content. I haven't checked the code for event_route[sl:local-response], but based on commit message should be the same. I haven't used the local-response so far at all, today after a discussion on sr-users I wanted to enable kemi callback for tm:local-response and I noticed that behaviour in the code, even I expected to be like local-request (before sending out). I am not sure how much used are the event routes for tm:local-response and sl:local-response, I haven't seen any questions about them so far on mailing lists, that's why I am asking here if would make sense to rename them like tm:local-response-sent and sl:local-response-sent to properly reflect when they are executed. I am expecting that they are very few used so far, so no big head ache with upgrades and bringing some consistency around (this change to be part of next major release). It can stay like now with proper documentation, however in the future if one want and event route for local responses before being sent out, there will be more confusion, imo ... Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

4 5

git:master:88350ffb: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 88350ffb64c9655f195bf9e96be9645589094370 URL: https://github.com/kamailio/kamailio/commit/88350ffb64c9655f195bf9e96be9645… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T13:31:45+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/88350ffb64c9655f195bf9e96be9645… Patch: https://github.com/kamailio/kamailio/commit/88350ffb64c9655f195bf9e96be9645…

1 0

git:master:a2b8e829: tm: new parameter event_callback_lres_sent
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: a2b8e8296f3a56b9ba96f043e3297e4e65d95a58 URL: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: new parameter event_callback_lres_sent - set the name of callback function to be executed in KEMI scripts for event_route[tm:local-response] --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… Patch: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 25ece75fa6..350be35bdd 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -98,6 +98,8 @@ static int goto_on_reply=0; int goto_on_sl_reply=0; extern str on_sl_reply_name; +extern str _tm_event_callback_lres_sent; + /* remap 503 response code to 500 */ extern int tm_remap_503_500; /* send path and flags in 3xx class reply */ @@ -454,7 +456,10 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, struct tmcb_params onsend_params; int rt, backup_rt; struct run_act_ctx ctx; + struct run_act_ctx *bctx; struct sip_msg pmsg; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("tm:local-response-sent"); init_cancel_info(&cancel_data); if (!buf) @@ -558,17 +563,20 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, &onsend_params); } - if(_tm_local_response_sent_lookup == 0) { - rt = route_lookup(&event_rt, "tm:local-response"); - _tm_local_response_sent_lookup = 1; - } else { - rt = -1; + if(_tm_event_callback_lres_sent.len>0 + && _tm_event_callback_lres_sent.s!=NULL) { + keng = sr_kemi_eng_get(); + } + rt = -1; + if(likely(keng==NULL)) { + if(_tm_local_response_sent_lookup == 0) { + rt = route_lookup(&event_rt, "tm:local-response"); + _tm_local_response_sent_lookup = 1; + } } - if (unlikely(rt >= 0 && event_rt.rlist[rt] != NULL)) - { + if ((rt >= 0 && event_rt.rlist[rt] != NULL) || (keng != NULL)) { if (likely(build_sip_msg_from_buf(&pmsg, buf, len, - inc_msg_no()) == 0)) - { + inc_msg_no()) == 0)) { struct onsend_info onsnd_info; onsnd_info.to=&(trans->uas.response.dst.to); @@ -580,11 +588,21 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], &pmsg, 0); + if(keng == NULL) { + run_top_route(event_rt.rlist[rt], &pmsg, 0); + } else { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + sr_kemi_route(keng, &pmsg, EVENT_ROUTE, + &_tm_event_callback_lres_sent, &evname); + sr_kemi_act_ctx_set(bctx); + } set_route_type(backup_rt); p_onsend=0; free_sip_msg(&pmsg); + } else { + LM_ERR("failed to build sip msg structure\n"); } } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 99e20afcd3..6cbdaf1776 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -218,6 +218,7 @@ str contact_flows_avp = {0, 0}; str ulattrs_xavp_name = {NULL, 0}; str on_sl_reply_name = {NULL, 0}; int tm_remap_503_500 = 1; +str _tm_event_callback_lres_sent = {NULL, 0}; int tm_failure_exec_mode = 0; @@ -469,6 +470,7 @@ static param_export_t params[]={ {"event_callback", PARAM_STR, &tm_event_callback }, {"relay_100", PARAM_INT, &default_tm_cfg.relay_100 }, {"rich_redirect" , PARAM_INT, &tm_rich_redirect }, + {"event_callback_lres_sent", PARAM_STR, &_tm_event_callback_lres_sent }, {0,0,0} };

1 0

git:master:e78d2ffb: tm: docs for event_callback_lres_sent param
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: e78d2ffb2537f4272fd9a796e640edb4e4a75736 URL: https://github.com/kamailio/kamailio/commit/e78d2ffb2537f4272fd9a796e640edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: docs for event_callback_lres_sent param --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/e78d2ffb2537f4272fd9a796e640edb… Patch: https://github.com/kamailio/kamailio/commit/e78d2ffb2537f4272fd9a796e640edb… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index e17137c0cd..4c583ca782 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1431,7 +1431,37 @@ modparam("tm", "event_callback", "ksr_tm_event") ... -- event callback function implemented in Lua function ksr_tm_event(evname) - KSR.info("===== htable module triggered event: " .. evname .. "\n"); + KSR.info("===== tm module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> + + <section id="tm.p.event_callback_lres_sent"> + <title><varname>event_callback_lres</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[tm:local-response] block. The function receives + a string parameter with the name of the event, respectively + "tm:local-response". + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback_lres_sent</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("tm", "event_callback_lres_sent", "ksr_tm_event_response_sent") +... +-- event callback function implemented in Lua +function ksr_tm_event_response_sent(evname) + KSR.info("===== tm module triggered event: " .. evname .. "\n"); return 1; end ...

1 0

git:master:234f201e: tm: lookup envet route for local-response only once
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 234f201e180289414d6a45b7ecfe696273a54182 URL: https://github.com/kamailio/kamailio/commit/234f201e180289414d6a45b7ecfe696… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: lookup envet route for local-response only once --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/234f201e180289414d6a45b7ecfe696… Patch: https://github.com/kamailio/kamailio/commit/234f201e180289414d6a45b7ecfe696… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 30006ae8a6..25ece75fa6 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -441,6 +441,8 @@ inline static void start_final_repl_retr( struct cell *t ) +static int _tm_local_response_sent_lookup = 0; + static int _reply_light( struct cell *trans, char* buf, unsigned int len, unsigned int code, char *to_tag, unsigned int to_tag_len, int lock, @@ -556,7 +558,12 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, &onsend_params); } - rt = route_lookup(&event_rt, "tm:local-response"); + if(_tm_local_response_sent_lookup == 0) { + rt = route_lookup(&event_rt, "tm:local-response"); + _tm_local_response_sent_lookup = 1; + } else { + rt = -1; + } if (unlikely(rt >= 0 && event_rt.rlist[rt] != NULL)) { if (likely(build_sip_msg_from_buf(&pmsg, buf, len,

1 0

git:master:613fba97: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 613fba9704b497e6181802a7aa68fb3b476d4897 URL: https://github.com/kamailio/kamailio/commit/613fba9704b497e6181802a7aa68fb3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T13:01:47+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/613fba9704b497e6181802a7aa68fb3… Patch: https://github.com/kamailio/kamailio/commit/613fba9704b497e6181802a7aa68fb3… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 8cbefc75b8..d76abbe728 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -3014,8 +3014,8 @@ event_route [tm:local-request] { 6.3. event_route[tm:local-response] - Executed when the tm module is about to send a local generated, - transaction stateful response. + Executed after the tm module sent a local generated, transaction + stateful response. Example 1.98. event_route[tm:local-response] usage ...

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019