sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
318 discussions

git:4.0: permissions: re-init db connection for reload cmd

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 7aba649db775a00e28dc75a9145a3da50f797776 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7aba649… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 2 17:05:35 2013 +0100 permissions: re-init db connection for reload cmd - some workers for specific mi/rpc commands may not have a db connection from the start (cherry picked from commit cb23be9456c178957399ec9d8ce8a1420d50fc32) --- modules/permissions/address.c | 25 +++++++++++++++++++++++++ modules/permissions/address.h | 5 +++++ modules/permissions/mi.c | 4 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/permissions/address.c b/modules/permissions/address.c index 501d59e..9a6bd44 100644 --- a/modules/permissions/address.c +++ b/modules/permissions/address.c @@ -227,6 +227,31 @@ dberror: return -1; } +/* + * Wrapper to reload addr table from mi or rpc + * we need to open the db_handle + */ +int reload_address_table_cmd(void) +{ + if (!db_handle) { + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + } + + if (reload_address_table () != 1) { + perm_dbf.close(db_handle); + db_handle = 0; + return -1; + } + + perm_dbf.close(db_handle); + db_handle = 0; + + return 1; +} /* * Initialize data structures diff --git a/modules/permissions/address.h b/modules/permissions/address.h index e501204..c138120 100644 --- a/modules/permissions/address.h +++ b/modules/permissions/address.h @@ -52,6 +52,11 @@ int mi_init_addresses(void); */ int reload_address_table(void); +/* + * Wrapper to reload addr table from mi or rpc + * we need to open the db_handle + */ +int reload_address_table_cmd(void); /* * Close connections and release memory diff --git a/modules/permissions/mi.c b/modules/permissions/mi.c index e38bc05..9ac67ff 100644 --- a/modules/permissions/mi.c +++ b/modules/permissions/mi.c @@ -114,7 +114,7 @@ void rpc_trusted_dump(rpc_t* rpc, void* c) { */ struct mi_root* mi_address_reload(struct mi_root *cmd_tree, void *param) { - if (reload_address_table () == 1) { + if (reload_address_table_cmd () == 1) { return init_mi_tree( 200, MI_SSTR(MI_OK)); } else { return init_mi_tree( 400, MI_SSTR("Address table reload failed")); @@ -125,7 +125,7 @@ struct mi_root* mi_address_reload(struct mi_root *cmd_tree, void *param) * RPC function to reload address table */ void rpc_address_reload(rpc_t* rpc, void* c) { - if (reload_address_table () != 1) { + if (reload_address_table_cmd () != 1) { rpc->fault(c, 500, "Reload failed."); return; }

11 years

git:4.1: permissions: re-init db connection for reload cmd

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 4ff3866652be6752e5167071ce02b888acda0e75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ff3866… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 2 17:05:35 2013 +0100 permissions: re-init db connection for reload cmd - some workers for specific mi/rpc commands may not have a db connection from the start (cherry picked from commit cb23be9456c178957399ec9d8ce8a1420d50fc32) --- modules/permissions/address.c | 25 +++++++++++++++++++++++++ modules/permissions/address.h | 5 +++++ modules/permissions/mi.c | 4 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/permissions/address.c b/modules/permissions/address.c index bb54e79..6dc3275 100644 --- a/modules/permissions/address.c +++ b/modules/permissions/address.c @@ -253,6 +253,31 @@ dberror: return -1; } +/* + * Wrapper to reload addr table from mi or rpc + * we need to open the db_handle + */ +int reload_address_table_cmd(void) +{ + if (!db_handle) { + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + } + + if (reload_address_table () != 1) { + perm_dbf.close(db_handle); + db_handle = 0; + return -1; + } + + perm_dbf.close(db_handle); + db_handle = 0; + + return 1; +} /* * Initialize data structures diff --git a/modules/permissions/address.h b/modules/permissions/address.h index b1cbbf4..ef72253 100644 --- a/modules/permissions/address.h +++ b/modules/permissions/address.h @@ -55,6 +55,11 @@ int mi_init_addresses(void); */ int reload_address_table(void); +/* + * Wrapper to reload addr table from mi or rpc + * we need to open the db_handle + */ +int reload_address_table_cmd(void); /* * Close connections and release memory diff --git a/modules/permissions/mi.c b/modules/permissions/mi.c index 34e831f..9467f1d 100644 --- a/modules/permissions/mi.c +++ b/modules/permissions/mi.c @@ -114,7 +114,7 @@ void rpc_trusted_dump(rpc_t* rpc, void* c) { */ struct mi_root* mi_address_reload(struct mi_root *cmd_tree, void *param) { - if (reload_address_table () == 1) { + if (reload_address_table_cmd () == 1) { return init_mi_tree( 200, MI_SSTR(MI_OK)); } else { return init_mi_tree( 400, MI_SSTR("Address table reload failed")); @@ -125,7 +125,7 @@ struct mi_root* mi_address_reload(struct mi_root *cmd_tree, void *param) * RPC function to reload address table */ void rpc_address_reload(rpc_t* rpc, void* c) { - if (reload_address_table () != 1) { + if (reload_address_table_cmd () != 1) { rpc->fault(c, 500, "Reload failed."); return; }

11 years

git:master: permissions: re-init db connection for reload cmd

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cb23be9456c178957399ec9d8ce8a1420d50fc32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb23be9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 2 17:05:35 2013 +0100 permissions: re-init db connection for reload cmd - some workers for specific mi/rpc commands may not have a db connection from the start --- modules/permissions/address.c | 25 +++++++++++++++++++++++++ modules/permissions/address.h | 5 +++++ modules/permissions/mi.c | 4 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/permissions/address.c b/modules/permissions/address.c index bb54e79..6dc3275 100644 --- a/modules/permissions/address.c +++ b/modules/permissions/address.c @@ -253,6 +253,31 @@ dberror: return -1; } +/* + * Wrapper to reload addr table from mi or rpc + * we need to open the db_handle + */ +int reload_address_table_cmd(void) +{ + if (!db_handle) { + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + } + + if (reload_address_table () != 1) { + perm_dbf.close(db_handle); + db_handle = 0; + return -1; + } + + perm_dbf.close(db_handle); + db_handle = 0; + + return 1; +} /* * Initialize data structures diff --git a/modules/permissions/address.h b/modules/permissions/address.h index b1cbbf4..ef72253 100644 --- a/modules/permissions/address.h +++ b/modules/permissions/address.h @@ -55,6 +55,11 @@ int mi_init_addresses(void); */ int reload_address_table(void); +/* + * Wrapper to reload addr table from mi or rpc + * we need to open the db_handle + */ +int reload_address_table_cmd(void); /* * Close connections and release memory diff --git a/modules/permissions/mi.c b/modules/permissions/mi.c index 34e831f..9467f1d 100644 --- a/modules/permissions/mi.c +++ b/modules/permissions/mi.c @@ -114,7 +114,7 @@ void rpc_trusted_dump(rpc_t* rpc, void* c) { */ struct mi_root* mi_address_reload(struct mi_root *cmd_tree, void *param) { - if (reload_address_table () == 1) { + if (reload_address_table_cmd () == 1) { return init_mi_tree( 200, MI_SSTR(MI_OK)); } else { return init_mi_tree( 400, MI_SSTR("Address table reload failed")); @@ -125,7 +125,7 @@ struct mi_root* mi_address_reload(struct mi_root *cmd_tree, void *param) * RPC function to reload address table */ void rpc_address_reload(rpc_t* rpc, void* c) { - if (reload_address_table () != 1) { + if (reload_address_table_cmd () != 1) { rpc->fault(c, 500, "Reload failed."); return; }

11 years

git:master: ndb_cassandra: replaced < and > with < and > in docbook xml file

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 219d3240b6d8ee8360da43aeeb4084cc866cec2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=219d324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 2 16:21:01 2013 +0100 ndb_cassandra: replaced < and > with < and > in docbook xml file - it fixes readme generation errors --- modules/ndb_cassandra/README | 224 +++++++++++---------- modules/ndb_cassandra/doc/ndb_cassandra_admin.xml | 8 +- 2 files changed, 119 insertions(+), 113 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=219…

11 years

Next Kamailio World - April 2-4, 2014, in Berlin, Germany

by Daniel-Constantin Mierla

Hello, I would like to quickly announce the dates and place for next Kamailio World Conference: April 2-4, 2014, in Berlin, Germany. More information is available on the web site: - http://conference.kamailio.com/k01/2013/12/kamailio-world-2014-april-2-4-in… More details will be published in the near future. Looking forward to meeting many of you at the event in Berlin next year, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

11 years

[tracker] Task closed: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#374 - Database location table not updated correctly? User who did this - Víctor Seva (linuxmaniac) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=374 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

[tracker] User took ownership: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#374 - Database location table not updated correctly? More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=374 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

[tracker] Comment added: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#374 - Database location table not updated correctly? User who did this - Morten Tryfoss (mtryfoss) ---------- Seems to work as expected. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=374#comment1190 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2013