sr-dev May 2012

sr-dev@lists.kamailio.org

29 participants
173 discussions

[tracker] Task closed: Crash in presence_reginfo/presence.so
by sip-router 10 May '12

10 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#203 - Crash in presence_reginfo/presence.so User who did this - Carsten Bock (carstenbock) Reason for closing: Works for me Additional comments about closing: Unable to reproduce. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=203 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

Siremis - Access is Denied - New Install
by Ryan Goode 09 May '12

09 May '12

Hello, I have a fresh server with a new install of Siremis. I can't seem to login. When I do, I receive an access denied message when I am redirected to /siremis/system/general_default Looking at the DB, it appears to successfully login (as indicated by last login column). It is almost as if the role assignment is not correctly assigned to the admin account. Where should I look next? Thanks! Ryan Goode

1 0

kamailio init slows down with multiple TLS domains of big certficates
by Jijo 09 May '12

09 May '12

Hi All, I have 5 domains with big TLS certficates like each domain has more than 8K bytes of certificates. I have observed that the kamailio taking quite amount of time to initialize. I looked at the code and found that the SSL_CONTEXT is initialized for each process. Why can't we use the same SSL_CONTEXT for all process. This will speed up the init time. I changed using single SSL context for all process and initialization was very fast. According to my understanding on a new TLS connection SSL structure for a connection shall copy all the data from SSL_CTXT. So there is no sharing of resource here, as SSL_CTXT is readable for all process. So why we have to create SSL_CTXT for each process. Please let me know if any particular reason to do it. Thanks Jijo

1 1

git:master: modules_k/presence: Fixed some issues to do with the notifier processes
by Peter Dunkley 09 May '12

09 May '12

