sr-dev

sr-dev@lists.kamailio.org

13 participants
44204 discussions

git:master: Removing mysql modules from modules_s

by Jan Janak

Module: sip-router Branch: master Commit: 0ff99279dda4f2cb69745dcf4fd1594d2a241ee2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ff9927… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 01:24:24 2009 +0200 Removing mysql modules from modules_s The module has already been merged with kamailio db_mysql and the new module is in modules directory --- modules_s/mysql/Makefile | 26 - modules_s/mysql/doc/mysql_parser.dia | Bin 2461 -> 0 bytes modules_s/mysql/my_cmd.c | 1345 ---------------------------------- modules_s/mysql/my_cmd.h | 73 -- modules_s/mysql/my_con.c | 195 ----- modules_s/mysql/my_con.h | 69 -- modules_s/mysql/my_fld.c | 65 -- modules_s/mysql/my_fld.h | 54 -- modules_s/mysql/my_res.c | 80 -- modules_s/mysql/my_res.h | 41 - modules_s/mysql/my_uri.c | 282 ------- modules_s/mysql/my_uri.h | 51 -- modules_s/mysql/mysql_mod.c | 146 ---- modules_s/mysql/mysql_mod.h | 52 -- 14 files changed, 0 insertions(+), 2479 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0ff…

15 years, 8 months

git:master: * Modules: presence

by Juha Heinanen

Module: sip-router Branch: master Commit: 9c73b883ea0d30cd1f51933179404c5123b5429f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c73b88… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Apr 23 20:12:57 2009 +0300 * Modules: presence Changed an INFO log into DBG log and improved logged information. --- modules_k/presence/presence.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 703050c..13b74ae 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -1160,7 +1160,9 @@ static int pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) LM_ERR( "getting status from rules document\n"); goto err; } - LM_INFO("subs.status= %d\n", subs.status); + LM_DBG("auth status of watcher <%.*s> on presentity <%.*s> is %d\n", + watcher_uri.len, watcher_uri.s, presentity_uri.len, presentity_uri.s, + subs.status); pkg_free(rules_doc->s); pkg_free(rules_doc); return subs.status;

15 years, 8 months

git:master: makefiles: minor COREPATH fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 3514d04ce924dbb536ddd598f4df0c81cd561dec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3514d04… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 15:45:39 2009 +0200 makefiles: minor COREPATH fixes - COREPATH must now be always defined because of the longer makefile include chain. --- Makefile | 2 +- Makefile.doc | 3 ++- lib/Makefile | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0bd375e..4079bb7 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,7 @@ endif auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc auto_gen_others=cfg.tab.h # auto generated, non-c +COREPATH=. #include source related defs include Makefile.sources #include special targets lists @@ -389,7 +390,6 @@ include Makefile.shared ifeq ($(config_mak),1) -COREPATH=. include Makefile.cfg else diff --git a/Makefile.doc b/Makefile.doc index 46cb1a5..64985bc 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -14,6 +14,7 @@ DOCUMENTS ?= index # Makefiles # ROOT_DIR ?= ../../.. +COREPATH ?=$(ROOT_DIR) # # Output directory where files produced by XSL stylesheets should be stored, @@ -179,7 +180,7 @@ ifeq (,$(MAKECMDGOALS)) include $(dep_files) else ifeq (,$(strip $(nodep_targets))) -include $(ROOT_DIR)/Makefile.targets +include $(COREPATH)/Makefile.targets endif ifneq (,$(filter-out $(nodep_targets) check, $(MAKECMDGOALS))) include $(dep_files) diff --git a/lib/Makefile b/lib/Makefile index 353b76f..1b22fd9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,6 +25,7 @@ subdirs: $(SUBDIRS) $(SUBDIRS): -@echo "Making $(sub_goals) in $@" ; $(MAKE) $(sub_goals) -C $@ +COREPATH=.. include ../Makefile.targets all: subdirs

15 years, 8 months

