sr-dev

sr-dev@lists.kamailio.org

17 participants
44129 discussions

git:janakj/postgres: - local free_query renamed to free_result to be coherent with the DB API

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: a22a469492369e1bbb48b8d2bf8129e5f7556ac5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a22a469… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 5 16:57:40 2008 +0000 - local free_query renamed to free_result to be coherent with the DB API git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3855 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_db_postgres.c | 2 +- modules/db_postgres/km_dbase.c | 4 ++-- modules/db_postgres/km_dbase.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index 06766a7..7d1f3a5 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -86,7 +86,7 @@ int db_postgres_bind_api(db_func_t *dbb) dbb->query = db_postgres_query; dbb->fetch_result = db_postgres_fetch_result; dbb->raw_query = db_postgres_raw_query; - dbb->free_result = db_postgres_free_query; + dbb->free_result = db_postgres_free_result; dbb->insert = db_postgres_insert; dbb->delete = db_postgres_delete; dbb->update = db_postgres_update; diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 525f405..ff6b297 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -308,7 +308,7 @@ static int free_query(const db_con_t* _con) } /* -** db_free_query free the query and free the result memory +** db_free_result free the query and free the result memory ** ** Arguments : ** db_con_t * as previously supplied by pg_init() @@ -319,7 +319,7 @@ static int free_query(const db_con_t* _con) ** negative number upon failure */ -int db_postgres_free_query(db_con_t* _con, db_res_t* _r) +int db_postgres_free_result(db_con_t* _con, db_res_t* _r) { free_query(_con); if (_r) db_free_result(_r); diff --git a/modules/db_postgres/km_dbase.h b/modules/db_postgres/km_dbase.h index 8053f01..d816616 100644 --- a/modules/db_postgres/km_dbase.h +++ b/modules/db_postgres/km_dbase.h @@ -61,7 +61,7 @@ int db_postgres_store_result(const db_con_t* _h, db_res_t** _r); /** * Free all memory allocated by get_result */ -int db_postgres_free_query(db_con_t* _h, db_res_t* _r); +int db_postgres_free_result(db_con_t* _h, db_res_t* _r); /**

15 years, 10 months

git:janakj/postgres: - added dependecy note of PostgreSQL library

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 20059ed0857a1ec3899b1c299bbb132595aed079 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20059ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 5 16:22:27 2008 +0000 - added dependecy note of PostgreSQL library git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3853 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_README | 4 +++- modules/db_postgres/km_doc/db_postgres_user.sgml | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/km_README b/modules/db_postgres/km_README index ffd49a6..fb8b0f4 100644 --- a/modules/db_postgres/km_README +++ b/modules/db_postgres/km_README @@ -46,7 +46,9 @@ Chapter 1. User's Guide The following libraries or applications must be installed before running OpenSER with this module loaded: - * None. + * PostgreSQL library - e.g., libpq5. + * PostgreSQL devel library - to compile the module (e.g., + libpq-dev). __________________________________________________________ 1.3. Exported Parameters diff --git a/modules/db_postgres/km_doc/db_postgres_user.sgml b/modules/db_postgres/km_doc/db_postgres_user.sgml index a2b3350..85dc4e8 100644 --- a/modules/db_postgres/km_doc/db_postgres_user.sgml +++ b/modules/db_postgres/km_doc/db_postgres_user.sgml @@ -31,7 +31,13 @@ <itemizedlist> <listitem> <para> - <emphasis>None</emphasis>. + <emphasis>PostgreSQL library</emphasis> - e.g., libpq5. + </para> + </listitem> + <listitem> + <para> + <emphasis>PostgreSQL devel library</emphasis> - to compile + the module (e.g., libpq-dev). </para> </listitem> </itemizedlist>

15 years, 10 months

git:janakj/postgres: - migrated to db_bind_api()

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 5a1f5e67c768500d930aeeadbc48b7d7030ea75c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a1f5e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 5 16:51:34 2008 +0000 - migrated to db_bind_api() git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3854 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_db_postgres.c | 35 ++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index 8cb196b..06766a7 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -31,10 +31,13 @@ #include <stdio.h> #include "../../sr_module.h" #include "../../db/db_con.h" +#include "../../db/db.h" #include "dbase.h" MODULE_VERSION +int db_postgres_bind_api(db_func_t *dbb); + static int mod_init(void); /* @@ -42,16 +45,7 @@ static int mod_init(void); */ static cmd_export_t cmds[]={ - {"db_use_table", (cmd_function)db_postgres_use_table, 2, 0, 0, 0}, - {"db_init", (cmd_function)db_postgres_init, 1, 0, 0, 0}, - {"db_close", (cmd_function)db_postgres_close, 2, 0, 0, 0}, - {"db_query", (cmd_function)db_postgres_query, 2, 0, 0, 0}, - {"db_fetch_result", (cmd_function)db_postgres_fetch_result, 2, 0, 0, 0}, - {"db_raw_query", (cmd_function)db_postgres_raw_query, 2, 0, 0, 0}, - {"db_free_result", (cmd_function)db_postgres_free_query, 2, 0, 0, 0}, - {"db_insert", (cmd_function)db_postgres_insert, 2, 0, 0, 0}, - {"db_delete", (cmd_function)db_postgres_delete, 2, 0, 0, 0}, - {"db_update", (cmd_function)db_postgres_update, 2, 0, 0, 0}, + {"db_bind_api", (cmd_function)db_postgres_bind_api, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -79,3 +73,24 @@ static int mod_init(void) return 0; } +int db_postgres_bind_api(db_func_t *dbb) +{ + if(dbb==NULL) + return -1; + + memset(dbb, 0, sizeof(db_func_t)); + + dbb->use_table = db_postgres_use_table; + dbb->init = db_postgres_init; + dbb->close = db_postgres_close; + dbb->query = db_postgres_query; + dbb->fetch_result = db_postgres_fetch_result; + dbb->raw_query = db_postgres_raw_query; + dbb->free_result = db_postgres_free_query; + dbb->insert = db_postgres_insert; + dbb->delete = db_postgres_delete; + dbb->update = db_postgres_update; + + return 0; +} +

15 years, 10 months

git:janakj/postgres: - change module docs FAQ link to a common one in the doc dir

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 9a643843f917a64533b117224f398abccd196de8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a64384… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 4 13:15:47 2008 +0000 - change module docs FAQ link to a common one in the doc dir - remove module specific FAQ content from the file in doc, this way no FAQ content will be created - credits for the patch/ the change scripts goes to Edson Gellert Schubert, 4lists at gmail dot com - update all READMEs, for most module docs the FAQ and devel information were now removed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3839 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_README | 42 ---------------------- modules/db_postgres/km_doc/db_postgres.sgml | 4 +-- modules/db_postgres/km_doc/db_postgres_user.sgml | 3 +- 3 files changed, 2 insertions(+), 47 deletions(-) diff --git a/modules/db_postgres/km_README b/modules/db_postgres/km_README index ea5d68a..ffd49a6 100644 --- a/modules/db_postgres/km_README +++ b/modules/db_postgres/km_README @@ -23,9 +23,6 @@ Greg Fausak 1.3. Exported Parameters 1.4. Exported Functions 1.5. Installation & Running - - 2. Developer's Guide - 3. Frequently Asked Questions __________________________________________________________ Chapter 1. User's Guide @@ -65,42 +62,3 @@ Chapter 1. User's Guide 1.5. Installation & Running Notes about installation and running. - __________________________________________________________ - -Chapter 2. Developer's Guide - - The module does not provide any API to use in other OpenSER - modules. - __________________________________________________________ - -Chapter 3. Frequently Asked Questions - - 3.1. Where can I find more about OpenSER? - 3.2. Where can I post a question about this module? - 3.3. How can I report a bug? - - 3.1. Where can I find more about OpenSER? - - Take a look at http://openser.org/. - - 3.2. Where can I post a question about this module? - - First at all check if your question was already answered on one - of our mailing lists: - - * User Mailing List - - http://openser.org/cgi-bin/mailman/listinfo/users - * Developer Mailing List - - http://openser.org/cgi-bin/mailman/listinfo/devel - - E-mails regarding any stable OpenSER release should be sent to - <users(a)openser.org> and e-mails regarding development versions - should be sent to <devel(a)openser.org>. - - If you want to keep the mail private, send it to - <team(a)openser.org>. - - 3.3. How can I report a bug? - - Please follow the guidelines provided at: - http://sourceforge.net/tracker/?group_id=139143. diff --git a/modules/db_postgres/km_doc/db_postgres.sgml b/modules/db_postgres/km_doc/db_postgres.sgml index 0db3261..6fee313 100644 --- a/modules/db_postgres/km_doc/db_postgres.sgml +++ b/modules/db_postgres/km_doc/db_postgres.sgml @@ -2,8 +2,7 @@ <!ENTITY user SYSTEM "db_postgres_user.sgml"> -<!ENTITY devel SYSTEM "db_postgres_devel.sgml"> -<!ENTITY faq SYSTEM "db_postgres_faq.sgml"> +<!ENTITY faq SYSTEM "../../../doc/module_faq.sgml">  <!ENTITY % docentities SYSTEM "../../../doc/entities.sgml"> @@ -46,7 +45,6 @@ <toc></toc> &user; - &devel; &faq; </book> diff --git a/modules/db_postgres/km_doc/db_postgres_user.sgml b/modules/db_postgres/km_doc/db_postgres_user.sgml index ab27eeb..a2b3350 100644 --- a/modules/db_postgres/km_doc/db_postgres_user.sgml +++ b/modules/db_postgres/km_doc/db_postgres_user.sgml @@ -1,8 +1,7 @@  <chapter> - <chapterinfo> - </chapterinfo> + <title>User's Guide</title> <section>

15 years, 10 months

git:master: Fixed matching of db flags names at the beginning of line.

by Jan Janak

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);

15 years, 10 months

git:master: Two small fixes in regular expressions.

by Jan Janak

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);

