sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: kex: added K dst uri related functions
by Daniel-Constantin Mierla 29 May '09

29 May '09

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

1 0

To parser bug
by Nils Ohlmeier 29 May '09

29 May '09

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*)

5 11

can't anymore build my debian package
by jh＠tutpro.com 29 May '09

29 May '09

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

3 5

git:master: makefile: fix last commit
by Andrei Pelinescu-Onciul 29 May '09

29 May '09

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/')

1 0

make modules issue
by Daniel-Constantin Mierla 29 May '09

29 May '09

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/

2 1

git:master: * modules_k/acc: included Makefile.radius
by Juha Heinanen 29 May '09

29 May '09

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

1 0

dns_try_ipv6
by jh＠tutpro.com 29 May '09

29 May '09

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

4 17

ser related stuff in sip-router installation
by jh＠tutpro.com 29 May '09

29 May '09

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

2 2

git:master: makefile: gcc version detection fix
by Andrei Pelinescu-Onciul 29 May '09

29 May '09

Module: sip-router Branch: master Commit: 0f72c774f7835155cd055c45530022febffeb30c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f72c77… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 29 16:52:43 2009 +0200 makefile: gcc version detection fix The gcc version detection got confused by spaces within (), resulting in a compilation error on SUSE gcc 4.3.2. Reported-by: Edson 4lists at gmail dot com --- Makefile.defs | 8 ++++++-- test/gcc_versions.txt | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 623c318..9836790 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -284,9 +284,13 @@ MKTAGS=ctags -R . ifneq (,$(findstring gcc, $(CC_LONGVER))) CC_NAME=gcc - 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/'\ + CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\ + |sed -e 's/([^)]*)//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/') +# 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/') # sed with POSIX.1 regex doesn't support |, + or ? # (darwin, solaris ...) => this complicated expression MKDEP=$(CC) -MM diff --git a/test/gcc_versions.txt b/test/gcc_versions.txt index 801611a..2b8f23c 100644 --- a/test/gcc_versions.txt +++ b/test/gcc_versions.txt @@ -17,5 +17,9 @@ gcc-3.4 (GCC) 3.4.4 20041218 (prerelease) (Debian 3.4.3-7) powerpc-apple-darwin8-gcc-3.5.0 (GCC) 3.5.0 20041026 (Apple Computer, Inc. build 4059) powerpc-apple-darwin8-gcc-4.0.0 (GCC) 4.0.0 20041026 (Apple Computer, Inc. build 4061) gcc-4.0 (GCC) 4.0.2 20050821 (prerelease) (Debian 4.0.1-6) +gcc-4.0 (GCC) 4.0.4 20060904 (prerelease) (Debian 4.0.3-7) gcc-4.0.1 (GCC) 3.3.6 (Gentoo 3.3.6, ssp-3.3.6-1.0, pie-8.7.8) - +gcc-4.1 (GCC) 4.1.3 20080704 (prerelease) (Debian 4.1.2-25) +gcc-4.2 (GCC) 4.2.4 (Debian 4.2.4-6) +gcc-4.3 (Debian 4.3.3-8) 4.3.3 +gcc (SUSE Linux) 4.3.2 [gcc-4_3-branch revision 141291]

1 0

vim syntax file for config
by Daniel-Constantin Mierla 29 May '09

29 May '09

Hello, for xVIM fans, here is attached a syntax file for SIP Router config file. It is refurbished from an old openser syntax file, updated with latest config language rules. It is still missing the 'select' definition, I had no time to search for the regexp that matches its format, maybe a ser developer can give it quicker. Of course, it can take other improvement, please feel free to contribute. If there are many users, we can keep it inside the source tree, somewhere in the scripts dir. Probably most of you know, but for newbees: - place the ser.vim in your home directory under ".vim/syntax/" - when you edit the config file with vim, run "setf ser" You can add rules in vim config to auto-detect -- see google for that -- skipping in this way setf command each time you edit a config. Hope some of you enjoy it, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/ " -*- vim -*- " FILE: ser.vim " LAST MODIFICATION: 2009-05-28 18:30 " (C) Copyright 2008 Stanisław Pitucha <viraptor(a)gmail.com> " (C) Copyright 2009 Daniel-Constantin Mierla <miconda(a)gmail.com> " Version: 1.01 " USAGE: " " Save this file to $VIMFILES/syntax/ser.vim. Either add a detection " script to filetypes.vim, or set filetype manually to "ser" when " editing SIP Router configuration file with 'setf ser'. " " List of keyword and core functions taken from latest dev version of " SIP Router. Module functions not included. " " Tested only on vim 7.1 " " Example: "setf ser" " " REQUIREMENTS: " vim (>= 7) if exists("b:current_syntax") finish endif syn match serConfigParamLine '^[^=]\+=.*$' contains=serCoreParameter,serString,serConfigConstant,serSpecial,serNumber,serCppComment,serHashComment syn region serConfigModparam start='^\s*modparam\s*(' end=')' contains=serString,serNumber syn match serConfigModule '^\s*loadmodule\s*"[^"]\+"' contains=serString syn keyword serTodo TODO FIXME XXX contained syn match serOperator '!\|&&\|||\|=[~=]\?\|>\|<\|+\|-\|/\|\*\||\|&\|^\|\~\|defined\|eq\|ieq\|ne\|ine' display contained syn region serCppComment start='/\*' end='\*/' contains=serTodo syn match serHashComment '#.*$' contains=serTodo syn match serStringEscape '\\.' contained syn match serNumber '[0-9]\+' contained syn region serString matchgroup=Normal start='"' skip='\\"' end='"' contained contains=serVariable,serStringEscape syn match serVariable "$[a-zA-Z_][a-zA-Z0-9_]*$([^)]\+)$\?" contained syn match serIdentifier '[a-zA-Z_][a-zA-Z0-9_]*' contained syn keyword serStatement route if else switch case default break exit return drop while contained syn keyword serSpecial yes no on off true false enabled disabled contained syn keyword serCoreKeyword af dst_ip dst_port from_uri method msg:len proto status snd_af snd_ip snd_port snd_proto src_ip src_port to_af to_ip to_port to_proto to_uri uri uri:host uri:port contained syn keyword serCoreValue udp UDP tcp TCP tls TLS sctp SCTP inet INET inet6 INET6 sslv23 SSLv23 SSLV23 sslv2 SSLv2 SSLV2 sslv3 SSLv3 SSLV3 tlsv1 TLSv1 TLSV1 max_len myself contained syn keyword serCoreFunction forward forward_tcp forward_udp forward_tls forward_sctp send send_tcp log error exec force_rport add_rport force_tcp_alias add_tcp_alias udp_mtu udp_mtu_try_proto setflag resetflag isflagset flags bool setavpflag resetavpflag isavpflagset avpflags rewritehost sethost seth rewritehostport sethostport sethp rewritehostporttrans sethostporttrans sethpt rewriteuser setuser setu rewriteuserpass setuserpass setup rewriteport setport setp rewriteuri seturi revert_uri prefix strip strip_tail userphone append_branch set_advertised_address set_advertised_port force_send_socket contained syn keyword serCoreParameter debug fork log_stderror log_facility listen alias auto_aliases dns rev_dns dns_try_ipv6 dns_try_naptr dns_srv_lb dns_srv_loadbalancing dns_udp_pref dns_udp_preference dns_tcp_pref dns_tcp_preference dns_tls_pref dns_tls_preference dns_sctp_pref dns_sctp_preference dns_retr_time dns_retr_no dns_servers_no dns_use_search_list dns_search_full_match dns_cache_init use_dns_cache use_dns_failover dns_cache_flags dns_cache_negative_ttl dns_cache_min_ttl dns_cache_max_ttl dns_cache_mem dns_cache_gc_interval dns_cache_del_nonexp dns_cache_delete_nonexpired dst_blacklist_init use_dst_blacklist dst_blacklist_mem dst_blacklist_expire dst_blacklist_ttl dst_blacklist_gc_interval port statistics maxbuffer children check_via phone2tel syn_branch memlog mem_log memdbg mem_dbg sip_warning server_signature reply_to_via user uid group gid chroot workdir wdir mhomed disable_tcp tcp_children tcp_accept_aliases tcp_send_timeout tcp_connect_timeout tcp_connection_lifetime tcp_poll_method tcp_max_connections tcp_no_connect tcp_source_ipv4 tcp_source_ipv6 tcp_fd_cache tcp_buf_write tcp_async tcp_conn_wq_max tcp_wq_max tcp_rd_buf_size tcp_wq_blk_size tcp_defer_accept tcp_delayed_ack tcp_syncnt tcp_linger2 tcp_keepalive tcp_keepidle tcp_keepintvl tcp_keepcnt tcp_crlf_ping disable_tls tls_disable enable_tls tls_enable tlslog tls_log tls_port_no tls_method tls_verify tls_require_certificate tls_certificate tls_private_key tls_ca_list tls_handshake_timeout tls_send_timeout disable_sctp enable_sctp sctp_children sctp_socket_rcvbuf sctp_socket_receive_buffer sctp_socket_sndbuf sctp_socket_send_buffer sctp_autoclose sctp_send_ttl sctp_send_retries advertised_address advertised_port disable_core_dump open_files_limit shm_force_alloc mlock_pages real_time rt_prio rt_policy rt_timer1_prio rt_fast_timer_prio rt_ftimer_prio rt_timer1_policy rt_ftimer_policy rt_timer2_prio rt_stimer_prio rt_timer2_policy rt_stimer_policy mcast_loopback mcast_ttl tos pmtu_discovery exit_timeout ser_kill_timeout max_while_loops stun_refresh_interval stun_allow_stun stun_allow_fp server_id description descr desc loadpath mpath contained syn region serBlock start='{' end='}' contained contains=serBlock,@serCodeElements syn match serRouteBlock '$failure_\|onreply_\|branch_\|event_\|onsend_$\?route$\s*\[[^\]]\+\]$\?' contained contains=serNumber,serString,serIdentifier syn region serRrouteBlockFold matchgroup=serRouteBlock start="$failure_\|onreply_\|branch_\|event_\|onsend_$\?route$\s*\[[^\]]\+\]$\?\s*\n\?{" matchgroup=NONE end="}" contains=serBlock,@serCodeElements syn cluster serCodeElements contains=serCppComment,serHashComment,serNumber,serString,serVariable,serOperator,serStatement,serKeyword,serCoreKeyword,serCoreValue,serCoreFunction,serIdentifier hi def link serCppComment Comment hi def link serHashComment Comment hi def link serTodo Todo hi def link serConfigModparam Function hi def link serConfigModule Keyword hi def link serKeyword Keyword hi def link serCoreKeyword Special hi def link serCoreValue Special hi def link serCoreFunction Function hi def link serRouteBlock Type hi def link serRrouteBlockFold Type hi def link serIdentifier Identifier hi def link serSpecial Special hi def link serCoreParameter Keyword hi def link serOperator Operator hi def link serStatement Conditional hi def link serNumber Number hi def link serVariable Identifier hi def link serString String hi def link serStringEscape Special let b:current_syntax = "ser"

1 0

← Newer
1
2
3
4
5
6
7
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009