git:master: Merge commit 'origin/ser_core_cvs'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 69f3a24eea65fb7663a0910f63239787327c3488 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69f3a24… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 14:33:37 2009 +0200 Merge commit 'origin/ser_core_cvs' * commit 'origin/ser_core_cvs': tcp: added missing blacklist on write pollerr makefiles: minor fix (use COREPATH in Makefile.targets) makefile: config and modules.lst minor fixes makefile.doc: support all targets and dep. fixes doc (INSTALL): minor make update makefiles: fixes and speed-ups makefiles: typo fixed Conflicts: Makefile.doc Makefile.rules Makefile.targets ---

15 years, 8 months

git:master: makefiles: added Makefile.utils

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c6f75a7e56f02abd271649797d2fa1db91ee1b16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6f75a7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 15:44:41 2009 +0200 makefiles: added Makefile.utils - added Makefile.utils - updated utils/{gen_ha1,sercmd} to use it --- Makefile.utils | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ utils/gen_ha1/Makefile | 6 +--- utils/sercmd/Makefile | 9 ++--- 3 files changed, 86 insertions(+), 10 deletions(-) diff --git a/Makefile.utils b/Makefile.utils new file mode 100644 index 0000000..8c31594 --- /dev/null +++ b/Makefile.utils @@ -0,0 +1,81 @@ +# +# $Id$ +# +# utils Makefile +#(to be included from each util/ subdirectory) +# +# History: +# -------- +# 2009-04-23 initial version derived from Makefile.modules (andrei) + + +# default path to the core makefiles +COREPATH ?=../.. + +ALLDEP=Makefile $(COREPATH)/Makefile.sources $(COREPATH)/Makefile.rules \ + $(COREPATH)/Makefile.utils $(COREPATH)/Makefile.dirs $(COREPATH)/config.mak + +#override modules value, an util cannot have submodules +override modules= +override static_modules= +override static_modules_path= + +ifneq ($(makefile_defs_included),1) +$(error "the local makefile does not include Makefile.defs!") +endif + +ifeq ($(MAKELEVEL), 0) +# make called directly in the module dir! + +else +# called by the main Makefile + +ALLDEP+=$(COREPATH)/Makefile + +endif + +include $(COREPATH)/Makefile.sources + + +# if config was not loaded (makefile_defs!=1) ignore +# the rest of makefile and try only to remake the config +ifeq ($(makefile_defs),1) + + +include $(COREPATH)/Makefile.dirs +include $(COREPATH)/Makefile.targets +include $(COREPATH)/Makefile.rules + +modules: + +# README build rules +ifneq (,$(wildcard doc/Makefile)) +#doc/Makefile present => we can generate README + +README: doc/*.xml + $(MAKE) -C doc $(MOD_NAME).txt + mv doc/$(MOD_NAME).txt $@ + +else +# do nothing + +README: +endif + +#man page build rules +ifneq (,$(wildcard $(MOD_NAME).xml)) + +$(MOD_NAME).7: $(MOD_NAME).xml + docbook2x-man -s ../../doc/stylesheets/serdoc2man.xsl $< + +man: $(MOD_NAME).7 + +else + +man: + +endif + +endif # ifeq($(makefile_defs),1) + +include $(COREPATH)/Makefile.cfg diff --git a/utils/gen_ha1/Makefile b/utils/gen_ha1/Makefile index 92c3553..79e4d58 100644 --- a/utils/gen_ha1/Makefile +++ b/utils/gen_ha1/Makefile @@ -10,8 +10,4 @@ NAME=gen_ha1 LIBS=../../md5.o -include ../../Makefile.sources -include ../../Makefile.targets -include ../../Makefile.rules - -modules: +include ../../Makefile.utils diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index a70260d..b762ab6 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -1,7 +1,7 @@ # $Id$ - -include ../../Makefile.defs -include ../../Makefile.targets +COREPATH=../.. +include $(COREPATH)/Makefile.defs +include $(COREPATH)/Makefile.targets auto_gen= NAME=sercmd @@ -43,8 +43,7 @@ ifeq ($(use_readline),1) endif -include ../../Makefile.sources -include ../../Makefile.rules +include $(COREPATH)/Makefile.utils ifeq (,$(quiet)) ifeq ($(use_readline),1)

15 years, 8 months

SR-Users-ES maillist

by Iñaki Baz Castillo

