sr-dev February 2019

sr-dev@lists.kamailio.org

23 participants
336 discussions

git:master:5afe4863: http_async_client: add documentation for new TCP keepalive parameters
by Federico Cabiddu 06 Feb '19

06 Feb '19

Module: kamailio Branch: master Commit: 5afe486375ae1ec8d7e479e579d5cc898fa1bac5 URL: https://github.com/kamailio/kamailio/commit/5afe486375ae1ec8d7e479e579d5cc8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-02-06T17:17:17+01:00 http_async_client: add documentation for new TCP keepalive parameters --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5afe486375ae1ec8d7e479e579d5cc8… Patch: https://github.com/kamailio/kamailio/commit/5afe486375ae1ec8d7e479e579d5cc8… --- 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 605964e268..73fdf32841 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 @@ -291,6 +291,63 @@ modparam("http_async_client", "tls_client_key", "/etc/kamailio/ssl/clientcert.ke ... modparam("http_async_client", "tls_ca_path", "/etc/kamailio/ssl/ca/") ... +</programlisting> + </example> + </section> + <section> + <title><varname>tcp_keepalive</varname> (integer)</title> + <para> + If defined to a non-zero value, TCP keepalive will be enabled on cURL connections. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>tcp_keepalive</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_async_client", "tcp_keepalive", 1) +... +</programlisting> + </example> + </section> + <section> + <title><varname>tcp_ka_idle</varname> (integer)</title> + <para> + TCP keep-alive idle time wait value (in seconds). + </para> + <para> + <emphasis> + Default value is 0 (use cURL default value, 60s). + </emphasis> + </para> + <example> + <title>Set <varname>tcp_ka_idle</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_async_client", "tcp_ka_idle", 30) +... +</programlisting> + </example> + </section> + <section> + <title><varname>tcp_ka_interval</varname> (integer)</title> + <para> + TCP keep-alive interval (in seconds). + </para> + <para> + <emphasis> + Default value is 0 (use cURL default value, 60s). + </emphasis> + </para> + <example> + <title>Set <varname>tcp_ka_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_async_client", "tcp_ka_interval", 120) +... </programlisting> </example> </section> @@ -397,6 +454,9 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>username</emphasis>: sets the username to use for authenticated requests</para></listitem> <listitem><para><emphasis>password</emphasis>: sets the password to use for authenticated requests</para></listitem> <listitem><para><emphasis>suspend</emphasis>: if set to 0 it doesn't suspend the current transaction before performing the query</para></listitem> + <listitem><para><emphasis>tcp_keepalive</emphasis>: enable TCP keepalive</para></listitem> + <listitem><para><emphasis>tcp_ka_idle</emphasis>: set TCP keepalive idle time wait</para></listitem> + <listitem><para><emphasis>tcp_ka_interval</emphasis>: set TCP keepalive interval</para></listitem> </itemizedlist> <example> <title><literal>$http_req(key)</literal> variable usage</title>

1 0

git:master:e5453090: uac: error message made warning for loading uac api
by Daniel-Constantin Mierla 06 Feb '19

06 Feb '19

Module: kamailio Branch: master Commit: e54530901c92f2578dc149ac780867d318c54912 URL: https://github.com/kamailio/kamailio/commit/e54530901c92f2578dc149ac780867d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-06T15:23:20+01:00 uac: error message made warning for loading uac api - some modules have optional use of uac --- Modified: src/modules/uac/api.h --- Diff: https://github.com/kamailio/kamailio/commit/e54530901c92f2578dc149ac780867d… Patch: https://github.com/kamailio/kamailio/commit/e54530901c92f2578dc149ac780867d… --- diff --git a/src/modules/uac/api.h b/src/modules/uac/api.h index 47de472ae9..36ec3fc0ee 100644 --- a/src/modules/uac/api.h +++ b/src/modules/uac/api.h @@ -38,7 +38,7 @@ int bind_uac(uac_api_t*); inline static int load_uac_api(uac_api_t *uacb){ bind_uac_f bind_uac_exports; if(!(bind_uac_exports=(bind_uac_f)find_export("bind_uac",1,0))){ - LM_ERR("Failed to import bind_uac\n"); + LM_WARN("failed to import bind_uac\n"); return -1; } return bind_uac_exports(uacb);

1 0

Re: [sr-dev] [kamailio/kamailio] dialog: do not require dlg_flag parameter to be set (404f403)
by Henning Westerholt 05 Feb '19

05 Feb '19

It has been back-ported to 5.1 and 5.2 branch on 9. January 2019. -- 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/commit/404f403786478a917637186446bb285…

1 0

git:master:fb2ac639: core: removed return never executed
by Daniel-Constantin Mierla 05 Feb '19

05 Feb '19

Module: kamailio Branch: master Commit: fb2ac639037cb911162bb61a541976899fa1bdab URL: https://github.com/kamailio/kamailio/commit/fb2ac639037cb911162bb61a5419768… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-05T22:19:34+01:00 core: removed return never executed --- Modified: src/core/locking.c --- Diff: https://github.com/kamailio/kamailio/commit/fb2ac639037cb911162bb61a5419768… Patch: https://github.com/kamailio/kamailio/commit/fb2ac639037cb911162bb61a5419768… --- diff --git a/src/core/locking.c b/src/core/locking.c index aced1d270c..c03fb15fcd 100644 --- a/src/core/locking.c +++ b/src/core/locking.c @@ -107,7 +107,6 @@ rec_lock_set_t* rec_lock_set_alloc(int n) ls->size=n; } return ls; - return NULL; } /** @@ -153,4 +152,4 @@ void rec_lock_set_release(rec_lock_set_t* lset, int i) { rec_lock_release(&lset->locks[i]); return; -} \ No newline at end of file +}

1 0

git:5.2:cd797dbf: dispatcher: Fix memleak in destination attributes
by Henning Westerholt 05 Feb '19

05 Feb '19

Module: kamailio Branch: 5.2 Commit: cd797dbfdc0c8a27cde66f096c5d592d880d65d8 URL: https://github.com/kamailio/kamailio/commit/cd797dbfdc0c8a27cde66f096c5d592… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-05T21:26:24+01:00 dispatcher: Fix memleak in destination attributes (cherry picked from commit 614b6b05028ea8d364f7acb95a6367f7c9ea1a6d) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cd797dbfdc0c8a27cde66f096c5d592… Patch: https://github.com/kamailio/kamailio/commit/cd797dbfdc0c8a27cde66f096c5d592… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 621aca823a..62ad80afa5 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -446,6 +446,8 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) if(dp != NULL) { if(dp->uri.s != NULL) shm_free(dp->uri.s); + if(dp->attrs.body.s != NULL) + shm_free(dp->attrs.body.s); shm_free(dp); } @@ -502,6 +504,8 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, if(dp != NULL) { if(dp->uri.s != NULL) shm_free(dp->uri.s); + if(dp->attrs.body.s != NULL) + shm_free(dp->attrs.body.s); shm_free(dp); } @@ -3242,6 +3246,10 @@ void ds_avl_destroy(ds_set_t **node_ptr) shm_free(dest->uri.s); dest->uri.s = NULL; } + if (dest->attrs.body.s != NULL) { + shm_free(dest->attrs.body.s); + dest->attrs.body.s = NULL; + } } if(node->dlist != NULL) shm_free(node->dlist);

1 0

git:5.2:1caa08e1: dispatcher: Stop searching if entry is found
by Henning Westerholt 05 Feb '19

05 Feb '19

Module: kamailio Branch: 5.2 Commit: 1caa08e1a3052ed08ec5dc4cf32c14f292e1a823 URL: https://github.com/kamailio/kamailio/commit/1caa08e1a3052ed08ec5dc4cf32c14f… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-05T21:26:07+01:00 dispatcher: Stop searching if entry is found (cherry picked from commit 7a66f44506e4897fef68b5ff927cf276678d3473) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/1caa08e1a3052ed08ec5dc4cf32c14f… Patch: https://github.com/kamailio/kamailio/commit/1caa08e1a3052ed08ec5dc4cf32c14f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 5d72f71686..621aca823a 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2523,7 +2523,6 @@ int ds_update_latency(int group, str *address, int code) int ds_get_state(int group, str *address) { int i = 0; - int state = 0; ds_set_t *idx = NULL; if(_ds_list == NULL || _ds_list_nr <= 0) { @@ -2542,11 +2541,11 @@ int ds_get_state(int group, str *address) && strncasecmp(idx->dlist[i].uri.s, address->s, address->len) == 0) { /* destination address found */ - state = idx->dlist[i].flags; + return idx->dlist[i].flags; } i++; } - return state; + return 0; } /**

1 0

git:5.2:548955b1: jansson: Fix reverse logic for JSON boolean
by Henning Westerholt 05 Feb '19

05 Feb '19

