sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
347 discussions

[tracker] Comment added: Crash when sqlops tries to do a 'select' on db_text
by sip-router 25 Apr '12

25 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#208 - Crash when sqlops tries to do a 'select' on db_text User who did this - shiwe (shiwe) ---------- correct given that all I've actually carried out in my existence is generating my way right here for you.""I may have poetry in my existence. http://www.askweddingdress.net formal summer dress And journey. And enjoy. Really like over all. No not the artful postures of adore http://www.askweddingdress.net/evening-dresses.html evening dresses http://www.askweddingdress.net vintage dresses new york , not playful and poetical video games of enjoy for that amusement of an night. But adore that overthrows existence. Unbiddable http://www.askweddingdress.net pink wedding dresses , ungovernable http://www.askweddingdress.net wedding gowns dresses , http://www.askweddingdress.net white dresses like a riot within the coronary heart, and absolutely nothing to become carried out, arrive damage or rapture. http://www.askweddingdress.net cheap evening dresses http://www.askweddingdress.net bridesmaid beach dresses ""May you in no way steal, lie or cheat. But when you should steal, then steal absent my sorrows. And in the event you ought to lie, lie with me all of the nights of my existence. http://www.askweddingdress.net flower girl dresses And in the event you should cheat, then remember to cheat loss of life, simply because I couldnat reside each day with no you.""I really like that you simply get cold when it is seventyone degrees out. I like that it ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=208#comment521 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.

1 0

[tracker] Comment added: make install fails with a bash syntax error
by sip-router 25 Apr '12

25 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#87 - make install fails with a bash syntax error User who did this - shiwe (shiwe) ---------- or hire for that day http://www.askweddingdress.net mix wedding dresses http://www.askweddingdress.net mature brides wedding dresses . The candy and favor bagsboxes may be bought in bulk from many different sites or regionally. The bride may even involve a personalised communication around the favor bag or box if she chooses. TheAcandy buffet is definitely an inspired concept simply because it can be for your marriage ceremony visitors. http://www.askweddingdress.net flower girl dresses http://www.askweddingdress.net cheap dresses Channeling inventive power, time and expertise into some thing wonderful for the visitors is often a magnificent method to display yourAappreciation for them takingApart inside the marriage ceremony day celebration. Picture by Jen Huang Photographythe best way to design a brief marriage ceremony gown It is additional challenging than 1 would picture. Brief marriage ceremony gowns, or stylish small white dresses that function just also as marriage ceremony gowns, http://www.askweddingdress.net cheap wedding gowns are so preferred due to the fact they are effortless http://www.askweddingdress.net mothers wedding dresses http://www.askweddingdress.net/prom-dresses.html beach dresses http://www.askweddingdress.net wedding gowns under 100 , http://www.askweddingdress.net cheap prom dresses enjoyable and entirely ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=87#comment520 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.

1 0

[tracker] Task opened: sssssssssssssssss
by sip-router 25 Apr '12

25 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - shiwe (shiwe) Attached to Project - sip-router Summary - sssssssssssssssss Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - 现场ccccccccc More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=216 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.

1 0

[tracker] Assignee added: sssssssssssssssss
by sip-router 25 Apr '12

25 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#216 - sssssssssssssssss User who did this - shiwe (shiwe) http://sip-router.org/tracker/index.php?do=details&task_id=216 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.

1 0

[tracker] Comment added: Record-Route and msg_apply_changes()
by sip-router 25 Apr '12

25 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#194 - Record-Route and msg_apply_changes() User who did this - shiwe (shiwe) ---------- considerably of a creation http://www.askweddingdress.net grey bridesmaid dress . More than the previous 50 many years, a lot more correct, less expensive quartz watches mechanical watches have been defeated, however the early 90s of final century, mechanical reconquer the marketplace. Faced with this situation, http://www.askweddingdress.net plus size bridal gowns dresses from a certain level, country wide manufacturers have a international influence to be an worldwide brand name, is just not lacking in background, the lack of game time is together with the packaging and marketing http://www.askweddingdress.net orange bridal dresses . http://www.askweddingdress.net cheap long evening dresses Once http://www.askweddingdress.net discount wedding gowns , http://www.askweddingdress.net beach prom dresses as being a decline in the aristocracy, Vacheron Constantin omega constellation meister watches family Sissi of Austria through the manufacturing of an opportunity to look at married, http://www.askweddingdress.net/bridesmaid-dresses.html bridesmaid prom dresses successfully positioning the item like a "royal style http://www.askweddingdress.net black dresses , noble and elegant", which Right after a century with the same style characteristics, http://www.askweddingdress.net vintage bridal dresses but and you will find components of chance, but also illustrates a problem in terms with the ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=194#comment519 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.