Hi, for the spanish speakers community there is a maillist about Sip-Router: http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users-es This maillist has been merged with the previous Kamailio Users-es maillist, so the maillist history remains. Best regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

15 years, 8 months

git:master: tls (common):Revert "Replace TCP_BUF_SIZE with a cfg_get(..)."

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: dcf7195d5dc28097f88b0e6841aa7c805244c22b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dcf7195… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 13:09:40 2009 +0200 tls (common):Revert "Replace TCP_BUF_SIZE with a cfg_get(..)." This reverts commit 29b0138a7ce09cab1024e25ac457cb8915a973da. (bad fix) --- modules/tls/tls_server.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 6795dec..32d8b28 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -45,7 +45,6 @@ #include "../../timer.h" #include "../../globals.h" #include "../../pt.h" -#include "../../tcp_options.h" #include "tls_init.h" #include "tls_domain.h" @@ -814,7 +813,7 @@ int tls_h_read(struct tcp_connection * c) SSL* ssl; r = &c->req; - bytes_free = cfg_get(tcp, tcp_cfg, rd_buf_size) - (int)(r->pos - r->buf); + bytes_free = TCP_BUF_SIZE - (int)(r->pos - r->buf); if (bytes_free == 0) { ERR("Buffer overrun, dropping\n");

15 years, 8 months

git:master: tls: ser_cert.sh portability fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8843ff67a4714b735fd8d00a770671a5e7f950c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8843ff6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 13:37:27 2009 +0000 tls: ser_cert.sh portability fixes - check if hostname supports -f, before trying it (else fallback to hostname without parameters). - check if getops supports long options (bsd and darwin versions do not). If not use only short options. --- modules/tls/ser_cert.sh | 51 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 10 deletions(-) diff --git a/modules/tls/ser_cert.sh b/modules/tls/ser_cert.sh index 046f1c6..4bfb8fc 100755 --- a/modules/tls/ser_cert.sh +++ b/modules/tls/ser_cert.sh @@ -19,8 +19,33 @@ DEFAULT_KEY_FILENAME="ser-selfsigned.key" DEFAULT_OPENSSL='openssl' HOSTNAME=`hostname -s` -FQDN=`hostname -f` -MAILNAME=`cat /etc/mailname 2> /dev/null || hostname -f` +if hostname -f >/dev/null 2>/dev/null ; then + FQDN=`hostname -f` +else + FQDN=`hostname` +fi +MAILNAME=`cat /etc/mailname 2> /dev/null || echo $FQDN` + +# test if we have the normal or enhanced getopt +getopt -T >/dev/null +if [ $? == 4 ]; then + LONGOPTS_SUPPORTED=1 +fi + +longopts() { + if [ -z "${LONGOPTS_SUPPORTED}"]; then + exit; + fi + case "$1" in + -h) echo ', --help';; + -d) echo ', --dir' ;; + -c) echo ', --certificate';; + -k) echo ', --key';; + -e) echo ', --expires';; + -i) echo ', --info';; + -o) echo ', --overwrite' ;; + esac +} usage() { cat <<EOF @@ -41,30 +66,30 @@ DESCRIPTION the options below). OPTIONS - -h, --help + -h`longopts -h` Display this help text. - -d, --dir=DIRECTORY + -d`longopts -d` The path to the directory where cert and key files will be stored. (Default value is '$DEFAULT_DIR') - -c, --certificate=FILENAME + -c`longopts -c` The name of the file where the certificate will be stored. (Default value is '$DEFAULT_CERT_FILENAME') - -k, --key=FILENAME + -k`longopts -k` The name of the file where the private key will be stored. (Default value is '$DEFAULT_KEY_FILENAME') - -e, --expires=DAYS + -e`longopts -e` Number of days for which the certificate will be valid. (Default value is '$DEFAULT_DAYS') - -i, --info=TEXT + -i`longopts -i` The description text to be embedded in the certificate. (Default value is '$DEFAULT_INFO') - -o, --overwrite + -o`longopts -o` Overwrite certificate and key files if they exist already. (By default they will be not overwritten.) @@ -88,7 +113,13 @@ if [ -z "$CERT_FILENAME" ] ; then CERT_FILENAME=$DEFAULT_CERT_FILENAME; fi; if [ -z "$KEY_FILENAME" ] ; then KEY_FILENAME=$DEFAULT_KEY_FILENAME; fi; if [ -z "$OPENSSL" ] ; then OPENSSL=$DEFAULT_OPENSSL; fi; -TEMP=`getopt -o hd:c:k:e:i:o --long help,dir:,certificate:,key:,expires:,info:,overwrite -n $COMMAND -- "$@"` +if [ -n "${LONGOPTS_SUPPORTED}" ]; then + # enhanced version + TEMP=`getopt -o hd:c:k:e:i:o --long help,dir:,certificate:,key:,expires:,info:,overwrite -n $COMMAND -- "$@"` +else + # basic version + TEMP=`getopt hd:c:k:e:i:o "$@"` +fi if [ $? != 0 ] ; then exit 1; fi eval set -- "$TEMP"

