sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
311 discussions

git:master:ef3233d1: core: init origproto to fix compiler warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ef3233d14080936486d09edbe9598d7d92bd2f33 URL: https://github.com/kamailio/kamailio/commit/ef3233d14080936486d09edbe9598d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-09T12:19:54+01:00 core: init origproto to fix compiler warning - GH #2543 --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/ef3233d14080936486d09edbe9598d7… Patch: https://github.com/kamailio/kamailio/commit/ef3233d14080936486d09edbe9598d7… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 9a4b90fba3..9a63a5bd21 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3261,6 +3261,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, ret=-E_DNS_NO_NAPTR; if(proto) origproto=*proto; + else origproto = PROTO_NONE; if (dns_hash==0){ /* not init => use normal, non-cached version */ LM_WARN("called before dns cache initialization\n"); h->srv=h->a=0;

3 years, 5 months

git:5.3:c16b3f7e: pkg/kamailio/alpine: packaged app_lua_sr module

by Sergey Safarov

Module: kamailio Branch: 5.3 Commit: c16b3f7e7fe6646ea84bdfc32e4130eeac6b39e5 URL: https://github.com/kamailio/kamailio/commit/c16b3f7e7fe6646ea84bdfc32e4130e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-09T00:24:15+03:00 pkg/kamailio/alpine: packaged app_lua_sr module (cherry picked from commit 6782b2c1789f162b405ec0b9894f61075a4307f9) --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/c16b3f7e7fe6646ea84bdfc32e4130e… Patch: https://github.com/kamailio/kamailio/commit/c16b3f7e7fe6646ea84bdfc32e4130e… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 395bfc8592..e687f0ab97 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -157,7 +157,7 @@ _mod_list_presence="presence presence_conference presence_dialoginfo \ rls xcap_client xcap_server" # - modules depending on lua library -_mod_list_lua="app_lua" +_mod_list_lua="app_lua app_lua_sr" # - modules depending on perl library _mod_list_perl="app_perl db_perlvdb"

3 years, 5 months

git:5.4:5c26e09f: pkg/kamailio/alpine: packaged app_lua_sr module

by Sergey Safarov

Module: kamailio Branch: 5.4 Commit: 5c26e09f8c5be8c3de66958207701cdd7a8dce62 URL: https://github.com/kamailio/kamailio/commit/5c26e09f8c5be8c3de66958207701cd… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-09T00:22:58+03:00 pkg/kamailio/alpine: packaged app_lua_sr module (cherry picked from commit 6782b2c1789f162b405ec0b9894f61075a4307f9) --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/5c26e09f8c5be8c3de66958207701cd… Patch: https://github.com/kamailio/kamailio/commit/5c26e09f8c5be8c3de66958207701cd… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 8427721ea3..41af6c2024 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -157,7 +157,7 @@ _mod_list_presence="presence presence_conference presence_dialoginfo \ rls xcap_client xcap_server" # - modules depending on lua library -_mod_list_lua="app_lua" +_mod_list_lua="app_lua app_lua_sr" # - modules depending on perl library _mod_list_perl="app_perl db_perlvdb"

3 years, 5 months

git:master:6782b2c1: pkg/kamailio/alpine: packaged app_lua_sr module

by Sergey Safarov

Module: kamailio Branch: master Commit: 6782b2c1789f162b405ec0b9894f61075a4307f9 URL: https://github.com/kamailio/kamailio/commit/6782b2c1789f162b405ec0b9894f610… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-09T00:19:44+03:00 pkg/kamailio/alpine: packaged app_lua_sr module --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/6782b2c1789f162b405ec0b9894f610… Patch: https://github.com/kamailio/kamailio/commit/6782b2c1789f162b405ec0b9894f610… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 974b99f623..6a7cb2534f 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -157,7 +157,7 @@ _mod_list_presence="presence presence_conference presence_dialoginfo \ rls xcap_client xcap_server" # - modules depending on lua library -_mod_list_lua="app_lua" +_mod_list_lua="app_lua app_lua_sr" # - modules depending on perl library _mod_list_perl="app_perl db_perlvdb"

3 years, 5 months

