sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

[tracker] Comment added: async_sleep() does not work

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#190 - async_sleep() does not work User who did this - Daniel-Constantin Mierla (miconda) ---------- I removed the flags that allowed using async functions in branch_route -- in this routing block is processed the outgoing branch, practically is too late to suspend processing of the request as a network send command was issued (e.g., t_relay()). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=190#comment455 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.

13 years

[tracker] User took ownership: async_sleep() does not work

by sip-router

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

13 years

git:master: async: cfg functions cannot be used in branch_route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 22278ed608d598ac353b32cd44517e961faa41b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22278ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 11 00:02:14 2011 +0100 async: cfg functions cannot be used in branch_route - that routing block is processing outgoing brnaches, not requests - reported by Jasmin Schnatterbeck, FS#190 --- modules/async/async_mod.c | 4 ++-- modules/async/doc/async_admin.xml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/async/async_mod.c b/modules/async/async_mod.c index 17c7179..26e94b7 100644 --- a/modules/async/async_mod.c +++ b/modules/async/async_mod.c @@ -56,9 +56,9 @@ struct tm_binds tmb; static cmd_export_t cmds[]={ {"async_route", (cmd_function)w_async_route, 2, fixup_async_route, - 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"async_sleep", (cmd_function)w_async_sleep, 1, fixup_async_sleep, - 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + 0, REQUEST_ROUTE|FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} }; diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml index 37b9a75..9087f62 100644 --- a/modules/async/doc/async_admin.xml +++ b/modules/async/doc/async_admin.xml @@ -112,6 +112,8 @@ modparam("async", "workers", 2) that the execution of config after resume will end once the route[routename] is finished. </para> + <para> + This function can be used from REQUEST_ROUTE. <example> <title><function>async_sleep</function> usage</title> <programlisting format="linespecific"> @@ -148,6 +150,8 @@ route[RESUME] { that the execution of config after resume will end once the route block where async_sleep() is called is finished. </para> + <para> + This function can be used from REQUEST_ROUTE. <example> <title><function>async_sleep</function> usage</title> <programlisting format="linespecific">

13 years

