sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:adubovikov/homer: Added support for HEP version 1. If siptrace is in duplicate mode only, not needed to load DB module.

by Alexandr Dubovikov

Module: sip-router Branch: adubovikov/homer Commit: 3758fcc44345237e2a5259ed56b6c90c669a9124 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3758fcc… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Aug 19 17:56:08 2011 +0200 Added support for HEP version 1. If siptrace is in duplicate mode only, not needed to load DB module. --- modules_k/siptrace/README | 118 +++++++++-- modules_k/siptrace/doc/siptrace.xml | 5 + modules_k/siptrace/doc/siptrace_admin.xml | 23 ++- modules_k/siptrace/siptrace.c | 318 ++++++++++++++++++++++++++--- 4 files changed, 416 insertions(+), 48 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=375…

13 years, 3 months

git:adubovikov/homer: SIP capture module. Homer Project.

by Alexandr Dubovikov

Module: sip-router Branch: adubovikov/homer Commit: 52278518fcab9adee9aa8a22f9f21357dae57b36 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5227851… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Aug 19 17:31:21 2011 +0200 SIP capture module. Homer Project. The module can support follow capturing mode: 1. Mirroring/monitoring port 2. IPIP encapsulation. 3. HEP (version 1). --- modules/sipcapture/Makefile | 19 + modules/sipcapture/README | 308 +++++++ modules/sipcapture/doc/Makefile | 4 + modules/sipcapture/doc/kamailio.cfg | 68 ++ modules/sipcapture/doc/sipcapture.xml | 41 + modules/sipcapture/doc/sipcapture_admin.xml | 362 ++++++++ modules/sipcapture/sipcapture.c | 1232 +++++++++++++++++++++++++++ modules/sipcapture/sipcapture.h | 46 + 8 files changed, 2080 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=522…

13 years, 3 months

git:adubovikov/homer: Added SQL schema for sipcapture module. Example config has moved to examples directory.

by Alexandr Dubovikov

Module: sip-router Branch: adubovikov/homer Commit: 77964a3ccabb7b5b5ef1d7a90e0b7860d05b535b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77964a3… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Aug 19 17:47:25 2011 +0200 Added SQL schema for sipcapture module. Example config has moved to examples directory. --- modules/sipcapture/{doc => examples}/kamailio.cfg | 0 modules/sipcapture/sql/sipcapture-create.sql | 75 + modules/sipcapture/sql/sipcapture-st-create.sql | 9919 +++++++++++++++++++++ 3 files changed, 9994 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=779…

13 years, 3 months

git:adubovikov/homer: If ser works in IPIP capturing mode, raw_ipip is set to 1, that

by Alexandr Dubovikov

Module: sip-router Branch: adubovikov/homer Commit: 4747dde1929599d3028092eacf0353189b8d0f2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4747dde… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Aug 19 17:16:10 2011 +0200 If ser works in IPIP capturing mode, raw_ipip is set to 1, that point to cut one IP header off. --- raw_sock.c | 8 +++++++- raw_sock.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/raw_sock.c b/raw_sock.c index 6298da0..b514a87 100644 --- a/raw_sock.c +++ b/raw_sock.c @@ -84,6 +84,8 @@ #endif /* __OS_* */ +int raw_ipip = 0; /* set if raw socket is in capture mode for IPIP */ + /** create and return a raw socket. * @param proto - protocol used (e.g. IPPROTO_UDP, IPPROTO_RAW) @@ -319,10 +321,14 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, if (unlikely(n<0)) goto error; end=*buf+n; - if (unlikely(n<(sizeof(struct ip)+sizeof(struct udphdr)))) { + if (unlikely(n<((sizeof(struct ip) * raw_ipip ? 2 : 1)+sizeof(struct udphdr)))) { n=-3; goto error; } + + if(raw_ipip) + *buf = *buf + sizeof(struct ip); + /* FIXME: if initial buffer is aligned, one could skip the memcpy and directly cast ip and udphdr pointer to the memory */ memcpy(&iph, *buf, sizeof(struct ip)); diff --git a/raw_sock.h b/raw_sock.h index 6be0aba..868399f 100644 --- a/raw_sock.h +++ b/raw_sock.h @@ -39,6 +39,7 @@ struct raw_filter{ char proto; }; +extern int raw_ipip; int raw_socket(int proto, struct ip_addr* ip, str* iface, int iphdr_incl); int raw_udp4_socket(struct ip_addr* ip, str* iface, int iphdr_incl);

