sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:master:75021d64: Revert "rtpengine: Add rtpengine_allow_op modparam"

by Victor Seva

Module: kamailio Branch: master Commit: 75021d6475ac924252d5ac99a88d9876f50cbb29 URL: https://github.com/kamailio/kamailio/commit/75021d6475ac924252d5ac99a88d987… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-23T12:04:38+01:00 Revert "rtpengine: Add rtpengine_allow_op modparam" This reverts commit 69c156f9c2d2c40faf61e2ebde9f98b933b87baf. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/75021d6475ac924252d5ac99a88d987… Patch: https://github.com/kamailio/kamailio/commit/75021d6475ac924252d5ac99a88d987… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 34e197f..96a490d 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -210,30 +210,6 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) </programlisting> </example> </section> - <section id="rtpengine.p.rtpengine_allow_op"> - <title><varname>rtpengine_allow_op</varname> (integer)</title> - <para> - Enable this to allow finishing the current sessions while denying new sessions for the - <emphasis>manually deactivated nodes </emphasis> via kamctl command i.e. "disabled(permanent)" nodes. - Probably the manually deactivated machine is still running(did not crash). - </para> - <para> - This is <emphasis>useful</emphasis> when deactivating a node for maintanance and reject new sessions but allow current ones to finish. - </para> - <para> - <emphasis> - Default value is <quote>0</quote> to keep the current behaviour. - </emphasis> - </para> - <example> - <title>Set <varname>rtpengine_allow_op</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("rtpengine", "rtpengine_allow_op", 1) -... -</programlisting> - </example> - </section> <section id="rtpengine.p.queried_nodes_limit"> <title><varname>queried_nodes_limit</varname> (integer)</title> <para> diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 042c477..b3ca011 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -227,7 +227,6 @@ static struct mi_root* mi_show_hash_total(struct mi_root* cmd_tree, void* param) static int rtpengine_disable_tout = 60; -static int rtpengine_allow_op = 0; static int rtpengine_retr = 5; static int rtpengine_tout_ms = 1000; static int queried_nodes_limit = MAX_RTPP_TRIED_NODES; @@ -335,7 +334,6 @@ static param_export_t params[] = { {"rtpengine_disable_tout",INT_PARAM, &rtpengine_disable_tout }, {"rtpengine_retr", INT_PARAM, &rtpengine_retr }, {"rtpengine_tout_ms", INT_PARAM, &rtpengine_tout_ms }, - {"rtpengine_allow_op", INT_PARAM, &rtpengine_allow_op }, {"queried_nodes_limit", INT_PARAM, &queried_nodes_limit }, {"db_url", PARAM_STR, &rtpp_db_url }, {"table_name", PARAM_STR, &rtpp_table_name }, @@ -2371,7 +2369,7 @@ select_rtpp_node_new(str callid, int do_test, int op) } /* - * lookup the hastable (key=callid value=node) and get the old node (e.g. for answer/delete) + * lookup the hastable (key=callid value=node) and get the old node */ static struct rtpp_node * select_rtpp_node_old(str callid, int do_test, int op) @@ -2398,22 +2396,11 @@ select_rtpp_node_old(str callid, int do_test, int op) node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); } - // if node enabled, return it + // if node broke, don't send any message if (!node->rn_disabled) { return node; - } - - // if node _manually_ disabled(e.g kamctl) and proper configuration, return it - if (node->rn_recheck_ticks == MI_MAX_RECHECK_TICKS) { - if (rtpengine_allow_op) { - LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled(permanent) (probably still UP)! Return it\n", - node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); - return node; - } - LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled(permanent) (probably still UP)! Return NULL\n", - node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); } else { - LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled (probably BROKE)! Return NULL\n", + LM_DBG("rtpengine hash table lookup find node=%.*s for calllen=%d callid=%.*s, which is disabled!\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); }

9 years

git:master:f52bace8: Revert "rtpengine: Fix comments for hastable"

by Victor Seva

Module: kamailio Branch: master Commit: f52bace883bc0802d130ac65ac466da90275ba97 URL: https://github.com/kamailio/kamailio/commit/f52bace883bc0802d130ac65ac466da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-23T12:04:37+01:00 Revert "rtpengine: Fix comments for hastable" This reverts commit 44c19111fef40bd2f18ec7ecf8726d967c8a953a. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_hash.c Modified: modules/rtpengine/rtpengine_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/f52bace883bc0802d130ac65ac466da… Patch: https://github.com/kamailio/kamailio/commit/f52bace883bc0802d130ac65ac466da…

9 years

git:master:b2c5686e: Revert "rtpengine: Fix deletion for branching scenarios"

by Victor Seva

Module: kamailio Branch: master Commit: b2c5686ec199ab87e501fb5be86ac068866338a2 URL: https://github.com/kamailio/kamailio/commit/b2c5686ec199ab87e501fb5be86ac06… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-23T12:04:36+01:00 Revert "rtpengine: Fix deletion for branching scenarios" This reverts commit 028540c12ea47fc5fc0b7f787885c43d7962ea25. --- Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine_hash.c Modified: modules/rtpengine/rtpengine_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/b2c5686ec199ab87e501fb5be86ac06… Patch: https://github.com/kamailio/kamailio/commit/b2c5686ec199ab87e501fb5be86ac06…

9 years

git:master:90d5a98b: Revert "p_usrloc: str->s string NULL check before str_dup"

by Victor Seva

Module: kamailio Branch: master Commit: 90d5a98bb52a810e02f225e72faa1ab526b96bbb URL: https://github.com/kamailio/kamailio/commit/90d5a98bb52a810e02f225e72faa1ab… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-23T12:04:31+01:00 Revert "p_usrloc: str->s string NULL check before str_dup" This reverts commit d1c6dc67b222e05be1ff90be9b38846f63866839. --- Modified: modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/90d5a98bb52a810e02f225e72faa1ab… Patch: https://github.com/kamailio/kamailio/commit/90d5a98bb52a810e02f225e72faa1ab… --- diff --git a/modules/p_usrloc/ucontact.c b/modules/p_usrloc/ucontact.c index 72a5e65..651bac0 100644 --- a/modules/p_usrloc/ucontact.c +++ b/modules/p_usrloc/ucontact.c @@ -60,31 +60,20 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ } memset(c, 0, sizeof(ucontact_t)); - if (_contact->s && _contact->len > 0) { - if (shm_str_dup( &c->c, _contact) < 0) goto error; - } - - if (_ci->callid->s && _ci->callid->len > 0) { - if (shm_str_dup( &c->callid, _ci->callid) < 0) goto error; - } - - if (_ci->user_agent->s && _ci->user_agent->len > 0) { - if (shm_str_dup( &c->user_agent, _ci->user_agent) < 0) goto error; - } + if (shm_str_dup( &c->c, _contact) < 0) goto error; + if (shm_str_dup( &c->callid, _ci->callid) < 0) goto error; + if (shm_str_dup( &c->user_agent, _ci->user_agent) < 0) goto error; - if (_ci->received.s && _ci->received.len > 0) { + if (_ci->received.s && _ci->received.len) { if (shm_str_dup( &c->received, &_ci->received) < 0) goto error; } - - if (_ci->path && _ci->path->len > 0) { + if (_ci->path && _ci->path->len) { if (shm_str_dup( &c->path, _ci->path) < 0) goto error; } - - if (_ci->ruid.s && _ci->ruid.len > 0) { + if (_ci->ruid.s && _ci->ruid.len) { if (shm_str_dup( &c->ruid, &_ci->ruid) < 0) goto error; } - - if (_ci->instance.s && _ci->instance.len > 0) { + if (_ci->instance.s && _ci->instance.len) { if (shm_str_dup( &c->instance, &_ci->instance) < 0) goto error; }

9 years

git:master:d1c6dc67: p_usrloc: str->s string NULL check before str_dup

by Stefan Mititelu

Module: kamailio Branch: master Commit: d1c6dc67b222e05be1ff90be9b38846f63866839 URL: https://github.com/kamailio/kamailio/commit/d1c6dc67b222e05be1ff90be9b38846… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T12:59:58+02:00 p_usrloc: str->s string NULL check before str_dup Don't shm_str_dup() NULL str->s strings. Add checks to avoid shm_str_dup() warning. --- Modified: modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/d1c6dc67b222e05be1ff90be9b38846… Patch: https://github.com/kamailio/kamailio/commit/d1c6dc67b222e05be1ff90be9b38846… --- diff --git a/modules/p_usrloc/ucontact.c b/modules/p_usrloc/ucontact.c index 651bac0..72a5e65 100644 --- a/modules/p_usrloc/ucontact.c +++ b/modules/p_usrloc/ucontact.c @@ -60,20 +60,31 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ } memset(c, 0, sizeof(ucontact_t)); - if (shm_str_dup( &c->c, _contact) < 0) goto error; - if (shm_str_dup( &c->callid, _ci->callid) < 0) goto error; - if (shm_str_dup( &c->user_agent, _ci->user_agent) < 0) goto error; + if (_contact->s && _contact->len > 0) { + if (shm_str_dup( &c->c, _contact) < 0) goto error; + } - if (_ci->received.s && _ci->received.len) { + if (_ci->callid->s && _ci->callid->len > 0) { + if (shm_str_dup( &c->callid, _ci->callid) < 0) goto error; + } + + if (_ci->user_agent->s && _ci->user_agent->len > 0) { + if (shm_str_dup( &c->user_agent, _ci->user_agent) < 0) goto error; + } + + if (_ci->received.s && _ci->received.len > 0) { if (shm_str_dup( &c->received, &_ci->received) < 0) goto error; } - if (_ci->path && _ci->path->len) { + + if (_ci->path && _ci->path->len > 0) { if (shm_str_dup( &c->path, _ci->path) < 0) goto error; } - if (_ci->ruid.s && _ci->ruid.len) { + + if (_ci->ruid.s && _ci->ruid.len > 0) { if (shm_str_dup( &c->ruid, &_ci->ruid) < 0) goto error; } - if (_ci->instance.s && _ci->instance.len) { + + if (_ci->instance.s && _ci->instance.len > 0) { if (shm_str_dup( &c->instance, &_ci->instance) < 0) goto error; }

