sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

by Klaus Darilion

Hi! With kamailio 3.0 I encounter lots of crashes. I am using SNOM 320 and eyebeam clients. I think crashes are mostly correlated with SNOM 320. Server is CentOS5.4. OpenSSL is openssl-0.9.8e-12.el5_4.1. First crashed Kamailio always with the same backtrace: Program terminated with signal 11, Segmentation fault. [New process 1580] #0 0x0017451d in kssl_keytab_is_available () from /lib/libssl.so.6 (gdb) bt #0 0x0017451d in kssl_keytab_is_available () from /lib/libssl.so.6 #1 0x00156d01 in ssl3_choose_cipher () from /lib/libssl.so.6 #2 0x00151b45 in ssl3_get_client_hello () from /lib/libssl.so.6 #3 0x00152525 in ssl3_accept () from /lib/libssl.so.6 #4 0x00167eda in SSL_accept () from /lib/libssl.so.6 #5 0x004a6cff in tls_accept (c=0xb60ff4a0, error=0x0) at tls_server.c:327 #6 0x004ac15b in tls_h_fix_read_conn (c=0xb60ff4a0) at tls_server.c:1005 #7 0x0813d146 in tcp_read_req (con=0xb60ff4a0, bytes_read=0xbfe248b4, read_flags=0xbfe248b0) at tcp_read.c:654 #8 0x0813d8ef in handle_io (fm=0x82aa9d0, events=1, idx=-1) at tcp_read.c:930 #9 0x08141513 in tcp_receive_loop (unix_sock=27) at io_wait.h:1057 #10 0x0810fc1b in tcp_init_children () at tcp_main.c:4253 #11 0x0809ae69 in main_loop () at main.c:1525 #12 0x0809bc02 in main (argc=1, argv=0xbfe24cc4) at main.c:2251 (gdb) quit Then I configured RSA ciphers (as suggested by others) and now I get different backtraces. Here is an example where Kamailio wrote 2 core files: 1. Program terminated with signal 11, Segmentation fault. [New process 1735] #0 0x004d01d3 in free_hash_table () at h_table.c:423 423 clist_foreach_safe(&_tm_table->entries[i], p_cell, tmp_cell, (gdb) bt #0 0x004d01d3 in free_hash_table () at h_table.c:423 #1 0x004de1a0 in tm_shutdown () at t_funcs.c:126 #2 0x08104ef2 in destroy_modules () at sr_module.c:635 #3 0x08098400 in cleanup (show_status=1) at main.c:509 #4 0x0809912e in shutdown_children (sig=<value optimized out>, show_status=1) at main.c:649 #5 0x08099aa4 in handle_sigs () at main.c:740 #6 0x0809aab9 in main_loop () at main.c:1562 #7 0x0809bc02 in main (argc=1, argv=0xbfc70b74) at main.c:2251 2. Program terminated with signal 11, Segmentation fault. [New process 1759] #0 0x004f24ce in t_reply_matching (p_msg=0x8298cf0, p_branch=0xbfc70424) at t_lookup.c:983 983 if (p_cell->label != entry_label) (gdb) bt #0 0x004f24ce in t_reply_matching (p_msg=0x8298cf0, p_branch=0xbfc70424) at t_lookup.c:983 #1 0x004f5559 in t_check_msg (p_msg=0x8298cf0, param_branch=0xbfc70424) at t_lookup.c:1138 #2 0x004f5e94 in t_check (p_msg=0x8298cf0, param_branch=0xbfc70424) at t_lookup.c:1180 #3 0x005140d9 in reply_received (p_msg=0x8298cf0) at t_reply.c:1897 #4 0x0808c764 in forward_reply (msg=0x8298cf0) at forward.c:689 #5 0x080c401e in receive_msg ( buf=0xb60fe088 "SIP/2.0 200 Ok\r\nVia: SIP/2.0/TLS 83.136.32.167:5061;branch=z9hG4bKcc38.0a7d6be7.0;i=2\r\nVia: SIP/2.0/TLS 10.10.0.51:40487;received=83.136.33.3;branch=z9hG4bK-d8754z-7b0f1727475bda32-1---d8754z-;rport=2"..., len=1150, rcv_info=0xb60fded4) at receive.c:257 #6 0x0813cf41 in tcp_read_req (con=0xb60fdec0, bytes_read=0xbfc70768, read_flags=0xbfc70760) at tcp_read.c:761 #7 0x0813da0b in handle_io (fm=0x82aa708, events=1, idx=-1) at tcp_read.c:980 #8 0x08141513 in tcp_receive_loop (unix_sock=25) at io_wait.h:1057 #9 0x0810fc1b in tcp_init_children () at tcp_main.c:4253 #10 0x0809ae69 in main_loop () at main.c:1525 #11 0x0809bc02 in main (argc=1, argv=0xbfc70b74) at main.c:2251 Attached is the log file. I can provided intensive logs (memdbg) too. thanks klaus

