sr-dev

sr-dev@lists.kamailio.org

44307 discussions

Summary of Devel Meeting, Berlin 2010

by Daniel-Constantin Mierla

Hello, fyi: summary of the devel meeting in Berlin, June 8, 2010, was uploaded to: http://sip-router.org/wiki/meetings/berlin-2010-minutes Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

14 years, 7 months

git:andrei/tcp_tls_changes: tcp: support for tls partial encoding

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: e316312628e61cbded9b991d21385b4e8180b538 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e316312… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 5 14:44:14 2010 +0200 tcp: support for tls partial encoding The tls_encode() callback supports now partial encoding. It can encode only part of the input buffer (e.g. tls partial write enabled and not enough space in the internal buffers for all the tls records) and ask to be called back later with the remaining un-encoded part. The send flags are also passed to it, so that it can modify them if needed (e.g. reset SND_F_CON_CLOSE on partial tls write or when reading some data is needed before continuing the tls write). --- tcp_main.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++------------ tls_hooks.h | 19 ++++-- 2 files changed, 199 insertions(+), 50 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e31…

14 years, 7 months

git:andrei/tcp_tls_changes: tls: support for partial encoding and reseting send_flags

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: a08385f531dd0bf1044c8495e6e47c9aabfebd8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a08385f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 5 15:23:02 2010 +0200 tls: support for partial encoding and reseting send_flags Support for the extended version of the tls_encode() callback. On partial tls write and no more space in the internal static buffers for more records, return what records were encoded so far and ask to be called again after they are sent. When exiting after a partial write or after postponing the encode until more data has been read (WANT_READ), make sure that any request to close the connection after the first successful tcp level write will be postponed (reset SND_F_CON_CLOSE). --- modules/tls/tls_server.c | 56 ++++++++++++++++++++++++++++++++++++++------- modules/tls/tls_server.h | 4 ++- 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 600653c..f6d822c 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -607,16 +607,31 @@ typedef int (*tcp_low_level_send_t)(int fd, struct tcp_connection *c, * It is a callback that will be called by the tcp code, before a send * on TLS would be attempted. It should replace the input buffer with a * new static buffer containing the TLS processed data. + * If the input buffer could not be fully encoded (e.g. run out of space + * in the internal static buffer), it should set rest_buf and rest_len to + * the remaining part, so that it could be called again once the output has + * been used (sent). The send_flags used are also passed and they can be + * changed (e.g. to disallow a close() after a partial encode). * WARNING: it must always be called with c->write_lock held! * @param c - tcp connection * @param pbuf - pointer to buffer (value/result, on success it will be * replaced with a static buffer). * @param plen - pointer to buffer size (value/result, on success it will be * replaced with the size of the replacement buffer. + * @param rest_buf - (result) should be filled with a pointer to the + * remaining unencoded part of the original buffer if any, + * 0 otherwise. + * @param rest_len - (result) should be filled with the length of the + * remaining unencoded part of the original buffer (0 if + * the original buffer was fully encoded). + * @param send_flags - pointer to the send_flags that will be used for sending + * the message. * @return *plen on success (>=0), < 0 on error. */ int tls_encode_f(struct tcp_connection *c, - const char* *pbuf, unsigned int* plen) + const char** pbuf, unsigned int* plen, + const char** rest_buf, unsigned int* rest_len, + snd_flags_t* send_flags) { int n, offs; SSL* ssl; @@ -631,8 +646,11 @@ int tls_encode_f(struct tcp_connection *c, buf = *pbuf; len = *plen; - TLS_WR_TRACE("(%p, %p, %d) start (%s:%d* -> %s)\n", - c, buf, len, ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port, + *rest_buf = 0; + *rest_len = 0; + TLS_WR_TRACE("(%p, %p, %d, ... 0x%0x) start (%s:%d* -> %s)\n", + c, buf, len, send_flags->f, + ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port, su2a(&c->rcv.src_su, sizeof(c->rcv.src_su))); n = 0; offs = 0; @@ -656,6 +674,10 @@ int tls_encode_f(struct tcp_connection *c, c, tls_c->ct_wq?tls_c->ct_wq->queued:0); goto error_wq_full; } + /* buffer queued for a future send attempt, after first reading + some data (key exchange) => don't allow immediate closing of + the connection */ + send_flags->f &= ~SND_F_CON_CLOSE; goto end; } if (unlikely(tls_set_mbufs(c, &rd, &wr) < 0)) { @@ -718,12 +740,28 @@ redo_wr: goto error_wq_full; } tls_c->flags |= F_TLS_CON_WR_WANTS_RD; + /* buffer queued for a future send attempt, after first + reading some data (key exchange) => don't allow immediate + closing of the connection */ + send_flags->f &= ~SND_F_CON_CLOSE; break; /* or goto end */ case SSL_ERROR_WANT_WRITE: - /* error, no record fits in the buffer */ - BUG("write buffer too small (%d/%d bytes)\n", - wr.used, wr.size); - goto bug; + if (unlikely(offs == 0)) { + /* error, no record fits in the buffer or + no partial write enabled and buffer to small to fit + all the records */ + BUG("write buffer too small (%d/%d bytes)\n", + wr.used, wr.size); + goto bug; + } else { + /* offs != 0 => something was "written" */ + *rest_buf = buf + offs; + *rest_len = len - offs; + /* this function should be called again => disallow + immediate closing of the connection */ + send_flags->f &= ~SND_F_CON_CLOSE; + } + break; /* or goto end */ #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT: /* only if the underlying BIO is not yet connected @@ -772,8 +810,8 @@ redo_wr: end: *pbuf = (const char*)wr.buf; *plen = wr.used; - TLS_WR_TRACE("(%p) end (offs %d) => %d \n", - c, offs, *plen); + TLS_WR_TRACE("(%p) end (offs %d, rest_buf=%p rest_len=%d 0x%0x) => %d \n", + c, offs, *rest_buf, *rest_len, send_flags->f, *plen); return *plen; error: /*error_send:*/ diff --git a/modules/tls/tls_server.h b/modules/tls/tls_server.h index ba28067..62047d5 100644 --- a/modules/tls/tls_server.h +++ b/modules/tls/tls_server.h @@ -84,7 +84,9 @@ void tls_h_tcpconn_clean(struct tcp_connection *c); void tls_h_close(struct tcp_connection *c, int fd); int tls_encode_f(struct tcp_connection *c, - const char ** pbuf, unsigned int* plen); + const char ** pbuf, unsigned int* plen, + const char** rest_buf, unsigned int* rest_len, + snd_flags_t* send_flags) ; int tls_read_f(struct tcp_connection *c, int* flags);

14 years, 7 months

Dialog module: "CRITICAL bogus event 6 in state 2

by Klaus Feichtinger

Hello list, under special circumstances I have a problem with the DIALOG module of SIP-Router/Kamailio version 3.0.2. The dialog module is used in combination with presence, presence_xml, pua, pua_usrloc and pua_dialoginfo modules + db_mysql modules. The db_mode is set to "write_through", because of redundancy requirements. >From my point of view this problem has something to do with timing in general. E.g. a so called "data call" has a duration of about 50 ms only; INVITE....BYE). That problem occurs on this short calls only. Because of the problems in the dialog state machine, NOTIFY messages are incorrect. Even when the call is already finished, the NOTIFY message includes the state "confirmed" and causes a wrong status indication.... The detailed error message can be seen here: "Jun 9 16:00:39 debian /usr/sbin/kamailio[14992]: CRITICAL: dialog [dlg_hash.c:591]: bogus event 6 in state 2 for dlg [dialog-ID] with clid [Call-ID] and tags '1299370188-28358304-1276092068837' ''" I found in old mails of the developer list another error that looked nearly the same, but it differed in the event and state of the dialog state machine (the thread can be found under the link http://www.mail-archive.com/devel@lists.kamailio.org/msg03234.html). That bug should - according the information that I've found in the list - be solved. Therefore I will ask you: is the error as displayed above another well known error / bug, which (maybe) should already be solved? Is it a new bug? Thanks for any information. regards, Klaus Feichtinger -- GMX DSL: Internet-, Telefon- und Handy-Flat ab 19,99 EUR/mtl. Bis zu 150 EUR Startguthaben inklusive! http://portal.gmx.net/de/go/dsl

14 years, 7 months

git:master: modules_k: ratelimit - removing rl_drop functionality

by Ovidiu Sas

Module: sip-router Branch: master Commit: 9f652c9de2e95671aecae2cdce00fb6c15a265ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f652c9… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jul 2 18:45:22 2010 -0400 modules_k: ratelimit - removing rl_drop functionality - rl_drop is now obsolete: same functionality can be achieved by invoking: append_to_reply("Retry-After: 5\r\n"); sl_send_reply("503","Limiting"); - sl dependency was also removed and therefore the module can be used in both s and k configurations. --- modules_k/ratelimit/config.c | 52 ------------------ modules_k/ratelimit/config.h | 41 -------------- modules_k/ratelimit/ratelimit.c | 113 --------------------------------------- 3 files changed, 0 insertions(+), 206 deletions(-) diff --git a/modules_k/ratelimit/config.c b/modules_k/ratelimit/config.c deleted file mode 100644 index dc6ade1..0000000 --- a/modules_k/ratelimit/config.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2008 iptelorg GmbH - * - * This file is part of SIP-router, a free SIP server. - * - * SIP-router is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * SIP-router is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * History - * ------- - * 2008-02-05 adapting tm module for the configuration framework (Miklos) - */ - -/*! - * \file - * \brief TM :: Configuration - * \ingroup tm - */ - - -#include "../../cfg/cfg.h" -#include "../../parser/msg_parser.h" /* method types */ - -#include "config.h" - -struct cfg_group_ratelimit default_ratelimit_cfg = { - DEFAULT_REPLY_CODE, - DEFAULT_REPLY_REASON -}; - -void *ratelimit_cfg = &default_ratelimit_cfg; - -cfg_def_t ratelimit_cfg_def[] = { - {"reply_code", CFG_VAR_INT | CFG_ATOMIC, 400, 699, 0, 0, - "The code of the reply sent by Kamailio while limiting." }, - {"reply_reason", CFG_VAR_STRING, 0, 0, 0, 0, - "The reason of the reply sent by Kamailio while limiting."}, - {0, 0, 0, 0, 0, 0} -}; diff --git a/modules_k/ratelimit/config.h b/modules_k/ratelimit/config.h deleted file mode 100644 index 5ce3e26..0000000 --- a/modules_k/ratelimit/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * $Id$ - * - * SIP-router is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/*! - * \file - * \brief Ratelimit :: Configuration - * \ingroup ratelimit - */ - - -#ifndef _RATELIMIT_CONFIG_H -#define _RATELIMIT_CONFIG_H - - -#include "../../cfg/cfg.h" -#include "../../str.h" - - -#define DEFAULT_REPLY_CODE 503 -#define DEFAULT_REPLY_REASON "Server Unavailable" - -struct cfg_group_ratelimit { - unsigned int reply_code; - char* reply_reason; -}; - -extern struct cfg_group_ratelimit default_ratelimit_cfg; -extern void *ratelimit_cfg; -extern cfg_def_t ratelimit_cfg_def[]; - -#endif diff --git a/modules_k/ratelimit/ratelimit.c b/modules_k/ratelimit/ratelimit.c index ed73e32..b949c68 100644 --- a/modules_k/ratelimit/ratelimit.c +++ b/modules_k/ratelimit/ratelimit.c @@ -49,11 +49,9 @@ #include "../../data_lump.h" #include "../../data_lump_rpl.h" #include "../../lib/kcore/statistics.h" -#include "../sl/sl_api.h" #include "../../lib/kcore/km_ut.h" #include "../../rpc_lookup.h" -#include "config.h" MODULE_VERSION @@ -69,9 +67,6 @@ MODULE_VERSION #define RXL(m, str, i) (m)[i].rm_eo - (m)[i].rm_so #define RXS(m, str, i) (str) + (m)[i].rm_so -/** SL binds */ -struct sl_binds slb; - static inline int str_cmp(const str * a, const str * b); static inline int str_i_cmp(const str * a, const str * b); @@ -210,9 +205,6 @@ static ticks_t rl_timer_handle(ticks_t, struct timer_ln*, void*); static int w_rl_check_default(struct sip_msg*, char *, char *); static int w_rl_check_forced(struct sip_msg*, char *, char *); static int w_rl_check_forced_pipe(struct sip_msg*, char *, char *); -static int w_rl_drop_default(struct sip_msg*, char *, char *); -static int w_rl_drop_forced(struct sip_msg*, char *, char *); -static int w_rl_drop(struct sip_msg*, char *, char *); static int add_queue_params(modparam_t, void *); static int add_pipe_params(modparam_t, void *); /* RESERVED for future use @@ -225,17 +217,12 @@ static cmd_export_t cmds[]={ {"rl_check", (cmd_function)w_rl_check_forced, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|LOCAL_ROUTE}, {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, fixup_uint_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"rl_drop", (cmd_function)w_rl_drop_default, 0, 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"rl_drop", (cmd_function)w_rl_drop_forced, 1, fixup_uint_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"rl_drop", (cmd_function)w_rl_drop, 2, fixup_uint_uint, 0, REQUEST_ROUTE|LOCAL_ROUTE}, {0,0,0,0,0,0} }; static param_export_t params[]={ {"timer_interval", INT_PARAM, &timer_interval}, {"queue", STR_PARAM|USE_FUNC_PARAM, (void *)add_queue_params}, {"pipe", STR_PARAM|USE_FUNC_PARAM, (void *)add_pipe_params}, - {"reply_code", INT_PARAM, &default_ratelimit_cfg.reply_code}, - {"reply_reason", STR_PARAM, &default_ratelimit_cfg.reply_reason}, /* RESERVED for future use {"load_source", STR_PARAM|USE_FUNC_PARAM, (void *)set_load_source}, */ @@ -439,12 +426,6 @@ static int mod_init(void) timer_init(rl_timer, rl_timer_handle, 0, F_TIMER_FAST); timer_add(rl_timer, MS_TO_TICKS(1500)); /* Start it after 1500ms */ - /* load the SL API */ - if (load_sl_api(&slb)!=0) { - LM_ERR("failed to load SL API\n"); - return -1; - } - network_load_value = shm_malloc(sizeof(int)); if (network_load_value==NULL) { LM_ERR("oom for network_load_value\n"); @@ -497,13 +478,6 @@ static int mod_init(void) return -1; } - /* load configurations*/ - if( cfg_declare("ratelimit", ratelimit_cfg_def, &default_ratelimit_cfg, cfg_sizeof(ratelimit), - &ratelimit_cfg )){ - LM_ERR("failed to declare the configuration"); - return -1; - } - *network_load_value = 0; *load_value = 0.0; *load_source = load_source_mp; @@ -685,93 +659,6 @@ static void destroy(void) } -static int rl_drop(struct sip_msg * msg, unsigned int low, unsigned int high) -{ - str hdr; - int ret; - int drop_code; - str drop_reason; - - LM_DBG("(%d, %d)\n", low, high); - - if (slb.send_reply != 0) { - if ( (drop_code = cfg_get(ratelimit, ratelimit_cfg, reply_code)) == 0 ) - drop_code = DEFAULT_REPLY_CODE; - - if ( (drop_reason.s = cfg_get(ratelimit, ratelimit_cfg, reply_reason)) == 0 ) - drop_reason.s = DEFAULT_REPLY_REASON; - drop_reason.len = strlen(drop_reason.s); - - if (low != 0 && high != 0) { - hdr.s = (char *)pkg_malloc(64); - if (hdr.s == 0) { - LM_ERR("Can't allocate memory for Retry-After header\n"); - return 0; - } - hdr.len = 0; - if (! hdr.s) { - LM_ERR("no memory for hdr\n"); - return 0; - } - - if (high == low) { - hdr.len = snprintf(hdr.s, 63, "Retry-After: %d\r\n", low); - } else { - hdr.len = snprintf(hdr.s, 63, "Retry-After: %d\r\n", - low + rand() % (high - low + 1)); - } - - if (add_lump_rpl(msg, hdr.s, hdr.len, LUMP_RPL_HDR)==0) { - LM_ERR("Can't add header\n"); - pkg_free(hdr.s); - return 0; - } - ret = slb.send_reply(msg, drop_code, &drop_reason); - - pkg_free(hdr.s); - } else { - ret = slb.send_reply(msg, drop_code, &drop_reason); - } - } else { - LM_ERR("Can't send reply\n"); - return 0; - } - return ret; -} - -static int w_rl_drop(struct sip_msg* msg, char *p1, char *p2) -{ - unsigned int low, high; - - low = (unsigned int)(unsigned long)p1; - high = (unsigned int)(unsigned long)p2; - - if (high < low) { - return rl_drop(msg, low, low); - } else { - return rl_drop(msg, low, high); - } -} - -static int w_rl_drop_forced(struct sip_msg* msg, char *p1, char *p2) -{ - unsigned int i; - - if (p1) { - i = (unsigned int)(unsigned long)p1; - LM_DBG("send retry in %d s\n", i); - } else { - i = 5; - LM_DBG("send default retry in %d s\n", i); - } - return rl_drop(msg, i, i); -} - -static int w_rl_drop_default(struct sip_msg* msg, char *p1, char *p2) -{ - return rl_drop(msg, 0, 0); -} - static inline int str_cmp(const str * a , const str * b) { return ! (a->len == b->len && ! strncmp(a->s, b->s, a->len));

14 years, 7 months

seas module for sip-router

by Elias Baixas

Hello all, I have been working on the seas module to make it work on sip-router. I have my own git branch locally, but I'd like to share it on the sip-router public git so that others can take a look and finally push it to the master branch. it needs some transaction-module changes, so it needs good review from other more tm-knowledgable coders before it can be finally merged. where do I need to send my public ssh key to get commit access to the sip-router git ? thanks Elias

14 years, 7 months

building sip-router statically with restricted set of modules

by Timo Reimann

Heya, I've been trying to build sip-router statically, that is, create a single binary that includes a few selected modules from the modules/ and modules_k/ directories only (ser modules aren't required in my case). So far, I haven't had much luck: I tried passing various combinations of modules, include_modules, and static_modules parameters to `make' but to no avail. The Makefile jungle is quite vast too -- I couldn't make much sense out of it either in order to debug what I was doing wrong. Any help is appreciated. Cheers, --Timo

14 years, 7 months

SF.net SVN: openser:[6014] branches/1.5/modules/dialog/dlg_hash.c

by Marius Zbihlei

Revision: 6014 http://openser.svn.sourceforge.net/openser/?rev=6014&view=rev Author: mariuszbihlei Date: 2010-07-05 14:46:48 +0000 (Mon, 05 Jul 2010) Log Message: ----------- Do not consider in-early-dialog BYE requests to be bogus. Patch from Timo Reimann (timo.reimann at 1und1 dot de ) Modified Paths: -------------- branches/1.5/modules/dialog/dlg_hash.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 7 months

git:master: debugger: work on nicer output

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9a65f7d218a5740fb0196384e29e417efc755efb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a65f7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 5 10:37:22 2010 +0200 debugger: work on nicer output - output of dbg command to print action name along with type, making it more user friendly and easy to understand --- modules/debugger/debugger_act.c | 139 +++++++++++++++++++++++++++++++++++++++ modules/debugger/debugger_act.h | 34 ++++++++++ modules/debugger/debugger_api.c | 99 +++++++++++++++++++++++++-- 3 files changed, 264 insertions(+), 8 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9a6…

14 years, 7 months

git:master: core: typos in comments

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 39ac6a5c0a7833ad0c29ae7711f37b92c5c81e95 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39ac6a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 5 10:36:58 2010 +0200 core: typos in comments --- sr_module.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sr_module.h b/sr_module.h index 10afc55..b055c88 100644 --- a/sr_module.h +++ b/sr_module.h @@ -266,8 +266,8 @@ typedef struct fparam { avp_ident_t avp; /* AVP identifier */ select_t* select; /* select structure */ struct subst_expr* subst; /* Regex substitution */ - pv_spec_t* pvs; /* kamailo pseudo-vars */ - pv_elem_t* pve; /* kamailo pseudo-vars in a string */ + pv_spec_t* pvs; /* kamailio pseudo-vars */ + pv_elem_t* pve; /* kamailio pseudo-vars in a string */ } v; void *fixed; } fparam_t;

14 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