sr-dev December 2020

sr-dev@lists.kamailio.org

18 participants
205 discussions

git:5.4:573dd7e6: tls: log version, gh #2561
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.4 Commit: 573dd7e63ac3d2629367f72c967ec7fbd4edfcf1 URL: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T15:14:31Z tls: log version, gh #2561 (cherry picked from commit c9f0adddde8321bfaf368691fea74079e40bd789) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… Patch: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 0b9fd39fc8..fed9749624 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -385,6 +385,7 @@ static int mod_init(void) if (tls_check_sockets(*tls_domains_cfg) < 0) goto error; + LM_INFO("use OpenSSL version: %08x\n", (uint32_t)(OPENSSL_VERSION_NUMBER)); #ifndef OPENSSL_NO_ECDH LM_INFO("With ECDH-Support!\n"); #endif

1 0

git:master:8e54f027: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 8e54f027e8193b70e840033b9c3c5a94ebf5486b URL: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T14:46:11+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… Patch: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 3298f6f41d..8100557bd5 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -722,13 +722,15 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") Defines the name of XAVP class to store runtime module config values. The values are stored as inner XAVPs, like $xavp(class=>attribute). Valid inner XAVP names: + * expires - the number of maximum contacts to be stored for the + current registration AoR. It overwrites the 'max_contacts' module + parameter value. + * q - the expires value, to overwrite the value from SIP headers. * max_contacts - the number of maximum contacts to be stored for the current registration AoR. It overwrites the 'max_contacts' module parameter value. * socket - the string representing the socket on which the register request was received, as alternative to using the sock_hdr. - * q - q value of contact (integer 0-1000). It overrides q value given - in contact header and default_q parameter. For example. if this parameter is set to 'reg', then the number of maximum contacts can be set in $xavp(reg=>max_contacts). @@ -742,6 +744,7 @@ modparam("registrar", "xavp_cfg", "reg") request_route { ... $xavp(reg=>max_contacts) = 4; + $xavp(reg[0]=>expires) = 600; save("location"); ... }

1 0

git:master:4b7c02c9: registrar: docs for expires field of xavp_cfg
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 4b7c02c93053076d3089499a0290203157b63c0d URL: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T14:34:16+01:00 registrar: docs for expires field of xavp_cfg --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… Patch: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 94ce4b3a0b..f4bb213b14 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -745,24 +745,29 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") <itemizedlist> <listitem> <para> - <emphasis>max_contacts</emphasis> - the number of maximum + <emphasis>expires</emphasis> - the number of maximum contacts to be stored for the current registration AoR. It overwrites the 'max_contacts' module parameter value. </para> </listitem> <listitem> <para> - <emphasis>socket</emphasis> - the string representing the - socket on which the register request was received, as alternative - to using the sock_hdr. + <emphasis>q</emphasis> - the expires value, to overwrite the + value from SIP headers. + </para> + </listitem> + <listitem> + <para> + <emphasis>max_contacts</emphasis> - the number of maximum + contacts to be stored for the current registration AoR. It + overwrites the 'max_contacts' module parameter value. </para> </listitem> <listitem> <para> - <emphasis>q</emphasis> - q value of contact - (integer 0-1000). It - overrides q value given in contact header and - default_q parameter. + <emphasis>socket</emphasis> - the string representing the + socket on which the register request was received, as alternative + to using the sock_hdr. </para> </listitem> </itemizedlist> @@ -784,6 +789,7 @@ modparam("registrar", "xavp_cfg", "reg") request_route { ... $xavp(reg=>max_contacts) = 4; + $xavp(reg[0]=>expires) = 600; save("location"); ... }

1 0

git:master:132c9d03: registrar: allow taking expires value from xavp_cfg expires field
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 132c9d03a458c1c8371dfe5bfe07d996e4407cb2 URL: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T14:31:08+01:00 registrar: allow taking expires value from xavp_cfg expires field --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… Patch: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index 2b43dd7611..905e3d6b9d 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -246,27 +246,36 @@ contact_t* get_next_contact(contact_t* _c) void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e, int novariation) { int range = 0; + sr_xavp_t *vavp = NULL; + str xename = str_init("expires"); - if (!_ep || !_ep->body.len) { - *_e = get_expires_hf(_m); + if (reg_xavp_cfg.s != NULL) { + vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &xename); + } - if ( *_e < 0 ) { - *_e = cfg_get(registrar, registrar_cfg, default_expires); - range = cfg_get(registrar, registrar_cfg, default_expires_range); - } else { - range = cfg_get(registrar, registrar_cfg, expires_range); - } + if (vavp != NULL && vavp->val.v.i >= 0) { + *_e = vavp->val.v.i; } else { - if (str2int(&_ep->body, (unsigned int*)_e) < 0) { - *_e = cfg_get(registrar, registrar_cfg, default_expires); - range = cfg_get(registrar, registrar_cfg, default_expires_range); + if (!_ep || !_ep->body.len) { + *_e = get_expires_hf(_m); + + if ( *_e < 0 ) { + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); + } } else { - range = cfg_get(registrar, registrar_cfg, expires_range); + if (str2int(&_ep->body, (unsigned int*)_e) < 0) { + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); + } } } - if ( *_e != 0 ) - { + if ( *_e != 0 ) { if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { if(reg_min_expires_mode) { rerrno = R_LOW_EXP;

1 0

Releasing Kamailio 5.3.8
by Henning Westerholt 21 Dec '20

21 Dec '20

Hello, I am planning to release next week (likely on Monday 21st December) the next minor version out of branch 5.3, version 5.3.8. Backports of fixed issues from git master will be integrated as usual. If you are aware of new issues which were not yet reported, let us know (by creating an issue on the tracker). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

git:master:58468c3a: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 58468c3ac6cbfcf426e2f7a89d2becbec09aac32 URL: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T10:31:37+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… Patch: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 6724cc5716..0028f9e623 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -72,6 +72,7 @@ Hugh Waite 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 5. Pseudovariables @@ -128,6 +129,7 @@ Hugh Waite 1.23. http_connect_raw() usage 1.24. http_get_redirect() usage 1.25. http_client_query() usage + 1.26. http_client_get() usage Chapter 1. Admin Guide @@ -169,6 +171,7 @@ Chapter 1. Admin Guide 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 5. Pseudovariables @@ -670,6 +673,7 @@ modparam("http_client", "netinterface", "eth0") 4.2. http_connect_raw(connection, url, content_type, data, result) 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -818,6 +822,28 @@ http_client_query("http://api.com/index.php", "src=$si", "Content-Type: text/plain", "$var(result)"); ... +4.5. http_client_get(url, body, hdrs, respv) + + Perform a HTTP GET request to "url", storing the response body in the + "respv" variable. The "body" and "hdrs" can be empty strings to skip + setting them. The first three parameters can contain variables that are + evaluated at runtime. The "respv" has to be the name of a writable + variable. + + Note: usually HTTP GET requests should have no body, according to specs + the body in HTTP GET does not affect the response, but is not + explicitely forbidden. + + Example 1.26. http_client_get() usage +... +http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu +{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} +... + 5. Pseudovariables 5.1. $curlerror(error)

1 0

git:master:729340ff: http_client: docs for http_client_get()
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 729340ff8c80ac836f1889c505cf361abc4fe0ae URL: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T10:29:28+01:00 http_client: docs for http_client_get() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… Patch: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 6f1c897690..2c8295f07f 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -897,6 +897,35 @@ http_client_query("http://api.com/index.php", # POST-Request http_client_query("http://api.com/index.php", "src=$si", "Content-Type: text/plain", "$var(result)"); +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_get"> + <title> + <function moreinfo="none">http_client_get(url, body, hdrs, respv)</function> + </title> + <para> + Perform a HTTP GET request to "url", storing the response body + in the "respv" variable. The "body" and "hdrs" can be empty strings + to skip setting them. The first three parameters can contain + variables that are evaluated at runtime. The "respv" has to be + the name of a writable variable. + </para> + <para> + Note: usually HTTP GET requests should have no body, according to + specs the body in HTTP GET does not affect the response, but is + not explicitely forbidden. + </para> + <example> + <title><function>http_client_get()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} ... </programlisting> </example>

1 0

git:master:b6a10887: http_client: new function http_client_get()
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: b6a1088767c4d9d483113ad06ac4700dcf46820f URL: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T10:15:53+01:00 http_client: new function http_client_get() - do explicit GET request with headers (and body) - exported KSR.http_client.get_hdrs() --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700… Patch: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700…

1 0

git:master:b04111b5: core: kemi - KSR.is_method_in() uses E/e to match PRACK
by Daniel-Constantin Mierla 19 Dec '20

19 Dec '20

Module: kamailio Branch: master Commit: b04111b583b454b12ea0c6a265a14858c195b213 URL: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-19T15:34:05+01:00 core: kemi - KSR.is_method_in() uses E/e to match PRACK --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… Patch: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 4060ad9d4d..ba0b435dce 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -852,6 +852,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'E': + case 'e': + if(imethod==METHOD_PRACK) { + return SR_KEMI_TRUE; + } + break; case 'P': case 'p': if(imethod==METHOD_PUBLISH) {

1 0

git:master:8693fabb: tls: kemi function KSR.tls.cget(aname)
by Daniel-Constantin Mierla 18 Dec '20

18 Dec '20

Module: kamailio Branch: master Commit: 8693fabb57af9428af5d3110da7dce12fe5cd634 URL: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-18T09:19:08+01:00 tls: kemi function KSR.tls.cget(aname) - get connection/certificates attributes by providing a corresponding tls pv name --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_select.c Modified: src/modules/tls/tls_select.h --- Diff: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1… Patch: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1…

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2020