sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
199 discussions

git:master: srdb1: added callid_len entity
by Daniel-Constantin Mierla 04 Jul '11

04 Jul '11

Module: sip-router Branch: master Commit: 0a94c6d5d549a438d64006e66c57a66c19cda8f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a94c6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 4 22:02:19 2011 +0200 srdb1: added callid_len entity - used for size of callid columns across tables - set to 255 --- lib/srdb1/schema/acc.xml | 2 +- lib/srdb1/schema/aliases.xml | 2 +- lib/srdb1/schema/dialog.xml | 2 +- lib/srdb1/schema/location.xml | 2 +- lib/srdb1/schema/missed_calls.xml | 2 +- lib/srdb1/schema/pr_active_watchers.xml | 2 +- lib/srdb1/schema/rls_watchers.xml | 2 +- lib/srdb1/schema/sip_trace.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/srdb1/schema/acc.xml b/lib/srdb1/schema/acc.xml index cabe9ba..719298e 100644 --- a/lib/srdb1/schema/acc.xml +++ b/lib/srdb1/schema/acc.xml @@ -54,7 +54,7 @@ <name>callid</name> <type>string</type> <natural/> - <size>&description_len;</size> + <size>&callid_len;</size> <default/> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client. </description> </column> diff --git a/lib/srdb1/schema/aliases.xml b/lib/srdb1/schema/aliases.xml index 653e05e..6fbd840 100644 --- a/lib/srdb1/schema/aliases.xml +++ b/lib/srdb1/schema/aliases.xml @@ -90,7 +90,7 @@ <column> <name>callid</name> <type>string</type> - <size>&hf_len;</size> + <size>&callid_len;</size> <default>&DEFAULT_CALLID;</default> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client.</description> </column> diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index 1bc3807..8c5e5b4 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -47,7 +47,7 @@ <column> <name>callid</name> <type>string</type> - <size>&hf_len;</size> + <size>&callid_len;</size> <description>Call-ID of the dialog</description> </column> diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index 1411899..e5bef5a 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -90,7 +90,7 @@ <column> <name>callid</name> <type>string</type> - <size>&hf_len;</size> + <size>&callid_len;</size> <default>&DEFAULT_CALLID;</default> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client.</description> </column> diff --git a/lib/srdb1/schema/missed_calls.xml b/lib/srdb1/schema/missed_calls.xml index d8332fc..7a66440 100644 --- a/lib/srdb1/schema/missed_calls.xml +++ b/lib/srdb1/schema/missed_calls.xml @@ -52,7 +52,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&domain_len;</size> + <size>&callid_len;</size> <default/> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client. </description> <natural/> diff --git a/lib/srdb1/schema/pr_active_watchers.xml b/lib/srdb1/schema/pr_active_watchers.xml index 8c27d56..35d697a 100644 --- a/lib/srdb1/schema/pr_active_watchers.xml +++ b/lib/srdb1/schema/pr_active_watchers.xml @@ -96,7 +96,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&uri_len;</size> + <size>&callid_len;</size> <description>Call ID</description> </column> diff --git a/lib/srdb1/schema/rls_watchers.xml b/lib/srdb1/schema/rls_watchers.xml index 1faac29..8362e77 100644 --- a/lib/srdb1/schema/rls_watchers.xml +++ b/lib/srdb1/schema/rls_watchers.xml @@ -97,7 +97,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&uri_len;</size> + <size>&callid_len;</size> <description>Call ID</description> </column> diff --git a/lib/srdb1/schema/sip_trace.xml b/lib/srdb1/schema/sip_trace.xml index 5ff2a02..0b492c4 100644 --- a/lib/srdb1/schema/sip_trace.xml +++ b/lib/srdb1/schema/sip_trace.xml @@ -37,7 +37,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&hf_len;</size> + <size>&callid_len;</size> <default/> <description>call ID from SIP message</description> <natural/>

1 0

git:master: srdb1: entities files updated for callid_len and default cseq value
by Daniel-Constantin Mierla 04 Jul '11

04 Jul '11

Module: sip-router Branch: master Commit: 3d070a549807495e27589befb52a1350b35d9a47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d070a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 4 22:04:29 2011 +0200 srdb1: entities files updated for callid_len and default cseq value --- lib/srdb1/schema/entities.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/entities.xml b/lib/srdb1/schema/entities.xml index bb41627..0ad9a04 100644 --- a/lib/srdb1/schema/entities.xml +++ b/lib/srdb1/schema/entities.xml @@ -13,6 +13,7 @@ <!ENTITY sip_code_len "3"> <!ENTITY sip_reason_len "32"> <!ENTITY cseq_len "11"> +<!ENTITY callid_len "255"> <!ENTITY expires_len "11"> <!ENTITY flag_len "11"> <!ENTITY description_len "255"> @@ -22,7 +23,7 @@ <!ENTITY DEFAULT_LOCATION_EXPIRES "2020-05-28 21:32:15"> <!ENTITY DEFAULT_Q "1.0"> <!ENTITY DEFAULT_CALLID "Default-Call-ID"> -<!ENTITY DEFAULT_CSEQ "13"> +<!ENTITY DEFAULT_CSEQ "1"> <!ENTITY DEFAULT_DATETIME "1900-01-01 00:00:01">  <!ENTITY DEFAULT_FLAGS "0"> <!ENTITY KAMAILIO_MOD_DOC "http://www.kamailio.org/docs/modules/devel/">

1 0

git:master: version set to 3.2.0-dev6
by Daniel-Constantin Mierla 04 Jul '11

04 Jul '11

Module: sip-router Branch: master Commit: dea083ed12a5772ec44821c4d0ac8ca7f40d3300 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dea083e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 4 22:01:45 2011 +0200 version set to 3.2.0-dev6 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 4b9cbf0..29b53f1 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory debugger switcher # 0 - off (release mode)

1 0

assigning $rd buggy?
by Klaus Darilion 04 Jul '11

04 Jul '11

version: kamailio 3.1.4 (i386/linux) FAILURE_ROUTE: xlogl("L_NOTICE","failure to PSTN gateway: Call to $ru\n"); $rd = "81.209.128.132:5060"; xlogl("L_NOTICE","next gateway. Call to $ru\n"); route(RELAY); results in: NOTICE: <script>: 1089:failure to PSTN gateway: Call to sip:00431505641636@1.2.3.4:5060 ERROR: pv [pv_core.c:186]: failed to parse the R-URI NOTICE: <script>: 1097:next gateway. Call to <null> ... ERROR: uri2dst: bad_uri: sip:00431505641636@81.209.128.132:5060:5060 Looks like the assignment to $rd is buggy (double port) regards klaus

5 19

git:master: tm: add doxygen documentation for sip_msg.[c, h] files
by Henning Westerholt 04 Jul '11

04 Jul '11

