sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

git:master:df7773af: db_text : simple raw support for select
by Luis Azedo 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: df7773afce1c7ea5719c5311cda799e5197feeb6 URL: https://github.com/kamailio/kamailio/commit/df7773afce1c7ea5719c5311cda799e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-04-22T18:04:57+01:00 db_text : simple raw support for select --- Modified: modules/db_text/dbt_base.c Modified: modules/db_text/dbtext.c Modified: modules/db_text/dbtext.h --- Diff: https://github.com/kamailio/kamailio/commit/df7773afce1c7ea5719c5311cda799e… Patch: https://github.com/kamailio/kamailio/commit/df7773afce1c7ea5719c5311cda799e… --- diff --git a/modules/db_text/dbt_base.c b/modules/db_text/dbt_base.c index fc70433..3df41bb 100644 --- a/modules/db_text/dbt_base.c +++ b/modules/db_text/dbt_base.c @@ -322,10 +322,51 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, /* * Raw SQL query -- is not the case to have this method */ -int dbt_raw_query(db1_con_t* _h, char* _s, db1_res_t** _r) +int dbt_raw_query(db1_con_t* _h, const str* _s, db1_res_t** _r) { *_r = NULL; - return -1; + int res = -1; + dbt_table_p _tbc = NULL; + int cols; + int n = 0; + db_key_t *result_cols = NULL; + + if(!_h) { + LM_ERR("H INVALID\n"); + return res; + } + + if(!_s) { + LM_ERR("S INVALID\n"); + return res; + } + + if(dbt_use_table(_h, _s) != 0) { + LM_ERR("USE INVALID %.*s\n", _s->len, _s->s); + return res; + } + + _tbc = dbt_db_get_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + if(!_tbc) + { + LM_ERR("table %.*s does not exist!\n", CON_TABLE(_h)->len, CON_TABLE(_h)->s); + return res; + } + + cols = _tbc->nrcols; + result_cols = pkg_malloc(sizeof(db_key_t) * cols); + memset(result_cols, 0, sizeof(db_key_t) * cols); + for(n=0; n < cols; n++) { + result_cols[n] = &_tbc->colv[n]->name; + } + + dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + + res = dbt_query(_h, NULL, NULL, NULL, result_cols, 0, cols, NULL, _r); + pkg_free(result_cols); + return res; + + } /* diff --git a/modules/db_text/dbtext.c b/modules/db_text/dbtext.c index 142f1c5..4f1d4a6 100644 --- a/modules/db_text/dbtext.c +++ b/modules/db_text/dbtext.c @@ -126,7 +126,8 @@ int dbt_bind_api(db_func_t *dbb) dbb->delete = (db_delete_f)dbt_delete; dbb->update = (db_update_f)dbt_update; dbb->affected_rows = (db_affected_rows_f) dbt_affected_rows; - dbb->cap = DB_CAP_AFFECTED_ROWS; + dbb->raw_query = (db_raw_query_f) dbt_raw_query; + dbb->cap = DB_CAP_ALL | DB_CAP_AFFECTED_ROWS | DB_CAP_RAW_QUERY; return 0; } diff --git a/modules/db_text/dbtext.h b/modules/db_text/dbtext.h index 5517bd0..83bfcdc 100644 --- a/modules/db_text/dbtext.h +++ b/modules/db_text/dbtext.h @@ -60,7 +60,7 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, /* * Raw SQL query */ -int dbt_raw_query(db1_con_t* _h, char* _s, db1_res_t** _r); +int dbt_raw_query(db1_con_t* _h, const str* _s, db1_res_t** _r); /*

1 0

