sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

git:master: route_type: branch and onsend route bugs corrected

by Miklos Tirpak

Module: sip-router Branch: master Commit: 593513f8e03096319dc0ec4f2fa9752e31b0686c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=593513f… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Jun 3 10:38:42 2009 +0200 route_type: branch and onsend route bugs corrected - Branch and onsend routes did not restore the original route_type after they have finished the execution, so subsequent functions that need the route_type failed. (For example t_relay() in the second branch did not work if branch or onsend routes of the first branch were executed.) - get_route_type() macro added. --- modules/tm/t_fwd.c | 3 +++ modules_k/htable/htable.c | 2 +- onsend.h | 3 +++ route.h | 2 ++ 4 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 01a3699..f62af1f 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -151,6 +151,7 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, struct sip_uri parsed_uri_bak; int parsed_uri_ok_bak, uri_backed_up; str msg_uri_bak; + int backup_route_type; shbuf=0; msg_uri_bak.s=0; /* kill warnings */ @@ -189,12 +190,14 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, if (unlikely(branch_route)) { /* run branch_route actions if provided */ + backup_route_type = get_route_type(); set_route_type(BRANCH_ROUTE); tm_ctx_set_branch_index(branch+1); if (run_top_route(branch_rt.rlist[branch_route], i_req) < 0) { LOG(L_ERR, "ERROR: print_uac_request: Error in run_top_route\n"); } tm_ctx_set_branch_index(0); + set_route_type(backup_route_type); } /* run the specific callbacks for this transaction */ diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 68c3e2f..2f75738 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -182,7 +182,7 @@ static int child_init(int rank) if(faked_msg_init()<0) return -1; fmsg = faked_msg_next(); - rtb = route_type; + rtb = get_route_type(); set_route_type(REQUEST_ROUTE); run_top_route(event_rt.rlist[rt], fmsg); set_route_type(rtb); diff --git a/onsend.h b/onsend.h index ffec9f2..93f6dca 100644 --- a/onsend.h +++ b/onsend.h @@ -60,6 +60,7 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, struct onsend_info onsnd_info; int ret; struct run_act_ctx ra_ctx; + int backup_route_type; ret=1; if (onsend_rt.rlist[DEFAULT_RT]){ @@ -68,9 +69,11 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, onsnd_info.buf=buf; onsnd_info.len=len; p_onsend=&onsnd_info; + backup_route_type=get_route_type(); set_route_type(ONSEND_ROUTE); init_run_actions_ctx(&ra_ctx); ret=run_actions(&ra_ctx, onsend_rt.rlist[DEFAULT_RT], orig_msg); + set_route_type(backup_route_type); p_onsend=0; /* reset it */ } return ret; diff --git a/route.h b/route.h index 6232f4b..e346ebd 100644 --- a/route.h +++ b/route.h @@ -66,6 +66,8 @@ extern int route_type; route_type = (type); \ } while(0) +#define get_route_type() route_type + #define is_route_type(type) (route_type == (type)) struct route_list{

14 years, 11 months

CVS:commitlog: sip_router select_core.c select_core.h

by Tomas Mandys

tma0 2009/06/02 22:46:06 CEST SER CVS Repository Modified files: . select_core.c select_core.h Log: - @next_hop.src_ip: source ip of outgoing message Revision Changes Path 1.36 +52 -1 sip_router/select_core.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/select_core.c.diff… 1.28 +3 -1 sip_router/select_core.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/select_core.h.diff…

14 years, 11 months

CVS:commitlog: sip_router/modules/iptrtpproxy iptrtpproxy.c sip_router/modules/iptrtpproxy/doc iptrtpproxy.xml sip_router/modules/iptrtpproxy/examples ser.cfg

by Tomas Mandys

tma0 2009/06/02 22:05:46 CEST SER CVS Repository Modified files: modules/iptrtpproxy iptrtpproxy.c modules/iptrtpproxy/doc iptrtpproxy.xml modules/iptrtpproxy/examples ser.cfg Log: - iptrtpproxy_adjust_timeout() function - ringing_timeout - iptrtpproxy_find() function Revision Changes Path 1.2 +96 -6 sip_router/modules/iptrtpproxy/doc/iptrtpproxy.xml http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox… 1.2 +39 -14 sip_router/modules/iptrtpproxy/examples/ser.cfg http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox… 1.2 +250 -35 sip_router/modules/iptrtpproxy/iptrtpproxy.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox…

14 years, 11 months

[RtpProxy] Add log facility feature

by Iñaki Baz Castillo

Hi, it could be great if RtpProxy allows logging in a specific log facility (as Kamailio allows). Perhaps I miss something, but it's not possible with the current code, right? Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years, 11 months

SF.net SVN: openser:[5868] branches/1.5/modules/tm/t_fwd.c

by Daniel-Constantin Mierla

