sr-dev September 2012

sr-dev@lists.kamailio.org

32 participants
174 discussions

Cassandra module add CQL query support
by Boudewyn Ligthart 04 Sep '12

04 Sep '12

Hi, Please review the following patch for adding CQL query support to the Cassandra DB module. The patch allows CQL queries to be passed by the script and are returned to the script through the already existing means (AVPOPS, SQLOPS). This patch tested this through means of AVPOPS module and this is working. Thanks, Boudewyn Ligthart (Bou)

2 5

git:master: modules/db_cassandra: Added raw query support
by Anca Vamanu 04 Sep '12

04 Sep '12

Module: sip-router Branch: master Commit: 18c5f3fec6b5e4d2e8ad86b13c5b4e62c6c5513c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18c5f3f… Author: Boudewyn Ligthart <bligthart(a)btlnet.co.uk> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Sep 4 16:16:38 2012 +0300 modules/db_cassandra: Added raw query support The raw queries can be performed through avpops module and have to have the CQL syntax. --- modules/db_cassandra/README | 18 ++ modules/db_cassandra/db_cassandra.c | 1 + modules/db_cassandra/dbcassa_base.cpp | 199 +++++++++++++++++++++++ modules/db_cassandra/dbcassa_base.h | 2 + modules/db_cassandra/doc/db_cassandra.xml | 5 + modules/db_cassandra/doc/db_cassandra_admin.xml | 20 +++ 6 files changed, 245 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=18c…

1 0

git:3.1: b/f: In case of IPv6 Option in the RTP-Command, the pointers and the length need to be updated.
by admin＠sip-router.org 03 Sep '12

03 Sep '12

Module: sip-router Branch: 3.1 Commit: b63a4b3e121eac94a9f8a769c05622293a7932a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b63a4b3… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 3 21:31:58 2012 +0200 b/f: In case of IPv6 Option in the RTP-Command, the pointers and the length need to be updated. --- modules_k/rtpproxy/rtpproxy.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 494cda0..406397c 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -2091,6 +2091,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) LM_ERR("out of pkg memory\n"); FORCE_RTP_PROXY_RET (-1); } + /* We need to update the pointers and the length here, it has changed. */ + v[1].iov_base = opts.s.s; + v[1].iov_len = opts.oidx; } STR2IOVEC(newip, v[7]); STR2IOVEC(oldport, v[9]);

1 0

git:3.2: b/f: In case of IPv6 Option in the RTP-Command, the pointers and the length need to be updated.
by admin＠sip-router.org 03 Sep '12

03 Sep '12

Module: sip-router Branch: 3.2 Commit: 4f2f1e2d4ff0a9cecf8f8a05ee8f5ef7e597d46c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f2f1e2… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 3 21:31:58 2012 +0200 b/f: In case of IPv6 Option in the RTP-Command, the pointers and the length need to be updated. --- modules/rtpproxy/rtpproxy.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index ba66e54..d48cd78 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2150,6 +2150,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc LM_ERR("out of pkg memory\n"); FORCE_RTP_PROXY_RET (-1); } + /* We need to update the pointers and the length here, it has changed. */ + v[1].iov_base = opts.s.s; + v[1].iov_len = opts.oidx; } STR2IOVEC(newip, v[7]); STR2IOVEC(oldport, v[9]);

1 0

git:3.3: b/f: In case of IPv6 Option in the RTP-Command, the pointers and the length need to be updated.
by admin＠sip-router.org 03 Sep '12

03 Sep '12

Module: sip-router Branch: 3.3 Commit: f5997ba82e066d667d8fdf48a0eb8f284abe70be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5997ba… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 3 21:31:58 2012 +0200 b/f: In case of IPv6 Option in the RTP-Command, the pointers and the length need to be updated. --- modules/rtpproxy/rtpproxy.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index eee5ce0..0453ef9 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2203,6 +2203,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc LM_ERR("out of pkg memory\n"); FORCE_RTP_PROXY_RET (-1); } + /* We need to update the pointers and the length here, it has changed. */ + v[1].iov_base = opts.s.s; + v[1].iov_len = opts.oidx; } STR2IOVEC(newip, v[9]); STR2IOVEC(oldport, v[11]);

1 0

git:master: b/f: In case of IPv6 Option in the RTP-Command, the pointers and the length need to be updated.
by admin＠sip-router.org 03 Sep '12

03 Sep '12

Module: sip-router Branch: master Commit: 15f5c9f2f7323c5192a7eb550cc7e7c53b20782a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15f5c9f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 3 21:31:58 2012 +0200 b/f: In case of IPv6 Option in the RTP-Command, the pointers and the length need to be updated. --- modules/rtpproxy/rtpproxy.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 6cecc0f..9a0fd14 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2257,6 +2257,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc LM_ERR("out of pkg memory\n"); FORCE_RTP_PROXY_RET (-1); } + /* We need to update the pointers and the length here, it has changed. */ + v[1].iov_base = opts.s.s; + v[1].iov_len = opts.oidx; } STR2IOVEC(newip, v[9]); STR2IOVEC(oldport, v[11]);

1 0

git:master: kamdbctl: add some explanation to the variables section and fix path
by Henning Westerholt 03 Sep '12

03 Sep '12

Module: sip-router Branch: master Commit: a6a37ad2ae7dd99deae3ec9d83ab38ab54e2f2af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6a37ad… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Mon Sep 3 13:01:05 2012 +0200 kamdbctl: add some explanation to the variables section and fix path --- utils/kamctl/kamdbctl.base | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 59bc2e7..b1cf561 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -44,7 +44,8 @@ PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap # SQL definitions # If you change this definitions here, then you must change them -# in db/schema/entities.xml too. +# in ../../lib/srdb1/schema/entities.xml too. They are used in this +# script and needed to be the same as in the database definitions. # FIXME FOREVER=${FOREVER:-2020-05-28 21:32:15}

1 0

Celebrating 11 Years
by Daniel-Constantin Mierla 03 Sep '12

03 Sep '12

Hello, eleven years ago, the first piece of code of the project was committed. Last year we organized a public event, for the 10 years celebration, presentations and more details about it at: * http://sip-router.org/10-years-ser/ For the 11th year, I made a news with the summary of the past year - definitively it was lot of work, adding many new features: * http://www.kamailio.org/w/2012/09/kamailio-at-11-years/ Looking forward to the next year celebration, surely it will list another great set of new features! Many thanks to everyone helping the project, from advocating to development! Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, Nov 5-8, 2012 - http://asipto.com/u/kat

1 0

git:master: xlog: new module parameters log_colors
by Elena-Ramona Modroiu 03 Sep '12

03 Sep '12

