sr-dev June 2011

sr-dev@lists.kamailio.org

32 participants
167 discussions

[tracker] Comment added: [selects] @v.branch and others are not exported
by sip-router 30 Jun '11

30 Jun '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#138 - [selects] @v.branch and others are not exported User who did this - Iñaki Baz Castillo (ibc) ---------- The request is correct (no parsing errors at all): DEBUG: <core> [parser/parse_via.c:1287]: Found param type 232,<branch> = <z9hG4bKaxdawfnv>; state=16 Then when running this xlog: xlog("L_INFO", "[$sel((a)v.branch)] $rm from $fu ($fU) to $ru ($sel((a)v.transport) $si : $sp)"); I get <null> for $sel((a)v.branch): DEBUG: <core> [select_core.c:378]: missing VIA[6] header DEBUG: <core> [parser/parse_to.c:174]: DEBUG: add_param: tag=wohrg DEBUG: <core> [parser/parse_to.c:803]: end of header reached, state=29 DEBUG: <core> [select.c:424]: Calling SELECT 0x7f5e99bd9890 INFO: <script>: [<null>] ACK from sip:test_ibc@aliax.net (test_ibc) to sip:kaka@aliax.net (UDP 192.168.1.16 : 15060) So, what does it mean "[select_core.c:378]: missing VIA[6] header" ? It's not missing at all. It's an INVITE from Twinkle, 100% correct: INVITE sip:kaka@aliax.net SIP/2.0 Via: SIP/2.0/UDP 192.168.1.16:15060;rport;branch=z9hG4bKfzqlmkkf Max-Forwards: 70 To: <sip:kaka@aliax.net> From: "OverSIP" <sip:test_ibc@aliax.net>;tag=hkrmz Call-ID: soilztpqcxyvhfr@ibc-laptop CSeq: 986 INVITE Contact: <sip:test_ibc@192.168.1.16:15060;transport=udp> Content-Type: application/sdp Allow: INVITE,ACK,BYE,CANCEL,OPTIONS,PRACK,REFER,NOTIFY,SUBSCRIBE,INFO,MESSAGE Supported: replaces,norefersub,100rel User-Agent: Twinkle/1.4.2 Content-Length: 309 [...] ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=138#comment232 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: ipops: add a comment about autogenerated files from ragel
by Henning Westerholt 30 Jun '11

30 Jun '11

Module: sip-router Branch: master Commit: f369faa6d09f30a48d11fa34cbdb581df6ea01e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f369faa… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jun 29 22:35:39 2011 +0200 ipops: add a comment about autogenerated files from ragel --- modules/ipops/ip_parser.c | 4 ++++ modules/ipops/ip_parser.h | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/ipops/ip_parser.c b/modules/ipops/ip_parser.c index 0695fa5..b9e0a1c 100644 --- a/modules/ipops/ip_parser.c +++ b/modules/ipops/ip_parser.c @@ -1,3 +1,7 @@ +/* + * Warning: This file is auto generated from a ragel syntax (ip_parser.rl), + * do not change it! + */ #line 1 "ip_parser.rl" #include "ip_parser.h" diff --git a/modules/ipops/ip_parser.h b/modules/ipops/ip_parser.h index 7b53cc0..23ca248 100644 --- a/modules/ipops/ip_parser.h +++ b/modules/ipops/ip_parser.h @@ -1,3 +1,8 @@ +/* + * Warning: This file is auto generated from a ragel syntax (ip_parser.rl), + * do not change it! + */ + #ifndef ip_parser_h #define ip_parser_h

2 3

What is tcp_write_buf ?
by Iñaki Baz Castillo 30 Jun '11

30 Jun '11

Hi, devel cookbooks says: tcp_wq_max Maximum bytes queued for write allowed globally. It has no effect if tcp_write_buf is not enabled. However tcp_write_buf is not defined (neither it exists as at valid core parameter in config file). -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 2

