sr-dev May 2011

sr-dev@lists.kamailio.org

28 participants
167 discussions

git:tteras/db_sqlite: db_sqlite(k): add docbook docs
by Timo Teras 26 May '11

26 May '11

Module: sip-router Branch: tteras/db_sqlite Commit: f5d5348c0fd5a1b1bd204ef4bd34238c171ae047 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5d5348… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu May 26 13:07:10 2011 +0300 db_sqlite(k): add docbook docs --- modules_k/db_sqlite/README | 6 +-- modules_k/db_sqlite/doc/Makefile | 4 ++ modules_k/db_sqlite/doc/db_sqlite.xml | 45 +++++++++++++++ modules_k/db_sqlite/doc/db_sqlite_admin.xml | 78 +++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 4 deletions(-) diff --git a/modules_k/db_sqlite/README b/modules_k/db_sqlite/README index a19b2a6..2679f99 100644 --- a/modules_k/db_sqlite/README +++ b/modules_k/db_sqlite/README @@ -22,7 +22,6 @@ Timo Teräs 2.2. External Libraries or Applications 3. Exported Parameters - 4. Exported Functions Chapter 1. Admin Guide @@ -36,13 +35,12 @@ Chapter 1. Admin Guide 2.2. External Libraries or Applications 3. Exported Parameters - 4. Exported Functions 1. Overview - The module is an implementation of the internal DB API v1 connector - for SQlite 3 file. + The module is an implementation of the internal DB API v1 connector for + SQlite 3 file. 2. Dependencies diff --git a/modules_k/db_sqlite/doc/Makefile b/modules_k/db_sqlite/doc/Makefile new file mode 100644 index 0000000..e32e35e --- /dev/null +++ b/modules_k/db_sqlite/doc/Makefile @@ -0,0 +1,4 @@ +docs = db_sqlite.xml + +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules_k/db_sqlite/doc/db_sqlite.xml b/modules_k/db_sqlite/doc/db_sqlite.xml new file mode 100644 index 0000000..de1c53d --- /dev/null +++ b/modules_k/db_sqlite/doc/db_sqlite.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="http://www.w3.org/2001/XInclude"> + <bookinfo> + <title>SQlite Module</title> + <productname class="trade">&kamailioname;</productname> + <authorgroup> + <author> + <firstname>Timo</firstname> + <surname>Ter�s</surname> + <address> + <email>timo.teras(a)iki.fi</email> + </address> + </author> + <editor> + <firstname>Timo</firstname> + <surname>Ter�s</surname> + <address> + <email>timo.teras(a)iki.fi</email> + </address> + </editor> + </authorgroup> + <copyright> + <year>2011</year> + <holder>Timo Ter�s</holder> + </copyright> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </bookinfo> + <toc></toc> + + <xi:include href="db_sqlite_admin.xml"/> +</book> diff --git a/modules_k/db_sqlite/doc/db_sqlite_admin.xml b/modules_k/db_sqlite/doc/db_sqlite_admin.xml new file mode 100644 index 0000000..f60b799 --- /dev/null +++ b/modules_k/db_sqlite/doc/db_sqlite_admin.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + + + +<chapter> + <title>&adminguide;</title> + + <section> + <title>Overview</title> + <para>The module is an implementation of the internal DB API v1 connector + for SQlite 3 file.</para> + </section> + <section> + <title>Dependencies</title> + <section> + <title>&kamailio; Modules</title> + <para> + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>No dependencies on other &kamailio; modules</emphasis>. + </para> + </listitem> + </itemizedlist> + </para> + </section> + <section> + <title>External Libraries or Applications</title> + <para> + The following libraries or applications must be installed before running + &kamailio; with this module loaded: + <itemizedlist> + <listitem> + <para> + <emphasis>SQlite 3 library</emphasis> - e.g., libsqlite3-0 + </para> + </listitem> + <listitem> + <para> + <emphasis>SQlite 3 devel library</emphasis> - to compile + the module e.g. libsqlite3-dev + </para> + </listitem> + <listitem> + <para> + <emphasis>SQlite 3 utilities</emphasis> - for kamdbctl + e.g. sqlite3 + </para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + + <section> + <title>Exported Parameters</title> + <para> + NONE + </para> + </section> + + <section> + <title>Exported Functions</title> + <para> + NONE + </para> + </section> +</chapter> +

1 0

preparing v3.1.4
by Daniel-Constantin Mierla 26 May '11

26 May '11

Later today I will package v3.1.4, so if you have something to commit in branch 3.1, please do it before 15:00GMT. Thanks, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