1 0

call for participation: kamailio project at LinuxTag 2012
by Carsten Bock 24 Apr '12

24 Apr '12

Hello, in about five weeks the kamailio project will (again) be present on the LinuxTag fair, "the most important place for Linux and open source software in Europe" - http://www.linuxtag.org/2012/en.html . If you are in Berlin during this time, plan to visit the LinuxTag or just like to help your favourite SIP server project - please consider supporting us in running our fair booth! Even showing up for one or two hours helps a lot. We need also support to properly present our project, like flyers, a banner, maybe some live demonstrations.. So even if you can't participate in person, there are other ways to help us! Please contact me per mail if you could help at the booth or have some ideas about our project presentation. The actual state of preparations can be found in our wiki: http://sip-router.org/wiki/meetings/berlin-2012 Thanks in advance, Carsten @Henning: Thanks for providing a template for this Mail ;-) -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Schomburgstr. 80 D-22767 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Mobile +49 179 2021244 Office +49 40 34927219 Fax +49 40 34927220 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/ -- Meet ng-voice at LinuxTag 2012 in Berlin - May 23rd - 26th, 2012. Save the date!

3 3

git:master: modules_k/rls: Updated to use new (start|end|abort) _transaction DB APIs instead of the original db_(begin|commit|rollback)
by Peter Dunkley 24 Apr '12

24 Apr '12

