sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:master:980c861e: mtree: safety checks for range within the chars table
by Daniel-Constantin Mierla 02 Mar '17

02 Mar '17

Module: kamailio Branch: master Commit: 980c861e39b1fb27de8d7c10390566e516e37fcc URL: https://github.com/kamailio/kamailio/commit/980c861e39b1fb27de8d7c10390566e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-02T22:17:03+01:00 mtree: safety checks for range within the chars table --- Modified: src/modules/mtree/mtree.c --- Diff: https://github.com/kamailio/kamailio/commit/980c861e39b1fb27de8d7c10390566e… Patch: https://github.com/kamailio/kamailio/commit/980c861e39b1fb27de8d7c10390566e…

1 0

git:5.0:5f86f556: lcr: accept DB1_STR and DB1_STRING db types
by Ovidiu Sas 02 Mar '17

02 Mar '17

Module: kamailio Branch: 5.0 Commit: 5f86f556af54849eff7643c0cac24144c3b0da81 URL: https://github.com/kamailio/kamailio/commit/5f86f556af54849eff7643c0cac2414… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-03-02T14:43:19-05:00 lcr: accept DB1_STR and DB1_STRING db types (cherry picked from commit 958b63b9fc500152b6671b90e9a813696a6aaadb) --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5f86f556af54849eff7643c0cac2414… Patch: https://github.com/kamailio/kamailio/commit/5f86f556af54849eff7643c0cac2414…

1 0

git:5.0:ba743dc6: htable: accept both DB1_STR and DB1_STRING from database
by Ovidiu Sas 02 Mar '17

02 Mar '17

Module: kamailio Branch: 5.0 Commit: ba743dc62145d6d9e584e9f4ca150c8e334bdda2 URL: https://github.com/kamailio/kamailio/commit/ba743dc62145d6d9e584e9f4ca150c8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-03-02T10:59:22-05:00 htable: accept both DB1_STR and DB1_STRING from database (cherry picked from commit 5cdab87aa1093dd372fed624f0de33bd6c13e53a) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/ba743dc62145d6d9e584e9f4ca150c8… Patch: https://github.com/kamailio/kamailio/commit/ba743dc62145d6d9e584e9f4ca150c8… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index fd692ca..6ce3fc9 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -271,19 +271,29 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) goto error; } - if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING) { + switch(RES_ROWS(db_res)[i].values[0].type) { + case DB1_STR: + kname.s = (RES_ROWS(db_res)[i].values[0].val.str_val.s); + if(kname.s==NULL) { + LM_ERR("null key in row %d\n", i); + goto error; + } + kname.len = (RES_ROWS(db_res)[i].values[0].val.str_val.len); + break; + case DB1_STRING: + kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); + if(kname.s==NULL) { + LM_ERR("null key in row %d\n", i); + goto error; + } + kname.len = strlen(kname.s); + break; + default: LM_ERR("key type must be string (type=%d)\n", RES_ROWS(db_res)[i].values[0].type); goto error; } - kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); - if(kname.s==NULL) { - LM_ERR("null key in row %d\n", i); - goto error; - } - kname.len = strlen(kname.s); - if(ht->ncols>0) { if(ht_pack_values(ht, db_res, i, ncols, &val.s)<0) { LM_ERR("Error packing values\n");

1 0

git:master:5cdab87a: htable: accept both DB1_STR and DB1_STRING from database
by Ovidiu Sas 02 Mar '17

02 Mar '17

Module: kamailio Branch: master Commit: 5cdab87aa1093dd372fed624f0de33bd6c13e53a URL: https://github.com/kamailio/kamailio/commit/5cdab87aa1093dd372fed624f0de33b… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-03-02T10:57:39-05:00 htable: accept both DB1_STR and DB1_STRING from database --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5cdab87aa1093dd372fed624f0de33b… Patch: https://github.com/kamailio/kamailio/commit/5cdab87aa1093dd372fed624f0de33b… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index fd692ca..6ce3fc9 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -271,19 +271,29 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) goto error; } - if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING) { + switch(RES_ROWS(db_res)[i].values[0].type) { + case DB1_STR: + kname.s = (RES_ROWS(db_res)[i].values[0].val.str_val.s); + if(kname.s==NULL) { + LM_ERR("null key in row %d\n", i); + goto error; + } + kname.len = (RES_ROWS(db_res)[i].values[0].val.str_val.len); + break; + case DB1_STRING: + kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); + if(kname.s==NULL) { + LM_ERR("null key in row %d\n", i); + goto error; + } + kname.len = strlen(kname.s); + break; + default: LM_ERR("key type must be string (type=%d)\n", RES_ROWS(db_res)[i].values[0].type); goto error; } - kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); - if(kname.s==NULL) { - LM_ERR("null key in row %d\n", i); - goto error; - } - kname.len = strlen(kname.s); - if(ht->ncols>0) { if(ht_pack_values(ht, db_res, i, ncols, &val.s)<0) { LM_ERR("Error packing values\n");

1 0

