sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:5.0:8ad3a15c: htable: documentation fix for expires_column parameter
by Ovidiu Sas 01 Mar '17

01 Mar '17

Module: kamailio Branch: 5.0 Commit: 8ad3a15cb62d33afef6f12cef80eaac38794f14d URL: https://github.com/kamailio/kamailio/commit/8ad3a15cb62d33afef6f12cef80eaac… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-03-01T16:04:58-05:00 htable: documentation fix for expires_column parameter (cherry picked from commit f07fc80df5f475606ac81c2885cbedbdb3dca438) --- Modified: src/modules/htable/README Modified: src/modules/htable/doc/… [View More]

1 0

git:master:c6982e0e: topos_redis: new module to offer redis storage for topos module
by Daniel-Constantin Mierla 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: c6982e0e61d630b07282d497907a22a66ca2b70c URL: https://github.com/kamailio/kamailio/commit/c6982e0e61d630b07282d497907a22a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-01T10:08:50+01:00 topos_redis: new module to offer redis storage for topos module --- Added: src/modules/topos_redis/Makefile Added: src/modules/topos_redis/README Added: src/modules/… [View More]

1 0

git:master:0aaeed77: topos: unique id per dialog reused for both local contacts
by Daniel-Constantin Mierla 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: 0aaeed773316d4763471e723cfdc8d1230dfd5c1 URL: https://github.com/kamailio/kamailio/commit/0aaeed773316d4763471e723cfdc8d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-01T10:08:50+01:00 topos: unique id per dialog reused for both local contacts - relocated safety checks for storage update --- Modified: src/modules/topos/tps_storage.c --- Diff: https://… [View More]github.com/kamailio/kamailio/commit/0aaeed773316d4763471e723cfdc8d1… Patch: https://github.com/kamailio/kamailio/commit/0aaeed773316d4763471e723cfdc8d1… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 9bb416f..1d815ae 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -89,6 +89,7 @@ int tps_set_storage_api(tps_storage_api_t *tsa) { if(tsa==NULL) return -1; + LM_DBG("setting new storage api: %p\n", tsa); memcpy(&_tps_storage_api, tsa, sizeof(tps_storage_api_t)); return 0; @@ -197,7 +198,7 @@ int tps_storage_branch_rm(sip_msg_t *msg, tps_data_t *td) /** * */ -int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, int dir) +int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) { str sv; sip_uri_t puri; @@ -213,9 +214,7 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, int dir) return 0; } - sruid_next(&_tps_sruid); - - if(td->cp + 8 + (2*_tps_sruid.uid.len) + sv.len >= td->cbuf + TPS_DATA_SIZE) { + if(td->cp + 8 + (2*uuid->len) + sv.len >= td->cbuf + TPS_DATA_SIZE) { LM_ERR("insufficient data buffer\n"); return -1; } @@ -227,8 +226,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, int dir) td->b_uuid.s = td->cp; *td->cp = 'b'; td->cp++; - memcpy(td->cp, _tps_sruid.uid.s, _tps_sruid.uid.len); - td->cp += _tps_sruid.uid.len; + memcpy(td->cp, uuid->s, uuid->len); + td->cp += uuid->len; td->b_uuid.len = td->cp - td->b_uuid.s; td->bs_contact.s = td->cp; @@ -236,8 +235,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, int dir) td->a_uuid.s = td->cp; *td->cp = 'a'; td->cp++; - memcpy(td->cp, _tps_sruid.uid.s, _tps_sruid.uid.len); - td->cp += _tps_sruid.uid.len; + memcpy(td->cp, uuid->s, uuid->len); + td->cp += uuid->len; td->a_uuid.len = td->cp - td->a_uuid.s; td->as_contact.s = td->cp; @@ -255,8 +254,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, int dir) *td->cp = 'a'; } td->cp++; - memcpy(td->cp, _tps_sruid.uid.s, _tps_sruid.uid.len); - td->cp += _tps_sruid.uid.len; + memcpy(td->cp, uuid->s, uuid->len); + td->cp += uuid->len; *td->cp = '@'; td->cp++; memcpy(td->cp, puri.host.s, puri.host.len); @@ -369,9 +368,11 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) { int ret; - ret = tps_storage_fill_contact(msg, td, TPS_DIR_DOWNSTREAM); + sruid_next(&_tps_sruid); + + ret = tps_storage_fill_contact(msg, td, &_tps_sruid.uid, TPS_DIR_DOWNSTREAM); if(ret<0) goto error; - ret = tps_storage_fill_contact(msg, td, TPS_DIR_UPSTREAM); + ret = tps_storage_fill_contact(msg, td, &_tps_sruid.uid, TPS_DIR_UPSTREAM); if(ret<0) goto error; ret = tps_storage_link_msg(msg, td, TPS_DIR_DOWNSTREAM); if(ret<0) goto error; @@ -1049,23 +1050,10 @@ int tps_db_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db_val_t db_uvals[TPS_NR_KEYS]; int nr_keys; int nr_ucols; - int ret; - if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) + if(_tps_db_handle==NULL) return -1; - if(md->s_method_id != METHOD_INVITE) { - return 0; - } - if(msg->first_line.u.reply.statuscode<200 - || msg->first_line.u.reply.statuscode>=300) { - return 0; - } - - - ret = tps_storage_link_msg(msg, md, md->direction); - if(ret<0) return -1; - memset(db_ucols, 0, TPS_NR_KEYS*sizeof(db_key_t)); memset(db_uvals, 0, TPS_NR_KEYS*sizeof(db_val_t)); @@ -1134,6 +1122,22 @@ int tps_db_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) */ int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) { + int ret; + + if(msg==NULL || md==NULL || sd==NULL) + return -1; + + if(md->s_method_id != METHOD_INVITE) { + return 0; + } + if(msg->first_line.u.reply.statuscode<200 + || msg->first_line.u.reply.statuscode>=300) { + return 0; + } + + ret = tps_storage_link_msg(msg, md, md->direction); + if(ret<0) return -1; + return _tps_storage_api.update_dialog(msg, md, sd); } [View Less]

