sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

git:master:d354446a: auth, auth_ephemeral: return code for expired username
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: d354446ab40b7cf13ec3286c2cda9ccc7edfdf42 URL: https://github.com/kamailio/kamailio/commit/d354446ab40b7cf13ec3286c2cda9cc… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:10:29+01:00 auth,auth_ephemeral: return code for expired username - added AUTH_USERNAME_EXPIRED auth api return code and used it in auth ephemeral authentication, when username is expired --- Modified: src/modules/auth/api.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/d354446ab40b7cf13ec3286c2cda9cc… Patch: https://github.com/kamailio/kamailio/commit/d354446ab40b7cf13ec3286c2cda9cc… --- diff --git a/src/modules/auth/api.h b/src/modules/auth/api.h index 9730b409ed..33d131840a 100644 --- a/src/modules/auth/api.h +++ b/src/modules/auth/api.h @@ -39,6 +39,7 @@ */ typedef enum auth_cfg_result { AUTH_USER_MISMATCH = -8, /*!< Auth user != From/To user */ + AUTH_USERNAME_EXPIRED = -7, /*!< Ephemeral auth username expired */ AUTH_NONCE_REUSED = -6, /*!< Returned if nonce is used more than once */ AUTH_NO_CREDENTIALS = -5, /*!< Credentials missing */ AUTH_STALE_NONCE = -4, /*!< Stale nonce */ diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 745f12d7ab..216332b321 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -203,7 +203,7 @@ int autheph_verify_timestamp(str *_username) if (cur_time > expires) { LM_WARN("username has expired\n"); - return -1; + return AUTH_USERNAME_EXPIRED; } return 0; @@ -255,10 +255,16 @@ static inline int digest_authenticate(struct sip_msg *_m, str *_realm, username = ((auth_body_t *) h->parsed)->digest.username.whole; LM_DBG("username: %.*s\n", username.len, username.s); - if (autheph_verify_timestamp(&username) < 0) + int res = autheph_verify_timestamp(&username); + if (res < 0) { - LM_ERR("invalid timestamp in username\n"); - return AUTH_ERROR; + if (res == -1) + { + LM_ERR("invalid timestamp in username\n"); + return AUTH_ERROR; + } else { + return AUTH_USERNAME_EXPIRED; + } } SECRET_LOCK; @@ -489,10 +495,16 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) return AUTH_ERROR; } - if (autheph_verify_timestamp(susername) < 0) + int res = autheph_verify_timestamp(susername); + if (res < 0) { - LM_ERR("invalid timestamp in username\n"); - return AUTH_ERROR; + if (res == -1) + { + LM_ERR("invalid timestamp in username\n"); + return AUTH_ERROR; + } else { + return AUTH_USERNAME_EXPIRED; + } } LM_DBG("username: %.*s\n", susername->len, susername->s);

1 0

git:master:45aa3fe8: tcpops: set tcp keepalive values when available per option
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 45aa3fe81269abd3d9a644b4bd278afc194a3c53 URL: https://github.com/kamailio/kamailio/commit/45aa3fe81269abd3d9a644b4bd278af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:07:58+01:00 tcpops: set tcp keepalive values when available per option - cover macos and *bsd for couple of options --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/45aa3fe81269abd3d9a644b4bd278af… Patch: https://github.com/kamailio/kamailio/commit/45aa3fe81269abd3d9a644b4bd278af… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9abf34af6e..3f66958b6c 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -130,8 +130,13 @@ int tcpops_acquire_fd_from_tcpmain(int conid, int *fd) return 0; } -#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPIDLE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) - #warning "TCP keepalive is not fully supported by your platform" +#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) + #define KSR_TCPOPS_NOKEEPALIVE +#endif + +#ifdef KSR_TCPOPS_NOKEEPALIVE + +#warning "TCP keepalive options not supported by this platform" int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) { @@ -144,6 +149,7 @@ int tcpops_keepalive_disable(int fd, int closefd) LM_ERR("tcp_keepalive_disable() failed: this module does not support your platform\n"); return -1; } + #else int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) @@ -156,11 +162,15 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close LM_ERR("failed to enable SO_KEEPALIVE: %s\n", strerror(errno)); return -1; } else { - +#ifdef HAVE_TCP_KEEPIDLE if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle))<0){ LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno)); } +#else + #warning "TCP_KEEPIDLE option not supported by this platform" + LM_DBG("TCP_KEEPIDLE option not available - ignoring\n"); +#endif if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count))<0){