1 0

git:tteras/db_sqlite: utils: add sqlite support to kamctl/kamdbctl
by Timo Teras 26 May '11

26 May '11

Module: sip-router Branch: tteras/db_sqlite Commit: 9d36d8537b21b2d1cd51dd639ad8c1b802af2672 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d36d85… Author: Natanael Copa <ncopa(a)alpinelinux.org> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu May 26 07:18:44 2011 +0000 utils: add sqlite support to kamctl/kamdbctl - sql scripts copied from postgres versions and converted to sqlite (only major change was: sed s/SERIAL/INTEGER/) - kamdbctl.sqlite based on kamdbctl.postgres with permissions stuff removed (sqlite has unix file permissions only) and some mysql emulation removed too - no real ro-mode --- utils/kamctl/kamctl | 6 + utils/kamctl/kamctl.sqlite | 51 +++++++++ utils/kamctl/kamctlrc | 6 +- utils/kamctl/kamdbctl | 13 ++ utils/kamctl/kamdbctl.sqlite | 152 ++++++++++++++++++++++++++ utils/kamctl/sqlite/acc-create.sql | 28 +++++ utils/kamctl/sqlite/alias_db-create.sql | 12 ++ utils/kamctl/sqlite/auth_db-create.sql | 15 +++ utils/kamctl/sqlite/avpops-create.sql | 15 +++ utils/kamctl/sqlite/carrierroute-create.sql | 42 +++++++ utils/kamctl/sqlite/cpl-create.sql | 10 ++ utils/kamctl/sqlite/dialog-create.sql | 29 +++++ utils/kamctl/sqlite/dialplan-create.sql | 13 ++ utils/kamctl/sqlite/dispatcher-create.sql | 11 ++ utils/kamctl/sqlite/domain-create.sql | 8 ++ utils/kamctl/sqlite/domainpolicy-create.sql | 13 ++ utils/kamctl/sqlite/drouting-create.sql | 39 +++++++ utils/kamctl/sqlite/group-create.sql | 19 +++ utils/kamctl/sqlite/htable-create.sql | 9 ++ utils/kamctl/sqlite/imc-create.sql | 19 +++ utils/kamctl/sqlite/lcr-create.sql | 43 +++++++ utils/kamctl/sqlite/matrix-create.sql | 9 ++ utils/kamctl/sqlite/msilo-create.sql | 16 +++ utils/kamctl/sqlite/mtree-create.sql | 8 ++ utils/kamctl/sqlite/pdt-create.sql | 9 ++ utils/kamctl/sqlite/permissions-create.sql | 21 ++++ utils/kamctl/sqlite/presence-create.sql | 92 ++++++++++++++++ utils/kamctl/sqlite/purple-create.sql | 9 ++ utils/kamctl/sqlite/registrar-create.sql | 22 ++++ utils/kamctl/sqlite/rls-create.sql | 42 +++++++ utils/kamctl/sqlite/siptrace-create.sql | 20 ++++ utils/kamctl/sqlite/speeddial-create.sql | 14 +++ utils/kamctl/sqlite/standard-create.sql | 5 + utils/kamctl/sqlite/uac-create.sql | 16 +++ utils/kamctl/sqlite/uri_db-create.sql | 10 ++ utils/kamctl/sqlite/userblacklist-create.sql | 21 ++++ utils/kamctl/sqlite/usrloc-create.sql | 22 ++++ 37 files changed, 887 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9d3…

2 2

git:tteras/db_sqlite: db_sqlite(k): add README
by Timo Teras 26 May '11

26 May '11

Module: sip-router Branch: tteras/db_sqlite Commit: 78e9801b3fd167d7b548cbe7d0bf8b7b2e45201f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78e9801… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu May 26 11:36:17 2011 +0300 db_sqlite(k): add README With information about author and module dependencies. --- modules_k/db_sqlite/README | 71 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/modules_k/db_sqlite/README b/modules_k/db_sqlite/README new file mode 100644 index 0000000..a19b2a6 --- /dev/null +++ b/modules_k/db_sqlite/README @@ -0,0 +1,71 @@ +SQlite Module + +Timo Teräs + +Edited by + +Timo Teräs + + Copyright © 2011 Timo Teräs + Revision History + Revision $Revision$ $Date$ + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 4. Exported Functions + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 4. Exported Functions + +1. Overview + + The module is an implementation of the internal DB API v1 connector + for SQlite 3 file. + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The following modules must be loaded before this module: + * No dependencies on other Kamailio modules. + +2.2. External Libraries or Applications + + The following libraries or applications must be installed before + running Kamailio with this module loaded: + * SQlite 3 library - e.g., libsqlite3-0 + * SQlite 3 devel library - to compile the module e.g. libsqlite3-dev + * SQlite 3 utilities - for kamdbctl e.g. sqlite3 + +3. Exported Parameters + + NONE + +4. Exported Functions + + NONE

