sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:4.3:dd4d1700: usrloc: log details of contact when inserting in db failes

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: dd4d1700a36c6d64590ad00ae8c60270d16c62c3 URL: https://github.com/kamailio/kamailio/commit/dd4d1700a36c6d64590ad00ae8c6027… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T16:25:32+01:00 usrloc: log details of contact when inserting in db failes (cherry picked from commit 1a05910912fbf9baaf821cc30fac7485c1e67622) --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/dd4d1700a36c6d64590ad00ae8c6027… Patch: https://github.com/kamailio/kamailio/commit/dd4d1700a36c6d64590ad00ae8c6027… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index a645e42..68e0359 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -680,7 +680,8 @@ int db_insert_ucontact(ucontact_t* _c) } if (ul_dbf.insert(ul_dbh, keys, vals, nr_cols) < 0) { - LM_ERR("inserting contact in db failed\n"); + LM_ERR("inserting contact in db failed %.*s (%.*s)\n", + _c->aor->len, ZSW(_c->aor->s), _c->ruid.len, ZSW(_c->ruid.s)); return -1; }

8 years, 8 months

git:4.3:3969a72e: dmq: removed params field from dmq_node_t

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 3969a72ebf47d9468ecfdf8c1ea3a4216b098ebf URL: https://github.com/kamailio/kamailio/commit/3969a72ebf47d9468ecfdf8c1ea3a42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T16:25:18+01:00 dmq: removed params field from dmq_node_t - used only for setting a flag - duplicating a node caused issues with param field not being duplicated, resulting in potential many free of same pointer, reported by Sebastian Damm (cherry picked from commit 16bc7b726a21108458f354aea840cdbf5d89d6d8) --- Modified: modules/dmq/dmqnode.c Modified: modules/dmq/dmqnode.h Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/3969a72ebf47d9468ecfdf8c1ea3a42… Patch: https://github.com/kamailio/kamailio/commit/3969a72ebf47d9468ecfdf8c1ea3a42… --- diff --git a/modules/dmq/dmqnode.c b/modules/dmq/dmqnode.c index 7b0bf63..f9816cb 100644 --- a/modules/dmq/dmqnode.c +++ b/modules/dmq/dmqnode.c @@ -185,20 +185,12 @@ dmq_node_t* build_dmq_node(str* uri, int shm) { } /* if any params found */ if(params) { - if(shm) { - if(shm_duplicate_params(&ret->params, params) < 0) { - LM_ERR("error duplicating params\n"); - free_params(params); - goto error; - } + if(set_dmq_node_params(ret, params) < 0) { free_params(params); - } else { - ret->params = params; - } - if(set_dmq_node_params(ret, ret->params) < 0) { LM_ERR("error setting parameters\n"); goto error; } + free_params(params); } else { LM_DBG("no dmqnode params found\n"); } @@ -248,12 +240,8 @@ dmq_node_t* find_dmq_node_uri2(str* uri) void destroy_dmq_node(dmq_node_t* node, int shm) { if(shm) { - if (node->params!=NULL) - shm_free_params(node->params); shm_free_node(node); } else { - if (node->params!=NULL) - free_params(node->params); pkg_free_node(node); } } diff --git a/modules/dmq/dmqnode.h b/modules/dmq/dmqnode.h index 2ef7b5f..7bc7ff6 100644 --- a/modules/dmq/dmqnode.h +++ b/modules/dmq/dmqnode.h @@ -43,7 +43,6 @@ typedef struct dmq_node { str orig_uri; /* original uri string - e.g. sip:127.0.0.1:5060;passive=true */ struct sip_uri uri; /* parsed uri string */ struct ip_addr ip_address; /* resolved IP address */ - param_t* params; /* uri parameters */ int status; /* reserved - maybe something like active,timeout,disabled */ int last_notification; /* last notificatino receied from the node */ struct dmq_node* next; /* pointer to the next struct dmq_node */ diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 3abefde..3bcff96 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -406,7 +406,7 @@ int extract_node_list(dmq_node_list_t* update_list, struct sip_msg* msg) update_list->nodes = cur; update_list->count++; total_nodes++; - } else if (find->params && ret->status != find->status) { + } else if (find->uri.params.s && ret->status != find->status) { LM_DBG("updating status on %.*s from %d to %d\n", STR_FMT(&tmp_uri), ret->status, find->status); ret->status = find->status;