git:master: async: fixed broken docbook crated in previous commit

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5176f66abb7c9f588431ba3a05a9b54d2d8e5093 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5176f66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 11 00:04:47 2011 +0100 async: fixed broken docbook crated in previous commit --- modules/async/doc/async_admin.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml index 9087f62..e4ddde4 100644 --- a/modules/async/doc/async_admin.xml +++ b/modules/async/doc/async_admin.xml @@ -114,6 +114,7 @@ modparam("async", "workers", 2) </para> <para> This function can be used from REQUEST_ROUTE. + </para> <example> <title><function>async_sleep</function> usage</title> <programlisting format="linespecific"> @@ -152,6 +153,7 @@ route[RESUME] { </para> <para> This function can be used from REQUEST_ROUTE. + </para> <example> <title><function>async_sleep</function> usage</title> <programlisting format="linespecific">

13 years

git:master: async: readme file was regenerated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dcea57fb83b480a8d55e466a26e677a639bda6bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dcea57f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 11 00:05:46 2011 +0100 async: readme file was regenerated --- modules/async/README | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/async/README b/modules/async/README index 45d0971..21b2cc2 100644 --- a/modules/async/README +++ b/modules/async/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2011 asipto.com + Copyright � 2011 asipto.com __________________________________________________________________ Table of Contents @@ -107,7 +107,7 @@ modparam("async", "workers", 2) 4.1. async_route(routename, seconds) 4.2. async_sleep(seconds) -4.1. async_route(routename, seconds) +4.1. async_route(routename, seconds) Simulate a sleep of 'seconds' and then continue the processing of SIP request with the route[routename]. In case of internal errors, the @@ -126,6 +126,8 @@ modparam("async", "workers", 2) that the execution of config after resume will end once the route[routename] is finished. + This function can be used from REQUEST_ROUTE. + Example 1.2. async_sleep usage ... async_route("RESUME", "4"); @@ -136,7 +138,7 @@ route[RESUME] { } ... -4.2. async_sleep(seconds) +4.2. async_sleep(seconds) Simulate a sleep of 'seconds' and then continue the processing of SIP request with the next action. In case of internal errors, the function @@ -152,6 +154,8 @@ route[RESUME] { that the execution of config after resume will end once the route block where async_sleep() is called is finished. + This function can be used from REQUEST_ROUTE. + Example 1.3. async_sleep usage ... async_sleep("4");

13 years

[tracker] Task opened: async_sleep() does not work

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Jasmin Schnatterbeck (jasmin) Attached to Project - sip-router Summary - async_sleep() does not work Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hello, when using async_sleep() in branch_route I get: /usr/sbin/kamailio[8410]: : tm [timer.h:216]: WARNING: -_set_fr_timer- already added: 0x7fcdf5bfc7d0 , tl=0x7fcdf5bfc7f0!!! /usr/sbin/kamailio[8410]: : tm [t_fwd.c:1396]: BUG: t_send_branch: retr. already started for 0x7fcdf5bfc7d0 .... and the message is sent out immediately. In async_mod.c the function async_sleep() is exported for usage in branch_route... what can be wrong? Regards Jasmin More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=190 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.

13 years

[tracker] Task opened: dlg_manage() after t_newtran() does not work

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Jasmin Schnatterbeck (jasmin) Attached to Project - sip-router Summary - dlg_manage() after t_newtran() does not work Task Type - Bug Report Category - dialog Status - Assigned Assigned To - Timo Reimann Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hello, when I tried to use t_newtran() with the dialog-module loaded, the following problem occured; - the dialog tracking flag is not set (yet) - script calls t_newtran() - TMCB_REQUEST_IN calls dlg_onreq() - there is no dialog tracking flag set (yet), so no dialog is started by dlg_onreq() - script sets dialog tracking flag - script calls t_relay() => TMCB_REQUEST_IN (and dlg_onreq()) is not called again, because the transaction already exists. => no dialog at all But there is dlg_manage(), that can start a dialog (even after t_newtran() and without using dlg_onreq()). The problem is, that dlg_set_tm_callbacks() is called by dlg_onreq() only => in case of dlg_manage() after t_newtran() dlg_set_tm_callbacks() is not being called. As result of this, the response callbacks (and dialog state etc.) don't work... Jasmin More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=189 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.

13 years

[tracker] Assignee added: dlg_manage() after t_newtran() does not work

by sip-router

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

13 years

git:3.2: modules_k/presence: Authorisation requests not working in DB only mode

by Peter Dunkley

Module: sip-router Branch: 3.2 Commit: fe80dfd78cda377efa39857e23b7b011f84be4e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe80dfd… 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 (cherry picked from commit 754a5f470ecc45d976beeb33be0dc43b88510b5d) --- modules_k/presence/presence.c | 249 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 239 insertions(+), 10 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 1bb6c9b..7d2cbfc 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -1073,15 +1073,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) { @@ -1103,8 +1332,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); @@ -1113,9 +1342,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; @@ -1125,10 +1354,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)

13 years

git:3.2: modules_k/pua: Temporary dialogs did not contain all of the required fields.

by Peter Dunkley

Module: sip-router Branch: 3.2 Commit: e84539d3b49354e71300be808abf51aaab1785e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e84539d… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Dec 8 22:03:35 2011 +0000 modules_k/pua: Temporary dialogs did not contain all of the required fields. - Temporary dialogs are created when a SUBSCRIBE is sent to handle the timing issue that means that NOTIFYs can be processed before 200 OKs (the real dialog is created on 200 OK). - Not every required field was filled in for the temporary dialogs so dialog searches were failing and duplicate dialogs created. (cherry picked from commit 464d6a353f1de7d7ca38cd856320b973f3341679) --- modules_k/pua/send_subscribe.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index f9d72df..80e1472 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -963,8 +963,12 @@ insert: presentity->id.len = subs->id.len; size += subs->id.len; + presentity->event = pres.event; + presentity->flag = pres.flag; + /* Set the temporary record expiry for 2 * 64T1 seconds from now */ presentity->expires= (int)time(NULL) + 64; + presentity->desired_expires= presentity->expires; insert_htable(presentity);

13 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011