sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

git:master: * modules_k/permissions: subnet matching fix ( credits to anonymous)
by Juha Heinanen 04 Mar '10

04 Mar '10

Module: sip-router Branch: master Commit: f5a29762b6155209721ba0dfc3f30b4a9764c191 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5a2976… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Mar 4 09:09:22 2010 +0200 * modules_k/permissions: subnet matching fix (credits to anonymous) --- modules_k/permissions/hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index 7358225..5c5c7a6 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -565,7 +565,7 @@ int find_group_in_subnet_table(struct subnet* table, i = 0; while (i < count) { - subnet = ip_addr << table[i].mask; + subnet = htonl(ntohl(ip_addr) >> table[i].mask); if ((table[i].subnet == subnet) && ((table[i].port == port) || (table[i].port == 0))) return table[i].grp;

1 0

[ openser-Bugs-2963040 ] allow_source_address_group() not matching correctly
by SourceForge.net 04 Mar '10

04 Mar '10

Bugs item #2963040, was opened at 2010-03-04 02:04 Message generated for change (Tracker Item Submitted) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2963040&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver devel Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: allow_source_address_group() not matching correctly Initial Comment: IP address subnet matching does not work properly when using the allow_source_address_group() function from the Permissions module. The problem comes from /modules_k/permissions/hash.c:568 in function find_group_in_subnet_table(). subnet = ip_addr << table[i].mask; should be subnet = htonl(ntohl(ip_addr) >> table[i].mask); Here is a git diff to fix it: diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index 7358225..7917d5a 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -565,7 +565,7 @@ int find_group_in_subnet_table(struct subnet* table, i = 0; while (i < count) { - subnet = ip_addr << table[i].mask; + subnet = htonl(ntohl(ip_addr) >> table[i].mask); //ip_addr << table[i].mask; if ((table[i].subnet == subnet) && ((table[i].port == port) || (table[i].port == 0))) return table[i].grp; ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2963040&group_…

1 0

[tracker] Comment added: display name without quotes and uac_replace_from
by sip-router 03 Mar '10

03 Mar '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#39 - display name without quotes and uac_replace_from User who did this - Andrei Pelinescu-Onciul (andrei) ---------- Thanks, it should be fixed on master GIT#907686. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=39#comment30 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

[tracker] Task changed: display name without quotes and uac_replace_from
by sip-router 03 Mar '10

03 Mar '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#39 - display name without quotes and uac_replace_from User who did this: Andrei Pelinescu-Onciul (andrei) Percent Complete: 0% -> 90% Status: Assigned -> Requires testing Severity: Medium -> Low Priority: Normal -> Low 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.

1 0

git:master: test: added parse to body test program
by Andrei Pelinescu-Onciul 03 Mar '10

03 Mar '10

Module: sip-router Branch: master Commit: 2cedf1626147ce0bcf67435a57dc23643c55d7d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2cedf16… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 3 19:30:04 2010 +0100 test: added parse to body test program - added parse to body test program that uses the same code as sip-router. E.g. test/parse_to_body "Foo <foo@bar>CR". - update p_uri (parse uri test) to compile with sip-router. --- test/p_uri.c | 7 +-- test/parse_to_body.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 4 deletions(-) diff --git a/test/p_uri.c b/test/p_uri.c index 1f2cc99..ea75676 100644 --- a/test/p_uri.c +++ b/test/p_uri.c @@ -1,6 +1,6 @@ /** uri parser test program. */ /* compile with: - gcc -Wall p_uri.c -o p_uri -DFAST_LOCK -D__CPU_i386 -DSHM_MEM */ + gcc -Wall p_uri.c -o p_uri -DFAST_LOCK -D__CPU_i386 */ #include <stdio.h> #include <stdlib.h> /* exit() */ #include <string.h> @@ -10,6 +10,7 @@ /* ser compat defs */ #define EXTRA_DEBUG #include "../parser/parse_uri.c" +#include "../dprint.c" int ser_error=0; @@ -17,7 +18,7 @@ int log_stderr=1; int process_no=0; struct process_table* pt=0; int phone2tel=1; -volatile int dprint_crit=0; +/*volatile int dprint_crit=0; */ int my_pid() {return 0; }; struct cfg_group_core default_core_cfg = { @@ -68,7 +69,6 @@ struct cfg_group_core default_core_cfg = { void *core_cfg = &default_core_cfg; - void dprint(char * format, ...) { va_list ap; @@ -82,7 +82,6 @@ void dprint(char * format, ...) - int main (int argc, char** argv) { diff --git a/test/parse_to_body.c b/test/parse_to_body.c new file mode 100644 index 0000000..fe92371 --- /dev/null +++ b/test/parse_to_body.c @@ -0,0 +1,116 @@ +/** to/from body parser test program. */ +/* compile with: + gcc -Wall parse_to_body.c -o parse_to_body -DFAST_LOCK -D__CPU_i386 */ +#include <stdio.h> +#include <stdlib.h> /* exit() */ +#include <string.h> +#include <stdarg.h> +#include "../str.h" + +/* ser compat defs */ +#define EXTRA_DEBUG +#include "../parser/parse_to.c" +#include "../dprint.c" + + +int ser_error=0; +int log_stderr=1; +int process_no=0; +struct process_table* pt=0; +int phone2tel=1; +/*volatile int dprint_crit=0; */ +int my_pid() {return 0; }; + +struct cfg_group_core default_core_cfg = { + L_DBG, /* print only msg. < L_WARN */ + LOG_DAEMON, /* log_facility -- see syslog(3) */ +#ifdef USE_DST_BLACKLIST + /* blacklist */ + 0, /* dst blacklist is disabled by default */ + DEFAULT_BLST_TIMEOUT, + DEFAULT_BLST_MAX_MEM, +#endif + /* resolver */ +#ifdef USE_IPV6 + 1, /* dns_try_ipv6 -- on by default */ +#else + 0, /* dns_try_ipv6 -- off, if no ipv6 support */ +#endif + 0, /* dns_try_naptr -- off by default */ + 30, /* udp transport preference (for naptr) */ + 20, /* tcp transport preference (for naptr) */ + 10, /* tls transport preference (for naptr) */ + 20, /* sctp transport preference (for naptr) */ + -1, /* dns_retr_time */ + -1, /* dns_retr_no */ + -1, /* dns_servers_no */ + 1, /* dns_search_list */ + 1, /* dns_search_fmatch */ + 0, /* dns_reinit */ + /* DNS cache */ +#ifdef USE_DNS_CACHE + 1, /* use_dns_cache -- on by default */ + 0, /* dns_cache_flags */ + 0, /* use_dns_failover -- off by default */ + 0, /* dns_srv_lb -- off by default */ + DEFAULT_DNS_NEG_CACHE_TTL, /* neg. cache ttl */ + DEFAULT_DNS_CACHE_MIN_TTL, /* minimum ttl */ + DEFAULT_DNS_CACHE_MAX_TTL, /* maximum ttl */ + DEFAULT_DNS_MAX_MEM, /* dns_cache_max_mem */ + 0, /* dns_cache_del_nonexp -- delete only expired entries by default */ +#endif +#ifdef PKG_MALLOC + 0, /* mem_dump_pkg */ +#endif +#ifdef SHM_MEM + 0, /* mem_dump_shm */ +#endif +}; + +void *core_cfg = &default_core_cfg; + +void dprint(char * format, ...) +{ + va_list ap; + + fprintf(stderr, "%2d(%d) ", process_no, my_pid()); + va_start(ap, format); + vfprintf(stderr,format,ap); + fflush(stderr); + va_end(ap); +} + + + +int main (int argc, char** argv) +{ + + int r; + struct to_body to_b; + struct to_param *p; + + if (argc<2){ + printf("usage: %s to_body [, to_body...]\n", argv[0]); + exit(1); + } + + for (r=1; r<argc; r++){ + /*memset(&to_b, 0, sizeof(to_b));*/ + if (parse_to(argv[r], argv[r]+strlen(argv[r]), &to_b)==0 || + to_b.error!=1){ + printf("error: parsing %s\n", argv[r]); + continue; + } + printf("body: [%.*s]\n", to_b.body.len, to_b.body.s); + printf("uri: [%.*s]\n", to_b.uri.len, to_b.uri.s); + printf("display: [%.*s]\n", to_b.display.len, to_b.display.s); + printf("tag: [%.*s]\n\n", to_b.tag_value.len, to_b.tag_value.s); + for (p=to_b.param_lst; p; p=p->next){ + printf(" param type: %d\n", p->type); + printf(" param name: [%.*s]\n", p->name.len, p->name.s); + printf(" param value: [%.*s]\n\n", p->value.len, p->value.s); + } + printf("\n"); + } + return 0; +}

1 0

git:master: core: define shm_str_dup() only ifdef SHM_MEM
by Andrei Pelinescu-Onciul 03 Mar '10

03 Mar '10

Module: sip-router Branch: master Commit: f2e37b7e4f3d6041bcd8dbe1846ab0c24b9e26df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2e37b7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 3 19:29:04 2010 +0100 core: define shm_str_dup() only ifdef SHM_MEM --- ut.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ut.h b/ut.h index 3d98e11..2328824 100644 --- a/ut.h +++ b/ut.h @@ -642,6 +642,9 @@ static inline int str2sint(str* _s, int* _r) return 0; } + + +#ifdef SHM_MEM /** * \brief Make a copy of a str structure using shm_malloc * \param dst destination @@ -660,6 +663,9 @@ static inline int shm_str_dup(str* dst, const str* src) dst->len = src->len; return 0; } +#endif /* SHM_MEM */ + + /** * \brief Make a copy of a str structure using pkg_malloc

1 0

git:master: core: parse_to display name multi-token no-quotes fix
by Andrei Pelinescu-Onciul 03 Mar '10

03 Mar '10

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:

1 0

git:andrei/cancel_reason: tm: Reason header copy for received CANCELs
by Andrei Pelinescu-Onciul 03 Mar '10

03 Mar '10

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

2 3

git:andrei/cancel_reason: tm: CANCEL reason header on/off switches
by Andrei Pelinescu-Onciul 03 Mar '10

03 Mar '10

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,

1 0

preparing for kamailio 3.0.1
by Daniel-Constantin Mierla 03 Mar '10

03 Mar '10

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/

2 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010