Module: sip-router Branch: master Commit: e2f654081831dc6e291d195dca1e9fd9ce53996a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2f6540… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed May 9 13:59:23 2012 +0100 modules_k/presence: Fixed some issues to do with the notifier processes - Removal of expired presentities (on a timer) didn't work right - Removal of old presentities after "closed" NOTIFY didn't work in all cases - When the same subscriber was logged in twice only one client got certain notifications. --- modules_k/presence/notify.c | 52 ++++++++++++++++++---- modules_k/presence/presentity.c | 90 ++++++++++++++++++++++++++++---------- modules_k/presence/presentity.h | 1 + modules_k/presence/publish.c | 42 ++++++++++++------ 4 files changed, 136 insertions(+), 49 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 509b3dd..3d71f43 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -1345,12 +1345,16 @@ int publ_notify_notifier(str pres_uri, pres_ev_t *event) goto error; } - if(result == NULL) goto error; + if(result == NULL) + { + LM_ERR("bad result\n"); + goto error; + } + rows = RES_ROWS(result); for (i = 0; i <RES_ROW_N(result); i++) { - rows = RES_ROWS(result); - values = ROW_VALUES(rows); + values = ROW_VALUES(&rows[i]); subs.callid.s = (char *) VAL_STRING(&values[r_callid_col]); subs.callid.len = strlen(subs.callid.s); @@ -2043,7 +2047,10 @@ static int unset_watchers_updated_winfo(str *pres_uri) } if (result == NULL) - ncols = 0; + { + LM_ERR("bad result\n"); + goto error; + } else ncols = result->n; @@ -2113,7 +2120,10 @@ static int winfo_dialog_pending(str *pres_uri) } if (result == NULL) - ret = 0; + { + LM_ERR("bad result\n"); + goto error; + } else ret = result->n; @@ -2169,7 +2179,10 @@ static int watchers_awaiting_update(str *pres_uri, pres_ev_t *event) } if (result == NULL) - ret = 0; + { + LM_ERR("bad result\n"); + goto error; + } else ret = result->n; @@ -2219,8 +2232,11 @@ int set_wipeer_subs_updated(str *pres_uri, pres_ev_t *event, int full) goto error; } - if (result == NULL ) + if (result == NULL) + { + LM_ERR("bad result\n"); goto error; + } if (result->n <= 0) { @@ -2393,8 +2409,11 @@ static watcher_t *build_watchers_list(subs_t *sub) goto error; } - if (result == NULL ) + if (result == NULL) + { + LM_ERR("bad result\n"); goto error; + } if (result->n <= 0) goto done; @@ -2450,6 +2469,19 @@ static int notifier_notify(subs_t *sub, int *updated) } else { + if (sub->event->type & PUBL_TYPE) + { + int tmp = watchers_awaiting_update(&sub->pres_uri, + sub->event); + if (tmp < 0) + { + LM_ERR("checking watchers\n"); + goto error; + } + else if (tmp == 0) + attempt_delete_presentities = 1; + } + if (sub->updated_winfo == UPDATED_TYPE && winfo_dialog_pending(&sub->pres_uri) > 0) { @@ -2509,7 +2541,7 @@ static int notifier_notify(subs_t *sub, int *updated) else if (sub->event->type & PUBL_TYPE) { int tmp = watchers_awaiting_update(&sub->pres_uri, - sub->event); + sub->event); if (tmp < 0) { LM_ERR("checking watchers\n"); @@ -2531,6 +2563,7 @@ static int notifier_notify(subs_t *sub, int *updated) goto error; } +done: if (attempt_delete_presentities) { if (delete_offline_presentities(&sub->pres_uri, sub->event) < 0) @@ -2542,7 +2575,6 @@ static int notifier_notify(subs_t *sub, int *updated) ret = 1; -done: error: free_notify_body(nbody, sub->event); free_watcher_list(watchers); diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c index a752ff0..4d0a02d 100644 --- a/modules_k/presence/presentity.c +++ b/modules_k/presence/presentity.c @@ -542,6 +542,7 @@ after_dialog_check: LM_ERR("updating watcher records\n"); goto error; } + if (num_watchers > 0) { if (mark_presentity_for_delete(presentity) < 0) @@ -562,17 +563,9 @@ after_dialog_check: if (pres_notifier_processes == 0 || num_watchers == 0) { - if (pa_dbf.use_table(pa_db, &presentity_table) < 0) - { - LM_ERR("unsuccessful use table sql operation\n"); - goto error; - } - - LM_DBG("expires =0 -> deleting from database\n"); - - if(pa_dbf.delete(pa_db,query_cols,0,query_vals,n_query_cols)<0) + if (delete_presentity(presentity) < 0) { - LM_ERR("unsuccessful sql delete operation"); + LM_ERR("Deleting presentity\n"); goto error; } @@ -757,7 +750,7 @@ after_dialog_check: send_notify: /* send notify with presence information */ - if (pres_notifier_processes == 0 || num_watchers == 0) + if (pres_notifier_processes > 0) { if (publ_notify_notifier(pres_uri, presentity->event) < 0) { @@ -1133,6 +1126,19 @@ int mark_presentity_for_delete(presentity_t *pres) int ret = -1; str *cur_body, *new_body = NULL; + if (pres->event->agg_nbody == NULL) + { + /* Nothing clever to do here... just delete */ + if (delete_presentity(pres) < 0) + { + LM_ERR("deleting presentity\n"); + goto error; + } + + ret = 0; + goto done; + } + if (pa_dbf.use_table(pa_db, &presentity_table) < 0) { LM_ERR("unsuccessful use table sql operation\n"); @@ -1163,19 +1169,6 @@ int mark_presentity_for_delete(presentity_t *pres) query_vals[n_query_cols].val.str_val = pres->etag; n_query_cols++; - if (pres->event->agg_nbody == NULL) - { - /* Nothing clever to do here... just delete */ - if(pa_dbf.delete(pa_db, query_cols, 0, query_vals, n_query_cols) < 0) - { - LM_ERR("unsuccessful sql delete operation"); - goto error; - } - - ret = 0; - goto done; - } - result_cols[0] = &str_body_col; if (pa_dbf.query(pa_db, query_cols, 0, query_vals, result_cols, @@ -1243,6 +1236,55 @@ error: return ret; } +int delete_presentity(presentity_t *pres) +{ + db_key_t query_cols[4]; + db_val_t query_vals[4]; + int n_query_cols = 0; + int ret = -1; + + if (pa_dbf.use_table(pa_db, &presentity_table) < 0) + { + LM_ERR("unsuccessful use table sql operation\n"); + goto error; + } + + query_cols[n_query_cols] = &str_username_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->user; + n_query_cols++; + + query_cols[n_query_cols] = &str_domain_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->domain; + n_query_cols++; + + query_cols[n_query_cols] = &str_event_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->event->name; + 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 = pres->etag; + n_query_cols++; + + if(pa_dbf.delete(pa_db, query_cols, 0, query_vals, n_query_cols) < 0) + { + LM_ERR("unsuccessful sql delete operation"); + goto error; + } + + ret = 0; + +error: + return ret; +} + int delete_offline_presentities(str *pres_uri, pres_ev_t *event) { db_key_t query_cols[4]; diff --git a/modules_k/presence/presentity.h b/modules_k/presence/presentity.h index 2b87aca..744ed6c 100644 --- a/modules_k/presence/presentity.h +++ b/modules_k/presence/presentity.h @@ -72,6 +72,7 @@ char* get_sphere(str* pres_uri); typedef char* (*pres_get_sphere_t)(str* pres_uri); int mark_presentity_for_delete(presentity_t *pres); +int delete_presentity(presentity_t *pres); int delete_offline_presentities(str *pres_uri, pres_ev_t *event); #endif diff --git a/modules_k/presence/publish.c b/modules_k/presence/publish.c index c1249b1..9bac8ae 100644 --- a/modules_k/presence/publish.c +++ b/modules_k/presence/publish.c @@ -76,6 +76,7 @@ void msg_presentity_clean(unsigned int ticks,void *param) db1_res_t *result = NULL; db_row_t *row ; db_val_t *row_vals ; + int n_db_cols = 0; int i =0, size= 0; struct p_modif* p= NULL; presentity_t* pres= NULL; @@ -94,17 +95,19 @@ void msg_presentity_clean(unsigned int ticks,void *param) return ; } - db_keys[0] = &str_expires_col; - db_ops[0] = OP_LT; - db_vals[0].type = DB1_INT; - db_vals[0].nul = 0; - db_vals[0].val.int_val = (int)time(NULL); + db_keys[n_db_cols] = &str_expires_col; + db_ops[n_db_cols] = OP_LT; + db_vals[n_db_cols].type = DB1_INT; + db_vals[n_db_cols].nul = 0; + db_vals[n_db_cols].val.int_val = (int)time(NULL); + n_db_cols++; - db_keys[1] = &str_expires_col; - db_ops[1] = OP_GT; - db_vals[1].type = DB1_INT; - db_vals[1].nul = 0; - db_vals[1].val.int_val = 0; + db_keys[n_db_cols] = &str_expires_col; + db_ops[n_db_cols] = OP_GT; + db_vals[n_db_cols].type = DB1_INT; + db_vals[n_db_cols].nul = 0; + db_vals[n_db_cols].val.int_val = 0; + n_db_cols++; result_cols[user_col= n_result_cols++] = &str_username_col; result_cols[domain_col=n_result_cols++] = &str_domain_col; @@ -113,7 +116,7 @@ void msg_presentity_clean(unsigned int ticks,void *param) static str query_str = str_init("username"); if(pa_dbf.query(pa_db, db_keys, db_ops, db_vals, result_cols, - 2, n_result_cols, &query_str, &result )< 0) + n_db_cols, n_result_cols, &query_str, &result )< 0) { LM_ERR("failed to query database for expired messages\n"); if(result) @@ -223,11 +226,20 @@ void msg_presentity_clean(unsigned int ticks,void *param) LM_ERR("Updating watcher records\n"); goto error; } + if (num_watchers > 0) { if (mark_presentity_for_delete(p[i].p) < 0) { - LM_ERR("Marking presentities\n"); + LM_ERR("Marking presentity\n"); + goto error; + } + } + else + { + if (delete_presentity(p[i].p) < 0) + { + LM_ERR("Deleting presentity\n"); goto error; } } @@ -269,10 +281,10 @@ void msg_presentity_clean(unsigned int ticks,void *param) goto error; } -delete_pres: - if (pres_notifier_processes <= 0 || num_watchers == 0) + if (pres_notifier_processes == 0) { - if (pa_dbf.delete(pa_db, db_keys, db_ops, db_vals, 2) < 0) +delete_pres: + if (pa_dbf.delete(pa_db, db_keys, db_ops, db_vals, n_db_cols) < 0) LM_ERR("failed to delete expired records from DB\n"); }

1 0

git:master: modules_k/pua: Added (start|end|abort)_transaction calls ( when in DB only mode and where supported)
by Peter Dunkley 09 May '12

09 May '12

Module: sip-router Branch: master Commit: ea2fab792425bf30197d47ae08f806a908fc3681 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea2fab7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed May 9 13:55:01 2012 +0100 modules_k/pua: Added (start|end|abort)_transaction calls (when in DB only mode and where supported) - Helps with some multi-server/process race hazards --- modules_k/pua/pua.h | 6 +++ modules_k/pua/pua_db.c | 4 -- modules_k/pua/pua_db.h | 2 - modules_k/pua/send_publish.c | 85 +++++++++++++++++++++++++++------------ modules_k/pua/send_subscribe.c | 75 ++++++++++++++++++++++++++++++----- 5 files changed, 130 insertions(+), 42 deletions(-) diff --git a/modules_k/pua/pua.h b/modules_k/pua/pua.h index 1246532..34e2135 100644 --- a/modules_k/pua/pua.h +++ b/modules_k/pua/pua.h @@ -26,6 +26,7 @@ #define PUBLISH_H #include "../../str.h" +#include "../../lib/srdb1/db.h" #include "hash.h" #define INSERT_TYPE 1<<1 @@ -54,4 +55,9 @@ int reginfo_increase_version; extern int update_pua(ua_pres_t* p); extern int clean_puadb( int update_period, int min_expires ); +extern db_func_t pua_dbf; +extern db1_con_t *pua_db; +extern int pua_fetch_rows; + + #endif diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index a92b028..2e6c398 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -37,10 +37,6 @@ #include "pua.h" #include "pua_db.h" -/* database connection */ -extern db1_con_t *pua_db; -extern int pua_fetch_rows; - /* database colums */ static str str_id_col = str_init( "id" ); static str str_pres_uri_col = str_init("pres_uri"); diff --git a/modules_k/pua/pua_db.h b/modules_k/pua/pua_db.h index 4348b6d..0cc82a9 100644 --- a/modules_k/pua/pua_db.h +++ b/modules_k/pua/pua_db.h @@ -47,8 +47,6 @@ #define PUA_VERSION (1<<16) #define PUA_EXTRA_HEADERS (1<<17) -extern db_func_t pua_dbf; - void free_results_puadb( db1_res_t *res ); int is_dialog_puadb(ua_pres_t *pres); int get_record_id_puadb(ua_pres_t *pres, str **rec_id ); diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index 600ba8e..cfc759f 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -213,6 +213,15 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) dbpres.watcher_uri = &watcher_uri; dbpres.extra_headers = &extra_headers; + if (dbmode == PUA_DB_ONLY && pua_dbf.start_transaction) + { + if (pua_dbf.start_transaction(pua_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + if(ps->param== NULL|| *ps->param== NULL) { LM_ERR("NULL callback parameter\n"); @@ -422,6 +431,16 @@ done: } if (res) free_results_puadb(res); + + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + { + if (pua_dbf.end_transaction(pua_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + return; error: @@ -433,6 +452,13 @@ error: if(presentity) shm_free(presentity); if (res) free_results_puadb(res); + + if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) + { + if (pua_dbf.abort_transaction(pua_db) < 0) + LM_ERR("in abort_transaction\n"); + } + return; } @@ -454,11 +480,20 @@ int send_publish( publ_info_t* publ ) db1_res_t *res=NULL; ua_pres_t dbpres; str pres_uri={0,0}, watcher_uri={0,0}, extra_headers={0,0}; + int ret = -1; LM_DBG("pres_uri=%.*s\n", publ->pres_uri->len, publ->pres_uri->s ); - /* get event from list */ + if (dbmode == PUA_DB_ONLY && pua_dbf.start_transaction) + { + if (pua_dbf.start_transaction(pua_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + /* get event from list */ ev= get_event(publ->event); if(ev== NULL) { @@ -495,8 +530,8 @@ int send_publish( publ_info_t* publ ) { if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); - free_results_puadb(res); - return 418; + ret = 418; + goto error; } if(publ->flag & INSERT_TYPE) @@ -521,14 +556,14 @@ insert: { LM_DBG("request for a publish with expires 0 and" " no record found\n"); - free_results_puadb(res); - return 0; + goto done; + } if(publ->body== NULL) { LM_ERR("New PUBLISH and no body found- invalid request\n"); - free_results_puadb(res); - return ERR_PUBLISH_NO_BODY; + ret = ERR_PUBLISH_NO_BODY; + goto error; } } else @@ -541,8 +576,7 @@ insert: LM_ERR("while allocating memory\n"); if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); - free_results_puadb(res); - return -1; + goto error; } memcpy(etag.s, presentity->etag.s, presentity->etag.len); etag.len= presentity->etag.len; @@ -650,26 +684,18 @@ send_publish: goto error; } - pkg_free(str_hdr); +done: + ret = 0; - if( body && ret_code) - { - if(body->s) - xmlFree(body->s); - pkg_free(body); - } - if(etag.s) - pkg_free(etag.s); - if(tuple_id) + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) { - if(tuple_id->s) - pkg_free(tuple_id->s); - pkg_free(tuple_id); + if (pua_dbf.end_transaction(pua_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } } - free_results_puadb(res); - return 0; - error: if(etag.s) pkg_free(etag.s); @@ -692,7 +718,14 @@ error: pkg_free(tuple_id); } free_results_puadb(res); - return -1; + + if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) + { + if (pua_dbf.abort_transaction(pua_db) < 0) + LM_ERR("in abort_transaction\n"); + } + + return ret; } ua_pres_t* publish_cbparam(publ_info_t* publ,str* body,str* tuple_id, diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 9b89a4a..bc10b28 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -297,6 +297,16 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) LM_ERR("null callback parameter\n"); return; } + + if (dbmode == PUA_DB_ONLY && pua_dbf.start_transaction) + { + if (pua_dbf.start_transaction(pua_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + LM_DBG("completed with status %d\n",ps->code) ; hentity= (ua_pres_t*)(*ps->param); hash_code= core_hash(hentity->pres_uri,hentity->watcher_uri, @@ -676,6 +686,16 @@ done: hentity->flag= flag; run_pua_callbacks( hentity, msg); } + + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + { + if (pua_dbf.end_transaction(pua_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + goto end; error: @@ -685,6 +705,12 @@ error: shm_free(presentity); } + if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) + { + if (pua_dbf.abort_transaction(pua_db) < 0) + LM_ERR("in abort_transaction\n"); + } + end: if(hentity) @@ -889,7 +915,7 @@ int send_subscribe(subs_info_t* subs) ua_pres_t* presentity= NULL; str met= {"SUBSCRIBE", 9}; str* str_hdr= NULL; - int ret= 0; + int ret= -1; unsigned int hash_code=0; ua_pres_t* hentity= NULL; int expires; @@ -926,6 +952,15 @@ int send_subscribe(subs_info_t* subs) return -1; } + if (dbmode == PUA_DB_ONLY && pua_dbf.start_transaction) + { + if (pua_dbf.start_transaction(pua_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + /* generation of hash and getting lock moved from here to further down */ if (dbmode==PUA_DB_ONLY) @@ -980,8 +1015,7 @@ insert: { LM_ERR("while building callback" " param\n"); - ret= -1; - goto done; + goto error; } hentity->flag= flag; @@ -1005,7 +1039,11 @@ insert: uac_r.dialog = 0; } shm_free(hentity); - goto done; + + /* Although this is an error must not return -1 as the + calling function must continue processing. */ + ret = 0; + goto error; } /* Now create a temporary hash table entry. @@ -1022,7 +1060,7 @@ insert: if(presentity== NULL) { LM_ERR("no more share memory\n"); - goto done; + goto error; } memset(presentity, 0, size); size= sizeof(ua_pres_t); @@ -1111,10 +1149,9 @@ insert: if(td== NULL) { LM_ERR("while building tm dlg_t structure"); - ret= -1; if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); - goto done; + goto error; } hentity= subs_cbparam_indlg(presentity, expires, REQ_OTHER); @@ -1123,8 +1160,7 @@ insert: LM_ERR("while building callback param\n"); if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); - ret= -1; - goto done; + goto error; } if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); @@ -1139,14 +1175,33 @@ insert: shm_free(hentity); hentity= NULL; LM_ERR("while sending request with t_request\n"); - goto done; + goto error; } } done: + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + { + if (pua_dbf.end_transaction(pua_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + + ret = 0; + +error: pua_free_tm_dlg(td); pkg_free(str_hdr); free_results_puadb(res); + + if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) + { + if (pua_dbf.abort_transaction(pua_db) < 0) + LM_ERR("in abort_transaction\n"); + } + return ret; }

1 0

kamdbctl error
by Vineet Menon 09 May '12

09 May '12

Hi, I am compiling sources of kamailio 3.2.3 on ubuntu 12.04. I have used make command > `make group_include="standard mysql" all` > to make the sources. and then > `make install`..... > Now when i do kamdbctl it throws an error, $ kamdbctl create > ERROR: could not load the script in > /usr/local/lib64/kamailio//kamctl/kamdbctl.mysql for database engine MYSQL > ERROR: database engine not loaded - tried 'MYSQL' > Any guess what is the problem??? Regards, Vineet Menon

2 6

kamailio and gnutls
by Victor Seva 09 May '12

09 May '12

Hi, I was looking for info in order to build kamailio with gnutls and I've found an old bug report[0] with some initial patches and an old thread [1] discussing about openssl/gnutls and Debian. Is there any way to build kamailio with gnutls? Thanks in advance. [0] http://sourceforge.net/tracker/?func=detail&atid=743022&aid=1758793&group_i… [1] http://thread.gmane.org/gmane.comp.voip.ser.devel/1697/focus=1697

2 1

git:master: modules/dialplan: dp_translate documentation improvement
by admin＠sip-router.org 09 May '12

09 May '12

Module: sip-router Branch: master Commit: bf2cb0f9a5fc6e3dff5194801cd90e15a8c193fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf2cb0f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed May 9 10:22:17 2012 +0300 modules/dialplan: dp_translate documentation improvement --- modules/dialplan/README | 44 +++++++++++++++--------------- modules/dialplan/doc/dialplan_admin.xml | 12 ++++---- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modules/dialplan/README b/modules/dialplan/README index b7acda1..1b18d07 100644 --- a/modules/dialplan/README +++ b/modules/dialplan/README @@ -12,9 +12,9 @@ Edited by Juha Heinanen - Copyright � 2007-2008 Voice Sistem SRL + Copyright © 2007-2008 Voice Sistem SRL - Copyright � 2008-2010 Juha Heinanen + Copyright © 2008-2010 Juha Heinanen __________________________________________________________________ Table of Contents @@ -46,7 +46,7 @@ Juha Heinanen 6. Functions - 6.1. dp_translate(id, src[/dest]) + 6.1. dp_translate(id, [src[/dest]]) 7. MI Commands @@ -109,7 +109,7 @@ Chapter 1. Admin Guide 6. Functions - 6.1. dp_translate(id, src[/dest]) + 6.1. dp_translate(id, [src[/dest]]) 7. MI Commands @@ -200,7 +200,7 @@ Chapter 1. Admin Guide The translation rules will be loaded using this database URL. - Default value is "mysql://openser:openserrw@localhost/openser". + Default value is “mysql://openser:openserrw@localhost/openser”. Example 1.1. Set db_url parameter ... @@ -211,7 +211,7 @@ modparam("dialplan", "db_url", "mysql://user:passwb@localhost/db") The table's name from which to load the translation rules. - Default value is "dialplan". + Default value is “dialplan”. Example 1.2. Set table_name parameter ... @@ -222,7 +222,7 @@ modparam("dialplan", "table_name", "my_table") The column name used to store the dialplan ID group. - Default value is "dpid". + Default value is “dpid”. Example 1.3. Set dpid_col parameter ... @@ -234,7 +234,7 @@ modparam("dialplan", "dpid_col", "column_name") The column name used to store the priority of the corresponding rule from the database row. - Default value is "pr". + Default value is “pr”. Example 1.4. Set pr_col parameter ... @@ -245,7 +245,7 @@ modparam("dialplan", "pr_col", "column_name") The column name used to store the type of matching of the rule. - Default value is "match_op". + Default value is “match_op”. Example 1.5. Set match_op_col parameter ... @@ -256,7 +256,7 @@ modparam("dialplan", "match_op_col", "column_name") The column name to store the rule match expression. - Default value is "match_exp". + Default value is “match_exp”. Example 1.6. Set match_exp_col parameter ... @@ -268,7 +268,7 @@ modparam("dialplan", "match_exp_col", "column_name") The column name to store the length of a string matching the match expression. - Default value is "match_len". + Default value is “match_len”. Example 1.7. Set pr_col parameter ... @@ -279,7 +279,7 @@ modparam("dialplan", "match_len_col", "column_name") The column name to store the rule's substitution expression. - Default value is "subst_exp". + Default value is “subst_exp”. Example 1.8. Set pr_col parameter ... @@ -290,7 +290,7 @@ modparam("dialplan", "subst_exp_col", "column_name") The column name to store the rule's replacement expression. - Default value is "repl_exp". + Default value is “repl_exp”. Example 1.9. Set repl_exp_col parameter ... @@ -302,7 +302,7 @@ modparam("dialplan", "repl_exp_col", "column_name") The column name to store the rule's attributes to be set to the message. - Default value is "attrs". + Default value is “attrs”. Example 1.10. Set attrs_col parameter ... @@ -315,7 +315,7 @@ modparam("dialplan", "attrs_col", "column_name") (dp_translate() succeeds). This parameter can be an AVP or a SCRIPT VAR. - Default value is "NULL". + Default value is “NULL”. Example 1.11. Set attrs_pvar parameter ... @@ -326,7 +326,7 @@ modparam("dialplan", "attrs_pvar", "$avp(s:dest)") The number of rows to be fetched at once from database - Default value is "1000". + Default value is “1000”. Example 1.12. Set fetch_rows parameter ... @@ -335,12 +335,14 @@ modparam("dialplan", "fetch_rows", 4000) 6. Functions - 6.1. dp_translate(id, src[/dest]) + 6.1. dp_translate(id, [src[/dest]]) -6.1. dp_translate(id, src[/dest]) +6.1. dp_translate(id, [src[/dest]]) Will try to translate src into dest according to the translation rules - with dialplan ID equal to id. If dest is missing, only matching and + with dialplan ID equal to id. If src/dest is missing the default + parameter “ruri.user/ruri.user” will be used, thus translating the + request uri user part. If only dest is missing, only matching and storing of matching rule's attributes is done. Returns 1, if translation succeeded, -1 in case of some error occurred, @@ -354,9 +356,7 @@ modparam("dialplan", "fetch_rows", 4000) variable + script var - the dialplan id is the value of an existing script variable. - * src/dest - input and output of the function. If this parameter is - missing the default parameter "ruri.user/ruri.user" will be used, - thus translating the request uri user part. + * src/dest - input and output of the function. Input parameter src can be any pseudo variable. Output parameter dest can be: + R-URI diff --git a/modules/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml index a789a4c..254e124 100644 --- a/modules/dialplan/doc/dialplan_admin.xml +++ b/modules/dialplan/doc/dialplan_admin.xml @@ -358,13 +358,16 @@ modparam("dialplan", "fetch_rows", 4000) <section> <title> - <function moreinfo="none">dp_translate(id, src[/dest])</function> + <function moreinfo="none">dp_translate(id, [src[/dest]])</function> </title> <para> Will try to translate src into dest according to - the translation rules with dialplan ID equal to id. If dest is + the translation rules with dialplan ID equal to id. If src/dest is + missing the default parameter <quote>ruri.user/ruri.user</quote> will + be used, thus translating the request uri user part. If only dest is missing, only matching and storing of matching rule's - attributes is done. + attributes is done. + </para> <para> Returns 1, if translation succeeded, -1 in case of some error @@ -399,9 +402,6 @@ modparam("dialplan", "fetch_rows", 4000) <listitem> <para> <emphasis>src/dest</emphasis> - input and output of the function. - If this parameter is missing the default parameter - <quote>ruri.user/ruri.user</quote> will be used, thus - translating the request uri user part. </para> <para>Input parameter src can be any pseudo variable. Output parameter dest can be:

1 0

git:3.2: modules_k/auth_radius: fixed typo in README
by admin＠sip-router.org 09 May '12

09 May '12

Module: sip-router Branch: 3.2 Commit: c554684986be936ae1d76513fdc7202b0c117db9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c554684… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed May 9 07:42:14 2012 +0300 modules_k/auth_radius: fixed typo in README - Fixed authorization return code for authorization failed. It should be 2 instead of 3. Reported by Ricardo Martinez. (cherry picked from commit 7665aefc966409588cca8e2a70d8a03e4d7a6fa1) --- modules_k/auth_radius/README | 2 +- modules_k/auth_radius/doc/auth_radius_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/auth_radius/README b/modules_k/auth_radius/README index f44d94e..1875408 100644 --- a/modules_k/auth_radius/README +++ b/modules_k/auth_radius/README @@ -227,7 +227,7 @@ modparam("auth_radius", "use_ruri_flag", 22) * -6 (nonce reused) - nonce is used more than once; * -5 (no credentials) - credentials were not found in request; * -4 (stale nonce) - stale nonce; - * -3 (authorization failed) - RADIUS responded with Access Reject + * -2 (authorization failed) - RADIUS responded with Access Reject which may be, for example, due to user not found or wrong password; * -1 (error) - some error occured during authorization (see syslog); diff --git a/modules_k/auth_radius/doc/auth_radius_admin.xml b/modules_k/auth_radius/doc/auth_radius_admin.xml index becb3fe..5deb681 100644 --- a/modules_k/auth_radius/doc/auth_radius_admin.xml +++ b/modules_k/auth_radius/doc/auth_radius_admin.xml @@ -226,7 +226,7 @@ modparam("auth_radius", "use_ruri_flag", 22) <emphasis>-4 (stale nonce)</emphasis> - stale nonce; </para></listitem> <listitem><para> - <emphasis>-3 (authorization failed)</emphasis> - RADIUS responded with Access Reject which may be, for example, due to user not found or wrong password; + <emphasis>-2 (authorization failed)</emphasis> - RADIUS responded with Access Reject which may be, for example, due to user not found or wrong password; </para></listitem> <listitem><para> <emphasis>-1 (error)</emphasis> - some error occured during authorization (see syslog);

1 0

git:master: modules_k/auth_radius: fixed typo in README
by admin＠sip-router.org 09 May '12

09 May '12

Module: sip-router Branch: master Commit: 7665aefc966409588cca8e2a70d8a03e4d7a6fa1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7665aef… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed May 9 07:42:14 2012 +0300 modules_k/auth_radius: fixed typo in README - Fixed authorization return code for authorization failed. It should be 2 instead of 3. Reported by Ricardo Martinez. --- modules_k/auth_radius/README | 2 +- modules_k/auth_radius/doc/auth_radius_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/auth_radius/README b/modules_k/auth_radius/README index f44d94e..1875408 100644 --- a/modules_k/auth_radius/README +++ b/modules_k/auth_radius/README @@ -227,7 +227,7 @@ modparam("auth_radius", "use_ruri_flag", 22) * -6 (nonce reused) - nonce is used more than once; * -5 (no credentials) - credentials were not found in request; * -4 (stale nonce) - stale nonce; - * -3 (authorization failed) - RADIUS responded with Access Reject + * -2 (authorization failed) - RADIUS responded with Access Reject which may be, for example, due to user not found or wrong password; * -1 (error) - some error occured during authorization (see syslog); diff --git a/modules_k/auth_radius/doc/auth_radius_admin.xml b/modules_k/auth_radius/doc/auth_radius_admin.xml index becb3fe..5deb681 100644 --- a/modules_k/auth_radius/doc/auth_radius_admin.xml +++ b/modules_k/auth_radius/doc/auth_radius_admin.xml @@ -226,7 +226,7 @@ modparam("auth_radius", "use_ruri_flag", 22) <emphasis>-4 (stale nonce)</emphasis> - stale nonce; </para></listitem> <listitem><para> - <emphasis>-3 (authorization failed)</emphasis> - RADIUS responded with Access Reject which may be, for example, due to user not found or wrong password; + <emphasis>-2 (authorization failed)</emphasis> - RADIUS responded with Access Reject which may be, for example, due to user not found or wrong password; </para></listitem> <listitem><para> <emphasis>-1 (error)</emphasis> - some error occured during authorization (see syslog);

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2012