sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
273 discussions

[kamailio] rtpengine: changes for mi_fifo_commands (#206)

by Stefan Mititelu

Added a new fifo command, namely nh_ping_rtpp, which pings the given proxy or all proxies, and if a proxy does not respond, disable it temporarily. If the proxy responds, it does nothing. Changed the existing fifos to execute for a specific proxy or for all proxies depending on the first given parameter. Changed nh_enable_rtpp to try to ping before enabling and enable it only if ping success. Changed some formatting for nh_show_rtpp to print 'N/A' when disabled permanent and to display the correct recheck_ticks. Updated doku accordingly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/206 -- Commit Summary -- * rtpengine: changes for mi_fifo_commands -- File Changes -- M modules/rtpengine/doc/rtpengine_admin.xml (79) M modules/rtpengine/rtpengine.c (588) -- Patch Links -- https://github.com/kamailio/kamailio/pull/206.patch https://github.com/kamailio/kamailio/pull/206.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/206

9 years, 5 months

git:master:20d2c6f6: p_usrloc: added path and +instance support

by Patric Marschall

Module: kamailio Branch: master Commit: 20d2c6f6384fbc74956d3fb9070a31f387ebf612 URL: https://github.com/kamailio/kamailio/commit/20d2c6f6384fbc74956d3fb9070a31f… Author: Patric Marschall <patric.marschall(a)1und1.de> Committer: Patric Marschall <patric.marschall(a)1und1.de> Date: 2015-06-15T13:00:45+02:00 p_usrloc: added path and +instance support - Added functionality for path headers and +instance contact header fields in REGISTER requests for the p_usrloc module. --- Modified: modules/p_usrloc/p_usrloc_mod.c Modified: modules/p_usrloc/p_usrloc_mod.h Modified: modules/p_usrloc/ucontact.c Modified: modules/p_usrloc/udomain.c Modified: modules/p_usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/20d2c6f6384fbc74956d3fb9070a31f… Patch: https://github.com/kamailio/kamailio/commit/20d2c6f6384fbc74956d3fb9070a31f…

9 years, 5 months

New commit right request for Stefan Mititelu

by lbalaceanu

Hello Daniel, As you saw from some dev message flows, we have a passionate new colleague in the 1&1 VoIP team. He has already contributed with several patches (committed by pull requests or by me). Lately he has also developed some debugger and rtpengine patches and we would want to use this occasion to request commit rights for him as well. His github account is smititelu. Thank you, Lucian Balaceanu

9 years, 5 months

git:master:52c4316d: Merge pull request #194 from snen/extend_drouting_with_3_symbols

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 52c4316db2f4e99fdd4bfeafabe914ce3f47783c URL: https://github.com/kamailio/kamailio/commit/52c4316db2f4e99fdd4bfeafabe914c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-15T11:35:13+02:00 Merge pull request #194 from snen/extend_drouting_with_3_symbols Add symbols "#*+" to drouting tree --- Modified: modules/drouting/prefix_tree.c Modified: modules/drouting/prefix_tree.h --- Diff: https://github.com/kamailio/kamailio/commit/52c4316db2f4e99fdd4bfeafabe914c… Patch: https://github.com/kamailio/kamailio/commit/52c4316db2f4e99fdd4bfeafabe914c… --- diff --git a/modules/drouting/prefix_tree.c b/modules/drouting/prefix_tree.c index c2bdfc7..b601d7a 100644 --- a/modules/drouting/prefix_tree.c +++ b/modules/drouting/prefix_tree.c @@ -119,7 +119,6 @@ get_prefix( { rt_info_t *rt = NULL; char *tmp=NULL; - char local=0; int idx=0; if(NULL == ptree) @@ -132,8 +131,8 @@ get_prefix( while(tmp< (prefix->s+prefix->len)) { if(NULL == tmp) goto err_exit; - local=*tmp; - if( !IS_DECIMAL_DIGIT(local) ) { + idx = get_node_index(*tmp); + if (idx == -1){ /* unknown character in the prefix string */ goto err_exit; } @@ -141,7 +140,6 @@ get_prefix( /* last digit in the prefix string */ break; } - idx = local -'0'; if( NULL == ptree->ptnode[idx].next) { /* this is a leaf */ break; @@ -155,7 +153,7 @@ get_prefix( if(NULL == tmp) goto err_exit; /* is it a real node or an intermediate one */ - idx = *tmp-'0'; + idx = get_node_index(*tmp); if(NULL != ptree->ptnode[idx].rg) { /* real node; check the constraints on the routing info*/ if( NULL != (rt = internal_check_rt( &(ptree->ptnode[idx]), rgid))) @@ -206,34 +204,36 @@ add_prefix( while(tmp < (prefix->s+prefix->len)) { if(NULL == tmp) goto err_exit; - if( !IS_DECIMAL_DIGIT(*tmp) ) { + int insert_index = get_node_index(*tmp); + if (insert_index == -1){ /* unknown character in the prefix string */ goto err_exit; } if( tmp == (prefix->s+prefix->len-1) ) { - /* last digit in the prefix string */ + /* last symbol in the prefix string */ + LM_DBG("adding info %p, %d at: " - "%p (%d)\n", r, rg, &(ptree->ptnode[*tmp-'0']), *tmp-'0'); - res = add_rt_info(&(ptree->ptnode[*tmp-'0']), r,rg); + "%p (%d)\n", r, rg, &(ptree->ptnode[insert_index]), insert_index); + res = add_rt_info(&(ptree->ptnode[insert_index]), r,rg); if(res < 0 ) goto err_exit; unode++; res = 1; goto ok_exit; } - /* process the current digit in the prefix */ - if(NULL == ptree->ptnode[*tmp - '0'].next) { + /* process the current symbol in the prefix */ + if(NULL == ptree->ptnode[insert_index].next) { /* allocate new node */ - INIT_PTREE_NODE(ptree, ptree->ptnode[*tmp - '0'].next); - inode+=10; + INIT_PTREE_NODE(ptree, ptree->ptnode[insert_index].next); + inode+=PTREE_CHILDREN; #if 0 printf("new tree node: %p (bp: %p)\n", - ptree->ptnode[*tmp - '0'].next, - ptree->ptnode[*tmp - '0'].next->bp + ptree->ptnode[insert_index].next, + ptree->ptnode[insert_index].next->bp ); #endif } - ptree = ptree->ptnode[*tmp-'0'].next; + ptree = ptree->ptnode[insert_index].next; tmp++; } @@ -318,3 +318,32 @@ print_rt( rt->pgwl[i].pgw->pri.len, rt->pgwl[i].pgw->pri.s, rt->pgwl[i].pgw->ip.len, rt->pgwl[i].pgw->ip.s); } + + +int +get_node_index( + char ch + ) +{ + switch (ch) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + return ch - '0'; + case '*': + return 10; + case '#': + return 11; + case '+': + return 12; + } + return -1; +} diff --git a/modules/drouting/prefix_tree.h b/modules/drouting/prefix_tree.h index ff90417..41065e3 100644 --- a/modules/drouting/prefix_tree.h +++ b/modules/drouting/prefix_tree.h @@ -34,9 +34,7 @@ #include "../../ip_addr.h" #include "dr_time.h" -#define PTREE_CHILDREN 10 -#define IS_DECIMAL_DIGIT(d) \ - (((d)>='0') && ((d)<= '9')) +#define PTREE_CHILDREN 13 //decimal digits, '*', '#', '+' extern int tree_size; @@ -176,4 +174,9 @@ check_rt( unsigned int rgid ); +int +get_node_index( + char ch + ); + #endif

9 years, 5 months

git:master:073f25f8: function for node index calculation added

by Savolainen Dmitri

Module: kamailio Branch: master Commit: 073f25f8d9181fe1d64e6a418bfee5889e4280ac URL: https://github.com/kamailio/kamailio/commit/073f25f8d9181fe1d64e6a418bfee58… Author: Savolainen Dmitri <savolainen(a)erinaco.ru> Committer: Savolainen Dmitri <savolainen(a)erinaco.ru> Date: 2015-06-11T20:14:58+03:00 function for node index calculation added --- Modified: modules/drouting/prefix_tree.c Modified: modules/drouting/prefix_tree.h --- Diff: https://github.com/kamailio/kamailio/commit/073f25f8d9181fe1d64e6a418bfee58… Patch: https://github.com/kamailio/kamailio/commit/073f25f8d9181fe1d64e6a418bfee58… --- diff --git a/modules/drouting/prefix_tree.c b/modules/drouting/prefix_tree.c index 2229144..b601d7a 100644 --- a/modules/drouting/prefix_tree.c +++ b/modules/drouting/prefix_tree.c @@ -119,7 +119,6 @@ get_prefix( { rt_info_t *rt = NULL; char *tmp=NULL; - char local=0; int idx=0; if(NULL == ptree) @@ -132,24 +131,10 @@ get_prefix( while(tmp< (prefix->s+prefix->len)) { if(NULL == tmp) goto err_exit; - local=*tmp; - - if( IS_DECIMAL_DIGIT(local) ) { - idx = local -'0'; - } - else if (local == '*'){ - idx = 10; - } - else if (local == '#'){ - idx = 11; - } - else if (local == '+'){ - idx = 12; - } - else{ + idx = get_node_index(*tmp); + if (idx == -1){ /* unknown character in the prefix string */ goto err_exit; - } if( tmp == (prefix->s+prefix->len-1) ) { /* last digit in the prefix string */ @@ -168,13 +153,7 @@ get_prefix( if(NULL == tmp) goto err_exit; /* is it a real node or an intermediate one */ - idx = *tmp-'0'; - if (*tmp == '*') - idx = 10; - else if (*tmp == '#') - idx = 11; - else if (*tmp == '+') - idx = 12; + idx = get_node_index(*tmp); if(NULL != ptree->ptnode[idx].rg) { /* real node; check the constraints on the routing info*/ if( NULL != (rt = internal_check_rt( &(ptree->ptnode[idx]), rgid))) @@ -225,22 +204,8 @@ add_prefix( while(tmp < (prefix->s+prefix->len)) { if(NULL == tmp) goto err_exit; - int insert_index = -1; - if( IS_DECIMAL_DIGIT(*tmp) ) { - /* unknown character in the prefix string */ - insert_index = *tmp - '0'; - } - else if (*tmp=='*'){ - insert_index = 10; - } - else if (*tmp=='#'){ - insert_index = 11; - } - else if (*tmp=='+'){ - insert_index = 12; - } - - else{ + int insert_index = get_node_index(*tmp); + if (insert_index == -1){ /* unknown character in the prefix string */ goto err_exit; } @@ -353,3 +318,32 @@ print_rt( rt->pgwl[i].pgw->pri.len, rt->pgwl[i].pgw->pri.s, rt->pgwl[i].pgw->ip.len, rt->pgwl[i].pgw->ip.s); } + + +int +get_node_index( + char ch + ) +{ + switch (ch) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + return ch - '0'; + case '*': + return 10; + case '#': + return 11; + case '+': + return 12; + } + return -1; +} diff --git a/modules/drouting/prefix_tree.h b/modules/drouting/prefix_tree.h index 4ebc8f7..41065e3 100644 --- a/modules/drouting/prefix_tree.h +++ b/modules/drouting/prefix_tree.h @@ -35,8 +35,6 @@ #include "dr_time.h" #define PTREE_CHILDREN 13 //decimal digits, '*', '#', '+' -#define IS_DECIMAL_DIGIT(d) \ - (((d)>='0') && ((d)<= '9')) extern int tree_size; @@ -176,4 +174,9 @@ check_rt( unsigned int rgid ); +int +get_node_index( + char ch + ); + #endif

9 years, 5 months

git:master:bdc05473: Add symbols "#*+" to drouting tree

by Savolainen Dmitri

Module: kamailio Branch: master Commit: bdc05473eaf1dd5edc6b8aadb810a511413e0286 URL: https://github.com/kamailio/kamailio/commit/bdc05473eaf1dd5edc6b8aadb810a51… Author: Savolainen Dmitri <savolainen(a)erinaco.ru> Committer: Savolainen Dmitri <savolainen(a)erinaco.ru> Date: 2015-06-08T20:30:53+03:00 Add symbols "#*+" to drouting tree --- Modified: modules/drouting/prefix_tree.c Modified: modules/drouting/prefix_tree.h --- Diff: https://github.com/kamailio/kamailio/commit/bdc05473eaf1dd5edc6b8aadb810a51… Patch: https://github.com/kamailio/kamailio/commit/bdc05473eaf1dd5edc6b8aadb810a51… --- diff --git a/modules/drouting/prefix_tree.c b/modules/drouting/prefix_tree.c index c2bdfc7..2229144 100644 --- a/modules/drouting/prefix_tree.c +++ b/modules/drouting/prefix_tree.c @@ -133,15 +133,28 @@ get_prefix( if(NULL == tmp) goto err_exit; local=*tmp; - if( !IS_DECIMAL_DIGIT(local) ) { + + if( IS_DECIMAL_DIGIT(local) ) { + idx = local -'0'; + } + else if (local == '*'){ + idx = 10; + } + else if (local == '#'){ + idx = 11; + } + else if (local == '+'){ + idx = 12; + } + else{ /* unknown character in the prefix string */ goto err_exit; + } if( tmp == (prefix->s+prefix->len-1) ) { /* last digit in the prefix string */ break; } - idx = local -'0'; if( NULL == ptree->ptnode[idx].next) { /* this is a leaf */ break; @@ -156,6 +169,12 @@ get_prefix( goto err_exit; /* is it a real node or an intermediate one */ idx = *tmp-'0'; + if (*tmp == '*') + idx = 10; + else if (*tmp == '#') + idx = 11; + else if (*tmp == '+') + idx = 12; if(NULL != ptree->ptnode[idx].rg) { /* real node; check the constraints on the routing info*/ if( NULL != (rt = internal_check_rt( &(ptree->ptnode[idx]), rgid))) @@ -206,34 +225,50 @@ add_prefix( while(tmp < (prefix->s+prefix->len)) { if(NULL == tmp) goto err_exit; - if( !IS_DECIMAL_DIGIT(*tmp) ) { + int insert_index = -1; + if( IS_DECIMAL_DIGIT(*tmp) ) { + /* unknown character in the prefix string */ + insert_index = *tmp - '0'; + } + else if (*tmp=='*'){ + insert_index = 10; + } + else if (*tmp=='#'){ + insert_index = 11; + } + else if (*tmp=='+'){ + insert_index = 12; + } + + else{ /* unknown character in the prefix string */ goto err_exit; } if( tmp == (prefix->s+prefix->len-1) ) { - /* last digit in the prefix string */ + /* last symbol in the prefix string */ + LM_DBG("adding info %p, %d at: " - "%p (%d)\n", r, rg, &(ptree->ptnode[*tmp-'0']), *tmp-'0'); - res = add_rt_info(&(ptree->ptnode[*tmp-'0']), r,rg); + "%p (%d)\n", r, rg, &(ptree->ptnode[insert_index]), insert_index); + res = add_rt_info(&(ptree->ptnode[insert_index]), r,rg); if(res < 0 ) goto err_exit; unode++; res = 1; goto ok_exit; } - /* process the current digit in the prefix */ - if(NULL == ptree->ptnode[*tmp - '0'].next) { + /* process the current symbol in the prefix */ + if(NULL == ptree->ptnode[insert_index].next) { /* allocate new node */ - INIT_PTREE_NODE(ptree, ptree->ptnode[*tmp - '0'].next); - inode+=10; + INIT_PTREE_NODE(ptree, ptree->ptnode[insert_index].next); + inode+=PTREE_CHILDREN; #if 0 printf("new tree node: %p (bp: %p)\n", - ptree->ptnode[*tmp - '0'].next, - ptree->ptnode[*tmp - '0'].next->bp + ptree->ptnode[insert_index].next, + ptree->ptnode[insert_index].next->bp ); #endif } - ptree = ptree->ptnode[*tmp-'0'].next; + ptree = ptree->ptnode[insert_index].next; tmp++; } diff --git a/modules/drouting/prefix_tree.h b/modules/drouting/prefix_tree.h index ff90417..4ebc8f7 100644 --- a/modules/drouting/prefix_tree.h +++ b/modules/drouting/prefix_tree.h @@ -34,7 +34,7 @@ #include "../../ip_addr.h" #include "dr_time.h" -#define PTREE_CHILDREN 10 +#define PTREE_CHILDREN 13 //decimal digits, '*', '#', '+' #define IS_DECIMAL_DIGIT(d) \ (((d)>='0') && ((d)<= '9'))

9 years, 5 months

[kamailio] Add symbols "#*+" to drouting tree (#194)

by Savolainen Dmitri

With this patch drouting can use "#*+" in addition to the decimal digits. ### Some tests with a set of 500.000 rules (64bit system) #### Performance impact (kamcmd droating.reload): decimal only: ~21sec decimal and "#*+": ~21sec #### Memory usage (kamcmd core.shmmem): after start, decimal only, used: 203119976 after start, decimal and "#*+", used: 240338888 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/194 -- Commit Summary -- * Add symbols "#*+" to drouting tree -- File Changes -- M modules/drouting/prefix_tree.c (61) M modules/drouting/prefix_tree.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/194.patch https://github.com/kamailio/kamailio/pull/194.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/194

9 years, 5 months

git:master:bc9308eb: Merge pull request #205 from kamailio/db_text_patch

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bc9308eb928b67c485e53917b63ff0215677f13e URL: https://github.com/kamailio/kamailio/commit/bc9308eb928b67c485e53917b63ff02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-15T11:30:19+02:00 Merge pull request #205 from kamailio/db_text_patch db_text : memory allocation/release issues in raw query --- Modified: modules/db_text/dbt_base.c Modified: modules/db_text/dbt_raw_query.c Modified: modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/bc9308eb928b67c485e53917b63ff02… Patch: https://github.com/kamailio/kamailio/commit/bc9308eb928b67c485e53917b63ff02… --- diff --git a/modules/db_text/dbt_base.c b/modules/db_text/dbt_base.c index 7ca4563..6d70ce5 100644 --- a/modules/db_text/dbt_base.c +++ b/modules/db_text/dbt_base.c @@ -503,7 +503,8 @@ int dbt_delete(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, int _n) _drp = _drp0; } - dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); + if( ((dbt_con_p)_h->tail)->affected ) + dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); /* dbt_print_table(_tbc, NULL); */ @@ -587,7 +588,8 @@ int dbt_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, _drp = _drp->next; } - dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); + if( ((dbt_con_p)_h->tail)->affected ) + dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); /* dbt_print_table(_tbc, NULL); */ diff --git a/modules/db_text/dbt_raw_query.c b/modules/db_text/dbt_raw_query.c index ad13600..143a585 100644 --- a/modules/db_text/dbt_raw_query.c +++ b/modules/db_text/dbt_raw_query.c @@ -120,10 +120,15 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + _tbc = NULL; res = dbt_query(_h, _k, _op, _v, result_cols, nc, cols, NULL, _r); error: + + if(_tbc) + dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + if(tokens) { for (i = 0; *(tokens + i); i++) { pkg_free(*(tokens + i)); diff --git a/modules/db_text/dbt_raw_util.c b/modules/db_text/dbt_raw_util.c index aba55b8..f000f3b 100644 --- a/modules/db_text/dbt_raw_util.c +++ b/modules/db_text/dbt_raw_util.c @@ -141,6 +141,7 @@ void dbt_clean_where(int n, db_key_t* _k, db_op_t* _op, db_val_t* _v) if(_k) { for(i=0; i < n; i++) { pkg_free(_k[i]->s); + pkg_free(_k[i]); } pkg_free(_k); } @@ -167,7 +168,7 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) char** _o1 = NULL; db_val_t* _v1 = NULL; regmatch_t* matches = NULL; - int l; + int n, l; int len; regex_t preg; int offset = 0; @@ -214,9 +215,9 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) // needs changes in dbt_query / dbt_row_match l = matches[2].rm_eo - matches[2].rm_so; - _k1[idx] = pkg_malloc(sizeof(str)+l+1); + _k1[idx] = pkg_malloc(sizeof(db_key_t)); _k1[idx]->len = l; - _k1[idx]->s = (char*) (_k1[idx]+sizeof(str)); + _k1[idx]->s = pkg_malloc(sizeof(char) * (l+1)); strncpy(_k1[idx]->s, buffer+matches[2].rm_so, l); _k1[idx]->s[l]='\0'; @@ -237,11 +238,11 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) _v1[idx].val.str_val.s = pkg_malloc(l+1); strncpy(_v1[idx].val.str_val.s, buffer+matches[5].rm_so, l); } -/* int n; - for(n=0; n < MAX_MATCH; n++) { - LM_ERR("MATCH RESULT %d - %d,%d\n", n, matches[n].rm_so, matches[n].rm_eo); - } -*/ + +// for(n=0; n < MAX_MATCH; n++) { +// LM_ERR("MATCH RESULT %d - %d,%d\n", n, matches[n].rm_so, matches[n].rm_eo); +// } + if(matches[0].rm_eo != -1) offset += matches[0].rm_eo;

9 years, 5 months

git:master:d4f7cf1d: db_text : memory allocation / release in raw query

by Luis Azedo

Module: kamailio Branch: master Commit: d4f7cf1d933d74a55dfee0eafcf646a6165b12d6 URL: https://github.com/kamailio/kamailio/commit/d4f7cf1d933d74a55dfee0eafcf646a… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-11T17:17:08+01:00 db_text : memory allocation / release in raw query --- Modified: modules/db_text/dbt_raw_query.c Modified: modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/d4f7cf1d933d74a55dfee0eafcf646a… Patch: https://github.com/kamailio/kamailio/commit/d4f7cf1d933d74a55dfee0eafcf646a… --- diff --git a/modules/db_text/dbt_raw_query.c b/modules/db_text/dbt_raw_query.c index ad13600..143a585 100644 --- a/modules/db_text/dbt_raw_query.c +++ b/modules/db_text/dbt_raw_query.c @@ -120,10 +120,15 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + _tbc = NULL; res = dbt_query(_h, _k, _op, _v, result_cols, nc, cols, NULL, _r); error: + + if(_tbc) + dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + if(tokens) { for (i = 0; *(tokens + i); i++) { pkg_free(*(tokens + i)); diff --git a/modules/db_text/dbt_raw_util.c b/modules/db_text/dbt_raw_util.c index aba55b8..f000f3b 100644 --- a/modules/db_text/dbt_raw_util.c +++ b/modules/db_text/dbt_raw_util.c @@ -141,6 +141,7 @@ void dbt_clean_where(int n, db_key_t* _k, db_op_t* _op, db_val_t* _v) if(_k) { for(i=0; i < n; i++) { pkg_free(_k[i]->s); + pkg_free(_k[i]); } pkg_free(_k); } @@ -167,7 +168,7 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) char** _o1 = NULL; db_val_t* _v1 = NULL; regmatch_t* matches = NULL; - int l; + int n, l; int len; regex_t preg; int offset = 0; @@ -214,9 +215,9 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) // needs changes in dbt_query / dbt_row_match l = matches[2].rm_eo - matches[2].rm_so; - _k1[idx] = pkg_malloc(sizeof(str)+l+1); + _k1[idx] = pkg_malloc(sizeof(db_key_t)); _k1[idx]->len = l; - _k1[idx]->s = (char*) (_k1[idx]+sizeof(str)); + _k1[idx]->s = pkg_malloc(sizeof(char) * (l+1)); strncpy(_k1[idx]->s, buffer+matches[2].rm_so, l); _k1[idx]->s[l]='\0'; @@ -237,11 +238,11 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) _v1[idx].val.str_val.s = pkg_malloc(l+1); strncpy(_v1[idx].val.str_val.s, buffer+matches[5].rm_so, l); } -/* int n; - for(n=0; n < MAX_MATCH; n++) { - LM_ERR("MATCH RESULT %d - %d,%d\n", n, matches[n].rm_so, matches[n].rm_eo); - } -*/ + +// for(n=0; n < MAX_MATCH; n++) { +// LM_ERR("MATCH RESULT %d - %d,%d\n", n, matches[n].rm_so, matches[n].rm_eo); +// } + if(matches[0].rm_eo != -1) offset += matches[0].rm_eo;

9 years, 5 months

git:master:4dbff66f: db_text : only mark changed if there was a real change

by Luis Azedo

Module: kamailio Branch: master Commit: 4dbff66fff81f929118f18338f0a57fac674d4f9 URL: https://github.com/kamailio/kamailio/commit/4dbff66fff81f929118f18338f0a57f… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-11T17:16:09+01:00 db_text : only mark changed if there was a real change --- Modified: modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/4dbff66fff81f929118f18338f0a57f… Patch: https://github.com/kamailio/kamailio/commit/4dbff66fff81f929118f18338f0a57f… --- diff --git a/modules/db_text/dbt_base.c b/modules/db_text/dbt_base.c index 7ca4563..6d70ce5 100644 --- a/modules/db_text/dbt_base.c +++ b/modules/db_text/dbt_base.c @@ -503,7 +503,8 @@ int dbt_delete(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, int _n) _drp = _drp0; } - dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); + if( ((dbt_con_p)_h->tail)->affected ) + dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); /* dbt_print_table(_tbc, NULL); */ @@ -587,7 +588,8 @@ int dbt_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, _drp = _drp->next; } - dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); + if( ((dbt_con_p)_h->tail)->affected ) + dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1); /* dbt_print_table(_tbc, NULL); */

9 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015