sr-dev November 2009

sr-dev@lists.kamailio.org

30 participants
177 discussions

git:sr_3.0: dialog(k): set dlg context after pre script callback
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 63b457cf35abf32d3dbdbf4390a11d4a265e6825 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63b457c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 13:57:22 2009 +0100 dialog(k): set dlg context after pre script callback - applies for the case of timeout route - the prescript callback resets it otherwise - reported by Nathan Angelacos, SF svn # 5927 (cherry picked from commit 1efaa9c19279a5dded570fb60621b45191d46027) --- modules_k/dialog/dlg_handlers.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 491a1f1..cd19708 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -967,13 +967,14 @@ void dlg_ontimeout( struct dlg_tl *tl) if(dlg->toroute>0 && dlg->toroute<main_rt.entries && main_rt.rlist[dlg->toroute]!=NULL) { - dlg_set_ctx_dialog(dlg); fmsg = faked_msg_next(); if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)>0) { + dlg_set_ctx_dialog(dlg); LM_DBG("executing route %d on timeout\n", dlg->toroute); set_route_type(REQUEST_ROUTE); run_top_route(main_rt.rlist[dlg->toroute], fmsg, 0); + dlg_set_ctx_dialog(0); exec_post_script_cb(fmsg, REQUEST_CB_TYPE); } }

1 0

git:sr_3.0: pv: reset local var for tobody trans
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 34d0cb8837669e6a4473dc5523320d29a697cce8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34d0cb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 13:45:16 2009 +0100 pv: reset local var for tobody trans - from SF svn, #5951 (cherry picked from commit d4a1d5146773eac1d82b8abb39747cc8ec427801) --- modules_k/pv/pv_trans.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 3401edd..d9120de 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -925,7 +925,7 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, { if(_tr_tobody_str.len==0) memset(&_tr_tobody, 0, sizeof(struct to_body)); - if(val->rs.len>_tr_tobody_str.len) + if(_tr_tobody_str.s==NULL || val->rs.len>_tr_tobody_str.len) { if(_tr_tobody_str.s) pkg_free(_tr_tobody_str.s); _tr_tobody_str.s = @@ -954,7 +954,7 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, { memset(&_tr_tobody, 0, sizeof(struct to_body)); pkg_free(_tr_tobody_str.s); - _tr_tobody_str.len = 0; + memset(&_tr_tobody_str, 0, sizeof(str)); return -1; } if (parse_uri(_tr_tobody.uri.s, _tr_tobody.uri.len, @@ -963,7 +963,7 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, free_to_params(&_tr_tobody); memset(&_tr_tobody, 0, sizeof(struct to_body)); pkg_free(_tr_tobody_str.s); - _tr_tobody_str.len = 0; + memset(&_tr_tobody_str, 0, sizeof(str)); return -1; }

1 0

git:sr_3.0: remove some modules from excluded_modules list
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: ba23e4e065cf2a78f0b4aac42e6a3cfbc9dfc18d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba23e4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 13:33:03 2009 +0100 remove some modules from excluded_modules list - they compile and were K default (cherry picked from commit 93b42945ad2a57c84626cdd08ec40aa17c06036d) --- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b482402..7f2d496 100644 --- a/Makefile +++ b/Makefile @@ -198,13 +198,13 @@ else # excluded because they depend on external libraries exclude_modules?= cpl mangler postgres jabber mysql cpl-c \ auth_radius misc_radius \ - acc_radius dialog pa rls presence_b2b xcap xmlrpc\ + acc_radius pa rls presence_b2b xcap xmlrpc\ osp tls oracle \ unixsock dbg print_lib auth_identity ldap \ db_berkeley db_mysql db_postgres db_oracle \ db_unixodbc memcached mi_xmlrpc \ - nat_traversal perl perlvdb purple seas siptrace \ - snmpstats uac_redirect xmpp \ + perl perlvdb purple seas \ + snmpstats xmpp \ carrierroute misc_radius peering \ dialplan lcr utils presence \ presence_dialoginfo presence_xml pua pua_bla \

1 0

git:sr_3.0: rls(k): set callback type for local requests
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 04a122388dc9906a7eed887ebb6898618291f36f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04a1223… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 12:30:31 2009 +0100 rls(k): set callback type for local requests - type has to be TMCB_LOCAL_COMPLETED to execute transaction callback (cherry picked from commit dfefc8a15e9b059cf16d4930d12437948307568a) --- modules_k/rls/notify.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 9734d6c..85c62a4 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -686,8 +686,8 @@ int rls_send_notify(subs_t* subs, str* body, char* start_cid, } LM_DBG("str_hdr= %.*s\n", str_hdr->len, str_hdr->s); - set_uac_req(&uac_r, &met, str_hdr, body, td, 0, rls_notify_callback, - (void*)cb_param); + set_uac_req(&uac_r, &met, str_hdr, body, td, TMCB_LOCAL_COMPLETED, + rls_notify_callback, (void*)cb_param); rt = tmb.t_request_within(&uac_r); if(rt < 0)

1 0

git:sr_3.0: pua(k): : set callback type for local requests
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 4f5d692221d63ffdea91fb5294626511a8f5c6c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f5d692… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 12:30:18 2009 +0100 pua(k): : set callback type for local requests - type has to be TMCB_LOCAL_COMPLETED to execute transaction callback (cherry picked from commit ab31636c85552d48610c65d65afd4eaa126cf6a0) --- modules_k/pua/pua.c | 8 ++++---- modules_k/pua/send_publish.c | 4 ++-- modules_k/pua/send_subscribe.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index 3efaaac..3706200 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -660,8 +660,8 @@ int update_pua(ua_pres_t* p, unsigned int hash_code) goto error; } - set_uac_req(&uac_r, &met, str_hdr, 0, 0, 0, publ_cback_func, - (void*)cb_param); + set_uac_req(&uac_r, &met, str_hdr, 0, 0, TMCB_LOCAL_COMPLETED, + publ_cback_func, (void*)cb_param); result= tmb.t_request(&uac_r, p->pres_uri, /* Request-URI */ @@ -705,8 +705,8 @@ int update_pua(ua_pres_t* p, unsigned int hash_code) } - set_uac_req(&uac_r, &met, str_hdr, 0, td, 0, subs_cback_func, - (void*)cb_param); + set_uac_req(&uac_r, &met, str_hdr, 0, td, TMCB_LOCAL_COMPLETED, + subs_cback_func, (void*)cb_param); result= tmb.t_request_within(&uac_r); if(result< 0) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index a1d45f9..3523cbc 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -551,8 +551,8 @@ send_publish: if(body && body->len && body->s ) LM_DBG("body:\n%.*s\n ", body->len, body->s); - set_uac_req(&uac_r, &met, str_hdr, body, 0, 0, publ_cback_func, - (void*)cb_param); + set_uac_req(&uac_r, &met, str_hdr, body, 0, TMCB_LOCAL_COMPLETED, + publ_cback_func, (void*)cb_param); result= tmb.t_request(&uac_r, publ->pres_uri, /*! Request-URI */ publ->pres_uri, /*! To */ diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 656030a..93ae42a 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -885,8 +885,8 @@ insert: } hentity->flag= flag; - set_uac_req(&uac_r, &met, str_hdr, 0, 0, 0,subs_cback_func, - (void*)hentity); + set_uac_req(&uac_r, &met, str_hdr, 0, 0, TMCB_LOCAL_COMPLETED, + subs_cback_func, (void*)hentity); result= tmb.t_request (&uac_r, /* Type of the message */ subs->remote_target?subs->remote_target:subs->pres_uri,/* Request-URI*/ @@ -971,8 +971,8 @@ insert: // hentity->flag= flag; LM_DBG("event parameter: %d\n", hentity->event); - set_uac_req(&uac_r, &met, str_hdr, 0, td, 0,subs_cback_func, - (void*)hentity); + set_uac_req(&uac_r, &met, str_hdr, 0, td, TMCB_LOCAL_COMPLETED, + subs_cback_func, (void*)hentity); result= tmb.t_request_within(&uac_r); if(result< 0) {

1 0

git:sr_3.0: jabber(k): : set callback type for local requests
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 1a2187a0a880c5ee6562e60fc0082d4c1541e713 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a2187a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 12:30:02 2009 +0100 jabber(k): : set callback type for local requests - type has to be TMCB_LOCAL_COMPLETED to execute transaction callback (cherry picked from commit 2e88092d23443985f7d8459c2815cf91f68d752e) --- modules_k/jabber/xjab_worker.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/jabber/xjab_worker.c b/modules_k/jabber/xjab_worker.c index c15ea13..a8f3ab5 100644 --- a/modules_k/jabber/xjab_worker.c +++ b/modules_k/jabber/xjab_worker.c @@ -1184,7 +1184,8 @@ int xj_send_sip_msg(str *proxy, str *to, str *from, str *msg, int *cbp) #ifdef XJ_EXTRA_DEBUG LM_DBG("uac callback parameter [%p==%d]\n", cbp, *cbp); #endif - set_uac_req(&uac_r, &msg_type, &str_hdr, msg, 0, 0, xj_tuac_callback, (void*)cbp); + set_uac_req(&uac_r, &msg_type, &str_hdr, msg, 0, TMCB_LOCAL_COMPLETED, + xj_tuac_callback, (void*)cbp); } else { set_uac_req(&uac_r, &msg_type, &str_hdr, msg, 0, 0, 0, 0); }

1 0

git:sr_3.0: imc(k): : set callback type for local requests
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 6ec456a56bef2d8a236b3312998e6b328002b0bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ec456a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 12:29:48 2009 +0100 imc(k): : set callback type for local requests - type has to be TMCB_LOCAL_COMPLETED to execute transaction callback (cherry picked from commit 9eb765ffc7f6e9eac99b7f998b37f56338d8c285) --- modules_k/imc/imc_cmd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/imc/imc_cmd.c b/modules_k/imc/imc_cmd.c index 163f5f8..0bf8e50 100644 --- a/modules_k/imc/imc_cmd.c +++ b/modules_k/imc/imc_cmd.c @@ -491,7 +491,7 @@ int imc_handle_invite(struct sip_msg* msg, imc_cmd_t *cmd, cback_param->inv_uri = member->uri; /*?!?! possible race with 'remove user' */ - set_uac_req(&uac_r, &imc_msg_type, &all_hdrs, &body, 0, 0, + set_uac_req(&uac_r, &imc_msg_type, &all_hdrs, &body, 0, TMCB_LOCAL_COMPLETED, imc_inv_callback, (void*)(cback_param)); result= tmb.t_request(&uac_r, &member->uri, /* Request-URI */

1 0

git:sr_3.0: presence(k): : set callback type for local requests
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: e89900603d12984de0fc16ef529001011572820d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e899006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 12:29:31 2009 +0100 presence(k): : set callback type for local requests - type has to be TMCB_LOCAL_COMPLETED to execute transaction callback (cherry picked from commit 598aea444e9f8b2a1c610daa363723e2d38496b7) --- modules_k/presence/notify.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 93dddf0..92c2f55 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -1569,8 +1569,8 @@ jump_over_body: goto error; } - set_uac_req(&uac_r, &met, &str_hdr, notify_body, td, 0, p_tm_callback, - (void*)cb_param); + set_uac_req(&uac_r, &met, &str_hdr, notify_body, td, TMCB_LOCAL_COMPLETED, + p_tm_callback, (void*)cb_param); result = tmb.t_request_within(&uac_r); if(result< 0) {

1 0

git:sr_3.0: dialog(k): : set callback type for local requests
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 6c2b7c76ed105fc672fb2de8e0d37db56c33435f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c2b7c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 12:29:09 2009 +0100 dialog(k): : set callback type for local requests - type has to be TMCB_LOCAL_COMPLETED to execute transaction callback (cherry picked from commit 0bcc7d5f76ec897f748857befbbdcdc265d0b970) --- modules_k/dialog/dlg_req_within.c | 2 +- modules_k/dialog/dlg_transfer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index e0f208e..9be5c51 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -252,7 +252,7 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) ref_dlg(cell, 1); memset(&uac_r,'\0', sizeof(uac_req_t)); - set_uac_req(&uac_r, &met, hdrs, NULL, dialog_info, 0, + set_uac_req(&uac_r, &met, hdrs, NULL, dialog_info, TMCB_LOCAL_COMPLETED, bye_reply_cb, (void*)cell); result = d_tmb.t_request_within(&uac_r); diff --git a/modules_k/dialog/dlg_transfer.c b/modules_k/dialog/dlg_transfer.c index df6f5d1..4b87ba2 100644 --- a/modules_k/dialog/dlg_transfer.c +++ b/modules_k/dialog/dlg_transfer.c @@ -160,7 +160,7 @@ static int dlg_refer_callee(dlg_transfer_ctx_t *dtc) CRLF, CRLF_LEN); memset(&uac_r, '\0', sizeof(uac_req_t)); - set_uac_req(&uac_r, &met, &hdrs, NULL, dialog_info, 0, + set_uac_req(&uac_r, &met, &hdrs, NULL, dialog_info, TMCB_LOCAL_COMPLETED, dlg_refer_tm_callback, (void*)dtc); result = d_tmb.t_request_within(&uac_r); @@ -320,6 +320,7 @@ int dlg_bridge(str *from, str *to, str *op) uac_r.method = &s_method; uac_r.headers = &s_hdrs; uac_r.body = &s_body; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; uac_r.cb = dlg_bridge_tm_callback; uac_r.cbp = (void*)(long)dtc; ret = d_tmb.t_request(&uac_r, /* UAC Req */

1 0

git:sr_3.0: dispatcher(k): set callback type for local requests
by Daniel-Constantin Mierla 16 Nov '09

16 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 69fdda750fa7190cdbc9ae355d912d712bc11af5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69fdda7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 12:27:44 2009 +0100 dispatcher(k): set callback type for local requests - type has to be TMCB_LOCAL_COMPLETED to execute transaction callback (cherry picked from commit 58c75326614ccc3805640c2a15d95b4ad5e8e6d4) --- modules_k/dispatcher/dispatch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index d1fa863..3adb9a3 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1653,7 +1653,8 @@ void ds_check_timer(unsigned int ticks, void* param) * int request(str* m, str* ruri, str* to, str* from, str* h, * str* b, str *oburi, * transaction_cb cb, void* cbp); */ - set_uac_req(&uac_r, &ds_ping_method, 0, 0, 0, 0, ds_options_callback, + set_uac_req(&uac_r, &ds_ping_method, 0, 0, 0, + TMCB_LOCAL_COMPLETED, ds_options_callback, (void*)(long)list->id); if (tmb.t_request(&uac_r, &list->dlist[j].uri,

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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 November 2009