13 years, 3 months

git:master: modules/app_lua, modules_k/presence_xml: Added support for pres_check_basic() and pres_check_available() to app_lua

by Peter Dunkley

Module: sip-router Branch: master Commit: 604a8a95e0f61c792f6f235dd444fbb7781ecd26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=604a8a9… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 19 15:30:26 2011 +0100 modules/app_lua, modules_k/presence_xml: Added support for pres_check_basic() and pres_check_available() to app_lua --- modules/app_lua/app_lua_exp.c | 107 +++++++++++++++++++++++++++++++++ modules_k/presence_xml/pres_check.c | 66 ++++---------------- modules_k/presence_xml/pres_check.h | 5 +- modules_k/presence_xml/presence_xml.c | 74 ++++++++++++++++++++++- 4 files changed, 195 insertions(+), 57 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=604…

13 years, 3 months

How to create an pv_spec_t for an avp from just the name?

by Alex Hermann

Hello, i need to create a pv_spec_t for an avp, where i only have the name of the avp in a str (0 terminated). Is there a helper function to do this? I know pv_parse_spec() exists, but is needs "$avp(name)" as input and is a bit of a heavy function. I only have "name", and need to get the same pv_spec_t as if pv_parse_spec() was called with "$avp(name)" as parameter. -- Greetings, Alex Hermann

13 years, 3 months

[ openser-Patches-3394470 ] CDR-based logging (1.5 backport)

by SourceForge.net

Patches item #3394470, was opened at 2011-08-19 13:40 Message generated for change (Tracker Item Submitted) made by timoreimann You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3394470&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 Submitted By: Timo Reimann (timoreimann) Assigned to: Nobody/Anonymous (nobody) Summary: CDR-based logging (1.5 backport) Initial Comment: This patch provides the functionality to produce CDRs from Kamailio. It is a backport of the code pushed to the Sip-Router master branch on 3. August 2011. Changes affect the following modules: modules/dialog modules/acc ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3394470&group_…

13 years, 3 months

New developer: Alexandr Dubovikov

by Daniel-Constantin Mierla

Hello, a new person has now developer access to GIT repository - Alexandr Dubovikov, contributor in the past with patches, is going to work now on extensions related to Homer project - turning the SIP server in a SIP capturing server. His developer id is adubovikov. You can read more about Homer project at: * http://code.google.com/p/homer/ * http://www.kamailio.org/events/2011-Cluecon/AD-Homerv2.pdf Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

13 years, 3 months

git:master: modules_k/sqlops: Move s.sql transformation to sqlops as sql. val and add sql.val.int, sql.val.str

by Alex Hermann

Module: sip-router Branch: master Commit: 486c7e1871eae56c356baef98e4ac0e399914681 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=486c7e1… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Aug 18 18:17:59 2011 +0200 modules_k/sqlops: Move s.sql transformation to sqlops as sql.val and add sql.val.int, sql.val.str s.sql was not really a string transformation as it handled null and integers too. Move it to sqlops as sql.val (it was not yet in a released version) and add 2 new transformations. Summarizing: sql.val: returns a valid SQL value. $null as NULL, int as number, string as quoted and escaped string sql.val.int: returns a non-null integer ($null becomes 0) sql.val.str: returns a non-null quoted and escaped string. ($null becomes '') --- modules_k/pv/pv_trans.c | 31 +-------- modules_k/pv/pv_trans.h | 2 +- modules_k/sqlops/sql_trans.c | 159 ++++++++++++++++++++++++++++++++++++++++++ modules_k/sqlops/sql_trans.h | 34 +++++++++ modules_k/sqlops/sqlops.c | 11 +++ 5 files changed, 206 insertions(+), 31 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 43ff05d..a3175f6 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -54,7 +54,6 @@ /*! transformation buffer */ static char _tr_buffer[TR_BUFFER_SIZE]; -static str _tr_null = { "NULL", 4 }; /*! @@ -74,7 +73,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t v, w; time_t t; - if(val==NULL || (val->flags&PV_VAL_NULL && subtype != TR_S_SQL)) + if(val==NULL || val->flags&PV_VAL_NULL) return -1; switch(subtype) @@ -594,31 +593,6 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s = _tr_buffer; break; - case TR_S_SQL: - if (val->flags&PV_VAL_NULL) { - val->flags = PV_VAL_STR; - val->rs = _tr_null; - break; - } - if(val->flags&PV_TYPE_INT || !(val->flags&PV_VAL_STR)) { - val->rs.s = int2str(val->ri, &val->rs.len); - val->flags = PV_VAL_STR; - break; - } - if(val->rs.len>TR_BUFFER_SIZE/2-1) { - LM_ERR("escape buffer to short"); - return -1; - } - _tr_buffer[0] = '\''; - i = escape_common(_tr_buffer+1, val->rs.s, val->rs.len); - _tr_buffer[++i] = '\''; - _tr_buffer[++i] = '\0'; - memset(val, 0, sizeof(pv_value_t)); - val->flags = PV_VAL_STR; - val->rs.s = _tr_buffer; - val->rs.len = i; - break; - default: LM_ERR("unknown subtype %d\n", subtype); @@ -1379,9 +1353,6 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==3 && strncasecmp(name.s, "md5", 3)==0) { t->subtype = TR_S_MD5; goto done; - } else if(name.len==3 && strncasecmp(name.s, "sql", 3)==0) { - t->subtype = TR_S_SQL; - goto done; } else if(name.len==7 && strncasecmp(name.s, "tolower", 7)==0) { t->subtype = TR_S_TOLOWER; goto done; diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 2cd2fd0..0938ddc 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -40,7 +40,7 @@ enum _tr_s_subtype { TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, - TR_S_TIMEFORMAT, TR_S_SQL + TR_S_TIMEFORMAT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, diff --git a/modules_k/sqlops/sql_trans.c b/modules_k/sqlops/sql_trans.c new file mode 100644 index 0000000..50ecc06 --- /dev/null +++ b/modules_k/sqlops/sql_trans.c @@ -0,0 +1,159 @@ +/** + * $Id$ + * + * Copyright (C) 2011 SpeakUp B.V. (alex(a)speakup.nl) + * + * This file is part of kamailio, a free SIP server. + * + * openser is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * openser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> + +#include "../../mem/mem.h" +#include "../../dprint.h" +#include "../../trim.h" +#include "../../lib/kcore/strcommon.h" + +#include "sql_trans.h" + +#define is_in_str(p, in) (p<in->s+in->len && *p) + +#define TR_BUFFER_SIZE 2048 + + +static int _tr_eval_sql_val(pv_value_t *val) +{ + int i; + static char _tr_buffer[TR_BUFFER_SIZE]; + + if(val->flags&PV_TYPE_INT || !(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + val->flags = PV_VAL_STR; + return 0; + } + if(val->rs.len>TR_BUFFER_SIZE/2-1) { + LM_ERR("escape buffer to short"); + return -1; + } + _tr_buffer[0] = '\''; + i = escape_common(_tr_buffer+1, val->rs.s, val->rs.len); + _tr_buffer[++i] = '\''; + _tr_buffer[++i] = '\0'; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = i; + return 0; +} + + +int tr_eval_sql(struct sip_msg *msg, tr_param_t *tp, int subtype, + pv_value_t *val) +{ + static str _sql_null = { "NULL", 4 }; + static str _sql_zero = { "0", 1 }; + static str _sql_empty = { "''", 2 }; + + if(val==NULL) + return -1; + + switch(subtype) { + case TR_SQL_VAL: + if (val->flags&PV_VAL_NULL) { + val->flags = PV_VAL_STR; + val->rs = _sql_null; + return 0; + } else { + return _tr_eval_sql_val(val); + } + break; + + case TR_SQL_VAL_INT: + if (val->flags&PV_VAL_NULL) { + val->flags = PV_VAL_STR; + val->rs = _sql_zero; + return 0; + } else { + return _tr_eval_sql_val(val); + } + break; + + case TR_SQL_VAL_STR: + if (val->flags&PV_VAL_NULL) { + val->flags = PV_VAL_STR; + val->rs = _sql_empty; + return 0; + } else { + return _tr_eval_sql_val(val); + } + break; + + default: + LM_ERR("unknown subtype %d\n", + subtype); + return -1; + } + return 0; +} + + +char* tr_parse_sql(str *in, trans_t *t) +{ + char *p; + str name; + + + if(in==NULL || t==NULL) + return NULL; + + p = in->s; + name.s = in->s; + t->type = TR_SQL; + t->trf = tr_eval_sql; + + /* find next token */ + while(is_in_str(p, in) && *p!=TR_PARAM_MARKER && *p!=TR_RBRACKET) p++; + if(*p=='\0') { + LM_ERR("unable to find transformation start: %.*s\n", in->len, in->s); + return NULL; + } + name.len = p - name.s; + trim(&name); + + if(name.len==3 && strncasecmp(name.s, "val", 3)==0) { + t->subtype = TR_SQL_VAL; + goto done; + } + if(name.len==7 && strncasecmp(name.s, "val.int", 7)==0) { + t->subtype = TR_SQL_VAL_INT; + goto done; + } + if(name.len==7 && strncasecmp(name.s, "val.str", 7)==0) { + t->subtype = TR_SQL_VAL_STR; + goto done; + } + + LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, + name.len, name.s, name.len); + return NULL; +done: + t->name = name; + return p; +} + diff --git a/modules_k/sqlops/sql_trans.h b/modules_k/sqlops/sql_trans.h new file mode 100644 index 0000000..ec96ded --- /dev/null +++ b/modules_k/sqlops/sql_trans.h @@ -0,0 +1,34 @@ +/** + * $Id$ + * + * Copyright (C) 2011 SpeakUp B.V. (alex(a)speakup.nl) + * + * This file is part of kamailio, a free SIP server. + * + * openser is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * openser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _SQL_TRANS_H_ +#define _SQL_TRANS_H_ + +#include "../../pvar.h" + +enum _tr_sql_type { TR_SQL_NONE=0, TR_SQL }; +enum _tr_sql_subtype { + TR_SQL_ST_NONE=0, TR_SQL_VAL, TR_SQL_VAL_INT, TR_SQL_VAL_STR }; + +char* tr_parse_sql(str *in, trans_t *tr); + +#endif diff --git a/modules_k/sqlops/sqlops.c b/modules_k/sqlops/sqlops.c index 5bb4b2f..0a4526c 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -52,6 +52,7 @@ #include "../../pvar.h" #include "sql_api.h" #include "sql_var.h" +#include "sql_trans.h" MODULE_VERSION @@ -110,6 +111,11 @@ static param_export_t params[]={ {0,0,0} }; +static tr_export_t mod_trans[] = { + { {"sql", sizeof("sql")-1}, tr_parse_sql }, + { { 0, 0 }, 0 } +}; + /** module exports */ struct module_exports exports= { @@ -127,6 +133,11 @@ struct module_exports exports= { child_init /* per-child init function */ }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + return register_trans_mod(path, mod_trans); +} + static int child_init(int rank) { if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN)

13 years, 3 months

re.subst stopped working

by Juha Heinanen

there was recently a commit related to re.subst. looks like it broke one of my re.substs that used to work before: $(rb{re.subst,/[\n\r\t]//g}) Aug 18 15:43:54 sip /usr/sbin/sip-proxy[14727]: ERROR: <core> [re.c:235]: ERROR: subst_parser: expression is too short: /[ Aug 18 15:43:54 sip /usr/sbin/sip-proxy[14727]: ERROR: textops [txt_var.c:230]: invalid transformation [subst,/[#012#015#011]//g}] <8> Aug 18 15:43:54 sip /usr/sbin/sip-proxy[14727]: ERROR: <core> [pvapi.c:1303]: error parsing [{re.subst,/[#012#015#011]//g}] Aug 18 15:43:54 sip /usr/sbin/sip-proxy[14727]: ERROR: <core> [pvapi.c:698]: bad tr in pvar name "rb" Aug 18 15:43:54 sip /usr/sbin/sip-proxy[14727]: ERROR: <core> [pvapi.c:724]: invalid parsing in [$(rb{re.subst,/[#012#015#011]//g})>#012] at (4) my testing is pretty much stuck before this is fixed. -- juha

13 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011