15 years, 8 months

git:master: tls: fixed missing TCP_BUF_SIZE

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b8c2f391dad82675340b99df64ab9c10e67ac003 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8c2f39… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Apr 20 14:16:02 2009 +0000 tls: fixed missing TCP_BUF_SIZE - updated to the dynamic buffers used now for the tcp connections Reported-by: Alfred E. Heggestad, aeh at db org --- modules/tls/tls_server.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 32d8b28..1054438 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -799,6 +799,62 @@ again: } + +/* nonblocking version */ +int tls_h_nonblocking_write(struct tcp_connection *c, int fd, const char *buf, + unsigned int len) +{ + int err, n; + + n = 0; + if (tls_update_fd(c, fd) < 0) goto error; +again: + err = 0; + if (c->state == S_CONN_CONNECT) { + if (tls_connect(c, &err) < 0) goto error; + } else if (c->state == S_CONN_ACCEPT) { + if (tls_accept(c, &err) < 0) goto error; + } + if (c->state!=S_CONN_CONNECT && c->state!=S_CONN_ACCEPT){ + n = tls_write(c, buf, len, &err); + if (n < 0) { + DBG("tls_write error %d (ssl %d)\n", n, err); + goto error; + } else if (n==len){ + goto end; + }else{ + DBG("%ld bytes still need to be written\n", + (long)(len - n)); + } + }else + n=0; /* no bytes written */ + + switch(err){ + /* TODO: set some flag: WANT_READ, WANT_WRITE */ + case 0: + case SSL_ERROR_WANT_WRITE: + break; + case SSL_ERROR_WANT_READ: + break; +#if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ + case SSL_ERROR_WANT_ACCEPT: +#endif + case SSL_ERROR_WANT_CONNECT: + DBG("re-trying accept/connect\n"); + break; + default: + BUG("Unhandled SSL error %d\n", err); + goto error; + } + +error: + return -1; +end: + return n; +} + + + /* * called only when a connection is in S_CONN_OK, we do not have to care * about accepting or connecting here, each modification of ssl data @@ -813,7 +869,7 @@ int tls_h_read(struct tcp_connection * c) SSL* ssl; r = &c->req; - bytes_free = TCP_BUF_SIZE - (int)(r->pos - r->buf); + bytes_free = c->req.b_size - (int)(r->pos - r->buf); if (bytes_free == 0) { ERR("Buffer overrun, dropping\n");

15 years, 8 months

git:master: tls: don't start if tcp is in async mode

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 024a23ebba44e94f2e6fe588bb06ef5a84740304 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=024a23e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Apr 20 14:22:54 2009 +0000 tls: don't start if tcp is in async mode - added check for tcp async mode on startup. If tcp is in async mode and tls_force_run is not set, refuse to start and print an error message (tls does not support yet tcp async mode). --- modules/tls/tls_mod.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 436785f..7f79ce8 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -308,6 +308,12 @@ static int mod_init(void) "(set enable_tls=1 in the config to enable it)\n"); return 0; } + + if (cfg_get(tcp, tcp_cfg, async) && !tls_force_run){ + ERR("tls does not support tcp in async mode, please use" + " tcp_async=no in the config file\n"); + return -1; + } /* Convert tls_method parameter to integer */ method = tls_parse_method(&tls_method); if (method < 0) {

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev