sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

by Olle E. Johansson

http://kamailio.org/docs/modules/devel/modules/rabbitmq.html Please do provide a URL to the rabbitmq library project in addition to the name of the package name of a Linux distro. - Is the package name "librabbitmq-dev" the same for all major Linux distributions? - Have you checked this on OpenBSD or FreeBSD? We are multi-linux-distro and multi-platform :-) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/903

7 years, 9 months

git:master:52e86348: rabbitmq: added link to rabbitmq c lib

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 52e8634807b8c64a8ecd432a3c0e024185d3a447 URL: https://github.com/kamailio/kamailio/commit/52e8634807b8c64a8ecd432a3c0e024… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-09T12:47:12+01:00 rabbitmq: added link to rabbitmq c lib - GH #903 --- Modified: src/modules/rabbitmq/doc/rabbitmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/52e8634807b8c64a8ecd432a3c0e024… Patch: https://github.com/kamailio/kamailio/commit/52e8634807b8c64a8ecd432a3c0e024… --- diff --git a/src/modules/rabbitmq/doc/rabbitmq_admin.xml b/src/modules/rabbitmq/doc/rabbitmq_admin.xml index 24f9275..c54b047 100644 --- a/src/modules/rabbitmq/doc/rabbitmq_admin.xml +++ b/src/modules/rabbitmq/doc/rabbitmq_admin.xml @@ -10,7 +10,7 @@  <chapter xmlns:xi="http://www.w3.org/2001/XInclude"> - + <title>&adminguide;</title> <section> @@ -18,7 +18,8 @@ <para> This module offers amqp communication using librabbitmq. - This module was created based on <emphasis>rabbitmq-c</emphasis> C client. + This module was created using <emphasis>rabbitmq-c</emphasis> C client + (<ulink url="https://github.com/alanxz/rabbitmq-c">https://github.com/alanxz/rabbitmq-c</ulink>). An new amqp connection is setup on a per-children basis, when Kamailio starts. If connection is lost, the process tries to re-establish it when a new amqp action is required. </para> @@ -60,7 +61,8 @@ <itemizedlist> <listitem> <para> - <emphasis>librabbitmq-dev</emphasis>. + <emphasis>librabbitmq-dev</emphasis> - + (<ulink url="https://github.com/alanxz/rabbitmq-c">https://github.com/alanxz/rabbitmq-c</ulink>). </para> </listitem> </itemizedlist>

7 years, 9 months

git:master:bde1246e: modules: readme files regenerated - db_text ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: bde1246e931a911ea4ee87c3ca9178b1419e4cdc URL: https://github.com/kamailio/kamailio/commit/bde1246e931a911ea4ee87c3ca9178b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-03-09T12:46:25+01:00 modules: readme files regenerated - db_text ... [skip ci] --- Modified: src/modules/db_text/README Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/bde1246e931a911ea4ee87c3ca9178b… Patch: https://github.com/kamailio/kamailio/commit/bde1246e931a911ea4ee87c3ca9178b…

7 years, 9 months

git:master:e386b4dd: Merge pull request #1014 from lazedo/dbtext-fixes-master

by GitHub

Module: kamailio Branch: master Commit: e386b4dd3f00655b9a370e1e2a2e112e7aab0da2 URL: https://github.com/kamailio/kamailio/commit/e386b4dd3f00655b9a370e1e2a2e112… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-09T12:40:27+01:00 Merge pull request #1014 from lazedo/dbtext-fixes-master db_text fixes & live query --- Modified: src/modules/db_text/db_text.c Modified: src/modules/db_text/dbt_base.c Modified: src/modules/db_text/dbt_file.c Modified: src/modules/db_text/dbt_lib.c Modified: src/modules/db_text/dbt_lib.h Modified: src/modules/db_text/dbt_raw_query.c Modified: src/modules/db_text/doc/db_text_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e386b4dd3f00655b9a370e1e2a2e112… Patch: https://github.com/kamailio/kamailio/commit/e386b4dd3f00655b9a370e1e2a2e112…

7 years, 9 months

git:master:f49200b8: db_text : add documentation for db_text.query

by Luis Azedo

Module: kamailio Branch: master Commit: f49200b82025fc0ba3caf04415c56b1aa7ff447a URL: https://github.com/kamailio/kamailio/commit/f49200b82025fc0ba3caf04415c56b1… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-04T12:31:55Z db_text : add documentation for db_text.query --- Modified: src/modules/db_text/doc/db_text_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f49200b82025fc0ba3caf04415c56b1… Patch: https://github.com/kamailio/kamailio/commit/f49200b82025fc0ba3caf04415c56b1… --- diff --git a/src/modules/db_text/doc/db_text_admin.xml b/src/modules/db_text/doc/db_text_admin.xml index a5cb874..9c0ecb0 100644 --- a/src/modules/db_text/doc/db_text_admin.xml +++ b/src/modules/db_text/doc/db_text_admin.xml @@ -270,6 +270,26 @@ modparam("db_text", "db_mode", 1) </programlisting> </example> </section> + <section> + <title><varname>default_connection</varname> (string)</title> + <para> + connection for use with rpc query command. + </para> + + <para> + <emphasis> + Default value is <quote>none</quote> (off). + </emphasis> + </para> + <example> + <title>Set <varname>default_connection</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("db_text", "default_connection", "text:///var/db/kamailio/dbtext") + ... + </programlisting> + </example> + </section> <section> <title><varname>emptystring</varname> (integer)</title> <para> @@ -329,6 +349,18 @@ modparam("db_text", "file_buffer_size", 8192) kamcmd db_text.dump </programlisting> </section> + <section> + <title> + <function moreinfo="none">db_text.query</function> + </title> + <para>run sql command</para> + <para>Name: <emphasis>db_text.query</emphasis></para> + <para>Parameters: <emphasis>sqlcmd</emphasis></para> + <para>RPC Command Format:</para> + <programlisting format="linespecific"> + kamcmd db_text.query 'select * from location where username="xxx"' + </programlisting> + </section> </section> <section> <title>Installation and Running</title>

7 years, 9 months

git:master:af1d1618: db_text : check allocated memory

by Luis Azedo

Module: kamailio Branch: master Commit: af1d16183bf52ec3f898e3a86410ca21c8c7f821 URL: https://github.com/kamailio/kamailio/commit/af1d16183bf52ec3f898e3a86410ca2… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-04T12:12:21Z db_text : check allocated memory --- Modified: src/modules/db_text/dbt_raw_query.c --- Diff: https://github.com/kamailio/kamailio/commit/af1d16183bf52ec3f898e3a86410ca2… Patch: https://github.com/kamailio/kamailio/commit/af1d16183bf52ec3f898e3a86410ca2… --- diff --git a/src/modules/db_text/dbt_raw_query.c b/src/modules/db_text/dbt_raw_query.c index cda4a38..5ed3ce6 100644 --- a/src/modules/db_text/dbt_raw_query.c +++ b/src/modules/db_text/dbt_raw_query.c @@ -115,22 +115,46 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) if(ncols == 1 && strncmp(*tokens, "*", 1) == 0) { cols = _tbc->nrcols; result_cols = pkg_malloc(sizeof(db_key_t) * cols); + if(result_cols == NULL) { + LM_ERR("no more memory allocating"); + goto error; + } memset(result_cols, 0, sizeof(db_key_t) * cols); for(n=0; n < cols; n++) { result_cols[n] = pkg_malloc(sizeof(str)); + if(result_cols[n] == NULL) { + LM_ERR("no more memory allocating"); + goto error; + } result_cols[n]->len = _tbc->colv[n]->name.len; result_cols[n]->s = pkg_malloc((_tbc->colv[n]->name.len + 1) * sizeof(char)); + if(result_cols[n]->s == NULL) { + LM_ERR("no more memory allocating"); + goto error; + } strncpy(result_cols[n]->s, _tbc->colv[n]->name.s, _tbc->colv[n]->name.len); result_cols[n]->s[_tbc->colv[n]->name.len] = '\0'; } } else { cols = ncols; result_cols = pkg_malloc(sizeof(db_key_t) * cols); + if(result_cols == NULL) { + LM_ERR("no more memory allocating"); + goto error; + } memset(result_cols, 0, sizeof(db_key_t) * cols); for(n=0; *(tokens + n); n++) { result_cols[n] = pkg_malloc(sizeof(str)); + if(result_cols[n] == NULL) { + LM_ERR("no more memory allocating"); + goto error; + } result_cols[n]->len = strlen(*(tokens + n)); result_cols[n]->s = pkg_malloc((strlen(*(tokens + n)) + 1) * sizeof(char)); + if(result_cols[n]->s == NULL) { + LM_ERR("no more memory allocating"); + goto error; + } strncpy(result_cols[n]->s, *(tokens + n), strlen(*(tokens + n))); result_cols[n]->s[strlen(*(tokens + n))] = '\0'; } @@ -167,8 +191,10 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) if(result_cols) { for(n=0; n < cols; n++) { - pkg_free(result_cols[n]->s); - pkg_free(result_cols[n]); + if(result_cols[n]->s) + pkg_free(result_cols[n]->s); + if(result_cols[n]) + pkg_free(result_cols[n]); } pkg_free(result_cols); }

7 years, 9 months

git:master:650858ba: db_text : add rpc command for live query

by Luis Azedo

Module: kamailio Branch: master Commit: 650858ba246eee589876ffb257b7312bffd9243a URL: https://github.com/kamailio/kamailio/commit/650858ba246eee589876ffb257b7312… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-03T17:37:04Z db_text : add rpc command for live query --- Modified: src/modules/db_text/db_text.c --- Diff: https://github.com/kamailio/kamailio/commit/650858ba246eee589876ffb257b7312… Patch: https://github.com/kamailio/kamailio/commit/650858ba246eee589876ffb257b7312… --- diff --git a/src/modules/db_text/db_text.c b/src/modules/db_text/db_text.c index 7dc2cbb..eaeb408 100644 --- a/src/modules/db_text/db_text.c +++ b/src/modules/db_text/db_text.c @@ -47,6 +47,7 @@ int db_mode = 0; /* Database usage mode: 0 = cache, 1 = no cache */ int empty_string = 0; /* Treat empty string as "" = 0, 1 = NULL */ int _db_text_read_buffer_size = DEFAULT_DB_TEXT_READ_BUFFER_SIZE; int _db_text_max_result_rows = DEFAULT_MAX_RESULT_ROWS; +str dbt_default_connection = str_init(""); int dbt_bind_api(db_func_t *dbb); @@ -67,6 +68,7 @@ static param_export_t params[] = { {"emptystring", INT_PARAM, &empty_string}, {"file_buffer_size", INT_PARAM, &_db_text_read_buffer_size}, {"max_result_rows", INT_PARAM, &_db_text_max_result_rows}, + {"default_connection", PARAM_STR, &dbt_default_connection}, {0, 0, 0} }; @@ -156,8 +158,78 @@ static void rpc_dump(rpc_t *rpc, void *c) { return; } -static rpc_export_t rpc_methods[] = { - {"db_text.dump", rpc_dump, rpc_dump_doc, 0}, - {0, 0, 0, 0} +static const char *rpc_query_doc[2] = { + "Perform Live Query", 0 }; +/* rpc function implementations */ +static void rpc_query(rpc_t *rpc, void *ctx) { + str sql; + db1_con_t *con; + db1_res_t* _r; + int res; + int n; + char *buf; + size_t len; + FILE *stream; + dbt_table_p tab; + dbt_row_p rowp; + + rpc->scan(ctx, "S", &sql); + + con = dbt_init(&dbt_default_connection); + if(con == NULL) { + rpc->rpl_printf(ctx, "invalid connection : %s", dbt_default_connection.s); + return; + } + + res = dbt_raw_query(con, &sql, &_r); + if(res != 0) { + rpc->rpl_printf(ctx, "error executing sql statement"); + goto end; + } + + + if(_r) { + tab = (dbt_table_p)_r->ptr; + if(_r->n == 0) { + rpc->rpl_printf(ctx, "statement returned 0 rows"); + } else { + stream = open_memstream (&buf, &len); + if (stream == NULL) { + rpc->rpl_printf(ctx, "error opening stream"); + goto end; + } + dbt_print_table_header(tab, stream); + fflush (stream); + buf[len] = '\0'; + rpc->rpl_printf(ctx, "%s", buf); + rowp = tab->rows; + for(n=0; n < _r->n; n++) { + fseeko (stream, 0, SEEK_SET); + dbt_print_table_row_ex(tab, rowp, stream, 0); + fflush (stream); + buf[len] = '\0'; + rpc->rpl_printf(ctx, "%s", buf); + rowp = rowp->next; + } + fclose (stream); + free (buf); + rpc->rpl_printf(ctx, "\ntotal rows %d / %d", _r->n, tab->nrrows); + } + } else { + rpc->rpl_printf(ctx, "%d affected rows", ((dbt_con_p)con->tail)->affected); + } + + if(_r) + dbt_free_result(con, _r); + +end: + dbt_close(con); +} + +static rpc_export_t rpc_methods[] = { + {"db_text.dump", rpc_dump, rpc_dump_doc, 0}, + {"db_text.query", rpc_query, rpc_query_doc, 0}, + {0, 0, 0, 0} +};

