sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
273 discussions

git:master:43e7f342: kazoo : do not override common properties in payload if they exist

by Luis Azedo

Module: kamailio Branch: master Commit: 43e7f3425ed5d2ad2bcd9b9c52442174ef243729 URL: https://github.com/kamailio/kamailio/commit/43e7f3425ed5d2ad2bcd9b9c5244217… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-16T20:14:40+01:00 kazoo : do not override common properties in payload if they exist also adds app_name parameter to be sent in "App-Name" field, defaults to NAME at compilation time (kamailio) --- Modified: modules/kazoo/const.h Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/43e7f3425ed5d2ad2bcd9b9c5244217… Patch: https://github.com/kamailio/kamailio/commit/43e7f3425ed5d2ad2bcd9b9c5244217… --- diff --git a/modules/kazoo/const.h b/modules/kazoo/const.h index 0e469bd..0e1ff9a 100644 --- a/modules/kazoo/const.h +++ b/modules/kazoo/const.h @@ -13,6 +13,7 @@ extern str str_event_message_summary; extern str str_event_dialog; extern str str_event_presence; +extern str kz_app_name; extern str str_username_col; extern str str_domain_col; diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index 05027d9..0b1cfa4 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -103,6 +103,8 @@ str kz_db_url = {0,0}; str kz_query_timeout_avp = {0,0}; pv_spec_t kz_query_timeout_spec; +str kz_app_name = str_init(NAME); + MODULE_VERSION static tr_export_t mod_trans[] = { @@ -176,6 +178,7 @@ static param_export_t params[] = { {"consume_messages_on_reconnect", INT_PARAM, &dbk_consume_messages_on_reconnect}, {"amqp_query_timeout_avp", STR_PARAM, &kz_query_timeout_avp.s}, {"json_escape_char", STR_PARAM, &kz_json_escape_str.s}, + {"app_name", STR_PARAM, &kz_app_name.s}, {0, 0, 0} }; diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 075ad84..af01260 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -688,15 +688,19 @@ void kz_amqp_add_payload_common_properties(json_obj_ptr json_obj, char* server_i char node_name[512]; - json_object_object_add(json_obj, BLF_JSON_APP_NAME, - json_object_new_string(NAME)); - json_object_object_add(json_obj, BLF_JSON_APP_VERSION, - json_object_new_string(VERSION)); - sprintf(node_name, "kamailio(a)%.*s", dbk_node_hostname.len, dbk_node_hostname.s); - json_object_object_add(json_obj, BLF_JSON_NODE, - json_object_new_string(node_name)); - json_object_object_add(json_obj, BLF_JSON_MSG_ID, - json_object_new_string_len(unique->s, unique->len)); + if(kz_json_get_object(json_obj, BLF_JSON_APP_NAME) == NULL) + json_object_object_add(json_obj, BLF_JSON_APP_NAME, json_object_new_string(kz_app_name.s)); + + if(kz_json_get_object(json_obj, BLF_JSON_APP_VERSION) == NULL) + json_object_object_add(json_obj, BLF_JSON_APP_VERSION, json_object_new_string(VERSION)); + + if(kz_json_get_object(json_obj, BLF_JSON_NODE) == NULL) { + sprintf(node_name, "kamailio(a)%.*s", dbk_node_hostname.len, dbk_node_hostname.s); + json_object_object_add(json_obj, BLF_JSON_NODE, json_object_new_string(node_name)); + } + + if(kz_json_get_object(json_obj, BLF_JSON_MSG_ID) == NULL) + json_object_object_add(json_obj, BLF_JSON_MSG_ID, json_object_new_string_len(unique->s, unique->len)); }

9 years, 5 months

git:master:e4ce2a08: Merge branch 'master' of https://github.com/kamailio/kamailio

by Patric Marschall

Module: kamailio Branch: master Commit: e4ce2a0837937effdfcccc26e8118028208a6c11 URL: https://github.com/kamailio/kamailio/commit/e4ce2a0837937effdfcccc26e811802… Author: Patric Marschall <patric.marschall(a)1und1.de> Committer: Patric Marschall <patric.marschall(a)1und1.de> Date: 2015-06-16T15:38:01+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio --- Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h Modified: modules/lcr/README Modified: modules/lcr/doc/lcr_admin.xml Modified: modules/lcr/lcr_mod.c Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e4ce2a0837937effdfcccc26e811802… Patch: https://github.com/kamailio/kamailio/commit/e4ce2a0837937effdfcccc26e811802…

9 years, 5 months

