sr-dev

sr-dev@lists.kamailio.org

15 participants
44224 discussions

git:master: kex: added K pv_printf() function

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f5cff79c5d6fa7270c56b1a7ca6e2d6902999c8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5cff79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 21:21:08 2009 +0300 kex: added K pv_printf() function --- modules_k/kex/kex_mod.c | 2 + modules_k/kex/km_core.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/kex/km_core.h | 2 + 3 files changed, 78 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index 64f26a8..7fa5830 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -74,6 +74,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"isdsturiset", (cmd_function)w_isdsturiset, 0, 0, 0, ANY_ROUTE }, + {"pv_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, + 0, ANY_ROUTE }, {0,0,0,0,0,0} }; diff --git a/modules_k/kex/km_core.c b/modules_k/kex/km_core.c index cea12ea..72e2dde 100644 --- a/modules_k/kex/km_core.c +++ b/modules_k/kex/km_core.c @@ -27,6 +27,8 @@ #include "../../dprint.h" #include "../../dset.h" #include "../../flags.h" +#include "../../pvar.h" +#include "../../lvalue.h" #include "../../mod_fix.h" #include "km_core.h" @@ -95,3 +97,75 @@ int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2) return 1; } +int pv_printf_fixup(void** param, int param_no) +{ + pv_spec_t *spec=NULL; + pv_elem_t *pvmodel=NULL; + str tstr; + + if(param_no==1) + { + spec = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); + if(spec==NULL) + { + LM_ERR("out of pkg\n"); + return -1; + } + memset(spec, 0, sizeof(pv_spec_t)); + tstr.s = (char*)(*param); + tstr.len = strlen(tstr.s); + if(pv_parse_spec(&tstr, spec)==NULL) + { + LM_ERR("unknown script variable in first parameter"); + pkg_free(spec); + return -1; + } + if(!pv_is_w(spec)) + { + LM_ERR("read-only script variable in first parameter"); + pkg_free(spec); + return -1; + } + *param = spec; + } else if(param_no==2) { + pvmodel = 0; + tstr.s = (char*)(*param); + tstr.len = strlen(tstr.s); + if(pv_parse_format(&tstr, &pvmodel)<0) + { + LM_ERR("error in second parameter"); + return -1; + } + *param = pvmodel; + } + return 0; +} + +int w_pv_printf(struct sip_msg *msg, char *s1, str *s2) +{ + pv_spec_t *spec=NULL; + pv_elem_t *model=NULL; + pv_value_t val; + + spec = (pv_spec_t*)s1; + + model = (pv_elem_t*)s2; + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_printf_s(msg, model, &val.rs)!=0) + { + LM_ERR("cannot eval second parameter\n"); + goto error; + } + val.flags = PV_VAL_STR; + if(spec->setf(msg, &spec->pvp, EQ_T, &val)<0) + { + LM_ERR("setting PV failed\n"); + goto error; + } + + return 1; +error: + return -1; +} + diff --git a/modules_k/kex/km_core.h b/modules_k/kex/km_core.h index 84fe5dd..5fa08f8 100644 --- a/modules_k/kex/km_core.h +++ b/modules_k/kex/km_core.h @@ -29,5 +29,7 @@ int w_km_append_branch(struct sip_msg *msg, char *uri, str *s2); int w_setdsturi(struct sip_msg *msg, char *uri, str *s2); int w_resetdsturi(struct sip_msg *msg, char *uri, str *s2); int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2); +int w_pv_printf(struct sip_msg *msg, char *s1, str *s2); +int pv_printf_fixup(void** param, int param_no); #endif

15 years, 7 months

64b - lib or lib64?

by Daniel-Constantin Mierla

Hello, kamailio installs the modules under lib64 on 64b architecture, SR does it in lib. I do not recall exactly the discussion when we did the update in openser, but probably we got somehow to the conclusion that it should be so. Looking now in my deb distro, i see in the system (/ and /usr): lib lib32 lib64 where lib64 is symlink to lib, so I guess SR way is still right. How is in other distros? Opinions? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 7 months

git:master: kex: added K dst uri related functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6b9d28ee105960c790dae46119430764c1241b3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b9d28e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 20:03:57 2009 +0300 kex: added K dst uri related functions - setdsturi(uri)/resetdsturi()/isdsturiset() --- modules_k/kex/kex_mod.c | 6 ++++++ modules_k/kex/km_core.c | 30 ++++++++++++++++++++++++++++++ modules_k/kex/km_core.h | 3 +++ 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index 9baa48d..64f26a8 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -68,6 +68,12 @@ static cmd_export_t cmds[]={ 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"km_append_branch", (cmd_function)w_km_append_branch, 1, fixup_spve_null, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"setdsturi", (cmd_function)w_setdsturi, 1, 0, + 0, ANY_ROUTE }, + {"resetdsturi", (cmd_function)w_resetdsturi, 0, 0, + 0, ANY_ROUTE }, + {"isdsturiset", (cmd_function)w_isdsturiset, 0, 0, + 0, ANY_ROUTE }, {0,0,0,0,0,0} }; diff --git a/modules_k/kex/km_core.c b/modules_k/kex/km_core.c index beebb35..cea12ea 100644 --- a/modules_k/kex/km_core.c +++ b/modules_k/kex/km_core.c @@ -65,3 +65,33 @@ int w_km_append_branch(struct sip_msg *msg, char *uri, str *sq) return ret; } +int w_setdsturi(struct sip_msg *msg, char *uri, str *s2) +{ + str s; + + /* todo: fixup */ + s.s = uri; + s.len = strlen(uri); + + if(set_dst_uri(msg, &s)!=0) + return -1; + return 1; + +} + +int w_resetdsturi(struct sip_msg *msg, char *uri, str *s2) +{ + if(msg->dst_uri.s!=0) + pkg_free(msg->dst_uri.s); + msg->dst_uri.s = 0; + msg->dst_uri.len = 0; + return 1; +} + +int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2) +{ + if(msg->dst_uri.s==0 || msg->dst_uri.len<=0) + return -1; + return 1; +} + diff --git a/modules_k/kex/km_core.h b/modules_k/kex/km_core.h index a668c71..84fe5dd 100644 --- a/modules_k/kex/km_core.h +++ b/modules_k/kex/km_core.h @@ -26,5 +26,8 @@ #include "../../sr_module.h" int w_km_append_branch(struct sip_msg *msg, char *uri, str *s2); +int w_setdsturi(struct sip_msg *msg, char *uri, str *s2); +int w_resetdsturi(struct sip_msg *msg, char *uri, str *s2); +int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2); #endif

15 years, 7 months

To parser bug

by Nils Ohlmeier

Hello, during testing SER at SIPit 24 I discovered something what I believe is a major bug in the To and From header parser of SER. When you send a request with a To or From header like this: To: <sip:nils@invalid.com>;foo the To header parameter parser fails, and the whole To header is not parsed. According to the BNF of 3261 generic parameters without parameters are allowed in To and From header. So I created the attached patch, which seems to work for me. Please review carefully and let me know if I overlooked something in the problem statement or the bug fix. Cheers Nils Index: parse_to.c =================================================================== RCS file: /cvsroot/ser/sip_router/parser/parse_to.c,v retrieving revision 1.22 diff -a -u -r1.22 parse_to.c --- parse_to.c 23 Jun 2008 17:09:57 -0000 1.22 +++ parse_to.c 20 May 2009 05:04:40 -0000 @@ -122,6 +122,11 @@ case TAG3: param->type=TAG_PARAM; case PARA_NAME: + param->value.len = tmp-param->value.s; + saved_status = E_PARA_VALUE; + status = F_LF; + add_param( param , to_b ); + break; case TAG1: case TAG2: param->name.len = tmp-param->name.s; @@ -161,6 +166,11 @@ case TAG3: param->type=TAG_PARAM; case PARA_NAME: + param->name.len = tmp-param->name.s; + saved_status = E_PARA_VALUE; + status = F_CR; + add_param( param , to_b ); + break; case TAG1: case TAG2: param->name.len = tmp-param->name.s; @@ -277,7 +287,13 @@ } #endif case PARA_VALUE_TOKEN: - param->value.len=tmp-param->value.s; + case PARA_NAME: + if (status == PARA_VALUE_TOKEN) { + param->value.len=tmp-param->value.s; + } + else { + param->name.len = tmp-param->name.s; + } add_param(param,to_b); case E_PARA_VALUE: param = (struct to_param*)

15 years, 7 months

can't anymore build my debian package

by jh＠tutpro.com