7 years, 9 months

git:master:bc98193e: db_text : split db_print routines

by Luis Azedo

Module: kamailio Branch: master Commit: bc98193e9d2c553d6ae5c54203dc89aa2eee19fc URL: https://github.com/kamailio/kamailio/commit/bc98193e9d2c553d6ae5c54203dc89a… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-03T17:36:36Z db_text : split db_print routines allows fine grained usage --- Modified: src/modules/db_text/dbt_file.c Modified: src/modules/db_text/dbt_lib.h --- Diff: https://github.com/kamailio/kamailio/commit/bc98193e9d2c553d6ae5c54203dc89a… Patch: https://github.com/kamailio/kamailio/commit/bc98193e9d2c553d6ae5c54203dc89a…

7 years, 9 months

git:master:d3bf6422: db_text : less intrusive log

by Luis Azedo

Module: kamailio Branch: master Commit: d3bf6422c004c723a626cae569710b909e8b5315 URL: https://github.com/kamailio/kamailio/commit/d3bf6422c004c723a626cae569710b9… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-03T17:35:22Z db_text : less intrusive log --- Modified: src/modules/db_text/dbt_base.c Modified: src/modules/db_text/dbt_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/d3bf6422c004c723a626cae569710b9… Patch: https://github.com/kamailio/kamailio/commit/d3bf6422c004c723a626cae569710b9… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 425d351..860d16e 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -89,7 +89,6 @@ db1_con_t* dbt_init(const str* _sqlurl) memset(_res, 0, sizeof(db1_con_t) + sizeof(dbt_con_t)); _res->tail = (unsigned long)((char*)_res+sizeof(db1_con_t)); - LM_INFO("using database at: %.*s\n", _s.len, _s.s); DBT_CON_CONNECTION(_res) = dbt_cache_get_db(&_s); if (!DBT_CON_CONNECTION(_res)) { diff --git a/src/modules/db_text/dbt_lib.c b/src/modules/db_text/dbt_lib.c index 8177ebd..3a1ec79 100644 --- a/src/modules/db_text/dbt_lib.c +++ b/src/modules/db_text/dbt_lib.c @@ -143,7 +143,7 @@ dbt_cache_p dbt_cache_get_db(str *_s) LM_ERR("database [%.*s] does not exists!\n", _s->len, _s->s); goto done; } - LM_DBG("new db!\n"); + LM_INFO("using database at: %.*s\n", _s->len, _s->s); _dcache = (dbt_cache_p)shm_malloc(sizeof(dbt_cache_t)); if(!_dcache)

7 years, 9 months

git:master:856518ab: db_text : fix memory allocation

by Luis Azedo

Module: kamailio Branch: master Commit: 856518ab2d31659be606f8ef607ea061eec079f4 URL: https://github.com/kamailio/kamailio/commit/856518ab2d31659be606f8ef607ea06… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-03T17:34:38Z db_text : fix memory allocation --- Modified: src/modules/db_text/dbt_raw_query.c --- Diff: https://github.com/kamailio/kamailio/commit/856518ab2d31659be606f8ef607ea06… Patch: https://github.com/kamailio/kamailio/commit/856518ab2d31659be606f8ef607ea06… --- diff --git a/src/modules/db_text/dbt_raw_query.c b/src/modules/db_text/dbt_raw_query.c index 82078b8..cda4a38 100644 --- a/src/modules/db_text/dbt_raw_query.c +++ b/src/modules/db_text/dbt_raw_query.c @@ -89,8 +89,8 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_trim(table_ptr); table.s = table_ptr; - table.len = len; - LM_DBG("using table '%.*s'\n", table.len, table.s); + table.len = strlen(table_ptr); + LM_DBG("using table '%.*s'\n", table.len, table.s); if(dbt_use_table(_h, &table) != 0) { LM_ERR("use table is invalid %.*s\n", table.len, table.s); @@ -117,15 +117,22 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) 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; + result_cols[n] = pkg_malloc(sizeof(str)); + result_cols[n]->len = _tbc->colv[n]->name.len; + result_cols[n]->s = pkg_malloc((_tbc->colv[n]->name.len + 1) * sizeof(char)); + strncpy(result_cols[n]->s, _tbc->colv[n]->name.s, _tbc->colv[n]->name.len); + result_cols[n]->s[_tbc->colv[n]->name.len] = '\0'; } } else { cols = ncols; result_cols = pkg_malloc(sizeof(db_key_t) * cols); memset(result_cols, 0, sizeof(db_key_t) * cols); for(n=0; *(tokens + n); n++) { - result_cols[n]->s = *(tokens + n); + result_cols[n] = pkg_malloc(sizeof(str)); result_cols[n]->len = strlen(*(tokens + n)); + result_cols[n]->s = pkg_malloc((strlen(*(tokens + n)) + 1) * sizeof(char)); + strncpy(result_cols[n]->s, *(tokens + n), strlen(*(tokens + n))); + result_cols[n]->s[strlen(*(tokens + n))] = '\0'; } } @@ -159,6 +166,10 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_clean_where(nc, _k, _op, _v); if(result_cols) { + for(n=0; n < cols; n++) { + pkg_free(result_cols[n]->s); + pkg_free(result_cols[n]); + } pkg_free(result_cols); } @@ -200,9 +211,14 @@ int dbt_raw_query_update(db1_con_t* _h, str* _s, db1_res_t** _r) table_ptr[len] = '\0'; dbt_trim(table_ptr); table.s = table_ptr; - table.len = len; + table.len = strlen(table_ptr); where_ptr = strcasestr(_s->s, " where "); + if(where_ptr == NULL) { + LM_ERR("specify where clause to determine keys\n"); + goto error; + } + fields_end_ptr = where_ptr; len = fields_end_ptr - ( fields_start_ptr + 4) + 1; fields_ptr = pkg_malloc(len); @@ -216,11 +232,6 @@ int dbt_raw_query_update(db1_con_t* _h, str* _s, db1_res_t** _r) goto error; } - - if(where_ptr == NULL) { - LM_ERR("specify where clause to determine keys\n"); - goto error; - } nkeys = dbt_build_where(where_ptr + 7, &_k, &_op1, &_kv); if(nkeys < 1) { LM_ERR("needsa at least one key\n"); @@ -383,9 +394,14 @@ int dbt_raw_query_replace(db1_con_t* _h, str* _s, db1_res_t** _r) table_ptr[len] = '\0'; dbt_trim(table_ptr); table.s = table_ptr; - table.len = len; + table.len = strlen(table_ptr); where_ptr = strcasestr(_s->s, " where "); + if(where_ptr == NULL) { + LM_ERR("specify where clause to determine keys\n"); + goto error; + } + fields_end_ptr = where_ptr; len = fields_end_ptr - ( fields_start_ptr + 4) + 1; fields_ptr = pkg_malloc(len); @@ -399,11 +415,6 @@ int dbt_raw_query_replace(db1_con_t* _h, str* _s, db1_res_t** _r) goto error; } - - if(where_ptr == NULL) { - LM_ERR("specify where clause to determine keys\n"); - goto error; - } nkeys = dbt_build_where(where_ptr + 7, &_k, &_op1, &_kv); if(nkeys < 1) { LM_ERR("needsa at least one key\n"); @@ -492,6 +503,7 @@ int dbt_raw_query(db1_con_t* _h, str* _s, db1_res_t** _r) return res; } + ((dbt_con_p)_h->tail)->affected = 0; dbt_trim(_s->s); _s->len = strlen(_s->s);

7 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017