Module: sip-router Branch: master Commit: 1db5459e967bbe34133718a6184266c45c4e868b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1db5459… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 4 00:40:21 2011 +0200 tm: add doxygen documentation for sip_msg.[c,h] files --- modules/tm/sip_msg.c | 54 +++++++++++++++++++++++++++++------------ modules/tm/sip_msg.h | 65 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 89 insertions(+), 30 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index f968acd..0eac3a4 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -1,17 +1,4 @@ /* - * $Id$ - * - * cloning a message into shared memory (TM keeps a snapshot - * of messages in memory); note that many operations, which - * allocate pkg memory (such as parsing) cannot be used with - * a cloned message -- it would result in linking pkg structures - * to shmem msg and eventually in a memory error - * - * the cloned message is stored in a single memory fragment to - * save too many shm_mallocs -- these are expensive as they - * not only take lookup in fragment table but also a shmem lock - * operation (the same for shm_free) - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server. @@ -54,6 +41,28 @@ * later than the SIP msg. (Miklos) * 2009-07-22 moved most of the functions to core sip_msg_clone.c (andrei)*/ +/** + * @file + * @brief TM :: Message cloning functionality + * + * Cloning a message into shared memory (TM keeps a snapshot + * of messages in memory); note that many operations, which + * allocate pkg memory (such as parsing) cannot be used with + * a cloned message -- it would result in linking pkg structures + * to shmem msg and eventually in a memory error. + * + * The cloned message is stored in a single memory fragment to + * save too many shm_mallocs -- these are expensive as they + * not only take lookup in fragment table but also a shmem lock + * operation (the same for shm_free) + * + * Allow postponing the cloning of SIP msg: + * t_newtran() copies the requests to shm mem without the lumps, + * and t_forward_nonack() clones the lumps later when it is called + * the first time. + * @ingroup tm + */ + #include "defs.h" @@ -66,8 +75,14 @@ #include "../../sip_msg_clone.h" #include "../../fix_lumps.h" -/* Warning: Cloner does not clone all hdr_field headers (From, To, etc.). Pointers will reference pkg memory. Dereferencing will crash ser!!! */ +/** + * @brief Clone a SIP message + * @warning Cloner does not clone all hdr_field headers (From, To, etc.). Pointers will reference pkg memory. Dereferencing will crash ser! + * @param org_msg Original SIP message + * @param sip_msg_len Length of the SIP message + * @return Cloned SIP message, or NULL on error + */ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ) { /* take care of the lumps only for replies if the msg cloning is @@ -79,12 +94,19 @@ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ) return sip_msg_shm_clone(org_msg, sip_msg_len, 0); } -/* indicates wheter we have already cloned the msg lumps or not */ +/** + * @brief Indicates wheter we have already cloned the msg lumps or not + */ unsigned char lumps_are_cloned = 0; -/* wrapper function for msg_lump_cloner() with some additional sanity checks */ +/** + * @brief Wrapper function for msg_lump_cloner() with some additional sanity checks + * @param shm_msg SIP message in shared memory + * @param pgk_msg SIP message in private memory + * @return 0 on success, -1 on error + */ int save_msg_lumps( struct sip_msg *shm_msg, struct sip_msg *pkg_msg) { int ret; diff --git a/modules/tm/sip_msg.h b/modules/tm/sip_msg.h index f006cde..1742207 100644 --- a/modules/tm/sip_msg.h +++ b/modules/tm/sip_msg.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server. @@ -25,7 +23,27 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - +/** + * @file + * @brief TM :: Message cloning functionality + * + * Cloning a message into shared memory (TM keeps a snapshot + * of messages in memory); note that many operations, which + * allocate pkg memory (such as parsing) cannot be used with + * a cloned message -- it would result in linking pkg structures + * to shmem msg and eventually in a memory error. + * + * The cloned message is stored in a single memory fragment to + * save too many shm_mallocs -- these are expensive as they + * not only take lookup in fragment table but also a shmem lock + * operation (the same for shm_free) + * + * Allow postponing the cloning of SIP msg: + * t_newtran() copies the requests to shm mem without the lumps, + * and t_forward_nonack() clones the lumps later when it is called + * the first time. + * @ingroup tm + */ #ifndef _SIP_MSG_H #define _SIP_MSG_H @@ -36,20 +54,18 @@ #include "../../parser/msg_parser.h" #include "../../mem/shm_mem.h" -/* Allow postponing the cloning of SIP msg: - * t_newtran() copies the requests to shm mem without the lumps, - * and t_forward_nonack() clones the lumps later when it is called - * the first time. - * Replies use only one memory block. - */ #include "../../atomic_ops.h" /* membar_depends() */ -/* msg is a reply: one memory block was allocated +/** + * @brief Helper function to free a SIP message + * + * msg is a reply: one memory block was allocated + * * msg is a request: two memory blocks were allocated: - * - one for the sip_msg struct - * - another one for the lumps which is linked to - * add_rm, body_lumps, or reply_lump. + * - one for the sip_msg struct + * - another one for the lumps which is linked to add_rm, body_lumps, + * or reply_lump */ #define _sip_msg_free(_free_func, _p_msg) \ do{ \ @@ -69,14 +85,35 @@ }while(0) +/** + * @brief Free a SIP message safely, with locking + */ #define sip_msg_free(_p_msg) _sip_msg_free(shm_free, _p_msg) +/** + * @brief Free a SIP message unsafely, without locking + */ #define sip_msg_free_unsafe(_p_msg) _sip_msg_free(shm_free_unsafe, _p_msg) - +/** + * @brief Clone a SIP message + * @warning Cloner does not clone all hdr_field headers (From, To, etc.). Pointers will reference pkg memory. Dereferencing will crash ser! + * @param org_msg Original SIP message + * @param sip_msg_len Length of the SIP message + * @return Cloned SIP message, or NULL on error + */ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ); +/** + * @brief Indicates wheter we have already cloned the msg lumps or not + */ extern unsigned char lumps_are_cloned; +/** + * @brief Wrapper function for msg_lump_cloner() with some additional sanity checks + * @param shm_msg SIP message in shared memory + * @param pgk_msg SIP message in private memory + * @return 0 on success, -1 on error + */ int save_msg_lumps( struct sip_msg *shm_msg, struct sip_msg *pkg_msg);

1 0

git:master: tm: remove #ifdef POSTPONE_MSG_CLONING, its default for three years now
by Henning Westerholt 04 Jul '11

04 Jul '11