could it be possible that the compiler detection fix broke something, because i can't anymore build my debian package: Makefile:365: "make TLS option is obsoleted, try TLS_HOOKS or CORE_TLS" /bin/sh: -c: line 0: syntax error near unexpected token `)' /bin/sh: -c: line 0: `echo CFG_DEFS:= -DNAME=\'\"sip-router\"\' -DVERSION=\'\"2.1.0-dev23-make\"\' -DARCH=\'\"i386\"\' -DOS=\'linux_\' -DOS_QUOTED=\'\"linux\"\' -DCOMPILER=\'\"gcc //g\' -e \'s/^.*$[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$.*/\1/\' -e \'s/^[^0-9].*$[0-9][0-9]*\.[0-9][0-9]*$.*/\1/\')\"\' -D__CPU_i386 -D__OS_linux -DSER_VER=2001000 -DCFG_DIR=\'\"/etc/sip-router\"\' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DF_MALLOC -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DUSE_SCTP >>makecfg.lst' make[1]: *** No rule to make target `makecfg.lst', needed by `action.o'. Stop. -- juha

15 years, 7 months

git:master: makefile: fix last commit

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ca492cdd50807cf50072d9a510156860b1139467 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca492cd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 29 18:41:45 2009 +0200 makefile: fix last commit - workaround make not escaping a ')'. --- Makefile.defs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 9836790..bb0459a 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -284,10 +284,11 @@ MKTAGS=ctags -R . ifneq (,$(findstring gcc, $(CC_LONGVER))) CC_NAME=gcc + RPAREN=) CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\ - |sed -e 's/([^)]*)//g' \ + sed -e 's/([^$(RPAREN)]*)//g' \ -e 's/^.*$[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$.*/\1/'\ - -e 's/^[^0-9].*$[0-9][0-9]*\.[0-9][0-9]*$.*/\1/') + -e 's/^[^0-9].*$[0-9][0-9]*\.[0-9][0-9]*$.*/\1/') # CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|cut -d" " -f 3\ # |sed -e 's/^.*$[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$.*/\1/'\ # -e 's/^[^0-9].*$[0-9][0-9]*\.[0-9][0-9]*$.*/\1/')

15 years, 7 months

make modules issue

by Daniel-Constantin Mierla

Hello, currently avpops module is blacklisted from compilation. While module_k/avpops compiles, modules_s/avpops doesn't. If I add avpops in include_modules, compilation stops when it gets to module_k/avpops Adding modules_k/avpos to include_modules do not help? Ideas? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 7 months

git:master: * modules_k/acc: included Makefile.radius

by Juha Heinanen

Module: sip-router Branch: master Commit: 42b8c977416847c50f2937f987bcc06d73ed4ae4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42b8c97… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 29 18:50:20 2009 +0300 * modules_k/acc: included Makefile.radius * Included Makefile.radius if RADIUS accounting is enabled. --- modules_k/acc/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/acc/Makefile b/modules_k/acc/Makefile index ee6d3ff..24dd19f 100644 --- a/modules_k/acc/Makefile +++ b/modules_k/acc/Makefile @@ -17,8 +17,8 @@ DEFS+=-DSQL_ACC # (uncomment next line or 'ENABLE_RADIUS_ACC=true make all') #ENABLE_RADIUS_ACC=true ifeq ($(ENABLE_RADIUS_ACC),true) -DEFS+=-DRAD_ACC -I$(LOCALBASE)/include -LIBS=-L$(LOCALBASE)/lib $(RADIUS_LIB) +include ../../Makefile.radius +DEFS+=-DRAD_ACC endif # set ENABLE_DIAMETER_ACC to true if you wish to enable DIAMETER accounting

15 years, 7 months

dns_try_ipv6

by jh＠tutpro.com

when i try to use my kamailio.cfg with sip-router, the first place where it fails is this: dns_try_ipv6=no sip-router says that the config var is unknown. sip-router core cookbook lists the variable, but does not say anything about it. is there a replacement or what should i do about it? -- juha

15 years, 7 months

ser related stuff in sip-router installation

by jh＠tutpro.com

after my debian package was built, i noticed that it contained the following ser related files that still need some action: -rwxr-xr-x root/root 27708 2009-05-28 20:12 ./usr/sbin/sercmd -rwxr-xr-x root/root 13509 2009-05-28 20:12 ./usr/sbin/ser_mysql.sh -rw-r--r-- root/root 1490 2009-05-28 20:12 ./usr/share/man/man8/ser.8.gz -rw-r--r-- root/root 630 2009-05-28 20:12 ./usr/share/man/man5/ser.cfg.5.gz -- juha

15 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev