sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:janakj/postgres: - bugfix for (small) potential buffer overflow in BLOB escaping
by Jan Janak 18 Feb '09

18 Feb '09

Module: sip-router Branch: janakj/postgres Commit: 5bea0d904ef95a2813c10c7d77f1d1a03959f29d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bea0d9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Feb 11 14:40:27 2008 +0000 - bugfix for (small) potential buffer overflow in BLOB escaping git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3680 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_db_val.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/km_db_val.c b/modules/db_postgres/km_db_val.c index ee0e45c..c5b914b 100644 --- a/modules/db_postgres/km_db_val.c +++ b/modules/db_postgres/km_db_val.c @@ -263,6 +263,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* case DB_BLOB: l = VAL_BLOB(_v).len; + /* this estimation is not always correct, thus we need to check later again */ if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short for blob\n"); return -7; @@ -275,6 +276,10 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* LM_ERR("PQescapeBytea failed\n"); return -7; } + if (tmp_len > *_len) { + LM_ERR("escaped result too long\n"); + return -7; + } memcpy(_s, tmp_s, tmp_len); PQfreemem(tmp_s); tmp_len = strlen(_s);

1 0

git:janakj/postgres: - smaller optimization in postgres module
by Jan Janak 18 Feb '09

18 Feb '09

Module: sip-router Branch: janakj/postgres Commit: 51b3f28f8da399cac3931f34296c6f03d84ac303 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51b3f28… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 8 13:54:15 2008 +0000 - smaller optimization in postgres module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3667 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_db_res.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/modules/db_postgres/km_db_res.c b/modules/db_postgres/km_db_res.c index 43b1afb..7cdec54 100644 --- a/modules/db_postgres/km_db_res.c +++ b/modules/db_postgres/km_db_res.c @@ -181,7 +181,7 @@ int db_postgres_get_columns(const db_con_t* _h, db_res_t* _r) int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r, int row_start, int row_count) { - int row, cols, col; + int row, col; char **row_buf, *s; int len, fetch_count; @@ -215,16 +215,13 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r, int row_start, /* Save the number of rows in the current fetch */ RES_ROW_N(_r) = row_count; - /* Save the number of columns in the result query */ - cols = RES_COL_N(_r); - /* * Allocate an array of pointers one per column. It that will be used to hold * the address of the string representation of each column. */ - len = sizeof(char *) * cols; + len = sizeof(char *) * RES_COL_N(_r); row_buf = (char **)pkg_malloc(len); - LM_DBG("allocate for %d columns %d bytes in row buffer at %p\n", cols, len, row_buf); + LM_DBG("allocate for %d columns %d bytes in row buffer at %p\n", RES_COL_N(_r), len, row_buf); if (!row_buf) { LM_ERR("no private memory left\n"); return -1; @@ -244,7 +241,7 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r, int row_start, fetch_count = 0; for(row = row_start; row < (row_start + row_count); row++) { - for(col = 0; col < cols; col++) { + for(col = 0; col < RES_COL_N(_r); col++) { /* * The row data pointer returned by PQgetvalue points to storage * that is part of the PGresult structure. One should not modify @@ -274,7 +271,7 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r, int row_start, if(db_postgres_convert_row(_h, _r, &(RES_ROWS(_r)[fetch_count]), row_buf)<0){ LM_ERR("failed to convert row #%d\n", row); RES_ROW_N(_r) = row - row_start; - for (col=0; col<cols; col++) { + for (col = 0; col < RES_COL_N(_r); col++) { LM_DBG("freeing row_buf[%d] at %p\n", col, row_buf[col]); pkg_free(row_buf[col]); } @@ -301,7 +298,7 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r, int row_start, * that pg_free_rows(), pg_free_row() or pg_free_result() is eventually * called. */ - for (col=0; col<cols; col++) { + for (col = 0; col < RES_COL_N(_r); col++) { switch (RES_TYPES(_r)[col]) { case DB_STRING: case DB_STR: @@ -359,8 +356,7 @@ int db_postgres_convert_row(const db_con_t* _h, db_res_t* _r, db_row_t* _row, LM_ERR("no private memory left\n"); return -1; } - LM_DBG("allocate %d bytes for row values at %p\n", sizeof(db_val_t) * RES_COL_N(_r), - ROW_VALUES(_row)); + LM_DBG("allocate %d bytes for row values at %p\n", len, ROW_VALUES(_row)); ROW_N(_row) = RES_COL_N(_r); memset(ROW_VALUES(_row), 0, len);

1 0

git:janakj/postgres: - rename db_mod.* files
by Jan Janak 18 Feb '09

18 Feb '09

Module: sip-router Branch: janakj/postgres Commit: f8eb092e0e41f8c663bd880d188793f7f39f58f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8eb092… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 8 11:39:46 2008 +0000 - rename db_mod.* files - rename my_con.* files in db_unixodbc - fix includes in modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3666 689a6050-402a-0410-94f2-e92a70836424 --- .../db_postgres/{km_db_mod.c => km_db_postgres.c} | 0 modules/db_postgres/km_db_res.c | 117 ++++++++++---------- 2 files changed, 58 insertions(+), 59 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f8e…

1 0

git:janakj/postgres: further changes after the db name change
by Jan Janak 18 Feb '09

18 Feb '09

Module: sip-router Branch: janakj/postgres Commit: f170c790e6f03411d813d0ecad4b47384c194a38 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f170c79… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 15:46:09 2008 +0000 further changes after the db name change - update INSTALL file - fix Makefile skip modules variable - fix module Makefile, lib name - change db_bind_mod to add the db prefix in the function - change db url defines in db_berkeley and db_text - change database modules names in module struct - fix debian packaging - fix tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3642 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_Makefile | 2 +- modules/db_postgres/km_db_mod.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/km_Makefile b/modules/db_postgres/km_Makefile index 58c65ee..699f9be 100644 --- a/modules/db_postgres/km_Makefile +++ b/modules/db_postgres/km_Makefile @@ -4,7 +4,7 @@ include ../../Makefile.defs auto_gen= -NAME=postgres.so +NAME=db_postgres.so # set CROSS_COMPILE to true if you want to skip diff --git a/modules/db_postgres/km_db_mod.c b/modules/db_postgres/km_db_mod.c index fc2c6a6..8cb196b 100644 --- a/modules/db_postgres/km_db_mod.c +++ b/modules/db_postgres/km_db_mod.c @@ -58,7 +58,7 @@ static cmd_export_t cmds[]={ struct module_exports exports = { - "postgres", + "db_postgres", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, 0, /* module parameters */

1 0

git:janakj/postgres: - fix user documentation and rename all sgml file after the name change
by Jan Janak 18 Feb '09

18 Feb '09

Module: sip-router Branch: janakj/postgres Commit: 97d75df2b37ef3bdeff7945a8336d4f105de3f36 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97d75df… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 13:32:59 2008 +0000 - fix user documentation and rename all sgml file after the name change of the database modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3639 689a6050-402a-0410-94f2-e92a70836424 --- .../km_doc/{postgres.sgml => db_postgres.sgml} | 6 +++--- ...{postgres_devel.sgml => db_postgres_devel.sgml} | 0 .../{postgres_faq.sgml => db_postgres_faq.sgml} | 0 .../{postgres_user.sgml => db_postgres_user.sgml} | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_doc/postgres.sgml b/modules/db_postgres/km_doc/db_postgres.sgml similarity index 87% rename from modules/db_postgres/km_doc/postgres.sgml rename to modules/db_postgres/km_doc/db_postgres.sgml index 96b56ed..0db3261 100644 --- a/modules/db_postgres/km_doc/postgres.sgml +++ b/modules/db_postgres/km_doc/db_postgres.sgml @@ -1,9 +1,9 @@ <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [ -<!ENTITY user SYSTEM "postgres_user.sgml"> -<!ENTITY devel SYSTEM "postgres_devel.sgml"> -<!ENTITY faq SYSTEM "postgres_faq.sgml"> +<!ENTITY user SYSTEM "db_postgres_user.sgml"> +<!ENTITY devel SYSTEM "db_postgres_devel.sgml"> +<!ENTITY faq SYSTEM "db_postgres_faq.sgml">  <!ENTITY % docentities SYSTEM "../../../doc/entities.sgml"> diff --git a/modules/db_postgres/km_doc/postgres_devel.sgml b/modules/db_postgres/km_doc/db_postgres_devel.sgml similarity index 100% rename from modules/db_postgres/km_doc/postgres_devel.sgml rename to modules/db_postgres/km_doc/db_postgres_devel.sgml diff --git a/modules/db_postgres/km_doc/postgres_faq.sgml b/modules/db_postgres/km_doc/db_postgres_faq.sgml similarity index 100% rename from modules/db_postgres/km_doc/postgres_faq.sgml rename to modules/db_postgres/km_doc/db_postgres_faq.sgml diff --git a/modules/db_postgres/km_doc/postgres_user.sgml b/modules/db_postgres/km_doc/db_postgres_user.sgml similarity index 100% rename from modules/db_postgres/km_doc/postgres_user.sgml rename to modules/db_postgres/km_doc/db_postgres_user.sgml

1 0

git:janakj/postgres: - rename database modules to use the 'db_' prefix
by Jan Janak 18 Feb '09

18 Feb '09

Module: sip-router Branch: janakj/postgres Commit: 0761b7c23f73001b5969790eadf0604c8490eb1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0761b7c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 13:10:03 2008 +0000 - rename database modules to use the 'db_' prefix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3638 689a6050-402a-0410-94f2-e92a70836424 ---

1 0

git:master: Two small fixes in regular expressions.
by Jan Janak 18 Feb '09

18 Feb '09

Module: sip-router Branch: master Commit: 859fa59c08645100735b9653bd8dccd6a01d8c03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=859fa59… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 01:09:22 2009 +0100 Two small fixes in regular expressions. The fixes include: * db_con.h added to the regex matching header file names. * Fixed regexp matching db_con_t and db_res_t structures (previously did not match the two strings at the beginning of a line). --- scripts/kam_to_sr.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/kam_to_sr.sh b/scripts/kam_to_sr.sh index 330ee07..50e47f3 100755 --- a/scripts/kam_to_sr.sh +++ b/scripts/kam_to_sr.sh @@ -34,7 +34,7 @@ if ! egrep "Makefile\.modules" Makefile >/dev/null ; then exit 1 fi -if ! egrep '^#[ \t]*include[ \t]*".*\/db\/db(_(cap|id|key|op|pool|query|res|row|ut|val))?\.h[ \t]*"' *.[ch] >/dev/null ; then +if ! egrep '^#[ \t]*include[ \t]*".*\/db\/db(_(cap|con|id|key|op|pool|query|res|row|ut|val))?\.h[ \t]*"' *.[ch] >/dev/null ; then echo "The module does not seem to include old database headers..." exit 0 fi @@ -80,18 +80,18 @@ for file in *.[ch] ; do cp $file $file.backup cat $file.backup | gawk ' -/^#[ \t]*include[ \t]*".*\/db\/db(_(cap|id|key|op|pool|query|res|row|ut|val))?\.h[ \t]*"/ { +/^#[ \t]*include[ \t]*".*\/db\/db(_(cap|con|id|key|op|pool|query|res|row|ut|val))?\.h[ \t]*"/ { sub("/db/", "/lib/srdb1/", $0); } -/[^a-zA-Z0-9_](db_(con|res)_t|struct[ \t]+db_(con|res))[^a-zA-Z0-9_]/ { +/(^|[^a-zA-Z0-9_])(db_(con|res)_t|struct[ \t]+db_(con|res))([^a-zA-Z0-9_]|$)/ { gsub("struct[ \t]+db_con", "struct db1_con", $0); gsub("struct[ \t]+db_res", "struct db1_res", $0); gsub("db_con_t", "db1_con_t", $0); gsub("db_res_t", "db1_res_t", $0); } -/[^a-zA-Z0-9_]DB_((BIG)?INT|DOUBLE|STR(ING)?|DATETIME|BLOB|BITMAP)[^a-zA-Z0-9_]/ { +/(^|[^a-zA-Z0-9_])DB_((BIG)?INT|DOUBLE|STR(ING)?|DATETIME|BLOB|BITMAP)([^a-zA-Z0-9_]|$)/ { gsub("DB_INT", "DB1_INT", $0); gsub("DB_BIGINT", "DB1_BIGINT", $0); gsub("DB_DOUBLE", "DB1_DOUBLE", $0);

1 0

git:master: Fixed matching of db flags names at the beginning of line.
by Jan Janak 18 Feb '09

18 Feb '09

Module: sip-router Branch: master Commit: 7da6067ab0aba7dd3e755a0aa222fb2ea8721905 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7da6067… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 01:09:47 2009 +0100 Fixed matching of db flags names at the beginning of line. --- scripts/ser_to_sr.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/ser_to_sr.sh b/scripts/ser_to_sr.sh index 6826426..f8d5a90 100755 --- a/scripts/ser_to_sr.sh +++ b/scripts/ser_to_sr.sh @@ -84,7 +84,7 @@ for file in *.[ch] ; do sub("/db/", "/lib/srdb2/", $0); } -/[^a-zA-Z0-9_]DB_(LOAD_SER|DISABLED|CANON|IS_(TO|FROM)|FOR_SERWEB|PENDING|((CALLER|CALLEE)_)?DELETED|MULTIVALUE|FILL_ON_REG|REQUIRED|DIR)[^a-zA-Z0-9_]/ { +/(^|[^a-zA-Z0-9_])DB_(LOAD_SER|DISABLED|CANON|IS_(TO|FROM)|FOR_SERWEB|PENDING|((CALLER|CALLEE)_)?DELETED|MULTIVALUE|FILL_ON_REG|REQUIRED|DIR)([^a-zA-Z0-9_]|$)/ { gsub("DB_LOAD_SER", "SRDB_LOAD_SER", $0); gsub("DB_DISABLED", "SRDB_DISABLED", $0); gsub("DB_CANON", "SRDB_CANON", $0);

1 0

Module conversion scripts
by Jan Janak 17 Feb '09

17 Feb '09

Hello Everybody, The master branch now contains two new scripts in scripts subdirectory: * ser_to_sr.sh: This script can be used to convert ser modules for use with sip-router core. * kam_to_sr.sh: This script can be used to convert kamailio modules for use with sip-router core. Run one of the scripts in module directory to convert a module. Both scripts do all necessary database related changes, but I cannot guarantee that the converted module will work or even compile. In most cases you will probably have to do some extra changes to make the module compile, but at least you don't have to deal with the bulk of database related changes :-). Jan.

2 2

Both database interfaces integrated
by Jan Janak 17 Feb '09

17 Feb '09

Hello, I am happy to announce that I just managed to run sip-router with both versions of the database interface, single db_mysql merged from both projects and modules from both ser and kamailio at the same time. I loaded sqlops (kamailio) and avp_db (ser) modules and tried to use them from the same script and they both worked, using libsr1 and libsr2 respectively. Both modules used single db_mysql. Here is a very simple configuration file which demonstrates how modules from both projects can be used together: ------------------- loadmodule "./modules/db_mysql/db_mysql.so" loadmodule "./modules/domain/domain.so" loadmodule "./modules/avp_db/avp_db.so" loadmodule "./modules/sqlops/sqlops.so" loadmodule "./modules/xlog/xlog.so" loadmodule "./modules/avp/avp.so" modparam("domain|avp_db", "db_url", "db_mysql://ser:heslo@localhost/ser") modparam("sqlops","sqlcon","ca=>mysql://ser:heslo@localhost/ser") route { log(1, "ERR: Request received\n"); sql_query("ca", "select * from domain", "ra"); if($dbr(ra=>rows)>0) { log(1, "ERR:Some data found\n"); } else { log(1, "ERR:No data found\n"); } sql_result_free("ra"); load_attrs("$fu", "100"); if ($fu.test && ($fu.test == "abc")) { log(1, "ERR: Attribute loaded\n"); } else { log(1, "ERR: Attribute NOT loaded\n"); } dump_attrs(); } ------------- As the merged db_mysql module seems to work fine, I merged it from janakj/mysql into the master branch and I would like to encourage others to give it a spin. I am quite happy about the merge of db_mysql, we preserved histories from both projects, kamailio files are prefixed with km_ and it didn't that that many changes to make it work :-). I think this is the way to go for other database drivers as well. On the other hand porting kamailio modules to sip-router takes more tweaks than I expected. There are several subsystems which are not compatible (avps) and also kamailio seems to have more functions and data structures in the core, some of them are missing in the sip-router core. So expect more work when you try to port kamailio modules to sip-router. Jan.

3 4

← Newer
1
...
18
19
20
21
22
23
24
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009