Module: sip-router Branch: master Commit: a5a58239efb00f25cd51753c984ee4469fd97754 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5a5823… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Sep 3 08:53:47 2012 +0200 xlog: new module parameters log_colors - update the colorscheme for log levels --- modules_k/xlog/README | 44 ++++++++++++++----- modules_k/xlog/doc/xlog_admin.xml | 23 ++++++++++ modules_k/xlog/xlog.c | 83 +++++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 12 deletions(-) diff --git a/modules_k/xlog/README b/modules_k/xlog/README index cafb535..00b28d7 100644 --- a/modules_k/xlog/README +++ b/modules_k/xlog/README @@ -11,9 +11,9 @@ Elena-Ramona Modroiu <ramona(a)rosdev.ro> - Copyright � 2003 FhG FOKUS + Copyright © 2003 FhG FOKUS - Copyright � 2008-2010 Elena-Ramona Modroiu + Copyright © 2008-2010 Elena-Ramona Modroiu __________________________________________________________________ Table of Contents @@ -34,6 +34,7 @@ Elena-Ramona Modroiu 4.3. long_format (integer) 4.4. prefix (str) 4.5. log_facility (string) + 4.6. log_colors (string) 5. Functions @@ -49,8 +50,9 @@ Elena-Ramona Modroiu 1.3. Set long_format parameter 1.4. Set prefix parameter 1.5. log_facility example - 1.6. xlog usage - 1.7. xdbg usage + 1.6. log_colors example + 1.7. xlog usage + 1.8. xdbg usage Chapter 1. Admin Guide @@ -70,6 +72,7 @@ Chapter 1. Admin Guide 4.3. long_format (integer) 4.4. prefix (str) 4.5. log_facility (string) + 4.6. log_colors (string) 5. Functions @@ -83,7 +86,7 @@ Chapter 1. Admin Guide This module provides the possibility to print user formatted log or debug messages from Kamailio scripts, similar to the 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 + other variables from system. Section 2, “Implemented Specifiers” shows what can be printed out. 2. Implemented Specifiers @@ -126,6 +129,7 @@ Chapter 1. Admin Guide 4.3. long_format (integer) 4.4. prefix (str) 4.5. log_facility (string) + 4.6. log_colors (string) 4.1. buf_size (integer) @@ -184,6 +188,22 @@ modparam("xlog", "prefix", "-xlog: ") Example 1.5. log_facility example modparam("xlog", "log_facility", "LOG_DAEMON") +4.6. log_colors (string) + + Update terminal colors used by core for log levels (when log_stderr=1 + and log_color=1). The value has to be 'logname=colors', where colors is + two characters specifying foreground and background in the same format + as $C(xy) variable. + + The parameter can be set many times, its value can also be a + ';'-separated list of color specs. + + Default value is NULL. + + Example 1.6. log_colors example +modparam("xlog", "log_colors", "L_ERR=cr") +modparam("xlog", "log_colors", "L_ERR=cr;L_WARN=px") + 5. Functions 5.1. xlog([ [facility,] level,] format) @@ -191,7 +211,7 @@ modparam("xlog", "log_facility", "LOG_DAEMON") 5.3. xlogl([ [facility,] level,] format) 5.4. xdbgl(format) -5.1. xlog([ [facility,] level,] format) +5.1. xlog([ [facility,] level,] format) Print a formated message using LOG function. @@ -214,13 +234,13 @@ modparam("xlog", "log_facility", "LOG_DAEMON") 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. + “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 ANY_ROUTE. - Example 1.6. xlog usage + Example 1.7. xlog usage ... xlog("L_ERR", "time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]))\n"); ... @@ -233,7 +253,7 @@ xlog("LOG_LOCAL3", "L_ERR", "this message will be sent to syslog facility LOG_LO CAL3\n"); ... -5.2. xdbg(format) +5.2. xdbg(format) Print a formatted message using DBG function. @@ -242,17 +262,17 @@ CAL3\n"); This function can be used from ANY_ROUTE. - Example 1.7. xdbg usage + Example 1.8. xdbg usage ... xdbg("time $Cbx[$Tf]$Cxx method ($rm) r-uri ($ru)\n"); ... -5.3. xlogl([ [facility,] level,] format) +5.3. xlogl([ [facility,] level,] format) Similar to xlog(), in addition is printing cfg line number at the beginning of message. -5.4. xdbgl(format) +5.4. xdbgl(format) Similar to xdbg(), in addition is printing cfg line number at the beginning of message. diff --git a/modules_k/xlog/doc/xlog_admin.xml b/modules_k/xlog/doc/xlog_admin.xml index e52a4e1..1eb4d91 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -188,6 +188,29 @@ modparam("xlog", "log_facility", "LOG_DAEMON") </programlisting> </example> </section> + <section> + <title><varname>log_colors</varname> (string)</title> + <para> + Update terminal colors used by core for log levels (when log_stderr=1 + and log_color=1). The value has to be 'logname=colors', where colors + is two characters specifying foreground and background in the same + format as $C(xy) variable. + </para> + <para> + The parameter can be set many times, its value can also be a + ';'-separated list of color specs. + </para> + <para> + Default value is NULL. + </para> + <example> + <title>log_colors example</title> + <programlisting format="linespecific"> +modparam("xlog", "log_colors", "L_ERR=cr") +modparam("xlog", "log_colors", "L_ERR=cr;L_WARN=px") +</programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 1d6091b..2ebd4e9 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -34,6 +34,7 @@ #include "../../dprint.h" #include "../../error.h" #include "../../mem/mem.h" +#include "../../parser/parse_param.h" #include "xl_lib.h" @@ -75,6 +76,8 @@ static int xdbgl_fixup(void** param, int param_no); static void destroy(void); +static int xlog_log_colors_param(modparam_t type, void *val); + int pv_parse_color_name(pv_spec_p sp, str *in); static int pv_get_color(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); @@ -120,6 +123,7 @@ static param_export_t params[]={ {"long_format", INT_PARAM, &long_format}, {"prefix", STR_PARAM, &_xlog_prefix}, {"log_facility", STR_PARAM, &xlog_facility_name}, + {"log_colors", STR_PARAM|USE_FUNC_PARAM, (void*)xlog_log_colors_param}, {0,0,0} }; @@ -713,3 +717,82 @@ error: return -1; } +/** + * + */ +static int xlog_log_colors_param(modparam_t type, void *val) +{ + param_t* params_list = NULL; + param_hooks_t phooks; + param_t *pit=NULL; + str s; + int level; + + if(val==NULL) + goto error; + + s.s = (char*)val; + s.len = strlen(s.s); + + if(s.len<=0) + goto error; + + if(s.s[s.len-1]==';') + s.len--; + if (parse_params(&s, CLASS_ANY, &phooks, &params_list)<0) + goto error; + + for (pit = params_list; pit; pit=pit->next) + { + if (pit->name.len==7 + && strncasecmp(pit->name.s, "l_alert", 7)==0) { + level = L_ALERT; + } else if (pit->name.len==5 + && strncasecmp(pit->name.s, "l_bug", 5)==0) { + level = L_BUG; + } else if (pit->name.len==7 + && strncasecmp(pit->name.s, "l_crit2", 7)==0) { + level = L_CRIT2; + } else if (pit->name.len==6 + && strncasecmp(pit->name.s, "l_crit", 6)==0) { + level = L_CRIT; + } else if (pit->name.len==5 + && strncasecmp(pit->name.s, "l_err", 5)==0) { + level = L_ERR; + } else if (pit->name.len==6 + && strncasecmp(pit->name.s, "l_warn", 6)==0) { + level = L_WARN; + } else if (pit->name.len==8 + && strncasecmp(pit->name.s, "l_notice", 8)==0) { + level = L_NOTICE; + } else if (pit->name.len==6 + && strncasecmp(pit->name.s, "l_info", 6)==0) { + level = L_INFO; + } else if (pit->name.len==5 + && strncasecmp(pit->name.s, "l_dbg", 5)==0) { + level = L_DBG; + } else { + LM_ERR("invalid level name %.*s\n", + pit->name.len, pit->name.s); + goto error; + } + + if(pit->body.len!=2) { + LM_ERR("invalid color spec for level %.*s (%.*s)\n", + pit->name.len, pit->name.s, + pit->body.len, pit->body.s); + goto error; + } + dprint_color_update(level, pit->body.s[0], pit->body.s[1]); + } + + if(params_list!=NULL) + free_params(params_list); + return 0; + +error: + if(params_list!=NULL) + free_params(params_list); + return -1; + +}

1 0

git:master: core: added function to update log level color scheme
by Elena-Ramona Modroiu 03 Sep '12

03 Sep '12

Module: sip-router Branch: master Commit: 1c1bdda16c7643b882a437583368d97e33c21e56 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c1bdda… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Sep 3 08:52:26 2012 +0200 core: added function to update log level color scheme --- dprint.c | 8 ++++++++ dprint.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dprint.c b/dprint.c index 90dd110..12259d4 100644 --- a/dprint.c +++ b/dprint.c @@ -343,3 +343,11 @@ void dprint_color_reset(void) dprint_term_color('x', 'x', &obuf); fprintf(stderr, "%.*s", obuf.len, obuf.s); } + +void dprint_color_update(int level, char f, char b) +{ + if(level<L_MIN || level>L_MAX) + return; + if(f && f!='0') _log_level_colors[level - L_MIN].f = f; + if(b && b!='0') _log_level_colors[level - L_MIN].b = b; +} diff --git a/dprint.h b/dprint.h index 04179de..cddb490 100644 --- a/dprint.h +++ b/dprint.h @@ -139,6 +139,7 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); void dprint_color(int level); void dprint_color_reset(void); +void dprint_color_update(int level, char f, char b); void dprint_init_colors(void); /** @brief

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 September 2012