git:master:e712d32f: topos_redis: update fields and reduce expires for termintated dialogs
by Daniel-Constantin Mierla 02 Mar '17

02 Mar '17

Module: kamailio Branch: master Commit: e712d32f9304f95b5b19b26905546b4af700298f URL: https://github.com/kamailio/kamailio/commit/e712d32f9304f95b5b19b26905546b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-02T16:40:41+01:00 topos_redis: update fields and reduce expires for termintated dialogs --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e712d32f9304f95b5b19b26905546b4… Patch: https://github.com/kamailio/kamailio/commit/e712d32f9304f95b5b19b26905546b4…

1 0

git:master:5851bf01: topos_redis: set expire for dialog and branch records
by Daniel-Constantin Mierla 02 Mar '17

02 Mar '17

Module: kamailio Branch: master Commit: 5851bf01ba33c89c9eef5ac5ed8681369627a0aa URL: https://github.com/kamailio/kamailio/commit/5851bf01ba33c89c9eef5ac5ed86813… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-02T16:09:52+01:00 topos_redis: set expire for dialog and branch records --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5851bf01ba33c89c9eef5ac5ed86813… Patch: https://github.com/kamailio/kamailio/commit/5851bf01ba33c89c9eef5ac5ed86813… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 204d9fb..08ead91 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -42,6 +42,7 @@ extern str _topos_redis_serverid; extern ndb_redis_api_t _tps_redis_api; +extern topos_api_t _tps_api; static str _tps_redis_bprefix = str_init("b:x:"); static str _tps_redis_dprefix = str_init("d:z:"); @@ -93,6 +94,15 @@ str tt_key_x_tag = str_init("x_tag"); str tt_key_s_method = str_init("s_method"); str tt_key_s_cseq = str_init("s_cseq"); +#define TPS_REDIS_SET_ARGSV(sval, argc, argv, argvlen) \ + do { \ + if((sval)->s!=NULL && (sval)->len>0) { \ + argv[argc] = (sval)->s; \ + argvlen[argc] = (sval)->len; \ + argc++; \ + } \ + } while(0) + #define TPS_REDIS_SET_ARGS(sval, argc, akey, argv, argvlen) \ do { \ if((sval)->s!=NULL && (sval)->len>0) { \ @@ -119,6 +129,14 @@ str tt_key_s_cseq = str_init("s_cseq"); TPS_REDIS_SET_ARGS((sval), argc, akey, argv, argvlen); \ } while(0) +#define TPS_REDIS_SET_ARGNV(nval, rp, sval, argc, argv, argvlen) \ + do { \ + (sval)->s = int2bstr((unsigned long)nval, rp, &(sval)->len); \ + rp = (sval)->s + (sval)->len + 1; \ + TPS_REDIS_SET_ARGSV((sval), argc, argv, argvlen); \ + } while(0) + + /** * */ @@ -230,6 +248,35 @@ int tps_redis_insert_dialog(tps_data_t *td) rkey.len, rkey.s, argc); freeReplyObject(rrpl); + /* set expire for the key */ + argc = 0; + + argv[argc] = "EXPIRE"; + argvlen[argc] = 6; + argc++; + + argv[argc] = rkey.s; + argvlen[argc] = rkey.len; + argc++; + + lval = (unsigned long)_tps_api.get_dialog_expire(); + if(lval==0) { + return 0; + } + TPS_REDIS_SET_ARGNV(lval, rp, &rval, argc, argv, argvlen); + + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); + if(rrpl==NULL) { + LM_ERR("failed to execute expireredis command\n"); + if(rsrv->ctxRedis->err) { + LM_ERR("redis error: %s\n", rsrv->ctxRedis->errstr); + } + return -1; + } + LM_DBG("expire set on dialog record for [%.*s] with argc %d\n", + rkey.len, rkey.s, argc); + freeReplyObject(rrpl); + return 0; } @@ -328,6 +375,35 @@ int tps_redis_insert_branch(tps_data_t *td) freeReplyObject(rrpl); + /* set expire for the key */ + argc = 0; + + argv[argc] = "EXPIRE"; + argvlen[argc] = 6; + argc++; + + argv[argc] = rkey.s; + argvlen[argc] = rkey.len; + argc++; + + lval = (unsigned long)_tps_api.get_dialog_expire(); + if(lval==0) { + return 0; + } + TPS_REDIS_SET_ARGNV(lval, rp, &rval, argc, argv, argvlen); + + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); + if(rrpl==NULL) { + LM_ERR("failed to execute expireredis command\n"); + if(rsrv->ctxRedis->err) { + LM_ERR("redis error: %s\n", rsrv->ctxRedis->errstr); + } + return -1; + } + LM_DBG("expire set on branch record for [%.*s] with argc %d\n", + rkey.len, rkey.s, argc); + freeReplyObject(rrpl); + return 0; }

1 0

git:master:83a8c977: topos: api functions to get dialog and branch expire values
by Daniel-Constantin Mierla 02 Mar '17

02 Mar '17

Module: kamailio Branch: master Commit: 83a8c97798d9dbac7e67203e4a246b6013503c01 URL: https://github.com/kamailio/kamailio/commit/83a8c97798d9dbac7e67203e4a246b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-02T15:12:05+01:00 topos: api functions to get dialog and branch expire values --- Modified: src/modules/topos/api.h Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/83a8c97798d9dbac7e67203e4a246b6… Patch: https://github.com/kamailio/kamailio/commit/83a8c97798d9dbac7e67203e4a246b6… --- diff --git a/src/modules/topos/api.h b/src/modules/topos/api.h index 1e27416..ab36672 100644 --- a/src/modules/topos/api.h +++ b/src/modules/topos/api.h @@ -56,12 +56,16 @@ typedef struct tps_storage_api { typedef int (*tps_set_storage_api_f)(tps_storage_api_t *tsa); int tps_set_storage_api(tps_storage_api_t *tsa); +typedef int (*tps_get_dialog_expire_f)(void); +typedef int (*tps_get_branch_expire_f)(void); /** * @brief TOPOS API structure */ typedef struct topos_api { tps_set_storage_api_f set_storage_api; + tps_get_dialog_expire_f get_dialog_expire; + tps_get_branch_expire_f get_branch_expire; } topos_api_t; typedef int (*bind_topos_f)(topos_api_t* api); diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 7e33605..14297f7 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -383,6 +383,22 @@ int tps_msg_sent(void *data) /** * */ +int tps_get_dialog_expire(void) +{ + return _tps_dialog_expire; +} + +/** + * + */ +int tps_get_branch_expire(void) +{ + return _tps_branch_expire; +} + +/** + * + */ int bind_topos(topos_api_t *api) { if (!api) { @@ -391,6 +407,8 @@ int bind_topos(topos_api_t *api) } memset(api, 0, sizeof(topos_api_t)); api->set_storage_api = tps_set_storage_api; + api->get_dialog_expire = tps_get_dialog_expire; + api->get_branch_expire = tps_get_branch_expire; return 0; }

1 0

git:master:a43d8460: topos: proper detection of direction for requests within dialog
by Daniel-Constantin Mierla 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: a43d8460f4caca20f42f0eb44ec4bd9e22cb1513 URL: https://github.com/kamailio/kamailio/commit/a43d8460f4caca20f42f0eb44ec4bd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-01T23:41:12+01:00 topos: proper detection of direction for requests within dialog - related to GH #1005 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/a43d8460f4caca20f42f0eb44ec4bd9… Patch: https://github.com/kamailio/kamailio/commit/a43d8460f4caca20f42f0eb44ec4bd9… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 8c976b3..aa470e2 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -867,6 +867,7 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) tps_data_t stsd; tps_data_t *ptsd; str lkey; + str ftag; str xuuid; int direction = TPS_DIR_DOWNSTREAM; @@ -907,6 +908,23 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) if(tps_storage_load_dialog(msg, &mtsd, &stsd)==0) { ptsd = &stsd; } + /* detect direction - get from-tag */ + if(parse_from_header(msg)<0 || msg->from==NULL) { + LM_ERR("failed getting 'from' header!\n"); + goto error; + } + ftag = get_from(msg)->tag_value; + + if(stsd.a_tag.len!=ftag.len) { + direction = TPS_DIR_UPSTREAM; + } else { + if(memcmp(stsd.a_tag.s, ftag.s, ftag.len)==0) { + direction = TPS_DIR_DOWNSTREAM; + } else { + direction = TPS_DIR_UPSTREAM; + } + } + mtsd.direction = direction; } /* local generated requests */

1 0

git:master:3c773fd9: Makefile.groups: added topos_redis to redis group
by Daniel-Constantin Mierla 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: 3c773fd93045a2f3b88cf80bc0218c321718622d URL: https://github.com/kamailio/kamailio/commit/3c773fd93045a2f3b88cf80bc0218c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-01T23:29:44+01:00 Makefile.groups: added topos_redis to redis group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/3c773fd93045a2f3b88cf80bc0218c3… Patch: https://github.com/kamailio/kamailio/commit/3c773fd93045a2f3b88cf80bc0218c3… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 04b78eb..e4412ee 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -153,7 +153,7 @@ mod_list_jansson=jansson mod_list_jansson_event=janssonrpcc # - modules depending on redis library -mod_list_redis=ndb_redis +mod_list_redis=ndb_redis topos_redis # - modules depending on mono library mod_list_mono=app_mono

1 0

git:master:f07fc80d: htable: documentation fix for expires_column parameter
by Ovidiu Sas 01 Mar '17

01 Mar '17

Module: kamailio Branch: master Commit: f07fc80df5f475606ac81c2885cbedbdb3dca438 URL: https://github.com/kamailio/kamailio/commit/f07fc80df5f475606ac81c2885cbedb… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-03-01T16:03:19-05:00 htable: documentation fix for expires_column parameter --- Modified: src/modules/htable/README Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f07fc80df5f475606ac81c2885cbedb… Patch: https://github.com/kamailio/kamailio/commit/f07fc80df5f475606ac81c2885cbedb…

2 4

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