sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

syntax error in while condition
by jh＠tutpro.com 01 Jun '09

01 Jun '09

i'm not down to 3 syntax errors from 600+. here is one of them: while (1) { 0(7054) WARNING: <core> [cfg.y:2898]: warning in config file, line 1838, column 12: constant value in while(...) how do i write a while statement where condition is always true? -- juha

2 4

git:tirpi/script_callbacks: script callbacks: corrections
by Miklos Tirpak 01 Jun '09

01 Jun '09

Module: sip-router Branch: tirpi/script_callbacks Commit: d14f231501cedebd1d9c5956a98aec5f01b6413c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d14f231… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 1 17:33:38 2009 +0200 script callbacks: corrections - callbacks have been tested, bugs found have been corrected. --- script_cb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script_cb.c b/script_cb.c index 729eda4..c715dc8 100644 --- a/script_cb.c +++ b/script_cb.c @@ -160,8 +160,8 @@ int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) abort(); } #endif - flags = PRE_SCRIPT_CB & (1<<(type-1)); - for (cb=pre_script_cb[type]; cb ; cb=cb->next ) { + flags = PRE_SCRIPT_CB | (1<<(type-1)); + for (cb=pre_script_cb[type-1]; cb ; cb=cb->next ) { /* stop on error */ if (cb->cbf(msg, flags, cb->param)==0) return 0; @@ -183,8 +183,8 @@ int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) abort(); } #endif - flags = POST_SCRIPT_CB & (1<<(type-1)); - for (cb=post_script_cb[type]; cb ; cb=cb->next){ + flags = POST_SCRIPT_CB | (1<<(type-1)); + for (cb=post_script_cb[type-1]; cb ; cb=cb->next){ cb->cbf(msg, flags, cb->param); } return 1;

1 0

git:master: docbook: Generate TOC for root-level section elements
by Jan Janak 01 Jun '09

01 Jun '09

Module: sip-router Branch: master Commit: 229fd4f9d5685e1f41c790b7e6b69533d2d9e8f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=229fd4f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Jun 1 17:30:37 2009 +0200 docbook: Generate TOC for root-level section elements Change the configuration of docbook XSL stylesheet so that they generate the table of contents even for documents whose root-level element is <section>. This is needed for docbook documentation in modules that originate from SER. --- docbook/html.xsl | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/docbook/html.xsl b/docbook/html.xsl index 0468528..2551f41 100644 --- a/docbook/html.xsl +++ b/docbook/html.xsl @@ -8,4 +8,29 @@  <xsl:import href="html.common.xsl"/> +  + +  + <xsl:param name="toc.section.depth">4</xsl:param> + <xsl:param name="generate.section.toc.level">4</xsl:param> + +  + <xsl:param name="generate.toc"> + appendix toc,title + article/appendix nop + article toc,title + book toc,title,figure,table,example,equation + chapter toc,title + part toc,title + preface toc,title + qandadiv toc + qandaset toc + reference toc,title + /section toc + set toc,title + </xsl:param> + </xsl:stylesheet>

1 0

the last two: t_was_cancelled()
by jh＠tutpro.com 01 Jun '09

01 Jun '09

what is equivalent of t_was_cancelled()? -- juha

2 1

git:tirpi/script_callbacks: script callbacks: onsend_route correction
by Miklos Tirpak 01 Jun '09

01 Jun '09

