sr-dev August 2009

sr-dev@lists.kamailio.org

20 participants
75 discussions

git:master: tls: Set internal module name to "tls".

by Jan Janak

Module: sip-router Branch: master Commit: a2bae03c1760ea5764728e3611ee82161270bedd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2bae03… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Aug 7 13:35:39 2009 +0200 tls: Set internal module name to "tls". Set module name to "tls", not "tlsops". Reported by MÉSZÁROS Mihály <misi(a)niif.hu> --- modules/tls/tls_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 7f79ce8..f0499e2 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -224,7 +224,7 @@ static param_export_t params[] = { * Module interface */ struct module_exports exports = { - "tlsops", + "tls", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* Exported functions */ params, /* Exported parameters */

14 years, 9 months

SF.net SVN: openser:[5910] branches

by Henning Westerholt

Revision: 5910 http://openser.svn.sourceforge.net/openser/?rev=5910&view=rev Author: henningw Date: 2009-08-06 17:08:30 +0000 (Thu, 06 Aug 2009) Log Message: ----------- - fix error in auth_db documentation for calc_ha1 parameter Modified Paths: -------------- branches/1.3/modules/auth_db/README branches/1.3/modules/auth_db/doc/auth_db_user.sgml branches/1.4/modules/auth_db/README branches/1.4/modules/auth_db/doc/auth_db_admin.xml branches/1.5/modules/auth_db/README branches/1.5/modules/auth_db/doc/auth_db_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 9 months

SF.net SVN: openser:[5909] branches/1.5/modules/rls

by Elena-Ramona Modroiu

Revision: 5909 http://openser.svn.sourceforge.net/openser/?rev=5909&view=rev Author: anomarme Date: 2009-08-05 11:34:36 +0000 (Wed, 05 Aug 2009) Log Message: ----------- - fix memory leak Modified Paths: -------------- branches/1.5/modules/rls/notify.c branches/1.5/modules/rls/resource_notify.c branches/1.5/modules/rls/subscribe.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 9 months

SF.net SVN: openser:[5908] branches/1.5/modules/rls/subscribe.c

by Elena-Ramona Modroiu

Revision: 5908 http://openser.svn.sourceforge.net/openser/?rev=5908&view=rev Author: anomarme Date: 2009-08-04 15:47:21 +0000 (Tue, 04 Aug 2009) Log Message: ----------- - fixed supported header name Modified Paths: -------------- branches/1.5/modules/rls/subscribe.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 9 months

core events famework

by Daniel-Constantin Mierla

Hello, I committed in branch tmp/core_events a simple framework to execute callbacks by core in various cases. So far there are two defined events: for network data in and data out. I used it for implementing a topo-hiding module that is transparent for script writer and cope with stateless/stateful module in the same way. Now, about the new event framework. The core stores a structure with pointers to event manager callbacks. typedef int (*sr_event_cb_f)(void *data); typedef struct sr_event_cb { sr_event_cb_f net_data_in; sr_event_cb_f net_data_out; } sr_event_cb_t; The event manager can be implemented elsewhere, but the execution of call manager and implementation must be very tied. The event manager callback gets only one parameter, which is a void* and is specific per event, thus the implementation must know what is the content. So far, only one listener is needed for network data in/out events, thus the event manager does the processing, but if the event should trigger more functions from different parts of code, then the manager must take of handling them (registration, execution, etc...). You can download the branch and test the topoh module. It will be merged once we discuss and decide whether the new core events framework is the best for now, if something is missing, a.s.o. Feedback is very much appreciated. Cheers, Daniel -- Daniel-Constantin Mierla * SIP Router Bootcamp * Kamailio (OpenSER) and Asterisk Training * Berlin, Germany, Sep 1-4, 2009 * http://www.asipto.com/index.php/sip-router-bootcamp/

14 years, 9 months

git:tmp/core_events: core: execute callbacks for NET_DATA_IN and NET_DATA_OUT

by Daniel-Constantin Mierla

Module: sip-router Branch: tmp/core_events Commit: 88b792e4932b33700f5240be3923c19394c8e4d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88b792e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 4 16:43:30 2009 +0200 core: execute callbacks for NET_DATA_IN and NET_DATA_OUT - NET_DATA_IN is executed when a sip message is received. The callback may replace the content of incoming buffer, assuming BUF_SIZE for its size - NET_DATA_OUT is executed when a sip message is sent. The callback may replace the output buffer content with a new pkg location --- forward.h | 18 ++++++++++++++---- receive.c | 6 ++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/forward.h b/forward.h index 0a5750a..b486694 100644 --- a/forward.h +++ b/forward.h @@ -60,6 +60,7 @@ #endif #include "compiler_opt.h" +#include "events.h" enum ss_mismatch { @@ -114,9 +115,14 @@ int forward_reply( struct sip_msg* msg); * that generated them; use 0 if you don't want this) * buf, len = buffer * returns: 0 if ok, -1 on error*/ + static inline int msg_send(struct dest_info* dst, char* buf, int len) { struct dest_info new_dst; + str outb; + outb.s = buf; + outb.len = len; + sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb); if (likely(dst->proto==PROTO_UDP)){ if (unlikely((dst->send_sock==0) || @@ -129,7 +135,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) } dst=&new_dst; } - if (unlikely(udp_send(dst, buf, len)==-1)){ + if (unlikely(udp_send(dst, outb.s, outb.len)==-1)){ STATS_TX_DROPS; LOG(L_ERR, "msg_send: ERROR: udp_send failed\n"); goto error; @@ -143,7 +149,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) " support is disabled\n"); goto error; }else{ - if (unlikely(tcp_send(dst, 0, buf, len)<0)){ + if (unlikely(tcp_send(dst, 0, outb.s, outb.len)<0)){ STATS_TX_DROPS; LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n"); goto error; @@ -158,7 +164,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) " support is disabled\n"); goto error; }else{ - if (unlikely(tcp_send(dst, 0, buf, len)<0)){ + if (unlikely(tcp_send(dst, 0, outb.s, outb.len)<0)){ STATS_TX_DROPS; LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n"); goto error; @@ -184,7 +190,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) } dst=&new_dst; } - if (unlikely(sctp_msg_send(dst, buf, len)<0)){ + if (unlikely(sctp_msg_send(dst, outb.s, outb.len)<0)){ STATS_TX_DROPS; LOG(L_ERR, "msg_send: ERROR: sctp_msg_send failed\n"); goto error; @@ -196,8 +202,12 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) LOG(L_CRIT, "BUG: msg_send: unknown proto %d\n", dst->proto); goto error; } + if(outb.s != buf) + pkg_free(outb.s); return 0; error: + if(outb.s != buf) + pkg_free(outb.s); return -1; } diff --git a/receive.c b/receive.c index 824e693..579a6c2 100644 --- a/receive.c +++ b/receive.c @@ -98,6 +98,12 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) struct timezone tz; unsigned int diff; #endif + str inb; + + inb.s = buf; + inb.len = len; + sr_event_exec(SREV_NET_DATA_IN, (void*)&inb); + len = inb.len; msg=pkg_malloc(sizeof(struct sip_msg)); if (msg==0) {

14 years, 9 months

git:tmp/core_events: core: new sr events system

by Daniel-Constantin Mierla

Module: sip-router Branch: tmp/core_events Commit: 85acffe10f182c5d0cfb382f33ff5a2d1203524a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85acffe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 4 16:47:10 2009 +0200 core: new sr events system - designed to have small footprint in core - the goal is to execute a event manager function during core processing - event managers can be implemented in modules or elsewhere - two event types added: SREV_NET_DATA_IN and SREV_NET_DATA_OUT (see the other commit) --- events.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ events.h | 40 +++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 0 deletions(-) diff --git a/events.c b/events.c new file mode 100644 index 0000000..7ba5e34 --- /dev/null +++ b/events.c @@ -0,0 +1,90 @@ +/** + * $Id$ + * + * Copyright (C) 2009 SIP-Router.org + * + * This file is part of Extensible SIP Router, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "dprint.h" +#include "mem/mem.h" +#include "events.h" + +static sr_event_cb_t _sr_events_list; +static int _sr_events_inited = 0; + +void sr_event_cb_init(void) +{ + if(_sr_events_inited == 0) + { + memset(&_sr_events_list, 0, sizeof(sr_event_cb_t)); + _sr_events_inited = 1; + } +} + +int sr_event_register_cb(int type, sr_event_cb_f f) +{ + sr_event_cb_init(); + switch(type) { + case SREV_NET_DATA_IN: + if(_sr_events_list.net_data_in==0) + _sr_events_list.net_data_in = f; + else return -1; + break; + case SREV_NET_DATA_OUT: + if(_sr_events_list.net_data_out==0) + _sr_events_list.net_data_out = f; + else return -1; + break; + default: + return -1; + } + return 0; +} + +int sr_event_exec(int type, void *data) +{ + int ret; + str *p; + switch(type) { + case SREV_NET_DATA_IN: + if(_sr_events_list.net_data_in!=0) + { + p = (str*)data; + LM_DBG("PRE-IN ++++++++++++++++++++++++++++++++\n" + "%.*s\n+++++\n", p->len, p->s); + ret = _sr_events_list.net_data_in(data); + LM_DBG("POST-IN ++++++++++++++++++++++++++++++++\n" + "%.*s\n+++++\n", p->len, p->s); + return ret; + } else return 1; + break; + case SREV_NET_DATA_OUT: + if(_sr_events_list.net_data_out!=0) + { + p = (str*)data; + LM_DBG("PRE-OUT ++++++++++++++++++++\n" + "%.*s\n+++++++++++++++++++\n", p->len, p->s); + ret = _sr_events_list.net_data_out(data); + LM_DBG("POST-OUT ++++++++++++++++++++\n" + "%.*s\n+++++++++++++++++++\n", p->len, p->s); + return ret; + } else return 1; + break; + default: + return -1; + } +} + diff --git a/events.h b/events.h new file mode 100644 index 0000000..9fda619 --- /dev/null +++ b/events.h @@ -0,0 +1,40 @@ +/** + * $Id$ + * + * Copyright (C) 2009 SIP-Router.org + * + * This file is part of Extensible SIP Router, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _SR_EVENTS_H_ +#define _SR_EVENTS_H_ + +#include "parser/msg_parser.h" + +#define SREV_NET_DATA_IN 1 +#define SREV_NET_DATA_OUT 2 + +typedef int (*sr_event_cb_f)(void *data); + +typedef struct sr_event_cb { + sr_event_cb_f net_data_in; + sr_event_cb_f net_data_out; +} sr_event_cb_t; + +void sr_event_cb_init(void); +int sr_event_register_cb(int type, sr_event_cb_f f); +int sr_event_exec(int type, void *data); + +#endif

14 years, 9 months

git:tmp/core_events: topoh: new module for hiding topology details

by Daniel-Constantin Mierla

Module: sip-router Branch: tmp/core_events Commit: b16b129457bb7f1198fab78bea367e5c19ea8ca7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b16b129… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 4 16:53:44 2009 +0200 topoh: new module for hiding topology details - transparent for script writer and processing type (stateless, stateful) - it is not affected by server restart - can handle cloud deployments by using same secret key --- modules/topoh/Makefile | 15 + modules/topoh/README | 186 ++++++++ modules/topoh/doc/Makefile | 4 + modules/topoh/doc/topoh.xml | 37 ++ modules/topoh/doc/topoh_admin.xml | 198 ++++++++ modules/topoh/th_mask.c | 175 +++++++ modules/topoh/th_mask.h | 30 ++ modules/topoh/th_msg.c | 913 +++++++++++++++++++++++++++++++++++++ modules/topoh/th_msg.h | 45 ++ modules/topoh/topoh_mod.c | 332 ++++++++++++++ 10 files changed, 1935 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b16…

14 years, 9 months

QjSimple 0.6.3 - sip phone for linux, macosx and windows

by Daniel-Constantin Mierla

Thanks to Klaus Darilion, QjSimple 0.6.3 works on most of desktop OS: Linux(es), Windows and Mac OS X. It is a very handy application, especially for developers, but not olny, with simple UI and debugger window. A perfect replacement (for my very old good Linux testing tool) KPhone since QjSimple has SIMPLE presence support, tls ... more at: http://www.ipcom.at/index.php?id=560/ Cheers, Daniel -- Daniel-Constantin Mierla * SIP Router Bootcamp * Kamailio (OpenSER) and Asterisk Training * Berlin, Germany, Sep 1-4, 2009 * http://www.asipto.com/index.php/sip-router-bootcamp/

14 years, 9 months

git:master: presence_xml: define _DARWIN_C_SOURCE 1

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cabd988384344a485377b817da4dc49ab0151a91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cabd988… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 3 15:54:54 2009 +0200 presence_xml: define _DARWIN_C_SOURCE 1 - compile the module on darwin, workaround for strptime --- modules_k/presence_xml/pidf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_xml/pidf.c b/modules_k/presence_xml/pidf.c index 36eb2a5..95b0a47 100644 --- a/modules_k/presence_xml/pidf.c +++ b/modules_k/presence_xml/pidf.c @@ -41,6 +41,7 @@ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect of the above define on features.h/unistd.h syscall() */ + #define _DARWIN_C_SOURCE 1 #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

14 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2009