sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: core: parse_to display name multi-token no-quotes fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 907686c0c4c1141af175d692251b8e1fab28b64e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=907686c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 3 19:24:08 2010 +0100 core: parse_to display name multi-token no-quotes fix Fix for properly returning a non-quoted display name that is composed of several tokens (contains spaces). The previous version would set the display name to the first token, in this case (e.g. Foo Bar <sip:foo@bar> resulted in display_name="Foo" instead of "Foo Bar"). Reported-by: Ronald Voermans ronald voermans nu Closes FlySpray#39 . --- parser/parse_to.c | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/parser/parse_to.c b/parser/parse_to.c index 803f825..8dbaacf 100644 --- a/parser/parse_to.c +++ b/parser/parse_to.c @@ -22,12 +22,12 @@ * History: * --------- * 2003-04-26 ZSW (jiri) + * 2010-03-03 fix multi-token no-quotes display name (andrei) */ -/*! \file - * \brief Parser :: Parse To: header - * - * \ingroup parser +/** Parser :: Parse To: header. + * @file + * @ingroup parser */ #include "parse_to.h" @@ -41,7 +41,7 @@ enum { START_TO, DISPLAY_QUOTED, E_DISPLAY_QUOTED, DISPLAY_TOKEN, - S_URI_ENCLOSED, URI_ENCLOSED, E_URI_ENCLOSED, + DISPLAY_TOKEN_SP, S_URI_ENCLOSED, URI_ENCLOSED, E_URI_ENCLOSED, URI_OR_TOKEN, MAYBE_URI_END, END, F_CR, F_LF, F_CRLF }; @@ -532,6 +532,10 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) to_b->uri.s= 0; to_b->display.len = 0; to_b->display.s = 0; + to_b->tag_value.len = 0; + to_b->tag_value.s = 0; + to_b->param_lst = 0; + to_b->last_param = 0; foo=0; for( tmp=buffer; tmp<end; tmp++) @@ -556,6 +560,10 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) foo = tmp; status = MAYBE_URI_END; break; + case DISPLAY_TOKEN: + foo = tmp; + status = DISPLAY_TOKEN_SP; + break; } break; case '\n': @@ -565,12 +573,17 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) foo = tmp; status = MAYBE_URI_END; case MAYBE_URI_END: - case DISPLAY_TOKEN: + case DISPLAY_TOKEN_SP: case E_DISPLAY_QUOTED: case END: saved_status=status; status=F_LF; break; + case DISPLAY_TOKEN: + foo=tmp; + saved_status=DISPLAY_TOKEN_SP; + status=F_LF; + break; case F_CR: status=F_CRLF; break; @@ -592,12 +605,17 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) foo = tmp; status = MAYBE_URI_END; case MAYBE_URI_END: - case DISPLAY_TOKEN: + case DISPLAY_TOKEN_SP: case E_DISPLAY_QUOTED: case END: saved_status=status; status=F_CR; break; + case DISPLAY_TOKEN: + foo=tmp; + saved_status=DISPLAY_TOKEN_SP; + status=F_CR; + break; case F_CRLF: case F_CR: case F_LF: @@ -652,10 +670,13 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) status = S_URI_ENCLOSED; break; case URI_OR_TOKEN: - case DISPLAY_TOKEN: + case DISPLAY_TOKEN: + to_b->display.len=tmp-to_b->display.s; + status = S_URI_ENCLOSED; + break; + case DISPLAY_TOKEN_SP: case MAYBE_URI_END: - /* deal with the incorrect displayname<uri>.. */ - to_b->display.len=(foo?foo:tmp)-to_b->display.s; + to_b->display.len=foo-to_b->display.s; status = S_URI_ENCLOSED; break; case F_CRLF: @@ -756,6 +777,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) status=URI_ENCLOSED; break; case MAYBE_URI_END: + case DISPLAY_TOKEN_SP: status = DISPLAY_TOKEN; case DISPLAY_QUOTED: case DISPLAY_TOKEN:

14 years, 11 months