1 0

git:master:517792c1: modules: readme files regenerated - http_async_client ... [skip ci]
by Kamailio Dev 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 517792c11bf293f732c0f68abbac1914655f9175 URL: https://github.com/kamailio/kamailio/commit/517792c11bf293f732c0f68abbac191… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-03-29T08:01:50+01:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/517792c11bf293f732c0f68abbac191… Patch: https://github.com/kamailio/kamailio/commit/517792c11bf293f732c0f68abbac191… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 1f4540b69e..f2afe6325d 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,9 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout + * timeout: sets the HTTP timeout. (Note, this timeout should be + normally less than tm.fr_timer timeout, because transaction timeout + has a higher priority over HTTP timeout) * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use

1 0

git:master:6224a38d: Merge pull request #1913 from samael33/master
by GitHub 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 6224a38df635876333749d6fc6919f31dc087991 URL: https://github.com/kamailio/kamailio/commit/6224a38df635876333749d6fc6919f3… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-03-29T07:53:29+01:00 Merge pull request #1913 from samael33/master Small notes on $http_req(timeout) usage. --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6224a38df635876333749d6fc6919f3… Patch: https://github.com/kamailio/kamailio/commit/6224a38df635876333749d6fc6919f3… --- 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 5a050bf424..a9e344a5dc 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 @@ -435,7 +435,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>hdr</emphasis>: sets/modifies/removes a HTTP header. N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> <listitem><para><emphasis>body</emphasis>: sets/modifies/removes the request body</para></listitem> <listitem><para><emphasis>method</emphasis>: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified)</para></listitem> - <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less than <literal>tm.fr_timer</literal> timeout, because transaction timeout has a higher priority over HTTP timeout)</para></listitem> <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem>

1 0

git:master:a1a2617c: Per Federico Cabiddu comments
by Igor Olhovskiy 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: a1a2617c4320bcfea291b87197d4b4185920b8a2 URL: https://github.com/kamailio/kamailio/commit/a1a2617c4320bcfea291b87197d4b41… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Date: 2019-03-28T18:31:19+02:00 Per Federico Cabiddu comments --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a1a2617c4320bcfea291b87197d4b41… Patch: https://github.com/kamailio/kamailio/commit/a1a2617c4320bcfea291b87197d4b41… --- 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 962d60e9a6..a9e344a5dc 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 @@ -435,7 +435,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>hdr</emphasis>: sets/modifies/removes a HTTP header. N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> <listitem><para><emphasis>body</emphasis>: sets/modifies/removes the request body</para></listitem> <listitem><para><emphasis>method</emphasis>: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified)</para></listitem> - <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less, than <literal>tm.fr_timer</literal> timeout, cause transaction timeout has a higher priority over HTTP timeout)</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less than <literal>tm.fr_timer</literal> timeout, because transaction timeout has a higher priority over HTTP timeout)</para></listitem> <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem>

1 0

git:master:0ec5ecd8: Fix README
by Igor Olhovskiy 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 0ec5ecd8f7cc948f2a772f75d32fde8d47796014 URL: https://github.com/kamailio/kamailio/commit/0ec5ecd8f7cc948f2a772f75d32fde8… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Date: 2019-03-28T15:22:25+02:00 Fix README --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/0ec5ecd8f7cc948f2a772f75d32fde8… Patch: https://github.com/kamailio/kamailio/commit/0ec5ecd8f7cc948f2a772f75d32fde8… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 45fe6f0e5f..1f4540b69e 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout (Note, this timeout should be normally less, than tm.fr_timer timeout, cause transaction timeout has a higher priority over HTTP timeout) + * timeout: sets the HTTP timeout * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use

1 0

git:master:b8542031: Typo
by Igor Olhovskiy 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: b8542031300d85a723104cbc3214a735c83b0036 URL: https://github.com/kamailio/kamailio/commit/b8542031300d85a723104cbc3214a73… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Date: 2019-03-28T15:18:55+02:00 Typo --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b8542031300d85a723104cbc3214a73… Patch: https://github.com/kamailio/kamailio/commit/b8542031300d85a723104cbc3214a73… --- 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 e6219e96ec..962d60e9a6 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 @@ -440,7 +440,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem> <listitem><para><emphasis>authmethod</emphasis>: - Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap<literal> + Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap and multiple methods can be used. Note that in this case, the CURL library will make an extra request to discover server-supported authentication methods. You may want to use a specific value.

1 0

git:master:cb9796fe: Notes on use http_req(timeout)
by Igor Olhovskiy 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: cb9796fe7fdbc08c2daa1bcf151f7563b5684047 URL: https://github.com/kamailio/kamailio/commit/cb9796fe7fdbc08c2daa1bcf151f756… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Date: 2019-03-28T15:16:54+02:00 Notes on use http_req(timeout) --- Modified: src/modules/http_async_client/README Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb9796fe7fdbc08c2daa1bcf151f756… Patch: https://github.com/kamailio/kamailio/commit/cb9796fe7fdbc08c2daa1bcf151f756… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 1f4540b69e..45fe6f0e5f 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout + * timeout: sets the HTTP timeout (Note, this timeout should be normally less, than tm.fr_timer timeout, cause transaction timeout has a higher priority over HTTP timeout) * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use 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 5a050bf424..e6219e96ec 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 @@ -435,12 +435,12 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>hdr</emphasis>: sets/modifies/removes a HTTP header. N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> <listitem><para><emphasis>body</emphasis>: sets/modifies/removes the request body</para></listitem> <listitem><para><emphasis>method</emphasis>: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified)</para></listitem> - <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less, than <literal>tm.fr_timer</literal> timeout, cause transaction timeout has a higher priority over HTTP timeout)</para></listitem> <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem> <listitem><para><emphasis>authmethod</emphasis>: - Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap + Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap<literal> and multiple methods can be used. Note that in this case, the CURL library will make an extra request to discover server-supported authentication methods. You may want to use a specific value.

1 0

Regarding CDR
by Ganesh Allavarapu 29 Mar '19

29 Mar '19

Hi , I am new to kamalio. we are using kamalio as a SIP proxy and generating some CDR in plain text format. I would like to know how we can get ASN.1 encoded file from kamalio. Thanks, Ganesh A

1 0

git:5.2:a7f6227e: app_lua: get lua execution stack for previous level
by Daniel-Constantin Mierla 28 Mar '19

28 Mar '19

Module: kamailio Branch: 5.2 Commit: a7f6227efe8228444a8afd17e548640ca8458beb URL: https://github.com/kamailio/kamailio/commit/a7f6227efe8228444a8afd17e548640… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-28T19:38:07+01:00 app_lua: get lua execution stack for previous level - returns the info where current function was executed (cherry picked from commit a15210d064e08ac8b1a271502360b7066bff43b6) --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/a7f6227efe8228444a8afd17e548640… Patch: https://github.com/kamailio/kamailio/commit/a7f6227efe8228444a8afd17e548640… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 7b1322ee21..d223975f04 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1942,7 +1942,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) + (tve.tv_usec - tvb.tv_usec); if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { memset(&dinfo, 0, sizeof(lua_Debug)); - if(lua_getstack(L, 0, &dinfo)>0 + if(lua_getstack(L, 1, &dinfo)>0 && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)"

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019