git:master: xlog(k): readme updated with log_facility param
by Elena-Ramona Modroiu 30 Jun '11

30 Jun '11

Module: sip-router Branch: master Commit: 2bc80f622d415d9745ba47909c6a47d340dad8b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bc80f6… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Thu Jun 30 11:17:32 2011 +0200 xlog(k): readme updated with log_facility param --- modules_k/xlog/README | 24 ++++++++++++++++++++---- modules_k/xlog/doc/xlog_admin.xml | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/modules_k/xlog/README b/modules_k/xlog/README index d1e0f92..bf433d8 100644 --- a/modules_k/xlog/README +++ b/modules_k/xlog/README @@ -33,6 +33,7 @@ Elena-Ramona Modroiu 4.2. force_color (integer) 4.3. long_format (integer) 4.4. prefix (str) + 4.5. log_facility (string) 5. Exported Functions @@ -47,8 +48,9 @@ Elena-Ramona Modroiu 1.2. Set force_color parameter 1.3. Set long_format parameter 1.4. Set prefix parameter - 1.5. xlog usage - 1.6. xdbg usage + 1.5. log_facility example + 1.6. xlog usage + 1.7. xdbg usage Chapter 1. Admin Guide @@ -67,6 +69,7 @@ Chapter 1. Admin Guide 4.2. force_color (integer) 4.3. long_format (integer) 4.4. prefix (str) + 4.5. log_facility (string) 5. Exported Functions @@ -122,6 +125,7 @@ Chapter 1. Admin Guide 4.2. force_color (integer) 4.3. long_format (integer) 4.4. prefix (str) + 4.5. log_facility (string) 4.1. buf_size (integer) @@ -168,6 +172,18 @@ modparam("xlog", "long_format", 1) modparam("xlog", "prefix", "-xlog: ") ... +4.5. log_facility (string) + + Syslog facility to be used when printing xlog messages. In this way you + can get the xlog messages in a separate syslog file than the debug + messages issued from source code. + + Default value is NULL (unset - use same facility as source code debug + messages). + + Example 1.5. log_facility example +modparam("xlog", "log_facility", "LOG_DAEMON") + 5. Exported Functions 5.1. xlog([level,] format) @@ -199,7 +215,7 @@ modparam("xlog", "prefix", "-xlog: ") This function can be used from ANY_ROUTE. - Example 1.5. xlog usage + Example 1.6. xlog usage ... xlog("L_ERR", "time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]))\n"); ... @@ -218,7 +234,7 @@ xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); This function can be used from ANY_ROUTE. - Example 1.6. xdbg usage + Example 1.7. xdbg usage ... xdbg("time $Cbx[$Tf]$Cxx method ($rm) r-uri ($ru)\n"); ... diff --git a/modules_k/xlog/doc/xlog_admin.xml b/modules_k/xlog/doc/xlog_admin.xml index 683d110..bcd1c46 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -170,6 +170,25 @@ modparam("xlog", "prefix", "-xlog: ") </programlisting> </example> </section> + <section> + <title><varname>log_facility</varname> (string)</title> + <para> + Syslog facility to be used when printing xlog messages. + In this way you can get the xlog messages in a separate syslog file + than the debug messages issued from source code. + </para> + <para> + Default value is NULL (unset - use same facility as source code debug + messages). + </para> + <example> + <title>log_facility example</title> + <programlisting format="linespecific"> +modparam("xlog", "log_facility", "LOG_DAEMON") +</programlisting> + </example> + </section> + </section> <section> <title>Exported Functions</title>

1 0

git:master: xlog(k): new module parameter log_facility
by Elena-Ramona Modroiu 30 Jun '11

30 Jun '11