Module: sip-router Branch: master Commit: 56f2823ca3cba947e968a398b96395232ee21f62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56f2823… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 4 00:07:45 2011 +0200 tm: remove #ifdef POSTPONE_MSG_CLONING, its default for three years now - remove POSTPONE_MSG_CLONING define from tm module - its now the default for more than three years - control flow in the module without it is better understandable - the current way is the expected behavior, also recently discussed on the list --- modules/tm/h_table.c | 7 ------- modules/tm/sip_msg.c | 9 --------- modules/tm/sip_msg.h | 25 ++++++------------------- modules/tm/t_fwd.c | 10 ++-------- modules/tm/t_suspend.c | 2 -- modules/tm/tm.c | 9 --------- 6 files changed, 8 insertions(+), 54 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 991435f..743fa94 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -369,13 +369,6 @@ struct cell* build_cell( struct sip_msg* p_msg ) } if (p_msg) { -#ifndef POSTPONE_MSG_CLONING - /* it makes no sense to clean the lumps when they are not cloned (Miklos) */ - - /* clean possible previous added vias/clen header or else they would - * get propagated in the failure routes */ - free_via_clen_lump(&p_msg->add_rm); -#endif new_cell->uas.request = sip_msg_cloner(p_msg,&sip_msg_len); if (!new_cell->uas.request) goto error; diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index ab093f8..f968acd 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -64,29 +64,21 @@ #include "../../data_lump_rpl.h" #include "../../ut.h" #include "../../sip_msg_clone.h" - -#ifdef POSTPONE_MSG_CLONING #include "../../fix_lumps.h" -#endif /* Warning: Cloner does not clone all hdr_field headers (From, To, etc.). Pointers will reference pkg memory. Dereferencing will crash ser!!! */ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ) { -#ifdef POSTPONE_MSG_CLONING /* take care of the lumps only for replies if the msg cloning is postponed */ if (org_msg->first_line.type==SIP_REPLY) -#endif /* POSTPONE_MSG_CLONING */ /*cloning all the lumps*/ return sip_msg_shm_clone(org_msg, sip_msg_len, 1); -#ifdef POSTPONE_MSG_CLONING /* don't clone the lumps */ return sip_msg_shm_clone(org_msg, sip_msg_len, 0); -#endif /* POSTPONE_MSG_CLONING */ } -#ifdef POSTPONE_MSG_CLONING /* indicates wheter we have already cloned the msg lumps or not */ unsigned char lumps_are_cloned = 0; @@ -144,4 +136,3 @@ int save_msg_lumps( struct sip_msg *shm_msg, struct sip_msg *pkg_msg) } return ret<0?-1:0; } -#endif /* POSTPONE_MSG_CLONING */ diff --git a/modules/tm/sip_msg.h b/modules/tm/sip_msg.h index 0c6a6a3..f006cde 100644 --- a/modules/tm/sip_msg.h +++ b/modules/tm/sip_msg.h @@ -42,19 +42,15 @@ * the first time. * Replies use only one memory block. */ -#define POSTPONE_MSG_CLONING -#ifdef POSTPONE_MSG_CLONING #include "../../atomic_ops.h" /* membar_depends() */ -#endif -#ifdef POSTPONE_MSG_CLONING - /* msg is a reply: one memory block was allocated - * msg is a request: two memory blocks were allocated: - * - one for the sip_msg struct - * - another one for the lumps which is linked to - * add_rm, body_lumps, or reply_lump. - */ +/* msg is a reply: one memory block was allocated + * msg is a request: two memory blocks were allocated: + * - one for the sip_msg struct + * - another one for the lumps which is linked to + * add_rm, body_lumps, or reply_lump. + */ #define _sip_msg_free(_free_func, _p_msg) \ do{ \ if (_p_msg->first_line.type==SIP_REPLY) { \ @@ -72,13 +68,6 @@ } \ }while(0) -#else /* POSTPONE_MSG_CLONING */ - - /* only one memory block was allocated */ -#define _sip_msg_free(_free_func, _p_msg) \ - _free_func( (_p_msg) ) - -#endif /* POSTPONE_MSG_CLONING */ #define sip_msg_free(_p_msg) _sip_msg_free(shm_free, _p_msg) #define sip_msg_free_unsafe(_p_msg) _sip_msg_free(shm_free_unsafe, _p_msg) @@ -86,11 +75,9 @@ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ); -#ifdef POSTPONE_MSG_CLONING extern unsigned char lumps_are_cloned; int save_msg_lumps( struct sip_msg *shm_msg, struct sip_msg *pkg_msg); -#endif #endif diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index d0e8fb9..6385812 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -123,9 +123,8 @@ #ifdef USE_DST_BLACKLIST #include "../../dst_blacklist.h" #endif -#ifdef POSTPONE_MSG_CLONING #include "../../atomic_ops.h" /* membar_depends() */ -#endif + static int goto_on_branch = 0, branch_route = 0; @@ -231,11 +230,9 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, /* dup lumps * TODO: clone lumps only if needed */ -#ifdef POSTPONE_MSG_CLONING /* lumps can be set outside of the lock, make sure that we read * the up-to-date values */ membar_depends(); -#endif add_rm_backup = i_req->add_rm; body_lumps_backup = i_req->body_lumps; if (unlikely(i_req->add_rm)){ @@ -919,11 +916,9 @@ int e2e_cancel_branch( struct sip_msg *cancel_msg, struct cell *t_cancel, /* print */ if (cfg_get(tm, tm_cfg, reparse_invite)) { /* buffer is built localy from the INVITE which was sent out */ -#ifdef POSTPONE_MSG_CLONING /* lumps can be set outside of the lock, make sure that we read * the up-to-date values */ membar_depends(); -#endif if (cancel_msg->add_rm || cancel_msg->body_lumps) { LOG(L_WARN, "WARNING: e2e_cancel_branch: CANCEL is built locally, " "thus lumps are not applied to the message!\n"); @@ -1461,7 +1456,6 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , branch_route = 0; } -#ifdef POSTPONE_MSG_CLONING /* on first-time forwarding, update the lumps */ if (first_branch==0) { /* update the shmem-ized msg with the lumps */ @@ -1472,7 +1466,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , 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). diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 19c7f32..578d6b0 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -82,7 +82,6 @@ int t_suspend(struct sip_msg *msg, DBG("SER: ERROR: t_suspend (100)\n"); } -#ifdef POSTPONE_MSG_CLONING if ((t->nr_of_outgoings==0) && /* if there had already been an UAC created, then the lumps were saved as well */ @@ -92,7 +91,6 @@ int t_suspend(struct sip_msg *msg, "failed to save the message lumps\n"); return -1; } -#endif /* save the message flags */ t->uas.request->flags = msg->flags; diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 734f093..096e30c 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -726,10 +726,7 @@ static int script_init( struct sip_msg *foo, unsigned int flags, void *bar) /* set request mode so that multiple-mode actions know * how to behave */ set_route_type(REQUEST_ROUTE); - -#ifdef POSTPONE_MSG_CLONING lumps_are_cloned = 0; -#endif return 1; } @@ -1888,7 +1885,6 @@ static int w_t_drop_replies(struct sip_msg* msg, char* foo, char* bar) /* save the message lumps after t_newtran() but before t_relay() */ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) { -#ifdef POSTPONE_MSG_CLONING struct cell *t; if (is_route_type(REQUEST_ROUTE)) { @@ -1905,11 +1901,6 @@ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) } } /* else nothing to do, the lumps have already been saved */ return 1; -#else - LOG(L_ERR, "ERROR: w_t_save_lumps: POSTPONE_MSG_CLONING is not defined," - " thus, the functionality is not supported\n"); - return -1; -#endif }

1 0

git:master: doxygen: small doc fix in parser
by Henning Westerholt 04 Jul '11

04 Jul '11

Module: sip-router Branch: master Commit: 17060b4656bcbaa18cd43fb7e51549ffa5a979fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17060b4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun Jul 3 21:50:04 2011 +0200 doxygen: small doc fix in parser --- parser/msg_parser.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 30069a9..9298eb7 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -88,19 +88,19 @@ enum request_method { METHOD_UNDEF=0, /*!< 0 - --- */ METHOD_INVITE=1, /*!< 1 - 2^0 */ METHOD_CANCEL=2, /*!< 2 - 2^1 */ - METHOD_ACK=4, /*!< 3 - 2^2 */ - METHOD_BYE=8, /*!< 4 - 2^3 */ - METHOD_INFO=16, /*!< 5 - 2^4 */ - METHOD_REGISTER=32, /*!< 6 - 2^5 */ - METHOD_SUBSCRIBE=64, /*!< 7 - 2^6 */ - METHOD_NOTIFY=128, /*!< 8 - 2^7 */ - METHOD_MESSAGE=256, /*!< 9 - 2^8 */ - METHOD_OPTIONS=512, /*!< 10 - 2^9 */ - METHOD_PRACK=1024, /*!< 11 - 2^10 */ - METHOD_UPDATE=2048, /*!< 12 - 2^11 */ - METHOD_REFER=4096, /*!< 13 - 2^12 */ - METHOD_PUBLISH=8192, /*!< 14 - 2^13 */ - METHOD_OTHER=16384 /*!< 15 - 2^14 */ + METHOD_ACK=4, /*!< 4 - 2^2 */ + METHOD_BYE=8, /*!< 8 - 2^3 */ + METHOD_INFO=16, /*!< 16 - 2^4 */ + METHOD_REGISTER=32, /*!< 32 - 2^5 */ + METHOD_SUBSCRIBE=64, /*!< 64 - 2^6 */ + METHOD_NOTIFY=128, /*!< 128 - 2^7 */ + METHOD_MESSAGE=256, /*!< 256 - 2^8 */ + METHOD_OPTIONS=512, /*!< 512 - 2^9 */ + METHOD_PRACK=1024, /*!< 1024 - 2^10 */ + METHOD_UPDATE=2048, /*!< 2048 - 2^11 */ + METHOD_REFER=4096, /*!< 4096 - 2^12 */ + METHOD_PUBLISH=8192, /*!< 8192 - 2^13 */ + METHOD_OTHER=16384 /*!< 16384 - 2^14 */ }; #define FL_FORCE_RPORT (1 << 0) /*!< force rport */

1 0

git:master: docbook: allow setting catalog path from command line
by Daniel-Constantin Mierla 03 Jul '11

03 Jul '11

Module: sip-router Branch: master Commit: ddcaa44c02d90cac198ec9079d33225afd1134ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddcaa44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 3 15:21:22 2011 +0200 docbook: allow setting catalog path from command line --- docbook/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docbook/Makefile b/docbook/Makefile index bdd43bf..6d5408d 100644 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -97,7 +97,7 @@ html_css ?= /css/sr-doc.css # the site-wide catalog file present in Debian and possibly other systems # too. This file is updated by the package manager whenever docbook schema # file or docbook xsl stylesheets are being installed. -catalog=$(docbook_dir)/catalog.xml +catalog ?= $(docbook_dir)/catalog.xml lynx ?= lynx dia ?= dia

1 0

git:master: tmx: exported asynchronous functions to config
by Daniel-Constantin Mierla 03 Jul '11

03 Jul '11

Module: sip-router Branch: master Commit: ed191572ee9b6fee6bbfcfcb68754c61732866ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed19157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 3 15:07:04 2011 +0200 tmx: exported asynchronous functions to config - t_suspend() - suppend the execution of SIP request in a transaction - the transaction is created if it does not exist already. $T(id_index) and $T(id_label) can be used to get transaction's internal index and label identifiers - t_continue(index, label, rtname) - continue the execution of a suspended transaction identified by (index, label) with the actions in route[rtname] --- modules_k/tmx/tmx_mod.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 insertions(+), 2 deletions(-) diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 9bbd98c..ba19538 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -48,7 +48,8 @@ static void destroy(void); static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2); static int fixup_cancel_branches(void** param, int param_no); -static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *flag); +static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, + char *flag); static int fixup_cancel_callid(void** param, int param_no); static int t_reply_callid(struct sip_msg* msg, char *cid, char *cseq, char *rc, char *rs); @@ -58,6 +59,10 @@ static int t_flush_flags(struct sip_msg* msg, char*, char* ); static int t_is_failure_route(struct sip_msg* msg, char*, char* ); static int t_is_branch_route(struct sip_msg* msg, char*, char* ); +static int w_t_suspend(struct sip_msg* msg, char*, char*); +static int w_t_continue(struct sip_msg* msg, char *idx, char *lbl, char *rtn); +static int fixup_t_continue(void** param, int param_no); + /* statistic variables */ stat_var *tm_rcv_rpls; stat_var *tm_rld_rpls; @@ -141,7 +146,7 @@ static cmd_export_t cmds[]={ fixup_cancel_branches, 0, ONREPLY_ROUTE }, {"t_cancel_callid", (cmd_function)t_cancel_callid, 3, fixup_cancel_callid, 0, ANY_ROUTE }, - {"t_reply_callid", (cmd_function)t_reply_callid, 4, + {"t_reply_callid", (cmd_function)t_reply_callid, 4, fixup_reply_callid, 0, ANY_ROUTE }, {"t_flush_flags", (cmd_function)t_flush_flags, 0, 0, 0, ANY_ROUTE }, @@ -149,6 +154,10 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"t_is_branch_route", (cmd_function)t_is_branch_route, 0, 0, 0, ANY_ROUTE }, + {"t_suspend", (cmd_function)w_t_suspend, 0, 0, + 0, ANY_ROUTE }, + {"t_continue", (cmd_function)w_t_continue, 3, + fixup_t_continue, 0, ANY_ROUTE }, {0,0,0,0,0,0} }; @@ -449,6 +458,107 @@ static int t_is_branch_route(struct sip_msg* msg, char *foo, char *bar) return -1; } +/** + * + */ +static int w_t_suspend(struct sip_msg* msg, char *p1, char *p2) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + t=_tmx_tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(_tmx_tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = _tmx_tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(_tmx_tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suppend the processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + return 1; +} + +/** + * + */ +static int w_t_continue(struct sip_msg* msg, char *idx, char *lbl, char *rtn) +{ + unsigned int tindex; + unsigned int tlabel; + str rtname; + cfg_action_t *act; + int ri; + + if(fixup_get_ivalue(msg, (gparam_p)idx, (int*)&tindex)<0) + { + LM_ERR("cannot get transaction index\n"); + return -1; + } + + if(fixup_get_ivalue(msg, (gparam_p)lbl, (int*)&tlabel)<0) + { + LM_ERR("cannot get transaction label\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)rtn, &rtname)<0) + { + LM_ERR("cannot get route block name\n"); + return -1; + } + + ri = route_get(&main_rt, rtname.s); + if(ri<0) + { + LM_ERR("unable to find route block [%.*s]\n", rtname.len, rtname.s); + return -1; + } + act = main_rt.rlist[ri]; + if(act==NULL) + { + LM_ERR("empty action lists in route block [%.*s]\n", + rtname.len, rtname.s); + return -1; + } + + if(_tmx_tmb.t_continue(tindex, tlabel, act)<0) + { + LM_ERR("resuming the processing of transaction [%u:%u] failed\n", + tindex, tlabel); + return -1; + } + return 1; +} + +/** + * + */ +static int fixup_t_continue(void** param, int param_no) +{ + if (param_no==1 || param_no==2) { + return fixup_igp_null(param, 1); + } + if (param_no==3) { + return fixup_spve_null(param, 1); + } + + return 0; +} + #ifdef STATISTICS /*** tm stats ***/

