sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

git:master:97a921ca: db_text: add support for replace
by lazedo 04 Jan '16

04 Jan '16

Module: kamailio Branch: master Commit: 97a921ca63bd5482a690fe8ba399b05fd0134129 URL: https://github.com/kamailio/kamailio/commit/97a921ca63bd5482a690fe8ba399b05… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2016-01-04T05:12:42Z db_text: add support for replace implements replace with update/insert tries to update, inserts if not found --- 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/97a921ca63bd5482a690fe8ba399b05… Patch: https://github.com/kamailio/kamailio/commit/97a921ca63bd5482a690fe8ba399b05… --- diff --git a/modules/db_text/dbt_base.c b/modules/db_text/dbt_base.c index 6d70ce5..4ab9a16 100644 --- a/modules/db_text/dbt_base.c +++ b/modules/db_text/dbt_base.c @@ -617,3 +617,132 @@ int dbt_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, return -1; } +int dbt_replace(db1_con_t* _h, db_key_t* _k, db_val_t* _v, + int _n, int _nk, int _m) +{ + dbt_table_p _tbc = NULL; + dbt_row_p _drp = NULL; + int i, j; + int *lkey=NULL, *lres=NULL; + + if (!_h || !CON_TABLE(_h) || _nk <= 0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + ((dbt_con_p)_h->tail)->affected = 0; + + /* lock database */ + _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 -1; + } + + if(_k) + { + lkey = dbt_get_refs(_tbc, _k, _nk); + if(!lkey) + goto error; + } + lres = dbt_get_refs(_tbc, _k, _n); + if(!lres) + goto error; + _drp = _tbc->rows; + while(_drp) + { + if(dbt_row_match(_tbc, _drp, lkey, NULL, _v, _nk)) + { // update fields + for(i=0; i<_n; i++) + { + if(dbt_is_neq_type(_tbc->colv[lres[i]]->type, _v[i].type)) + { + LM_ERR("incompatible types!\n"); + goto error; + } + + if(dbt_row_update_val(_drp, &(_v[i]), + _tbc->colv[lres[i]]->type, lres[i])) + { + LM_ERR("cannot set v[%d] in c[%d]!\n", + i, lres[i]); + goto error; + } + } + + ((dbt_con_p)_h->tail)->affected++; + + } + _drp = _drp->next; + } + + if(((dbt_con_p)_h->tail)->affected == 0) { + _drp = dbt_row_new(_tbc->nrcols); + if(!_drp) + { + LM_ERR("no shm memory for a new row!!\n"); + goto error; + } + + for(i=0; i<_n; i++) + { + j = lres[i]; + if(dbt_is_neq_type(_tbc->colv[j]->type, _v[i].type)) + { + LM_ERR("incompatible types v[%d] - c[%d]!\n", i, j); + goto error; + } + if(_v[i].type == DB1_STRING && !_v[i].nul) + _v[i].val.str_val.len = strlen(_v[i].val.string_val); + if(dbt_row_set_val(_drp, &(_v[i]), _tbc->colv[j]->type, j)) + { + LM_ERR("cannot set v[%d] in c[%d]!\n", i, j); + goto error; + } + } + + if(dbt_table_add_row(_tbc, _drp)) + { + LM_ERR("cannot insert the new row!!\n"); + goto error; + } + + ((dbt_con_p)_h->tail)->affected = 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); */ + + /* unlock database */ + dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + + if(lkey) + pkg_free(lkey); + if(lres) + pkg_free(lres); + + return 0; + +error: + + if(lkey) + pkg_free(lkey); + if(lres) + pkg_free(lres); + if(_drp) // free row + dbt_row_free(_tbc, _drp); + + /* unlock database */ + dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); + + LM_ERR("failed to update the table!\n"); + + return -1; +} + + diff --git a/modules/db_text/dbtext.c b/modules/db_text/dbtext.c index 4f1d4a6..f601398 100644 --- a/modules/db_text/dbtext.c +++ b/modules/db_text/dbtext.c @@ -125,9 +125,10 @@ int dbt_bind_api(db_func_t *dbb) dbb->insert = (db_insert_f)dbt_insert; dbb->delete = (db_delete_f)dbt_delete; dbb->update = (db_update_f)dbt_update; + dbb->replace = (db_replace_f)dbt_replace; dbb->affected_rows = (db_affected_rows_f) dbt_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; + dbb->cap = DB_CAP_ALL | DB_CAP_AFFECTED_ROWS | DB_CAP_RAW_QUERY | DB_CAP_REPLACE; return 0; } diff --git a/modules/db_text/dbtext.h b/modules/db_text/dbtext.h index 92e6236..5cbacae 100644 --- a/modules/db_text/dbtext.h +++ b/modules/db_text/dbtext.h @@ -82,6 +82,12 @@ int dbt_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, db_key_t* _uk, db_val_t* _uv, int _n, int _un); /* + * replace a row in table + */ +int dbt_replace(db1_con_t* _h, db_key_t* _k, db_val_t* _v, + int _n, int _nk, int _m); + +/* * Affected rows */ int dbt_affected_rows(db1_con_t* _h);

1 0

[kamailio] db_text: add support for replace (#459)
by lazedo 04 Jan '16

04 Jan '16

implements replace with update/insert tries to update, inserts if not found You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/459 -- Commit Summary -- * db_text: add support for replace -- File Changes -- M modules/db_text/dbt_base.c (129) M modules/db_text/dbtext.c (3) M modules/db_text/dbtext.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/459.patch https://github.com/kamailio/kamailio/pull/459.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/459

2 2

git:master:59c1823b: Merge pull request #458 from kamailio/lazedo/presence_logs
by lazedo 04 Jan '16

04 Jan '16

Module: kamailio Branch: master Commit: 59c1823b71871c4e35550414b7169ee28f50d53a URL: https://github.com/kamailio/kamailio/commit/59c1823b71871c4e35550414b7169ee… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2016-01-04T10:17:57Z Merge pull request #458 from kamailio/lazedo/presence_logs presence: additional info in logs --- Modified: modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/59c1823b71871c4e35550414b7169ee… Patch: https://github.com/kamailio/kamailio/commit/59c1823b71871c4e35550414b7169ee… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index f6a0ba9..d92182b 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1612,11 +1612,12 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, } LM_GEN1(pres_local_log_level, - "NOTIFY %.*s via %.*s on behalf of %.*s for event %.*s\n", + "NOTIFY %.*s via %.*s on behalf of %.*s for event %.*s : %.*s\n", td->rem_uri.len, td->rem_uri.s, td->hooks.next_hop->len, td->hooks.next_hop->s, - td->loc_uri.len, td->loc_uri.s, subs->event->name.len, - subs->event->name.s); + td->loc_uri.len, td->loc_uri.s, + subs->event->name.len, subs->event->name.s, + subs->callid.len, subs->callid.s); ps_free_tm_dlg(td); @@ -2859,7 +2860,13 @@ int process_dialogs(int round, int presence_winfo) if (dialog->n > 1) { - LM_ERR("multiple records found\n"); + LM_ERR("multiple records found for %.*s, ci : %.*s, tt : %.*s, ft : %.*s, ev : %.*s\n", + sub.pres_uri.len, sub.pres_uri.s, + sub.callid.len, sub.callid.s, + sub.to_tag.len, sub.to_tag.s, + sub.from_tag.len, sub.from_tag.s, + ev_sname.len, ev_sname.s + ); goto delete_dialog; }

1 0

git:master:ad168dd5: presence: additional info in logs
by lazedo 04 Jan '16

04 Jan '16

Module: kamailio Branch: master Commit: ad168dd580d21e1896c21a41b91b7eee5e5e7f8b URL: https://github.com/kamailio/kamailio/commit/ad168dd580d21e1896c21a41b91b7ee… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2016-01-04T05:17:09Z presence: additional info in logs adds callid to NOTIFY log adds log when multiple records are found in process_dialogs --- Modified: modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/ad168dd580d21e1896c21a41b91b7ee… Patch: https://github.com/kamailio/kamailio/commit/ad168dd580d21e1896c21a41b91b7ee… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index f6a0ba9..d92182b 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1612,11 +1612,12 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, } LM_GEN1(pres_local_log_level, - "NOTIFY %.*s via %.*s on behalf of %.*s for event %.*s\n", + "NOTIFY %.*s via %.*s on behalf of %.*s for event %.*s : %.*s\n", td->rem_uri.len, td->rem_uri.s, td->hooks.next_hop->len, td->hooks.next_hop->s, - td->loc_uri.len, td->loc_uri.s, subs->event->name.len, - subs->event->name.s); + td->loc_uri.len, td->loc_uri.s, + subs->event->name.len, subs->event->name.s, + subs->callid.len, subs->callid.s); ps_free_tm_dlg(td); @@ -2859,7 +2860,13 @@ int process_dialogs(int round, int presence_winfo) if (dialog->n > 1) { - LM_ERR("multiple records found\n"); + LM_ERR("multiple records found for %.*s, ci : %.*s, tt : %.*s, ft : %.*s, ev : %.*s\n", + sub.pres_uri.len, sub.pres_uri.s, + sub.callid.len, sub.callid.s, + sub.to_tag.len, sub.to_tag.s, + sub.from_tag.len, sub.from_tag.s, + ev_sname.len, ev_sname.s + ); goto delete_dialog; }

1 0

[kamailio] presence: additional info in logs (#458)
by lazedo 04 Jan '16

04 Jan '16

adds callid to NOTIFY log adds log when multiple records are found in process_dialogs You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/458 -- Commit Summary -- * presence: additional info in logs -- File Changes -- M modules/presence/notify.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/458.patch https://github.com/kamailio/kamailio/pull/458.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/458

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016