sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

git:master: modules_k/rls: Added lock for rls_update_subs() in DB only mode
by Peter Dunkley 08 Dec '11

08 Dec '11

Module: sip-router Branch: master Commit: ca8f2211bd1c4bebe083a07b3afe7107254e6bea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca8f221… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:50:05 2011 +0000 modules_k/rls: Added lock for rls_update_subs() in DB only mode - If a client updates the same resource-list document multiple times in quick succession rls_update_subs() might overlap for the same dialogs. - This was causing problems in DB only mode so a lock has been added. - Not a problem when the hash-table is used as each row has locks. - Problem identified and fix defined by me. - Fix implemented by Hugh Waite @ Crocodile RCS --- modules_k/rls/rls.c | 21 +++++++++++++++++++++ modules_k/rls/rls.h | 2 ++ modules_k/rls/subscribe.c | 6 +++++- 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index c482af2..c8d54eb 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -88,6 +88,10 @@ search_event_t pres_search_event; get_event_list_t pres_get_ev_list; int clean_period = 100; +/* Lock for rls_update_subs */ +gen_lock_t *rls_update_subs_lock = NULL; + + /* address and port(default: 80):"http://192.168.2.132:8000/xcap-root"*/ char* xcap_root; unsigned int xcap_port = 8000; @@ -574,6 +578,17 @@ static int mod_init(void) register_timer(rlsubs_table_update, 0, clean_period); } + if ((rls_update_subs_lock = lock_alloc()) == NULL) + { + LM_ERR("Failed to alloc rls_updae_subs_lock\n"); + return -1; + } + if (lock_init(rls_update_subs_lock) == NULL) + { + LM_ERR("Failed to init rls_updae_subs_lock\n"); + return -1; + } + return 0; } @@ -678,6 +693,12 @@ static void destroy(void) if(rls2_db && rls2_dbf.close) rls2_dbf.close(rls2_db); + + if (rls_update_subs_lock != NULL) + { + lock_destroy(rls_update_subs_lock); + lock_dealloc(rls_update_subs_lock); + } } int handle_expired_record(subs_t* s) diff --git a/modules_k/rls/rls.h b/modules_k/rls/rls.h index 12e98c8..055d674 100644 --- a/modules_k/rls/rls.h +++ b/modules_k/rls/rls.h @@ -103,6 +103,8 @@ extern str rls_outbound_proxy; extern int rls_max_notify_body_len; extern int rls_expires_offset; +extern gen_lock_t *rls_update_subs_lock; + /* database connection */ extern db1_con_t *rls_db; extern db_func_t rls_dbf; diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 92f34de..cab70ff 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -1029,7 +1029,11 @@ int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent) if (dbmode==RLS_DB_ONLY) { - return(update_all_subs_rlsdb(&parsed_uri.user, &parsed_uri.host, &event)); + int ret; + lock_get(rls_update_subs_lock); + ret = (update_all_subs_rlsdb(&parsed_uri.user, &parsed_uri.host, &event)); + lock_release(rls_update_subs_lock); + return ret; }

1 0

git:master: modules_k/pua: Some of the functions in pua_db. c did not completely replicate the behaviour of the original hash-table functions
by Peter Dunkley 08 Dec '11

08 Dec '11

Module: sip-router Branch: master Commit: 1c3b6dbf68efd8e5cc29c715cbb3917ef8f42f84 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c3b6db… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 22:05:35 2011 +0000 modules_k/pua: Some of the functions in pua_db.c did not completely replicate the behaviour of the original hash-table functions - This caused a variety of problems during RLS client testing. - Fixes by Paul Pankhurst @ Crocodile RCS --- modules_k/pua/pua_db.c | 69 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 51 insertions(+), 18 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index e81cf3f..54e11c0 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -301,13 +301,16 @@ int matches_in_puadb(ua_pres_t *pres) q_ops[puri_col] = OP_EQ; n_query_cols++; - q_cols[pid_col= n_query_cols] = &str_pres_id_col; - q_vals[pid_col].type = DB1_STR; - q_vals[pid_col].nul = 0; - q_vals[pid_col].val.str_val.s = pres->id.s; - q_vals[pid_col].val.str_val.len = pres->id.len; - q_ops[pid_col] = OP_EQ; - n_query_cols++; + if (pres->id.s && pres->id.len) + { + q_cols[pid_col= n_query_cols] = &str_pres_id_col; + q_vals[pid_col].type = DB1_STR; + q_vals[pid_col].nul = 0; + q_vals[pid_col].val.str_val.s = pres->id.s; + q_vals[pid_col].val.str_val.len = pres->id.len; + q_ops[pid_col] = OP_EQ; + n_query_cols++; + } q_cols[flag_col= n_query_cols] = &str_flag_col; q_vals[flag_col].type = DB1_INT; @@ -359,7 +362,10 @@ int matches_in_puadb(ua_pres_t *pres) q_ops[etag_col] = OP_EQ; n_query_cols++; } - + else + { + LM_DBG("no etag restriction\n"); + } } @@ -419,13 +425,16 @@ ua_pres_t* search_puadb(ua_pres_t *pres, ua_pres_t *result, db1_res_t **dbres) q_ops[puri_col] = OP_EQ; n_query_cols++; - q_cols[pid_col= n_query_cols] = &str_pres_id_col; - q_vals[pid_col].type = DB1_STR; - q_vals[pid_col].nul = 0; - q_vals[pid_col].val.str_val.s = pres->id.s; - q_vals[pid_col].val.str_val.len = pres->id.len; - q_ops[pid_col] = OP_EQ; - n_query_cols++; + if (pres->id.s && pres->id.len) + { + q_cols[pid_col= n_query_cols] = &str_pres_id_col; + q_vals[pid_col].type = DB1_STR; + q_vals[pid_col].nul = 0; + q_vals[pid_col].val.str_val.s = pres->id.s; + q_vals[pid_col].val.str_val.len = pres->id.len; + q_ops[pid_col] = OP_EQ; + n_query_cols++; + } q_cols[flag_col= n_query_cols] = &str_flag_col; q_vals[flag_col].type = DB1_INT; @@ -476,7 +485,10 @@ ua_pres_t* search_puadb(ua_pres_t *pres, ua_pres_t *result, db1_res_t **dbres) q_ops[etag_col] = OP_EQ; n_query_cols++; } - + else + { + LM_DBG("no etag restriction\n"); + } } @@ -850,9 +862,30 @@ int get_record_id_puadb(ua_pres_t *pres, str **rec_id ) if (nr_rows == 0) { /* no match */ - LM_DBG("No rows found.\n"); + LM_DBG("No rows found. Looking for temporary dialog\n"); pua_dbf.free_result(pua_db, res); - return(0); + + q_vals[totag_col].val.str_val.s = ""; + q_vals[totag_col].val.str_val.len = 0; + + + if(pua_dbf.query(pua_db, q_cols, q_ops, q_vals, + res_cols,n_query_cols,n_res_cols,0,&res) < 0) + { + LM_ERR("DB query error\n"); + return(-1); + } + + nr_rows = RES_ROW_N(res); + + if (nr_rows == 0) + { + LM_DBG( "Temporary Dialog Not found\n" ); + pua_dbf.free_result(pua_db, res); + return(0); + } + + LM_DBG( "Found a temporary Dialog\n" ); } if (nr_rows != 1)

1 0

git:master: modules_k/presence, modules_k/pua, modules_k/rls: Changed rls_update_subs() to not send unnecessary back-end re-SUBSCRIBEs.
by Peter Dunkley 08 Dec '11

08 Dec '11

