sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

git:master: htable: replace PV_NAME_PVAR with PV_NAME_OTHER

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 33e4b20ffeb6a26f49080f701dc03e35498ac221 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33e4b20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 9 12:02:22 2009 +0300 htable: replace PV_NAME_PVAR with PV_NAME_OTHER - forgotten to be updated when PV_NAME_OTHER was introduced to get rid of PVAR type hack - name of $sht is a custom structure, not a PV - reported by Christian Koch --- modules_k/htable/ht_var.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/ht_var.c b/modules_k/htable/ht_var.c index 3f7ecba..4cc0808 100644 --- a/modules_k/htable/ht_var.c +++ b/modules_k/htable/ht_var.c @@ -163,7 +163,7 @@ int pv_parse_ht_name(pv_spec_p sp, str *in) } hpv->ht = ht_get_table(&hpv->htname); sp->pvp.pvn.u.dname = (void*)hpv; - sp->pvp.pvn.type = PV_NAME_PVAR; + sp->pvp.pvn.type = PV_NAME_OTHER; return 0; error:

15 years, 5 months

git:master: core: fixed pv_get_spec_name()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a93f14f36e007741ba2c531ae4d15170a449deca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a93f14f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 9 11:59:53 2009 +0300 core: fixed pv_get_spec_name() - check for PV_NAME_PVAR was wrongly used with PV_NAME_INTSTR - reported and credits to Christian Koch --- pvapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pvapi.c b/pvapi.c index 87de64a..72fb48d 100644 --- a/pvapi.c +++ b/pvapi.c @@ -800,7 +800,7 @@ int pv_get_spec_name(struct sip_msg* msg, pv_param_p ip, pv_value_t *name) name->flags = PV_VAL_INT|PV_TYPE_INT; } return 0; - } else if(ip->pvn.type==PV_NAME_INTSTR) { + } else if(ip->pvn.type==PV_NAME_PVAR) { /* pvar */ if(pv_get_spec_value(msg, (pv_spec_p)(ip->pvn.u.dname), name)!=0) {

15 years, 5 months

SF.net SVN: openser:[5870] branches/1.5/modules/htable/ht_var.c

by Daniel-Constantin Mierla

Revision: 5870 http://openser.svn.sourceforge.net/openser/?rev=5870&view=rev Author: miconda Date: 2009-06-09 08:56:58 +0000 (Tue, 09 Jun 2009) Log Message: ----------- - replace PV_NAME_PVAR with PV_NAME_OTHER - forgotten to be updated when PV_NAME_OTHER was introduced to get rid of PVAR type hack - name of $sht is a custom structure, not a PV - reported by Christian Koch Modified Paths: -------------- branches/1.5/modules/htable/ht_var.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 5 months

SF.net SVN: openser:[5869] branches/1.5/pvapi.c

by Daniel-Constantin Mierla

Revision: 5869 http://openser.svn.sourceforge.net/openser/?rev=5869&view=rev Author: miconda Date: 2009-06-09 08:43:58 +0000 (Tue, 09 Jun 2009) Log Message: ----------- - fixed pv_get_spec_name() - check for PV_NAME_PVAR was wrongly used with PV_NAME_INTSTR - reported and credit to Christian Koch Modified Paths: -------------- branches/1.5/pvapi.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 5 months

git:master: xlog(k): readme updated

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 05eb09c1d7bdada655bd29137e2cfe8d1563e689 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=05eb09c… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue Jun 9 10:20:51 2009 +0300 xlog(k): readme updated --- modules_k/xlog/README | 157 +++++++++++++++++++++++-------------- modules_k/xlog/doc/xlog_admin.xml | 19 +++++ 2 files changed, 116 insertions(+), 60 deletions(-) diff --git a/modules_k/xlog/README b/modules_k/xlog/README index 71aa0f5..f1c7966 100644 --- a/modules_k/xlog/README +++ b/modules_k/xlog/README @@ -17,82 +17,109 @@ Elena-Ramona Modroiu Copyright � 2008 Elena-Ramona Modroiu Revision History - Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Mi, 06 Aug 2008) $ - __________________________________________________________ + Revision $Revision$ $Date$ + __________________________________________________________________ Table of Contents 1. Admin Guide - 1.1. Overview - 1.2. Implemented Specifiers - 1.3. Dependencies + 1. Overview + 2. Implemented Specifiers + 3. Dependencies - 1.3.1. Kamailio Modules - 1.3.2. External Libraries or Applications + 3.1. Kamailio Modules + 3.2. External Libraries or Applications - 1.4. Exported Parameters + 4. Exported Parameters - 1.4.1. buf_size (integer) - 1.4.2. force_color (integer) + 4.1. buf_size (integer) + 4.2. force_color (integer) + 4.3. prefix (str) - 1.5. Exported Functions + 5. Exported Functions - 1.5.1. xlog([level,] format) - 1.5.2. xdbg(format) + 5.1. xlog([level,] format) + 5.2. xdbg(format) List of Examples 1.1. Set buf_size parameter 1.2. Set force_color parameter - 1.3. xlog usage - 1.4. xdbg usage + 1.3. Set prefix parameter + 1.4. xlog usage + 1.5. xdbg usage Chapter 1. Admin Guide -1.1. Overview + Table of Contents + + 1. Overview + 2. Implemented Specifiers + 3. Dependencies + + 3.1. Kamailio Modules + 3.2. External Libraries or Applications + + 4. Exported Parameters + + 4.1. buf_size (integer) + 4.2. force_color (integer) + 4.3. prefix (str) - This module provides the possibility to print user formatted - log or debug messages from Kamailio scripts, similar to printf - function. A C-style printf specifier is replaced with a part of - the SIP request or other variables from system. Section 1.2, - "Implemented Specifiers" shows what can be printed out. + 5. Exported Functions -1.2. Implemented Specifiers + 5.1. xlog([level,] format) + 5.2. xdbg(format) - In the xlog function, you use pseudo-variables, that are a part - of Kamailio core and are used by other modules as well (e.g., - avpops in the function avp_printf()) +1. Overview - The most important changes from earlier versions of Kamailio - are: + This module provides the possibility to print user formatted log or + debug messages from Kamailio scripts, similar to printf function. A + C-style printf specifier is replaced with a part of the SIP request or + other variables from system. Section 2, "Implemented Specifiers" shows + what can be printed out. + +2. Implemented Specifiers + + In the xlog function, you use pseudo-variables, that are a part of + Kamailio core and are used by other modules as well (e.g., avpops in + the function avp_printf()) + + The most important changes from earlier versions of Kamailio are: * - '%' has been replaced by '$' - * - to print a header, use now $hdr(header_name[index]) - instead of %{header_name[index]} - * - to print an AVP, use now $avp([si]:avp_id[index]) instead - of %{[si]:avp_id[index]} or $avp([$avp_alias[index]) - instead of %{[$avp_alias[index]} + * - to print a header, use now $hdr(header_name[index]) instead of + %{header_name[index]} + * - to print an AVP, use now $avp([si]:avp_id[index]) instead of + %{[si]:avp_id[index]} or $avp([$avp_alias[index]) instead of + %{[$avp_alias[index]} + + The full list of available pseudo-variables in Kamailio is available + at: http://kamailio.org/dokuwiki/ - The full list of available pseudo-variables in Kamailio is - available at: http://kamailio.org/dokuwiki/ +3. Dependencies -1.3. Dependencies + 3.1. Kamailio Modules + 3.2. External Libraries or Applications -1.3.1. Kamailio Modules +3.1. Kamailio Modules The following modules must be loaded before this module: * No dependencies on other Kamailio modules. -1.3.2. External Libraries or Applications +3.2. External Libraries or Applications - The following libraries or applications must be installed - before running Kamailio with this module loaded: + The following libraries or applications must be installed before + running Kamailio with this module loaded: * None. -1.4. Exported Parameters +4. Exported Parameters -1.4.1. buf_size (integer) + 4.1. buf_size (integer) + 4.2. force_color (integer) + 4.3. prefix (str) + +4.1. buf_size (integer) Maximum size of the log message. @@ -103,7 +130,7 @@ Chapter 1. Admin Guide modparam("xlog", "buf_size", 8192) ... -1.4.2. force_color (integer) +4.2. force_color (integer) When set to 1, forces color printing even if log_stderror=0. @@ -114,15 +141,28 @@ modparam("xlog", "buf_size", 8192) modparam("xlog", "force_color", 0) ... -1.5. Exported Functions +4.3. prefix (str) + + Prefix to be printed before the log message. + + Default value is "<script>: ". + + Example 1.3. Set prefix parameter +... +modparam("xlog", "prefix", "-xlog: ") +... + +5. Exported Functions + + 5.1. xlog([level,] format) + 5.2. xdbg(format) -1.5.1. xlog([level,] format) +5.1. xlog([level,] format) Print a formated message using LOG function. Meaning of the parameters are as follows: - * level - The level that will be used in LOG function. It can - be: + * level - The level that will be used in LOG function. It can be: + L_ALERT - log level -3 + L_CRIT - log level -2 + L_ERR - log level -1 @@ -130,23 +170,20 @@ modparam("xlog", "force_color", 0) + L_NOTICE - log level 2 + L_INFO - log level 3 + L_DBG - log level 4 - + $pv - any valid pseudo-variable, that has an integer - value. See above options for valid log levels. - If it is not a pseudo-variable, then what really matters is - the third letter of the value. If the log level is higher - than the "debug" global parameter, the message is not - printed to syslog. - If this parameter is missing, the implicit log level is - 'L_ERR'. + + $pv - any valid pseudo-variable, that has an integer value. + See above options for valid log levels. + If it is not a pseudo-variable, then what really matters is the + third letter of the value. If the log level is higher than the + "debug" global parameter, the message is not printed to syslog. + If this parameter is missing, the implicit log level is 'L_ERR'. * format - The formatted string to be printed. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.3. xlog usage + Example 1.4. xlog usage ... -xlog("L_ERR", "time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]) -)\n"); +xlog("L_ERR", "time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]))\n"); ... xlog("time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]))\n"); ... @@ -154,7 +191,7 @@ $var(loglevel) = 2; xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); ... -1.5.2. xdbg(format) +5.2. xdbg(format) Print a formatted message using DBG function. @@ -164,7 +201,7 @@ xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.4. xdbg usage + Example 1.5. 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 570abc6..0db2da8 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -131,6 +131,25 @@ modparam("xlog", "force_color", 0) </programlisting> </example> </section> + <section> + <title><varname>prefix</varname> (str)</title> + <para> + Prefix to be printed before the log message. + </para> + <para> + <emphasis> + Default value is "<script>: ". + </emphasis> + </para> + <example> + <title>Set <varname>prefix</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xlog", "prefix", "-xlog: ") +... +</programlisting> + </example> + </section> </section> <section> <title>Exported Functions</title>

15 years, 5 months

git:master: xlog(k): replaced LM_GEN1 with LOG_

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 0911088466011cde4ba9104c301a744b67bf4d9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0911088… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue Jun 9 10:10:15 2009 +0300 xlog(k): replaced LM_GEN1 with LOG_ - do not print file name and line - printed prefix defaulted to "<script>: " - value of prefix can be set by module parameter - reported and credits to Juha Heinanen and Andrei Pelinescu-Onciul --- modules_k/xlog/xlog.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index e3a38bd..07bb378 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -42,7 +42,8 @@ MODULE_VERSION -char *log_buf = NULL; +char *_xlog_buf = NULL; +char *_xlog_prefix = "<script>: "; /** parameters */ int buf_size=4096; @@ -97,6 +98,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"buf_size", INT_PARAM, &buf_size}, {"force_color", INT_PARAM, &force_color}, + {"prefix", STR_PARAM, &_xlog_prefix}, {0,0,0} }; @@ -122,8 +124,8 @@ struct module_exports exports= { */ static int mod_init(void) { - log_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char)); - if(log_buf==NULL) + _xlog_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char)); + if(_xlog_buf==NULL) { LM_ERR("no pkg memory left\n"); return -1; @@ -142,11 +144,12 @@ static int xlog_1(struct sip_msg* msg, char* frm, char* str2) log_len = buf_size; - if(xl_print_log(msg, (pv_elem_t*)frm, log_buf, &log_len)<0) + if(xl_print_log(msg, (pv_elem_t*)frm, _xlog_buf, &log_len)<0) return -1; - /* log_buf[log_len] = '\0'; */ - LM_GEN1(L_ERR, "%.*s", log_len, log_buf); + /* _xlog_buf[log_len] = '\0'; */ + LOG_(DEFAULT_FACILITY, L_ERR, _xlog_prefix, + "%.*s", log_len, _xlog_buf); return 1; } @@ -179,11 +182,12 @@ static int xlog_2(struct sip_msg* msg, char* lev, char* frm) log_len = buf_size; - if(xl_print_log(msg, (pv_elem_t*)frm, log_buf, &log_len)<0) + if(xl_print_log(msg, (pv_elem_t*)frm, _xlog_buf, &log_len)<0) return -1; - /* log_buf[log_len] = '\0'; */ - LM_GEN1((int)level, "%.*s", log_len, log_buf); + /* _xlog_buf[log_len] = '\0'; */ + LOG_(DEFAULT_FACILITY, (int)level, _xlog_prefix, + "%.*s", log_len, _xlog_buf); return 1; } @@ -199,11 +203,12 @@ static int xdbg(struct sip_msg* msg, char* frm, char* str2) log_len = buf_size; - if(xl_print_log(msg, (pv_elem_t*)frm, log_buf, &log_len)<0) + if(xl_print_log(msg, (pv_elem_t*)frm, _xlog_buf, &log_len)<0) return -1; - /* log_buf[log_len] = '\0'; */ - LM_GEN1(L_DBG, "%.*s", log_len, log_buf); + /* _xlog_buf[log_len] = '\0'; */ + LOG_(DEFAULT_FACILITY, L_DBG, _xlog_prefix, + "%.*s", log_len, _xlog_buf); return 1; } @@ -213,8 +218,8 @@ static int xdbg(struct sip_msg* msg, char* frm, char* str2) */ void destroy(void) { - if(log_buf) - pkg_free(log_buf); + if(_xlog_buf) + pkg_free(_xlog_buf); } static int xlog_fixup(void** param, int param_no)