8 years, 8 months

git:4.3:851a3bb7: p_usrloc: str->s string NULL check before str_dup

by Stefan Mititelu

Module: kamailio Branch: 4.3 Commit: 851a3bb7788b0a154e8fdb9fa4f150fa0777e8b5 URL: https://github.com/kamailio/kamailio/commit/851a3bb7788b0a154e8fdb9fa4f150f… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T13:23:12+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/851a3bb7788b0a154e8fdb9fa4f150f… Patch: https://github.com/kamailio/kamailio/commit/851a3bb7788b0a154e8fdb9fa4f150f… --- diff --git a/modules/p_usrloc/ucontact.c b/modules/p_usrloc/ucontact.c index cdce6dd..f37c160 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; }

8 years, 8 months

git:4.2:416c887e: p_usrloc: str->s string NULL check before str_dup

by Stefan Mititelu

Module: kamailio Branch: 4.2 Commit: 416c887efa29b9ffb8b30264542747b143e2e64e URL: https://github.com/kamailio/kamailio/commit/416c887efa29b9ffb8b30264542747b… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T13:22:30+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. (cherry picked from commit d1c6dc67b222e05be1ff90be9b38846f63866839) --- Modified: modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/416c887efa29b9ffb8b30264542747b… Patch: https://github.com/kamailio/kamailio/commit/416c887efa29b9ffb8b30264542747b… --- diff --git a/modules/p_usrloc/ucontact.c b/modules/p_usrloc/ucontact.c index a29fccc..f07ec22 100644 --- a/modules/p_usrloc/ucontact.c +++ b/modules/p_usrloc/ucontact.c @@ -67,20 +67,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; }

8 years, 8 months

git:4.1:eb2cad0b: p_usrloc: str->s string NULL check before str_dup

by Stefan Mititelu

Module: kamailio Branch: 4.1 Commit: eb2cad0ba521c260d7a3b7aeda2642e5eed965a5 URL: https://github.com/kamailio/kamailio/commit/eb2cad0ba521c260d7a3b7aeda2642e… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T13:19:17+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. (cherry picked from commit d1c6dc67b222e05be1ff90be9b38846f63866839) --- Modified: modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/eb2cad0ba521c260d7a3b7aeda2642e… Patch: https://github.com/kamailio/kamailio/commit/eb2cad0ba521c260d7a3b7aeda2642e… --- diff --git a/modules/p_usrloc/ucontact.c b/modules/p_usrloc/ucontact.c index 10defc5..c458e42 100644 --- a/modules/p_usrloc/ucontact.c +++ b/modules/p_usrloc/ucontact.c @@ -67,20 +67,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; }

8 years, 8 months

git:master:82fc14da: Revert "Revert "p_usrloc: str->s string NULL check before str_dup""

by Stefan Mititelu

Module: kamailio Branch: master Commit: 82fc14da184549780d39903e91745baf338b75ae URL: https://github.com/kamailio/kamailio/commit/82fc14da184549780d39903e91745ba… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-23T13:13:37+02:00 Revert "Revert "p_usrloc: str->s string NULL check before str_dup"" This reverts commit 90d5a98bb52a810e02f225e72faa1ab526b96bbb. --- Modified: modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/82fc14da184549780d39903e91745ba… Patch: https://github.com/kamailio/kamailio/commit/82fc14da184549780d39903e91745ba… --- 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; }

8 years, 8 months

git:master:99218397: Revert "rtpengine: hash table to keep the selected nodes"

by Victor Seva