15 years, 10 months

Module conversion scripts

by Jan Janak

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.

15 years, 10 months

Both database interfaces integrated

by Jan Janak

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.

15 years, 10 months

git:master: SER to sip-router module conversion script.

by Jan Janak

Module: sip-router Branch: master Commit: beb252b7d97cba59830a321b0a4c8981c35ca0c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=beb252b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 19:15:16 2009 +0100 SER to sip-router module conversion script. This is a simple script which attempts to convert modules that use ser core to sip-router core. Signed-off-by: Jan Janak <jan(a)iptel.org> --- scripts/ser_to_sr.sh | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/scripts/ser_to_sr.sh b/scripts/ser_to_sr.sh new file mode 100755 index 0000000..6826426 --- /dev/null +++ b/scripts/ser_to_sr.sh @@ -0,0 +1,107 @@ +#!/usr/bin/env sh +# +# This is a simple script which attempts to convert ser modules so that they +# can be used with the sip-router core. Most of the changes done by the script +# deal with the changes in the database abstraction layer in the sip-router +# source tree. +# +# Run this script in module directory to convert it from ser core to +# sip-router core. The root of the tree should be two levels up, otherwise +# relative paths to headers (../..) would not work and the module will not +# compile. +# +# Some of the changes done by the script: +# +# * Extra defines in the Makefile to make the module link with libsrdb2 +# * Path to database headers updated to point to lib/srdb2 +# * Database flag names renamed from DB_* to SRDB_* +# (DB_DISABLED -> SRDB_DISABLED) +# +# NOTE: There is no guarantee that the update module would compile or even +# work. Make a backup before running the script. You have been warned! +# +# Written by Jan Janak <jan(a)iptel.org> +# + +if [ ! -f Makefile ] ; then + echo "ERROR: Could not find module Makefile" + echo " Run this file in the module directory" + exit 1 +fi + +if ! egrep "Makefile\.modules" Makefile >/dev/null ; then + echo "ERROR: Doesn't look like a module..." + exit 1 +fi + +if ! egrep '^#[ \t]*include[ \t]*".*\/db\/db(_(cmd|con|ctx|drv|fld|gen|pool|rec|res|uri))?\.h[ \t]*"' *.[ch] >/dev/null ; then + echo "The module does not seem to include old database headers..." + exit 0 +fi + +echo -n "Updating Makefile..." +cp Makefile Makefile.backup +cat Makefile.backup | gawk ' +BEGIN { + serlibpath_seen = 0 + libs_seen = 0 + defs_seen = 0 +} + +# If the define already exists then skip it, this ensures that +# we do not add the same line more than once. +/^[ \t]*DEFS[ \t]*\+?=.*SER_MOD_INTERFACE/ { + defs_seen = 1 +} + +/^[ \t]*SER_LIBS[ \t]*\+?=.*srdb2\/srdb2/ { + libs_seen = 1 +} + +/^[ \t]*SERLIBPATH[ \t]*=/ { + serlibpath_seen = 1 +} + +# Write everything just before the line including Makefile.modules, +# this is most likely the last line in the Makefile +/^[ \t]*include[ \t]+.*\/Makefile\.modules[ \t]*$/ { + if (serlibpath_seen == 0) print "SERLIBPATH=../../lib" + if (defs_seen == 0) print "DEFS+=-DSER_MOD_INTERFACE" + if (libs_seen == 0) print "SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2" +} + +{ print $0 } + +' > Makefile +echo "done." + +for file in *.[ch] ; do + echo -n "Updating file $file..." + cp $file $file.backup + cat $file.backup | gawk ' + +/^#[ \t]*include[ \t]*".*\/db\/db(_(cmd|con|ctx|drv|fld|gen|pool|rec|res|uri))?\.h[ \t]*"/ { + 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_]/ { + gsub("DB_LOAD_SER", "SRDB_LOAD_SER", $0); + gsub("DB_DISABLED", "SRDB_DISABLED", $0); + gsub("DB_CANON", "SRDB_CANON", $0); + gsub("DB_IS_TO", "SRDB_IS_TO", $0); + gsub("DB_IS_FROM", "SRDB_IS_FROM", $0); + gsub("DB_FOR_SERWEB", "SRDB_FOR_SERWEB", $0); + gsub("DB_PENDING", "SRDB_PENDING", $0); + gsub("DB_DELETED", "SRDB_DELETED", $0); + gsub("DB_CALLER_DELETED", "SRDB_CALLER_DELETED", $0); + gsub("DB_CALLEE_DELETED", "SRDB_CALLEE_DELETED", $0); + gsub("DB_MULTIVALUE", "SRDB_MULTIVALUE", $0); + gsub("DB_FILL_ON_REG", "SRDB_FILL_ON_REG", $0); + gsub("DB_REQUIRED", "SRDB_REQUIRED", $0); + gsub("DB_DIR", "SRDB_DIR", $0); +} + +{ print $0 } +' >$file + echo "done." +done

15 years, 10 months

git:master: Kamailio to sip-router module conversion script.

by Jan Janak

Module: sip-router Branch: master Commit: ec898038f34decb415e3adb696f2c0ff2ab007ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec89803… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 19:13:11 2009 +0100 Kamailio to sip-router module conversion script. This is a simple script which attempts to convert modules that use kamalio core to sip-router core. Signed-off-by: Jan Janak <jan(a)iptel.org> --- scripts/kam_to_sr.sh | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/scripts/kam_to_sr.sh b/scripts/kam_to_sr.sh new file mode 100755 index 0000000..330ee07 --- /dev/null +++ b/scripts/kam_to_sr.sh @@ -0,0 +1,107 @@ +#!/usr/bin/env sh +# +# This is a simple script which attempts to convert kamailio modules so that +# they can be used with the sip-router core. Most of the changes done by the +# script deal with the changes in the database abstraction layer in the +# sip-router source tree. +# +# Run this script in module directory to convert it from kamailio core to +# sip-router core. The root of the tree should be two levels up, otherwise +# relative paths to headers (../..) would not work and the module will not +# compile. +# +# Some of the changes done by the script: +# +# * Extra defines in the Makefile to make the module link with libsrdb1 +# * Path to database headers updated to point to lib/srdb1 +# * db_con_t and db_res_t renamed to db1_con_t and db1_res_t in *.[ch] +# * Value type names such as DB_INT changed to DB1_INT in *.[ch] +# +# NOTE: There is no guarantee that the update module would compile or even +# work. Make a backup before running the script. You have been warned! +# +# Written by Jan Janak <jan(a)iptel.org> +# + +if [ ! -f Makefile ] ; then + echo "ERROR: Could not find module Makefile" + echo " Run this file in the module directory" + exit 1 +fi + +if ! egrep "Makefile\.modules" Makefile >/dev/null ; then + echo "ERROR: Doesn't look like a module..." + 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 + echo "The module does not seem to include old database headers..." + exit 0 +fi + +echo -n "Updating Makefile..." +cp Makefile Makefile.backup +cat Makefile.backup | gawk ' +BEGIN { + serlibpath_seen = 0 + libs_seen = 0 + defs_seen = 0 +} + +# If the define already exists then skip it, this ensures that +# we do not add the same line more than once. +/^[ \t]*DEFS[ \t]*\+?=.*OPENSER_MOD_INTERFACE/ { + defs_seen = 1 +} + +/^[ \t]*SER_LIBS[ \t]*\+?=.*srdb1\/srdb1/ { + libs_seen = 1 +} + +/^[ \t]*SERLIBPATH[ \t]*=/ { + serlibpath_seen = 1 +} + +# Write everything just before the line including Makefile.modules, +# this is most likely the last line in the Makefile +/^[ \t]*include[ \t]+.*\/Makefile\.modules[ \t]*$/ { + if (serlibpath_seen == 0) print "SERLIBPATH=../../lib" + if (defs_seen == 0) print "DEFS+=-DOPENSER_MOD_INTERFACE" + if (libs_seen == 0) print "SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1" +} + +{ print $0 } + +' > Makefile +echo "done." + +for file in *.[ch] ; do + echo -n "Updating file $file..." + 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]*"/ { + sub("/db/", "/lib/srdb1/", $0); +} + +/[^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_]/ { + gsub("DB_INT", "DB1_INT", $0); + gsub("DB_BIGINT", "DB1_BIGINT", $0); + gsub("DB_DOUBLE", "DB1_DOUBLE", $0); + gsub("DB_STR", "DB1_STR", $0); + gsub("DB_DATETIME", "DB1_DATETIME", $0); + gsub("DB_BLOB", "DB1_BLOB", $0); + gsub("DB_BITMAP", "DB1_BITMAP", $0); +} + +{ print $0 } +' >$file + echo "done." +done

15 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev