sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:kamailio_3.0: dialog(k): set dlg context after pre script callback

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 1efaa9c19279a5dded570fb60621b45191d46027 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1efaa9c… 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 --- 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); } }

15 years, 2 months

OpenSolaris + sip-router // Kamailio 3.0

by Nick Lemberger

I don't know if there's a plan to support the newer Solaris' distros but sip-router and Kamailio 3.0 don't compile on OpenSolaris with SunStudio Compiler (cc) or GCC. Kamailio up to 1.5 has historically compiled at least with GCC - it seems to be Makefile related. --- When the CC variable is set to point to SunStudio (/opt/SunStudioExpress/bin/cc) I get: Makefile:248: config.mak: No such file or directory normal Makefile.defs exec Makefile.defs:380: Unknown compiler /opt/SunStudioExpress/bin/cc\; supported compilers: gcc, sun cc, intel icc target architecture <x86_64>, host architecture <x86_64> Makefile.defs:933: *** Unsupported compiler (/opt/SunStudioExpress/bin/cc:/opt/SunStudioExpress/bin/cc), try gcc. Stop. --- If I set it to GCC 4.3.2 I get the following when I make (or gmake, although OpenSolaris generally defaults to GNU make): Makefile:248: config.mak: No such file or directory normal Makefile.defs exec target architecture <i386>, host architecture <x86_64> And things just stop - I never get a prompt back until I ctrl-x. --- I'm attempting the compile as root so there aren't and permissions issues. And suggestions would be most appreciated. -Nick

15 years, 2 months

SF.net SVN: openser:[5955] branches/1.4/pvar.c

by Daniel-Constantin Mierla

Revision: 5955 http://openser.svn.sourceforge.net/openser/?rev=5955&view=rev Author: miconda Date: 2009-11-06 12:20:14 +0000 (Fri, 06 Nov 2009) Log Message: ----------- - return transport parameter value for $rP - reported by Alex Hermann, SF.net tracker #2892560 Modified Paths: -------------- branches/1.4/pvar.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 2 months

SF.net SVN: openser:[5954] branches/1.5/modules/pv/pv_core.c

by Daniel-Constantin Mierla

Revision: 5954 http://openser.svn.sourceforge.net/openser/?rev=5954&view=rev Author: miconda Date: 2009-11-06 12:10:19 +0000 (Fri, 06 Nov 2009) Log Message: ----------- - return transport parameter value for $rP - reported by Alex Hermann, SF.net tracker #2892560 Modified Paths: -------------- branches/1.5/modules/pv/pv_core.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 2 months

git:kamailio_3.0: imc(k): : set callback type for local requests

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 9eb765ffc7f6e9eac99b7f998b37f56338d8c285 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9eb765f… 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 --- 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 */

15 years, 2 months

git:kamailio_3.0: dialog(k): : set callback type for local requests

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 0bcc7d5f76ec897f748857befbbdcdc265d0b970 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0bcc7d5… 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 --- 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 */

15 years, 2 months

git:kamailio_3.0: pua(k): : set callback type for local requests

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: ab31636c85552d48610c65d65afd4eaa126cf6a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab31636… 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 --- 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) {

15 years, 2 months

git:kamailio_3.0: jabber(k): : set callback type for local requests

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 2e88092d23443985f7d8459c2815cf91f68d752e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e88092… 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 --- 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); }

15 years, 2 months

git:kamailio_3.0: presence(k): : set callback type for local requests

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 598aea444e9f8b2a1c610daa363723e2d38496b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=598aea4… 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 --- 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) {

15 years, 2 months

git:kamailio_3.0: dispatcher(k): set callback type for local requests

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 58c75326614ccc3805640c2a15d95b4ad5e8e6d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58c7532… 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 --- 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,

15 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev