sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 3375ff25bc672fc198fffa99bb23f59877031cd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3375ff2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 22 09:00:37 2009 +0000 makefiles: typo fixed s/mantainer/maintainer/ --- Makefile.rules | 6 +++--- Makefile.targets | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 665fcf7..f1ea045 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -198,12 +198,12 @@ mrproper: clean done \ fi -.PHONY: mantainer-cleaan -mantainer-clean: distclean +.PHONY: maintainer-clean +maintainer-clean: distclean -rm -f TAGS tags *.dbg .*.swp -@for r in $(modules) "" ; do \ if [ -d "$$r" ]; then \ - $(MAKE) -C $$r mantainer-clean; \ + $(MAKE) -C $$r maintainer-clean; \ fi ; \ done diff --git a/Makefile.targets b/Makefile.targets index 39e7f7b..8ccae76 100644 --- a/Makefile.targets +++ b/Makefile.targets @@ -13,7 +13,7 @@ # 2008-06-26 initial version (andrei) # -clean_targets:= clean proper distclean realclean mantainer-clean clean_libs \ +clean_targets:= clean proper distclean realclean maintainer-clean clean_libs \ clean-all proper-all distclean-all realclean-all \ clean_cfg clean_modules_cfg clean-modules-cfg doc_targets:= modules-doc modules-readme README modules-man man \

15 years, 8 months