[kamailio/kamailio] update PHONENUM google libphonenumber version on centos7 (#2533)

by Damien Burke

### Description installing from the RPM installs libphonenumber 8.10 which does not include the north American area code 689. ### Solution? Update google libphonenumber requirements to >=8.12 in kamailio's PHONENUM module. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.1 (x86_64/linux) 09fd6a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 09fd6a compiled on 11:07:49 Sep 1 2020 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS 7.8 - CentOS Linux release 7.8.2003 (Core) kernel 3.10.0-1127.13.1.el7.x86_64 ``` -- 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/2533

3 years, 5 months

git:5.4:345376cb: sl: Fix 3xx stats RPC marshalling

by Henning Westerholt

Module: kamailio Branch: 5.4 Commit: 345376cb49a5464ebb65f940e97262e010dc24ae URL: https://github.com/kamailio/kamailio/commit/345376cb49a5464ebb65f940e97262e… Author: Guillem Jover <gjover(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-06T14:25:16Z sl: Fix 3xx stats RPC marshalling The struct_add() method was getting 4 values but only 3 "d". (cherry picked from commit ac55cc5ce5fcbb50d3a2a6b228585dce8fc1150d) --- Modified: src/modules/sl/sl_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/345376cb49a5464ebb65f940e97262e… Patch: https://github.com/kamailio/kamailio/commit/345376cb49a5464ebb65f940e97262e… --- diff --git a/src/modules/sl/sl_stats.c b/src/modules/sl/sl_stats.c index dd683eda5b..079786aade 100644 --- a/src/modules/sl/sl_stats.c +++ b/src/modules/sl/sl_stats.c @@ -73,7 +73,7 @@ static void rpc_stats(rpc_t* rpc, void* c) "202", total.err[RT_202], "2xx", total.err[RT_2xx]); - rpc->struct_add(st, "ddd", + rpc->struct_add(st, "dddd", "300", total.err[RT_300], "301", total.err[RT_301], "302", total.err[RT_302],

3 years, 5 months

git:5.3:c64c264c: sl: Fix 3xx stats RPC marshalling

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: c64c264c84a12b66aa77e088306fe9914c08d558 URL: https://github.com/kamailio/kamailio/commit/c64c264c84a12b66aa77e088306fe99… Author: Guillem Jover <gjover(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-06T14:24:51Z sl: Fix 3xx stats RPC marshalling The struct_add() method was getting 4 values but only 3 "d". (cherry picked from commit ac55cc5ce5fcbb50d3a2a6b228585dce8fc1150d) --- Modified: src/modules/sl/sl_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/c64c264c84a12b66aa77e088306fe99… Patch: https://github.com/kamailio/kamailio/commit/c64c264c84a12b66aa77e088306fe99… --- diff --git a/src/modules/sl/sl_stats.c b/src/modules/sl/sl_stats.c index dd683eda5b..079786aade 100644 --- a/src/modules/sl/sl_stats.c +++ b/src/modules/sl/sl_stats.c @@ -73,7 +73,7 @@ static void rpc_stats(rpc_t* rpc, void* c) "202", total.err[RT_202], "2xx", total.err[RT_2xx]); - rpc->struct_add(st, "ddd", + rpc->struct_add(st, "dddd", "300", total.err[RT_300], "301", total.err[RT_301], "302", total.err[RT_302],

3 years, 5 months

git:master:f59b0342: modules: readme files regenerated - sl ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f59b0342e380b73eab6415a070a5f9250316fcbb URL: https://github.com/kamailio/kamailio/commit/f59b0342e380b73eab6415a070a5f92… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-06T10:16:21+01:00 modules: readme files regenerated - sl ... [skip ci] --- Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/f59b0342e380b73eab6415a070a5f92… Patch: https://github.com/kamailio/kamailio/commit/f59b0342e380b73eab6415a070a5f92… --- diff --git a/src/modules/sl/README b/src/modules/sl/README index 71825ac919..39a022f6b1 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -29,8 +29,9 @@ Daniel-Constantin Mierla 3.1. sl_send_reply(code, reason) 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward_reply([ code, [ reason ] ]) + 3.3. send_reply_mode(code, reason, mode) + 3.4. sl_reply_error() + 3.5. sl_forward_reply([ code, [ reason ] ]) 4. Statistics @@ -74,8 +75,9 @@ Daniel-Constantin Mierla 1.6. event_callback_lres_sent example 1.7. sl_send_reply usage 1.8. send_reply usage - 1.9. sl_reply_error usage - 1.10. send_reply usage + 1.9. send_reply_mode usage + 1.10. sl_reply_error usage + 1.11. send_reply usage Chapter 1. Admin Guide @@ -95,8 +97,9 @@ Chapter 1. Admin Guide 3.1. sl_send_reply(code, reason) 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward_reply([ code, [ reason ] ]) + 3.3. send_reply_mode(code, reason, mode) + 3.4. sl_reply_error() + 3.5. sl_forward_reply([ code, [ reason ] ]) 4. Statistics @@ -246,8 +249,9 @@ modparam("sl", "event_callback_lres_sent", "ksr_event_sl_local_response") 3.1. sl_send_reply(code, reason) 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward_reply([ code, [ reason ] ]) + 3.3. send_reply_mode(code, reason, mode) + 3.4. sl_reply_error() + 3.5. sl_forward_reply([ code, [ reason ] ]) 3.1. sl_send_reply(code, reason) @@ -297,18 +301,37 @@ send_reply("404", "Not found"); send_reply("403", "Invalid user - $fU"); ... -3.3. sl_reply_error() +3.3. send_reply_mode(code, reason, mode) + + Similar to send_reply() function, with additional third parameter mode, + which can specify extra operations to be done along with sending the + SIP response. + + The parameter mode is a flag-based value and can be a combination of: + * 1 - do not connect to send the response (similar to + set_reply_no_connect()). + * 2 - close the connection after sending the response (similar to + set_reply_close()). + + Example 1.9. send_reply_mode usage +... +send_reply_mode("404", "Not found", "3"); +... +send_reply_mode("403", "Invalid user - $fU", "3"); +... + +3.4. sl_reply_error() Sends back an error reply describing the nature of the last internal error. Usually this function should be used after a script function that returned an error code. - Example 1.9. sl_reply_error usage + Example 1.10. sl_reply_error usage ... sl_reply_error(); ... -3.4. sl_forward_reply([ code, [ reason ] ]) +3.5. sl_forward_reply([ code, [ reason ] ]) Forward statelessly the current received SIP reply, with the option to change the status code and reason text. The new code has to be in the @@ -321,7 +344,7 @@ sl_reply_error(); This function can be used from ONREPLY_ROUTE. - Example 1.10. send_reply usage + Example 1.11. send_reply usage ... if(status=="408") sl_forward_reply("404", "Not found");

3 years, 5 months

git:master:05ed94d0: sl: docs for send_reply_mode()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 05ed94d030f62714cc0220fc6b6e0ffd5a0feb79 URL: https://github.com/kamailio/kamailio/commit/05ed94d030f62714cc0220fc6b6e0ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-06T10:06:42+01:00 sl: docs for send_reply_mode() --- Modified: src/modules/sl/doc/sl_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/05ed94d030f62714cc0220fc6b6e0ff… Patch: https://github.com/kamailio/kamailio/commit/05ed94d030f62714cc0220fc6b6e0ff… --- diff --git a/src/modules/sl/doc/sl_functions.xml b/src/modules/sl/doc/sl_functions.xml index 1bb12b76c4..11ef470675 100644 --- a/src/modules/sl/doc/sl_functions.xml +++ b/src/modules/sl/doc/sl_functions.xml @@ -84,6 +84,42 @@ send_reply("404", "Not found"); ... send_reply("403", "Invalid user - $fU"); ... +</programlisting> + </example> + </section> + + <section id="sl.f.send_reply_mode"> + <title> + <function moreinfo="none">send_reply_mode(code, reason, mode)</function> + </title> + <para> + Similar to send_reply() function, with additional third parameter + mode, which can specify extra operations to be done along with + sending the SIP response. + </para> + <para> + The parameter mode is a flag-based value and can be a combination of: + </para> + <itemizedlist> + <listitem> + <para><emphasis>1</emphasis> - do not connect to send the response + (similar to set_reply_no_connect()). + </para> + </listitem> + <listitem> + <para><emphasis>2</emphasis> - close the connection after sending the + response (similar to set_reply_close()). + </para> + </listitem> + </itemizedlist> + <example> + <title><function>send_reply_mode</function> usage</title> + <programlisting format="linespecific"> +... +send_reply_mode("404", "Not found", "3"); +... +send_reply_mode("403", "Invalid user - $fU", "3"); +... </programlisting> </example> </section>

3 years, 5 months

git:master:14923a25: sl: new function send_reply_mode(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 14923a2581113615ad071be407086dcf807a5f67 URL: https://github.com/kamailio/kamailio/commit/14923a2581113615ad071be407086dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-06T09:38:08+01:00 sl: new function send_reply_mode(...) - similar to send_reply(), but has a 3rd parameter to control the execution mode (for now it can set the flags to not connect on sending or close connection after sending) --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/14923a2581113615ad071be407086dc… Patch: https://github.com/kamailio/kamailio/commit/14923a2581113615ad071be407086dc… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 66a16a0f08..a46faab182 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -71,6 +71,8 @@ str _sl_event_callback_lres_sent = STR_NULL; static int w_sl_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_send_reply(struct sip_msg* msg, char* str1, char* str2); +static int w_send_reply_mode(struct sip_msg* msg, char* str1, char* str2, + char *str3); static int w_sl_reply_error(struct sip_msg* msg, char* str1, char* str2); static int w_sl_forward_reply0(sip_msg_t* msg, char* str1, char* str2); static int w_sl_forward_reply1(sip_msg_t* msg, char* str1, char* str2); @@ -80,6 +82,7 @@ static int mod_init(void); static int child_init(int rank); static void mod_destroy(); static int fixup_sl_reply(void** param, int param_no); +static int fixup_sl_reply_mode(void** param, int param_no); static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_ltt_name(pv_spec_p sp, str *in); @@ -99,6 +102,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE}, {"send_reply", w_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE}, + {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, fixup_sl_reply_mode, 0, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, 0, @@ -333,6 +338,53 @@ static int w_send_reply(struct sip_msg* msg, char* p1, char* p2) return send_reply(msg, code, &reason); } +/** + * @brief send stateful reply if transaction was created + * + * Check if transation was created for respective SIP request and reply + * in stateful mode, otherwise send stateless reply + * + * @param msg - SIP message structure + * @param code - reply status code + * @param reason - reply reason phrase + * @param mode - execution mode + * @return 1 for success and -1 for failure + */ +int ki_send_reply_mode(struct sip_msg *msg, int code, str *reason, int mode) +{ + if(mode & SET_RPL_NO_CONNECT_T) { + msg->rpl_send_flags.f|= SND_F_FORCE_CON_REUSE; + } else if(mode & SET_RPL_CLOSE_T) { + msg->rpl_send_flags.f|= SND_F_CON_CLOSE; + } + + return send_reply(msg, code, reason); +} + +/** + * @brief Small wrapper around send_reply + */ +static int w_send_reply_mode(struct sip_msg* msg, char* p1, char* p2, char *p3) +{ + int code; + str reason; + int mode = 0; + + if (get_int_fparam(&code, msg, (fparam_t*)p1) < 0) { + code = default_code; + } + + if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) { + reason = default_reason; + } + + if (get_int_fparam(&mode, msg, (fparam_t*)p3) < 0) { + mode = 0; + } + + return ki_send_reply_mode(msg, code, &reason, mode); +} + /** * @brief store To-tag value in totag parameter */ @@ -374,6 +426,21 @@ static int fixup_sl_reply(void** param, int param_no) return 0; } +/** + * @brief fixup for SL reply mode config file functions + */ +static int fixup_sl_reply_mode(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_var_int_12(param, 1); + } else if (param_no == 2) { + return fixup_var_pve_str_12(param, 2); + } else if (param_no == 3) { + return fixup_var_int_12(param, 1); + } + return 0; +} + /** * @brief forward SIP reply statelessly with different code and reason text */ @@ -613,6 +680,11 @@ static sr_kemi_t sl_kemi_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sl"), str_init("send_reply_mode"), + SR_KEMIP_INT, ki_send_reply_mode, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sl"), str_init("sl_reply_error"), SR_KEMIP_INT, sl_reply_error, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

3 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020