git:andrei/cancel_reason: tm: Reason header copy for received CANCELs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/cancel_reason Commit: 23e0d801e5717586da6c696460f5a30d04467028 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23e0d80… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 2 17:28:16 2010 +0100 tm: Reason header copy for received CANCELs When canceling branches due to a received CANCEL, use the Reason headers in the received CANCEL (all the Reason headers from the received CANCEL will be copied in the generated CANCELs, see RFC3326 for more details). --- modules/tm/t_fwd.c | 11 ++++++++--- modules/tm/t_msgbuilder.c | 37 +++++++++++++++++++++++++++++++++---- modules/tm/t_reply.c | 5 ++++- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 4f7cb02..0e1a00e 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -951,13 +951,15 @@ error: -void e2e_cancel( struct sip_msg *cancel_msg, +void e2e_cancel( struct sip_msg *cancel_msg, struct cell *t_cancel, struct cell *t_invite ) { branch_bm_t cancel_bm; #ifndef E2E_CANCEL_HOP_BY_HOP branch_bm_t tmp_bm; -#endif +#else /* def E2E_CANCEL_HOP_BY_HOP */ + struct cancel_reason reason; +#endif /* E2E_CANCEL_HOP_BY_HOP */ int i; int lowest_error; int ret; @@ -1002,6 +1004,9 @@ void e2e_cancel( struct sip_msg *cancel_msg, * have 0 branches and we check for the branch number in * t_reply_matching() ). */ + init_cancel_reason(&reason); + reason.cause=CANCEL_REAS_RCVD_CANCEL; + reason.u.e2e_cancel=cancel_msg; for (i=0; i<t_invite->nr_of_outgoings; i++) if (cancel_bm & (1<<i)) { /* it's safe to get the reply lock since e2e_cancel is @@ -1011,7 +1016,7 @@ void e2e_cancel( struct sip_msg *cancel_msg, ret=cancel_branch( t_invite, i, - 0, + &reason, cfg_get(tm,tm_cfg, cancel_b_flags) | ((t_invite->uac[i].request.buffer==NULL)? F_CANCEL_B_FAKE_REPLY:0) /* blind UAC? */ diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index bf49c64..4ccf3d2 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -104,6 +104,7 @@ char *build_local(struct cell *Trans,unsigned int branch, str via_id; struct hostport hp; int reason_len, code_len; + struct hdr_field *reas1, *reas_last; /* init */ via_id.s=0; @@ -169,6 +170,7 @@ char *build_local(struct cell *Trans,unsigned int branch, /* Content Length, EoM */ *len+=CONTENT_LENGTH_LEN+1 + CRLF_LEN; reason_len = 0; + reas1 = 0; /* compute reason size */ if (reason && reason->cause != CANCEL_REAS_UNKNOWN){ if (likely(reason->cause > 0)){ @@ -179,7 +181,14 @@ char *build_local(struct cell *Trans,unsigned int branch, CRLF_LEN; } else if (reason->cause == CANCEL_REAS_RCVD_CANCEL && reason->u.e2e_cancel) { - /* FIXME: TODO */ + /* parse the entire cancel, to get all the Reason headers */ + parse_headers(reason->u.e2e_cancel, HDR_EOH_F, 0); + for(hdr=get_hdr(reason->u.e2e_cancel, HDR_REASON_T), reas1=hdr; + hdr; hdr=next_sibling_hdr(hdr)) { + /* hdr->len includes CRLF */ + reason_len += hdr->len; + reas_last=hdr; + } } else if (unlikely(reason->cause != -1)) BUG("unhandled reason cause %d\n", reason->cause); } @@ -243,7 +252,12 @@ char *build_local(struct cell *Trans,unsigned int branch, } append_str(p, CRLF, CRLF_LEN); } else if (reason->cause == CANCEL_REAS_RCVD_CANCEL) { - /* FIXME: handle cancel */ + for(hdr=reas1; hdr; hdr=next_sibling_hdr(hdr)) { + /* hdr->len includes CRLF */ + append_str(p, hdr->name.s, hdr->len); + if (likely(hdr==reas_last)) + break; + } } } append_str(p, CRLF, CRLF_LEN); /* msg. end */ @@ -274,6 +288,7 @@ char *build_local_reparse(struct cell *Trans,unsigned int branch, enum _hdr_types_t hf_type; int first_via, to_len; int cancel_buf_len, reason_len, code_len; + struct hdr_field *reas1, *reas_last, *hdr; invite_buf = Trans->uac[branch].request.buffer; invite_len = Trans->uac[branch].request.buffer_len; @@ -289,6 +304,7 @@ char *build_local_reparse(struct cell *Trans,unsigned int branch, } reason_len = 0; + reas1 = 0; /* compute reason size */ if (reason && reason->cause != CANCEL_REAS_UNKNOWN){ if (likely(reason->cause > 0)){ @@ -299,7 +315,14 @@ char *build_local_reparse(struct cell *Trans,unsigned int branch, CRLF_LEN; } else if (reason->cause == CANCEL_REAS_RCVD_CANCEL && reason->u.e2e_cancel) { - /* FIXME: TODO */ + /* parse the entire cancel, to get all the Reason headers */ + parse_headers(reason->u.e2e_cancel, HDR_EOH_F, 0); + for(hdr=get_hdr(reason->u.e2e_cancel, HDR_REASON_T), reas1=hdr; + hdr; hdr=next_sibling_hdr(hdr)) { + /* hdr->len includes CRLF */ + reason_len += hdr->len; + reas_last=hdr; + } } else if (unlikely(reason->cause != -1)) BUG("unhandled reason cause %d\n", reason->cause); } @@ -424,9 +447,15 @@ char *build_local_reparse(struct cell *Trans,unsigned int branch, } append_str(d, CRLF, CRLF_LEN); } else if (reason->cause == CANCEL_REAS_RCVD_CANCEL) { - /* FIXME: handle cancel */ + for(hdr=reas1; hdr; hdr=next_sibling_hdr(hdr)) { + /* hdr->len includes CRLF */ + append_str(d, hdr->name.s, hdr->len); + if (likely(hdr==reas_last)) + break; + } } } + /* final (end-of-headers) CRLF */ append_str(d, CRLF, CRLF_LEN); *len = d - cancel_buf; /* LOG(L_DBG, "DBG: build_local: %.*s\n", *len, cancel_buf); */ diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index a42820e..6ee3fae 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2035,12 +2035,15 @@ int reply_received( struct sip_msg *p_msg ) SEND_BUFFER( &uac->local_cancel ); #endif /* retrs. should be already started so do nothing */ - }else if (atomic_cmpxchg_long((void*)&uac->local_cancel.buffer, 0, + }else if (atomic_cmpxchg_long((void*)&uac->local_cancel.buffer, 0, (long)BUSY_BUFFER)==0){ /* try to rebuild it if empty (not set or marked as BUSY). * if BUSY or set just exit, a cancel will be (or was) sent * shortly on this branch */ DBG("tm: reply_received: branch CANCEL created\n"); + /* note that in this case we do not know the reason + (it could be a final reply or a received cancel) + and we don't want to wait for it => no reason */ cancel_branch(t, branch, 0, F_CANCEL_B_FORCE_C); } goto done; /* nothing to do */

14 years, 11 months

git:andrei/cancel_reason: tm: CANCEL reason header on/off switches

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/cancel_reason Commit: 984eec800fcab256ce46ee03729374aee7c44617 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=984eec8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 3 14:57:43 2010 +0100 tm: CANCEL reason header on/off switches Config support (both runtime and modparam) for turning on/off Reason header support in locally generated or end-to-end hop-by-hop CANCELs: - local_cancel_reason = 0|1. Default 1 (on). - e2e_cancel_reason= 0|1. (Default 1 (on). End-to-end CANCEL reason header copy can also be turned on/off on a per transaction basis: t_set_no_e2e_cancel_reason(0|1). E.g.: t_set_no_e2e_cancel_reason(1); # disable reason copy t_relay(); t_set_no_e2e_cancel_reason(0) can be used to enable reason header on a per transaction basis, if the default is disabled (e2e_cancel_reason is set to 0). --- modules/tm/config.c | 19 ++++++++++++++----- modules/tm/config.h | 9 +++++---- modules/tm/h_table.h | 8 ++++---- modules/tm/t_lookup.c | 2 ++ modules/tm/t_msgbuilder.c | 22 ++++++++++++++-------- modules/tm/tm.c | 27 +++++++++++++++++++++------ 6 files changed, 60 insertions(+), 27 deletions(-) diff --git a/modules/tm/config.c b/modules/tm/config.c index b715d03..8a4e456 100644 --- a/modules/tm/config.c +++ b/modules/tm/config.c @@ -24,10 +24,9 @@ * 2008-02-05 adapting tm module for the configuration framework (Miklos) */ -/*! - * \file - * \brief TM :: Configuration - * \ingroup tm +/** TM :: Runtime configuration variables. + * @file + * @ingroup tm */ @@ -94,7 +93,11 @@ struct cfg_group_tm default_tm_cfg = { 1, /* cancel_b_method used for e2e and 6xx cancels*/ 1, /* reparse_on_dns_failover */ 0, /* disable_6xx, by default off */ - 0 /* local_ack_mode, default 0 (rfc3261 conformant) */ + 0, /* local_ack_mode, default 0 (rfc3261 conformant) */ + 1, /* local_cancel_reason -- add Reason header to locally generated + CANCELs; on by default */ + 1 /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs + into the corresp. hop-by-hop CANCELs, on by default */ }; void *tm_cfg = &default_tm_cfg; @@ -196,5 +199,11 @@ cfg_def_t tm_cfg_def[] = { " it is not set to 0 but allows dealing with NATed contacts in some " "simple cases)" }, + {"local_cancel_reason", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set to 1, a Reason header is added to locally generated CANCELs" + " (see RFC3326)" }, + {"e2e_cancel_reason", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set to 1, Reason headers from received CANCELs are copied into" + " the corresponding generated hop-by-hop CANCELs"}, {0, 0, 0, 0, 0, 0} }; diff --git a/modules/tm/config.h b/modules/tm/config.h index ed65acf..b740ec4 100644 --- a/modules/tm/config.h +++ b/modules/tm/config.h @@ -21,10 +21,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*! - * \file - * \brief TM :: Configuration - * \ingroup tm +/** TM :: Runtime configuration variables. + * @file + * @ingroup tm */ @@ -136,6 +135,8 @@ struct cfg_group_tm { int reparse_on_dns_failover; int disable_6xx; int local_ack_mode; + int local_cancel_reason; + int e2e_cancel_reason; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 1c1cd2d..ad7c3d7 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -40,10 +40,9 @@ * inlined often used functions (andrei) */ -/*! - * \file - * \brief TM :: - * \ingroup tm +/** TM :: hash table, flags and other general defines. + * @file + * @ingroup tm */ @@ -281,6 +280,7 @@ struct totag_elem { #define T_DISABLE_6xx (1<<8) /* treat 6xx as a normal reply */ #define T_DISABLE_FAILOVER (1<<9) /* don't perform dns failover */ +#define T_NO_E2E_CANCEL_REASON (1<<10) /* don't propagate CANCEL Reason */ #define T_DONT_FORK (T_CANCELED|T_6xx) /* unsigned short should be enough for a retr. timer: max. 65535 ticks => diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index 58e6fbc..01f6a82 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1265,6 +1265,8 @@ static inline void init_new_t(struct cell *new_cell, struct sip_msg *p_msg) (!cfg_get(tm, tm_cfg, tm_auto_inv_100) -1); new_cell->flags|=T_DISABLE_6xx & (!cfg_get(tm, tm_cfg, disable_6xx) -1); + new_cell->flags|=T_NO_E2E_CANCEL_REASON & + (!!cfg_get(tm, tm_cfg, e2e_cancel_reason) -1); /* reset flags */ new_cell->flags &= (~ get_msgid_val(user_cell_reset_flags, p_msg->id, int)); diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index 4ccf3d2..a05fdbc 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -171,16 +171,18 @@ char *build_local(struct cell *Trans,unsigned int branch, *len+=CONTENT_LENGTH_LEN+1 + CRLF_LEN; reason_len = 0; reas1 = 0; - /* compute reason size */ + /* compute reason size (if no reason or disabled => reason_len == 0)*/ if (reason && reason->cause != CANCEL_REAS_UNKNOWN){ - if (likely(reason->cause > 0)){ + if (likely(reason->cause > 0 && + cfg_get(tm, tm_cfg, local_cancel_reason))){ /* Reason: SIP;cause=<reason->cause>[;text=<reason->u.text.s>] */ reason_len = REASON_PREFIX_LEN + USHORT2SBUF_MAX_LEN + (reason->u.text.s? REASON_TEXT_LEN + 1 + reason->u.text.len + 1 : 0) + CRLF_LEN; } else if (reason->cause == CANCEL_REAS_RCVD_CANCEL && - reason->u.e2e_cancel) { + reason->u.e2e_cancel && + !(Trans->flags & T_NO_E2E_CANCEL_REASON)) { /* parse the entire cancel, to get all the Reason headers */ parse_headers(reason->u.e2e_cancel, HDR_EOH_F, 0); for(hdr=get_hdr(reason->u.e2e_cancel, HDR_REASON_T), reas1=hdr; @@ -189,7 +191,7 @@ char *build_local(struct cell *Trans,unsigned int branch, reason_len += hdr->len; reas_last=hdr; } - } else if (unlikely(reason->cause != -1)) + } else if (unlikely(reason->cause < -1)) BUG("unhandled reason cause %d\n", reason->cause); } *len+= reason_len; @@ -305,16 +307,18 @@ char *build_local_reparse(struct cell *Trans,unsigned int branch, reason_len = 0; reas1 = 0; - /* compute reason size */ + /* compute reason size (if no reason or disabled => reason_len == 0)*/ if (reason && reason->cause != CANCEL_REAS_UNKNOWN){ - if (likely(reason->cause > 0)){ + if (likely(reason->cause > 0 && + cfg_get(tm, tm_cfg, local_cancel_reason))){ /* Reason: SIP;cause=<reason->cause>[;text=<reason->u.text.s>] */ reason_len = REASON_PREFIX_LEN + USHORT2SBUF_MAX_LEN + (reason->u.text.s? REASON_TEXT_LEN + 1 + reason->u.text.len + 1 : 0) + CRLF_LEN; } else if (reason->cause == CANCEL_REAS_RCVD_CANCEL && - reason->u.e2e_cancel) { + reason->u.e2e_cancel && + !(Trans->flags & T_NO_E2E_CANCEL_REASON)) { /* parse the entire cancel, to get all the Reason headers */ parse_headers(reason->u.e2e_cancel, HDR_EOH_F, 0); for(hdr=get_hdr(reason->u.e2e_cancel, HDR_REASON_T), reas1=hdr; @@ -323,7 +327,7 @@ char *build_local_reparse(struct cell *Trans,unsigned int branch, reason_len += hdr->len; reas_last=hdr; } - } else if (unlikely(reason->cause != -1)) + } else if (unlikely(reason->cause < -1)) BUG("unhandled reason cause %d\n", reason->cause); } @@ -431,6 +435,8 @@ char *build_local_reparse(struct cell *Trans,unsigned int branch, /* end of SIP message found */ /* add reason if needed */ if (reason_len) { + /* if reason_len !=0, no need for any reason enabled + checks */ if (likely(reason->cause > 0)) { append_str(d, REASON_PREFIX, REASON_PREFIX_LEN); code_len=ushort2sbuf(reason->cause, d, diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 2b35681..221be3b 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -87,16 +87,17 @@ * 2008-08-11 sctp support: t_relay_to_sctp, t_replicate_sctp, * t_forward_nonack_sctp (andrei) * 2009-03-18 added a new param: auto_inv_100_reason (aheise) + * 2010-03-03 added new params: local_cancel_reason and e2e_cancel_reason + * (andrei) */ -/*! - * \file - * \brief TM :: Module API (core) - * \ingroup tm +/** TM :: Module API (core). + * @file + * @ingroup tm */ -/*! - * \defgroup tm TM :: Transaction stateful proxy support +/** + * @defgroup tm TM :: Transaction stateful proxy support * The TM module enables stateful processing of SIP transactions. The main use of stateful logic, which is costly in terms of memory and CPU, is some @@ -283,6 +284,8 @@ static int w_t_reset_max_lifetime(struct sip_msg* msg, char* foo, char* bar); static int t_set_auto_inv_100(struct sip_msg* msg, char* on_off, char* foo); static int t_set_disable_6xx(struct sip_msg* msg, char* on_off, char* foo); static int t_set_disable_failover(struct sip_msg* msg, char* on_off, char* f); +static int t_set_no_e2e_cancel_reason(struct sip_msg* msg, char* on_off, + char* f); static int t_branch_timeout(struct sip_msg* msg, char*, char*); static int t_branch_replied(struct sip_msg* msg, char*, char*); static int t_any_timeout(struct sip_msg* msg, char*, char*); @@ -428,6 +431,13 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_set_disable_failover", t_set_disable_failover, 1, fixup_var_int_1, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + {"t_set_no_e2e_cancel_reason", t_set_no_e2e_cancel_reason, 1, + fixup_var_int_1, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + /* alias for t_set_no_e2e_cancel_reason */ + {"t_disable_e2e_cancel_reason", t_set_no_e2e_cancel_reason, 1, + fixup_var_int_1, + 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, @@ -535,6 +545,8 @@ static param_export_t params[]={ {"contacts_avp", PARAM_STRING, &contacts_avp_param }, {"disable_6xx_block", PARAM_INT, &default_tm_cfg.disable_6xx }, {"local_ack_mode", PARAM_INT, &default_tm_cfg.local_ack_mode }, + {"local_cancel_reason", PARAM_INT, &default_tm_cfg.local_cancel_reason }, + {"e2e_cancel_reason", PARAM_INT, &default_tm_cfg.e2e_cancel_reason }, {0,0,0} }; @@ -1736,6 +1748,9 @@ T_SET_FLAG_GEN_FUNC(t_set_disable_6xx, T_DISABLE_6xx) T_SET_FLAG_GEN_FUNC(t_set_disable_failover, T_DISABLE_FAILOVER) +/* disable/enable e2e cancel reason copy for the current transaction */ +T_SET_FLAG_GEN_FUNC(t_set_no_e2e_cancel_reason, T_NO_E2E_CANCEL_REASON) + /* script function, FAILURE_ROUTE only, returns true if the * choosed "failure" branch failed because of a timeout,

14 years, 11 months

preparing for kamailio 3.0.1

by Daniel-Constantin Mierla

Hello, I think it is time to prepare for first minor release (3.0.1) in 3.0 series. We are approaching two months since kamailio 3.0.0, period within several issues were reported and fixed. Please report anything you are aware is not currently working in 3.0 to sr-dev(a)lists.sip-router.org or bug tracker: http://sip-router.org/tracker/ As for date, end of this week or beginning of next week would be a good time? Other opinions? Cheers, Daniel -- Daniel-Constantin Mierla Kamailio SIP Router Masterclass, Berlin, March 22-26, 2010 * http://www.asipto.com/index.php/sip-router-masterclass/

14 years, 11 months

[tracker] Task opened: display name without quotes and uac_replace_from

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Ronald Voermans (voermans) Attached to Project - sip-router Summary - display name without quotes and uac_replace_from Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - With Kamailio 3.0.0 the uac_replace_from isn't working correctly. When a From-display-name doesn't have quotes and has spaces in it, the function uac_replace_from only replaces the first word of the display name instead of the full display name. When the display name is enclosed by quotes, this issue doesn't occur. The bug seems to be exposed in parser_to.c. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=39 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.

14 years, 11 months

[tracker] Assignee added: display name without quotes and uac_replace_from

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#39 - display name without quotes and uac_replace_from User who did this - Ronald Voermans (voermans) http://sip-router.org/tracker/index.php?do=details&task_id=39 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.

14 years, 11 months

git:master: parse_param: Let the body point behind '=' when body is missing .

by Jan Janak

Module: sip-router Branch: master Commit: afd800bd67c3dd54db69a5c24e0a8bd362609061 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=afd800b… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Tue Mar 2 16:03:42 2010 -0500 parse_param: Let the body point behind '=' when body is missing. This fixes potential issues with functions that copy parameters structures from private to shared memory because such functions usually translate string pointers using a base pointing at the first character of the parameter list. Reported by Daniel. --- parser/parse_param.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/parser/parse_param.c b/parser/parse_param.c index f86d1c9..c68e237 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -456,9 +456,8 @@ inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) if (_s->len == 0) { /* Be forgiving and accept parameters with missing value, - * we just set the body of such a parameter to an empty - * string. */ - t->body.s = ""; + * we just set the length of parameter body to 0. */ + t->body.s = _s->s; t->body.len = 0; } else if (parse_param_body(_s, t) < 0) { LOG(L_ERR, "parse_params(): Error while parsing param body\n");

14 years, 11 months

git:master: param_parser: Accept parameters with missing bodies.

by Jan Janak

Module: sip-router Branch: master Commit: a3b2fcde99ebd5f625d0168473caef5dbbaf1029 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3b2fcd… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Tue Feb 23 14:38:31 2010 -0500 param_parser: Accept parameters with missing bodies. This change makes the parameter parser more forgiving. It accepts parameters with missing bodies (foo=), such parameters will have the body set to an empty string. Observed on iptel.org --- parser/parse_param.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/parser/parse_param.c b/parser/parse_param.c index 8dee261..f86d1c9 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -455,11 +455,12 @@ inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) trim_leading(_s); if (_s->len == 0) { - LOG(L_ERR, "parse_params(): Body missing\n"); - goto error; - } - - if (parse_param_body(_s, t) < 0) { + /* Be forgiving and accept parameters with missing value, + * we just set the body of such a parameter to an empty + * string. */ + t->body.s = ""; + t->body.len = 0; + } else if (parse_param_body(_s, t) < 0) { LOG(L_ERR, "parse_params(): Error while parsing param body\n"); goto error; }

14 years, 11 months

How to contruct ACK/BYE correctly in dialog with NATed client

by Min Wang

Hi My issue is how to construct ACK correctly in the dialog in case of NATed client. ( please see http://lists.sip-router.org/pipermail/sr-dev/2010-February/006145.html for the scenario detail ) nated-u1(bob)---> P1 --> nated-u2 (alice) e.g: bob calls alcie, (A) In the normal case, U1 ---> P1 ---> U2 Invite-> <--200 OK ACK --> The good ACK msg capted from P1 to U2 is: # U 67.154.255.47:4060 (P1) -> 67.154.250.3:2051 ( public ip/port for U2) ACK sip:alice@172.16.8.42:2051;line=e96ci3a9 SIP/2.0. (B) In the abormal case, U1 ---> P1 ---> U2 Invite-> ACK --> BYE --> <--488 P1 check something and need to send ACK/BYE to u2 The pseudo code try to use dialog module function: dialog.request_inside(&method_ACK,&reqbuf,NULL, d,cb,cbp) >From the log file: DEBUG:tm:t_uac: next_hop=<sip:alice@centercall.net> The captured ACK msg: U 67.154.255.47:4060 (P1) -> 67.154.255.44:5060 (i-cscf) ACK sip:alice@centercall.net SIP/2.0. The two ACK msg is different. Questions: (1) How can I generate the correct ACK msg in this case? (2) The issue with second ACK need more explaination ( from openims point of view): i-cscf ---- s-cscf | U1 --> P1 --> U2 (i/s-cscf is sip proxy) With this kind of ACK, the ACK first goes to i-cscf, which choose s-cscf, then goes back to P1, P1 will try to relay the ACK route[Term_Subsequent]{ ... if (!P_security_relay()) P_NAT_relay(); t_relay() ... } The log shows: 22106 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_funcs.c:184]: tm: put_on_wait: transaction 0xb59834b4 already on wait It seems the tm module put this new ACK (the P1-generated ACK loop back to P1 now ) on hold, NOT relaying to U2. >From sniffed packets, the ACK never reaches the U2. Any good way to resolve the issue? Just FYI the BYE can reach U2 as it is a new tm transaction. # U 67.154.255.47:4060 -> 67.154.255.44:5060 BYE sip:alice@centercall.net SIP/2.0. 22512 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_lookup.c:711]: DEBUG: t_lookup_request: no transaction found 22558 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_funcs.c:388]: SER: new transaction fwd'ed /////////detailed log for ACK in Term_Subsequent /////////////// 21997 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [parser/msg_parser.c:627]: SIP Request: 21998 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [parser/msg_parser.c:629]: method: <ACK> 21999 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [parser/msg_parser.c:631]: uri: <sip:alice@172.16.8.42 :2051;line=otkb9mdz> 22000 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [parser/msg_parser.c:633]: version: <SIP/2.0> 22091 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: NOTICE: <script>: >> Term_Subsequent before relay 22092 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [mem/q_malloc.c:366]: qm_malloc(0x8272e60, 36) called from pcscf: registration.c: P_security_relay(1086) 22093 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [mem/q_malloc.c:406]: qm_malloc(0x8272e60, 36) returns address 0x82e2140 frag. 0x82e2128 (size=36) on 1 -th hit 22094 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: pcscf [registration.c:1104]: ERR:P-CSCF:P_security_relay: we cannot find the contact or its IPSec/TLS SAs for <0://172.16.8.42:2051>. 22095 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [mem/q_malloc.c:428]: qm_free(0x8272e60, 0x82e2140), called from pcscf: registration.c: P_security_relay(1107) 22096 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [mem/q_malloc.c:450]: qm_free: freeing frag. 0x82e2128 alloc'ed from pcscf: registration.c: P_security_relay(1086) 22097 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [mem/q_malloc.c:366]: qm_malloc(0x8272e60, 41) called from pcscf: registration.c: get_NAT_dst_uri(921) 22098 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [mem/q_malloc.c:406]: qm_malloc(0x8272e60, 44) returns address 0x830605c frag. 0x8306044 (size=52) on 1 -th hit 22099 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: INFO: pcscf [registration.c:1031]: INFO:P-CSCF:P_NAT_relay: <sip:67.154.250.3:2051> 22100 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_lookup.c:1387]: DEBUG: t_newtran: msg id=77 , global msg id=76 , T on entrance=0xffffffff 22101 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_lookup.c:528]: t_lookup_request: start searching: hash=37128, isACK=1 22102 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_lookup.c:470]: DEBUG: RFC3261 transaction matched, tid=8019.82c67232.0 22103 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_lookup.c:728]: DEBUG: t_lookup_request: transaction found (T =0xb59834b4) 22104 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_reply.c:1420]: DEBUG: cleanup_uac_timers: RETR/FR timers reset 22105 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: <core> [timer.c:595]: timer_add called on an active timer 0xb59834fc (0xb5842c2c, 0xb5842c2c), flags 201 22106 Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: DEBUG: tm [t_funcs.c:184]: tm: put_on_wait: transaction 0xb59834b4 already on wait Mar 2 11:06:25 im1 /usr/sbin/ser[27551]: NOTICE: <script>: >> Term_Subsequent end Kind Regards Min Wang .

14 years, 11 months

How to change the reply msg in the onreply_route

by Min Wang

Hi I have following scenario: u1---> p1 --> u2 u1 calling u2, u2 reply with 200 OK, The p1 need to check something, and decide to send ACK/Bye to u2, and 488 to u1: onreply_route[1] { if (my_function_check("")) { release_call_onreply(""); } } The question is : How to do implement release_call_onreply correctly? The pseudo codes is like: t=tmb.t_gett(); send_request(method_ACK); send_request(method_BYE); reason_code = 488 tmb.t_reply(t->uas.request,reason_code,reason_text); (Not sure if t_reply can be called here or not.) The ACK/Bye is sent to U2, 488 is sent to U1, But the issue is it seems the original 200 OK is forwarded to U1 as well. How to avoid it? Or should the Data lumps function be used here to modify the 200 reply msg instead of using t_reply here? Kind Regards Min Wang

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