2 1

git:3.1: htable: adjust item array size
by Juha Heinanen 26 May '11

26 May '11

Module: sip-router Branch: 3.1 Commit: ec3f4706b500771aef14e49d1a9ea3a2cdef2be1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec3f470… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu May 26 07:09:14 2011 +0200 htable: adjust item array size - it was 1 too much, reported by Juha Heinanen (cherry picked from commit 6987c52c42e8df6a08d54e155ee868b8b9eb523b) --- modules_k/htable/ht_db.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 729bed3..1c6b566 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -201,7 +201,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) ht_array_size_suffix.s); hname.s = ht_name_buf; hname.len = strlen(ht_name_buf); - val.n = n+1; + val.n = n; if(ht_set_cell(ht, &hname, 0, &val, mode)) { @@ -262,7 +262,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) ht_array_size_suffix.s); hname.s = ht_name_buf; hname.len = strlen(ht_name_buf); - val.n = n+1; + val.n = n; if(ht_set_cell(ht, &hname, 0, &val, mode)) { LM_ERR("error adding array size to hash table.\n");

1 0

git:3.1: htable: set the size of item arrays
by Juha Heinanen 26 May '11

26 May '11

Module: sip-router Branch: 3.1 Commit: f98d523cc7034c6c69e305cdbb3370693df0b1e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f98d523… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed May 25 21:59:14 2011 +0200 htable: set the size of item arrays - it was not computed properly, reported by Juha Henanen (cherry picked from commit 01e7be75f2643fec6a6ac6ab6614ce65421f8bf3) --- modules_k/htable/ht_db.c | 66 ++++++++++++++++----------------------------- 1 files changed, 24 insertions(+), 42 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 82495e1..729bed3 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -108,7 +108,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) { db_key_t db_cols[4] = {&ht_db_name_column, &ht_db_ktype_column, &ht_db_vtype_column, &ht_db_value_column}; - db_key_t db_ord = &ht_db_ktype_column; + db_key_t db_ord = &ht_db_name_column; db1_res_t* db_res = NULL; str kname; str pname; @@ -189,60 +189,42 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } kname.len = strlen(kname.s); ktype = RES_ROWS(db_res)[i].values[1].val.int_val; - if(ktype==0 && last_ktype==1) + if(last_ktype==1) { - snprintf(ht_name_buf, HT_NAME_BUF_SIZE, "%.*s%.*s", - pname.len, pname.s, ht_array_size_suffix.len, - ht_array_size_suffix.s); - hname.s = ht_name_buf; - hname.len = strlen(ht_name_buf); - val.n = n+1; - - if(ht_set_cell(ht, &hname, 0, &val, mode)) + if(pname.len>0 + && (pname.len!=kname.len + || strncmp(pname.s, kname.s, pname.len)!=0)) { - LM_ERR("error adding array size to hash table.\n"); - goto error; + /* new key name, last was an array => add its size */ + snprintf(ht_name_buf, HT_NAME_BUF_SIZE, "%.*s%.*s", + pname.len, pname.s, ht_array_size_suffix.len, + ht_array_size_suffix.s); + hname.s = ht_name_buf; + hname.len = strlen(ht_name_buf); + val.n = n+1; + + if(ht_set_cell(ht, &hname, 0, &val, mode)) + { + LM_ERR("error adding array size to hash table.\n"); + goto error; + } + pname.len = 0; + pname.s = ""; + n = 0; } - pname.len = 0; - pname.s = ""; - n = 0; } + last_ktype = ktype; + pname = kname; if(ktype==1) { - if(pname.len!=kname.len - || strncmp(pname.s, kname.s, pname.len)) - { - /* add count */ - if(pname.len > 0) - { - /* perhaps some opt can be done here */ - snprintf(ht_name_buf, HT_NAME_BUF_SIZE, "%.*s%.*s", - pname.len, pname.s, ht_array_size_suffix.len, - ht_array_size_suffix.s); - hname.s = ht_name_buf; - hname.len = strlen(ht_name_buf); - val.n = n+1; - - if(ht_set_cell(ht, &hname, 0, &val, mode)) - { - LM_ERR("error adding array size to hash table\n"); - goto error; - } - } - /* reset */ - pname = kname; - n=0; - } else { - n++; - } snprintf(ht_name_buf, HT_NAME_BUF_SIZE, "%.*s[%d]", kname.len, kname.s, n); hname.s = ht_name_buf; hname.len = strlen(ht_name_buf); + n++; } else { hname = kname; } - last_ktype = ktype; vtype = RES_ROWS(db_res)[i].values[2].val.int_val; kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); if(kvalue.s==NULL) {

1 0

Re: [sr-dev] [SR-Users] htable ::size has wrong value
by Juha Heinanen 26 May '11

26 May '11

daniel, i moved this to sr-dev list. when i read ht_db_load_table() code, i start to get impression that it assumes that the records are also ordered by key_name, which is not the case in the query. -- juha

2 10

git:master: htable: adjust item array size
by Daniel-Constantin Mierla 26 May '11

26 May '11

Module: sip-router Branch: master Commit: 6987c52c42e8df6a08d54e155ee868b8b9eb523b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6987c52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 26 07:09:14 2011 +0200 htable: adjust item array size - it was 1 too much, reported by Juha Heinanen --- modules_k/htable/ht_db.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 45a11d1..66402fe 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -217,7 +217,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) ht_array_size_suffix.s); hname.s = ht_name_buf; hname.len = strlen(ht_name_buf); - val.n = n+1; + val.n = n; if(ht_set_cell(ht, &hname, 0, &val, mode)) { @@ -278,7 +278,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) ht_array_size_suffix.s); hname.s = ht_name_buf; hname.len = strlen(ht_name_buf); - val.n = n+1; + val.n = n; if(ht_set_cell(ht, &hname, 0, &val, mode)) { LM_ERR("error adding array size to hash table.\n");

1 0

git:master: kamailio.cfg: added two new define options
by Daniel-Constantin Mierla 25 May '11

25 May '11

Module: sip-router Branch: master Commit: 023381eb3eb199eeaa40e59197264977409b5534 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=023381e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 25 23:44:22 2011 +0200 kamailio.cfg: added two new define options - WITH_BLOCK3XX - block 3xx replies - WITH_VOICEMAIL - redirect call to voicemail server on not found, busy or no answer --- etc/kamailio.cfg | 81 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 62 insertions(+), 19 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index decfd0f..7a545db 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -68,6 +68,14 @@ # block if more than 16 requests in 2 seconds and ban for 300 seconds) # - define WITH_ANTIFLOOD # +# *** To block 3XX redirect replies execute: +# - define WITH_BLOCK3XX +# +# *** To enable VoiceMail routing execute: +# - define WITH_VOICEMAIL +# - set the value of voicemail.srv_ip +# - adjust the value of voicemail.srv_port +# # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB @@ -170,6 +178,13 @@ enable_tls=yes pstn.gw_ip = "" desc "PSTN GW Address" #!endif +#!ifdef WITH_VOICEMAIL +# VoiceMail Routing on offline, busy or no answer +# +# - by default Voicemail server IP is empty to avoid misrouting +voicemail.srv_ip = "" desc "VoiceMail IP Address" +voicemail.srv_port = "5060" desc "VoiceMail Port" +#!endif ####### Modules Section ######## @@ -586,15 +601,18 @@ route[LOCATION] { alias_db_lookup("dbaliases"); #!endif + $avp(oexten) = $rU; if (!lookup("location")) { - switch ($rc) { + $var(rc) = $rc; + route(TOVOICEMAIL); + t_newtran(); + switch ($var(rc)) { case -1: case -3: - t_newtran(); - t_reply("404", "Not Found"); + send_reply("404", "Not Found"); exit; case -2: - sl_send_reply("405", "Method Not Allowed"); + send_reply("405", "Method Not Allowed"); exit; } } @@ -784,8 +802,7 @@ route[PSTN] { # XMLRPC routing #!ifdef WITH_XMLRPC -route[XMLRPC] -{ +route[XMLRPC] { # allow XMLRPC from localhost if ((method=="POST" || method=="GET") && (src_ip==127.0.0.1)) { @@ -802,6 +819,29 @@ route[XMLRPC] } #!endif +# route to voicemail server +route[TOVOICEMAIL] { +#!ifdef WITH_VOICEMAIL + if(!is_method("INVITE")) + return; + + # check if VoiceMail server IP is defined + if (strempty($sel(cfg_get.voicemail.srv_ip))) { + xlog("SCRIPT: VoiceMail rotuing enabled but IP not defined\n"); + return; + } + if($avp(oexten)==$null) + return; + + $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + + $sel(cfg_get.voicemail.srv_port); + route(RELAY); + exit; +#!endif + + return; +} + # Sample branch router branch_route[BRANCH_ONE] { xdbg("new branch at $ru\n"); @@ -834,17 +874,20 @@ failure_route[FAIL_ONE] { exit; } - # uncomment the following lines if you want to block client - # redirect based on 3xx replies. - ##if (t_check_status("3[0-9][0-9]")) { - ## t_reply("404","Not found"); - ## exit; - ##} - - # uncomment the following lines if you want to redirect the failed - # calls to a different new destination - ##if (t_check_status("486|408")) { - ## sethostport("192.168.2.100:5060"); - ## t_relay(); - ##} +#!ifdef WITH_BLOCK3XX + # block call redirect based on 3xx replies. + if (t_check_status("3[0-9][0-9]")) { + t_reply("404","Not found"); + exit; + } +#!endif + +#!ifdef WITH_VOICEMAIL + # serial forking + # - route to voicemail on busy or no answer (timeout) + if (t_check_status("486|408")) { + route(TOVOICEMAIL); + exit; + } +#!endif }

1 0

git:master: htable: set the size of item arrays
by Daniel-Constantin Mierla 25 May '11

25 May '11

Module: sip-router Branch: master Commit: 01e7be75f2643fec6a6ac6ab6614ce65421f8bf3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01e7be7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 25 21:59:14 2011 +0200 htable: set the size of item arrays - it was not computed properly, reported by Juha Henanen --- modules_k/htable/ht_db.c | 66 ++++++++++++++++----------------------------- 1 files changed, 24 insertions(+), 42 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index 3808b51..45a11d1 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -124,7 +124,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) { db_key_t db_cols[4] = {&ht_db_name_column, &ht_db_ktype_column, &ht_db_vtype_column, &ht_db_value_column}; - db_key_t db_ord = &ht_db_ktype_column; + db_key_t db_ord = &ht_db_name_column; db1_res_t* db_res = NULL; str kname; str pname; @@ -205,60 +205,42 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } kname.len = strlen(kname.s); ktype = RES_ROWS(db_res)[i].values[1].val.int_val; - if(ktype==0 && last_ktype==1) + if(last_ktype==1) { - snprintf(ht_name_buf, HT_NAME_BUF_SIZE, "%.*s%.*s", - pname.len, pname.s, ht_array_size_suffix.len, - ht_array_size_suffix.s); - hname.s = ht_name_buf; - hname.len = strlen(ht_name_buf); - val.n = n+1; - - if(ht_set_cell(ht, &hname, 0, &val, mode)) + if(pname.len>0 + && (pname.len!=kname.len + || strncmp(pname.s, kname.s, pname.len)!=0)) { - LM_ERR("error adding array size to hash table.\n"); - goto error; + /* new key name, last was an array => add its size */ + snprintf(ht_name_buf, HT_NAME_BUF_SIZE, "%.*s%.*s", + pname.len, pname.s, ht_array_size_suffix.len, + ht_array_size_suffix.s); + hname.s = ht_name_buf; + hname.len = strlen(ht_name_buf); + val.n = n+1; + + if(ht_set_cell(ht, &hname, 0, &val, mode)) + { + LM_ERR("error adding array size to hash table.\n"); + goto error; + } + pname.len = 0; + pname.s = ""; + n = 0; } - pname.len = 0; - pname.s = ""; - n = 0; } + last_ktype = ktype; + pname = kname; if(ktype==1) { - if(pname.len!=kname.len - || strncmp(pname.s, kname.s, pname.len)) - { - /* add count */ - if(pname.len > 0) - { - /* perhaps some opt can be done here */ - snprintf(ht_name_buf, HT_NAME_BUF_SIZE, "%.*s%.*s", - pname.len, pname.s, ht_array_size_suffix.len, - ht_array_size_suffix.s); - hname.s = ht_name_buf; - hname.len = strlen(ht_name_buf); - val.n = n+1; - - if(ht_set_cell(ht, &hname, 0, &val, mode)) - { - LM_ERR("error adding array size to hash table\n"); - goto error; - } - } - /* reset */ - pname = kname; - n=0; - } else { - n++; - } snprintf(ht_name_buf, HT_NAME_BUF_SIZE, "%.*s[%d]", kname.len, kname.s, n); hname.s = ht_name_buf; hname.len = strlen(ht_name_buf); + n++; } else { hname = kname; } - last_ktype = ktype; vtype = RES_ROWS(db_res)[i].values[2].val.int_val; kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); if(kvalue.s==NULL) {

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2011