sr-dev

sr-dev@lists.kamailio.org

2 participants
45453 discussions

git:master: tm: _reply cleans up after itself
by Andrei Pelinescu-Onciul 22 Feb '10

22 Feb '10

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); }

1 0

git:master: tm: restrict tm onreply_route commands to tm reply routes only
by Andrei Pelinescu-Onciul 22 Feb '10

22 Feb '10

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; }

1 0

git:master: core: distinct core and tm onreply route tests
by Andrei Pelinescu-Onciul 22 Feb '10

22 Feb '10

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;

1 0

git:master: tm: tm onreply route has now TM_ONREPLY_ROUTE type
by Andrei Pelinescu-Onciul 22 Feb '10

22 Feb '10

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 */

1 0

git:master: Merge remote branch 'origin/andrei/blst_send_flags'
by Andrei Pelinescu-Onciul 19 Feb '10

19 Feb '10

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 ---

1 0

git:andrei/blst_send_flags: tm: blacklist on 503 reply fixed for send flags
by Andrei Pelinescu-Onciul 19 Feb '10

19 Feb '10

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 */

1 0

git:andrei/blst_send_flags: NEWS: minor blacklist flag number correction
by Andrei Pelinescu-Onciul 19 Feb '10

19 Feb '10

Module: sip-router Branch: andrei/blst_send_flags Commit: 4bb4f8527673e69ecb8c66ad32ae236b200cecd7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bb4f85… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 19 16:26:44 2010 +0100 NEWS: minor blacklist flag number correction --- NEWS | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 3896e72..75c74bf 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,8 @@ new config variables: at runtime. Default: 0 (no blacklist reason is ignored). Possible values: 0 -disabled, 2 - send error; 4 - connect error, 8 - icmp (reserverd), 16 - transaction timeout, - 32 - administratively prohibited (manually set). + 32 - 503 received, 64 - administratively prohibited + (manually set). - dst_blacklist_tcp_imask - like dst_blacklist_udp_imask, but for tcp. - dst_blacklist_tls_imask - like dst_blacklist_tls_imask, but for tcp. - dst_blacklist_sctp_imask -like dst_blacklist_sctp_imask, but for tcp.

1 0

SF.net SVN: openser:[5989] branches/1.5/modules/acc
by Marius Zbihlei 19 Feb '10

19 Feb '10

Revision: 5989 http://openser.svn.sourceforge.net/openser/?rev=5989&view=rev Author: mariuszbihlei Date: 2010-02-19 15:09:39 +0000 (Fri, 19 Feb 2010) Log Message: ----------- modules:acc Fixed a bug that caused global log_facility (the one in kamailio) to be overwritten by acc's log_facility if the module was loaded. This caused log messages to be printed in the acc's log facility (really annoying if the ) In kamailio executable log_facility in the initialized Data segment (global variables) and elf's .dynsym section , the dynamic symbol table, which contains all of the file's imported and exported symbols 08131cec D log_facility Also the same can be said for acc's log facility 00007234 D log_facility This caused that when dlopen() was called on acc.so, the .dynsym section to the concatenated, and caused the main's log_facility to resolve to wrong symbol. Patch by Timo Reimann(timo.reimann AT 1und1.de) Modified Paths: -------------- branches/1.5/modules/acc/acc.c branches/1.5/modules/acc/acc_mod.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Your opinion about presence subscription blocking actions
by Iñaki Baz Castillo 19 Feb '10

19 Feb '10

Hi, I'm dealing with presence right now. I've read full OMA and RCS specifications/proposals/guidelines for presence and XCAP but I don't feel comfortable with some parts of them. So let me to explain the question (it involves the sr/kamailio presence module behavior for a future re-design in which I want to participate): In presence/XCAP/XDM there are three ways bob can deny alice to see his presence status (by modifying the XCAP documents according): 1) Ignore alice's request. This is, bob doesn't "allow" neither "blocks" alice, so alice just gets the first NOTIFY from the server with: Subscription-Status: pending After some long time the server will send: Subscription-Status: terminated ; reason=expired 2) Block alice by invoking a "block" action. This means that alice receives a NOTIFY from the server with: Subscription-Status: terminated; reason=rejected This is: alice *knows* that she has been explicitely blocked by bob. 3) Polite-block alice by invoking "polite-block" action. In this way the presence server generates a spoofed NOTIFY for alice containing "offline" information but the header: Subscription-Status: active This is: alice *things* she has been allowed by bob and bob it's offline right now (not true). Well, in real IM/presence world (MSN, Skype, XMPP, Yahoo...) option 2 doesn't exist, am I right? This is, if you block an user he doesn't know that you have blocked him. Instead just options 1 or 3 are used (and in some networks just option 1). Do you see any advantage in point 2? Personally I don't see it and it just introduces too much complexity for presence/XCAP/XDM client developers. I would appreciate your opinnions about it. Thanks. -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 2

[tracker] Task closed: tm clone msg / free_faked_req bug
by sip-router 19 Feb '10

19 Feb '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#37 - tm clone msg / free_faked_req bug User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37 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.

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