15 years, 5 months

requests timed out too fast

by jh＠tutpro.com

after the regex fixup bug was fixed, i got a bit further with my sip-router tests. by the way, am i the only one testing sip-router, because no-one else has complained about anything? this time i was hit by problem, where sip-router sends 408 request timeout too fast. the reason turned out to be difference in units of sr and kamailio tm module timer values. in sr, timer values are given in ms, whereas in k they are seconds. it would be easy to make the change if it would only involve tm module params in config file, but in my case, i have these timer values all over in database, where they get assigned to pseudo variables used by tm module. so migration from kamailio tm to sr tm will not be easy. in order to help here, could it be possible to have a new tm module param that tells which units (ms or seconds) timer values are given to tm module? -- juha

15 years, 5 months

CVS:commitlog: sip_router tcp_init.h

by Andrei Pelinescu-Onciul

andrei 2009/06/08 10:50:40 CEST SER CVS Repository Modified files: . tcp_init.h Log: tcp: remove unused var. decls Removed tcp_new_conn_alias_flags and tcp_alias_flags declaration, since they have been replaced by runtime cfg. equivalents (tcp alias_flags and new_conn_alias_flags). Reported-by: Libor Chocholaty <libor(a)iptel.org> Revision Changes Path 1.10 +1 -5 sip_router/tcp_init.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/tcp_init.h.diff?r1…

