sr-dev

sr-dev@lists.kamailio.org

15 participants
44218 discussions

git:master: dialog (k): lookup the index of timeout route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a4c2f8086781f27648b6796ed10a93b91103f6e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4c2f80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 28 12:26:13 2009 +0300 dialog (k): lookup the index of timeout route - sr can have str name for routes, therefore K mode is no longer valid --- modules_k/dialog/dlg_handlers.c | 2 +- modules_k/dialog/dlg_var.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 2b3d53d..0ebb4b1 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -964,7 +964,7 @@ void dlg_ontimeout( struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); - if(dlg->toroute>0 && dlg->toroute<RT_NO) + if(dlg->toroute>0 && main_rt.rlist[dlg->toroute]!=NULL) { dlg_set_ctx_dialog(dlg); fmsg = faked_msg_next(); diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 588e231..48710e5 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -20,6 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "../../route.h" + #include "dlg_var.h" dlg_ctx_t _dlg_ctx; @@ -68,6 +70,8 @@ int pv_set_dlg_ctx(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { int n; + char *rtp; + if(param==NULL) return -1; @@ -88,7 +92,17 @@ int pv_set_dlg_ctx(struct sip_msg* msg, pv_param_t *param, _dlg_ctx.to_bye = n; break; case 4: - _dlg_ctx.to_route = n; + if(val->flags&PV_VAL_STR) { + if(val->rs.s[val->rs.len]=='\0') + _dlg_ctx.to_route = route_lookup(&main_rt, val->rs.s); + else _dlg_ctx.to_route = 0; + } else { + if(n!=0) { + rtp = int2str(n, NULL); + _dlg_ctx.to_route = route_lookup(&main_rt, rtp); + } else _dlg_ctx.to_route = 0; + } + if(_dlg_ctx.to_route <0) _dlg_ctx.to_route = 0; break; default: _dlg_ctx.on = n;

15 years, 7 months

sip-router with/without tls/sctp

by jh＠tutpro.com

INSTALL document does not mention TLS and SCTP at all. is it so that TLS and SCTP support is automatically included by the make process? there is no comment in Makefile.defs on CORE_TLS variable. it that what is used to control if TLS support is included? in Makefile.defs there is also SCTP variable without any comment. is that what is used to control if SCTP support is included? -- juha

15 years, 7 months

git:master: * User-Agent and Server headers now contain string "SIP Router" .

by Juha Heinanen

Module: sip-router Branch: master Commit: 7d33b8097711d2ac70e3b160dab17b93aab4b39d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d33b80… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu May 28 09:30:59 2009 +0300 * User-Agent and Server headers now contain string "SIP Router". --- config.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.h b/config.h index e78d727..021d22a 100644 --- a/config.h +++ b/config.h @@ -85,11 +85,11 @@ #define CONTENT_LENGTH "Content-Length: " #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1) -#define USER_AGENT "User-Agent: Sip EXpress router"\ +#define USER_AGENT "User-Agent: SIP Router "\ "(" VERSION " (" ARCH "/" OS_QUOTED "))" #define USER_AGENT_LEN (sizeof(USER_AGENT)-1) -#define SERVER_HDR "Server: Sip EXpress router "\ +#define SERVER_HDR "Server: SIP Router "\ "(" VERSION " (" ARCH "/" OS_QUOTED "))" #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1)

15 years, 7 months

git:master: * Ported xmlrpc server blocking fix from OpenSIPS.

by Juha Heinanen

Module: sip-router Branch: master Commit: 9f6ac8e61b433fc81cd923e43e819c628be6ce88 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f6ac8e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed May 27 19:13:29 2009 +0300 * Ported xmlrpc server blocking fix from OpenSIPS. --- modules_k/mi_xmlrpc/abyss_server.c | 5 +++-- modules_k/mi_xmlrpc/abyss_socket.c | 7 +++++++ modules_k/mi_xmlrpc/abyss_socket.h | 6 ++++++ modules_k/mi_xmlrpc/abyss_socket_unix.c | 16 ++++++++++++++-- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/modules_k/mi_xmlrpc/abyss_server.c b/modules_k/mi_xmlrpc/abyss_server.c index c23606f..48219fc 100644 --- a/modules_k/mi_xmlrpc/abyss_server.c +++ b/modules_k/mi_xmlrpc/abyss_server.c @@ -1352,7 +1352,7 @@ waitForConnectionCapacity(outstandingConnList * const outstandingConnListP) { void ServerHandleSigchld(pid_t const pid) { - ThreadHandleSigchld(pid); + //ThreadHandleSigchld(pid); } #endif @@ -1388,7 +1388,6 @@ destroyConnSocket(void * const userHandle) { } -#include "../../dprint.h" static void serverRun2(TServer * const serverP) { @@ -1423,6 +1422,8 @@ serverRun2(TServer * const serverP) { if (!error) { addToOutstandingConnList(outstandingConnListP, connectionP); ConnProcess(connectionP); + SocketClose(connectedSocketP); + /* When connection is done (which could be later, courtesy of a background thread), destroyConnSocket() will destroy *connectedSocketP. diff --git a/modules_k/mi_xmlrpc/abyss_socket.c b/modules_k/mi_xmlrpc/abyss_socket.c index 8f3168a..7a367f0 100644 --- a/modules_k/mi_xmlrpc/abyss_socket.c +++ b/modules_k/mi_xmlrpc/abyss_socket.c @@ -147,6 +147,13 @@ SocketCreate(const struct TSocketVtbl * const vtblP, void +SocketClose(TSocket * const socketP) { + socketP->vtbl.close(socketP); +} + + + +void SocketDestroy(TSocket * const socketP) { assert(socketP->signature == socketSignature); diff --git a/modules_k/mi_xmlrpc/abyss_socket.h b/modules_k/mi_xmlrpc/abyss_socket.h index 000e099..90b429e 100644 --- a/modules_k/mi_xmlrpc/abyss_socket.h +++ b/modules_k/mi_xmlrpc/abyss_socket.h @@ -14,6 +14,8 @@ typedef struct in_addr TIPAddr; +typedef void SocketCloseImpl(TSocket * const socketP); + typedef void SocketDestroyImpl(TSocket * const socketP); typedef void SocketWriteImpl(TSocket * const socketP, @@ -57,6 +59,7 @@ typedef void SocketGetPeerNameImpl(TSocket * const socketP, abyss_bool * const successP); struct TSocketVtbl { + SocketCloseImpl * close; SocketDestroyImpl * destroy; SocketWriteImpl * write; SocketReadImpl * read; @@ -92,6 +95,9 @@ void SocketTerm(void); void +SocketClose(TSocket * const socketP); + +void SocketCreate(const struct TSocketVtbl * const vtblP, void * const implP, TSocket ** const socketPP); diff --git a/modules_k/mi_xmlrpc/abyss_socket_unix.c b/modules_k/mi_xmlrpc/abyss_socket_unix.c index cb87abd..c5bdccd 100644 --- a/modules_k/mi_xmlrpc/abyss_socket_unix.c +++ b/modules_k/mi_xmlrpc/abyss_socket_unix.c @@ -102,6 +102,7 @@ SocketUnixTerm(void) { +static SocketCloseImpl socketClose; static SocketDestroyImpl socketDestroy; static SocketWriteImpl socketWrite; static SocketReadImpl socketRead; @@ -116,6 +117,7 @@ static SocketGetPeerNameImpl socketGetPeerName; static struct TSocketVtbl const vtbl = { + &socketClose, &socketDestroy, &socketWrite, &socketRead, @@ -189,14 +191,24 @@ SocketUnixCreateFd(int const fd, } +static void +socketClose(TSocket * const socketP) { + + struct socketUnix * const socketUnixP = socketP->implP; + + if (!socketUnixP->userSuppliedFd && socketUnixP->fd ) { + close(socketUnixP->fd); + socketUnixP->fd = 0; + } +} + static void socketDestroy(TSocket * const socketP) { struct socketUnix * const socketUnixP = socketP->implP; - if (!socketUnixP->userSuppliedFd) - close(socketUnixP->fd); + socketClose(socketP); free(socketUnixP); }

15 years, 7 months

SF.net SVN: openser:[5860] branches/1.5/modules/mi_xmlrpc

by Juha Heinanen

Revision: 5860 http://openser.svn.sourceforge.net/openser/?rev=5860&view=rev Author: juhe Date: 2009-05-27 16:11:07 +0000 (Wed, 27 May 2009) Log Message: ----------- * Ported xmlrpc server blocking fix from OpenSIPs. Modified Paths: -------------- branches/1.5/modules/mi_xmlrpc/abyss_server.c branches/1.5/modules/mi_xmlrpc/abyss_socket.c branches/1.5/modules/mi_xmlrpc/abyss_socket.h branches/1.5/modules/mi_xmlrpc/abyss_socket_unix.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 7 months

#sip-router irc channel

by Daniel-Constantin Mierla

Hello, the irc fans that want to do "a more real-time chat" about using/developing sip router project, can join the #sip-router channel on irc.freenode.net. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 7 months

Development mailing lists moved

by Jan Janak

Hello, As announced earlier, mailing lists serdev(a)lists.iptel.org and devel(a)lists.kamailio.org have been merged into one. The address of the new mailing list is sr-dev(a)lists.sip-router.org and the administrative interface is available at http://lists.sip-router.org/cgi-bin/mailman/sr-dev This is the common new development mailing list for ser, kamailio, and sip-router projects. We will not be using the old mailing lists anymore, although their email addresses still exist and they are forwarded to the new mailing list. We migrated all subscribers from serdev(a)lists.iptel.org and devel(a)lists.kamailio.org to the new mailing list. Because mailman cannot migrate users while preserving all their settings, it is possible that some of the settings that you may have configured in the www interface of mailman got lost. If this is the case then, please, go to the www interface of the new mailing list at http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev and restore them manually. We apologize for this inconvenience, but mailman does not seem to offer any tool that would automate this process. Also, you may need to updated your email filters if you use them. The email address of the mailing list is sr-dev(a)lists.sip-router.org. The old mailing list addresses still work, thus you may occasionally see emails posted to serdev(a)iptel.org or devel(a)lists.kamailio.org. If you post an email to serdev(a)iptel.org or devel(a)lists.kamailio.org then it will be forwarded to this mailing list transparently. Archives of the two former mailing lists are still available at http://lists.iptel.org/pipermail/serdev http://lists.kamailio.org/pipermail/devel and they'll continue to be available there. We have no plans to move them elsewhere, because their locations are well known and they are referred from many other sites around the net. For your convenience the info page of the new list contains direct links to the old archives: http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev The new mailing list will receive commit logs from three source repositories: 1) SER cvs repository at Berlios 2) Kamailio SVN repository at Sourceforge 3) The shared git repository of sip-router We can redirect some of the commitlogs somewhere else later if this generates too much traffic. So, I hereby declare the mailing list open for all ser/kamailio/sip-router related traffic. Welcome everybody, have a lot of fun and hope to see you in many fruitful discussions :-). Jan (on behalf of ser and kamailio developer groups).

15 years, 7 months

SF.net SVN: openser:[5859] branches/1.5/modules/htable

by Daniel-Constantin Mierla

Revision: 5859 http://openser.svn.sourceforge.net/openser/?rev=5859&view=rev Author: miconda Date: 2009-05-26 17:48:46 +0000 (Tue, 26 May 2009) Log Message: ----------- - fix typo in MI command name and example Modified Paths: -------------- branches/1.5/modules/htable/README branches/1.5/modules/htable/doc/htable_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 7 months

git:master: * Case of proto argument of allow_trusted function is now ignored.

by Juha Heinanen

Module: sip-router Branch: master Commit: e3c45d02763b7869bb7a206a3310ee8f2441991b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3c45d0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue May 26 20:22:44 2009 +0300 * Case of proto argument of allow_trusted function is now ignored. --- modules_k/permissions/README | 759 +++++++++++++---------- modules_k/permissions/doc/permissions_admin.xml | 3 +- modules_k/permissions/trusted.c | 9 +- 3 files changed, 427 insertions(+), 344 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e3c…

15 years, 7 months

CVS:commitlog: sip_router NEWS cfg.y core_cmd.c main.c sctp_options.c sctp_options.h sctp_server.c

by Andrei Pelinescu-Onciul

andrei 2009/05/26 19:20:14 CEST SER CVS Repository Modified files: . NEWS cfg.y core_cmd.c main.c sctp_options.c sctp_options.h sctp_server.c Log: sctp: enable runtime changing for some of the cfg vars Migrated sctp to the cfg. framework. All config variables can be interrogated at runtime using the cfg.get rpc (e.g. $ sercmd cfg.get sctp send_ttl) and some of them can also be changed (send_ttl and send_retries for now). Revision Changes Path 1.102 +4 -1 sip_router/NEWS http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/NEWS.diff?r1=1.101… 1.177 +6 -6 sip_router/cfg.y http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.y.diff?r1=1.17… 1.37 +8 -7 sip_router/core_cmd.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/core_cmd.c.diff?r1… 1.275 +8 -2 sip_router/main.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/main.c.diff?r1=1.2… 1.5 +67 -15 sip_router/sctp_options.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.c.dif… 1.3 +14 -9 sip_router/sctp_options.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.h.dif… 1.25 +30 -20 sip_router/sctp_server.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_server.c.diff…

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