9 years

git:master:ce33e4c1: modules/ims_usrloc_pcscf: allow contacts with no received params (populated from notify)

by jaybeepee

Module: kamailio Branch: master Commit: ce33e4c19764bc9c2ec41e564199a2d13d74a85e URL: https://github.com/kamailio/kamailio/commit/ce33e4c19764bc9c2ec41e564199a2d… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-23T12:48:36+02:00 modules/ims_usrloc_pcscf: allow contacts with no received params (populated from notify) --- Modified: modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/ce33e4c19764bc9c2ec41e564199a2d… Patch: https://github.com/kamailio/kamailio/commit/ce33e4c19764bc9c2ec41e564199a2d… --- diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index 6aeda65..736f194 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -665,8 +665,8 @@ static inline pcontact_info_t* dbrow2info( db_val_t *vals, str *contact) ci.via_prot = VAL_INT(vals + 3); received.s = (char*) VAL_STRING(vals + 4); if (VAL_NULL(vals+4) || !received.s || !received.s[0]) { - LM_ERR("Empty received for contact [%.*s].... ignoring\n", contact->len, contact->s); - return 0; + LM_DBG("Empty received for contact [%.*s]....\n", contact->len, contact->s); /*this could happen if you have been notified about a contact from S-CSCF*/ + received.len = 0; } else { received.len = strlen(received.s); }

9 years

git:master:028540c1: rtpengine: Fix deletion for branching scenarios

by Stefan Mititelu

Module: kamailio Branch: master Commit: 028540c12ea47fc5fc0b7f787885c43d7962ea25 URL: https://github.com/kamailio/kamailio/commit/028540c12ea47fc5fc0b7f787885c43… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T12:12:27+02:00 rtpengine: Fix deletion for branching scenarios - hash table entry contains callid, viabranch - hash table lookup based on callid, viabranch (useful for branching scenarios); keep doing the hash table remove right away - remove op param when select_rtpp_node(); not needed --- Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine_hash.c Modified: modules/rtpengine/rtpengine_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/028540c12ea47fc5fc0b7f787885c43… Patch: https://github.com/kamailio/kamailio/commit/028540c12ea47fc5fc0b7f787885c43…

9 years

git:master:44c19111: rtpengine: Fix comments for hastable

by Stefan Mititelu

Module: kamailio Branch: master Commit: 44c19111fef40bd2f18ec7ecf8726d967c8a953a URL: https://github.com/kamailio/kamailio/commit/44c19111fef40bd2f18ec7ecf8726d9… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T12:12:27+02:00 rtpengine: Fix comments for hastable - shm NULL checks and free already alloc'ed shm - default entry tout to 3600 sec - return node only, not the whole entry - zero shm hashtable parts - lookup and select new node if lookup fails; this is done for all commands and assures fallback behaviour - change void to struct specific - make set_rtp_inst_pvar() static -> used only in rtpengine.c - fix typos rtpproxy vs rtpengine --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_hash.c Modified: modules/rtpengine/rtpengine_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/44c19111fef40bd2f18ec7ecf8726d9… Patch: https://github.com/kamailio/kamailio/commit/44c19111fef40bd2f18ec7ecf8726d9…

9 years

git:master:69c156f9: rtpengine: Add rtpengine_allow_op modparam

by Stefan Mititelu

Module: kamailio Branch: master Commit: 69c156f9c2d2c40faf61e2ebde9f98b933b87baf URL: https://github.com/kamailio/kamailio/commit/69c156f9c2d2c40faf61e2ebde9f98b… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T12:12:27+02:00 rtpengine: Add rtpengine_allow_op modparam When the param is enabled, allow current sessions to finish and deny new sessions for manually deactivated rtpengine nodes via kamctl i.e. "disabled(permanent)" nodes. This is useful when deactivating the nodes for maintenance. Default value is 0, so the current behaviour is maintained (e.g. don't send commands to any deactivated proxy). Updated doku. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/69c156f9c2d2c40faf61e2ebde9f98b… Patch: https://github.com/kamailio/kamailio/commit/69c156f9c2d2c40faf61e2ebde9f98b… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 96a490d..34e197f 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -210,6 +210,30 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) </programlisting> </example> </section> + <section id="rtpengine.p.rtpengine_allow_op"> + <title><varname>rtpengine_allow_op</varname> (integer)</title> + <para> + Enable this to allow finishing the current sessions while denying new sessions for the + <emphasis>manually deactivated nodes </emphasis> via kamctl command i.e. "disabled(permanent)" nodes. + Probably the manually deactivated machine is still running(did not crash). + </para> + <para> + This is <emphasis>useful</emphasis> when deactivating a node for maintanance and reject new sessions but allow current ones to finish. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> to keep the current behaviour. + </emphasis> + </para> + <example> + <title>Set <varname>rtpengine_allow_op</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "rtpengine_allow_op", 1) +... +</programlisting> + </example> + </section> <section id="rtpengine.p.queried_nodes_limit"> <title><varname>queried_nodes_limit</varname> (integer)</title> <para> diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index b3ca011..042c477 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -227,6 +227,7 @@ static struct mi_root* mi_show_hash_total(struct mi_root* cmd_tree, void* param) static int rtpengine_disable_tout = 60; +static int rtpengine_allow_op = 0; static int rtpengine_retr = 5; static int rtpengine_tout_ms = 1000; static int queried_nodes_limit = MAX_RTPP_TRIED_NODES; @@ -334,6 +335,7 @@ static param_export_t params[] = { {"rtpengine_disable_tout",INT_PARAM, &rtpengine_disable_tout }, {"rtpengine_retr", INT_PARAM, &rtpengine_retr }, {"rtpengine_tout_ms", INT_PARAM, &rtpengine_tout_ms }, + {"rtpengine_allow_op", INT_PARAM, &rtpengine_allow_op }, {"queried_nodes_limit", INT_PARAM, &queried_nodes_limit }, {"db_url", PARAM_STR, &rtpp_db_url }, {"table_name", PARAM_STR, &rtpp_table_name }, @@ -2369,7 +2371,7 @@ select_rtpp_node_new(str callid, int do_test, int op) } /* - * lookup the hastable (key=callid value=node) and get the old node + * lookup the hastable (key=callid value=node) and get the old node (e.g. for answer/delete) */ static struct rtpp_node * select_rtpp_node_old(str callid, int do_test, int op) @@ -2396,11 +2398,22 @@ select_rtpp_node_old(str callid, int do_test, int op) node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); } - // if node broke, don't send any message + // if node enabled, return it if (!node->rn_disabled) { return node; + } + + // if node _manually_ disabled(e.g kamctl) and proper configuration, return it + if (node->rn_recheck_ticks == MI_MAX_RECHECK_TICKS) { + if (rtpengine_allow_op) { + LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled(permanent) (probably still UP)! Return it\n", + node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); + return node; + } + LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled(permanent) (probably still UP)! Return NULL\n", + node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); } else { - LM_DBG("rtpengine hash table lookup find node=%.*s for calllen=%d callid=%.*s, which is disabled!\n", + LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled (probably BROKE)! Return NULL\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); }

9 years

git:master:e3a37979: rtpengine: kamctl fifo nh_show_hash_total

by Stefan Mititelu

Module: kamailio Branch: master Commit: e3a379790e3370f549ab7d44e8d603e8a9040ecc URL: https://github.com/kamailio/kamailio/commit/e3a379790e3370f549ab7d44e8d603e… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T12:12:27+02:00 rtpengine: kamctl fifo nh_show_hash_total Print the total number of hash entries in the hash table, at the given moment. Updated doku. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine_hash.c Modified: modules/rtpengine/rtpengine_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/e3a379790e3370f549ab7d44e8d603e… Patch: https://github.com/kamailio/kamailio/commit/e3a379790e3370f549ab7d44e8d603e…

9 years

← Newer
1
...
12
13
14
15
16
17
18
...
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 2015