15 years, 5 months

CVS:commitlog: sip_router dns_cache.c

by Andrei Pelinescu-Onciul

andrei 2009/06/08 10:50:08 CEST SER CVS Repository Modified files: . dns_cache.c Log: dns: fix missing out-of-memory check - fix missing out-of-memory check when creating a negative cache entry - minor optimizations (likely) Revision Changes Path 1.30 +11 -8 sip_router/dns_cache.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/dns_cache.c.diff?r…

15 years, 5 months

git:master: * Slit db query result check to query check and result check in order to

by Juha Heinanen

Module: sip-router Branch: master Commit: 478a38bbf71574253811e35ff340bc89018d0235 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=478a38b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Jun 6 18:20:15 2009 +0300 * Slit db query result check to query check and result check in order to get error message if query fails. * Added check that db handle exists. --- modules_k/msilo/msilo.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 23f9cb7..d17e0d7 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -996,22 +996,25 @@ static int m_dump(struct sip_msg* msg, char* owner, char* str2) db_vals[2].type = DB1_INT; db_vals[2].nul = 0; db_vals[2].val.int_val = 0; - - if (msilo_dbf.use_table(db_con, &ms_db_table) < 0) - { - LM_ERR("failed to use_table\n"); - goto error; + + if (db_con == NULL) { + LM_ERR("database connection has not been established\n"); + goto error; } - if((msilo_dbf.query(db_con,db_keys,db_ops,db_vals,db_cols,db_no_keys, - db_no_cols, ob_key, &db_res)!=0) || (RES_ROW_N(db_res) <= 0)) - { - LM_DBG("no stored message for <%.*s>!\n", pto->uri.len, pto->uri.s); - goto done; + if (msilo_dbf.query(db_con,db_keys,db_ops,db_vals,db_cols,db_no_keys, + db_no_cols, ob_key, &db_res) < 0) { + LM_ERR("failed to query database\n"); + goto error; + } + + if (RES_ROW_N(db_res) <= 0) { + LM_DBG("no stored message for <%.*s>!\n", pto->uri.len, pto->uri.s); + goto done; } LM_DBG("dumping [%d] messages for <%.*s>!!!\n", - RES_ROW_N(db_res), pto->uri.len, pto->uri.s); + RES_ROW_N(db_res), pto->uri.len, pto->uri.s); for(i = 0; i < RES_ROW_N(db_res); i++) { @@ -1084,7 +1087,7 @@ done: * Free the result because we don't need it * anymore */ - if (db_res!=NULL && msilo_dbf.free_result(db_con, db_res) < 0) + if ((db_res !=NULL) && msilo_dbf.free_result(db_con, db_res) < 0) LM_ERR("failed to free result of query\n"); return 1; @@ -1271,8 +1274,13 @@ void m_send_ontimer(unsigned int ticks, void *param) return; } - if((msilo_dbf.query(db_con,db_keys,db_ops,db_vals,db_cols,db_no_keys, - db_no_cols, NULL,&db_res)!=0) || (RES_ROW_N(db_res) <= 0)) + if (msilo_dbf.query(db_con,db_keys,db_ops,db_vals,db_cols,db_no_keys, + db_no_cols, NULL,&db_res) < 0) { + LM_ERR("failed to query database\n"); + goto done; + } + + if (RES_ROW_N(db_res) <= 0) { LM_DBG("no message for <%.*s>!\n", 24, ctime((const time_t*)&ttime)); goto done; @@ -1350,7 +1358,7 @@ done: /** * Free the result because we don't need it anymore */ - if (db_res!=NULL && msilo_dbf.free_result(db_con, db_res) < 0) + if ((db_res != NULL) && msilo_dbf.free_result(db_con, db_res) < 0) LM_DBG("failed to free result of query\n"); return;

15 years, 5 months

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009