Module: sip-router Branch: master Commit: 167714254cca8cb911f2911ba557744ecd6d0d73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1677142… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Apr 24 10:58:22 2012 +0100 modules_k/rls: Updated to use new (start|end|abort)_transaction DB APIs instead of the original db_(begin|commit|rollback) --- modules_k/rls/notify.c | 19 ++++++++++----- modules_k/rls/resource_notify.c | 47 +++++++++++++++++++++++++------------- modules_k/rls/rls_db.c | 26 ++++++++++++--------- 3 files changed, 58 insertions(+), 34 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index fbb7e17..1e06d57 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -128,11 +128,11 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, goto error; } - if (dbmode == RLS_DB_ONLY) + if (dbmode == RLS_DB_ONLY && rlpres_dbf.start_transaction) { - if (db_begin(&rlpres_dbf, rlpres_db) < 0) + if (rlpres_dbf.start_transaction(rlpres_db) < 0) { - LM_ERR("in BEGIN\n"); + LM_ERR("in start_transaction\n"); goto error; } } @@ -266,11 +266,11 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, goto error; } - if (dbmode == RLS_DB_ONLY) + if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction) { - if (db_commit(&rlpres_dbf, rlpres_db) < 0) + if (rlpres_dbf.end_transaction(rlpres_db) < 0) { - LM_ERR("in COMMIT\n"); + LM_ERR("in end_transaction\n"); goto error; } } @@ -289,7 +289,6 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, return 0; error: - if(rlmi_cont) { if(rlmi_cont->s) @@ -308,6 +307,12 @@ error: rlpres_dbf.free_result(rlpres_db, result); if(rlsubs_did.s) pkg_free(rlsubs_did.s); + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.abort_transaction) + { + if (rlpres_dbf.abort_transaction(rlpres_db) < 0) + LM_ERR("in abort_transaction"); + } return -1; } diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 910b098..310b0af 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -893,10 +893,13 @@ static void timer_send_full_state_notifies(int round) goto done; } - if (db_begin(&rls_dbf, rls_db) < 0) + if (rls_dbf.start_transaction) { - LM_ERR("in BEGIN\n"); - goto done; + if (rls_dbf.start_transaction(rls_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto done; + } } /* Step 1: Find rls_watchers that require full-state notification */ @@ -918,10 +921,13 @@ static void timer_send_full_state_notifies(int round) goto done; } - if (db_commit(&rls_dbf, rls_db) < 0) + if (rls_dbf.end_transaction) { - LM_ERR("in COMMIT\n"); - goto done; + if (rls_dbf.end_transaction(rls_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto done; + } } /* Step 3: Full-state notify each watcher we found */ @@ -1000,6 +1006,11 @@ done: rls_dbf.free_result(rls_db, result); if (doc != NULL) xmlFreeDoc(doc); + if (rls_dbf.abort_transaction) + { + if (rls_dbf.abort_transaction(rls_db) < 0) + LM_ERR("in abort_transaction\n"); + } } static void timer_send_update_notifies(int round) @@ -1037,12 +1048,12 @@ static void timer_send_update_notifies(int round) goto done; } - if (dbmode == RLS_DB_ONLY) + if (dbmode == RLS_DB_ONLY && rlpres_dbf.start_transaction) { - if (db_begin(&rlpres_dbf, rlpres_db) < 0) + if (rlpres_dbf.start_transaction(rlpres_db) < 0) { - LM_ERR("in BEGIN\n"); - goto error; + LM_ERR("in start_transaction\n"); + goto done; } } @@ -1060,25 +1071,29 @@ static void timer_send_update_notifies(int round) update_vals, 1, 1)< 0) { LM_ERR("in sql update\n"); - goto error; + goto done; } - if (dbmode == RLS_DB_ONLY) + if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction) { - if (db_commit(&rlpres_dbf, rlpres_db) < 0) + if (rlpres_dbf.end_transaction(rlpres_db) < 0) { - LM_ERR("in COMMIT\n"); - goto error; + LM_ERR("in end_transaction\n"); + goto done; } } send_notifies(result, did_col, resource_uri_col, auth_state_col, reason_col, pres_state_col, content_type_col); -error: done: if(result) rlpres_dbf.free_result(rlpres_db, result); + if (dbmode == RLS_DB_ONLY && rls_dbf.abort_transaction) + { + if (rlpres_dbf.abort_transaction(rlpres_db) < 0) + LM_ERR("in abort_transaction\n"); + } } void timer_send_notify(unsigned int ticks,void *param) diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 46bda91..0aab750 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -124,7 +124,6 @@ int delete_expired_subs_rlsdb( void ) int i; subs_t subs; str rlsubs_did = {0, 0}; - int transaction_started = 0; if(rls_db == NULL) { @@ -149,12 +148,14 @@ int delete_expired_subs_rlsdb( void ) result_cols[r_to_tag_col=n_result_cols++] = &str_to_tag_col; result_cols[r_from_tag_col=n_result_cols++] = &str_from_tag_col; - if (db_begin(&rls_dbf, rls_db) < 0) + if (rls_dbf.start_transaction) { - LM_ERR("in BEGIN\n"); - goto error; + if (rls_dbf.start_transaction(rls_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } } - transaction_started = 1; if(rls_dbf.query(rls_db, query_cols, query_ops, query_vals, result_cols, n_query_cols, n_result_cols, 0, &result )< 0) @@ -221,10 +222,13 @@ int delete_expired_subs_rlsdb( void ) pkg_free(rlsubs_did.s); } - if (db_commit(&rls_dbf, rls_db) < 0) + if (rls_dbf.end_transaction) { - LM_ERR("in COMMIT\n"); - goto error; + if (rls_dbf.end_transaction(rls_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } } if(result) rls_dbf.free_result(rls_db, result); @@ -234,10 +238,10 @@ error: if (result) rls_dbf.free_result(rls_db, result); if (rlsubs_did.s) pkg_free(rlsubs_did.s); - if (transaction_started) + if (rls_dbf.abort_transaction) { - if (db_commit(&rls_dbf, rls_db) < 0) - LM_ERR("in COMMIT\n"); + if (rls_dbf.abort_transaction(rls_db) < 0) + LM_ERR("in abort_transaction\n"); } return -1;

1 0

git:master: modules/db_postgres: Added implementation of (start|end|abort) _transaction DB APIs
by Peter Dunkley 24 Apr '12

24 Apr '12

Module: sip-router Branch: master Commit: d544b24a6c844b06edd5da9ee1be9d6f2aafcb8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d544b24… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Apr 24 10:53:24 2012 +0100 modules/db_postgres: Added implementation of (start|end|abort)_transaction DB APIs --- modules/db_postgres/km_db_postgres.c | 3 + modules/db_postgres/km_dbase.c | 101 ++++++++++++++++++++++++++++++++++ modules/db_postgres/km_dbase.h | 15 +++++ modules/db_postgres/km_pg_con.h | 2 + 4 files changed, 121 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index f56a2ff..34edca7 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -96,6 +96,9 @@ int db_postgres_bind_api(db_func_t *dbb) dbb->update = db_postgres_update; dbb->replace = db_postgres_replace; dbb->affected_rows = db_postgres_affected_rows; + dbb->start_transaction= db_postgres_start_transaction; + dbb->end_transaction = db_postgres_end_transaction; + dbb->abort_transaction= db_postgres_abort_transaction; return 0; } diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 5e79d52..101cc8e 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -624,6 +624,107 @@ int db_postgres_affected_rows(const db1_con_t* _h) return CON_AFFECTED(_h); } +/** + * Starts a single transaction that will consist of one or more queries (SQL BEGIN) + * \param _h database handle + * \return 0 on success, negative on failure + */ +int db_postgres_start_transaction(db1_con_t* _h) +{ + db1_res_t *res = NULL; + str query_str = str_init("BEGIN"); + + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (CON_TRANSACTION(_h) == 1) { + LM_ERR("transaction already started\n"); + return -1; + } + + if (db_postgres_raw_query(_h, &query_str, &res) < 0) + { + LM_ERR("executing raw_query\n"); + return -1; + } + + if (res) db_postgres_free_result(_h, res); + + CON_TRANSACTION(_h) = 1; + return 0; +} + +/** + * Ends a transaction and commits the changes (SQL COMMIT) + * \param _h database handle + * \return 0 on success, negative on failure + */ +int db_postgres_end_transaction(db1_con_t* _h) +{ + db1_res_t *res = NULL; + str query_str = str_init("COMMIT"); + + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (CON_TRANSACTION(_h) == 0) { + LM_ERR("transaction not in progress\n"); + return -1; + } + + if (db_postgres_raw_query(_h, &query_str, &res) < 0) + { + LM_ERR("executing raw_query\n"); + return -1; + } + + if (res) db_postgres_free_result(_h, res); + + /* Only _end_ the transaction after the raw_query. That way, if the + raw_query fails, and the calling module does an abort_transaction() + to clean-up, a ROLLBACK will be sent to the DB. */ + CON_TRANSACTION(_h) = 0; + return 0; +} + +/** + * Ends a transaction and rollsback the changes (SQL ROLLBACK) + * \param _h database handle + * \return 1 if there was something to rollback, 0 if not, negative on failure + */ +int db_postgres_abort_transaction(db1_con_t* _h) +{ + db1_res_t *res = NULL; + str query_str = str_init("ROLLBACK"); + + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (CON_TRANSACTION(_h) == 0) { + LM_DBG("nothing to rollback\n"); + return 0; + } + + /* Whether the rollback succeeds or not we need to _end_ the + transaction now or all future starts will fail */ + CON_TRANSACTION(_h) = 0; + + if (db_postgres_raw_query(_h, &query_str, &res) < 0) + { + LM_ERR("executing raw_query\n"); + return -1; + } + + if (res) db_postgres_free_result(_h, res); + + return 1; +} /*! * Store name of table that will be used by subsequent database functions diff --git a/modules/db_postgres/km_dbase.h b/modules/db_postgres/km_dbase.h index 60c824b..4598139 100644 --- a/modules/db_postgres/km_dbase.h +++ b/modules/db_postgres/km_dbase.h @@ -113,6 +113,21 @@ int db_postgres_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrow int db_postgres_affected_rows(const db1_con_t* _h); /* + * SQL BEGIN + */ +int db_postgres_start_transaction(db1_con_t* _h); + +/* + * SQL COMMIT + */ +int db_postgres_end_transaction(db1_con_t* _h); + +/* + * SQL ROLLBACK + */ +int db_postgres_abort_transaction(db1_con_t* _h); + +/* * Store name of table that will be used by * subsequent database functions */ diff --git a/modules/db_postgres/km_pg_con.h b/modules/db_postgres/km_pg_con.h index b0f92c6..bfc2638 100644 --- a/modules/db_postgres/km_pg_con.h +++ b/modules/db_postgres/km_pg_con.h @@ -54,6 +54,7 @@ struct pg_con { char** row; /*!< Actual row in the result */ time_t timestamp; /*!< Timestamp of last query */ int affected_rows; /*!< Number of rows affected by the last statement */ + int transaction; /*!< indicates whether a multi-query transaction is currently open */ }; #define CON_SQLURL(db_con) (((struct pg_con*)((db_con)->tail))->sqlurl) @@ -64,6 +65,7 @@ struct pg_con { #define CON_TIMESTAMP(db_con) (((struct pg_con*)((db_con)->tail))->timestamp) #define CON_ID(db_con) (((struct pg_con*)((db_con)->tail))->id) #define CON_AFFECTED(db_con) (((struct pg_con*)((db_con)->tail))->affected_rows) +#define CON_TRANSACTION(db_con) (((struct pg_con*)((db_con)->tail))->transaction) /* * Create a new connection structure,