git:ser_core_cvs: doc (INSTALL): minor make update

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: ad9c95e3dd5ef93bd1cb734235c0eb267ed8c67e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad9c95e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 22 13:46:56 2009 +0000 doc (INSTALL): minor make update --- INSTALL | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index eca400b..4618835 100644 --- a/INSTALL +++ b/INSTALL @@ -343,13 +343,29 @@ Example: make modules-list include_modules="tls" skip_modules="print" Clean: make clean (clean the modules too) -make proper (clean also the dependencies and the config) +make proper (clean also the dependencies and the config, but not the module + list) make distclean (the same as proper) -make mantainer-clean (clean everything, including make's config, saved +make maintainer-clean (clean everything, including make's config, saved module list, auto generated files, tags, *.dbg a.s.o) make clean-all (clean all the modules in modules/*) make proper-all (like make proper but for all the modules in modules/*) +Config clean: + +make clean_cfg (cleans the compile config) +make clean-modules-cfg (cleans the modules list) + +"Reduced" clean: + +make local-clean (cleans only the core, no libs, utils or modules) +make clean-modules (like make clean, but cleans only the modules) +make clean-libs (like make clean, but cleans only the libs) +make clean-utils (like make clean, but cleans only the utils +make proper-modules (like make proper, but only for modules) +make proper-libs (like make proper, but only for libs) +make proper-utils (like make proper, but only for utils) + Compile: make proper

15 years, 8 months

git:ser_core_cvs: makefiles: fixes and speed-ups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 8ca5d8dda4250da35e041833d4427ea8cfd28bfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ca5d8d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 22 13:46:30 2009 +0000 makefiles: fixes and speed-ups - make clean, proper, realclean, distclean and maintainer-clean will work on all the libs in the lib/ directory. - clean, proper, realclean, distclean and maintainer-clean targets split into more specific targets: local-clean, clean-modules, clean-libs, clean-utils (and the same for the others) => make proper & friends depend now only on the really needed parts => much faster. - doc directories are entered only if a Makefile is present. - make maintainer-clean properly deletes the config and the modules list at the end (it doesn't recreate it). --- Makefile | 27 ++++++++++++++++++---- Makefile.libs | 9 ++----- Makefile.rules | 66 ++++++++++++++++++++++++++++++++++++----------------- Makefile.targets | 11 +++++++- lib/Makefile | 11 +++++--- 5 files changed, 86 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index 003ba26..98ff4d2 100644 --- a/Makefile +++ b/Makefile @@ -763,23 +763,40 @@ install-modules-man: modules-man $(man_prefix)/$(man_dir)/man7 done; true -.PHONY: clean_libs +# libs cleaning targets +.PHONY: clean-libs +clean-libs: + $(MAKE) -C lib clean -clean_libs: - $(MAKE) -C lib proper +.PHONY: proper-libs realclean-libs distclean-libs maintainer-clean-libs +proper-libs realclean-libs distclean-libs maintainer-clean-libs: + $(MAKE) -C lib $(patsubst %-libs,%,$@) +# clean modules on make clean +clean: clean-modules +# clean utils on make clean +clean: clean-utils # cleaning in libs always when cleaning ser -clean: clean_libs +clean: clean-libs + +# proper/distclean a.s.o modules, utils and libs too + +proper: proper-modules proper-utils proper-libs +distclean: distclean-modules distclean-utils distclean-libs +realclean: realclean-modules realclean-utils realclean-libs +maintainer-clean: maintainer-clean-modules maintainer-clean-utils \ + maintainer-clean-libs #try to clean everything (including all the modules, even ones that are not # configured/compiled normally .PHONY: clean-all clean-all: modules=$(modules_all) clean-all: clean +maintainer-clean: modules=$(modules_all) # on make proper clean also the build config (w/o module list) -proper realclean distclean: clean_cfg +proper realclean distclean maintainer-clean: clean_cfg # on maintainer clean, remove also the configured module list maintainer-clean: clean_modules_cfg diff --git a/Makefile.libs b/Makefile.libs index d780dd3..d1f6f3e 100644 --- a/Makefile.libs +++ b/Makefile.libs @@ -123,16 +123,13 @@ link_clean: -@rm -f $(LIB_RUNTIME_NAME) -@rm -f $(LIB_LINK_NAME) -clean: link_clean +local-clean: link_clean -ifneq ($(strip $(LIBINAME_F)),) .PHONY: libiname_clean - libiname_clean: - -@rm -f "$(LIBINAME_F)" + -@rm -f libiname.lst -clean: libiname_clean -endif +local-clean: libiname_clean $(lib_prefix)/$(lib_dir): mkdir -p $(lib_prefix)/$(lib_dir) diff --git a/Makefile.rules b/Makefile.rules index f1ea045..ad51d49 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -158,54 +158,78 @@ dep: $(depends) .PHONY: static static: $(objs) -.PHONY: clean -clean: +# clean only the current directory (no modules or utils) +# (it's usefull to have it separated from clean for speeding up make proper) +.PHONY: local-clean +local-clean: -@rm -f $(objs) $(NAME) $(objs:.o=.il) librpath.lst 2>/dev/null + +.PHONY: clean +clean: local-clean + +.PHONY: clean-modules +clean-modules: -@for r in $(modules) $(static_modules_path) "" ; do \ if [ -d "$$r" ]; then \ echo "module $$r" ; \ - $(MAKE) -C $$r clean ; \ - $(MAKE) -C $$r/doc clean ; \ + $(MAKE) -C "$$r" clean ; \ + [ -d "$$r"/doc/Makefile ] && $(MAKE) -C "$$r"/doc clean ; \ fi ; \ - done + done + +.PHONY: clean-utils +clean-utils: @if [ -n "$(modules)" ]; then \ for r in $(utils_compile) "" ; do \ if [ -d "$$r" ]; then \ - $(MAKE) -C $$r clean ; \ + $(MAKE) -C "$$r" clean ; \ fi ; \ done \ fi +# make proper for the local directory .PHONY: proper .PHONY: distclean .PHONY: realclean -proper realclean distclean: mrproper - -mrproper: clean +.PHONY: maintainer-clean +proper distclean realclean maintainer-clean: local-clean -@rm -f $(depends) $(auto_gen) $(auto_gen_others) \ makecfg.lst 2>/dev/null + +maintainer-clean: clean-tmp + +.PHONY: proper-modules +.PHONY: distclean-modules +.PHONY: realclean-modules +.PHONY: maintainer-clean-modules +proper-modules realclean-modules distclean-modules maintainer-clean-modules: \ + clean_target=$(patsubst %-modules,%,$@) +proper-modules realclean-modules distclean-modules maintainer-clean-modules: -@for r in $(modules) "" ; do \ if [ -d "$$r" ]; then \ - $(MAKE) -C $$r proper ; \ - $(MAKE) -C $$r/doc proper ; \ + $(MAKE) -C "$$r" $(clean_target); \ + [ -r "$$r"/doc/Makefile ] && $(MAKE) -C "$$r"/doc $(clean_target);\ fi ; \ - done + done + +.PHONY: proper-utils +.PHONY: distclean-utils +.PHONY: realclean-utils +.PHONY: maintainer-clean-utils +proper-utils realclean-utils distclean-utils maintainer-clean-utils: \ + clean_target=$(patsubst %-utils,%,$@) +proper-utils realclean-utils distclean-utils maintainer-clean-utils: @if [ -n "$(modules)" ]; then \ for r in $(utils_compile) "" ; do \ if [ -d "$$r" ]; then \ - $(MAKE) -C $$r proper ; \ + $(MAKE) -C "$$r" $(clean_target); \ fi ; \ done \ fi -.PHONY: maintainer-clean -maintainer-clean: distclean - -rm -f TAGS tags *.dbg .*.swp - -@for r in $(modules) "" ; do \ - if [ -d "$$r" ]; then \ - $(MAKE) -C $$r maintainer-clean; \ - fi ; \ - done +.PHONY: clean-tmp +clean-tmp: + -@rm -f TAGS tags *.dbg .*.swp .PHONY: doxygen diff --git a/Makefile.targets b/Makefile.targets index 8ccae76..8f287ab 100644 --- a/Makefile.targets +++ b/Makefile.targets @@ -13,9 +13,16 @@ # 2008-06-26 initial version (andrei) # -clean_targets:= clean proper distclean realclean maintainer-clean clean_libs \ +clean_targets:= clean proper distclean realclean maintainer-clean local-clean \ clean-all proper-all distclean-all realclean-all \ - clean_cfg clean_modules_cfg clean-modules-cfg + clean_cfg clean_modules_cfg clean-modules-cfg \ + clean-modules proper-modules realclean-modules \ + distclean-modules maintainer-clean-modules \ + clean-utils proper-utils realclean-utils distclean-utils \ + maintaner-clean-utils \ + clean-libs proper-libs realclean-libs distclean-libs \ + maintainer-clean-libs \ + clean-tmp clean_doxygen doc_targets:= modules-doc modules-readme README modules-man man \ install-doc install-modules-doc install-man install-ser-man \ install-modules-man diff --git a/lib/Makefile b/lib/Makefile index 01bbc1d..353b76f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -7,7 +7,10 @@ # -SUBDIRS=binrpc cds xcap presence shm_regex +#SUBDIRS=binrpc cds xcap presence shm_regex + +SUBDIRS=$(filter-out CVS doc $(lib_exclude), $(strip \ + $(patsubst %/Makefile,%,$(wildcard */Makefile)))) .PHONY: subdirs $(SUBDIRS) @@ -22,11 +25,11 @@ subdirs: $(SUBDIRS) $(SUBDIRS): -@echo "Making $(sub_goals) in $@" ; $(MAKE) $(sub_goals) -C $@ -all: subdirs +include ../Makefile.targets -proper: clean +all: subdirs -clean: subdirs +$(clean_targets): subdirs install: subdirs

