sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: tmx(k): core & tm onreply route support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 5a620b105b62e48631e9248906e00b4b2c7b4081 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a620b1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 19:41:33 2010 +0100 tmx(k): core & tm onreply route support - support for core onreply route (like for tm onreply route, but with extra t_unref). - use get_route_type() instead of directly accessing route_type. --- modules_k/tmx/t_var.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules_k/tmx/t_var.c b/modules_k/tmx/t_var.c index 6441763..7f537ff 100644 --- a/modules_k/tmx/t_var.c +++ b/modules_k/tmx/t_var.c @@ -404,12 +404,18 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, /* no T */ code = 0; } else { - switch (route_type) { + switch (get_route_type()) { case REQUEST_ROUTE: /* use the status of the last sent reply */ code = t->uas.status; break; - case ONREPLY_ROUTE: + case CORE_ONREPLY_ROUTE: + /* t_check() above has the side effect of setting T and + REFerencing T => we must unref and unset it for the + main/core onreply_route. */ + _tmx_tmb.t_unref(msg); + /* no break */ + case TM_ONREPLY_ROUTE: /* use the status of the current reply */ code = msg->first_line.u.reply.statuscode; break; @@ -424,7 +430,7 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, } break; default: - LM_ERR("unsupported route_type %d\n", route_type); + LM_ERR("unsupported route_type %d\n", get_route_type()); code = 0; } }

14 years, 11 months

git:master: tm: onreply_route: fix cleanup after DROP

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ba15378ef66a11d3cbd6862aa2bfb060d099ca03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba15378… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 18:01:26 2010 +0100 tm: onreply_route: fix cleanup after DROP After a DROP in the onreply_route the avp lists where not restored to their original values and the possible msg flags changes in the script were dropped. --- modules/tm/t_reply.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index f37903a..9fbe6c3 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2053,13 +2053,6 @@ int reply_received( struct sip_msg *p_msg ) LOCK_REPLIES( t ); replies_locked=1; run_top_route(onreply_rt.rlist[t->on_reply], p_msg, &ctx); - if ((ctx.run_flags&DROP_R_F) && (msg_status<200)) { - if (unlikely(replies_locked)) { - replies_locked = 0; - UNLOCK_REPLIES( t ); - } - goto done; - } /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; getbflagsval(0, &uac->branch_flags); @@ -2074,6 +2067,16 @@ int reply_received( struct sip_msg *p_msg ) #ifdef WITH_XAVP xavp_set_list(backup_xavps); #endif + /* handle a possible DROP in the script, but only if this + is not a final reply (final replies already stop the timers + and droping them might leave a transaction living forever) */ + if ((ctx.run_flags&DROP_R_F) && (msg_status<200)) { + if (unlikely(replies_locked)) { + replies_locked = 0; + UNLOCK_REPLIES( t ); + } + goto done; + } } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */

14 years, 11 months

