sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

[ openser-Patches-3035780 ] Let pua use the configured outboudn proxy in all cases
by SourceForge.net 28 Jul '10

28 Jul '10

Patches item #3035780, was opened at 2010-07-28 09:07 Message generated for change (Tracker Item Submitted) made by axlh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3035780&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 1.5.x Status: Open Resolution: None Priority: 5 Private: No … [View More]

1 0

[ openser-Patches-3035778 ] Fix registrar when fetching binding for unregistered user
by SourceForge.net 28 Jul '10

28 Jul '10

Patches item #3035778, was opened at 2010-07-28 09:04 Message generated for change (Tracker Item Submitted) made by axlh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3035778&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 1.5.x Status: Open Resolution: None Priority: 5 Private: No … [View More]

1 0

[ openser-Patches-3035382 ] Fix transformation tobody.params
by SourceForge.net 28 Jul '10

28 Jul '10

Patches item #3035382, was opened at 2010-07-27 18:11 Message generated for change (Comment added) made by axlh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3035382&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: core Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: … [View More]

1 0

git:master: core: new param -A to add cfg preprocesor directives
by Daniel-Constantin Mierla 27 Jul '10

27 Jul '10

Module: sip-router Branch: master Commit: 95dec431421ce9f809f3a15f4c6407fff2d401a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95dec43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 27 23:46:48 2010 +0200 core: new param -A to add cfg preprocesor directives - defines can be specified from command line with option -A - these defines are available from begining of … [View More]parsing the config - examples: - '-A WITH_AUTH' is like having '#!define WITH_AUTH' at top of cfg - '-A LISTENIP=127.0.0.1' is like '#!define LISTENIP=127.0.0.1' --- cfg.lex | 6 ++---- main.c | 28 ++++++++++++++++++++++++++-- ppcfg.h | 3 +++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/cfg.lex b/cfg.lex index 564cb56..804b9e6 100644 --- a/cfg.lex +++ b/cfg.lex @@ -166,8 +166,6 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; - static int pp_define(int len, const char * text); - static int pp_define_set(int len, char * text); static str *pp_define_get(int len, const char * text); static int pp_ifdef_type(int pos); static void pp_ifdef_var(int len, const char * text); @@ -1614,7 +1612,7 @@ static int pp_lookup(int len, const char * text) return -1; } -static int pp_define(int len, const char * text) +int pp_define(int len, const char * text) { if (pp_num_defines == MAX_DEFINES) { LOG(L_CRIT, "ERROR: too many defines -- adjust MAX_DEFINES\n"); @@ -1636,7 +1634,7 @@ static int pp_define(int len, const char * text) return 0; } -static int pp_define_set(int len, char *text) +int pp_define_set(int len, char *text) { if(len<=0) { LOG(L_DBG, "no define value - ignoring\n"); diff --git a/main.c b/main.c index 5b0c476..cc6f137 100644 --- a/main.c +++ b/main.c @@ -183,6 +183,7 @@ #include "basex.h" /* init */ #include "pvapi_init.h" /* init */ #include "pv_core.h" /* register core pvars */ +#include "ppcfg.h" #ifdef DEBUG_DMALLOC #include <dmalloc.h> @@ -246,7 +247,8 @@ Options:\n\ -G file Create a pgid file\n\ -O nr Script optimization level (debugging option)\n\ -a mode Auto aliases mode: enable with yes or on,\n\ - disable with no or off\n" + disable with no or off\n\ + -A define Add config pre-processor define (e.g., -A WITH_AUTH)\n" #ifdef STATS " -s file File to which statistics is dumped (disabled otherwise)\n" #endif @@ -1649,6 +1651,7 @@ int main(int argc, char** argv) struct timeval tval; fd_set fds; int res; + char *p; /*init*/ time(&up_since); @@ -1667,7 +1670,7 @@ int main(int argc, char** argv) "DBG_MSG_QA enabled, ser may exit abruptly\n"); #endif - options= ":f:cm:dVhEb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SQ:O:a:" + options= ":f:cm:dVhEb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" #ifdef STATS "s:" #endif @@ -1749,6 +1752,26 @@ int main(int argc, char** argv) /* user needed for possible shm. pre-init */ user=optarg; break; + case 'A': + p = strchr(optarg, '='); + if(p) { + *p = '\0'; + } + if(pp_define(strlen(optarg), optarg)<0) { + fprintf(stderr, "error at define param: -A %s\n", + optarg); + goto error; + } + if(p) { + *p = '='; + p++; + if(pp_define_set(strlen(p), p)<0) { + fprintf(stderr, "error at define value: -A %s\n", + optarg); + goto error; + } + } + break; case 'b': case 'l': case 'n': @@ -1864,6 +1887,7 @@ try_again: case 'V': case 'h': case 'O': + case 'A': break; case 'E': log_stderr=1; // use in both getopt switches diff --git a/ppcfg.h b/ppcfg.h index c8ff4fa..c3a01f4 100644 --- a/ppcfg.h +++ b/ppcfg.h @@ -25,6 +25,9 @@ int pp_subst_add(char *data); int pp_subst_run(char **data); +int pp_define(int len, const char * text); +int pp_define_set(int len, char * text); + #endif /*_PPCFG_H_*/ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ [View Less]

1 1

git:master: core: added option '-a' to control auto aliases
by Daniel-Constantin Mierla 27 Jul '10

27 Jul '10

Module: sip-router Branch: master Commit: b01dc20a7a45e3b80b00b03889762fdff8feda8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b01dc20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 27 23:20:24 2010 +0200 core: added option '-a' to control auto aliases - enable auto aliases with '-a yes' or -'-a on' - disable auto aliases with '-a no' or -'-a off' - the option … [View More]

1 0

SF.net SVN: openser:[6029] trunk
by axlh＠users.sourceforge.net 27 Jul '10

27 Jul '10

Revision: 6029 http://openser.svn.sourceforge.net/openser/?rev=6029&view=rev Author: axlh Date: 2010-07-27 17:20:58 +0000 (Tue, 27 Jul 2010) Log Message: ----------- Fix the transformation tobody.params when the last value of the parameter list is quoted. The resulting string was truncated by 2 characters. Because there is no way to find out the length of the parameter list (trailing whitespace may be present), store it in the to_body struct. Modified Paths: -------------- … [View More]

2 1

SF.net SVN: openser:[6032] trunk
by Daniel-Constantin Mierla 27 Jul '10

27 Jul '10

Revision: 6032 http://openser.svn.sourceforge.net/openser/?rev=6032&view=rev Author: miconda Date: 2010-07-27 20:42:20 +0000 (Tue, 27 Jul 2010) Log Message: ----------- reverted commit 6029 - there should not be new commits in SVN trunk, devel source code is on GIT repository hosted by git.sip-router.org - besides, it broke compilation Modified Paths: -------------- trunk/modules/pv/pv_trans.c trunk/parser/parse_to.c Property Changed: ---------------- trunk/… [View More]

1 0

[ openser-Patches-3035382 ] Fix transformation tobody.params
by SourceForge.net 27 Jul '10

27 Jul '10

Patches item #3035382, was opened at 2010-07-27 19:11 Message generated for change (Comment added) made by miconda You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3035382&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: core Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: … [View More]

1 0

SF.net SVN: openser:[6031] branches/1.5
by Daniel-Constantin Mierla 27 Jul '10

27 Jul '10

Revision: 6031 http://openser.svn.sourceforge.net/openser/?rev=6031&view=rev Author: miconda Date: 2010-07-27 19:49:34 +0000 (Tue, 27 Jul 2010) Log Message: ----------- revert commit 6030 - it was incomplete, compilationd does not work anymore Modified Paths: -------------- branches/1.5/modules/pv/pv_trans.c branches/1.5/parser/parse_to.c Property Changed: ---------------- branches/1.5/modules/pv/pv_trans.c This was sent by the SourceForge.net collaborative … [View More]

1 0

git:master: modules_k/dialog: Add support for spiral detection.
by Timo Reimann 27 Jul '10

27 Jul '10

Module: sip-router Branch: master Commit: 0b665153a93ae7f1ff9d25b2ca1e30d9fbbe248b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b66515… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 27 18:50:31 2010 +0200 modules_k/dialog: Add support for spiral detection. - Introduce module parameter "detect_spirals" which controls whether spiraling messages should be detected or not. - If that … [View More]flag is set, dlg_onreq() will check incoming message's dialog identifier (except for not yet existing To tag) against its local set of dialogs. If a match is found, the generation of a new dialog will be suppressed. - New dialog callback DLGCB_SPIRALED may be registered to allow custom module actions on occurrence of a spiraling event. --- modules_k/dialog/dialog.c | 7 ++ modules_k/dialog/dlg_cb.h | 1 + modules_k/dialog/dlg_handlers.c | 130 ++++++++++++++++++++++----------- modules_k/dialog/doc/dialog_admin.xml | 24 ++++++ modules_k/dialog/doc/dialog_devel.xml | 5 + 5 files changed, 123 insertions(+), 44 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index a7e34a2..f965a06 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -99,6 +99,7 @@ pv_elem_t * ruri_param_model = NULL; int dlg_enable_stats = 1; int active_dlgs_cnt = 0; int early_dlgs_cnt = 0; +int detect_spirals = 1; stat_var *active_dlgs = 0; stat_var *processed_dlgs = 0; stat_var *expired_dlgs = 0; @@ -182,6 +183,7 @@ static param_export_t mod_params[]={ { "default_timeout", INT_PARAM, &default_timeout }, { "dlg_extra_hdrs", STR_PARAM, &dlg_extra_hdrs.s }, { "dlg_match_mode", INT_PARAM, &seq_match_mode }, + { "detect_spirals", INT_PARAM, &detect_spirals, }, { "db_url", STR_PARAM, &db_url.s }, { "db_mode", INT_PARAM, &dlg_db_mode }, { "table_name", STR_PARAM, &dialog_table_name }, @@ -473,6 +475,11 @@ static int mod_init(void) return -1; } + if (detect_spirals != 0 && detect_spirals != 1) { + LM_ERR("invalid value %d for detect_spirals param!!\n",detect_spirals); + return -1; + } + /* if statistics are disabled, prevent their registration to core */ if (dlg_enable_stats==0) exports.stats = 0; diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index 3013809..fc8b05a 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -66,6 +66,7 @@ typedef int (*register_dlgcb_f)(struct dlg_cell* dlg, int cb_types, #define DLGCB_MI_CONTEXT (1<<10) #define DLGCB_RPC_CONTEXT (1<<11) #define DLGCB_DESTROY (1<<12) +#define DLGCB_SPIRALED (1<<13) struct dlg_callback { int types; diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index a3610cc..77ad7ca 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -84,6 +84,7 @@ static pv_spec_t *timeout_avp; /*!< AVP for timeout setting */ static int default_timeout; /*!< default dialog timeout */ static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ +extern int detect_spirals; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -484,6 +485,50 @@ inline static int get_dlg_timeout(struct sip_msg *req) /*! + * \brief Helper function to get the necessary content from SIP message + * \param req SIP request + * \param callid found callid + * \param ftag found from tag + * \param ttag found to tag + * \param with_ttag flag set if to tag must be found for success + * \return 0 on success, -1 on failure + */ +static inline int pre_match_parse( struct sip_msg *req, str *callid, + str *ftag, str *ttag, int with_ttag) +{ + if (parse_headers(req,HDR_CALLID_F|HDR_TO_F,0)<0 || !req->callid || + !req->to ) { + LM_ERR("bad request or missing CALLID/TO hdr :-/\n"); + return -1; + } + + if (get_to(req)->tag_value.len==0) { + if (with_ttag == 1) { + /* out of dialog request with preloaded Route headers; ignore. */ + return -1; + } else { + ttag->s = NULL; + ttag->len = 0; + } + } else { + *ttag = get_to(req)->tag_value; + } + + if (parse_from_header(req)<0 || get_from(req)->tag_value.len==0) { + LM_ERR("failed to get From header\n"); + return -1; + } + + /* callid */ + *callid = req->callid->body; + trim(callid); + /* from tag */ + *ftag = get_from(req)->tag_value; + return 0; +} + + +/*! * \brief Function that is registered as TM callback and called on requests * \see dlg_new_dialog * \param t transaction, used to created the dialog @@ -492,13 +537,48 @@ inline static int get_dlg_timeout(struct sip_msg *req) */ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) { - struct sip_msg *msg; - msg = param->req; - if((msg->flags&dlg_flag)!=dlg_flag) + struct dlg_cell *dlg; + str callid; + str ftag; + str ttag; + unsigned int dir; + struct sip_msg *req = param->req; + + if((req->flags&dlg_flag)!=dlg_flag) return; if (current_dlg_pointer!=NULL) return; - dlg_new_dialog(msg, t); + if (!detect_spirals) + goto create; + + /* skip initial requests - they may end up here because of the + * preloaded route */ + if ( (!req->to && parse_headers(req, HDR_TO_F,0)<0) || !req->to ) { + LM_ERR("bad request or missing TO hdr :-/\n"); + return; + } + + dlg = 0; + dir = DLG_DIR_NONE; + + if (pre_match_parse( req, &callid, &ftag, &ttag, 0)<0) { + LM_WARN("pre-matching failed\n"); + return; + } + dlg = get_dlg(&callid, &ftag, &ttag, &dir); + if (!dlg){ + LM_DBG("Callid '%.*s' not found, must be a new dialog\n", + req->callid->body.len, req->callid->body.s); + goto create; + } + + run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, DLG_DIR_DOWNSTREAM, 0); + + unref_dlg(dlg, 1); + return; + +create: + dlg_new_dialog(req, t); } @@ -685,44 +765,6 @@ static inline int parse_dlg_rr_param(char *p, char *end, int *h_entry, int *h_id /*! - * \brief Helper function to get the necessary content from SIP message - * \param req SIP request - * \param callid found callid - * \param ftag found from tag - * \param ttag found to tag - * \return 0 on succes, -1 on failure - */ -static inline int pre_match_parse( struct sip_msg *req, str *callid, - str *ftag, str *ttag) -{ - if (parse_headers(req,HDR_CALLID_F|HDR_TO_F,0)<0 || !req->callid || - !req->to ) { - LM_ERR("bad request or missing CALLID/TO hdr :-/\n"); - return -1; - } - - if (get_to(req)->tag_value.len==0) { - /* out of dialog request with preloaded Route headers; ignore. */ - return -1; - } - - if (parse_from_header(req)<0 || get_from(req)->tag_value.len==0) { - LM_ERR("failed to get From header\n"); - return -1; - } - - /* callid */ - *callid = req->callid->body; - trim(callid); - /* to tag */ - *ttag = get_to(req)->tag_value; - /* from tag */ - *ftag = get_from(req)->tag_value; - return 0; -} - - -/*! * \brief Update the saved CSEQ information in dialog from SIP message * \param dlg updated dialog * \param req SIP request @@ -838,7 +880,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) return; } else { // lookup_dlg has incremented the ref count by 1 - if (pre_match_parse( req, &callid, &ftag, &ttag)<0) { + if (pre_match_parse( req, &callid, &ftag, &ttag, 1)<0) { unref_dlg(dlg, 1); return; } @@ -871,7 +913,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) } if (dlg==0) { - if (pre_match_parse( req, &callid, &ftag, &ttag)<0) + if (pre_match_parse( req, &callid, &ftag, &ttag, 1)<0) return; /* TODO - try to use the RR dir detection to speed up here the * search -bogdan */ diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 56c4b7b..af697d9 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -325,6 +325,30 @@ modparam("dialog", "dlg_match_mode", 1) </section> <section> + <title><varname>detect_spirals</varname> (integer)</title> + <para> + Whether spirals (i.e., messages routed through the proxy multiple times) + should be detected or not. + </para> + <para> + If set to 0, spirals will not be detected and result in the generation of a + new, possibly dangling dialog structure per occurring spiral. If set to 1, + spirals are detected and internally mapped to existing dialog structures. + </para> + <para> + Default value is 1. + </para> + <example> + <title>Set <varname>detect_spirals</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("dialog", "detect_spirals", 1) + ... + </programlisting> + </example> + </section> + + <section> <title><varname>db_url</varname> (string)</title> <para> If you want to store the information about the dialogs in a database diff --git a/modules_k/dialog/doc/dialog_devel.xml b/modules_k/dialog/doc/dialog_devel.xml index a32739f..4865dee 100644 --- a/modules_k/dialog/doc/dialog_devel.xml +++ b/modules_k/dialog/doc/dialog_devel.xml @@ -95,6 +95,11 @@ </para> </listitem> <listitem> + <para><emphasis>DLGCB_SPIRALED</emphasis> - called when the + dialog matches a spiraling request - it's a per dialog type. + </para> + </listitem> + <listitem> <para><emphasis>DLGCB_DESTROY</emphasis> </para> </listitem> [View Less]

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2010