1 0

git:master: lib/srdb1: Converted db_(begin|end|rollback) to proper DB API functions
by Peter Dunkley 24 Apr '12

24 Apr '12

Module: sip-router Branch: master Commit: aca1c20d91878991b0a0bef4ae8bef3da89527d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aca1c20… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Apr 24 10:48:39 2012 +0100 lib/srdb1: Converted db_(begin|end|rollback) to proper DB API functions --- lib/srdb1/db.c | 6 ++++ lib/srdb1/db.h | 46 ++++++++++++++++++++------------- lib/srdb1/db_query.c | 69 -------------------------------------------------- 3 files changed, 34 insertions(+), 87 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index 17c018a..d57efa8 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -242,6 +242,12 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) "db_insert_update", 2, 0); dbf.insert_delayed = (db_insert_delayed_f)find_mod_export(tmp, "db_insert_delayed", 2, 0); + dbf.start_transaction = (db_start_transaction_f)find_mod_export(tmp, + "db_start_transaction", 1, 0); + dbf.end_transaction = (db_end_transaction_f)find_mod_export(tmp, + "db_end_transaction", 1, 0); + dbf.abort_transaction = (db_abort_transaction_f)find_mod_export(tmp, + "db_abort_transaction", 1, 0); } if(db_check_api(&dbf, tmp)!=0) goto error; diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index a0927e5..2cbcdf7 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -341,6 +341,31 @@ typedef int (*db_insert_delayed_f) (const db1_con_t* _h, const db_key_t* _k, */ typedef int (*db_affected_rows_f) (const db1_con_t* _h); +/** + * \brief Start a single transaction that will consist of one or more queries. + * + * \param _h structure representing database connection + * \return 0 if everything is OK, otherwise returns < 0 + */ +typedef int (*db_start_transaction_f) (db1_con_t* _h); + +/** + * \brief End a transaction. + * + * \param _h structure representing database connection + * \return 0 if everything is OK, otherwise returns < 0 + */ +typedef int (*db_end_transaction_f) (db1_con_t* _h); + +/** + * \brief Abort a transaction. + * + * Use this function if you have an error after having started a transaction + * and you want to rollback any uncommitted changes before continuing. + * \param _h structure representing database connection + * \return 1 if there was something to rollbak, 0 if not, negative on failure + */ +typedef int (*db_abort_transaction_f) (db1_con_t* _h); /** * \brief Database module callbacks @@ -368,6 +393,9 @@ typedef struct db_func { db_insert_update_f insert_update; /* Insert into table, update on duplicate key */ db_insert_delayed_f insert_delayed; /* Insert delayed into table */ db_affected_rows_f affected_rows; /* Numer of affected rows for last query */ + db_start_transaction_f start_transaction; /* Start a single transaction consisting of multiple queries */ + db_end_transaction_f end_transaction; /* End a transaction */ + db_abort_transaction_f abort_transaction; /* Abort a transaction */ } db_func_t; @@ -518,22 +546,4 @@ int db_fetch_query(db_func_t *dbf, int frows, int db_fetch_next(db_func_t *dbf, int frows, db1_con_t* _h, db1_res_t** _r); -/** - * \brief wrapper around db raw_query to perform BEGIN - * \return -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability - */ -int db_begin(db_func_t *dbf, db1_con_t* _h); - -/** - * \brief wrapper around db raw_query to perform COMMIT - * \return -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability - */ -int db_commit(db_func_t *dbf, db1_con_t* _h); - -/** - * \wrapper around db raw_query to perform ROLLBACK - * \return -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability - */ -int db_rollback(db_func_t *dbf, db1_con_t* _h); - #endif /* DB1_H */ diff --git a/lib/srdb1/db_query.c b/lib/srdb1/db_query.c index 1305f46..004d10c 100644 --- a/lib/srdb1/db_query.c +++ b/lib/srdb1/db_query.c @@ -456,72 +456,3 @@ error: } return -1; } - -/** - * wrapper around db raw_query to perform BEGIN - * return: -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability - */ -int db_begin(db_func_t *dbf, db1_con_t* _h) -{ - db1_res_t *res = NULL; - int ret = 0; - str query_str = str_init("BEGIN"); - - if (DB_CAPABILITY(*dbf, DB_CAP_RAW_QUERY)) { - if (dbf->raw_query(_h, &query_str, &res)) { - LM_ERR("unable to run raw query\n"); - ret = -1; - goto done; - } - ret = 1; - } -done: - if (res) dbf->free_result(_h, res); - return ret; -} - -/** - * wrapper around db raw_query to perform COMMIT - * return: -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability - */ -int db_commit(db_func_t *dbf, db1_con_t* _h) -{ - db1_res_t *res = NULL; - int ret = 0; - str query_str = str_init("COMMIT"); - - if (DB_CAPABILITY(*dbf, DB_CAP_RAW_QUERY)) { - if (dbf->raw_query(_h, &query_str, &res)) { - LM_ERR("unable to run raw query\n"); - ret = -1; - goto done; - } - ret = 1; - } -done: - if (res) dbf->free_result(_h, res); - return ret; -} - -/** - * wrapper around db raw_query to perform ROLLBACK - * return: -1 error; 0 OK with no raw_query capability; 1 OK with raw_query capability - */ -int db_rollback(db_func_t *dbf, db1_con_t* _h) -{ - db1_res_t *res = NULL; - int ret = 0; - str query_str = str_init("COMMIT"); - - if (DB_CAPABILITY(*dbf, DB_CAP_RAW_QUERY)) { - if (dbf->raw_query(_h, &query_str, &res)) { - LM_ERR("unable to run raw query\n"); - ret = -1; - goto done; - } - ret = 1; - } -done: - if (res) dbf->free_result(_h, res); - return ret; -}

1 0

git:master: msilo(k): updated table version value to match db schema
by Daniel-Constantin Mierla 24 Apr '12

24 Apr '12

Module: sip-router Branch: master Commit: 0af556b85415533104892b8654b53b105c8b8aa2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0af556b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 24 10:19:34 2012 +0200 msilo(k): updated table version value to match db schema --- modules_k/msilo/msilo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 12e6fe0..2680af4 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -112,7 +112,7 @@ static str sc_stored_hdrs = str_init("extra_hdrs"); /* 10 */ MODULE_VERSION -#define S_TABLE_VERSION 6 +#define S_TABLE_VERSION 7 /** database connection */ static db1_con_t *db_con = NULL;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012