14 years, 9 months

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, 9 months

git:master: various modules: don't access route_type directly

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d06c0f78f327134d37b5be68af8c88f595ef1238 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d06c0f7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 19:45:14 2010 +0100 various modules: don't access route_type directly route_type should be accessed only through get_route_type() or is_route_type(FOO). Replaced all the route_type==FOO_ROUTE with is_route_type(FOO_ROUTE). --- modules/dialplan/dialplan.c | 2 +- modules/lcr/lcr_mod.c | 2 +- modules_k/dialog/dlg_profile.c | 6 +++--- modules_k/dispatcher/dispatch.c | 2 +- modules_k/domain/domain.c | 4 ++-- modules_k/domainpolicy/domainpolicy.c | 4 ++-- modules_k/registrar/save.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index 15477e1..e102748 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -288,7 +288,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest, return -1; } - if(route_type==FAILURE_ROUTE + if(is_route_type(FAILURE_ROUTE) && (dest->type==PVT_RURI || dest->type==PVT_RURI_USERNAME)) { if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0)!=1 ){ LM_ERR("append_branch action failed\n"); diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 3c83bfb..cd05b06 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2048,7 +2048,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) } } - if ((route_type == REQUEST_ROUTE) && (ru_avp == NULL)) { + if ((is_route_type(REQUEST_ROUTE)) && (ru_avp == NULL)) { /* First invocation in route block => Rewrite Request URI. */ memset(&act, '\0', sizeof(act)); diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index 8df5792..723b9aa 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -337,7 +337,7 @@ static struct dlg_cell *get_current_dialog(struct sip_msg *msg) struct cell *trans; struct tm_callback* x; - if (route_type==REQUEST_ROUTE) { + if (is_route_type(REQUEST_ROUTE)) { /* use the per-process static holder */ if (msg->id==current_dlg_msg_id) return current_dlg_pointer; @@ -478,7 +478,7 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p /* get current dialog */ dlg = get_current_dialog(msg); - if (dlg==NULL && route_type!=REQUEST_ROUTE) { + if (dlg==NULL && !is_route_type(REQUEST_ROUTE)) { LM_CRIT("BUG - dialog not found in a non REQUEST route (%d)\n", REQUEST_ROUTE); return -1; @@ -534,7 +534,7 @@ int unset_dlg_profile(struct sip_msg *msg, str *value, /* get current dialog */ dlg = get_current_dialog(msg); - if (dlg==NULL || route_type==REQUEST_ROUTE) { + if (dlg==NULL || is_route_type(REQUEST_ROUTE)) { LM_CRIT("BUG - dialog NULL or del_profile used in request route\n"); return -1; } diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index befac12..5fdc86b 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1237,7 +1237,7 @@ static inline int ds_update_dst(struct sip_msg *msg, str *uri, int mode) } break; } - if(ds_append_branch!=0 && route_type==FAILURE_ROUTE) + if(ds_append_branch!=0 && is_route_type(FAILURE_ROUTE)) { if (append_branch(msg, 0, duri, 0, Q_UNSPECIFIED, 0, 0)!=1 ) { diff --git a/modules_k/domain/domain.c b/modules_k/domain/domain.c index 3b217c7..942a6ce 100644 --- a/modules_k/domain/domain.c +++ b/modules_k/domain/domain.c @@ -168,13 +168,13 @@ int is_uri_host_local(struct sip_msg* _msg, char* _s1, char* _s2) qvalue_t q; struct sip_uri puri; - if ( route_type&(REQUEST_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE) ) { + if ( is_route_type(REQUEST_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE) ) { if (parse_sip_msg_uri(_msg) < 0) { LM_ERR("Error while parsing R-URI\n"); return -1; } return is_domain_local(&(_msg->parsed_uri.host)); - } else if (route_type == FAILURE_ROUTE) { + } else if (is_route_type(FAILURE_ROUTE)) { branch.s = get_branch(0, &branch.len, &q, 0, 0, 0, 0); if (branch.s) { if (parse_uri(branch.s, branch.len, &puri) < 0) { diff --git a/modules_k/domainpolicy/domainpolicy.c b/modules_k/domainpolicy/domainpolicy.c index f77095e..ad138e3 100644 --- a/modules_k/domainpolicy/domainpolicy.c +++ b/modules_k/domainpolicy/domainpolicy.c @@ -765,7 +765,7 @@ int dp_can_connect(struct sip_msg* _msg, char* _s1, char* _s2) { str domain; int ret; - if (route_type != REQUEST_ROUTE) { + if (!is_route_type(REQUEST_ROUTE)) { LM_ERR("unsupported route type\n"); return -1; } @@ -823,7 +823,7 @@ int dp_apply_policy(struct sip_msg* _msg, char* _s1, char* _s2) { int port, proto; struct socket_info* si; - if (route_type != REQUEST_ROUTE) { + if (!is_route_type(REQUEST_ROUTE)) { LM_ERR("unsupported route type\n"); return -1; } diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 3b479f6..71c8021 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -784,13 +784,13 @@ int save(struct sip_msg* _m, char* _d, char* _cflags) update_stat(accepted_registrations, 1); /* Only send reply upon request, not upon reply */ - if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) && (reg_send_reply(_m) < 0)) + if ((is_route_type(REQUEST_ROUTE)) && !is_cflag_set(REG_SAVE_NORPL_FL) && (reg_send_reply(_m) < 0)) return -1; return ret; error: update_stat(rejected_registrations, 1); - if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) ) + if (is_route_type(REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) ) reg_send_reply(_m); return 0;

14 years, 9 months

git:master: tm: t_check_status & t_reply main onreply_route fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 75e52b43af0a445b18ccf17e0558da1f41e10337 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75e52b4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 19:38:40 2010 +0100 tm: t_check_status & t_reply main onreply_route fix - t_check_status: in some situations t_check_status left the transaction referenced when called from main onreply_route (e.g. t_check_status(); drop ) - t_reply: unref the transaction only when called from the main onreply_route and not from tm onreply route --- modules/tm/tm.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 513dc99..2b35681 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -902,7 +902,7 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) str tmp; fp = (fparam_t*)p1; - + t = 0; /* first get the transaction */ if (t_check(msg, 0 ) == -1) return -1; if ((t = get_t()) == 0) { @@ -989,11 +989,23 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) regfree(re); pkg_free(re); } - + + if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ + /* t_check() above has the side effect of setting T and + REFerencing T => we must unref and unset it. */ + UNREF( t ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); + } if (n!=0) return -1; return 1; error: + if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ + /* t_check() above has the side effect of setting T and + REFerencing T => we must unref and unset it. */ + UNREF( t ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); + } if (s) pkg_free(s); if ((fp->type != FPARAM_REGEX) && re) { regfree(re); @@ -1268,8 +1280,10 @@ inline static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) 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); + if (is_route_type(CORE_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, 9 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, 9 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, 9 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, 9 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, 9 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, 9 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, 9 months

← Newer
1
2
3
4
5
6
7
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010