Module: kamailio Branch: 5.2 Commit: 548955b101a1752b8525e8101014ab4e5576dc36 URL: https://github.com/kamailio/kamailio/commit/548955b101a1752b8525e8101014ab4… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-05T21:25:44+01:00 jansson: Fix reverse logic for JSON boolean (cherry picked from commit 0125c1c8d8c1179670def9dc4b3e66d6a8e58360) --- Modified: src/modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/548955b101a1752b8525e8101014ab4… Patch: https://github.com/kamailio/kamailio/commit/548955b101a1752b8525e8101014ab4… --- diff --git a/src/modules/jansson/jansson_utils.c b/src/modules/jansson/jansson_utils.c index 29ffc306f6..ae2040bc7c 100644 --- a/src/modules/jansson/jansson_utils.c +++ b/src/modules/jansson/jansson_utils.c @@ -45,7 +45,7 @@ int jansson_to_val(pv_value_t* val, char** freeme, json_t* v) { val->rs.len = strlen(value); val->flags = PV_VAL_STR; }else if(json_is_boolean(v)) { - val->ri = json_is_true(v) ? 0 : 1; + val->ri = json_is_true(v) ? 1 : 0; val->flags = PV_TYPE_INT|PV_VAL_INT; }else if(json_is_real(v)) { char* value = NULL;

1 0

git:5.2:ac37b2fa: siputils: Return true if options_reply() succeeds
by Henning Westerholt 05 Feb '19

05 Feb '19

Module: kamailio Branch: 5.2 Commit: ac37b2faf754548d0f3c6cfb14bc1e547eed03ed URL: https://github.com/kamailio/kamailio/commit/ac37b2faf754548d0f3c6cfb14bc1e5… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-05T21:25:28+01:00 siputils: Return true if options_reply() succeeds (cherry picked from commit 73d29ddde2b38cfea2c9ca4a84f4b8a246b7da50) --- Modified: src/modules/siputils/options.c --- Diff: https://github.com/kamailio/kamailio/commit/ac37b2faf754548d0f3c6cfb14bc1e5… Patch: https://github.com/kamailio/kamailio/commit/ac37b2faf754548d0f3c6cfb14bc1e5… --- diff --git a/src/modules/siputils/options.c b/src/modules/siputils/options.c index 67cf07856d..484c65f75f 100644 --- a/src/modules/siputils/options.c +++ b/src/modules/siputils/options.c @@ -112,7 +112,7 @@ int opt_reply(struct sip_msg* _msg, char* _foo, char* _bar) { return -1; } else - return 0; + return 1; } else { pkg_free(rpl_hf.s); LM_ERR("add_lump_rpl failed\n"); @@ -124,6 +124,6 @@ int opt_reply(struct sip_msg* _msg, char* _foo, char* _bar) { return -1; } else - return 0; + return 1; }

1 0

git:5.2:c5f1ac9b: dispatcher: Don't take modulus of hash twice
by Henning Westerholt 05 Feb '19

05 Feb '19

Module: kamailio Branch: 5.2 Commit: c5f1ac9be0fe28ab3967f4f0ed085d4a272c7437 URL: https://github.com/kamailio/kamailio/commit/c5f1ac9be0fe28ab3967f4f0ed085d4… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-05T21:25:11+01:00 dispatcher: Don't take modulus of hash twice (cherry picked from commit 5b23ce265b43adda75731a90fdf1a3a47daa3a51) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c5f1ac9be0fe28ab3967f4f0ed085d4… Patch: https://github.com/kamailio/kamailio/commit/c5f1ac9be0fe28ab3967f4f0ed085d4… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 59cf1d9302..5d72f71686 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2096,7 +2096,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } break; case DS_ALG_RANDOM: /* 6 - random selection */ - hash = kam_rand() % idx->nr; + hash = kam_rand(); break; case DS_ALG_HASHPV: /* 7 - hash on PV value */ if(ds_hash_pvar(msg, &hash) != 0) {

1 0

git:5.2:c3065e71: jansson: Log column on parse error
by Henning Westerholt 05 Feb '19

05 Feb '19

Module: kamailio Branch: 5.2 Commit: c3065e717f686cc11ceadd8a95fd3d98c2ffe2c7 URL: https://github.com/kamailio/kamailio/commit/c3065e717f686cc11ceadd8a95fd3d9… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-02-05T21:18:03+01:00 jansson: Log column on parse error (cherry picked from commit 4038a6046bc34c92313817549c93a9f16e993032) --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c3065e717f686cc11ceadd8a95fd3d9… Patch: https://github.com/kamailio/kamailio/commit/c3065e717f686cc11ceadd8a95fd3d9… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 012f1aba40..7eceae4e96 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -41,9 +41,9 @@ int janssonmod_get_helper(sip_msg_t* msg, str *path_s, str *src_s, pv_spec_t *ds json = json_loads(src_s->s, JSON_REJECT_DUPLICATES, &parsing_error); if(!json) { - ERR("failed to parse: %.*s\n", src_s->len, src_s->s); - ERR("json error at line %d: %s\n", - parsing_error.line, parsing_error.text); + ERR("failed to parse json: %.*s\n", src_s->len, src_s->s); + ERR("json error at line %d, col %d: %s\n", + parsing_error.line, parsing_error.column, parsing_error.text); goto fail; }

1 0

← Newer
1
...
26
27
28
29
30
31
32
33
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 February 2019