sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

git:master: modules_k/pua: Fixed race hazard on pua table

by Peter Dunkley

Module: sip-router Branch: master Commit: 287ee15ffa985cb6d07f192f1d1cbfadb31c0fd8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=287ee15… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 12 21:52:39 2012 +0000 modules_k/pua: Fixed race hazard on pua table - During testing a race hazard where the 2XX to a back-end SUBSCRIBE can be received and processed (and the DB UPDATE to convert a temporary dialog to a full dialog) before the DB INSERT to create a temporary dialog is run. There is an incredibly small window for this, but it was happening consistently on one system. - The easiest way to fix this is to use the replace() DB API to convert the dialog and live with the initial INSERT failing (this does not actually return an error from the SRDB1 interface so the rest of the code continues OK). Unfortunately, the replace() API is not available for some databases (for example, PostgreSQL). - I have updated the code to use replace() when it is available and to do an update() then check affected_rows() (and if 0 then do an insert()) when replace() is not available. - The update() and then insert() process makes the window for the race much smaller, but doesn't get rid of it completely. However, with PostgreSQL a DB rule can be used to fix it completely: - PostgreSQL DB rule: CREATE RULE "pua_insert_race1" AS ON INSERT TO "pua" WHERE EXISTS( SELECT 1 FROM pua WHERE call_id=NEW.call_id AND from_tag=NEW.from_tag AND pres_id=NEW.pres_id AND to_tag='' ) DO INSTEAD ( UPDATE pua SET expires=NEW.expires, desired_expires=NEW.desired_expires, flag=NEW.flag, etag=NEW.etag, tuple_id=NEW.tuple_id, to_tag=NEW.to_tag, cseq=NEW.cseq, record_route=NEW.record_route, contact=NEW.contact, remote_contact=NEW.remote_contact, version=NEW.version, extra_headers=NEW.extra_headers WHERE call_id=NEW.call_id AND from_tag=NEW.from_tag AND pres_id=NEW.pres_id ); - You can also add another PostgreSQL rule to make the failing INSERT (described above) do so quietly. This does not affect the function of the code, but it will make the logs quieter (which is nice): CREATE RULE "pua_insert_race2" AS ON INSERT TO "pua" WHERE EXISTS( SELECT 1 FROM pua WHERE call_id=NEW.call_id AND from_tag=NEW.from_tag AND to_tag<>'' ) DO INSTEAD NOTHING; --- modules_k/pua/pua_db.c | 187 +++++++++++++++++++++++++--------------- modules_k/pua/send_subscribe.c | 54 ------------ 2 files changed, 118 insertions(+), 123 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index b83e3ed..b652cee 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -883,9 +883,9 @@ int get_record_id_puadb(ua_pres_t *pres, str **rec_id ) /******************************************************************************/ int convert_temporary_dialog_puadb(ua_pres_t *pres) { - db_key_t query_cols[4], data_cols[10]; - db_val_t query_vals[4], data_vals[10]; - int n_query_cols = 0, n_data_cols = 0; + db_key_t query_cols[18]; + db_val_t query_vals[18]; + int n_query_cols = 0; if (pres==NULL) { @@ -920,82 +920,131 @@ int convert_temporary_dialog_puadb(ua_pres_t *pres) n_query_cols++; /* The columns I need to fill in to convert a temporary dialog to a dialog */ - data_cols[n_data_cols] = &str_expires_col; - data_vals[n_data_cols].type = DB1_INT; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.int_val = pres->expires; - n_data_cols++; - - data_cols[n_data_cols] = &str_desired_expires_col; - data_vals[n_data_cols].type = DB1_INT; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.int_val = pres->desired_expires; - n_data_cols++; - - data_cols[n_data_cols] = &str_flag_col; - data_vals[n_data_cols].type = DB1_INT; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.int_val = pres->flag; - n_data_cols++; - - data_cols[n_data_cols] = &str_to_tag_col; - data_vals[n_data_cols].type = DB1_STR; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.str_val = pres->to_tag; - n_data_cols++; - - data_cols[n_data_cols] = &str_cseq_col; - data_vals[n_data_cols].type = DB1_INT; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.int_val = pres->cseq; - n_data_cols++; - - data_cols[n_data_cols] = &str_record_route_col; - data_vals[n_data_cols].type = DB1_STR; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.str_val = pres->record_route; - n_data_cols++; - - data_cols[n_data_cols] = &str_contact_col; - data_vals[n_data_cols].type = DB1_STR; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.str_val = pres->contact; - n_data_cols++; - - data_cols[n_data_cols] = &str_remote_contact_col; - data_vals[n_data_cols].type = DB1_STR; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.str_val = pres->remote_contact; - n_data_cols++; - - data_cols[n_data_cols] = &str_version_col; - data_vals[n_data_cols].type = DB1_INT; - data_vals[n_data_cols].nul = 0; - data_vals[n_data_cols].val.int_val = pres->version; - n_data_cols++; - - data_cols[n_data_cols] = &str_extra_headers_col; - data_vals[n_data_cols].type = DB1_STR; - data_vals[n_data_cols].nul = 0; + query_cols[n_query_cols] = &str_expires_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val = pres->expires; + n_query_cols++; + + query_cols[n_query_cols] = &str_desired_expires_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val = pres->desired_expires; + n_query_cols++; + + query_cols[n_query_cols] = &str_flag_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val = pres->flag; + n_query_cols++; + + query_cols[n_query_cols] = &str_to_tag_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = pres->to_tag; + n_query_cols++; + + query_cols[n_query_cols] = &str_cseq_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val = pres->cseq; + n_query_cols++; + + query_cols[n_query_cols] = &str_record_route_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = pres->record_route; + n_query_cols++; + + query_cols[n_query_cols] = &str_contact_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = pres->contact; + n_query_cols++; + + query_cols[n_query_cols] = &str_remote_contact_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val = pres->remote_contact; + n_query_cols++; + + query_cols[n_query_cols] = &str_version_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val = pres->version; + n_query_cols++; + + query_cols[n_query_cols] = &str_extra_headers_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; if (pres->extra_headers) { - data_vals[n_data_cols].val.str_val.s = pres->extra_headers->s; - data_vals[n_data_cols].val.str_val.len = pres->extra_headers->len; + query_vals[n_query_cols].val.str_val.s = pres->extra_headers->s; + query_vals[n_query_cols].val.str_val.len = pres->extra_headers->len; } else { - data_vals[n_data_cols].val.str_val.s = ""; - data_vals[n_data_cols].val.str_val.len = 0; + query_vals[n_query_cols].val.str_val.s = ""; + query_vals[n_query_cols].val.str_val.len = 0; } - n_data_cols++; + n_query_cols++; - if (pua_dbf.update(pua_db, query_cols, 0, query_vals, - data_cols, data_vals, n_query_cols, n_data_cols) < 0) + query_cols[n_query_cols] = &str_event_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val = pres->event; + n_query_cols++; + + query_cols[n_query_cols] = &str_watcher_uri_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val.s = pres->watcher_uri->s; + query_vals[n_query_cols].val.str_val.len = pres->watcher_uri->len; + n_query_cols++; + + query_cols[n_query_cols] = &str_etag_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val.s = 0; + query_vals[n_query_cols].val.str_val.len = 0; + n_query_cols++; + + query_cols[n_query_cols] = &str_tuple_id_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.str_val.s = 0; + query_vals[n_query_cols].val.str_val.len = 0; + n_query_cols++; + + if (pua_dbf.replace != NULL) { - LM_ERR("Failed update db\n"); - return -1; + if (pua_dbf.replace(pua_db, query_cols, query_vals, n_query_cols) < 0) + { + LM_ERR("Failed replace db\n"); + return -1; + } + } + else + { + if (pua_dbf.update(pua_db, query_cols, 0, query_vals, + query_cols + 4, query_vals + 4, 4, n_query_cols - 4) < 0) + { + LM_ERR("Failed update db\n"); + return -1; + } + + LM_DBG("affected_rows: %d\n", pua_dbf.affected_rows(pua_db)); + if (pua_dbf.affected_rows(pua_db) == 0) + { + if (pua_dbf.insert(pua_db, query_cols, query_vals, n_query_cols) < 0) + { + LM_ERR("Failed insert db\n"); + return -1; + } + } } + shm_free(pres->remote_contact.s); shm_free(pres); diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 15a1a02..b135ac3 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -1050,18 +1050,9 @@ insert: if(subs->flag & UPDATE_TYPE) { - /* - LM_ERR("request for a subscription" - " with update type and no record found\n"); - ret= -1; - goto done; - commented this because of the strange type parameter in usrloc callback functions - */ - LM_DBG("request for a subscription with update type" " and no record found\n"); subs->flag= INSERT_TYPE; - } hentity= subscribe_cbparam(subs, REQ_OTHER); if(hentity== NULL) @@ -1168,50 +1159,6 @@ insert: } else { - /* - if(presentity->desired_expires== 0) - { - - if(subs->expires< 0) - { - LM_DBG("Found previous request for unlimited subscribe-" - " do not send subscribe\n"); - - if (subs->event & PWINFO_EVENT) - { - presentity->watcher_count++; - } - lock_release(&HashT->p_records[hash_code].lock); - goto done; - - } - - - if(subs->event & PWINFO_EVENT) - { - if(subs->expires== 0) - { - presentity->watcher_count--; - if( presentity->watcher_count> 0) - { - lock_release(&HashT->p_records[hash_code].lock); - goto done; - } - } - else - { - presentity->watcher_count++; - if(presentity->watcher_count> 1) - { - lock_release(&HashT->p_records[hash_code].lock); - goto done; - } - } - } - - } - */ - if (subs->internal_update_flag == INTERNAL_UPDATE_TRUE) { LM_INFO("attempting to re-SUBSCRIBE on internal (rls_update_subs()) update - skipping\n"); @@ -1265,7 +1212,6 @@ insert: if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); - // hentity->flag= flag; LM_DBG("event parameter: %d\n", hentity->event); set_uac_req(&uac_r, &met, str_hdr, 0, td, TMCB_LOCAL_COMPLETED,

12 years, 6 months

git:master: modules_k/presence: Some important stuff was removed when the latest set of presence fixes were merged in

by Peter Dunkley

Module: sip-router Branch: master Commit: 54b44414fff9eb94cad752f93d54005eea8c0c85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54b4441… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 6 18:04:20 2012 +0000 modules_k/presence: Some important stuff was removed when the latest set of presence fixes were merged in - The result was that PUA and RLS in master would not longer compile - I have restored the stuff needed to build PUA and RLS, but there could well be other stuff that has been lost --- modules_k/presence/subscribe.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h index 05a8fa5..bf7d189 100644 --- a/modules_k/presence/subscribe.h +++ b/modules_k/presence/subscribe.h @@ -52,6 +52,9 @@ struct pres_ev; #define PRES_SUBSCRIBE_RECV 1 +#define INTERNAL_UPDATE_FALSE 0 +#define INTERNAL_UPDATE_TRUE 1 + struct subscription { str pres_uri; @@ -78,6 +81,7 @@ struct subscription int db_flag; str* auth_rules_doc; int recv_event; + int internal_update_flag; struct subscription* next; };

12 years, 6 months

git:master: dns: srv load balancing distribution fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d8fe0def83736c204dd1eace89e8ca1823704fc3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8fe0de… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 9 19:12:59 2012 +0100 dns: srv load balancing distribution fix The load distribution when doing SRV based load balancing was not completely fair. The first listed server had always an extra (sum_of_weights-weight)/(sum_of_weights*(sum_of_weights+1) chance of being selected. For example for 2 servers both with weight 50, the first one will have an extra (100-50)/100*101 change of being selected => extra 0.495% which gives a 50.495% - 49.505% distribution instead of 50% - 50%. For large weight values this doesn't make a big difference (e.g. for 500-500 => 50.049% instead of 50%) but for small values it becomes very noticeable (e.g. for 1-1 => 66% - 33% distribution instead of 50%-50%). The chance of selecting a 0-weight record was also changed. It was 1/(sum_of_weights+1) and now is 1/(sum_of_weights*1000). Reported-by: Michal Matyska michal.matyska iptel org --- dns_cache.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index da8f97d..1a7f1c5 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -100,6 +100,8 @@ #define DNS_HE_MAX_ADDR 10 /* maxium addresses returne in a hostent struct */ #define MAX_CNAME_CHAIN 10 #define SPACE_FORMAT " " /* format of view output */ +#define DNS_SRV_ZERO_W_CHANCE 1000 /* one in a 1000*weight_sum chance for + selecting a 0-weight record */ int dns_cache_init=1; /* if 0, the DNS cache is not initialized at startup */ static gen_lock_t* dns_hash_lock=0; @@ -2286,6 +2288,7 @@ inline static struct dns_rr* dns_srv_get_nxt_rr(struct dns_hash_entry* e, unsigned rand_w; int found; int saved_idx; + int zero_weight; /* number of records with 0 weight */ int i, idx; struct r_sums_entry{ unsigned r_sum; @@ -2307,6 +2310,7 @@ retry: prio=((struct srv_rdata*)start_grp->rdata)->priority; sum=0; saved_idx=-1; + zero_weight = 0; found=0; for (idx=0;rr && (prio==((struct srv_rdata*)rr->rdata)->priority) && (idx < MAX_SRV_GRP_IDX); idx++, rr=rr->next){ @@ -2328,6 +2332,7 @@ retry: if ((saved_idx==-1) || (((struct srv_rdata*)rr->rdata)->weight==0)){ saved_idx=idx; } + zero_weight += (((struct srv_rdata*)rr->rdata)->weight == 0); sum+=((struct srv_rdata*)rr->rdata)->weight; r_sums[idx].r_sum=sum; r_sums[idx].rr=rr; @@ -2338,10 +2343,15 @@ retry: n+=idx; /* next group start idx, last rr */ srv_reset_tried(tried); goto retry; - }else if ((found==1) || ((rand_w=dns_srv_random(sum))==0)){ - /* 1. if only one found, avoid a useless random() call or - * 2. if rand_w==0, immediately select a 0 weight record if present, - * or else the first record found + }else if ((found==1) || (sum==0) || + (((rand_w=(dns_srv_random(sum-1)+1))==1) && zero_weight && + (dns_srv_random(DNS_SRV_ZERO_W_CHANCE)==0))){ + /* 1. if only one found, avoid a useless random() call + and select it (saved_idx will point to it). + * 2. if the sum of weights is 0 (all have 0 weight) or + * 3. rand_w==1 and there are records with 0 weight and + * random(probab. of selecting a 0-weight) + * immediately select a 0 weight record. * (this takes care of the 0-weight at the beginning requirement) */ i=saved_idx; /* saved idx contains either first 0 weight or first valid record */

12 years, 6 months

[tracker] Comment added: tls module 'config' param can point to directory

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#89 - tls module 'config' param can point to directory User who did this - Daniel-Constantin Mierla (miconda) ---------- Looks interesting, you can go ahead and commit if nobody else has other suggestions for such feature. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=89#comment509 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.

12 years, 6 months

git:master: modules_k/rls: Fixed race hazard on rls_presentity table

by Peter Dunkley

Module: sip-router Branch: master Commit: 46eb7f2c33231355aa26632bc3d1adb02ee2556f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46eb7f2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 12 21:44:46 2012 +0000 modules_k/rls: Fixed race hazard on rls_presentity table - During testing I observed that it is possible for two back-end NOTIFYs that will affect the same rls_presentity table row to be processed simultaneously. This is a problem when the row does not yet exist as the SELECTs can both return 0 rows resulting in both processes trying to INSERT - but only one will succeed. - The easiest way to fix this is to use the replace() DB API, but this is not available for some databases (for example, PostgreSQL). - I have updated the code to use replace() when it is available and to do an update() then check affected_rows() (and if 0 then do an insert()) when replace() is not available. - The update() and then insert() process makes the window for the race much smaller, but doesn't get rid of it completely. However, with PostgreSQL a DB rule can be used to fix it completely. - PostgreSQL DB rule: CREATE RULE "rls_presentity_insert_race" AS ON INSERT TO "rls_presentity" WHERE EXISTS( SELECT 1 FROM rls_presentity WHERE (rlsubs_did, resource_uri)=(NEW.rlsubs_did, NEW.resource_uri) ) DO INSTEAD ( UPDATE rls_presentity SET updated=NEW.updated, auth_state=NEW.auth_state, reason=NEW.reason, content_type=NEW.content_type, presence_state=NEW.presence_state, expires=NEW.expires WHERE (rlsubs_did, resource_uri)=(NEW.rlsubs_did, NEW.resource_uri) ); --- modules_k/rls/resource_notify.c | 45 ++++++++++++++++---------------------- 1 files changed, 19 insertions(+), 26 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index df40e82..d0bf435 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -500,16 +500,15 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) str body= {0, 0}; ua_pres_t dialog; str* res_id= NULL; - db_key_t query_cols[9], result_cols[1]; - db_val_t query_vals[9]; - db1_res_t* result= NULL; + db_key_t query_cols[8]; + db_val_t query_vals[8]; int n_query_cols= 0; str auth_state= {0, 0}; int found= 0; str reason = {0, 0}; int auth_flag; struct hdr_field* hdr= NULL; - int n, expires= -1; + int expires= -1; str content_type= {0, 0}; int reply_code = 500; str reply_str = pu_500_rpl; @@ -755,42 +754,36 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) LM_ERR("in use_table\n"); goto error; } - /* query-> if not present insert // else update */ - result_cols[0]= &str_updated_col; - - if(rlpres_dbf.query(rlpres_db, query_cols, 0, query_vals, result_cols, - 2, 1, 0, &result)< 0) - { - LM_ERR("in sql query\n"); - if(result) - rlpres_dbf.free_result(rlpres_db, result); - goto error; - } - if(result== NULL) - goto error; - n= result->n; - rlpres_dbf.free_result(rlpres_db, result); - - if(n<= 0) + + if (rlpres_dbf.replace != NULL) { - if(rlpres_dbf.insert(rlpres_db, query_cols, query_vals, n_query_cols)< 0) + if(rlpres_dbf.replace(rlpres_db, query_cols, query_vals, n_query_cols)< 0) { - LM_ERR("in sql insert\n"); + LM_ERR("in sql replace\n"); goto error; } - LM_DBG("Inserted in database table new record\n"); + LM_DBG("Inserted/replace in database table new record\n"); } else { - LM_DBG("Updated in db table already existing record\n"); if(rlpres_dbf.update(rlpres_db, query_cols, 0, query_vals, query_cols+2, query_vals+2, 2, n_query_cols-2)< 0) { LM_ERR("in sql update\n"); goto error; } - } + if (rlpres_dbf.affected_rows(rlpres_db) == 0) + { + if(rlpres_dbf.insert(rlpres_db, query_cols, query_vals, n_query_cols)< 0) + { + LM_ERR("in sql insert\n"); + goto error; + } + LM_DBG("Inserted in database table new record\n"); + } + } + LM_DBG("Updated rlpres_table\n"); /* reply 200OK */ done:

12 years, 6 months

git:master: modules/db_postgres: Added affect_rows() API to db_postgres

by Peter Dunkley

Module: sip-router Branch: master Commit: 2bd922dba30ae6c49242089e906254fe7d0f660f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bd922d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 12 21:31:51 2012 +0000 modules/db_postgres: Added affect_rows() API to db_postgres --- modules/db_postgres/km_db_postgres.c | 1 + modules/db_postgres/km_dbase.c | 19 +++++++++++++++++++ modules/db_postgres/km_dbase.h | 4 ++++ modules/db_postgres/km_pg_con.h | 3 ++- 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index 9b0bd8b..5914e5f 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -93,6 +93,7 @@ int db_postgres_bind_api(db_func_t *dbb) dbb->insert = db_postgres_insert; dbb->delete = db_postgres_delete; dbb->update = db_postgres_update; + dbb->affected_rows = db_postgres_affected_rows; return 0; } diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index c01d37a..a7b9546 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -69,6 +69,7 @@ #include <string.h> #include <stdio.h> +#include <stdlib.h> #include "../../dprint.h" #include "../../mem/mem.h" #include "../../lib/srdb1/db.h" @@ -425,11 +426,14 @@ int db_postgres_store_result(const db1_con_t* _con, db1_res_t** _r) LM_DBG("%p PQresultStatus(%s) PQgetResult(%p)\n", _con, PQresStatus(pqresult), CON_RESULT(_con)); + CON_AFFECTED(_con) = 0; + switch(pqresult) { case PGRES_COMMAND_OK: /* Successful completion of a command returning no data * (such as INSERT or UPDATE). */ rc = 0; + CON_AFFECTED(_con) = atoi(PQcmdTuples(CON_RESULT(_con))); break; case PGRES_TUPLES_OK: @@ -444,6 +448,7 @@ int db_postgres_store_result(const db1_con_t* _con, db1_res_t** _r) break; } rc = 0; + CON_AFFECTED(_con) = atoi(PQcmdTuples(CON_RESULT(_con))); break; /* query failed */ case PGRES_FATAL_ERROR: @@ -557,6 +562,20 @@ int db_postgres_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _ return tmp; } +/** + * Returns the affected rows of the last query. + * \param _h database handle + * \return returns the affected rows as integer or -1 on error. + */ +int db_postgres_affected_rows(const db1_con_t* _h) +{ + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + return CON_AFFECTED(_h); +} + /*! * 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 0e8a20b..7c15e8d 100644 --- a/modules/db_postgres/km_dbase.h +++ b/modules/db_postgres/km_dbase.h @@ -102,6 +102,10 @@ int db_postgres_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _ */ int db_postgres_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows); +/* + * number of rows affected by the last DB query/statement + */ +int db_postgres_affected_rows(const db1_con_t* _h); /* * Store name of table that will be used by diff --git a/modules/db_postgres/km_pg_con.h b/modules/db_postgres/km_pg_con.h index 798a4af..b0f92c6 100644 --- a/modules/db_postgres/km_pg_con.h +++ b/modules/db_postgres/km_pg_con.h @@ -53,7 +53,7 @@ struct pg_con { PGresult *res; /*!< this is the current result */ 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 */ }; #define CON_SQLURL(db_con) (((struct pg_con*)((db_con)->tail))->sqlurl) @@ -63,6 +63,7 @@ struct pg_con { #define CON_ROW(db_con) (((struct pg_con*)((db_con)->tail))->row) #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) /* * Create a new connection structure,

12 years, 6 months

git:master: lib/srdb1: Updated constraints and indices for some of the presence tables

by Peter Dunkley

Module: sip-router Branch: master Commit: 419e26078bb9e8f67e4e613c21db3feee418c8a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=419e260… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 12 21:38:19 2012 +0000 lib/srdb1: Updated constraints and indices for some of the presence tables - Updated to match recent presence/pua/rls code changes - Added new index on username, domain, and event to the presentity table - Added unique constraint on etag, tuple_id, call_id, and from_tag to the pua table - Added indices on (pres_id), (call_id, from_tag, to_tag), and (pres_id, pres_uri, call_id, from_tag) to the pua table - Removed presentity uri from the rls_watcher table index --- lib/srdb1/schema/pr_presentity.xml | 7 +++++ lib/srdb1/schema/pr_pua.xml | 40 +++++++++++++++++++++++---- lib/srdb1/schema/rls_watchers.xml | 1 - utils/kamctl/db_sqlite/presence-create.sql | 8 +++++- utils/kamctl/db_sqlite/rls-create.sql | 2 +- utils/kamctl/mysql/presence-create.sql | 8 +++++- utils/kamctl/mysql/rls-create.sql | 2 +- utils/kamctl/oracle/presence-create.sql | 8 +++++- utils/kamctl/oracle/rls-create.sql | 2 +- utils/kamctl/postgres/presence-create.sql | 8 +++++- utils/kamctl/postgres/rls-create.sql | 2 +- 11 files changed, 73 insertions(+), 15 deletions(-) diff --git a/lib/srdb1/schema/pr_presentity.xml b/lib/srdb1/schema/pr_presentity.xml index f37b753..eb793ca 100644 --- a/lib/srdb1/schema/pr_presentity.xml +++ b/lib/srdb1/schema/pr_presentity.xml @@ -98,4 +98,11 @@ <colref linkend="expires"/> </index> + <index> + <name>account_idx</name> + <colref linkend="username"/> + <colref linkend="domain"/> + <colref linkend="event"/> + </index> + </table> diff --git a/lib/srdb1/schema/pr_pua.xml b/lib/srdb1/schema/pr_pua.xml index 79e5986..6a3079c 100644 --- a/lib/srdb1/schema/pr_pua.xml +++ b/lib/srdb1/schema/pr_pua.xml @@ -26,7 +26,7 @@ <description>Unique ID</description> </column> - <column> + <column id="pres_uri"> <name>pres_uri</name> <type>string</type> <size>&uri_len;</size> @@ -34,7 +34,7 @@ <natural/> </column> - <column> + <column id="pres_id"> <name>pres_id</name> <type>string</type> <size>255</size> @@ -70,14 +70,14 @@ <description>Flags</description> </column> - <column> + <column id="etag"> <name>etag</name> <type>string</type> <size>&domain_len;</size> <description>Etag</description> </column> - <column> + <column id="tuple_id"> <name>tuple_id</name> <type>string</type> <size>&domain_len;</size> @@ -92,7 +92,7 @@ <description>Watcher URI</description> </column> - <column> + <column id="call_id"> <name>call_id</name> <type>string</type> <size>&callid_len;</size> @@ -106,7 +106,7 @@ <description>To tag</description> </column> - <column> + <column id="from_tag"> <name>from_tag</name> <type>string</type> <size>&domain_len;</size> @@ -151,4 +151,32 @@ <description>Extra Headers</description> </column> + <index> + <name>pua_idx</name> + <colref linkend="etag"/> + <colref linkend="tuple_id"/> + <colref linkend="call_id"/> + <colref linkend="from_tag"/> + <unique/> + </index> + + <index> + <name>presid_idx</name> + <colref linkend="pres_id"/> + </index> + + <index> + <name>dialog_idx</name> + <colref linkend="call_id"/> + <colref linkend="from_tag"/> + <colref linkend="to_tag"/> + </index> + + <index> + <name>tmp_dlg_idx</name> + <colref linkend="pres_id"/> + <colref linkend="pres_uri"/> + <colref linkend="call_id"/> + <colref linkend="from_tag"/> + </index> </table> diff --git a/lib/srdb1/schema/rls_watchers.xml b/lib/srdb1/schema/rls_watchers.xml index 8362e77..3f67dc0 100644 --- a/lib/srdb1/schema/rls_watchers.xml +++ b/lib/srdb1/schema/rls_watchers.xml @@ -175,7 +175,6 @@ <index> <name>rls_watcher_idx</name> - <colref linkend="presentity_uri"/> <colref linkend="callid"/> <colref linkend="to_tag"/> <colref linkend="from_tag"/> diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index ac0e007..8a4a07c 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -13,6 +13,7 @@ CREATE TABLE presentity ( ); CREATE INDEX presentity_presentity_expires ON presentity (expires); +CREATE INDEX presentity_account_idx ON presentity (username, domain, event); INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( @@ -91,6 +92,11 @@ CREATE TABLE pua ( contact VARCHAR(128) NOT NULL, remote_contact VARCHAR(128) NOT NULL, version INTEGER NOT NULL, - extra_headers TEXT NOT NULL + extra_headers TEXT NOT NULL, + CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag) ); +CREATE INDEX pua_presid_idx ON pua (pres_id); +CREATE INDEX pua_dialog_idx ON pua (call_id, from_tag, to_tag); +CREATE INDEX pua_tmp_dlg_idx ON pua (pres_id, pres_uri, call_id, from_tag); + diff --git a/utils/kamctl/db_sqlite/rls-create.sql b/utils/kamctl/db_sqlite/rls-create.sql index 4a05695..d98256e 100644 --- a/utils/kamctl/db_sqlite/rls-create.sql +++ b/utils/kamctl/db_sqlite/rls-create.sql @@ -37,6 +37,6 @@ CREATE TABLE rls_watchers ( version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, - CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) + CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag) ); diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 51644df..1ba1e05 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -13,6 +13,7 @@ CREATE TABLE presentity ( ) ENGINE=MyISAM; CREATE INDEX presentity_expires ON presentity (expires); +CREATE INDEX account_idx ON presentity (username, domain, event); INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( @@ -91,6 +92,11 @@ CREATE TABLE pua ( contact VARCHAR(128) NOT NULL, remote_contact VARCHAR(128) NOT NULL, version INT(11) NOT NULL, - extra_headers TEXT NOT NULL + extra_headers TEXT NOT NULL, + CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag) ) ENGINE=MyISAM; +CREATE INDEX presid_idx ON pua (pres_id); +CREATE INDEX dialog_idx ON pua (call_id, from_tag, to_tag); +CREATE INDEX tmp_dlg_idx ON pua (pres_id, pres_uri, call_id, from_tag); + diff --git a/utils/kamctl/mysql/rls-create.sql b/utils/kamctl/mysql/rls-create.sql index 02a6f75..28e3c60 100644 --- a/utils/kamctl/mysql/rls-create.sql +++ b/utils/kamctl/mysql/rls-create.sql @@ -37,6 +37,6 @@ CREATE TABLE rls_watchers ( version INT(11) DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, - CONSTRAINT rls_watcher_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) + CONSTRAINT rls_watcher_idx UNIQUE (callid, to_tag, from_tag) ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 9ef4797..2e9c932 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -21,6 +21,7 @@ END presentity_tr; BEGIN map2users('presentity'); END; / CREATE INDEX presentity_presentity_expires ON presentity (expires); +CREATE INDEX presentity_account_idx ON presentity (username, domain, event); INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( @@ -123,7 +124,8 @@ CREATE TABLE pua ( contact VARCHAR2(128), remote_contact VARCHAR2(128), version NUMBER(10), - extra_headers CLOB + extra_headers CLOB, + CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag) ); CREATE OR REPLACE TRIGGER pua_tr @@ -134,3 +136,7 @@ END pua_tr; / BEGIN map2users('pua'); END; / +CREATE INDEX pua_presid_idx ON pua (pres_id); +CREATE INDEX pua_dialog_idx ON pua (call_id, from_tag, to_tag); +CREATE INDEX pua_tmp_dlg_idx ON pua (pres_id, pres_uri, call_id, from_tag); + diff --git a/utils/kamctl/oracle/rls-create.sql b/utils/kamctl/oracle/rls-create.sql index 21b6f62..b4aac84 100644 --- a/utils/kamctl/oracle/rls-create.sql +++ b/utils/kamctl/oracle/rls-create.sql @@ -45,7 +45,7 @@ CREATE TABLE rls_watchers ( version NUMBER(10) DEFAULT 0 NOT NULL, socket_info VARCHAR2(64), local_contact VARCHAR2(128), - CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) + CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag) ); CREATE OR REPLACE TRIGGER rls_watchers_tr diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 6b61de6..8be1dcc 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -13,6 +13,7 @@ CREATE TABLE presentity ( ); CREATE INDEX presentity_presentity_expires ON presentity (expires); +CREATE INDEX presentity_account_idx ON presentity (username, domain, event); INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( @@ -91,6 +92,11 @@ CREATE TABLE pua ( contact VARCHAR(128) NOT NULL, remote_contact VARCHAR(128) NOT NULL, version INTEGER NOT NULL, - extra_headers TEXT NOT NULL + extra_headers TEXT NOT NULL, + CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag) ); +CREATE INDEX pua_presid_idx ON pua (pres_id); +CREATE INDEX pua_dialog_idx ON pua (call_id, from_tag, to_tag); +CREATE INDEX pua_tmp_dlg_idx ON pua (pres_id, pres_uri, call_id, from_tag); + diff --git a/utils/kamctl/postgres/rls-create.sql b/utils/kamctl/postgres/rls-create.sql index 76735a2..99e97ca 100644 --- a/utils/kamctl/postgres/rls-create.sql +++ b/utils/kamctl/postgres/rls-create.sql @@ -37,6 +37,6 @@ CREATE TABLE rls_watchers ( version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, - CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) + CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag) );

12 years, 6 months

[tracker] Task closed: Kamailio 1.5 Dispatcher (minor) problem.

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#40 - Kamailio 1.5 Dispatcher (minor) problem. User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Deferred More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=40 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.

12 years, 6 months

[tracker] Comment added: Kamailio 1.5 Dispatcher (minor) problem.

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#40 - Kamailio 1.5 Dispatcher (minor) problem. User who did this - Daniel-Constantin Mierla (miconda) ---------- This got a bit old, thinking of it is for 1.5 and has an workaround, I am closing it -- it would be hard for a devel to test it with that version. If you can reproduce it with latest version, reopen and paste the log messages with debug=3. I suspect the keepalives are sent from an interface that has no route, which might be just fixed by setting mhomed parameter. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=40#comment508 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.

12 years, 6 months

[tracker] Task closed: check symbol conflicts

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#12 - check symbol conflicts User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: Mac os x goes smooth. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=12 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.

12 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
14
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012