Module: sip-router Branch: tirpi/script_callbacks Commit: 6a690d16f8ba2db8ae4123248589128ddfb25bf1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a690d1… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 1 16:33:59 2009 +0200 script callbacks: onsend_route correction - The pre-script callbacks are executed only if the onsend_route is defined. - The callbacks can access the socket info. --- onsend.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/onsend.h b/onsend.h index efb07df..867161b 100644 --- a/onsend.h +++ b/onsend.h @@ -63,22 +63,22 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, int ret; struct run_act_ctx ra_ctx; - if (exec_pre_script_cb(orig_msg, ONSEND_CB_TYPE)>0) { - ret=1; - if (onsend_rt.rlist[DEFAULT_RT]){ - onsnd_info.to=&dst->to; - onsnd_info.send_sock=dst->send_sock; - onsnd_info.buf=buf; - onsnd_info.len=len; - p_onsend=&onsnd_info; - set_route_type(ONSEND_ROUTE); + ret=1; + if (onsend_rt.rlist[DEFAULT_RT]){ + onsnd_info.to=&dst->to; + onsnd_info.send_sock=dst->send_sock; + onsnd_info.buf=buf; + onsnd_info.len=len; + p_onsend=&onsnd_info; + set_route_type(ONSEND_ROUTE); + if (exec_pre_script_cb(orig_msg, ONSEND_CB_TYPE)>0) { init_run_actions_ctx(&ra_ctx); ret=run_actions(&ra_ctx, onsend_rt.rlist[DEFAULT_RT], orig_msg); - p_onsend=0; /* reset it */ + exec_post_script_cb(orig_msg, ONSEND_CB_TYPE); + } else { + ret=0; /* drop the message */ } - exec_post_script_cb(orig_msg, ONSEND_CB_TYPE); - } else { - ret = 0; + p_onsend=0; /* reset it */ } return ret; }

1 0

git:tirpi/script_callbacks: script callbacks: onsend route
by Miklos Tirpak 01 Jun '09

01 Jun '09

Module: sip-router Branch: tirpi/script_callbacks Commit: 6d3d94baa88351df76600d3c832dd0aca9ad3e2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d3d94b… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 1 15:50:37 2009 +0200 script callbacks: onsend route - pre- and post-script callbacks are executed also for onsend route --- onsend.h | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/onsend.h b/onsend.h index ffec9f2..efb07df 100644 --- a/onsend.h +++ b/onsend.h @@ -28,6 +28,7 @@ * History: * ------- * 2005-12-11 created by andrei + * 2009-06-01 Pre- and post-script callbacks of onsend route are executed (Miklos) */ @@ -38,6 +39,7 @@ #include "ip_addr.h" #include "action.h" #include "route.h" +#include "script_cb.h" struct onsend_info{ union sockaddr_union* to; @@ -60,18 +62,23 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, struct onsend_info onsnd_info; int ret; struct run_act_ctx ra_ctx; - - ret=1; - if (onsend_rt.rlist[DEFAULT_RT]){ - onsnd_info.to=&dst->to; - onsnd_info.send_sock=dst->send_sock; - onsnd_info.buf=buf; - onsnd_info.len=len; - p_onsend=&onsnd_info; - set_route_type(ONSEND_ROUTE); - init_run_actions_ctx(&ra_ctx); - ret=run_actions(&ra_ctx, onsend_rt.rlist[DEFAULT_RT], orig_msg); - p_onsend=0; /* reset it */ + + if (exec_pre_script_cb(orig_msg, ONSEND_CB_TYPE)>0) { + ret=1; + if (onsend_rt.rlist[DEFAULT_RT]){ + onsnd_info.to=&dst->to; + onsnd_info.send_sock=dst->send_sock; + onsnd_info.buf=buf; + onsnd_info.len=len; + p_onsend=&onsnd_info; + set_route_type(ONSEND_ROUTE); + init_run_actions_ctx(&ra_ctx); + ret=run_actions(&ra_ctx, onsend_rt.rlist[DEFAULT_RT], orig_msg); + p_onsend=0; /* reset it */ + } + exec_post_script_cb(orig_msg, ONSEND_CB_TYPE); + } else { + ret = 0; } return ret; }

1 0

git:tirpi/script_callbacks: script callbacks: typo correction: s/pre/post
by Miklos Tirpak 01 Jun '09

01 Jun '09

Module: sip-router Branch: tirpi/script_callbacks Commit: 61d41e8473a3e74b5e9fde5cdaa5ce9951629722 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61d41e8… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 1 15:19:07 2009 +0200 script callbacks: typo correction: s/pre/post --- modules/tm/t_suspend.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index e9802b9..3c22ab9 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -160,7 +160,7 @@ int t_continue(unsigned int hash_index, unsigned int label, if (exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE)>0) { if (run_top_route(route, &faked_req)<0) LOG(L_ERR, "ERROR: t_continue: Error in run_top_route\n"); - exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE); + exec_post_script_cb(&faked_req, FAILURE_CB_TYPE); } /* TODO: save_msg_lumps should clone the lumps to shm mem */

1 0

git:tirpi/script_callbacks: script callbacks: support for failure and branch routes
by Miklos Tirpak 01 Jun '09

01 Jun '09