Revision: 5868 http://openser.svn.sourceforge.net/openser/?rev=5868&view=rev Author: miconda Date: 2009-06-02 09:25:18 +0000 (Tue, 02 Jun 2009) Log Message: ----------- - ifdef'ed last recevied checked added last time (possible side effects to be more investigated) Modified Paths: -------------- branches/1.5/modules/tm/t_fwd.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 11 months

git:master: * Commented out warning about deprecated avp name syntax. I suggest to

by Juha Heinanen

Module: sip-router Branch: master Commit: 94cd6af2a0ba0deb82851983f97bb52cf2e152e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94cd6af… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Jun 2 11:17:54 2009 +0300 * Commented out warning about deprecated avp name syntax. I suggest to uncomment it, when sip-router itself doesn't anymore depend on integer named AVPs and it is truly possible to get rid of them. --- usr_avp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index 17d4cc9..6c06721 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -879,7 +879,7 @@ int parse_avp_ident( str *name, avp_ident_t* attr) attr->index = 0; DBG("Parsing '%.*s'\n", name->len, name->s); if (name->len>=2 && name->s[1]==':') { /* old fashion i: or s: */ - WARN("i: and s: avp name syntax is deprecated!\n"); + /* WARN("i: and s: avp name syntax is deprecated!\n"); */ c = name->s[0]; name->s += 2; name->len -= 2;

14 years, 11 months

SF.net SVN: openser:[5867] branches/1.5

by Daniel-Constantin Mierla

Revision: 5867 http://openser.svn.sourceforge.net/openser/?rev=5867&view=rev Author: miconda Date: 2009-06-01 22:17:56 +0000 (Mon, 01 Jun 2009) Log Message: ----------- - updated the email address Modified Paths: -------------- branches/1.5/AUTHORS branches/1.5/packaging/debian/changelog branches/1.5/packaging/debian/copyright branches/1.5/packaging/debian-etch/copyright branches/1.5/packaging/debian-sarge/copyright branches/1.5/packaging/netbsd/DESCR branches/1.5/packaging/netbsd/Makefile branches/1.5/packaging/openbsd/pkg/DESCR branches/1.5/packaging/rpm/kamailio.spec-4.1 branches/1.5/packaging/rpm/kamailio.spec.SuSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 11 months

SF.net SVN: openser:[5866] trunk

by Daniel-Constantin Mierla

Revision: 5866 http://openser.svn.sourceforge.net/openser/?rev=5866&view=rev Author: miconda Date: 2009-06-01 22:17:22 +0000 (Mon, 01 Jun 2009) Log Message: ----------- - updated email address Modified Paths: -------------- trunk/AUTHORS trunk/packaging/debian/copyright trunk/packaging/debian-etch/copyright trunk/packaging/netbsd/DESCR trunk/packaging/netbsd/Makefile trunk/packaging/openbsd/pkg/DESCR trunk/packaging/rpm/kamailio.spec-4.1 trunk/packaging/rpm/kamailio.spec.SuSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 11 months

Compilation Error on OpenSUSE

by Edson Gellert Schubert

Just downloaded SR from repository and try to compile it on a OpenSUSE 11.1 VM machine. Not lucky.... No matter if I try 'make', 'make all' or 'make install'. Even 'make dist-clean' gives the same. The output is: Kamailio-151:~/sr/sip-router # make config.mak loaded Makefile.defs defs skipped /bin/sh: -c: line 0: syntax error near unexpected token `)' /bin/sh: -c: line 0: `echo CFG_DEFS:= -DNAME=\'\"ser\"\' -DVERSION=\'\"2.1.0-dev23-make\"\' -DARCH=\'\"i386\"\' -DOS=\'linux_\' -DOS_QUOTED=\'\"linux\"\' -DCOMPILER=\'\"gcc Linux)\"\' -D__CPU_i386 -D__OS_linux -DSER_VER=2001000 -DCFG_DIR=\'\"/usr/local/etc/ser/\"\' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DDBG_QM_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: *** No rule to make target `makecfg.lst', needed by `action.o'. Stop. Kamailio-151:~/sr/sip-router # Edson.

14 years, 11 months

Problems porting a module

by Raúl Alexis Betancor Santana

Hi all, I'm trying to use the call_control module from OpenSIPS on kamailio 1.5.1 and I'm stuck with and error that I'm not able to fix CallControl module could be directly compiled with kamailio 1.5.1 without any issue because it's a very simple module. But when testing, and I call call_control() from the script, I allways gets 2009-05-28T17:15:36+02:00 <daemon.err> test02 test02[9431]: ERROR:call_control:callcontrol_connect: failed to connect to /var/run/callcontrol.sock: No such file or directory 2009-05-28T17:15:36+02:00 <daemon.err> test02 test02[9431]: Call control: internal server error I have callcontrol running, and /var/run/callcontrol.sock exist and kamailio have the needed permission to work with it. Does anyone used the call_control module from OpenSIPS (no matter if with kamailio or with opensips) ? I tracked down the source to line 521 of call_control.c, on witch that error is printed out. Best regards -- Raúl Alexis Betancor Santana Dimensión Virtual

14 years, 11 months

← Newer
1
...
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009