git:master: tm: t_reply can now be used from onreply_routes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9e2873513df7d4fc2fee192f47629b81301f5012 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e28735… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 17:50:40 2010 +0100 tm: t_reply can now be used from onreply_routes t_reply can now be used both from the main onreply_route (onreply_route{}) or from tm onreply_routes (onreply_route[x]{}, where x!=0). In general it should be followed by a DROP. If not you might get some log warning messages (but besides that nothing bad will happen). --- modules/tm/tm.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 16275c8..513dc99 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -315,7 +315,7 @@ static cmd_export_t cmds[]={ {"t_lookup_cancel", w_t_lookup_cancel, 1, fixup_int_1, REQUEST_ROUTE}, {T_REPLY, w_t_reply, 2, fixup_t_reply, - REQUEST_ROUTE | FAILURE_ROUTE }, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE }, {"t_retransmit_reply", w_t_retransmit_reply, 0, 0, REQUEST_ROUTE}, {"t_release", w_t_release, 0, 0, @@ -1255,6 +1255,21 @@ inline static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) ret = t_reply_unsafe(t, msg, code, r); } else if (is_route_type(REQUEST_ROUTE)) { ret = t_reply( t, msg, code, r); + } else if (is_route_type(ONREPLY_ROUTE)) { + if (likely(t->uas.request)){ + if (is_route_type(CORE_ONREPLY_ROUTE)) + ret=t_reply(t, t->uas.request, code, r); + else + ret=t_reply_unsafe(t, t->uas.request, code, r); + }else + ret=-1; + /* t_check() above has the side effect of setting T and + REFerencing T => we must unref and unset it. + Note: this is needed only in the CORE_ONREPLY_ROUTE and not also in + the TM_ONREPLY_ROUTE. + */ + UNREF( t ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); } else { LOG(L_CRIT, "BUG: w_t_reply entered in unsupported mode\n"); ret = -1;

14 years, 11 months

git:master: NEWS: note about onreply_route changes & tm

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 099a29532ed7c9c8ce736eb1f989a5af8bba4b4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=099a295… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 18:00:30 2010 +0100 NEWS: note about onreply_route changes & tm --- NEWS | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index b52d505..5f193c4 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ $Id$ sip-router 3.1 chages core: + - onreply_route {...} is now equivalent with onreply_route[0] {...} - global, per protocol blacklist ignore masks (via extended send_flags). See dst_blacklist_udp_imask a.s.o (dst_blacklist_*_imask). - per message blacklist ignore masks @@ -36,6 +37,9 @@ modules: the mask for possible local replies to the current message. blst_rpl_clear_ignore(mask): like blst_rpl_ignore(mask), but clears instead of setting. +tm: + - t_reply() can be used both from the main/core onreply_route{} and tm + onreply_route[...]{}s.

14 years, 11 months

git:master: tm: _reply cleans up after itself

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4178ad7297258ef45fce7d6c9cfd6247bdd37809 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4178ad7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 17:48:45 2010 +0100 tm: _reply cleans up after itself The _reply() function now cleans possible added reply_lumps before exiting. This allows using it not only from request or failure route. --- modules/tm/t_reply.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 47c9dc4..f37903a 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -92,6 +92,8 @@ * 2009-06-01 Pre- and post-script callbacks of branch route are * executed (Miklos) * 2009-12-10 reply route is executed under lock to protect the avps (andrei) + * 2010-02-22 _reply() will cleanup any reply lumps that it might have added + * (andrei) * */ @@ -653,7 +655,9 @@ static int _reply( struct cell *trans, struct sip_msg* p_msg, char * buf, *dset; struct bookmark bm; int dset_len; + struct lump_rpl* rpl_l; + rpl_l=0; if (code>=200) set_kr(REQ_RPLD); /* compute the buffer in private memory prior to entering lock; * create to-tag if needed */ @@ -671,12 +675,19 @@ static int _reply( struct cell *trans, struct sip_msg* p_msg, || get_to(p_msg)->tag_value.len==0)) { calc_crc_suffix( p_msg, tm_tag_suffix ); buf = build_res_buf_from_sip_req(code,text, &tm_tag, p_msg, &len, &bm); + if (unlikely(rpl_l)){ + unlink_lump_rpl(p_msg, rpl_l); + free_lump_rpl(rpl_l); + } return _reply_light( trans, buf, len, code, text, tm_tag.s, TOTAG_VALUE_LEN, lock, &bm); } else { buf = build_res_buf_from_sip_req(code,text, 0 /*no to-tag*/, p_msg, &len, &bm); - + if (unlikely(rpl_l)){ + unlink_lump_rpl(p_msg, rpl_l); + free_lump_rpl(rpl_l); + } return _reply_light(trans,buf,len,code,text, 0, 0, /* no to-tag */lock, &bm); }

14 years, 11 months

git:master: tm: restrict tm onreply_route commands to tm reply routes only

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d6229974487d26658a88a73b68e5352983cee122 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d622997… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 16:41:59 2010 +0100 tm: restrict tm onreply_route commands to tm reply routes only - most tm onreply functions restricted to tm onreply routes only. They cannot be executed anymore from the main/core onreply_route (some of them won't work and others would leave the transaction referenced). - don't access route_type directly, but via get_route_type() --- modules/tm/t_reply.c | 2 +- modules/tm/t_serial.c | 2 +- modules/tm/tm.c | 47 +++++++++++++++++++++++++---------------------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index d0a58ed..47c9dc4 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -705,7 +705,7 @@ void faked_env( struct cell *t, struct sip_msg *msg) * a shmem-ed replica of the request; advertise it in route type; * for example t_reply needs to know that */ - backup_route_type=route_type; + backup_route_type=get_route_type(); set_route_type(FAILURE_ROUTE); /* also, tm actions look in beginning whether transaction is * set -- whether we are called from a reply-processing diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index fc9c527..83528bb 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -420,7 +420,7 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) /* no transaction yet => load Request-URI and branches */ - if (route_type == FAILURE_ROUTE) { + if (is_route_type(FAILURE_ROUTE)) { LM_CRIT("BUG - undefined transaction in failure route\n"); return -1; } diff --git a/modules/tm/tm.c b/modules/tm/tm.c index bd1b54a..16275c8 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -397,9 +397,9 @@ static cmd_export_t cmds[]={ {"t_relay_cancel", w_t_relay_cancel, 0, 0, REQUEST_ROUTE}, {"t_on_failure", w_t_on_negative, 1, fixup_on_failure, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE }, + REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE }, {"t_on_reply", w_t_on_reply, 1, fixup_on_reply, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE }, + REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE }, {"t_on_branch", w_t_on_branch, 1, fixup_on_branch, REQUEST_ROUTE | FAILURE_ROUTE }, {"t_check_status", t_check_status, 1, fixup_t_check_status, @@ -409,37 +409,37 @@ static cmd_export_t cmds[]={ {"t_write_unix", t_write_unix, 2, fixup_t_write, REQUEST_ROUTE | FAILURE_ROUTE }, {"t_set_fr", t_set_fr_inv, 1, fixup_var_int_1, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_set_fr", t_set_fr_all, 2, fixup_var_int_12, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_reset_fr", w_t_reset_fr, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_set_retr", w_t_set_retr, 2, fixup_var_int_12, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_reset_retr", w_t_reset_retr, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_set_max_lifetime", w_t_set_max_lifetime, 2, fixup_var_int_12, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_reset_max_lifetime", w_t_reset_max_lifetime, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_set_auto_inv_100", t_set_auto_inv_100, 1, fixup_var_int_1, REQUEST_ROUTE}, {"t_set_disable_6xx", t_set_disable_6xx, 1, fixup_var_int_1, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_set_disable_failover", t_set_disable_failover, 1, fixup_var_int_1, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_branch_timeout", t_branch_timeout, 0, 0, FAILURE_ROUTE}, {"t_branch_replied", t_branch_replied, 0, 0, FAILURE_ROUTE}, {"t_any_timeout", t_any_timeout, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_any_replied", t_any_replied, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_is_canceled", t_is_canceled, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_is_expired", t_is_expired, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_grep_status", t_grep_status, 1, fixup_var_int_1, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_drop_replies", w_t_drop_replies, 0, 0, FAILURE_ROUTE}, {"t_drop_replies", w_t_drop_replies, 1, 0, @@ -447,7 +447,7 @@ static cmd_export_t cmds[]={ {"t_save_lumps", w_t_save_lumps, 0, 0, REQUEST_ROUTE}, {"t_check_trans", t_check_trans, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|BRANCH_ROUTE }, {"t_load_contacts", t_load_contacts, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -940,13 +940,14 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) break; } - switch(route_type) { + switch(get_route_type()) { case REQUEST_ROUTE: /* use the status of the last sent reply */ status = int2str( t->uas.status, 0); break; - case ONREPLY_ROUTE: + case TM_ONREPLY_ROUTE: + case CORE_ONREPLY_ROUTE: /* use the status of the current reply */ status = msg->first_line.u.reply.status.s; backup = status[msg->first_line.u.reply.status.len]; @@ -973,7 +974,8 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) break; default: - LOG(L_ERR,"ERROR:t_check_status: unsupported route type %d\n",route_type); + LOG(L_ERR,"ERROR:t_check_status: unsupported route type %d\n", + get_route_type()); goto error; } @@ -1355,8 +1357,9 @@ inline static int _w_t_relay_to(struct sip_msg *p_msg , } if (is_route_type(REQUEST_ROUTE)) return t_relay_to( p_msg, proxy, force_proto, - 0 /* no replication */ ); - LOG(L_CRIT, "ERROR: w_t_relay_to: unsupported route type: %d\n", route_type); + 0 /* no replication */ ); + LOG(L_CRIT, "ERROR: w_t_relay_to: unsupported route type: %d\n", + get_route_type()); return 0; }

14 years, 11 months

git:master: core: distinct core and tm onreply route tests

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 5e0e999ad320688e41f338bc7c6fc5f8fa76678f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e0e999… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 14:49:37 2010 +0100 core: distinct core and tm onreply route tests - added TM_ONREPLY_ROUTE and CORE_ONREPLY_ROUTE to the possible route types. This allows to distinguish between the main reply route (executed by the core) and onreply routes executed by tm. ONREPLY_ROUTE was changed to TM_ONREPLY_ROUTE|CORE_ONREPLY_ROUTE, so that is_route_type(ONREPLY_ROUTE) will return true both for CORE_ONREPLY_ROUTE and TM_ONREPLY_ROUTE. - onreply_route[0] {} is equivalent with onreply_route{}. - use different route types when parsing the script for onreply_route{} (CORE_ONREPLY_ROUTE) and onreply_route[x]{}, where x!=0 (TM_ONREPLY_ROUTE). --- cfg.y | 39 +++++++++++++++++++++++++-------------- receive.c | 2 +- route.h | 6 ++++-- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/cfg.y b/cfg.y index 763879a..453e6a1 100644 --- a/cfg.y +++ b/cfg.y @@ -647,7 +647,7 @@ statement: | module_stm | {rt=REQUEST_ROUTE;} route_stm | {rt=FAILURE_ROUTE;} failure_route_stm - | {rt=ONREPLY_ROUTE;} onreply_route_stm + | onreply_route_stm | {rt=BRANCH_ROUTE;} branch_route_stm | {rt=ONSEND_ROUTE;} send_route_stm | {rt=EVENT_ROUTE;} event_route_stm @@ -1775,35 +1775,46 @@ failure_route_stm: } | ROUTE_FAILURE error { yyerror("invalid failure_route statement"); } ; + onreply_route_stm: - ROUTE_ONREPLY LBRACE actions RBRACE { + ROUTE_ONREPLY LBRACE {rt=CORE_ONREPLY_ROUTE;} actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); YYABORT; } #endif /* SHM_MEM */ - push($3, &onreply_rt.rlist[DEFAULT_RT]); + push($4, &onreply_rt.rlist[DEFAULT_RT]); } - | ROUTE_ONREPLY LBRACK route_name RBRACK LBRACE actions RBRACE { + | ROUTE_ONREPLY error { yyerror("invalid onreply_route statement"); } + | ROUTE_ONREPLY LBRACK route_name RBRACK + {rt=(*$3=='0' && $3[1]==0)?CORE_ONREPLY_ROUTE:TM_ONREPLY_ROUTE;} + LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); YYABORT; } #endif /* SHM_MEM */ - i_tmp=route_get(&onreply_rt, $3); - if (i_tmp==-1){ - yyerror("internal error"); - YYABORT; - } - if (onreply_rt.rlist[i_tmp]){ - yyerror("duplicate route"); - YYABORT; + if (*$3=='0' && $3[1]==0){ + /* onreply_route[0] {} is equivalent with onreply_route {}*/ + push($7, &onreply_rt.rlist[DEFAULT_RT]); + }else{ + i_tmp=route_get(&onreply_rt, $3); + if (i_tmp==-1){ + yyerror("internal error"); + YYABORT; + } + if (onreply_rt.rlist[i_tmp]){ + yyerror("duplicate route"); + YYABORT; + } + push($7, &onreply_rt.rlist[i_tmp]); } - push($6, &onreply_rt.rlist[i_tmp]); } - | ROUTE_ONREPLY error { yyerror("invalid onreply_route statement"); } + | ROUTE_ONREPLY LBRACK route_name RBRACK error { + yyerror("invalid onreply_route statement"); + } ; branch_route_stm: ROUTE_BRANCH LBRACE actions RBRACE { diff --git a/receive.c b/receive.c index a045e3a..df26196 100644 --- a/receive.c +++ b/receive.c @@ -247,7 +247,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* exec the onreply routing script */ if (onreply_rt.rlist[DEFAULT_RT]){ - set_route_type(ONREPLY_ROUTE); + set_route_type(CORE_ONREPLY_ROUTE); ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); #ifndef NO_ONREPLY_ROUTE_ERROR if (unlikely(ret<0)){ diff --git a/route.h b/route.h index e346ebd..5e3e04d 100644 --- a/route.h +++ b/route.h @@ -47,11 +47,13 @@ */ #define REQUEST_ROUTE (1 << 0) #define FAILURE_ROUTE (1 << 1) -#define ONREPLY_ROUTE (1 << 2) +#define TM_ONREPLY_ROUTE (1 << 2) #define BRANCH_ROUTE (1 << 3) #define ONSEND_ROUTE (1 << 4) #define ERROR_ROUTE (1 << 5) #define LOCAL_ROUTE (1 << 6) +#define CORE_ONREPLY_ROUTE (1 << 7) +#define ONREPLY_ROUTE (TM_ONREPLY_ROUTE|CORE_ONREPLY_ROUTE) #define EVENT_ROUTE REQUEST_ROUTE #define ANY_ROUTE (0xFFFFFFFF) @@ -68,7 +70,7 @@ extern int route_type; #define get_route_type() route_type -#define is_route_type(type) (route_type == (type)) +#define is_route_type(type) (route_type & (type)) struct route_list{ struct action** rlist;

14 years, 11 months

git:master: tm: tm onreply route has now TM_ONREPLY_ROUTE type

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 01f1e80610310ed00c4657724c05280831ba594f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01f1e80… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 14:53:42 2010 +0100 tm: tm onreply route has now TM_ONREPLY_ROUTE type --- modules/tm/t_reply.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 850442e..d0a58ed 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2020,7 +2020,7 @@ int reply_received( struct sip_msg *p_msg ) uac->request.dst.send_flags.blst_imask & BLST_503; /* processing of on_reply block */ if (t->on_reply) { - set_route_type(ONREPLY_ROUTE); + set_route_type(TM_ONREPLY_ROUTE); /* transfer transaction flag to message context */ if (t->uas.request) p_msg->flags=t->uas.request->flags; /* set the as avp_list the one from transaction */

14 years, 11 months

git:master: Merge remote branch 'origin/andrei/blst_send_flags'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 04f55d6c20fbb7628b3c672a5df5a0a1e2c67114 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04f55d6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 19 16:37:51 2010 +0100 Merge remote branch 'origin/andrei/blst_send_flags' Support for blacklist ignore flags, both global and on a per message basis. E.g.: per message: if (method=~"MESSAGE") blst_set_ignore(6); global: sercmd cfg.set_now_int core dst_blacklist_tcp_imask 16 * origin/andrei/blst_send_flags: NEWS: minor blacklist flag number correction tm: blacklist on 503 reply fixed for send flags NEWS: mentioned blacklist ignore masks core: cfg script support for blacklist ignore masks blst: global config variables for ignoring blacklist events blst: docs for blst_{set,clear}_ignore script functions blst: functions for ignoring blacklist events blst: use dst_blacklist_force_add tm: simplified blacklist add code blacklist: ignore mask support tm: updated to the new snd_flags_t structure core: send_flags preliminary blacklist support Conflicts: NEWS cfg.lex cfg.y dst_blacklist.h ---

14 years, 11 months

git:andrei/blst_send_flags: tm: blacklist on 503 reply fixed for send flags

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/blst_send_flags Commit: 0f2375f9216fd7f431e91d02f4ccc5dc9e4e5730 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f2375f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 19 15:35:57 2010 +0100 tm: blacklist on 503 reply fixed for send flags Blacklisting the source of a 503 reply now obeys also the blacklist ignore masks (both global and per message). The ignore 503 blacklist flag can be set (and it will be obeyed) in any route (be it main route, on branch, on send or the on_reply route). E.g.: using blst_set_ignore(32) in the onsend_route for a specific destination would cause the ignore 503 flag to be inherited by the 503 reply (this is the only blacklist flag that it's inherited this way). --- modules/tm/t_reply.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 0b16fae..4e53584 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1844,7 +1844,6 @@ int reply_received( struct sip_msg *p_msg ) #endif #ifdef USE_DST_BLACKLIST int blst_503_timeout; - struct dest_info src; struct hdr_field* hf; #endif #ifdef TMCB_ONSEND @@ -1972,6 +1971,10 @@ int reply_received( struct sip_msg *p_msg ) switch_rb_retr_to_t2(&uac->request); } } + /* pre-set the ignore BLST_503 flag in the message, if the + corresponding branch had it set on send */ + p_msg->fwd_send_flags.blst_imask|= + uac->request.dst.send_flags.blst_imask & BLST_503; /* processing of on_reply block */ if (t->on_reply) { set_route_type(ONREPLY_ROUTE); @@ -2008,10 +2011,13 @@ int reply_received( struct sip_msg *p_msg ) } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */ - if (cfg_get(tm, tm_cfg, tm_blst_503) - && cfg_get(core, core_cfg, use_dst_blacklist) - && (msg_status==503) - ){ + if ( (msg_status==503) && + cfg_get(tm, tm_cfg, tm_blst_503) && + /* check if the request sent on the branch had the the + blst 503 ignore flags set or it was set in the onreply_r*/ + should_blacklist_su(BLST_503, &p_msg->fwd_send_flags, + p_msg->rcv.proto, &p_msg->rcv.src_su) + ){ blst_503_timeout=cfg_get(tm, tm_cfg, tm_blst_503_default); if ((parse_headers(p_msg, HDR_RETRY_AFTER_F, 0)==0) && (p_msg->parsed_flag & HDR_RETRY_AFTER_F)){ @@ -2027,12 +2033,9 @@ int reply_received( struct sip_msg *p_msg ) } } if (blst_503_timeout){ - src.send_sock=0; - src.to=p_msg->rcv.src_su; - src.id=p_msg->rcv.proto_reserved1; - src.proto=p_msg->rcv.proto; - dst_blacklist_add_to(BLST_503, &src, p_msg, - S_TO_TICKS(blst_503_timeout)); + dst_blacklist_force_su_to(BLST_503, p_msg->rcv.proto, + &p_msg->rcv.src_su, p_msg, + S_TO_TICKS(blst_503_timeout)); } } #endif /* USE_DST_BLACKLIST */

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev