sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

git:master:89642d3c: permissions: store src ip in zero terminated string for trusted table
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 89642d3cddd90ba3e3f6d310e239492634fa6405 URL: https://github.com/kamailio/kamailio/commit/89642d3cddd90ba3e3f6d310e239492… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-23T16:24:39+02:00 permissions: store src ip in zero terminated string for trusted table - it is printed as string via rpc, resulting in invalid chars in the output - reported by Emmanuel Schmidbauer, GH#137 --- Modified: modules/permissions/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/89642d3cddd90ba3e3f6d310e239492… Patch: https://github.com/kamailio/kamailio/commit/89642d3cddd90ba3e3f6d310e239492… --- diff --git a/modules/permissions/hash.c b/modules/permissions/hash.c index 200e2c1..7b11ebd 100644 --- a/modules/permissions/hash.c +++ b/modules/permissions/hash.c @@ -155,7 +155,7 @@ int hash_table_insert(struct trusted_list** table, char* src_ip, } np->src_ip.len = strlen(src_ip); - np->src_ip.s = (char *) shm_malloc(np->src_ip.len); + np->src_ip.s = (char *) shm_malloc(np->src_ip.len+1); if (np->src_ip.s == NULL) { LM_CRIT("cannot allocate shm memory for src_ip string\n"); @@ -164,6 +164,7 @@ int hash_table_insert(struct trusted_list** table, char* src_ip, } (void) strncpy(np->src_ip.s, src_ip, np->src_ip.len); + np->src_ip.s[np->src_ip.len] = 0; if (pattern) { np->pattern = (char *) shm_malloc(strlen(pattern)+1);

1 0

git:master:9c3b650b: modules/ims_regisrar_pcscf: added optinal extra parameter for lookup_transport
by jaybeepee 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 9c3b650b96272bc792e9e52963ce987b410227ae URL: https://github.com/kamailio/kamailio/commit/9c3b650b96272bc792e9e52963ce987… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-23T10:59:07+02:00 modules/ims_regisrar_pcscf: added optinal extra parameter for lookup_transport - allows avp,pv,etc to be used as URI in search for lookup_transport --- Modified: modules/ims_registrar_pcscf/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9c3b650b96272bc792e9e52963ce987… Patch: https://github.com/kamailio/kamailio/commit/9c3b650b96272bc792e9e52963ce987… --- diff --git a/modules/ims_registrar_pcscf/reg_mod.c b/modules/ims_registrar_pcscf/reg_mod.c index 8eede00..874dad0 100644 --- a/modules/ims_registrar_pcscf/reg_mod.c +++ b/modules/ims_registrar_pcscf/reg_mod.c @@ -122,6 +122,7 @@ static int w_lookup_transport(struct sip_msg* _m, char* _d, char* _uri); /*! \brief Fixup functions */ static int domain_fixup(void** param, int param_no); +static int domain_uri_fixup(void** param, int param_no); static int save_fixup2(void** param, int param_no); static int assert_identity_fixup(void ** param, int param_no); @@ -141,15 +142,16 @@ inline void pcscf_act_time() * Exported functions */ static cmd_export_t cmds[] = { - {"pcscf_save", (cmd_function)w_save, 1, save_fixup2, 0, ONREPLY_ROUTE }, - {"pcscf_save_pending", (cmd_function)w_save_pending, 1, save_fixup2, 0, REQUEST_ROUTE }, - {"pcscf_follows_service_routes",(cmd_function)w_follows_service_routes, 1, save_fixup2, 0, REQUEST_ROUTE }, - {"pcscf_force_service_routes", (cmd_function)w_force_service_routes, 1, save_fixup2, 0, REQUEST_ROUTE }, - {"pcscf_is_registered", (cmd_function)w_is_registered, 1, save_fixup2, 0, REQUEST_ROUTE|ONREPLY_ROUTE }, - {"pcscf_assert_identity", (cmd_function)w_assert_identity, 2, assert_identity_fixup, 0, REQUEST_ROUTE }, - {"pcscf_assert_called_identity",(cmd_function)w_assert_called_identity, 1, assert_identity_fixup, 0, ONREPLY_ROUTE }, - {"reginfo_handle_notify", (cmd_function)w_reginfo_handle_notify, 1, domain_fixup, 0, REQUEST_ROUTE}, - {"lookup_transport", (cmd_function)w_lookup_transport, 1, domain_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"pcscf_save", (cmd_function)w_save, 1, save_fixup2, 0,ONREPLY_ROUTE }, + {"pcscf_save_pending", (cmd_function)w_save_pending, 1, save_fixup2, 0,REQUEST_ROUTE }, + {"pcscf_follows_service_routes",(cmd_function)w_follows_service_routes, 1, save_fixup2, 0,REQUEST_ROUTE }, + {"pcscf_force_service_routes", (cmd_function)w_force_service_routes, 1, save_fixup2, 0,REQUEST_ROUTE }, + {"pcscf_is_registered", (cmd_function)w_is_registered, 1, save_fixup2, 0,REQUEST_ROUTE|ONREPLY_ROUTE }, + {"pcscf_assert_identity", (cmd_function)w_assert_identity, 2, assert_identity_fixup, 0,REQUEST_ROUTE }, + {"pcscf_assert_called_identity",(cmd_function)w_assert_called_identity, 1, assert_identity_fixup, 0,ONREPLY_ROUTE }, + {"reginfo_handle_notify", (cmd_function)w_reginfo_handle_notify, 1, domain_fixup, 0,REQUEST_ROUTE}, + {"lookup_transport", (cmd_function)w_lookup_transport, 1, domain_fixup, 0,REQUEST_ROUTE|FAILURE_ROUTE}, + {"lookup_transport", (cmd_function)w_lookup_transport, 2, domain_uri_fixup, 0,REQUEST_ROUTE|FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -360,6 +362,23 @@ static int domain_fixup(void** param, int param_no) return 0; } +static int domain_uri_fixup(void** param, int param_no) +{ + udomain_t* d; + + if (param_no == 1) { + if (ul.register_udomain((char*)*param, &d) < 0) { + LM_ERR("failed to register domain\n"); + return E_UNSPEC; + } + *param = (void*)d; + } else { + fixup_var_pve_12(param, param_no); + } + + return 0; +} + /*! \brief * Fixup for "save" function - both domain and flags */

1 0

git:master:32cbfb23: pkg/kamailio/deb: update debian version to 4.3.0-pre0
by Victor Seva 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 32cbfb23c4f4e40fe4deaf65e7b3f88de90712a5 URL: https://github.com/kamailio/kamailio/commit/32cbfb23c4f4e40fe4deaf65e7b3f88… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-23T09:59:25+02:00 pkg/kamailio/deb: update debian version to 4.3.0-pre0 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog --- Diff: https://github.com/kamailio/kamailio/commit/32cbfb23c4f4e40fe4deaf65e7b3f88… Patch: https://github.com/kamailio/kamailio/commit/32cbfb23c4f4e40fe4deaf65e7b3f88… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 757240c..3b0778f 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre0) unstable; urgency=medium + + * update version to 4.3.0-pre0 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 23 Apr 2015 09:58:06 +0200 + kamailio (4.3.0~dev5) unstable; urgency=medium * update version to 4.3.0~dev5 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 757240c..3b0778f 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre0) unstable; urgency=medium + + * update version to 4.3.0-pre0 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 23 Apr 2015 09:58:06 +0200 + kamailio (4.3.0~dev5) unstable; urgency=medium * update version to 4.3.0~dev5 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 757240c..3b0778f 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre0) unstable; urgency=medium + + * update version to 4.3.0-pre0 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 23 Apr 2015 09:58:06 +0200 + kamailio (4.3.0~dev5) unstable; urgency=medium * update version to 4.3.0~dev5 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 757240c..3b0778f 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre0) unstable; urgency=medium + + * update version to 4.3.0-pre0 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 23 Apr 2015 09:58:06 +0200 + kamailio (4.3.0~dev5) unstable; urgency=medium * update version to 4.3.0~dev5 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 757240c..3b0778f 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre0) unstable; urgency=medium + + * update version to 4.3.0-pre0 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 23 Apr 2015 09:58:06 +0200 + kamailio (4.3.0~dev5) unstable; urgency=medium * update version to 4.3.0~dev5 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 757240c..3b0778f 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.0-pre0) unstable; urgency=medium + + * update version to 4.3.0-pre0 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 23 Apr 2015 09:58:06 +0200 + kamailio (4.3.0~dev5) unstable; urgency=medium * update version to 4.3.0~dev5

1 0

Kamailio v4.3 - development frozen
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Hello, development (master) branch of Kamailio enters now in pre-release phase for version 4.3.0. Therefore, no new feature should be pushed to master until we create a dedicated branch for 4.3 (expected to be in about 4 weeks or so). If in doubt to push or not a commit to master, push it first on a personal branch (or attach to an email) and discuss it on sr-dev. The new modules can be a bit more dynamic if there is need to get them to the right shape (e.g., like decision to rename functions, parameters or adjust database structure). We hope to get many people involved in testing, to rich a stable state before releasing 4.3.0. If you want to get involved and need assistance, don't hesitate to write to mailing lists. Help with updating the wiki page for migration from 4.2 to 4.3 as well as what is new in 4.3 is very appreciated. I will post updates about the very soon. Many thanks to everyone involved in development of 4.3 and the early testers that played with master branch so far. 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 0

git:master:0d0e7fa2: Makefile.defs: version set to 4.3.0-pre0
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 0d0e7fa2d50caca5a4aa0a59a3ad64f4a98b5bdb URL: https://github.com/kamailio/kamailio/commit/0d0e7fa2d50caca5a4aa0a59a3ad64f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-23T09:55:06+02:00 Makefile.defs: version set to 4.3.0-pre0 - pre-release phase - testing period, no new features till branching 4.3 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0d0e7fa2d50caca5a4aa0a59a3ad64f… Patch: https://github.com/kamailio/kamailio/commit/0d0e7fa2d50caca5a4aa0a59a3ad64f… --- diff --git a/Makefile.defs b/Makefile.defs index fb5e41c..ef419d9 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

Kamailio crash
by Alex Balashov 23 Apr '15

23 Apr '15

Hello, I just got this crash: (gdb) where #0 0x00007fc3c1319625 in raise () from /lib64/libc.so.6 #1 0x00007fc3c131ae05 in abort () from /lib64/libc.so.6 #2 0x0000000000619d31 in fm_free (qm=0x7fc1b6ffa000, p=0x1e11a02400000000, file=0x7fc3bf8ebbfd "tm: h_table.c", func=0x7fc3bf8ebed8 "free_cell", line=162) at mem/f_malloc.c:588 #3 0x00007fc3bf8300a1 in free_cell (dead_cell=0x7fc1b71da540) at h_table.c:162 #4 0x00007fc3bf831705 in free_hash_table () at h_table.c:448 #5 0x00007fc3bf85577a in tm_shutdown () at t_funcs.c:123 #6 0x0000000000590d79 in destroy_modules () at sr_module.c:811 #7 0x000000000049bb43 in cleanup (show_status=1) at main.c:569 #8 0x000000000049d10b in shutdown_children (sig=15, show_status=1) at main.c:711 #9 0x000000000049f6e1 in handle_sigs () at main.c:802 #10 0x00000000004a6fbf in main_loop () at main.c:1757 #11 0x00000000004ab8bf in main (argc=11, argv=0x7fff1dbcda68) at main.c:2578 The fact that shutdown handlers were called makes me wonder if this is not so much a crash as a foreseen condition that I am not properly handling, like OOM. Can anyone shed any light? Thanks, -- Alex Balashov | Principal | Evariste Systems LLC 303 Perimeter Center North, Suite 300 Atlanta, GA 30346 United States Tel: +1-800-250-5920 (toll-free) / +1-678-954-0671 (direct) Web: http://www.evaristesys.com/, http://www.csrpswitch.com/

2 3

git:master:0d799c41: Merge pull request #135 from mikomarrache/patch-1
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 0d799c41291be74d23a5cbda39fac645f37903ac URL: https://github.com/kamailio/kamailio/commit/0d799c41291be74d23a5cbda39fac64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-23T09:38:16+02:00 Merge pull request #135 from mikomarrache/patch-1 db_mongodb: fix typo --- Modified: modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/0d799c41291be74d23a5cbda39fac64… Patch: https://github.com/kamailio/kamailio/commit/0d799c41291be74d23a5cbda39fac64… --- diff --git a/modules/db_mongodb/mongodb_dbase.c b/modules/db_mongodb/mongodb_dbase.c index 8dd0313..7f14f29 100644 --- a/modules/db_mongodb/mongodb_dbase.c +++ b/modules/db_mongodb/mongodb_dbase.c @@ -470,7 +470,7 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) * \param _r database result set * \return 0 on success, negative on failure */ -static int db_mongdob_convert_bson(const db1_con_t* _h, db1_res_t* _r, +static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, int _row, const bson_t *_rdoc) { static str dummy_string = {"", 0}; @@ -619,7 +619,7 @@ static int db_mongdob_convert_bson(const db1_con_t* _h, db1_res_t* _r, * \param _r database result set * \return 0 on success, negative on failure */ -static int db_mongdob_convert_result(const db1_con_t* _h, db1_res_t* _r) +static int db_mongodb_convert_result(const db1_con_t* _h, db1_res_t* _r) { int row; db_mongodb_result_t *mgres; @@ -671,7 +671,7 @@ static int db_mongdob_convert_result(const db1_con_t* _h, db1_res_t* _r) LM_DBG("selected document: %s\n", jstr); bson_free (jstr); } - if(db_mongdob_convert_bson(_h, _r, row, itdoc)) { + if(db_mongodb_convert_bson(_h, _r, row, itdoc)) { LM_ERR("failed to convert bson at pos %d\n", row); return -1; } @@ -739,7 +739,7 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) LM_ERR("failed to set the columns\n"); goto error; } - if(db_mongdob_convert_result(_h, *_r)<0) { + if(db_mongodb_convert_result(_h, *_r)<0) { LM_ERR("failed to set the rows in result\n"); goto error; }

1 0

git:master:aa87b852: db_mongodb: fix typo
by mikomarrache 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: aa87b852fbfd333f2073ac7390c3f3b6568e0024 URL: https://github.com/kamailio/kamailio/commit/aa87b852fbfd333f2073ac7390c3f3b… Author: mikomarrache <mikomarrache(a)users.noreply.github.com> Committer: mikomarrache <mikomarrache(a)users.noreply.github.com> Date: 2015-04-22T15:04:40+03:00 db_mongodb: fix typo --- Modified: modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/aa87b852fbfd333f2073ac7390c3f3b… Patch: https://github.com/kamailio/kamailio/commit/aa87b852fbfd333f2073ac7390c3f3b… --- diff --git a/modules/db_mongodb/mongodb_dbase.c b/modules/db_mongodb/mongodb_dbase.c index 8dd0313..7f14f29 100644 --- a/modules/db_mongodb/mongodb_dbase.c +++ b/modules/db_mongodb/mongodb_dbase.c @@ -470,7 +470,7 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) * \param _r database result set * \return 0 on success, negative on failure */ -static int db_mongdob_convert_bson(const db1_con_t* _h, db1_res_t* _r, +static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, int _row, const bson_t *_rdoc) { static str dummy_string = {"", 0}; @@ -619,7 +619,7 @@ static int db_mongdob_convert_bson(const db1_con_t* _h, db1_res_t* _r, * \param _r database result set * \return 0 on success, negative on failure */ -static int db_mongdob_convert_result(const db1_con_t* _h, db1_res_t* _r) +static int db_mongodb_convert_result(const db1_con_t* _h, db1_res_t* _r) { int row; db_mongodb_result_t *mgres; @@ -671,7 +671,7 @@ static int db_mongdob_convert_result(const db1_con_t* _h, db1_res_t* _r) LM_DBG("selected document: %s\n", jstr); bson_free (jstr); } - if(db_mongdob_convert_bson(_h, _r, row, itdoc)) { + if(db_mongodb_convert_bson(_h, _r, row, itdoc)) { LM_ERR("failed to convert bson at pos %d\n", row); return -1; } @@ -739,7 +739,7 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) LM_ERR("failed to set the columns\n"); goto error; } - if(db_mongdob_convert_result(_h, *_r)<0) { + if(db_mongodb_convert_result(_h, *_r)<0) { LM_ERR("failed to set the rows in result\n"); goto error; }

1 0

[kamailio] db_mongodb: fix typo (#135)
by mikomarrache 23 Apr '15

23 Apr '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/135 -- Commit Summary -- * db_mongodb: fix typo -- File Changes -- M modules/db_mongodb/mongodb_dbase.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/135.patch https://github.com/kamailio/kamailio/pull/135.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/135

3 2

git:master:6ef943d5: Merge pull request #136 from lazedo/db_text_simple_raw
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 6ef943d5ee1376527e7ce173c1bba0fcf1dd4e90 URL: https://github.com/kamailio/kamailio/commit/6ef943d5ee1376527e7ce173c1bba0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-23T09:37:24+02:00 Merge pull request #136 from lazedo/db_text_simple_raw 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/6ef943d5ee1376527e7ce173c1bba0f… Patch: https://github.com/kamailio/kamailio/commit/6ef943d5ee1376527e7ce173c1bba0f… --- 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

← Newer
1
...
4
5
6
7
8
9
10
...
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