Module: sip-router Branch: tirpi/script_callbacks Commit: b9ed8d84b2eb5a9af8b1980cea772c0290611513 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9ed8d8… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 1 15:11:41 2009 +0200 script callbacks: support for failure and branch routes - Executing pre- and post-script callbacks for failure routes and branch routes. --- modules/tm/t_fwd.c | 11 ++++++++--- modules/tm/t_reply.c | 21 ++++++++++++++++----- modules/tm/t_suspend.c | 16 ++++++++++++---- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 01a3699..d0dd613 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -78,6 +78,7 @@ * t saved, thus, are not available. Set reparse_on_dns_failover * to 0 to revert the change. (Miklos) * 2008-06-04 T_CANCELED is now set each time a CANCEL is received (andrei) + * 2009-06-01 Pre- and post-script callbacks of branch route are executed (Miklos) */ #include "defs.h" @@ -98,6 +99,7 @@ #include "../../onsend.h" #include "../../compiler_opt.h" #include "../../route.h" +#include "../../script_cb.h" #include "t_funcs.h" #include "t_hooks.h" #include "t_msgbuilder.h" @@ -191,9 +193,12 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, /* run branch_route actions if provided */ set_route_type(BRANCH_ROUTE); tm_ctx_set_branch_index(branch+1); - if (run_top_route(branch_rt.rlist[branch_route], i_req) < 0) { - LOG(L_ERR, "ERROR: print_uac_request: Error in run_top_route\n"); - } + if (exec_pre_script_cb(i_req, BRANCH_CB_TYPE)>0) { + if (run_top_route(branch_rt.rlist[branch_route], i_req) < 0) { + LOG(L_ERR, "ERROR: print_uac_request: Error in run_top_route\n"); + } + exec_post_script_cb(i_req, BRANCH_CB_TYPE); + } tm_ctx_set_branch_index(0); } diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 8ab79c2..e60d046 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -89,6 +89,7 @@ * 2008-03-12 use cancel_b_method on 6xx (andrei) * 2008-05-30 make sure the wait timer is started after we don't need t * anymore to allow safe calls from fr_timer (andrei) + * 2009-06-01 Pre- and post-script callbacks of branch route are executed (Miklos) * */ @@ -106,6 +107,7 @@ #include "../../timer.h" #include "../../error.h" #include "../../action.h" +#include "../../script_cb.h" #include "../../dset.h" #include "../../tags.h" #include "../../route.h" @@ -861,9 +863,12 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, * on failure */ on_failure = t->on_negative; t->on_negative=0; - /* run a reply_route action if some was marked */ - if (run_top_route(failure_rt.rlist[on_failure], &faked_req)<0) - LOG(L_ERR, "ERROR: run_failure_handlers: Error in run_top_route\n"); + if (exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE)>0) { + /* run a reply_route action if some was marked */ + if (run_top_route(failure_rt.rlist[on_failure], &faked_req)<0) + LOG(L_ERR, "ERROR: run_failure_handlers: Error in run_top_route\n"); + exec_post_script_cb(&faked_req, FAILURE_CB_TYPE); + } } /* restore original environment and free the fake msg */ @@ -1963,6 +1968,9 @@ int reply_received( struct sip_msg *p_msg ) backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); setbflagsval(0, uac->branch_flags); + /* Pre- and post-script callbacks have already + * been execueted by the core. (Miklos) + */ if (run_top_route(onreply_rt.rlist[t->on_reply], p_msg)<0) LOG(L_ERR, "ERROR: on_reply processing failed\n"); /* transfer current message context back to t */ @@ -2090,8 +2098,11 @@ done: trans_not_found: /* transaction context was not found */ if (goto_on_sl_reply) { - /* the script writer has a chance to decide whether to - forward the reply or not */ + /* The script writer has a chance to decide whether to + * forward the reply or not. + * Pre- and post-script callbacks have already + * been execueted by the core. (Miklos) + */ return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg); } else { /* let the core forward the reply */ diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index c1dc1b1..e9802b9 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -27,10 +27,12 @@ * History: * -------- * 2008-11-10 Initial version (Miklos) + * 2009-06-01 Pre- and post-script callbacks of failure route are executed (Miklos) * */ -#include "../../select_buf.h" /* reset_static_buffer() */ +#include "../../action.h" +#include "../../script_cb.h" #include "sip_msg.h" #include "t_reply.h" @@ -151,9 +153,15 @@ int t_continue(unsigned int hash_index, unsigned int label, } faked_env( t, &faked_req); - if (run_top_route(route, &faked_req)<0) - LOG(L_ERR, "ERROR: t_continue: Error in run_top_route\n"); - + /* The sip msg is a faked msg just like in failure route + * therefore execute the pre- and post-script callbacks + * of failure route (Miklos) + */ + if (exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE)>0) { + if (run_top_route(route, &faked_req)<0) + LOG(L_ERR, "ERROR: t_continue: Error in run_top_route\n"); + exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE); + } /* TODO: save_msg_lumps should clone the lumps to shm mem */ /* restore original environment and free the fake msg */

1 0

git:tirpi/script_callbacks: script callback: modules updated to the new API
by Miklos Tirpak 01 Jun '09

01 Jun '09

Module: sip-router Branch: tirpi/script_callbacks Commit: 8216129fc2bacc2ce82158f315313d8f17a1ca4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8216129… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 1 14:38:45 2009 +0200 script callback: modules updated to the new API --- modules/tm/tm.c | 8 ++++---- modules/utils/utils.c | 6 +++--- modules_k/dialog/dialog.c | 6 +++--- modules_k/dialog/dlg_handlers.c | 6 +++--- modules_k/dialog/dlg_profile.c | 3 ++- modules_k/dialog/dlg_profile.h | 3 ++- modules_k/dialog/dlg_var.c | 2 +- modules_k/dialog/dlg_var.h | 2 +- modules_k/nat_traversal/nat_traversal.c | 6 +++--- modules_k/pua_usrloc/pua_usrloc.c | 2 +- modules_k/pua_usrloc/pua_usrloc.h | 2 +- modules_k/pua_usrloc/ul_publish.c | 2 +- modules_k/rtimer/rtimer_mod.c | 4 ++-- modules_k/siputils/ring.c | 3 ++- modules_k/siputils/ring.h | 3 ++- modules_k/siputils/siputils.c | 2 +- modules_k/sl/sl.c | 2 +- modules_k/sl/sl_funcs.c | 2 +- modules_k/sl/sl_funcs.h | 2 +- modules_s/avp_db/extra_attrs.c | 4 ++-- modules_s/db_ops/db_ops.c | 12 ++++++------ modules_s/eval/eval.c | 4 ++-- modules_s/iptrtpproxy/iptrtpproxy.c | 4 ++-- modules_s/sl/sl.c | 2 +- modules_s/sl/sl_funcs.c | 2 +- modules_s/sl/sl_funcs.h | 2 +- modules_s/timer/timer.c | 4 ++-- modules_s/xmlrpc/xmlrpc.c | 6 +++--- receive.c | 12 ++++++------ 29 files changed, 61 insertions(+), 57 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=821…

1 0

git:tirpi/script_callbacks: script callbacks: support for all kind of route blocks
by Miklos Tirpak 01 Jun '09

01 Jun '09