1 0

git:master: tmx: doxumented t_suspend() and t_continue()
by Daniel-Constantin Mierla 03 Jul '11

03 Jul '11

Module: sip-router Branch: master Commit: 492055eba80bfbbfeef3721ded47c2af603ae8f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=492055e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 3 15:32:42 2011 +0200 tmx: doxumented t_suspend() and t_continue() --- modules_k/tmx/README | 88 +++++++++++++++++++++++++++++--------- modules_k/tmx/doc/tmx_admin.xml | 65 ++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 21 deletions(-) diff --git a/modules_k/tmx/README b/modules_k/tmx/README index 38ffdd7..8a0ed2b 100644 --- a/modules_k/tmx/README +++ b/modules_k/tmx/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2009 Daniel-Constantin Mierla + Copyright � 2009 Daniel-Constantin Mierla __________________________________________________________________ Table of Contents @@ -32,6 +32,8 @@ Daniel-Constantin Mierla 3.4. t_flush_flags() 3.5. t_is_failure_route() 3.6. t_is_branch_route() + 3.7. t_suspend() + 3.8. t_continue(tindex, tlabel, rtname) 4. Exported pseudo-variables 5. Exported MI Functions @@ -64,6 +66,8 @@ Daniel-Constantin Mierla 1.4. t_flush_flags usage 1.5. t_is_failure_route usage 1.6. t_is_branch_route usage + 1.7. t_suspend usage + 1.8. t_continue usage Chapter 1. Admin Guide @@ -83,6 +87,8 @@ Chapter 1. Admin Guide 3.4. t_flush_flags() 3.5. t_is_failure_route() 3.6. t_is_branch_route() + 3.7. t_suspend() + 3.8. t_continue(tindex, tlabel, rtname) 4. Exported pseudo-variables 5. Exported MI Functions @@ -138,8 +144,10 @@ Chapter 1. Admin Guide 3.4. t_flush_flags() 3.5. t_is_failure_route() 3.6. t_is_branch_route() + 3.7. t_suspend() + 3.8. t_continue(tindex, tlabel, rtname) -3.1. t_cancel_branches(which) +3.1. t_cancel_branches(which) Cancel branches of an active SIP transaction. The function can be called for a SIP reply that will identify the current branch. @@ -158,7 +166,7 @@ if (t_cancel_branches("all")) { } ... -3.2. t_cancel_callid(callid, cseq, flag) +3.2. t_cancel_callid(callid, cseq, flag) Cancel first INVITE transaction identified by callid and cseq. It sets the flag if the value is greater than zero @@ -177,7 +185,7 @@ if (t_cancel_callid("123qaz", "5", "22")) { } ... -3.3. t_reply_callid(callid, cseq, code, reason) +3.3. t_reply_callid(callid, cseq, code, reason) Send reply to first INVITE transaction identified by callid and cseq. @@ -196,7 +204,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { } ... -3.4. t_flush_flags() +3.4. t_flush_flags() Flush the flags from current SIP message into the already created transaction. It make sense only in routing block if the transaction was @@ -209,7 +217,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { t_flush_flags(); ... -3.5. t_is_failure_route() +3.5. t_is_failure_route() Returns true if the top-executed route block is failure_route. @@ -226,7 +234,7 @@ route[abc] { } ... -3.6. t_is_branch_route() +3.6. t_is_branch_route() Returns true if the top-executed route block is branch_route. @@ -243,6 +251,44 @@ route[abc] { } ... +3.7. t_suspend() + + Suspend the execution of SIP request in a transaction. If transaction + was not created yet, it is created by this function. Returns true in + case of success and internal transaction index and label are available + via $T(id_index) and $T(id_label). + + This function can be used from ANY_ROUTE . + + Example 1.7. t_suspend usage +... +if(t_suspend()) +{ + xlog("proceesing suspended in trasaction [$T(id_index):$T(id_label)]\n"); + exit; +} +... + +3.8. t_continue(tindex, tlabel, rtname) + + Continue the execution of the transaction identified by tindex and + tlabel with the actions defined in route[rtname]. + + Parameters:. + * tindex - internal index of transaction. Can be an integer or a + pseudo-variable. + * tlabel - internal label of transaction. Can be an integer or a + pseudo-variable. + * rtname - the name of the route block to execute. Can be a static + string value or a dynamic string with pseudo-variables. + + This function can be used in ANY_ROUTE. + + Example 1.8. t_continue usage +... +tcontinue('123', '456', 'MYROUTE'); +... + 4. Exported pseudo-variables * $T_branch_idx @@ -261,22 +307,22 @@ route[abc] { 5.4. t_reply 5.5. t_reply_callid -5.1. t_uac_dlg +5.1. t_uac_dlg Generates and sends a local SIP request. Parameters: * method - request method * RURI - request SIP URI - * NEXT HOP - next hop SIP URI (OBP); use “.” if no value. - * socket - local socket to be used for sending the request; use “.” + * NEXT HOP - next hop SIP URI (OBP); use "." if no value. + * socket - local socket to be used for sending the request; use "." if no value. * headers - set of additional headers to be added to the request; at - least “From” and “To” headers must be specify) + least "From" and "To" headers must be specify) * body - (optional, may not be present) request body (if present, - requires the “Content-Type” and “Content-length” headers) + requires the "Content-Type" and "Content-length" headers) -5.2. t_uac_cancel +5.2. t_uac_cancel Generates and sends a CANCEL for an existing local SIP request. @@ -284,14 +330,14 @@ route[abc] { * callid - callid of the INVITE request to be cancelled. * cseq - cseq of the INVITE request to be cancelled. -5.3. t_hash +5.3. t_hash Gets information about the load of TM internal hash table. Parameters: * none -5.4. t_reply +5.4. t_reply Generates and sends a reply for an existing inbound SIP transaction. @@ -301,11 +347,11 @@ route[abc] { * trans_id - transaction identifier (has the hash_entry:label format) * to_tag - To tag to be added to TO header * new_headers - extra headers to be appended to the reply; use a dot - (“.”) char only if there are no headers; + (".") char only if there are no headers; * body - (optional, may not be present) reply body (if present, - requires the “Content-Type” and “Content-length” headers) + requires the "Content-Type" and "Content-length" headers) -5.5. t_reply_callid +5.5. t_reply_callid Generates and sends a reply for an existing inbound SIP transaction. @@ -316,9 +362,9 @@ route[abc] { * cseq - SIP CSeq header * to_tag - To tag to be added to TO header * new_headers - extra headers to be appended to the reply; use a dot - (“.”) char only if there are no headers; + (".") char only if there are no headers; * body - (optional, may not be present) reply body (if present, - requires the “Content-Type” and “Content-length” headers) + requires the "Content-Type" and "Content-length" headers) 6. Exported statistics @@ -335,7 +381,7 @@ route[abc] { 6.11. inuse_transactions Exported statistics are listed in the next sections. All statistics - except “inuse_transactions” can be reset. + except "inuse_transactions" can be reset. 6.1. received_replies diff --git a/modules_k/tmx/doc/tmx_admin.xml b/modules_k/tmx/doc/tmx_admin.xml index 86a8946..dfb85a3 100644 --- a/modules_k/tmx/doc/tmx_admin.xml +++ b/modules_k/tmx/doc/tmx_admin.xml @@ -242,6 +242,71 @@ route[abc] { </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">t_suspend()</function> + </title> + <para> + Suspend the execution of SIP request in a transaction. If transaction + was not created yet, it is created by this function. Returns true in + case of success and internal transaction index and label are available + via $T(id_index) and $T(id_label). + </para> + <para> + This function can be used from ANY_ROUTE . + </para> + <example> + <title><function>t_suspend</function> usage</title> + <programlisting format="linespecific"> +... +if(t_suspend()) +{ + xlog("proceesing suspended in trasaction [$T(id_index):$T(id_label)]\n"); + exit; +} +... +</programlisting> + </example> + </section> + <section> + <title> + <function moreinfo="none">t_continue(tindex, tlabel, rtname) + </function> + </title> + <para> + Continue the execution of the transaction identified by tindex and + tlabel with the actions defined in route[rtname]. + </para> + <para> + Parameters:. + </para> + <itemizedlist> + <listitem><para> + <emphasis>tindex</emphasis> - internal index of transaction. + Can be an integer or a pseudo-variable. + </para></listitem> + <listitem><para> + <emphasis>tlabel</emphasis> - internal label of transaction. + Can be an integer or a pseudo-variable. + </para></listitem> + <listitem><para> + <emphasis>rtname</emphasis> - the name of the route block to + execute. Can be a static string value or a dynamic string with + pseudo-variables. + </para></listitem> + </itemizedlist> + <para> + This function can be used in ANY_ROUTE. + </para> + <example> + <title><function>t_continue</function> usage</title> + <programlisting format="linespecific"> +... +tcontinue('123', '456', 'MYROUTE'); +... +</programlisting> + </example> + </section> </section> <section>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011