Module: kamailio Branch: master Commit: 99218397a285c72a1857ffff90d12afca1e15542 URL: https://github.com/kamailio/kamailio/commit/99218397a285c72a1857ffff90d12af… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-23T12:04:41+01:00 Revert "rtpengine: hash table to keep the selected nodes" This reverts commit fef0593a49fd6c6a08a7a1f3220e3b7f0cc030fe. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Removed: modules/rtpengine/rtpengine_hash.c Removed: modules/rtpengine/rtpengine_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/99218397a285c72a1857ffff90d12af… Patch: https://github.com/kamailio/kamailio/commit/99218397a285c72a1857ffff90d12af…

8 years, 8 months

git:master:147a26d9: Revert "rtpengine: Update doku for node enable/disable"

by Victor Seva

Module: kamailio Branch: master Commit: 147a26d9583c09c27dbe0b0ee06efe6e6cc8620d URL: https://github.com/kamailio/kamailio/commit/147a26d9583c09c27dbe0b0ee06efe6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-23T12:04:40+01:00 Revert "rtpengine: Update doku for node enable/disable" This reverts commit fefe1e63a175ce475a44ae11bb89929e5c5f67d3. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/147a26d9583c09c27dbe0b0ee06efe6… Patch: https://github.com/kamailio/kamailio/commit/147a26d9583c09c27dbe0b0ee06efe6… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 2454db2..bcb1c03 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -73,38 +73,6 @@ If the set was selected using setid_avp, the avp needs to be set only once before rtpengine_offer() or rtpengine_manage() call. </para> - <para> - From the current implementation point of view, the sets of rtpproxy nodes - are shared memory(shm), so all processes can see a common list of nodes. - There is no locking when setting the nodes enabled/disabled (to keep the - memory access as fast as possible). Thus, problems related to node state - might appear for concurent processes that might set the nodes - enabled/disabled(e.g. by fifo command). This robustness problems are overcomed as follows. - </para> - - <para> - If the current process sees the selected node as disabled, the node is - <emphasis>force tested</emphasis> before the current process actually - takes the disabled decision. If the test succeeds, the process will set - the node as enabled (but other concurrent process might still see it as disabled). -. - </para> - - <para> - If the current process sees the selected node as enabled, it does no additional checks - and sends the command which will fail in case the machine is actually broken. - The process will set the node as disabled (but other concurrent process might still see it as enabled). - </para> - - <para> - The 'kamctl fifo' commands (including rtpengin ones) are executed by an exclusive - process which operate on the same shared memory node list. - </para> - - <para> - All the nodes are pinged in the beginning by all the processes, - even if the node list is shared memory. - </para> </section> <section>

8 years, 8 months

git:master:997bc782: Revert "rtpengine: Add hash_table_size modparam"

by Victor Seva

Module: kamailio Branch: master Commit: 997bc78278a8d544e917caaf8672305e56cb7713 URL: https://github.com/kamailio/kamailio/commit/997bc78278a8d544e917caaf8672305… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-23T12:04:39+01:00 Revert "rtpengine: Add hash_table_size modparam" This reverts commit a37257d48702c494c080f7f7c86a2dc18957b242. --- 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/997bc78278a8d544e917caaf8672305… Patch: https://github.com/kamailio/kamailio/commit/997bc78278a8d544e917caaf8672305…

8 years, 8 months

git:master:4b213dd5: Revert "rtpengine: kamctl fifo nh_show_hash_total"

by Victor Seva

Module: kamailio Branch: master Commit: 4b213dd5b6f6c24c7ad331571d43a89018ce2e40 URL: https://github.com/kamailio/kamailio/commit/4b213dd5b6f6c24c7ad331571d43a89… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-11-23T12:04:39+01:00 Revert "rtpengine: kamctl fifo nh_show_hash_total" This reverts commit e3a379790e3370f549ab7d44e8d603e8a9040ecc. --- 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/4b213dd5b6f6c24c7ad331571d43a89… Patch: https://github.com/kamailio/kamailio/commit/4b213dd5b6f6c24c7ad331571d43a89…

8 years, 8 months

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