sr-dev July 2012

sr-dev@lists.kamailio.org

24 participants
172 discussions

git:master: pkg/kamailio/deb/wheezy: Added build dependency on libunistring-dev.
by admin＠sip-router.org 11 Jul '12

11 Jul '12

Module: sip-router Branch: master Commit: 008c92bece290aed3b8e6439be71c2c37526901d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=008c92b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Jul 8 21:20:35 2012 +0300 pkg/kamailio/deb/wheezy: Added build dependency on libunistring-dev. --- pkg/kamailio/deb/wheezy/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/… [View More]

4 6

git:3.3: kamdbctl: add domain_attrs table to standard tables
by Klaus Darilion 11 Jul '12

11 Jul '12

Module: sip-router Branch: 3.3 Commit: 671b52a37e3811bf89c74d83e6438739a67f50a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=671b52a… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Jul 11 12:30:51 2012 +0000 kamdbctl: add domain_attrs table to standard tables (cherry picked from commit 699526ddb3b02cb5766bc7ad6f1c7a1861006d4c) --- utils/kamctl/kamdbctl.base | 2 +- … [View More]

1 0

git:master: kamdbctl: add domain_attrs table to standard tables
by Klaus Darilion 11 Jul '12

11 Jul '12

Module: sip-router Branch: master Commit: 699526ddb3b02cb5766bc7ad6f1c7a1861006d4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=699526d… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Jul 11 12:30:51 2012 +0000 kamdbctl: add domain_attrs table to standard tables --- utils/kamctl/kamdbctl.base | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/… [View More]

1 0

git:3.3: modules_k/uac: fix handling of empty display-part.
by Andreas Granig 11 Jul '12

11 Jul '12

Module: sip-router Branch: 3.3 Commit: 66240e60d99b6bf9fc8f06c05cb7f4ecf6d8d1ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66240e6… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Wed Jul 11 12:52:38 2012 +0200 modules_k/uac: fix handling of empty display-part. This re-enables the feature to strip the display name by setting an empty string, like uac_replace_from("", "$var(from)"); --- … [View More]

1 0

git:master: modules_k/uac: fix handling of empty display-part.
by Andreas Granig 11 Jul '12

11 Jul '12

Module: sip-router Branch: master Commit: 40b37899aaadd1518d812c4a32aeab330b864cb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40b3789… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Wed Jul 11 12:52:38 2012 +0200 modules_k/uac: fix handling of empty display-part. This re-enables the feature to strip the display name by setting an empty string, like uac_replace_from("", "$var(from)"); --- … [View More]

1 0

is rfc5626 not supported in v3.3?
by 张 10 Jul '12

10 Jul '12

Dear firends, These new features announced by kamailio3.3: " Scalability support for handling GRUU and SIP Outbound dispatcher added outbound_proxy modparam for use with dispatcher pings usrloc handle reg-id Contact parameter defined by RFC5626 " But after I read the doc of dispatcher module, I can not find the PATH header and flow token process which is defined in RFC5626. Does kamailio3.3 still not support RFC5626? Best Regards Victor

1 0

is rfc5626 not supported in v3.3?
by 张 10 Jul '12

10 Jul '12

1 0

git:master: ndb_redis: redis_cmd changed into a variadic function.
by Vicente Hernando 10 Jul '12

10 Jul '12

Module: sip-router Branch: master Commit: ca5e3d93e3f117651d2152dccdfd4c299bf7f508 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca5e3d9… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Tue Jul 10 05:48:45 2012 -0400 ndb_redis: redis_cmd changed into a variadic function. - command string can be split into several strings. --- modules/ndb_redis/ndb_redis_mod.c | 65 ++++++++… [View More]++++++++++++++++++++--------- modules/ndb_redis/redis_client.c | 24 +++++++++---- modules/ndb_redis/redis_client.h | 3 +- 3 files changed, 66 insertions(+), 26 deletions(-) diff --git a/modules/ndb_redis/ndb_redis_mod.c b/modules/ndb_redis/ndb_redis_mod.c index c1f2b13..ecce4e9 100644 --- a/modules/ndb_redis/ndb_redis_mod.c +++ b/modules/ndb_redis/ndb_redis_mod.c @@ -161,7 +161,7 @@ static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres) return -1; } - if(redisc_exec(&s[0], &s[1], NULL, NULL, NULL, &s[2])<0) + if(redisc_exec(&s[0], &s[2], &s[1])<0) return -1; return 1; } @@ -172,7 +172,9 @@ static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres) static int w_redis_cmd4(struct sip_msg* msg, char* ssrv, char* scmd, char *sargv1, char* sres) { - str s[4]; + str s[3]; + str arg1; + char c1; if(fixup_get_svalue(msg, (gparam_t*)ssrv, &s[0])!=0) { @@ -184,19 +186,24 @@ static int w_redis_cmd4(struct sip_msg* msg, char* ssrv, char* scmd, LM_ERR("no redis command\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sargv1, &s[2])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sargv1, &arg1)!=0) { LM_ERR("no argument 1\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sres, &s[3])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sres, &s[2])!=0) { LM_ERR("no redis reply name\n"); return -1; } - if(redisc_exec(&s[0], &s[1], &s[2], NULL, NULL, &s[3])<0) + c1 = arg1.s[arg1.len]; + arg1.s[arg1.len] = '\0'; + if(redisc_exec(&s[0], &s[2], &s[1], arg1.s)<0) { + arg1.s[arg1.len] = c1; return -1; + } + arg1.s[arg1.len] = c1; return 1; } @@ -206,7 +213,9 @@ static int w_redis_cmd4(struct sip_msg* msg, char* ssrv, char* scmd, static int w_redis_cmd5(struct sip_msg* msg, char* ssrv, char* scmd, char *sargv1, char *sargv2, char* sres) { - str s[5]; + str s[3]; + str arg1, arg2; + char c1, c2; if(fixup_get_svalue(msg, (gparam_t*)ssrv, &s[0])!=0) { @@ -218,24 +227,33 @@ static int w_redis_cmd5(struct sip_msg* msg, char* ssrv, char* scmd, LM_ERR("no redis command\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sargv1, &s[2])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sargv1, &arg1)!=0) { LM_ERR("no argument 1\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sargv2, &s[3])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sargv2, &arg2)!=0) { LM_ERR("no argument 2\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sres, &s[4])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sres, &s[2])!=0) { LM_ERR("no redis reply name\n"); return -1; } - if(redisc_exec(&s[0], &s[1], &s[2], &s[3], NULL, &s[4])<0) + c1 = arg1.s[arg1.len]; + c2 = arg2.s[arg2.len]; + arg1.s[arg1.len] = '\0'; + arg2.s[arg2.len] = '\0'; + if(redisc_exec(&s[0], &s[2], &s[1], arg1.s, arg2.s)<0) { + c1 = arg1.s[arg1.len]; + c2 = arg2.s[arg2.len]; return -1; + } + c1 = arg1.s[arg1.len]; + c2 = arg2.s[arg2.len]; return 1; } @@ -245,7 +263,9 @@ static int w_redis_cmd5(struct sip_msg* msg, char* ssrv, char* scmd, static int w_redis_cmd6(struct sip_msg* msg, char* ssrv, char* scmd, char *sargv1, char *sargv2, char *sargv3, char* sres) { - str s[6]; + str s[3]; + str arg1, arg2, arg3; + char c1, c2, c3; if(fixup_get_svalue(msg, (gparam_t*)ssrv, &s[0])!=0) { @@ -257,29 +277,42 @@ static int w_redis_cmd6(struct sip_msg* msg, char* ssrv, char* scmd, LM_ERR("no redis command\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sargv1, &s[2])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sargv1, &arg1)!=0) { LM_ERR("no argument 1\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sargv2, &s[3])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sargv2, &arg2)!=0) { LM_ERR("no argument 2\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sargv3, &s[4])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sargv3, &arg3)!=0) { LM_ERR("no argument 3\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)sres, &s[5])!=0) + if(fixup_get_svalue(msg, (gparam_t*)sres, &s[2])!=0) { LM_ERR("no redis reply name\n"); return -1; } - if(redisc_exec(&s[0], &s[1], &s[2], &s[3], &s[4], &s[5])<0) + c1 = arg1.s[arg1.len]; + c2 = arg2.s[arg2.len]; + c3 = arg3.s[arg3.len]; + arg1.s[arg1.len] = '\0'; + arg2.s[arg2.len] = '\0'; + arg3.s[arg3.len] = '\0'; + if(redisc_exec(&s[0], &s[2], &s[1], arg1.s, arg2.s, arg3.s)<0) { + c1 = arg1.s[arg1.len]; + c2 = arg2.s[arg2.len]; + c3 = arg3.s[arg3.len]; return -1; + } + c1 = arg1.s[arg1.len]; + c2 = arg2.s[arg2.len]; + c3 = arg3.s[arg3.len]; return 1; } diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 267c8f5..84e9e9e 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> #include <sys/time.h> +#include <stdarg.h> #include "../../mem/mem.h" #include "../../dprint.h" @@ -310,23 +311,25 @@ err: /** * */ -int redisc_exec(str *srv, str *cmd, str *argv1, str *argv2, str *argv3, - str *res) +int redisc_exec(str *srv, str *res, str *cmd, ...) { redisc_server_t *rsrv=NULL; redisc_reply_t *rpl; char c; + va_list ap; + + va_start(ap, cmd); rsrv = redisc_get_server(srv); if(srv==NULL || cmd==NULL || res==NULL) { LM_ERR("invalid parameters"); - return -1; + goto error_exec; } if(rsrv==NULL) { LM_ERR("no redis server found: %.*s\n", srv->len, srv->s); - return -1; + goto error_exec; } if(rsrv->ctxRedis==NULL) { @@ -337,7 +340,7 @@ int redisc_exec(str *srv, str *cmd, str *argv1, str *argv2, str *argv3, if(rpl==NULL) { LM_ERR("no redis reply id found: %.*s\n", res->len, res->s); - return -1; + goto error_exec; } if(rpl->rplRedis!=NULL) { @@ -347,19 +350,24 @@ int redisc_exec(str *srv, str *cmd, str *argv1, str *argv2, str *argv3, } c = cmd->s[cmd->len]; cmd->s[cmd->len] = '\0'; - rpl->rplRedis = redisCommand(rsrv->ctxRedis, cmd->s); + rpl->rplRedis = redisvCommand(rsrv->ctxRedis, cmd->s, ap ); if(rpl->rplRedis == NULL) { /* null reply, reconnect and try again */ if(redisc_reconnect_server(rsrv)==0) { - rpl->rplRedis = redisCommand(rsrv->ctxRedis, cmd->s); + rpl->rplRedis = redisvCommand(rsrv->ctxRedis, cmd->s, ap); } } cmd->s[cmd->len] = c; + va_end(ap); return 0; -} +error_exec: + va_end(ap); + return -1; + +} /** * diff --git a/modules/ndb_redis/redis_client.h b/modules/ndb_redis/redis_client.h index f4d29f4..8aebe77 100644 --- a/modules/ndb_redis/redis_client.h +++ b/modules/ndb_redis/redis_client.h @@ -33,8 +33,7 @@ int redisc_init(void); int redisc_destroy(void); int redisc_add_server(char *spec); -int redisc_exec(str *srv, str *cmd, str *argv1, str *argv2, str *argv3, - str *res); +int redisc_exec(str *srv, str *res, str *cmd, ...); typedef struct redisc_server { str *sname; [View Less]

1 0

git:master: ndb_redis: README file update. redis_cmd variadic function.
by Vicente Hernando 10 Jul '12

10 Jul '12

Module: sip-router Branch: master Commit: 9485cfac5e1e6f4bb53407d3382f7dc725598f8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9485cfa… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Tue Jul 10 12:05:02 2012 +0200 ndb_redis: README file update. redis_cmd variadic function. --- modules/ndb_redis/README | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 … [View More]deletions(-) diff --git a/modules/ndb_redis/README b/modules/ndb_redis/README index b71d796..03c5cc9 100644 --- a/modules/ndb_redis/README +++ b/modules/ndb_redis/README @@ -35,7 +35,7 @@ Vicente Hernando 4. Functions - 4.1. redis_cmd(srvname, command, replyid) + 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_free(replyid) List of Examples @@ -60,7 +60,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. redis_cmd(srvname, command, replyid) + 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_free(replyid) 1. Overview @@ -121,15 +121,19 @@ modparam("ndb_redis", "server", "name=srvY;unix=/tmp/redis.sock;db=3") 4. Functions - 4.1. redis_cmd(srvname, command, replyid) + 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_free(replyid) -4.1. redis_cmd(srvname, command, replyid) +4.1. redis_cmd(srvname, command, ..., replyid) Send a command to REDIS server identified by srvname. The reply will be - stored in a local continer identified by replyid. All the parameters + stored in a local container identified by replyid. All the parameters can be strings with pseudo-variables that are evaluated at runtime. + Minimum required arguments are srvname, command and replyid. Command + argument can be separated into several ones using %s token. (See + examples) Total number of arguments cannot exceed six. + The reply can be accessed via pseudo-variable $redis(key). The key can be: type - type of the reply (as in hiredis.h); value - the value returned by REDIS server; info - in case of error from REDIS, it will @@ -158,6 +162,16 @@ redis_cmd("srvN", "SET ruri $ru", "r"); # get a value redis_cmd("srvN", "GET foo", "r"); +# same command separated into two arguments: +redis_cmd("srvN", "GET %s", "foo", "r"); + +# if we have a key with spaces within it: +redis_cmd("srvN", "GET %s", "foo bar", "r"); + +# several values substitution: +redis_cmd("srvN", "HMGET %s %s %s", "key1", "field1", "field2", "r"); + + # array example if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { xlog("array size: $redis(r=>size)\n"); [View Less]

1 0

git:master: ndb_redis: redis_cmd variadic function documentation.
by Vicente Hernando 10 Jul '12

10 Jul '12

Module: sip-router Branch: master Commit: 1010594cf1d7df4753a61142dc86d7d04f6c4be3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1010594… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Tue Jul 10 05:54:00 2012 -0400 ndb_redis: redis_cmd variadic function documentation. --- modules/ndb_redis/doc/ndb_redis_admin.xml | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+)… [View More]

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
18
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 2012