[kamailio] db_text : simple raw support for select (#136)
by lazedo 23 Apr '15

23 Apr '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/136 -- Commit Summary -- * db_text : simple raw support for select -- File Changes -- M modules/db_text/dbt_base.c (45) M modules/db_text/dbtext.c (3) M modules/db_text/dbtext.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/136.patch https://github.com/kamailio/kamailio/pull/136.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/136

2 8

git:master:5803387d: rtjson: added sample json document for routing
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 5803387da3a056de7cf08e85f49616810186b202 URL: https://github.com/kamailio/kamailio/commit/5803387da3a056de7cf08e85f496168… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-23T09:35:26+02:00 rtjson: added sample json document for routing --- Modified: modules/rtjson/README Modified: modules/rtjson/doc/rtjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5803387da3a056de7cf08e85f496168… Patch: https://github.com/kamailio/kamailio/commit/5803387da3a056de7cf08e85f496168…

1 0

git:master:8cb435dc: rtjson: filled rtjson_update_branch()
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 8cb435dcf3ec408c6c3f95ee699932f7aeb78a18 URL: https://github.com/kamailio/kamailio/commit/8cb435dcf3ec408c6c3f95ee699932f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-23T09:31:45+02:00 rtjson: filled rtjson_update_branch() --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/8cb435dcf3ec408c6c3f95ee699932f… Patch: https://github.com/kamailio/kamailio/commit/8cb435dcf3ec408c6c3f95ee699932f… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index cbb65e7..2b46036 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -29,6 +29,7 @@ #include "../../xavp.h" #include "../../dset.h" #include "../../mem/shm_mem.h" +#include "../../data_lump.h" #include "../../lib/srutils/srjson.h" #include "../../modules/tm/tm_load.h" #include "../../modules/uac/api.h" @@ -314,6 +315,8 @@ int rtjson_init_serial(sip_msg_t *msg, srjson_doc_t *jdoc, sr_xavp_t *iavp) srjson_t *nj = NULL; srjson_t *rj = NULL; str val; + unsigned int bflags = 0; + unsigned int old_bflags = 0; nj = srjson_GetObjectItem(jdoc, jdoc->root, "routes"); if(nj==NULL || nj->type!=srjson_Array || nj->child==NULL) { @@ -362,6 +365,15 @@ int rtjson_init_serial(sip_msg_t *msg, srjson_doc_t *jdoc, sr_xavp_t *iavp) } } + rj = srjson_GetObjectItem(jdoc, nj, "branch_flags"); + if(rj!=NULL && rj->type==srjson_Number && rj->valueint!=0) { + bflags = rj->valueint; + + old_bflags = 0; + getbflagsval(0, &old_bflags); + setbflagsval(0, old_bflags|bflags); + } + iavp->val.v.i++; return 0; @@ -375,6 +387,100 @@ int rtjson_init_serial(sip_msg_t *msg, srjson_doc_t *jdoc, sr_xavp_t *iavp) */ int rtjson_prepare_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) { + srjson_t *rj = NULL; + srjson_t *tj = NULL; + srjson_t *vj = NULL; + str xdsp = {0}; + str xuri = {0}; + str xhdr = {0}; + unsigned int bflags = 0; + unsigned int fr = 0; + unsigned int fr_inv = 0; + struct lump *anchor = NULL; + char *s; + + + if(tmb.set_fr!=NULL) { + rj = srjson_GetObjectItem(jdoc, nj, "fr_timer"); + if(rj!=NULL && rj->type==srjson_Number && rj->valueint!=0) { + fr = rj->valueint; + } + rj = srjson_GetObjectItem(jdoc, nj, "fr_inv_timer"); + if(rj!=NULL && rj->type==srjson_Number && rj->valueint!=0) { + fr_inv = rj->valueint; + } + if(fr || fr_inv) tmb.set_fr(msg, fr_inv, fr); + } + rj = srjson_GetObjectItem(jdoc, nj, "headers"); + if(rj==NULL || rj->type!=srjson_Object || rj->child==NULL) { + LM_DBG("no header operations - done\n"); + return 0; + } + + tj = srjson_GetObjectItem(jdoc, rj, "extra"); + if(tj!=NULL && tj->type==srjson_String && tj->valuestring!=0) { + xhdr.s = tj->valuestring; + xhdr.len = strlen(xhdr.s); + } + + if(xhdr.len>4) { + anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); + if(anchor == 0) { + LM_ERR("can't get anchor\n"); + return -1; + } + s = pkg_malloc(xhdr.len+1); + if(s==NULL) { + LM_ERR("no more pkg\n"); + return -1; + } + strncpy(s, xhdr.s, xhdr.len); + s[xhdr.len] = '\0'; + if (insert_new_lump_before(anchor, s, xhdr.len, 0) == 0) { + LM_ERR("can't insert lump\n"); + pkg_free(s); + return -1; + } + } + + if(uacb.replace_from!=NULL) { + tj = srjson_GetObjectItem(jdoc, rj, "from"); + if(tj!=NULL && tj->type==srjson_Object && rj->child!=NULL) { + vj = srjson_GetObjectItem(jdoc, tj, "display"); + if(vj!=NULL && vj->type==srjson_String && vj->valuestring!=0) { + xdsp.s = vj->valuestring; + xdsp.len = strlen(xdsp.s); + } + vj = srjson_GetObjectItem(jdoc, tj, "uri"); + if(vj!=NULL && vj->type==srjson_String && vj->valuestring!=0) { + xuri.s = vj->valuestring; + xuri.len = strlen(xuri.s); + } + if(xdsp.len>0 || xuri.len>0) { + uacb.replace_from(msg, &xdsp, &xuri); + } + } + } + + if(uacb.replace_to!=NULL) { + tj = srjson_GetObjectItem(jdoc, rj, "to"); + if(tj!=NULL && tj->type==srjson_Object && rj->child!=NULL) { + vj = srjson_GetObjectItem(jdoc, tj, "display"); + if(vj!=NULL && vj->type==srjson_String && vj->valuestring!=0) { + xdsp.s = vj->valuestring; + xdsp.len = strlen(xdsp.s); + } + vj = srjson_GetObjectItem(jdoc, tj, "uri"); + if(vj!=NULL && vj->type==srjson_String && vj->valuestring!=0) { + xuri.s = vj->valuestring; + xuri.len = strlen(xuri.s); + } + if(xdsp.len>0 || xuri.len>0) { + uacb.replace_from(msg, &xdsp, &xuri); + } + } + } + return 0; }

1 0

git:master:3640d634: mem: TLSF: fix typo + missing declaration
by Camille Oudot 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: 3640d634a457c000b5a643f569719186ac5dc982 URL: https://github.com/kamailio/kamailio/commit/3640d634a457c000b5a643f56971918… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-22T18:49:19+02:00 mem: TLSF: fix typo + missing declaration --- Modified: mem/tlsf.c Modified: mem/tlsf.h --- Diff: https://github.com/kamailio/kamailio/commit/3640d634a457c000b5a643f56971918… Patch: https://github.com/kamailio/kamailio/commit/3640d634a457c000b5a643f56971918… --- diff --git a/mem/tlsf.c b/mem/tlsf.c index d2f577e..3b494d0 100644 --- a/mem/tlsf.c +++ b/mem/tlsf.c @@ -912,6 +912,7 @@ tlsf_t tlsf_create(void* mem) tlsf_cast(control_t*, mem)->allocated = 0; tlsf_cast(control_t*, mem)->total_size = tlsf_size(); tlsf_cast(control_t*, mem)->fragments = 0; + tlsf_cast(control_t*, mem)->max_fragments = 0; #endif return tlsf_cast(tlsf_t, mem); } @@ -1106,7 +1107,7 @@ void tlsf_meminfo(tlsf_t pool, struct mem_info *info) memset(info, 0, sizeof(*info)); info->free = control->total_size - control->real_used; info->max_used = control->max_used; - info->real_used = control->max_used; + info->real_used = control->real_used; info->total_frags = control->fragments; info->used = control->allocated; info->total_size = control->total_size; diff --git a/mem/tlsf.h b/mem/tlsf.h index 24b4eeb..8826807 100644 --- a/mem/tlsf.h +++ b/mem/tlsf.h @@ -64,6 +64,7 @@ int tlsf_check(tlsf_t tlsf); int tlsf_check_pool(pool_t pool); void tlsf_meminfo(tlsf_t pool, struct mem_info *info); +size_t tlsf_available(tlsf_t pool); #if defined(__cplusplus) };

1 0

release v4.3.0
by Luis Azedo 22 Apr '15

22 Apr '15

Hi List, i tested a simple implementation on raw sql for db_text. no column selection, where conditions and is only select. given a table name, it just retrieves all the records. useful for iterating records from script. the intent is to proceed to support column selection, where conditions, select/update/delete would that be of interest ?

2 2

Roadmap for next major release v4.3.0
by Daniel-Constantin Mierla 22 Apr '15

22 Apr '15

Hello, it is time to nail down the roadmap to the next major release. We discussed during the last IRC devel meeting, proposing to get it out by beginning of June. Given we need to have at least one month of testing, I propose the next milestones: - freezing the development: Wednesday, April 22, 2015 - if testing goes smooth, then branching 4.3 after about one month: During the week starting May 18 - test more in beta phase, prepare packaging, etc. and release after 2-3 weeks: One of the days between June 4 and 11 Other suggestions or adjustments are welcome! Send them to mailing list to discuss further. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

1 3

git:master:2f615e19: mem: Merge TLSF branch
by Camille Oudot 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: 2f615e19e7dff2a27e68576f5878c4b322082e26 URL: https://github.com/kamailio/kamailio/commit/2f615e19e7dff2a27e68576f5878c4b… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-22T11:50:12+02:00 mem: Merge TLSF branch --- Modified: modules/auth_xkeys/auth_xkeys.c Modified: modules/auth_xkeys/auth_xkeys.h Modified: modules/auth_xkeys/auth_xkeys_mod.c Modified: modules/ims_qos/mod.c Modified: modules/ims_qos/rx_aar.c Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/msilo-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mysql/msilo-create.sql Modified: utils/kamctl/oracle/msilo-create.sql Modified: utils/kamctl/postgres/msilo-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/2f615e19e7dff2a27e68576f5878c4b… Patch: https://github.com/kamailio/kamailio/commit/2f615e19e7dff2a27e68576f5878c4b…

3 2

about CDP ,CDP_AVP and IMS_Charging
by ycaner 22 Apr '15

22 Apr '15

Hello, I am working on ims_charging module to Kamailio-Asterisk system. After a long time , it was entegrated Kamailio-Asterisk with our diameter service.it needs a little time to test it stability. i want to run kamailio as a applicatian server with some dialplans. so it is need to get user profiles from diameter service that runs on java , uses jdiameter.jar . can CDP module support custom avps and use in kamailio cfg? Now, i am using http_query function to get user profile infos. and i dont like it , when the high volume calls , it goes to timeout. Thansk for relpies -- View this message in context: http://sip-router.1086192.n5.nabble.com/about-CDP-CDP-AVP-and-IMS-Charging-… Sent from the Development mailing list archive at Nabble.com.

1 0

git:master:41b62951: mem: fix shm_available() def for TLSF
by Camille Oudot 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: 41b629519969bde65f09d0789e811012297c70b7 URL: https://github.com/kamailio/kamailio/commit/41b629519969bde65f09d0789e81101… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-22T11:48:41+02:00 mem: fix shm_available() def for TLSF --- Modified: mem/shm_mem.h --- Diff: https://github.com/kamailio/kamailio/commit/41b629519969bde65f09d0789e81101… Patch: https://github.com/kamailio/kamailio/commit/41b629519969bde65f09d0789e81101… --- diff --git a/mem/shm_mem.h b/mem/shm_mem.h index 6b7ce84..a240cd4 100644 --- a/mem/shm_mem.h +++ b/mem/shm_mem.h @@ -154,7 +154,7 @@ # define MY_SUMS(...) ((void) 0) # define shm_malloc_init(mem, bytes, type) tlsf_create_with_pool((void*) mem, bytes) # define shm_malloc_destroy(b) do{}while(0) -# define shm_available() qm_available(shm_block) +# define shm_available() tlsf_available(shm_block) # define shm_malloc_on_fork() do{}while(0) #else # include "q_malloc.h"

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015