git:master:6dba3a2d: dialog: removed unused variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6dba3a2d2785cba6b29bcb3d11b318687a12b632 URL: https://github.com/kamailio/kamailio/commit/6dba3a2d2785cba6b29bcb3d11b3186… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-16T15:45:23+02:00 dialog: removed unused variable --- Modified: modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6dba3a2d2785cba6b29bcb3d11b3186… Patch: https://github.com/kamailio/kamailio/commit/6dba3a2d2785cba6b29bcb3d11b3186… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index e3d0005..420caea 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -252,7 +252,6 @@ int dlg_clean_run(ticks_t ti) */ int init_dlg_table(unsigned int size) { - unsigned int n; unsigned int i; dlg_ka_list_head = (dlg_ka_t **)shm_malloc(sizeof(dlg_ka_t *));

9 years, 5 months

git:master:81fb65a7: p_usrloc: updated documentation

by Patric Marschall

Module: kamailio Branch: master Commit: 81fb65a7c89add3fc643f975044819800b7a9dcb URL: https://github.com/kamailio/kamailio/commit/81fb65a7c89add3fc643f9750448198… Author: Patric Marschall <patric.marschall(a)1und1.de> Committer: Patric Marschall <patric.marschall(a)1und1.de> Date: 2015-06-16T15:34:28+02:00 p_usrloc: updated documentation Updated documentation in p_usrloc module for parameters db_ops_ruid and db_update_as_insert. --- Modified: modules/p_usrloc/doc/p_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81fb65a7c89add3fc643f9750448198… Patch: https://github.com/kamailio/kamailio/commit/81fb65a7c89add3fc643f9750448198… --- diff --git a/modules/p_usrloc/doc/p_usrloc_admin.xml b/modules/p_usrloc/doc/p_usrloc_admin.xml index 55703c1..d2f9595 100644 --- a/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -539,7 +539,7 @@ modparam("p_usrloc", "connection_expires", "300") </para> <example> <title>Set <varname>alg_location</varname> parameter</title> - <programlisting format="linespecific"> + <programlisting format="linespecific"> ... modparam("p_usrloc", "alg_location", 1) ... @@ -584,7 +584,53 @@ modparam("p_usrloc", "default_db_type", "cluster") </programlisting> </example> </section> + + <section> + <title><varname>db_ops_ruid</varname> (int)</title> + <para> + If set to 1, database queries for update or delete are done using + ruid value. If it is set to 0, the old style using aor, contact and + call-id is done. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>db_ops_ruid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("p_usrloc", "db_ops_ruid", 0) +... + </programlisting> + </example> + </section> + + <section> + <title><varname>db_update_as_insert</varname> (string)</title> + <para> + Set this parameter if you want to do INSERT DB operations + instead of UPDATE DB operations. It is recommended to set this parameter + if you use Cassandra as a DB backend. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>db_update_as_insert</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("usrloc", "db_update_as_insert", 1) +... +</programlisting> + </example> </section> + + </section> + <section> <title><varname>default_db_url</varname>(str)</title> <para> @@ -647,7 +693,9 @@ modparam("p_usrloc", "db_mode", 2) <title><varname>db_url</varname></title> <para> This parameters is now obsolete, and replaced by specific p_usrloc parameters</para> </section> </section> - <section> + + + <section> <title>Installation & Running</title> <section> <title>Database setup</title>

9 years, 5 months

git:master:ceffd956: rtpengine: interpret session limit message

by Lucian Balaceanu

Module: kamailio Branch: master Commit: ceffd956e3b7a8070ffb6cf6c1a05b0f86f34ac8 URL: https://github.com/kamailio/kamailio/commit/ceffd956e3b7a8070ffb6cf6c1a05b0… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2015-06-16T16:28:53+03:00 rtpengine: interpret session limit message - upon receiving a "Parallel session limit reached"message from rtpengine Kamailio's rtpengine module should try the next media relay available (or none if none is available) without marking the media relay as unavailable; --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/ceffd956e3b7a8070ffb6cf6c1a05b0… Patch: https://github.com/kamailio/kamailio/commit/ceffd956e3b7a8070ffb6cf6c1a05b0… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 6f03d30..0c4e807 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -255,6 +255,8 @@ static int_str setid_avp; static str write_sdp_pvar_str = {NULL, 0}; static pv_spec_t* write_sdp_pvar = NULL; +#define RTPENGINE_SESS_LIMIT_MSG "Parallel session limit reached" +#define RTPENGINE_SESS_LIMIT_MSG_LEN (sizeof(RTPENGINE_SESS_LIMIT_MSG)-1) char* force_send_ip_str=""; int force_send_ip_af = AF_UNSPEC; @@ -1882,6 +1884,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ active_rtpp_set = default_rtpp_set; queried_nodes = 0; +select_node: do { if (++queried_nodes > queried_nodes_limit) { LM_ERR("queried nodes limit reached\n"); @@ -1909,11 +1912,19 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ goto error; } if (!bencode_dictionary_get_strcmp(resp, "result", "error")) { - if (!bencode_dictionary_get_str(resp, "error-reason", &error)) - LM_ERR("proxy return error but didn't give an error reason: %.*s\n", ret, cp); - else + if (!bencode_dictionary_get_str(resp, "error-reason", &error)) { + LM_ERR("proxy return error but didn't give an error reason: %.*s\n", ret, cp); + } + else { + if ((RTPENGINE_SESS_LIMIT_MSG_LEN == error.len) && + (strncmp(error.s, RTPENGINE_SESS_LIMIT_MSG, RTPENGINE_SESS_LIMIT_MSG_LEN) == 0)) + { + LM_WARN("proxy %.*s: %.*s", node->rn_url.len, node->rn_url.s , error.len, error.s); + goto select_node; + } LM_ERR("proxy replied with error: %.*s\n", error.len, error.s); - goto error; + } + goto error; } if (body_out)

9 years, 5 months

git:4.3:27d0e6d9: modules/lcr: added priority_ordering module parameter

by Juha Heinanen

Module: kamailio Branch: 4.3 Commit: 27d0e6d99ee512788f16ce4f6b6e4127dea420bd URL: https://github.com/kamailio/kamailio/commit/27d0e6d99ee512788f16ce4f6b6e412… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-06-16T11:37:45+03:00 modules/lcr: added priority_ordering module parameter - allows ordering of matched gateways only by priority and weight --- Modified: modules/lcr/README Modified: modules/lcr/doc/lcr_admin.xml Modified: modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/27d0e6d99ee512788f16ce4f6b6e412… Patch: https://github.com/kamailio/kamailio/commit/27d0e6d99ee512788f16ce4f6b6e412…

9 years, 5 months

git:master:bbcac5b0: modules/lcr: added priority_ordering module parameter

by Victor Seva

Module: kamailio Branch: master Commit: bbcac5b04262194b427ce6f7bfafed3cfd5095b1 URL: https://github.com/kamailio/kamailio/commit/bbcac5b04262194b427ce6f7bfafed3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-16T11:28:08+02:00 modules/lcr: added priority_ordering module parameter - allows ordering of matched gateways only by priority and weight --- Modified: modules/lcr/README Modified: modules/lcr/doc/lcr_admin.xml Modified: modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bbcac5b04262194b427ce6f7bfafed3… Patch: https://github.com/kamailio/kamailio/commit/bbcac5b04262194b427ce6f7bfafed3…

9 years, 5 months

git:4.3:65a4adb3: Revert "modules/lcr: added priority_ordering module parameter"

by Victor Seva

Module: kamailio Branch: 4.3 Commit: 65a4adb30436ae16f241aefb3c44fdd36192a3fd URL: https://github.com/kamailio/kamailio/commit/65a4adb30436ae16f241aefb3c44fdd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-16T11:25:50+02:00 Revert "modules/lcr: added priority_ordering module parameter" This reverts commit 27d0e6d99ee512788f16ce4f6b6e4127dea420bd. --- Modified: modules/lcr/README Modified: modules/lcr/doc/lcr_admin.xml Modified: modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/65a4adb30436ae16f241aefb3c44fdd… Patch: https://github.com/kamailio/kamailio/commit/65a4adb30436ae16f241aefb3c44fdd…

9 years, 5 months

git:master:e1f2a45f: Merge pull request #206 from smititelu/kamailio-17

by Stefan Mititelu

Module: kamailio Branch: master Commit: e1f2a45fbe1fd6c44c41e05061504c0d11530431 URL: https://github.com/kamailio/kamailio/commit/e1f2a45fbe1fd6c44c41e05061504c0… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-06-15T14:38:31+03:00 Merge pull request #206 from smititelu/kamailio-17 rtpengine: changes for mi_fifo_commands --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e1f2a45fbe1fd6c44c41e05061504c0… Patch: https://github.com/kamailio/kamailio/commit/e1f2a45fbe1fd6c44c41e05061504c0…

9 years, 5 months

git:master:a309fe46: rtpengine: changes for mi_fifo_commands

by Stefan Mititelu

Module: kamailio Branch: master Commit: a309fe46990df18cc37873d9e88d112bdbc2939f URL: https://github.com/kamailio/kamailio/commit/a309fe46990df18cc37873d9e88d112… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-06-12T11:55:04+03:00 rtpengine: changes for mi_fifo_commands Added a new fifo command, namely nh_ping_rtpp, which pings the given proxy or all proxies, and if a proxy does not respond, disable it temporarily. If the proxy responds, it does nothing. Changed the existing fifos to execute for a specific proxy or for all proxies depending on the first given parameter. Changed nh_enable_rtpp to try to ping before enabling and enable it only if ping success. Changed some formatting for nh_show_rtpp to print 'N/A' when disabled permanent and to display the correct recheck_ticks. Updated doku accordingly. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a309fe46990df18cc37873d9e88d112… Patch: https://github.com/kamailio/kamailio/commit/a309fe46990df18cc37873d9e88d112…

9 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015