Module: sip-router Branch: tirpi/script_callbacks Commit: 0a99f1b390d57e236f989b8a496f751b9d5d26a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a99f1b… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 1 13:13:45 2009 +0200 script callbacks: support for all kind of route blocks - Added pre- and post-script callback support for all kind of route blocks. - req/rpl is changed to be a flag, so more callback types can be registered at once this way. The flag is passed to the callback function. --- main.c | 1 + script_cb.c | 164 +++++++++++++++++++++++++++++++--------------------------- script_cb.h | 45 ++++++++++++---- 3 files changed, 123 insertions(+), 87 deletions(-) diff --git a/main.c b/main.c index 235d66e..d3329c5 100644 --- a/main.c +++ b/main.c @@ -1632,6 +1632,7 @@ int main(int argc, char** argv) } if (init_routes()<0) goto error; if (init_nonsip_hooks()<0) goto error; + if (init_script_cb()<0) goto error; if (init_rpcs()<0) goto error; if (register_core_rpcs()!=0) goto error; diff --git a/script_cb.c b/script_cb.c index 5099745..729eda4 100644 --- a/script_cb.c +++ b/script_cb.c @@ -34,6 +34,8 @@ * 2003-03-29 cleaning pkg allocation introduced (jiri) * 2003-03-19 replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei) * 2005-02-13 script callbacks devided into request and reply types (bogdan) + * 2009-06-01 Added pre- and post-script callback support for all types + * of route blocks. (Miklos) */ @@ -43,15 +45,15 @@ #include "error.h" #include "mem/mem.h" -static struct script_cb *pre_req_cb=0; -static struct script_cb *post_req_cb=0; - -static struct script_cb *pre_rpl_cb=0; -static struct script_cb *post_rpl_cb=0; - -static unsigned int cb_id=0; +/* Number of cb types = last cb type */ +#define SCRIPT_CB_NUM EVENT_CB_TYPE +static struct script_cb *pre_script_cb[SCRIPT_CB_NUM]; +static struct script_cb *post_script_cb[SCRIPT_CB_NUM]; +/* Add a script callback to the beginning of the linked list. + * Returns -1 on error + */ static inline int add_callback( struct script_cb **list, cb_function f, void *param) { @@ -59,11 +61,10 @@ static inline int add_callback( struct script_cb **list, new_cb=pkg_malloc(sizeof(struct script_cb)); if (new_cb==0) { - LOG(L_ERR, "ERROR:add_script_callback: out of memory\n"); + LOG(L_CRIT, "add_script_callback: out of memory\n"); return -1; } new_cb->cbf = f; - new_cb->id = cb_id++; new_cb->param = param; /* link at the beginning of the list */ new_cb->next = *list; @@ -71,50 +72,58 @@ static inline int add_callback( struct script_cb **list, return 0; } - -int register_script_cb( cb_function f, int type, void *param ) +/* Register pre- or post-script callbacks. + * Returns -1 on error, 0 on success + */ +int register_script_cb( cb_function f, unsigned int flags, void *param ) { + struct script_cb **cb_array; + int i; + /* type checkings */ - if ( (type&(REQ_TYPE_CB|RPL_TYPE_CB))==0 ) { - LOG(L_CRIT,"BUG:register_script_cb: REQUEST or REPLY " - "type not specified\n"); - goto error; + if ( (flags&((1<<SCRIPT_CB_NUM)-1))==0 ) { + LOG(L_BUG, "register_script_cb: callback flag not specified\n"); + return -1; + } + if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1<<SCRIPT_CB_NUM ) { + LOG(L_BUG, "register_script_cb: unsupported callback flags: %u\n", + flags); + return -1; } - if ( (type&(PRE_SCRIPT_CB|POST_SCRIPT_CB))==0 || - (type&PRE_SCRIPT_CB && type&POST_SCRIPT_CB) ) { - LOG(L_CRIT,"BUG:register_script_cb: callback POST or PRE type must " + if ( (flags&(PRE_SCRIPT_CB|POST_SCRIPT_CB))==0 || + (flags&PRE_SCRIPT_CB && flags&POST_SCRIPT_CB) ) { + LOG(L_BUG, "register_script_cb: callback POST or PRE type must " "be exactly one\n"); - goto error; + return -1; } - if (type&REQ_TYPE_CB) { - /* callback for request script */ - if (type&PRE_SCRIPT_CB) { - if (add_callback( &pre_req_cb, f, param)<0) - goto add_error; - } else if (type&POST_SCRIPT_CB) { - if (add_callback( &post_req_cb, f, param)<0) - goto add_error; - } - } - if (type&RPL_TYPE_CB) { - /* callback (also) for reply script */ - if (type&PRE_SCRIPT_CB) { - if (add_callback( &pre_rpl_cb, f, param)<0) - goto add_error; - } else if (type&POST_SCRIPT_CB) { - if (add_callback( &post_rpl_cb, f, param)<0) - goto add_error; - } + if (flags&PRE_SCRIPT_CB) + cb_array = pre_script_cb; + else + cb_array = post_script_cb; + + /* Add the callback to the lists. + * (as many times as many flags are set) + */ + for (i=0; i<SCRIPT_CB_NUM; i++) { + if ((flags&(1<<i)) == 0) + continue; + if (add_callback(&cb_array[i], f, param) < 0) + goto add_error; } - return 0; + add_error: - LOG(L_ERR,"ERROR:register_script_cb: failed to add callback\n"); -error: + LOG(L_ERR,"register_script_cb: failed to add callback\n"); return -1; } +int init_script_cb() +{ + memset(pre_script_cb, 0, SCRIPT_CB_NUM * sizeof(struct script_cb *)); + memset(post_script_cb, 0, SCRIPT_CB_NUM * sizeof(struct script_cb *)); + return 0; +} static inline void destroy_cb_list(struct script_cb **list) { @@ -127,53 +136,56 @@ static inline void destroy_cb_list(struct script_cb **list) } } - void destroy_script_cb() { - destroy_cb_list( &pre_req_cb ); - destroy_cb_list( &post_req_cb ); - destroy_cb_list( &pre_rpl_cb ); - destroy_cb_list( &post_req_cb ); -} + int i; + for (i=0; i<SCRIPT_CB_NUM; i++) { + destroy_cb_list(&pre_script_cb[i]); + destroy_cb_list(&post_script_cb[i]); + } +} -static inline int exec_pre_cb( struct sip_msg *msg, struct script_cb *cb) +/* Execute pre-script callbacks of a given type. + * Returns 0 on error, 1 on success + */ +int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) { - for ( ; cb ; cb=cb->next ) { + struct script_cb *cb; + unsigned int flags; + +#ifdef EXTRA_DEBUG + if (type >= SCRIPT_CB_NUM) { + LOG(L_BUG, "exec_pre_script_cb: Uknown callback type\n"); + abort(); + } +#endif + flags = PRE_SCRIPT_CB & (1<<(type-1)); + for (cb=pre_script_cb[type]; cb ; cb=cb->next ) { /* stop on error */ - if (cb->cbf(msg, cb->param)==0) + if (cb->cbf(msg, flags, cb->param)==0) return 0; } return 1; } - -static inline int exec_post_cb( struct sip_msg *msg, struct script_cb *cb) +/* Execute post-script callbacks of a given type. + * Always returns 1, success. + */ +int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) { - for ( ; cb ; cb=cb->next){ - cb->cbf( msg, cb->param); + struct script_cb *cb; + unsigned int flags; + +#ifdef EXTRA_DEBUG + if (type >= SCRIPT_CB_NUM) { + LOG(L_BUG, "exec_pre_script_cb: Uknown callback type\n"); + abort(); + } +#endif + flags = POST_SCRIPT_CB & (1<<(type-1)); + for (cb=post_script_cb[type]; cb ; cb=cb->next){ + cb->cbf(msg, flags, cb->param); } return 1; } - - -int exec_pre_req_cb( struct sip_msg *msg) -{ - return exec_pre_cb( msg, pre_req_cb); -} - -int exec_pre_rpl_cb( struct sip_msg *msg) -{ - return exec_pre_cb( msg, pre_rpl_cb); -} - -int exec_post_req_cb( struct sip_msg *msg) -{ - return exec_post_cb( msg, post_req_cb); -} - -int exec_post_rpl_cb( struct sip_msg *msg) -{ - return exec_post_cb( msg, post_rpl_cb); -} - diff --git a/script_cb.h b/script_cb.h index 0c81028..eb455a2 100644 --- a/script_cb.h +++ b/script_cb.h @@ -27,6 +27,8 @@ * History: * -------- * 2005-02-13 script callbacks devided into request and reply types (bogdan) + * 2009-06-01 Added pre- and post-script callback support for all types + * of route blocks. (Miklos) */ #ifndef _SCRIPT_CB_H_ @@ -34,30 +36,51 @@ #include "parser/msg_parser.h" -typedef int (cb_function)( struct sip_msg *msg, void *param ); +typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); -#define PRE_SCRIPT_CB (1<<0) -#define POST_SCRIPT_CB (1<<1) -#define REQ_TYPE_CB (1<<2) -#define RPL_TYPE_CB (1<<3) +#define PRE_SCRIPT_CB (1<<30) +#define POST_SCRIPT_CB (1<<31) +/* Pre- and post-script callback flags. Use these flags to register + * for the callbacks, and to check the type of the callback from the + * functions. + * (Power of 2 so more callbacks can be registered at once.) + */ +enum script_cb_flag { REQUEST_CB=1, FAILURE_CB=2, ONREPLY_CB=4, + BRANCH_CB=8, ONSEND_CB=16, ERROR_CB=32, + LOCAL_CB=64, EVENT_CB=128 }; + +/* Callback types used for executing the callbacks. + * Keep in sync with script_cb_flag!!! + */ +enum script_cb_type { REQUEST_CB_TYPE=1, FAILURE_CB_TYPE, ONREPLY_CB_TYPE, + BRANCH_CB_TYPE, ONSEND_CB_TYPE, ERROR_CB_TYPE, + LOCAL_CB_TYPE, EVENT_CB_TYPE }; struct script_cb{ cb_function *cbf; struct script_cb *next; - unsigned int id; void *param; }; -int register_script_cb( cb_function f, int type, void *param ); +/* Register pre- or post-script callbacks. + * Returns -1 on error, 0 on success + */ +int register_script_cb( cb_function f, unsigned int flags, void *param ); + +int init_script_cb(); void destroy_script_cb(); -int exec_pre_req_cb( struct sip_msg *msg); -int exec_post_req_cb( struct sip_msg *msg); +/* Execute pre-script callbacks of a given type. + * Returns 0 on error, 1 on success + */ +int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type); -int exec_pre_rpl_cb( struct sip_msg *msg); -int exec_post_rpl_cb( struct sip_msg *msg); +/* Execute post-script callbacks of a given type. + * Always returns 1, success. + */ +int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type); #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009