Module: sip-router Branch: master Commit: e9e6d51b87cea0d60c47200ab1f99948b1d9bc48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9e6d51… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 22:01:06 2011 +0000 modules_k/presence, modules_k/pua, modules_k/rls: Changed rls_update_subs() to not send unnecessary back-end re-SUBSCRIBEs. - The initial implementation sent a re-SUBSCRIBE for each existing back-end dialog and create new back-end dialogs as required (depending on the contents of the updated resource-list) documents. - This was very wasteful, so this version only sends the new SUBSCRIBEs --- modules_k/presence/subscribe.h | 4 ++++ modules_k/pua/send_subscribe.c | 14 ++++++++++++++ modules_k/pua/send_subscribe.h | 1 + modules_k/rls/subscribe.c | 4 ++++ 4 files changed, 23 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h index 3e318a1..b216fff 100644 --- a/modules_k/presence/subscribe.h +++ b/modules_k/presence/subscribe.h @@ -47,6 +47,9 @@ struct pres_ev; #define TERMINATED_STATUS 3 #define WAITING_STATUS 4 +#define INTERNAL_UPDATE_FALSE 0 +#define INTERNAL_UPDATE_TRUE 1 + struct subscription { str pres_uri; @@ -72,6 +75,7 @@ struct subscription int send_on_cback; int db_flag; str* auth_rules_doc; + int internal_update_flag; struct subscription* next; }; diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 1116896..1406ee4 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -47,6 +47,7 @@ #include "pua_callback.h" #include "event_list.h" #include "pua_db.h" +#include "../presence/subscribe.h" void print_subs(subs_info_t* subs) @@ -1116,6 +1117,19 @@ insert: */ dlg_t* td= NULL; + + if (subs->internal_update_flag == INTERNAL_UPDATE_TRUE) + { + LM_INFO("attempting to re-SUBSCRIBE on internal (rls_update_subs()) update - skipping\n"); + goto done; + } + + if (presentity->to_tag.len == 0) + { + LM_WARN("attempting to re-SUBSCRIBE to temporary (non-established) dialog - skipping\n"); + goto done; + } + td= pua_build_dlg_t(presentity); if(td== NULL) { diff --git a/modules_k/pua/send_subscribe.h b/modules_k/pua/send_subscribe.h index a6ff737..cddb33a 100644 --- a/modules_k/pua/send_subscribe.h +++ b/modules_k/pua/send_subscribe.h @@ -49,6 +49,7 @@ typedef struct subs_info for the received reply; it must be allocated in share memory; a reference to it will be found in the cb_param filed of the ua_pres_structure receied as a parameter for the registered function*/ + int internal_update_flag; }subs_info_t; diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index cab70ff..5238804 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -902,6 +902,8 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) extra_headers.len = strlen(extra_headers.s); s.extra_headers = &extra_headers; + + s.internal_update_flag = subs->internal_update_flag; if(process_list_and_exec(xmlnode, subs->from_user, subs->from_domain, send_resource_subs, (void*)(&s))<0) @@ -964,6 +966,8 @@ void update_a_sub(subs_t *subs_copy ) goto done; } + subs_copy->internal_update_flag = INTERNAL_UPDATE_TRUE; + if(resource_subscriptions(subs_copy, service_node)< 0) { LM_ERR("failed sending subscribe requests to resources in list\n");

1 0

git:master: modules_k/presence: Authorisation requests not working in DB only mode
by Peter Dunkley 08 Dec '11

08 Dec '11

Module: sip-router Branch: master Commit: 754a5f470ecc45d976beeb33be0dc43b88510b5d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=754a5f4… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:30:51 2011 +0000 modules_k/presence: Authorisation requests not working in DB only mode - The code behind pres_update_watchers() seemed to be missed when the presence DB only work was done. - pres_update_watchers() continued to work when the hash-table was used but not in DB only mode. - Problem and fix identified during testing @ Crocodile RCS - Fix implemented by Paul Pankhurst @ Crocodile RCS --- modules_k/presence/presence.c | 251 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 240 insertions(+), 11 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index d3db179..d573fb6 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -761,7 +761,7 @@ int pres_update_status(subs_t subs, str reason, db_key_t* query_cols, } /* save in the list all affected dialogs */ /* if status switches to terminated -> delete dialog */ - if(dbmode != DB_ONLY && update_pw_dialogs(&subs, subs.db_flag, subs_array)< 0) + if(update_pw_dialogs(&subs, subs.db_flag, subs_array)< 0) { LM_ERR( "extracting dialogs from [watcher]=%.*s(a)%.*s to" " [presentity]=%.*s\n", subs.from_user.len, subs.from_user.s, @@ -1083,15 +1083,244 @@ done: return err_ret; } +/********************************************************************************/ + +static int update_pw_dialogs_dbonlymode(subs_t* subs, subs_t** subs_array) +{ + db_key_t query_cols[5], db_cols[2]; + db_val_t query_vals[5], db_vals[2]; + db_key_t result_cols[22]; + int n_query_cols=0, n_result_cols=0, n_update_cols=0; + int event_col, pres_uri_col, from_user_col, from_domain_col; + int r_pres_uri_col,r_to_user_col,r_to_domain_col; + int r_from_user_col,r_from_domain_col,r_callid_col; + int r_to_tag_col,r_from_tag_col,r_sockinfo_col; + int r_event_id_col,r_local_contact_col,r_contact_col; + int r_record_route_col, r_reason_col; + int r_event_col, r_local_cseq_col, r_remote_cseq_col; + int r_status_col, r_version_col; + int r_expires_col; + db1_res_t *result= NULL; + db_val_t *row_vals; + db_row_t *rows; + int nr_rows, loop; + subs_t s, *cs; + event_t parsed_event; + str ev_sname; + + if(pa_db == NULL) + { + LM_ERR("null database connection\n"); + return(-1); + } + + if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) + { + LM_ERR("use table failed\n"); + return(-1); + } + + query_cols[event_col=n_query_cols]= &str_event_col; + query_vals[event_col].nul= 0; + query_vals[event_col].type= DB1_STR; + query_vals[event_col].val.str_val= subs->event->name ; + n_query_cols++; + + query_cols[pres_uri_col=n_query_cols]= &str_presentity_uri_col; + query_vals[pres_uri_col].nul= 0; + query_vals[pres_uri_col].type= DB1_STR; + query_vals[pres_uri_col].val.str_val= subs->pres_uri; + n_query_cols++; + + query_cols[from_user_col=n_query_cols]= &str_watcher_username_col; + query_vals[from_user_col].nul= 0; + query_vals[from_user_col].type= DB1_STR; + query_vals[from_user_col].val.str_val= subs->from_user; + n_query_cols++; + + query_cols[from_domain_col=n_query_cols]= &str_watcher_domain_col; + query_vals[from_domain_col].nul= 0; + query_vals[from_domain_col].type= DB1_STR; + query_vals[from_domain_col].val.str_val= subs->from_domain; + n_query_cols++; + + + result_cols[r_to_user_col=n_result_cols++] = &str_to_user_col; + result_cols[r_to_domain_col=n_result_cols++] = &str_to_domain_col; + result_cols[r_from_user_col=n_result_cols++] = &str_watcher_username_col; + result_cols[r_from_domain_col=n_result_cols++] = &str_watcher_domain_col; + result_cols[r_callid_col=n_result_cols++] = &str_callid_col; + 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; + result_cols[r_sockinfo_col=n_result_cols++] = &str_socket_info_col; + result_cols[r_event_id_col=n_result_cols++] = &str_event_id_col; + result_cols[r_local_contact_col=n_result_cols++] = &str_local_contact_col; + result_cols[r_record_route_col=n_result_cols++] = &str_record_route_col; + result_cols[r_reason_col=n_result_cols++] = &str_reason_col; + result_cols[r_local_cseq_col=n_result_cols++] = &str_local_cseq_col; + result_cols[r_version_col=n_result_cols++] = &str_version_col; + result_cols[r_expires_col=n_result_cols++] = &str_expires_col; + result_cols[r_event_col=n_result_cols++] = &str_event_col; + result_cols[r_pres_uri_col=n_result_cols++] = &str_presentity_uri_col; + result_cols[r_contact_col=n_result_cols++] = &str_contact_col; + + /* these ones are unused for some reason !!! */ + result_cols[r_remote_cseq_col=n_result_cols++] = &str_remote_cseq_col; + result_cols[r_status_col=n_result_cols++] = &str_status_col; + /*********************************************/ + + if(pa_dbf.query(pa_db, query_cols, 0, query_vals, result_cols, + n_query_cols, n_result_cols, 0, &result )< 0) + { + LM_ERR("Can't query db\n"); + if(result) pa_dbf.free_result(pa_db, result); + return(-1); + } + + if(result == NULL) return(-1); + + nr_rows = RES_ROW_N(result); + + LM_DBG("found %d matching dialogs\n", nr_rows); + + /* get the results and fill in return data structure */ + for (loop=0; loop <nr_rows; loop++) + { + rows = RES_ROWS(result); + row_vals = ROW_VALUES(rows); + + memset(&s, 0, sizeof(subs_t)); + s.status= subs->status; + + s.reason.s= subs->reason.s; + s.reason.len= s.reason.s?strlen(s.reason.s):0; //>>>>>>>>>> + + s.pres_uri.s= (char*)row_vals[r_pres_uri_col].val.string_val; + s.pres_uri.len= s.pres_uri.s?strlen(s.pres_uri.s):0; + + s.to_user.s= (char*)row_vals[r_to_user_col].val.string_val; + s.to_user.len= s.to_user.s?strlen(s.to_user.s):0; + + s.to_domain.s= (char*)row_vals[r_to_domain_col].val.string_val; + s.to_domain.len= s.to_domain.s?strlen(s.to_domain.s):0; + + s.from_user.s= (char*)row_vals[r_from_user_col].val.string_val; + s.from_user.len= s.from_user.s?strlen(s.from_user.s):0; + + s.from_domain.s= (char*)row_vals[r_from_domain_col].val.string_val; + s.from_domain.len= s.from_domain.s?strlen(s.from_domain.s):0; + + s.event_id.s=(char*)row_vals[r_event_id_col].val.string_val; + s.event_id.len= (s.event_id.s)?strlen(s.event_id.s):0; + + s.to_tag.s= (char*)row_vals[r_to_tag_col].val.string_val; + s.to_tag.len= s.to_tag.s?strlen(s.to_tag.s):0; + + s.from_tag.s= (char*)row_vals[r_from_tag_col].val.string_val; + s.from_tag.len= s.from_tag.s?strlen(s.from_tag.s):0; + + s.callid.s= (char*)row_vals[r_callid_col].val.string_val; + s.callid.len= s.callid.s?strlen(s.callid.s):0; + + s.record_route.s= (char*)row_vals[r_record_route_col].val.string_val; + s.record_route.len= (s.record_route.s)?strlen(s.record_route.s):0; + + s.contact.s= (char*)row_vals[r_contact_col].val.string_val; + s.contact.len= s.contact.s?strlen(s.contact.s):0; + + s.sockinfo_str.s = (char*)row_vals[r_sockinfo_col].val.string_val; + s.sockinfo_str.len = s.sockinfo_str.s?strlen(s.sockinfo_str.s):0; + + s.local_contact.s = (char*)row_vals[r_local_contact_col].val.string_val; + s.local_contact.len = s.local_contact.s?strlen(s.local_contact.s):0; + + ev_sname.s= (char*)row_vals[r_event_col].val.string_val; + ev_sname.len= ev_sname.s?strlen(ev_sname.s):0; + + s.event = contains_event(&ev_sname, &parsed_event); /*2nd param can be NULL?? */ + + if(s.event == NULL) + { + LM_ERR("event not found and set to NULL\n"); + } + + s.local_cseq = row_vals[r_local_cseq_col].val.int_val; + + s.expires = row_vals[r_expires_col].val.int_val; + + if( s.expires < (int)time(NULL) ) + s.expires = 0; + else + s.expires -= (int)time(NULL); + + s.version = row_vals[r_version_col].val.int_val; + + cs = mem_copy_subs(&s, PKG_MEM_TYPE); + if (cs == NULL) + { + LM_ERR("while copying subs_t structure\n"); + /* tidy up and return */ + pa_dbf.free_result(pa_db, result); + return(-1); + } + + cs->next= (*subs_array); + (*subs_array)= cs; + + printf_subs(cs); + } + + pa_dbf.free_result(pa_db, result); + + if (subs->status == TERMINATED_STATUS) + { + /* delete the records */ + if(pa_dbf.delete(pa_db, query_cols, 0, query_vals, n_query_cols)< 0) + { + LM_ERR("sql delete failed\n"); + return(-1); + } + + return(0); + } + + /* otherwise we update the records */ + db_cols[n_update_cols] = &str_status_col; + db_vals[n_update_cols].type = DB1_INT; + db_vals[n_update_cols].nul = 0; + db_vals[n_update_cols].val.int_val = subs->status; + n_update_cols++; + + db_cols[n_update_cols] = &str_reason_col; + db_vals[n_update_cols].type = DB1_STR; + db_vals[n_update_cols].nul = 0; + db_vals[n_update_cols].val.str_val= subs->reason; + n_update_cols++; + + if(pa_dbf.update(pa_db, query_cols, 0, query_vals, + db_cols,db_vals,n_query_cols,n_update_cols) < 0) + { + LM_ERR("DB update failed\n"); + return(-1); + } + + return(0); +} + +/********************************************************************************/ + static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs_array) { subs_t* s, *ps, *cs; int i= 0; - LM_DBG("start\n"); + LM_DBG("start\n"); + + if (dbmode == DB_ONLY) return(update_pw_dialogs_dbonlymode(subs, subs_array)); + lock_get(&subs_htable[hash_code].lock); - ps= subs_htable[hash_code].entries; + ps= subs_htable[hash_code].entries; while(ps && ps->next) { @@ -1113,8 +1342,8 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs if(cs== NULL) { LM_ERR( "copying subs_t stucture\n"); - lock_release(&subs_htable[hash_code].lock); - return -1; + lock_release(&subs_htable[hash_code].lock); + return -1; } cs->expires-= (int)time(NULL); cs->next= (*subs_array); @@ -1123,9 +1352,9 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs { ps->next= s->next; shm_free(s->contact.s); - shm_free(s); - LM_DBG(" deleted terminated dialog from hash table\n"); - } + shm_free(s); + LM_DBG(" deleted terminated dialog from hash table\n"); + } else ps= s; @@ -1135,10 +1364,10 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs ps= s; } - LM_DBG("found %d matching dialogs\n", i); - lock_release(&subs_htable[hash_code].lock); + LM_DBG("found %d matching dialogs\n", i); + lock_release(&subs_htable[hash_code].lock); - return 0; + return 0; } static int w_pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2)

1 0

git:master: modules_k/rls: Memory allocation problem for NOTIFY bodies
by Peter Dunkley 08 Dec '11

08 Dec '11

Module: sip-router Branch: master Commit: 0f79902f0e44f0cc3c01607a917121fbce8d30a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f79902… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:40:20 2011 +0000 modules_k/rls: Memory allocation problem for NOTIFY bodies - A few problems here: - The actual allocated buffer size was not used in the calculations in constr_multipart_body - The buffer pointer was copied to a local variable and not copied back after a realloc in constr_mulitpart_body(). This resulted in a double free when the realloc moved the buffer. - The length of the data in string buffer was never copied back to the str in constr_multipart_body(). - In both constr_multipart_body() and resource_notify.c when the buffer does not contain enough space another 2048 bytes is allocated. This is regardless of how much more space is actually needed. So if 4096 bytes were needed 2048 bytes would be allocated and then the end of the buffer would be overwritten by 4096 bytes of data. - Problem found and diagnosed during testing at Crocodile RCS - Fix implemented by Hugh Waite @ Crocodile RCS --- modules_k/rls/notify.c | 55 +++++++++++++++++++++++--------------- modules_k/rls/resource_notify.c | 2 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 319ad7f..779d262 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -51,6 +51,9 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> +static str *multipart_body = NULL; +static int multipart_body_size = 0; + typedef struct res_param { struct uri_link **next; @@ -68,7 +71,7 @@ int resource_uri_col=0, content_type_col, pres_state_col= 0, xmlDocPtr constr_rlmi_doc(db1_res_t* result, str* rl_uri, int version, xmlNodePtr rl_node, char*** cid_array, str username, str domain); -void constr_multipart_body(str *multipart_body, const str *const content_type, const str *const body, str *cid, int boundary_len, char *boundary_string); +void constr_multipart_body(const str *const content_type, const str *const body, str *cid, int boundary_len, char *boundary_string); dlg_t* rls_notify_dlg(subs_t* subs); @@ -78,14 +81,13 @@ int parse_xcap_uri(char *uri, str *host, unsigned short *port, str *path); int rls_get_resource_list(str *rl_uri, str *username, str *domain, xmlNodePtr *rl_node, xmlDocPtr *xmldoc); int add_resource_to_list(char* uri, void* param); -int add_resource(char* uri, xmlNodePtr list_node, str *multipart_body, char * boundary_string, db1_res_t *result, int *len_est); +int add_resource(char* uri, xmlNodePtr list_node, char * boundary_string, db1_res_t *result, int *len_est); int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, unsigned int hash_code) { xmlDocPtr rlmi_body= NULL; xmlNodePtr list_node= NULL; - str* multipart_body= NULL; db_key_t query_cols[2], update_cols[2], result_cols[7]; db_val_t query_vals[2], update_vals[2]; db1_res_t *result= NULL; @@ -96,8 +98,6 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, uri_link_t *uri_list_head = NULL; int len_est; res_param_t param; - char* body_buffer; - int size= BUF_REALLOC_SIZE; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ LM_DBG("start\n"); @@ -137,19 +137,20 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, /* Allocate an initial buffer for the multipart body. * This buffer will be reallocated if neccessary */ - body_buffer= (char *)pkg_malloc(size); - if(body_buffer== NULL) + multipart_body= (str*)pkg_malloc(sizeof(str)); + if(multipart_body== NULL) { ERR_MEM(PKG_MEM_STR); } - - multipart_body= (str*)pkg_malloc(sizeof(str)); - if(multipart_body== NULL) + + multipart_body_size = BUF_REALLOC_SIZE; + multipart_body->s = (char *)pkg_malloc(multipart_body_size); + + if(multipart_body->s== NULL) { ERR_MEM(PKG_MEM_STR); } - - multipart_body->s= body_buffer; + multipart_body->len= 0; /* Create an empty rlmi document */ @@ -169,7 +170,7 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, while (uri_list_head) { uri_link_t *last = uri_list_head; - if (add_resource(uri_list_head->uri, list_node, multipart_body, boundary_string, result, &len_est) >0) + if (add_resource(uri_list_head->uri, list_node, boundary_string, result, &len_est) >0) { if (resource_added == 0) { @@ -257,9 +258,11 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, if(multipart_body) { - pkg_free(multipart_body->s); + if (multipart_body->s) + pkg_free(multipart_body->s); pkg_free(multipart_body); } + multipart_body_size = 0; pkg_free(rlsubs_did.s); return 0; @@ -277,6 +280,7 @@ error: pkg_free(multipart_body->s); pkg_free(multipart_body); } + multipart_body_size = 0; if(result) rls_dbf.free_result(rls_db, result); @@ -369,7 +373,7 @@ error: int add_resource_instance(char* uri, xmlNodePtr resource_node, - db1_res_t* result, str *multipart_body, char * boundary_string, + db1_res_t* result, char * boundary_string, int *len_est) { xmlNodePtr instance_node= NULL; @@ -450,7 +454,7 @@ int add_resource_instance(char* uri, xmlNodePtr resource_node, if(auth_state_flag & ACTIVE_STATE) { - constr_multipart_body (multipart_body, &content_type, &body, &cid, boundary_len, boundary_string); + constr_multipart_body (&content_type, &body, &cid, boundary_len, boundary_string); xmlNewProp(instance_node, BAD_CAST "cid", BAD_CAST cid.s); } @@ -469,7 +473,7 @@ error: return -1; } -int add_resource(char* uri, xmlNodePtr list_node, str *multipart_body, char * boundary_string, db1_res_t *result, int *len_est) +int add_resource(char* uri, xmlNodePtr list_node, char * boundary_string, db1_res_t *result, int *len_est) { xmlNodePtr resource_node= NULL; int res; @@ -489,7 +493,7 @@ int add_resource(char* uri, xmlNodePtr list_node, str *multipart_body, char * bo } xmlNewProp(resource_node, BAD_CAST "uri", BAD_CAST uri); - res = add_resource_instance(uri, resource_node, result, multipart_body, boundary_string, len_est); + res = add_resource_instance(uri, resource_node, result, boundary_string, len_est); if(res < 0) { LM_ERR("while adding resource instance node\n"); @@ -587,10 +591,9 @@ error: } -void constr_multipart_body(str *multipart_body, const str *const content_type, const str *const body, str *cid, int boundary_len, char *boundary_string) +void constr_multipart_body(const str *const content_type, const str *const body, str *cid, int boundary_len, char *boundary_string) { char* buf= multipart_body->s; - int size= BUF_REALLOC_SIZE; int length= multipart_body->len; int chunk_len; @@ -601,10 +604,16 @@ void constr_multipart_body(str *multipart_body, const str *const content_type, c + 16 + cid->len + 18 + content_type->len + 4 + body->len + 8; - if(length + chunk_len >= size) + while(length + chunk_len >= multipart_body_size) { - REALLOC_BUF + multipart_body_size += BUF_REALLOC_SIZE; + multipart_body->s = (char*)pkg_realloc(multipart_body->s, multipart_body_size); + if(multipart_body->s == NULL) + { + ERR_MEM("constr_multipart_body"); + } } + buf = multipart_body->s; length+= sprintf(buf+ length, "--%.*s\r\n", boundary_len, boundary_string); @@ -616,6 +625,8 @@ void constr_multipart_body(str *multipart_body, const str *const content_type, c length+= sprintf(buf+length,"%.*s\r\n\r\n", body->len, body->s); + multipart_body->len = length; + error: return; diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index af64522..6d3fde5 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -371,7 +371,7 @@ void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, int aut if(cid.s) { - if(buf_len + chunk_len >= size) + while(buf_len + chunk_len >= size) { REALLOC_BUF }

1 0

git:master: modules_k/rls: removed unnecessary waitn_time <= 0 check
by Peter Dunkley 08 Dec '11

08 Dec '11

Module: sip-router Branch: master Commit: 0b6f0aec4b39e777ce11004917d77008cad225da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b6f0ae… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:47:54 2011 +0000 modules_k/rls: removed unnecessary waitn_time <= 0 check - This was checked twice one immediately after the other. The second check would never fail. --- modules_k/rls/rls.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index bc3c6bb..c482af2 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -491,9 +491,6 @@ static int mod_init(void) if(waitn_time<= 0) waitn_time= 5; - - if(waitn_time<= 0) - waitn_time= 100; /* bind libxml wrapper functions */

1 0

git:master: modules_k/rr: Exported record_route_advertised_address function to config file
by Peter Dunkley 08 Dec '11

08 Dec '11

Module: sip-router Branch: master Commit: 63250485d7acfc60237b2c368d66b0361c884d7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6325048… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:19:25 2011 +0000 modules_k/rr: Exported record_route_advertised_address function to config file - Exported the C API function to the config file - CHange by Hugh Waite @ Crocodile RCS --- modules_k/rr/README | 405 ++++++++++++++++++++++------------------- modules_k/rr/doc/rr_admin.xml | 40 ++++- modules_k/rr/rr_mod.c | 27 +++ 3 files changed, 283 insertions(+), 189 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=632…

1 0

git:master: modules_k/rls: Fixed some diagnostics that had typos and were at the wrong levels
by Peter Dunkley 08 Dec '11

08 Dec '11

Module: sip-router Branch: master Commit: 0c352ed5eb8baa6754f0e38cd04f5d365fb1c5bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c352ed… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 21:46:48 2011 +0000 modules_k/rls: Fixed some diagnostics that had typos and were at the wrong levels --- modules_k/rls/resource_notify.c | 6 +++--- modules_k/rls/rls_db.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 6d3fde5..e1da848 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -100,7 +100,7 @@ void get_dialog_from_did(char* did, subs_t **dialog, unsigned int *hash_code) if(*dialog==NULL) { - LM_ERR("record not retrieved from db [rlsubs_did]= %s\n", did); + LM_INFO("record not retrieved from db [rlsubs_did]= %s\n", did); return; } } @@ -113,7 +113,7 @@ void get_dialog_from_did(char* did, subs_t **dialog, unsigned int *hash_code) if(s== NULL) { - LM_ERR("record not found in hash_table [rlsubs_did]= %s\n", + LM_INFO("record not found in hash_table [rlsubs_did]= %s\n", did); lock_release(&rls_table[*hash_code].lock); return; @@ -250,7 +250,7 @@ void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, int aut if(dialog== NULL) { prev_did = NULL; - LM_ERR("Dialog is NULL\n"); + LM_INFO("Dialog is NULL\n"); continue; } } diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 1d63d17..17e4b78 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -1080,14 +1080,14 @@ subs_t *get_dialog_rlsdb( str callid, str to_tag, str from_tag ) if (nr_rows == 0) { /* no match */ - LM_ERR( "get_dialog_rlsb No matching records\n" ); + LM_INFO( "get_dialog_rlsdb No matching records\n" ); rls2_dbf.free_result(rls2_db, result); return(NULL); } if (nr_rows != 1) { - LM_ERR( "get_dialog_rlsb multiple matching records\n" ); + LM_ERR( "get_dialog_rlsdb multiple matching records\n" ); rls2_dbf.free_result(rls2_db, result); return(NULL); }

1 0

[OT] job offer - System administrator middleware & acs
by Henning Westerholt 07 Dec '11

07 Dec '11

[OT] Job offer: Interested in working with one of the biggest Voice over IP networks in europe? We're hiring and have one additional IT operation position open in our team in Karlsruhe, Germany. You would be responsible in a team of motivated system administrators for the operation and maintenance of the high- available middleware cluster and CPE auto-configuration services for the DSL and mobile products at 1&1. Furthermore you would be support the on-call duty for this services in the team. A solid understanding of german is necessary for the job, for more informations (additional requirements, how to apply..) please refer to the opening on the job web page. Of course please feel free to contact me per mail as well. http://jobs.1und1.de/xml/JobsDetail?job_id=3777 Best regards, Henning -- Henning Westerholt - Head of IT Operations Internet Access & Communications 1&1 Internet AG, Brauerstraße 48, 76135 Karlsruhe, Germany

1 0

git:master: xmlrpc: Removed define for Solaris compilations
by Jason Penton 07 Dec '11

07 Dec '11

Module: sip-router Branch: master Commit: 3552f22bbe89124eedca268fcd16bc9097fbb0b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3552f22… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Dec 7 14:32:45 2011 +0200 xmlrpc: Removed define for Solaris compilations - This define breaks on Solaris and is not required --- modules/xmlrpc/xmlrpc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 31c0711..566e6b9 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -23,7 +23,10 @@ * Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _XOPEN_SOURCE 4 /* strptime */ +/*This define breaks on Solaris OS */ +#ifndef __OS_solaris + #define _XOPEN_SOURCE 4 /* strptime */ +#endif #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #define _SVID_SOURCE 1 /* timegm */

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

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