sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

git:3.2: modules/lcr: fixed testing of transport protocol by to_gw functions
by Juha Heinanen 01 Dec '11

01 Dec '11

Module: sip-router Branch: 3.2 Commit: e80ca150ece624be1faf6abadf1ee692b6ee1b19 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e80ca15… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Dec 1 12:00:32 2011 +0200 modules/lcr: fixed testing of transport protocol by to_gw functions - Test failed when transport protocol is taken from Request-URI and there is not any. (cherry picked from commit 5cd8e582f833243884fa4daf891d24c4c0dcf1f9) --- modules/lcr/lcr_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 790c1e8..dac5c7d 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2320,7 +2320,7 @@ static int do_to_gw(struct sip_msg* _m, unsigned int lcr_id, /* Return result */ if ((res != NULL) && ((res->transport == transport) || - ((res->transport == PROTO_NONE) && (transport == PROTO_UDP)))) { + ((transport == PROTO_NONE) && (res->transport == PROTO_UDP)))) { LM_DBG("request goes to gw\n"); return 1; } else {

1 0

git:master: modules/lcr: fixed testing of transport protocol by to_gw functions
by Juha Heinanen 01 Dec '11

01 Dec '11

Module: sip-router Branch: master Commit: 5cd8e582f833243884fa4daf891d24c4c0dcf1f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5cd8e58… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Dec 1 12:00:32 2011 +0200 modules/lcr: fixed testing of transport protocol by to_gw functions - Test failed when transport protocol is taken from Request-URI and there is not any. --- modules/lcr/lcr_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 790c1e8..dac5c7d 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2320,7 +2320,7 @@ static int do_to_gw(struct sip_msg* _m, unsigned int lcr_id, /* Return result */ if ((res != NULL) && ((res->transport == transport) || - ((res->transport == PROTO_NONE) && (transport == PROTO_UDP)))) { + ((transport == PROTO_NONE) && (res->transport == PROTO_UDP)))) { LM_DBG("request goes to gw\n"); return 1; } else {

1 0

git:master: rls(k): regenerated the readme file
by Daniel-Constantin Mierla 01 Dec '11

01 Dec '11

Module: sip-router Branch: master Commit: cf17660d7bdd9d5ba94d73a4a06fab653369f227 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf17660… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 1 09:55:57 2011 +0100 rls(k): regenerated the readme file --- modules_k/rls/README | 198 +++++++++++++++++++++++++++----------------------- 1 files changed, 106 insertions(+), 92 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cf1…

1 0

git:master: rls(k): option load db records in chunks
by Daniel-Constantin Mierla 01 Dec '11

01 Dec '11

Module: sip-router Branch: master Commit: 3678ef86a542f93f13c39316b5be692875b459b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3678ef8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 1 09:49:22 2011 +0100 rls(k): option load db records in chunks - cope better with large number of db records - new parameter fetch_rows (default value 500) --- modules_k/rls/rls.c | 133 +++++++++++++++++++++++++++------------------------ 1 files changed, 70 insertions(+), 63 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 6e2f1c5..bc3c6bb 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -176,6 +176,8 @@ str str_doc_uri_col = str_init("doc_uri"); /* outbound proxy address */ str rls_outbound_proxy = {0, 0}; +int rls_fetch_rows = 500; + /** module functions */ static int mod_init(void); @@ -219,8 +221,9 @@ static param_export_t params[]={ { "outbound_proxy", STR_PARAM, &rls_outbound_proxy.s }, { "reload_db_subs", INT_PARAM, &rls_reload_db_subs }, { "max_notify_body_length", INT_PARAM, &rls_max_notify_body_len }, - { "db_mode", INT_PARAM, &dbmode }, - { "expires_offset", INT_PARAM, &rls_expires_offset }, + { "db_mode", INT_PARAM, &dbmode }, + { "expires_offset", INT_PARAM, &rls_expires_offset }, + { "fetch_rows", INT_PARAM, &rls_fetch_rows }, {0, 0, 0 } }; @@ -768,7 +771,8 @@ int rls_restore_db_subs(void) return -1; } - if(rls_dbf.query(rls_db,0, 0, 0, result_cols,0, n_result_cols, 0,&res)< 0) + if(db_fetch_query(&rls_dbf, rls_fetch_rows, rls_db, 0, 0, 0, + result_cols,0, n_result_cols, 0, &res)< 0) { LM_ERR("while querrying table\n"); if(res) @@ -789,89 +793,92 @@ int rls_restore_db_subs(void) return 0; } - LM_DBG("found %d db entries\n", res->n); + do { + LM_DBG("found %d db entries\n", res->n); - for(i =0 ; i< res->n ; i++) - { - row = &res->rows[i]; - row_vals = ROW_VALUES(row); - memset(&s, 0, sizeof(subs_t)); + for(i =0 ; i< res->n ; i++) + { + row = &res->rows[i]; + row_vals = ROW_VALUES(row); + memset(&s, 0, sizeof(subs_t)); - expires= row_vals[expires_col].val.int_val; + expires= row_vals[expires_col].val.int_val; - if(expires< (int)time(NULL)) - continue; + if(expires< (int)time(NULL)) + continue; - s.pres_uri.s= (char*)row_vals[pres_uri_col].val.string_val; - s.pres_uri.len= strlen(s.pres_uri.s); + s.pres_uri.s= (char*)row_vals[pres_uri_col].val.string_val; + s.pres_uri.len= strlen(s.pres_uri.s); - s.to_user.s=(char*)row_vals[to_user_col].val.string_val; - s.to_user.len= strlen(s.to_user.s); + s.to_user.s=(char*)row_vals[to_user_col].val.string_val; + s.to_user.len= strlen(s.to_user.s); - s.to_domain.s=(char*)row_vals[to_domain_col].val.string_val; - s.to_domain.len= strlen(s.to_domain.s); + s.to_domain.s=(char*)row_vals[to_domain_col].val.string_val; + s.to_domain.len= strlen(s.to_domain.s); - s.from_user.s=(char*)row_vals[from_user_col].val.string_val; - s.from_user.len= strlen(s.from_user.s); + s.from_user.s=(char*)row_vals[from_user_col].val.string_val; + s.from_user.len= strlen(s.from_user.s); - s.from_domain.s=(char*)row_vals[from_domain_col].val.string_val; - s.from_domain.len= strlen(s.from_domain.s); + s.from_domain.s=(char*)row_vals[from_domain_col].val.string_val; + s.from_domain.len= strlen(s.from_domain.s); - s.to_tag.s=(char*)row_vals[totag_col].val.string_val; - s.to_tag.len= strlen(s.to_tag.s); + s.to_tag.s=(char*)row_vals[totag_col].val.string_val; + s.to_tag.len= strlen(s.to_tag.s); - s.from_tag.s=(char*)row_vals[fromtag_col].val.string_val; - s.from_tag.len= strlen(s.from_tag.s); + s.from_tag.s=(char*)row_vals[fromtag_col].val.string_val; + s.from_tag.len= strlen(s.from_tag.s); - s.callid.s=(char*)row_vals[callid_col].val.string_val; - s.callid.len= strlen(s.callid.s); + s.callid.s=(char*)row_vals[callid_col].val.string_val; + s.callid.len= strlen(s.callid.s); - ev_sname.s= (char*)row_vals[event_col].val.string_val; - ev_sname.len= strlen(ev_sname.s); + ev_sname.s= (char*)row_vals[event_col].val.string_val; + ev_sname.len= strlen(ev_sname.s); - event= pres_contains_event(&ev_sname, &parsed_event); - if(event== NULL) - { - LM_ERR("event not found in list\n"); - goto error; - } - s.event= event; + event= pres_contains_event(&ev_sname, &parsed_event); + if(event== NULL) + { + LM_ERR("event not found in list\n"); + goto error; + } + s.event= event; - s.event_id.s=(char*)row_vals[event_id_col].val.string_val; - if(s.event_id.s) - s.event_id.len= strlen(s.event_id.s); + s.event_id.s=(char*)row_vals[event_id_col].val.string_val; + if(s.event_id.s) + s.event_id.len= strlen(s.event_id.s); - s.remote_cseq= row_vals[remote_cseq_col].val.int_val; - s.local_cseq= row_vals[local_cseq_col].val.int_val; - s.version= row_vals[version_col].val.int_val; + s.remote_cseq= row_vals[remote_cseq_col].val.int_val; + s.local_cseq= row_vals[local_cseq_col].val.int_val; + s.version= row_vals[version_col].val.int_val; - s.expires= expires- (int)time(NULL); - s.status= row_vals[status_col].val.int_val; + s.expires= expires- (int)time(NULL); + s.status= row_vals[status_col].val.int_val; - s.reason.s= (char*)row_vals[reason_col].val.string_val; - if(s.reason.s) - s.reason.len= strlen(s.reason.s); + s.reason.s= (char*)row_vals[reason_col].val.string_val; + if(s.reason.s) + s.reason.len= strlen(s.reason.s); - s.contact.s=(char*)row_vals[contact_col].val.string_val; - s.contact.len= strlen(s.contact.s); + s.contact.s=(char*)row_vals[contact_col].val.string_val; + s.contact.len= strlen(s.contact.s); - s.local_contact.s=(char*)row_vals[local_contact_col].val.string_val; - s.local_contact.len= strlen(s.local_contact.s); + s.local_contact.s=(char*)row_vals[local_contact_col].val.string_val; + s.local_contact.len= strlen(s.local_contact.s); - s.record_route.s=(char*)row_vals[record_route_col].val.string_val; - if(s.record_route.s) - s.record_route.len= strlen(s.record_route.s); + s.record_route.s=(char*)row_vals[record_route_col].val.string_val; + if(s.record_route.s) + s.record_route.len= strlen(s.record_route.s); - s.sockinfo_str.s=(char*)row_vals[sockinfo_col].val.string_val; - s.sockinfo_str.len= strlen(s.sockinfo_str.s); + s.sockinfo_str.s=(char*)row_vals[sockinfo_col].val.string_val; + s.sockinfo_str.len= strlen(s.sockinfo_str.s); - hash_code= core_hash(&s.pres_uri, &s.event->name, hash_size); - if(pres_insert_shtable(rls_table, hash_code, &s)< 0) - { - LM_ERR("adding new record in hash table\n"); - goto error; + hash_code= core_hash(&s.pres_uri, &s.event->name, hash_size); + if(pres_insert_shtable(rls_table, hash_code, &s)< 0) + { + LM_ERR("adding new record in hash table\n"); + goto error; + } } - } + } while((db_fetch_next(&rls_dbf, rls_fetch_rows, rls_db, &res)==1) + && (RES_ROW_N(res)>0)); rls_dbf.free_result(rls_db, res);

1 0

git:master: presence(k): documented fetch_rows parameter
by Daniel-Constantin Mierla 01 Dec '11

01 Dec '11

Module: sip-router Branch: master Commit: 20f71de9d02c31378011a931fde9cd1677c75621 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20f71de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 1 09:55:10 2011 +0100 presence(k): documented fetch_rows parameter --- modules_k/presence/doc/presence_admin.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/doc/presence_admin.xml b/modules_k/presence/doc/presence_admin.xml index a3cb721..3966644 100644 --- a/modules_k/presence/doc/presence_admin.xml +++ b/modules_k/presence/doc/presence_admin.xml @@ -425,6 +425,25 @@ modparam("presence", "timeout_rm_subs", 0) </programlisting> </example> </section> + <section> + <title><varname>fetch_rows</varname> (integer)</title> + <para> + Number of rows to be loaded in one step from database. + </para> + <para> + <emphasis> + Default value is 500. + </emphasis> + </para> + <example> + <title>Set <varname>fetch_rows</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence", "fetch_rows", 1000) +... +</programlisting> + </example> + </section> </section>

1 0

git:master: presence(k): regenerated the readme
by Daniel-Constantin Mierla 01 Dec '11

01 Dec '11

Module: sip-router Branch: master Commit: 4f7d94fbfb4d5d93eabf2e256ffcfb936e138a2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f7d94f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 1 09:55:33 2011 +0100 presence(k): regenerated the readme --- modules_k/presence/README | 117 +++++++++++++++++++++++++------------------- 1 files changed, 66 insertions(+), 51 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4f7…

1 0

git:master: rls(k): documented fetch_rows parameter
by Daniel-Constantin Mierla 01 Dec '11

01 Dec '11

Module: sip-router Branch: master Commit: 50985d2cfc0e3bbe394cc7fe64f9ccd39dc5c962 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50985d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 1 09:54:42 2011 +0100 rls(k): documented fetch_rows parameter --- modules_k/rls/doc/rls_admin.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/modules_k/rls/doc/rls_admin.xml b/modules_k/rls/doc/rls_admin.xml index c036b33..4870049 100644 --- a/modules_k/rls/doc/rls_admin.xml +++ b/modules_k/rls/doc/rls_admin.xml @@ -464,6 +464,25 @@ modparam("rls", "max_notify_body_length", 32000) </programlisting> </example> </section> + <section> + <title><varname>fetch_rows</varname> (integer)</title> + <para> + Number of rows to be loaded in one step from database. + </para> + <para> + <emphasis> + Default value is 500. + </emphasis> + </para> + <example> + <title>Set <varname>fetch_rows</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rls", "fetch_rows", 1000) +... +</programlisting> + </example> + </section> </section>

1 0

[tracker] Comment added: textopsx:msg_apply_changes() can corrupt incoming TCP message buffer
by sip-router 01 Dec '11

01 Dec '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#185 - textopsx:msg_apply_changes() can corrupt incoming TCP message buffer User who did this - Daniel-Constantin Mierla (miconda) ---------- I will look for safe options for such cases. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=185#comment432 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] User took ownership: textopsx:msg_apply_changes() can corrupt incoming TCP message buffer
by sip-router 01 Dec '11

01 Dec '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#185 - textopsx:msg_apply_changes() can corrupt incoming TCP message buffer More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=185 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

git:master: presence(k): option to fetch records from db in chunks
by Daniel-Constantin Mierla 01 Dec '11

01 Dec '11

Module: sip-router Branch: master Commit: 5931a413c2e7be4aa0c8ec57f777c1f1805dc86e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5931a41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 1 09:20:01 2011 +0100 presence(k): option to fetch records from db in chunks - can cope with large number of db records - new parameter fetch_rows (default value 500) --- modules_k/presence/presence.c | 2 + modules_k/presence/presentity.c | 96 +++++++++++++++++++++------------------ modules_k/presence/subscribe.c | 42 +++-------------- 3 files changed, 60 insertions(+), 80 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index b0ec644..d3db179 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -90,6 +90,7 @@ str presentity_table= str_init("presentity"); str active_watchers_table = str_init("active_watchers"); str watchers_table= str_init("watchers"); +int pres_fetch_rows = 500; int library_mode= 0; str server_address= {0, 0}; evlist_t* EvList= NULL; @@ -179,6 +180,7 @@ static param_export_t params[]={ { "enable_sphere_check", INT_PARAM, &sphere_enable}, { "timeout_rm_subs", INT_PARAM, &timeout_rm_subs}, { "send_fast_notify", INT_PARAM, &send_fast_notify}, + { "fetch_rows", INT_PARAM, &pres_fetch_rows}, {0,0,0} }; diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c index 75c3cfc..0c194f2 100644 --- a/modules_k/presence/presentity.c +++ b/modules_k/presence/presentity.c @@ -54,6 +54,8 @@ xmlNodePtr xmlNodeGetNodeByName(xmlNodePtr node, const char *name, static str pu_200_rpl = str_init("OK"); static str pu_412_rpl = str_init("Conditional request failed"); +extern int pres_fetch_rows; + #define ETAG_LEN 128 char* generate_ETag(int publ_count) @@ -717,8 +719,8 @@ int pres_htable_restore(void) goto error; } static str query_str = str_init("username"); - if (pa_dbf.query (pa_db, 0, 0, 0,result_cols,0, n_result_cols, - &query_str, &result) < 0) + if (db_fetch_query(&pa_dbf, pres_fetch_rows, pa_db, 0, 0, 0, result_cols, + 0, n_result_cols, &query_str, &result) < 0) { LM_ERR("querying presentity\n"); goto error; @@ -731,58 +733,62 @@ int pres_htable_restore(void) pa_dbf.free_result(pa_db, result); return 0; } - - for(i= 0; i< result->n; i++) - { - row = &result->rows[i]; - row_vals = ROW_VALUES(row); - if(row_vals[expires_col].val.int_val< (int)time(NULL)) - continue; - - sphere= NULL; - user.s= (char*)row_vals[user_col].val.string_val; - user.len= strlen(user.s); - domain.s= (char*)row_vals[domain_col].val.string_val; - domain.len= strlen(domain.s); - ev_str.s= (char*)row_vals[event_col].val.string_val; - ev_str.len= strlen(ev_str.s); - - if(event_parser(ev_str.s, ev_str.len, &ev)< 0) + do { + for(i= 0; i< result->n; i++) { - LM_ERR("parsing event\n"); + row = &result->rows[i]; + row_vals = ROW_VALUES(row); + + if(row_vals[expires_col].val.int_val< (int)time(NULL)) + continue; + + sphere= NULL; + user.s= (char*)row_vals[user_col].val.string_val; + user.len= strlen(user.s); + domain.s= (char*)row_vals[domain_col].val.string_val; + domain.len= strlen(domain.s); + ev_str.s= (char*)row_vals[event_col].val.string_val; + ev_str.len= strlen(ev_str.s); + + if(event_parser(ev_str.s, ev_str.len, &ev)< 0) + { + LM_ERR("parsing event\n"); + free_event_params(ev.params.list, PKG_MEM_TYPE); + goto error; + } + event= ev.type; free_event_params(ev.params.list, PKG_MEM_TYPE); - goto error; - } - event= ev.type; - free_event_params(ev.params.list, PKG_MEM_TYPE); - if(uandd_to_uri(user, domain, &uri)< 0) - { - LM_ERR("constructing uri\n"); - goto error; - } - /* insert in hash_table*/ + if(uandd_to_uri(user, domain, &uri)< 0) + { + LM_ERR("constructing uri\n"); + goto error; + } + /* insert in hash_table*/ - if(sphere_enable && event== EVENT_PRESENCE ) - { - body.s= (char*)row_vals[body_col].val.string_val; - body.len= strlen(body.s); - sphere= extract_sphere(body); - } + if(sphere_enable && event== EVENT_PRESENCE ) + { + body.s= (char*)row_vals[body_col].val.string_val; + body.len= strlen(body.s); + sphere= extract_sphere(body); + } - if(insert_phtable(&uri, event, sphere)< 0) - { - LM_ERR("inserting record in presentity hash table"); - pkg_free(uri.s); + if(insert_phtable(&uri, event, sphere)< 0) + { + LM_ERR("inserting record in presentity hash table"); + pkg_free(uri.s); + if(sphere) + pkg_free(sphere); + goto error; + } if(sphere) pkg_free(sphere); - goto error; + pkg_free(uri.s); } - if(sphere) - pkg_free(sphere); - pkg_free(uri.s); - } + } while((db_fetch_next(&pa_dbf, pres_fetch_rows, pa_db, &result)==1) + && (RES_ROW_N(result)>0)); + pa_dbf.free_result(pa_db, result); return 0; diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 3227cc7..b29fa34 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -46,8 +46,6 @@ #include "notify.h" #include "../pua/hash.h" -#define ACTW_FETCH_SIZE 128 - int get_stored_info(struct sip_msg* msg, subs_t* subs, int* error_ret, str* reply_str); int get_database_info(struct sip_msg* msg, subs_t* subs, int* error_ret, @@ -61,6 +59,7 @@ static str pu_400_rpl = str_init("Bad request"); static str pu_500_rpl = str_init("Server Internal Error"); static str pu_489_rpl = str_init("Bad Event"); +extern int pres_fetch_rows; int send_2XX_reply(struct sip_msg * msg, int reply_code, int lexpire, str* local_contact) @@ -1837,27 +1836,11 @@ int restore_db_subs(void) } /* select the whole table and all the columns */ - if (DB_CAPABILITY(pa_dbf, DB_CAP_FETCH)) + if (db_fetch_query(&pa_dbf, pres_fetch_rows, pa_db, 0, 0, 0, result_cols, + 0, n_result_cols, 0, &result) < 0) { - if(pa_dbf.query(pa_db,0,0,0,result_cols, 0, - n_result_cols, 0, 0) < 0) - { - LM_ERR("Error while querying (fetch) database\n"); - return -1; - } - if(pa_dbf.fetch_result(pa_db,&result,ACTW_FETCH_SIZE)<0) - { - LM_ERR("fetching rows failed\n"); - return -1; - } - } else - { - if (pa_dbf.query (pa_db, 0, 0, 0,result_cols,0, n_result_cols, - 0, &result) < 0) - { - LM_ERR("querying presentity\n"); - goto error; - } + LM_ERR("querying presentity\n"); + goto error; } nr_rows = RES_ROW_N(result); @@ -1983,19 +1966,8 @@ int restore_db_subs(void) } } - /* any more data to be fetched ?*/ - if (DB_CAPABILITY(pa_dbf, DB_CAP_FETCH)) { - if (pa_dbf.fetch_result( pa_db, &result, - ACTW_FETCH_SIZE ) < 0) { - LM_ERR("fetching more rows failed\n"); - goto error; - } - nr_rows = RES_ROW_N(result); - } else { - nr_rows = 0; - } - - }while (nr_rows>0); + } while((db_fetch_next(&pa_dbf, pres_fetch_rows, pa_db, &result)==1) + && (RES_ROW_N(result)>0)); pa_dbf.free_result(pa_db, result);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011