1 0

git:master:58c1ab8f: topos: restrict storage value to db and redis
by Daniel-Constantin Mierla 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: 58c1ab8fa03c992d201f226eab06d2fbe9999ee5 URL: https://github.com/kamailio/kamailio/commit/58c1ab8fa03c992d201f226eab06d2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-01T10:08:50+01:00 topos: restrict storage value to db and redis --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:4fa7a93f: topos: new parameter storage
by Daniel-Constantin Mierla 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: 4fa7a93fb60d8e8468b0f98272c1661d4913c463 URL: https://github.com/kamailio/kamailio/commit/4fa7a93fb60d8e8468b0f98272c1661… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-01T10:08:50+01:00 topos: new parameter storage - specify the storage type to be used - default value is "db", to use database connectors --- Modified: src/modules/topos/topos_mod.c --- Diff: … [View More] https://github.com/kamailio/kamailio/commit/4fa7a93fb60d8e8468b0f98272c1661… Patch: https://github.com/kamailio/kamailio/commit/4fa7a93fb60d8e8468b0f98272c1661… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 00f75a6..527b81f 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -74,6 +74,7 @@ sruid_t _tps_sruid; static str _tps_db_url = str_init(DEFAULT_DB_URL); int _tps_param_mask_callid = 0; int _tps_sanity_checks = 0; +str _tps_storage = str_init("db"); extern int _tps_branch_expire; extern int _tps_dialog_expire; @@ -103,6 +104,7 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ + {"storage", PARAM_STR, &_tps_storage}, {"db_url", PARAM_STR, &_tps_db_url}, {"mask_callid", PARAM_INT, &_tps_param_mask_callid}, {"sanity_checks", PARAM_INT, &_tps_sanity_checks}, @@ -134,15 +136,17 @@ struct module_exports exports= { */ static int mod_init(void) { - /* Find a database module */ - if (db_bind_mod(&_tps_db_url, &_tpsdbf)) { - LM_ERR("unable to bind database module\n"); - return -1; - } - if (!DB_CAPABILITY(_tpsdbf, DB_CAP_ALL)) { - LM_CRIT("database modules does not " - "provide all functions needed\n"); - return -1; + if(_tps_storage.len==2 && strncmp(_tps_storage.s, "db", 2)==0) { + /* Find a database module */ + if (db_bind_mod(&_tps_db_url, &_tpsdbf)) { + LM_ERR("unable to bind database module\n"); + return -1; + } + if (!DB_CAPABILITY(_tpsdbf, DB_CAP_ALL)) { + LM_CRIT("database modules does not " + "provide all functions needed\n"); + return -1; + } } if(_tps_sanity_checks!=0) { @@ -185,10 +189,12 @@ static int child_init(int rank) if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ - _tps_db_handle = _tpsdbf.init(&_tps_db_url); - if (!_tps_db_handle) { - LM_ERR("unable to connect database\n"); - return -1; + if(_tps_storage.len==2 && strncmp(_tps_storage.s, "db", 2)==0) { + _tps_db_handle = _tpsdbf.init(&_tps_db_url); + if (!_tps_db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } } return 0; @@ -199,9 +205,11 @@ static int child_init(int rank) */ static void destroy(void) { - if (_tps_db_handle) { - _tpsdbf.close(_tps_db_handle); - _tps_db_handle = 0; + if(_tps_storage.len==2 && strncmp(_tps_storage.s, "db", 2)==0) { + if (_tps_db_handle) { + _tpsdbf.close(_tps_db_handle); + _tps_db_handle = 0; + } } tps_storage_lock_set_destroy(); } [View Less]

1 0

git:master:02725bbc: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: 02725bbc77417b1e04faaf06e7fc309632378997 URL: https://github.com/kamailio/kamailio/commit/02725bbc77417b1e04faaf06e7fc309… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-03-01T08:46:25+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:307ad0a3: dialog Add missing ka_failed_limit parameter to README
by Olle E. Johansson 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: 307ad0a3e1084a7a03c045dc563421829b46c3e2 URL: https://github.com/kamailio/kamailio/commit/307ad0a3e1084a7a03c045dc5634218… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-03-01T08:41:30+01:00 dialog Add missing ka_failed_limit parameter to README --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:1f3884ce: manpage Add proper web address to the project (include https)
by Olle E. Johansson 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: 1f3884ce4cd08c6b7b52c2dd15bb2a5ac1905a63 URL: https://github.com/kamailio/kamailio/commit/1f3884ce4cd08c6b7b52c2dd15bb2a5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-03-01T08:41:30+01:00 manpage Add proper web address to the project (include https) --- Modified: doc/man/kamailio.8 --- Diff: https://github.com/kamailio/kamailio/commit/1f3884ce4cd08c6b7b52c2dd15bb2a5… Patch: … [View More]

1 0

git:master:958b63b9: lcr: accept DB1_STR and DB1_STRING db types
by Ovidiu Sas 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: 958b63b9fc500152b6671b90e9a813696a6aaadb URL: https://github.com/kamailio/kamailio/commit/958b63b9fc500152b6671b90e9a8136… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-02-28T19:06:05-05:00 lcr: accept DB1_STR and DB1_STRING db types --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/958b63b9fc500152b6671b90e9a8136… Patch: https://github.com/kamailio/kamailio/commit/958b63b9fc500152b6671b90e9a8136…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017