Module: sip-router Branch: master Commit: ff10fef4b398b4bc2f206559af9e1ad2fb3b8342 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff10fef… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Thu Jun 30 11:04:22 2011 +0200 xlog(k): new module parameter log_facility - allow to specify syslog facility for messages printed by xlog module - xlog messages can be diverted now to special file via syslog conf --- modules_k/xlog/xlog.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index fc406ec..0412b25 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -49,6 +49,8 @@ char *_xlog_prefix = "<script>: "; static int buf_size=4096; static int force_color=0; static int long_format=0; +static int xlog_facility = DEFAULT_FACILITY; +static char *xlog_facility_name = NULL; /** module functions */ static int mod_init(void); @@ -110,6 +112,7 @@ static param_export_t params[]={ {"force_color", INT_PARAM, &force_color}, {"long_format", INT_PARAM, &long_format}, {"prefix", STR_PARAM, &_xlog_prefix}, + {"log_facility", STR_PARAM, &xlog_facility_name}, {0,0,0} }; @@ -135,6 +138,17 @@ struct module_exports exports= { */ static int mod_init(void) { + int lf; + if (xlog_facility_name!=NULL) { + lf = str2facility(xlog_facility_name); + if (lf != -1) { + xlog_facility = lf; + } else { + LM_ERR("invalid syslog facility %s\n", xlog_facility_name); + return -1; + } + } + _xlog_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char)); if(_xlog_buf==NULL) { @@ -156,15 +170,15 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, txt.s = _xlog_buf; if(line>0) if(long_format==1) - LOG_(DEFAULT_FACILITY, level, _xlog_prefix, + LOG_(xlog_facility, level, _xlog_prefix, "%s:%d:%.*s", (xm->a)?(((xm->a->cfile)?xm->a->cfile:"")):"", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_(DEFAULT_FACILITY, level, _xlog_prefix, + LOG_(xlog_facility, level, _xlog_prefix, "%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_(DEFAULT_FACILITY, level, _xlog_prefix, + LOG_(xlog_facility, level, _xlog_prefix, "%.*s", txt.len, txt.s); return 1; }

1 0

git:master: tm: fix one 'no real prototype' warning, fix the wrong call as well
by Henning Westerholt 29 Jun '11

29 Jun '11

Module: sip-router Branch: master Commit: cac710f407cac3fe039f234eae222e221c445b11 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cac710f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jun 29 22:29:10 2011 +0200 tm: fix one 'no real prototype' warning, fix the wrong call as well --- modules/tm/h_table.c | 2 +- modules/tm/h_table.h | 2 +- modules/tm/tm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index c82f0b9..991435f 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -80,7 +80,7 @@ struct s_table* tm_get_table(void) { return _tm_table; } -void reset_kr() { +void reset_kr(void) { kr=0; } diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 5025479..905e2dd 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -483,7 +483,7 @@ extern struct s_table* _tm_table; /* private internal stuff, don't touch #define no_new_branches(_t_) ((_t_)->flags&T_6xx) -void reset_kr(); +void reset_kr(void); void set_kr( enum kill_reason kr ); enum kill_reason get_kr(); diff --git a/modules/tm/tm.c b/modules/tm/tm.c index d9c5258..734f093 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -722,7 +722,7 @@ static int script_init( struct sip_msg *foo, unsigned int flags, void *bar) t_on_reply(0); t_on_branch(0); /* reset the kr status */ - reset_kr(0); + reset_kr(); /* set request mode so that multiple-mode actions know * how to behave */ set_route_type(REQUEST_ROUTE);

1 0

git:master: core: fix two more 'no real prototype' warnings, fix one wrong caller in timer mod
by Henning Westerholt 29 Jun '11

29 Jun '11

Module: sip-router Branch: master Commit: 23bd471b227696a3b71e25403ee36eae338d85f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23bd471… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jun 29 22:30:39 2011 +0200 core: fix two more 'no real prototype' warnings, fix one wrong caller in timer mod --- modules_s/timer/timer.c | 2 +- pt.h | 2 +- timer.c | 2 +- timer.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_s/timer/timer.c b/modules_s/timer/timer.c index 1d34001..b470a85 100644 --- a/modules_s/timer/timer.c +++ b/modules_s/timer/timer.c @@ -204,7 +204,7 @@ static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) { /* begin critical section */ if (a->disable_itself) { - timer_allow_del(a->link); + timer_allow_del(); timer_del(a->link); timer_reinit(a->link); a->disable_itself = 0; diff --git a/pt.h b/pt.h index 2d16aa1..d2af6ac 100644 --- a/pt.h +++ b/pt.h @@ -62,7 +62,7 @@ extern int process_no; extern struct tcp_child* tcp_children; -int init_pt(); +int init_pt(int proc_no); int get_max_procs(); int register_procs(int no); int get_max_open_fds(); diff --git a/timer.c b/timer.c index efba92d..2f23f0f 100644 --- a/timer.c +++ b/timer.c @@ -815,7 +815,7 @@ return ret; * context), all other calls will have no effect and will log a * bug message */ -void timer_allow_del() +void timer_allow_del(void) { if (IS_IN_TIMER() ){ UNSET_RUNNING(); diff --git a/timer.h b/timer.h index 969ce5d..4adcc8e 100644 --- a/timer.h +++ b/timer.h @@ -186,7 +186,7 @@ int timer_del_safe(struct timer_ln *tl); #define timer_del timer_del_safe #endif -void timer_allow_del(); +void timer_allow_del(void); /* old timer compatibility functions & structure */

1 0

git:master: core: fix another bunch of 'no real prototype' warnings, add doxygen docs
by Henning Westerholt 29 Jun '11

29 Jun '11

Module: sip-router Branch: master Commit: 03a4b6fc64dd2abda540bc16ff37904984725f62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03a4b6f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jun 29 22:12:28 2011 +0200 core: fix another bunch of 'no real prototype' warnings, add doxygen docs * fix another bunch of gcc 4.5 'no real prototype' warnings by making the MD5 functions typesafe (removing this PROTO_LIST stuff) * refactoring of function definitions to use a proper style, like everybody else * remove not needed defines for datatypes, delete the then empty header completely * remove the unneeded include of md5global.h from a few modules * fix callers of MD5 utility functions which already use a proper type * adapt format of RSA copyright notices to the common style as well * add doxygen documentations to all functions and defines * similar changes have been done in kamailio, but have been not ported to this repository yet --- lib/kcore/strcommon.c | 2 +- md5.c | 83 ++++++++++++++--------------------- md5.h | 42 ++++++++++++++--- md5global.h | 38 ---------------- md5utils.c | 99 +++++++++++++++-------------------------- md5utils.h | 19 +++++++- modules/auth/nonce.c | 11 ++--- modules/auth/rfc2617.c | 1 - modules/topoh/th_mask.c | 2 +- modules_k/cfgutils/cfgutils.c | 4 +- modules_s/uac/auth_alg.c | 1 - 11 files changed, 128 insertions(+), 174 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=03a…

1 0

[selecs] @v.branch and others are not exported
by Iñaki Baz Castillo 29 Jun '11

29 Jun '11

Hi, in devel version (kamailio flavour) I try to print some selects to the log (using xlog): xlog("L_INFO", "request transport = $sel((a)v.transport), branch = $sel((a)v.branch)\n"); @v.transport is indeed printed (tcp/udp...) but @v.branch is not, neither other selects as @v, @v.host and so. Do I miss something? -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 3

[tracker] Task opened: [selects] @v.branch and others are not exported
by sip-router 29 Jun '11

29 Jun '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Iñaki Baz Castillo (ibc) Attached to Project - sip-router Summary - [selects] @v.branch and others are not exported Task Type - Bug Report Category - select framework Status - Assigned Assigned To - Jan Janak Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - In devel version (kamailio flavour) I try to print some selects to the log (using xlog): xlog("L_INFO", "request transport = $sel((a)v.transport), branch = $sel((a)v.branch)\n"); @v.transport is indeed printed (tcp/udp...) but @v.branch is not, neither other selects as @v, @v.host and so. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=138 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2011