sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:andrei/switch: rvalues: fix rval_new( empty string )

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: 5b37abcf81bade64b5bb8bc07ad4352e96c9d7b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b37abc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 21:51:43 2009 +0100 rvalues: fix rval_new( empty string ) - rval_new(RV_STR, empty string, ...) did not set properly the string pointer --- rvalue.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rvalue.c b/rvalue.c index 4c7472d..8bd0aa2 100644 --- a/rvalue.c +++ b/rvalue.c @@ -233,13 +233,17 @@ struct rvalue* rval_new(enum rval_type t, union rval_val* v, int extra_size) { struct rvalue* rv; - if (t==RV_STR && v && v->s.len) + if (t==RV_STR && v && v->s.s) return rval_new_str(&v->s, extra_size); rv=rval_new_empty(extra_size); if (likely(rv)){ rv->type=t; - if (likely(v)){ + if (likely(v && t!=RV_STR)){ rv->v=*v; + }else if (t==RV_STR){ + rv->v.s.s=&rv->buf[0]; + rv->v.s.len=0; + if (likely(extra_size)) rv->v.s.s[0]=0; }else memset (&rv->v, 0, sizeof(rv->v)); }

15 years, 2 months

Kamailio MI in shared modules

by Jan Janak

Hello, I just figured that the kamailio interface in shared modules (such as db_berkeley and db_flatstore) wouldn't work. Such modules are defined with -DSER_MOD_INTERFACE and thus use the module_exports structure from SER, which does not have the MI structure entry. So although such modules have all the MI commands and they link with libkmi, none of the management functions gets exported through the module API. Is there any solution to this yet? Jan.

15 years, 2 months

git:janakj/flatstore DELETED: Make km_sources compile, part two.

by Jan Janak

Module: sip-router Branch: janakj/flatstore DELETED Commit: 46b6981987a2ce15a2327f6da09741d860f25cb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46b6981… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 23:43:12 2009 +0100 Make km_sources compile, part two. List of changes: * Call km_mod_init, km_child_init, km_mod_destroy from the real init functions in flatstore_mod.c and make the km_ functions non-static so that they are callable from other object files. * Renamed non-static global variables in km_flatstore_mod.c to avoid conflicts with variables with the same name in flatstore_mod.c (local_timestamp->km_local_timestamp, flat_rotate->km_flat_rotate) --- modules/db_flatstore/flatstore_mod.c | 15 ++++++++++++- modules/db_flatstore/km_flat_mi.c | 3 +- modules/db_flatstore/km_flatstore.c | 4 +- modules/db_flatstore/km_flatstore_mod.c | 32 ++++++++++++------------------ modules/db_flatstore/km_flatstore_mod.h | 10 +++++++- 5 files changed, 38 insertions(+), 26 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 78c29e8..0f7b5b5 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -29,8 +29,8 @@ /** \file * Flatstore module interface. */ - #include "flatstore_mod.h" +#include "km_flatstore_mod.h" #include "flat_con.h" #include "flat_cmd.h" #include "flat_rpc.h" @@ -166,22 +166,33 @@ static int mod_init(void) *flat_rotate = time(0); flat_local_timestamp = *flat_rotate; - return 0; + + return km_mod_init(); } static void mod_destroy(void) { + km_mod_destroy(); if (flat_pid.s) free(flat_pid.s); if (flat_rotate) shm_free(flat_rotate); } +/* + * FIXME: We should check whether just calling km_child_init would really work + * here. This function comes from kamailio and since the core of sip-router is + * based on SER 2.0, the way how child_init is called and values of the rank + * variable could be incompatible with km_child_init function. A solution here + * would be to rewrite km_child_init with ser 2.0 init stuff in mind. + */ static int child_init(int rank) { char* tmp; unsigned int v; + km_child_init(rank); + if (rank <= 0) { v = -rank; } else { diff --git a/modules/db_flatstore/km_flat_mi.c b/modules/db_flatstore/km_flat_mi.c index 992e2a4..2200148 100644 --- a/modules/db_flatstore/km_flat_mi.c +++ b/modules/db_flatstore/km_flat_mi.c @@ -23,6 +23,7 @@ */ #include "flatstore_mod.h" +#include "km_flatstore_mod.h" #include "km_flat_mi.h" @@ -34,7 +35,7 @@ struct mi_root* mi_flat_rotate_cmd(struct mi_root* cmd_tree, void* param) if(rpl_tree == NULL) return rpl_tree; - *flat_rotate = time(0); + *km_flat_rotate = time(0); return rpl_tree; } diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index 499a98e..7a2fbaf 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -158,9 +158,9 @@ int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, int l; char *s, *p; - if (local_timestamp < *flat_rotate) { + if (km_local_timestamp < *km_flat_rotate) { flat_rotate_logs(); - local_timestamp = *flat_rotate; + km_local_timestamp = *km_flat_rotate; } f = CON_FILE(h); diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index d968594..ebb5304 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -37,12 +37,6 @@ /*MODULE_VERSION*/ -static int child_init(int rank); - -static int mod_init(void); - -static void mod_destroy(void); - int db_flat_bind_api(db_func_t *dbb); /* @@ -61,9 +55,9 @@ char* km_flat_delimiter = "|"; * Timestamp of the last log rotation request from * the FIFO interface */ -time_t* flat_rotate; +time_t* km_flat_rotate; -time_t local_timestamp; +time_t km_local_timestamp; /* * Flatstore database module interface @@ -98,40 +92,40 @@ struct kam_module_exports km_exports = { mi_cmds, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mod_init, /* module initialization function */ + km_mod_init, /* module initialization function */ 0, /* response function*/ - mod_destroy, /* destroy function */ - child_init /* per-child init function */ + km_mod_destroy, /* destroy function */ + km_child_init /* per-child init function */ }; -static int mod_init(void) +int km_mod_init(void) { if (strlen(km_flat_delimiter) != 1) { LM_ERR("delimiter has to be exactly one character\n"); return -1; } - flat_rotate = (time_t*)shm_malloc(sizeof(time_t)); - if (!flat_rotate) { + km_flat_rotate = (time_t*)shm_malloc(sizeof(time_t)); + if (!km_flat_rotate) { LM_ERR("no shared memory left\n"); return -1; } - *flat_rotate = time(0); - local_timestamp = *flat_rotate; + *km_flat_rotate = time(0); + km_local_timestamp = *km_flat_rotate; return 0; } -static void mod_destroy(void) +void km_mod_destroy(void) { - if (flat_rotate) shm_free(flat_rotate); + if (km_flat_rotate) shm_free(km_flat_rotate); } -static int child_init(int rank) +int km_child_init(int rank) { if (rank <= 0) { km_flat_pid = - rank; diff --git a/modules/db_flatstore/km_flatstore_mod.h b/modules/db_flatstore/km_flatstore_mod.h index b605c11..3ca8c50 100644 --- a/modules/db_flatstore/km_flatstore_mod.h +++ b/modules/db_flatstore/km_flatstore_mod.h @@ -48,14 +48,20 @@ extern char* km_flat_delimiter; * The timestamp of log rotation request from * the FIFO interface */ -extern time_t* flat_rotate; +extern time_t* km_flat_rotate; /* * Local timestamp marking the time of the * last log rotation in the process */ -extern time_t local_timestamp; +extern time_t km_local_timestamp; + +int km_mod_init(void); + +void km_mod_destroy(void); + +int km_child_init(int rank); #endif /* KM_FLATSTORE_MOD_H */

15 years, 2 months

git:janakj/bdb DELETED: Module renamed to db_bdb.

by Jan Janak

Module: sip-router Branch: janakj/bdb DELETED Commit: 7800eaf035782f64bd1c9786c1834bff5dc783f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7800eaf… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 15:14:48 2009 +0100 Module renamed to db_bdb. --- modules/db_berkeley/bdb_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/bdb_mod.c b/modules/db_berkeley/bdb_mod.c index 268527e..3ce1920 100644 --- a/modules/db_berkeley/bdb_mod.c +++ b/modules/db_berkeley/bdb_mod.c @@ -89,7 +89,7 @@ static param_export_t params[] = { }; struct module_exports exports = { - "bdb", + "db_bdb", cmds, /* Exported functions */ 0, /* RPC method */ params, /* Exported parameters */

15 years, 2 months

git:janakj/oracle DELETED: Merge branch 'master' of ssh://janakj@git. sip-router.org/sip-router into oracle

by Jan Janak

Module: sip-router Branch: janakj/oracle DELETED Commit: aad1137e2ea0cdc92201e7b30fda5429c31c9987 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aad1137… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 15:18:04 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into oracle * 'master' of ssh://janakj@git.sip-router.org/sip-router: SER replaced with SIP Router in the doxygen main file. ---

15 years, 2 months

git:janakj/ldap DELETED: Merge branch 'master' of ssh://janakj@git. sip-router.org/sip-router into ldap

by Jan Janak

Module: sip-router Branch: janakj/ldap DELETED Commit: a5ec520efadd627420028d1ffecba98575872299 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5ec520… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 15:18:01 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into ldap * 'master' of ssh://janakj@git.sip-router.org/sip-router: SER replaced with SIP Router in the doxygen main file. ---

15 years, 2 months

git:janakj/postgres DELETED: Integrate functions and parameters from kamailio sources.

by Jan Janak

Module: sip-router Branch: janakj/postgres DELETED Commit: f0546a246d0098405b61a64ca0fbaf32bbb5373f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0546a2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 14:32:18 2009 +0100 Integrate functions and parameters from kamailio sources. This patch adds db_bind_api function from kamailio sources to the list of exported functions. Also we call the mod_init function from kamailio sources at the and of the mod_init function in pg_mod.c. To make this possible I added a new header file and removed static from the mod_init function declaration. --- modules/db_postgres/km_db_postgres.c | 9 ++----- modules/db_postgres/km_db_postgres.h | 39 ++++++++++++++++++++++++++++++++++ modules/db_postgres/pg_mod.c | 4 ++- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index c3df575..ffe9230 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -38,14 +38,11 @@ #include "../../lib/srdb1/db_con.h" #include "../../lib/srdb1/db.h" #include "km_dbase.h" +#include "km_db_postgres.h" /*MODULE_VERSION*/ -int db_postgres_bind_api(db_func_t *dbb); - -static int mod_init(void); - /* * PostgreSQL database module interface */ @@ -66,14 +63,14 @@ struct kam_module_exports kam_exports = { 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mod_init, /* module initialization function */ + km_postgres_mod_init, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0 /* per-child init function */ }; -static int mod_init(void) +int km_postgres_mod_init(void) { return 0; } diff --git a/modules/db_postgres/km_db_postgres.h b/modules/db_postgres/km_db_postgres.h new file mode 100644 index 0000000..8959417 --- /dev/null +++ b/modules/db_postgres/km_db_postgres.h @@ -0,0 +1,39 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * Copyright (C) 2008 1&1 Internet AG + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! \file + * \brief DB_POSTGRES :: Core + * \ingroup db_postgres + * Module: \ref db_postgres + */ + +#ifndef _KM_DB_POSTGRES_H +#define _KM_DB_POSTGRES_H + +#include "../../lib/srdb1/db.h" + +int db_postgres_bind_api(db_func_t *dbb); + +int km_postgres_mod_init(void); + +#endif /* _KM_DB_POSTGRES_H */ diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 1bc4ad4..3c1e2d9 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -42,6 +42,7 @@ #include "pg_cmd.h" #include "pg_res.h" #include "pg_fld.h" +#include "km_db_postgres.h" #include "../../sr_module.h" @@ -77,6 +78,7 @@ static cmd_export_t cmds[] = { {"db_next", (cmd_function)pg_cmd_next, 0, 0, 0}, {"db_setopt", (cmd_function)pg_setopt, 0, 0, 0}, {"db_getopt", (cmd_function)pg_getopt, 0, 0, 0}, + {"db_bind_api", (cmd_function)db_postgres_bind_api, 0, 0, 0}, {0, 0, 0, 0, 0} }; @@ -538,7 +540,7 @@ static int pg_mod_init(void) } return -1; #endif /* PG_TEST */ - return 0; + return km_postgres_mod_init(); } /** @} */

15 years, 2 months

git:janakj/mysql DELETED: Make sure mod_init from kamailio/ db_mysql is called.

by Jan Janak

Module: sip-router Branch: janakj/mysql DELETED Commit: 43f01015237b9fabd9ef36d9674aac5bababcb1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43f0101… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 11:12:04 2009 +0100 Make sure mod_init from kamailio/db_mysql is called. Changes include: * mysql_mod_init renamed to kam_mysql_mod_init to avoid conflicts with sources from ser * The function is no longer static so that it can be accessed from mysql_mod.c * mysql_mod_init modified to call kam_mysql_mod_init at the end. --- modules/db_mysql/km_db_mysql.c | 6 ++---- modules/db_mysql/km_db_mysql.h | 2 ++ modules/db_mysql/mysql_mod.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 5c564b1..eb0ca05 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -50,8 +50,6 @@ unsigned int db_mysql_timeout_interval = 2; /* Default is 6 seconds */ unsigned int db_mysql_auto_reconnect = 1; /* Default is enabled */ -static int mysql_mod_init(void); - /* MODULE_VERSION */ /*! \brief @@ -81,14 +79,14 @@ struct kam_module_exports kam_exports = { 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mysql_mod_init, /* module initialization function */ + kam_mysql_mod_init, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0 /* per-child init function */ }; -static int mysql_mod_init(void) +int kam_mysql_mod_init(void) { LM_DBG("MySQL client version is %s\n", mysql_get_client_info()); return 0; diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index b0b475e..4705ca0 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -45,4 +45,6 @@ extern unsigned int db_mysql_auto_reconnect; int db_mysql_bind_api(db_func_t *dbb); +int kam_mysql_mod_init(void); + #endif /* KM_DB_MOD_H */ diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 61c2683..bfd903d 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -144,7 +144,8 @@ static int mysql_mod_init(void) " compiled against %ld)\n", MYSQL_VERSION_ID); } #endif - return 0; + + return kam_mysql_mod_init(); } /** @} */

15 years, 2 months

DB Driver Migration Status

by Jan Janak

Here is a short summary of my database driver integration attempt. The following db driver modules have been merged from both (kamailio and ser), these modules should work with both projects and they have been merged into the sip-router master branch: * db_berkeley * db_flatstore * db_mysql * db_postgres I have verified that all the modules above can be compiled in sip-router and that they can be loaded and used. Two modules, db_flatstore and db_berkeley, contain support for kamailio MI interface. The interface wouldn't work right now because I could not export MI functions with the current state of sip-router module interface. All the functions are there but they won't be made available to the MI interface. Then there are some database drivers that I haven' integrated because it does not make much sense right now: * oracle in ser and db_oracle in kamailio, the ser module currently does not work * dbtext in ser and db_text in kamailio, the ser module currently does not work And finally db_unixodbc module in kamailio does not have an equivalent in ser so we can keep it where it is right now. I would like to extend the module with support for libsrdb2 in the future and make it work with sip-router as well. Jan.

15 years, 2 months

git:master: Module renamed to db_bdb.

by Jan Janak

Module: sip-router Branch: master Commit: 7800eaf035782f64bd1c9786c1834bff5dc783f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7800eaf… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 15:14:48 2009 +0100 Module renamed to db_bdb. --- modules/db_berkeley/bdb_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/bdb_mod.c b/modules/db_berkeley/bdb_mod.c index 268527e..3ce1920 100644 --- a/modules/db_berkeley/bdb_mod.c +++ b/modules/db_berkeley/bdb_mod.c @@ -89,7 +89,7 @@ static param_export_t params[] = { }; struct module_exports exports = { - "bdb", + "db_bdb", cmds, /* Exported functions */ 0, /* RPC method */ params, /* Exported parameters */

15 years, 2 months

← Newer
1
2
3
4
5
6
7
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009