sr-dev May 2010

sr-dev@lists.kamailio.org

18 participants
140 discussions

git:kamailio_3.0: Merge remote branch 'origin/andrei/pointer_alias_warnings ' into kamailio_3.0

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 496566345b9faf263d2594445709dcd953036ac6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4965663… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 11:34:27 2010 +0200 Merge remote branch 'origin/andrei/pointer_alias_warnings' into kamailio_3.0 * origin/andrei/pointer_alias_warnings: rr(s): fix recently introduced avp_cookie name bug core: avp aliasing warning fixes group: fix pointer aliasing warnings rr: pointer aliasing warning fixes db_postgres: pointer aliasing warnings fixes core: pointer aliasing warnings fixed cfg: fixed pointer aliasing warnings Conflicts: route.c ---

14 years, 6 months

git:tmp/ruri_branch: core: mark uri as new on new message or seturi()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/ruri_branch Commit: 914a4c04220cb6ee569e45d6d37c141d38f206a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=914a4c0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 10:55:18 2010 +0200 core: mark uri as new on new message or seturi() Each time a new message is received the r-uri is marked as "new" (available for forking). The same happens when the uri is changed or modified in the script (seturi(), rewrite_uri(), setuser(), sethost() a.s.o.). --- action.c | 3 +++ receive.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/action.c b/action.c index 70cec69..5e1aed1 100644 --- a/action.c +++ b/action.c @@ -545,6 +545,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) msg->new_uri.len=0; msg->new_uri.s=0; msg->parsed_uri_ok=0; /* invalidate current parsed uri*/ + ruri_mark_new(); /* available for forking */ }; ret=1; break; @@ -593,6 +594,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) memcpy(msg->new_uri.s, a->val[0].u.string, len); msg->new_uri.s[len]=0; msg->new_uri.len=len; + ruri_mark_new(); /* available for forking */ ret=1; break; @@ -870,6 +872,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) msg->new_uri.s=new_uri; msg->new_uri.len=crt-new_uri; msg->parsed_uri_ok=0; + ruri_mark_new(); /* available for forking */ ret=1; break; case IF_T: diff --git a/receive.c b/receive.c index df26196..7f49fdc 100644 --- a/receive.c +++ b/receive.c @@ -149,6 +149,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) clear_branches(); if (msg->first_line.type==SIP_REQUEST){ + ruri_mark_new(); /* ruri is usable for forking (not consumed yet) */ if (!IS_SIP(msg)){ if ((ret=nonsip_msg_run_hooks(msg))!=NONSIP_MSG_ACCEPT){ if (unlikely(ret==NONSIP_MSG_ERROR))

14 years, 6 months

git:tmp/ruri_branch: tm: failure route start with r-uri marked as "consumed "

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/ruri_branch Commit: 4cf857a1180e14807b6d4085a5795a24cac262bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4cf857a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 11:02:28 2010 +0200 tm: failure route start with r-uri marked as "consumed" When the failure route starts, the main r-uri should not be reused for forking, unless changed. --- modules/tm/t_reply.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 2e6fd55..4318886 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -718,6 +718,7 @@ static int _reply( struct cell *trans, struct sip_msg* p_msg, /** create or restore a "fake environment" for running a failure_route. *if msg is set -> it will fake the env. vars conforming with the msg; if NULL * the env. will be restore to original. + * Side-effect: mark_ruri_consumed(). */ void faked_env( struct cell *t, struct sip_msg *msg) { @@ -740,6 +741,11 @@ void faked_env( struct cell *t, struct sip_msg *msg) */ backup_route_type=get_route_type(); set_route_type(FAILURE_ROUTE); + /* don't bother backing up ruri state, since failure route + is called either on reply or on timer and in both cases + the ruri should not be used again for forking */ + ruri_mark_consumed(); /* in failure route we assume ruri + should not be used again for forking */ /* also, tm actions look in beginning whether transaction is * set -- whether we are called from a reply-processing * or a timer process, we need to set current transaction;

14 years, 6 months

git:tmp/ruri_branch: modules*: mark r-uri as "new" when changed

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/ruri_branch Commit: 039b182ef82c12f6661cce7c60c8fb59a51551ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=039b182… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 11:06:18 2010 +0200 modules*: mark r-uri as "new" when changed Each time the r-uri, dst-uri or path is changed, the r-uri is marked as available for forking. This should simplify a lot serial forking from the script. --- modules/app_python/python_msgobj.c | 3 +++ modules/avpops/avpops_impl.c | 3 +++ modules_k/cpl-c/cpl_sig.c | 3 +++ modules_k/dispatcher/dispatch.c | 5 ++++- modules_k/domainpolicy/domainpolicy.c | 3 +++ modules_k/drouting/drouting.c | 2 ++ modules_k/kex/km_core.c | 3 +++ modules_k/path/path.c | 4 ++++ modules_k/pv/pv_core.c | 3 +++ modules_k/rr/loose.c | 3 +++ modules_k/textops/textops.c | 2 ++ modules_k/uac/auth.c | 2 ++ modules_s/avp/avp.c | 3 +++ modules_s/dispatcher/ds_backend.c | 6 ++++++ modules_s/mangler/contact_ops.c | 1 + modules_s/registrar/lookup.c | 2 ++ modules_s/rr/loose.c | 3 +++ modules_s/textops/textops.c | 2 ++ modules_s/uac/auth.c | 2 ++ 19 files changed, 54 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=039…

14 years, 6 months

git:tmp/ruri_branch: tm: use ruri for forking only if marked as "new"

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/ruri_branch Commit: 22f1b9940dc6c0d162f11f6f82bbc33db21aecb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22f1b99… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 10:58:36 2010 +0200 tm: use ruri for forking only if marked as "new" The r-uri is now used for forking only if marked as "new". After using it, it will be automatically marked as "consumed", so that it won't be used in the future (unless re-marked as new by changing the r-uri, dst_uri or path). This will simplify a lot serial forking via the script (only seturi(...); t_relay() is needed now, no messing with append_branch() is required anymore, unless parallel forking is desired) --- modules/tm/t_fwd.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index cc22096..5a8df8a 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1328,11 +1328,9 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , branch_route = 0; } - /* on first-time forwarding, use current uri, later only what - is in additional branches (which may be continuously refilled - */ - if (first_branch==0) { #ifdef POSTPONE_MSG_CLONING + /* on first-time forwarding, update the lumps */ + if (first_branch==0) { /* update the shmem-ized msg with the lumps */ if ((is_route_type(REQUEST_ROUTE)) && save_msg_lumps(t->uas.request, p_msg)) { @@ -1340,7 +1338,13 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , "failed to save the message lumps\n"); return -1; } + } #endif + /* if ruri is not already consumed (by another invocation), use current + uri too. Else add only additional branches (which may be continuously + refilled). + */ + if (ruri_get_forking_state()) { try_new=1; branch_ret=add_uac( t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), &p_msg->path_vec, proxy, p_msg->force_send_socket,

14 years, 6 months

git:tmp/ruri_branch: core: support for marking a "consumed" r-uri

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/ruri_branch Commit: b4ea43935347d8e8c0b73f3972177670127f7e50 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4ea439… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 10:51:51 2010 +0200 core: support for marking a "consumed" r-uri The main/message r-uri can now be marked as "consumed" during forking or as "new". New function introduced (dset.h): ruri_mark_new(), ruri_mark_consumed(), ruri_get_forking_state(). rewrite_uri() will now automatically mark the uri as "new". --- dset.c | 15 ++++++++++----- dset.h | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dset.c b/dset.c index 8223615..1e5c9e7 100644 --- a/dset.c +++ b/dset.c @@ -27,11 +27,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*! - * \file - * \brief SIP-router core :: - * \ingroup core - * Module: \ref core +/** destination set / branches support. + * @file dset.c + * @ingroup core + * Module: @ref core */ #include <string.h> @@ -68,6 +67,9 @@ unsigned int nr_branches = 0; /* branch iterator */ static int branch_iterator = 0; +/* used to mark ruris "consumed" when branching (1 new, 0 consumed) */ +int ruri_is_new = 0; + /* The q parameter of the Request-URI */ static qvalue_t ruri_q = Q_UNSPECIFIED; @@ -266,6 +268,7 @@ void clear_branches(void) nr_branches = 0; ruri_q = Q_UNSPECIFIED; ruri_bflags = 0; + ruri_mark_consumed(); } @@ -493,6 +496,8 @@ int rewrite_uri(struct sip_msg* _m, str* _s) _m->new_uri.s = buf; _m->new_uri.len = _s->len; + /* mark ruri as new and available for forking */ + ruri_mark_new(); return 1; } diff --git a/dset.h b/dset.h index ca91211..6f9f067 100644 --- a/dset.h +++ b/dset.h @@ -37,6 +37,7 @@ extern unsigned int nr_branches; +extern int ruri_is_new; /*! \brief * Structure for storing branch attributes @@ -166,6 +167,15 @@ inline static int get_request_uri(struct sip_msg* _m, str* _u) } +#define ruri_mark_new() (ruri_is_new = 1) + +#define ruri_mark_consumed() (ruri_is_new = 0) + +/** returns whether or not ruri should be used when forking. + * (usefull for serial forking) + * @return 0 if already marked as consumed, 1 if not. + */ +#define ruri_get_forking_state() (ruri_is_new) int rewrite_uri(struct sip_msg* _m, str* _s);

14 years, 6 months

git:kamailio_3.0: debian: updated changelog for 3.0.2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a2dbcec4278631ec78944098e7b407cebd682e92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2dbcec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 10:28:16 2010 +0200 debian: updated changelog for 3.0.2 --- pkg/kamailio/debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/debian/changelog b/pkg/kamailio/debian/changelog index c85aec4..4c6ebbd 100644 --- a/pkg/kamailio/debian/changelog +++ b/pkg/kamailio/debian/changelog @@ -1,3 +1,9 @@ +kamailio (3.0.2) unstable; urgency=low + + * update to 3.0.2 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 27 May 2010 10:27:36 +0100 + kamailio (3.0.1) unstable; urgency=low * update to 3.0.1 from upstream

14 years, 6 months

git:kamailio_3.0: centos spec: version set to 3.0.2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e5560029f04058642bebb09a1a1b7df699c5f80b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e556002… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 10:29:24 2010 +0200 centos spec: version set to 3.0.2 --- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 4f4f5bc..021cf7e 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.0.1 +%define ver 3.0.2 %define rel 0 %define _sharedir %{_prefix}/share

14 years, 6 months

git:kamailio_3.0: - version set to 3.0.2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 88e2a6d4ed6fae4d5c0b9ab268e41307aea4e8a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88e2a6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 10:27:53 2010 +0200 - version set to 3.0.2 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 97824b5..95dad34 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -154,7 +154,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory debugger switcher

14 years, 6 months

git:kamailio_3.0: registrar(k): reset dst uri in lookup

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 6dc77aa8801808211b42184c15712e6adf9b443d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dc77aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 13 11:41:06 2010 +0200 registrar(k): reset dst uri in lookup - upon lookup, dst uri is reset if no new dst uri is set from received or path, otherwise the coordinates of selected contact are not effective - reported by Andreas Granig (cherry picked from commit 53bb79cef5eb70e98472903ef84b5585cc798e65) --- modules_k/registrar/lookup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 67accc7..944d410 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -105,6 +105,9 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) goto done; } + /* reset next hop address */ + reset_dst_uri(_m); + /* If a Path is present, use first path-uri in favour of * received-uri because in that case the last hop towards the uac * has to handle NAT. - agranig */

14 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2010