15 years, 8 months

git:ser_core_cvs: makefile.doc: support all targets and dep. fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 7b3e3db2f2e88e5f86f4988cada5c293e83e12ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b3e3db… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 22 13:48:36 2009 +0000 makefile.doc: support all targets and dep. fixes - support all the *clean and *proper targets - include dependencies only if needed --- Makefile.doc | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile.doc b/Makefile.doc index 4cc6791..095aa3c 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -147,15 +147,25 @@ clean: @rm -f $(pdf_files) @rm -f $(html_files) -.PHONY: proper realclean distclean -proper realclean distclean: clean +.PHONY: proper distclean realclean maintainer-clean +proper realclean distclean maintainer-clean: clean @rm -f $(dep_files) *~ +maintainer-clean: clean-tmp + +.PHONY: clean-tmp +clean-tmp: + -rm -f TAGS tags *.dbg .*.swp + + ifeq (,$(MAKECMDGOALS)) include $(dep_files) +else +ifeq (,$(strip $(nodep_targets))) +include $(ROOT_DIR)/Makefile.targets endif -ifneq (,$(filter-out clean proper realclean distclean check, $(MAKECMDGOALS))) +ifneq (,$(filter-out $(nodep_targets) check, $(MAKECMDGOALS))) include $(dep_files) endif - +endif

15 years, 8 months

git:ser_core_cvs: makefile: config and modules.lst minor fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 3f52ab26d1bcdbb6c03e1ba94b5b48b8880404e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f52ab2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 22 15:09:13 2009 +0000 makefile: config and modules.lst minor fixes - don't build the config on clean (even if not present) - don't build the modules.lst unless needed (don't build it on clean, core only make a.s.o) --- INSTALL | 2 +- Makefile | 28 +++++++++++++++++++++------- Makefile.targets | 5 +++-- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/INSTALL b/INSTALL index 4618835..4d659b0 100644 --- a/INSTALL +++ b/INSTALL @@ -353,7 +353,7 @@ make proper-all (like make proper but for all the modules in modules/*) Config clean: -make clean_cfg (cleans the compile config) +make clean-cfg (cleans the compile config) make clean-modules-cfg (cleans the modules list) "Reduced" clean: diff --git a/Makefile b/Makefile index 98ff4d2..2c87003 100644 --- a/Makefile +++ b/Makefile @@ -59,6 +59,8 @@ # 2009-04-02 workaround for export not supported in gnu make 3.80 # target specific variables: use mk_params for each # $(MAKE) invocation (andrei) +# 2009-04-22 don't rebuild config.mak or modules.lst if not needed +# (e.g. on clean) (andrei) # # check make version @@ -76,6 +78,8 @@ auto_gen_others=cfg.tab.h # auto generated, non-c #include source related defs include Makefile.sources +#include special targets lists +include Makefile.targets # whether or not the entire build process should fail if building a module or # an utility fails @@ -93,7 +97,15 @@ skip_modules?= # Alternatives are txt, html, xhtml, and pdf (see Makefile.doc) doc_format?=html +# don't force modules.lst generation if the makefile goals do not +# require it (but if present use it) +ifeq (,$(strip $(filter-out $(clean_targets) $(aux_targets),$(MAKECMDGOALS)))) +ifneq (,$(strip $(wildcard modules.lst))) +-include modules.lst +endif +else include modules.lst +endif # ifneq (,$(strip $(filter-out ...,$(MAKECMDGOALS)))) #if called with group_include, ignore the modules from modules.lst ifneq ($(group_include),) @@ -221,15 +233,17 @@ ALLDEP=config.mak Makefile Makefile.sources Makefile.rules #C_DEFS:= -# try saved cfg, unless we are in the process of building it -ifeq (,$(filter config.mak config cfg cfg-defs,$(MAKECMDGOALS))) +# try saved cfg, unless we are in the process of building it or if we're doing +# a clean +ifeq (,$(strip \ + $(filter config.mak config cfg cfg-defs $(clean_targets),$(MAKECMDGOALS)))) include config.mak ifeq ($(makefile_defs),1) $(info config.mak loaded) # config_make valid & used config_mak=1 endif -else +else # config.mak doesn't need to be used ifneq (,$(filter cfg config cfg-defs,$(word 1,$(MAKECMDGOALS)))) # needed here to avoid starting a config submake # (e.g. rm -f config.mak; make config.mak), which would either require @@ -318,7 +332,6 @@ ifneq ($(TLS),) endif # include the common rules -include Makefile.targets include Makefile.rules #extra targets @@ -366,13 +379,14 @@ modules.lst: @$(call cfg_save_var2,modules,$@) @echo "modules_configured:=1" >>$@ + .PHONY: cfg config cfg-defs cfg-defs: config.mak cfg config: cfg-defs modules-cfg .PHONY: modules-cfg modules-list modules-lst -modules-cfg modules-list modules-lst: +modules-cfg modules-list modules-lst: rm -f modules.lst $(MAKE) modules.lst @@ -806,8 +820,8 @@ proper-all realclean-all distclean-all: modules=$(modules_all) proper-all realclean-all distclean-all: proper -.PHONY: clean_cfg -clean_cfg: +.PHONY: clean_cfg clean-cfg +clean_cfg clean-cfg: rm -f config.mak .PHONY: clean_modules_cfg clean-modules-cfg diff --git a/Makefile.targets b/Makefile.targets index 8f287ab..ec187a1 100644 --- a/Makefile.targets +++ b/Makefile.targets @@ -15,7 +15,7 @@ clean_targets:= clean proper distclean realclean maintainer-clean local-clean \ clean-all proper-all distclean-all realclean-all \ - clean_cfg clean_modules_cfg clean-modules-cfg \ + clean_cfg clean-cfg clean_modules_cfg clean-modules-cfg \ clean-modules proper-modules realclean-modules \ distclean-modules maintainer-clean-modules \ clean-utils proper-utils realclean-utils distclean-utils \ @@ -28,7 +28,8 @@ doc_targets:= modules-doc modules-readme README modules-man man \ install-modules-man # auxiliary: maintance, debugging, etc. (don't affect code/objects) aux_targets:= TAGS tar dist cfg-defs cfg config config.mak print-modules \ - dbg dbinstall librpath.lst makecfg.lst modules.lst + dbg dbinstall librpath.lst makecfg.lst modules.lst modules-cfg \ + modules-list modules-lst # other targets that don't produce code in the current directory ("external") ext_targets:= modules libs utils \ install-cfg install-modules install-utils install-modules-all \

15 years, 8 months

git:ser_core_cvs: makefiles: minor fix (use COREPATH in Makefile.targets)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 7d07255cf1b5bb363342225101b10720d2681922 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d07255… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 07:56:42 2009 +0000 makefiles: minor fix (use COREPATH in Makefile.targets) --- Makefile.rules | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index ad51d49..5c6c21a 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -254,7 +254,7 @@ ifeq (,$(MAKECMDGOALS)) -include $(depends) else ifeq (,$(strip $(nodep_targets))) -include Makefile.targets +include $(COREPATH)/Makefile.targets endif ifneq (,$(filter-out $(nodep_targets),$(MAKECMDGOALS))) -include $(depends)

15 years, 8 months

git:ser_core_cvs: tcp: added missing blacklist on write pollerr

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: fb751cbfd2713f9d36156d4fc30f4499022a1390 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb751cb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 08:56:00 2009 +0000 tcp: added missing blacklist on write pollerr Reported-and-tested-by: Vladimir Marek <vlada(a)iptel.org> --- tcp_main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 4f93154..21c4c80 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3499,11 +3499,21 @@ inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, } if (unlikely(ev & POLLERR)){ if (unlikely(tcpconn->state=S_CONN_CONNECT)){ +#ifdef USE_DST_BLACKLIST + if (cfg_get(core, core_cfg, use_dst_blacklist)) + dst_blacklist_su(BLST_ERR_CONNECT, tcpconn->rcv.proto, + &tcpconn->rcv.src_su, 0); +#endif /* USE_DST_BLACKLIST */ TCP_EV_CONNECT_ERR(0, TCP_LADDR(tcpconn), TCP_LPORT(tcpconn), TCP_PSU(tcpconn), TCP_PROTO(tcpconn)); TCP_STATS_CONNECT_FAILED(); }else{ +#ifdef USE_DST_BLACKLIST + if (cfg_get(core, core_cfg, use_dst_blacklist)) + dst_blacklist_su(BLST_ERR_SEND, tcpconn->rcv.proto, + &tcpconn->rcv.src_su, 0); +#endif /* USE_DST_BLACKLIST */ TCP_STATS_CON_RESET(); /* FIXME: it could != RST */ } }

15 years, 8 months

git:ser_modules: Merge branch 'cvs-head' of git://git.sip-router.org/ ser_modules into ser_modules

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: 35ce8821dd8065830ac14939fa562ab5e658247a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35ce882… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 23 12:48:41 2009 +0200 Merge branch 'cvs-head' of git://git.sip-router.org/ser_modules into ser_modules * 'cvs-head' of git://git.sip-router.org/ser_modules: tls: don't start if tcp is in async mode tls: fixed missing TCP_BUF_SIZE ---

15 years, 8 months

git:ser_modules: tls: fixed missing TCP_BUF_SIZE

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: 5c0cb12bf52adf2847a1c2e894a8c5e944485c21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c0cb12… 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_s/tls/tls_server.c | 58 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/modules_s/tls/tls_server.c b/modules_s/tls/tls_server.c index 32d8b28..1054438 100644 --- a/modules_s/tls/tls_server.c +++ b/modules_s/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:ser_modules: tls: don't start if tcp is in async mode

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: d9b7afae582a4d497eddc6eacbbc1690d030cbb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9b7afa… 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_s/tls/tls_mod.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules_s/tls/tls_mod.c b/modules_s/tls/tls_mod.c index 7c1b56a..a68a6c6 100644 --- a/modules_s/tls/tls_mod.c +++ b/modules_s/tls/tls_mod.c @@ -301,6 +301,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