sr-dev

sr-dev@lists.kamailio.org

44307 discussions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 69670e970984f2c4acf53383027904a33638371c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69670e9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 13 22:25:34 2010 +0200 core: fix unclosed comment (cherry picked from commit b4f7c405a7c15a950ce50561a5a61fb36d59bc28) --- io_wait.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/io_wait.c b/io_wait.c index 72e34ee..a7d0527 100644 --- a/io_wait.c +++ b/io_wait.c @@ -389,7 +389,7 @@ enum poll_types choose_poll_method() /* all DragonFly versions have kqueque */ #ifndef __OS_dragonfly if (_os_ver>=0x0401) /* if ver >= 4.1 */ - #endif /**__OS_dragonfly + #endif /**__OS_dragonfly */ #elif defined (__OS_netbsd) if (_os_ver>=0x020000) /* if ver >= 2.0 */ #elif defined (__OS_openbsd)

14 years, 5 months

git:sr_3.0: sercmd: fix LIBS - don't link -lresolv if not needed

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 31b02f9a0a2d80a43f318010dc8f200a2fa066fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31b02f9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 18:51:09 2010 +0200 sercmd: fix LIBS - don't link -lresolv if not needed - link with libresolv only on linux, solaris and darwin - on solaris link also witl -lxnet and -lnsl (bugs introduced in b0f00c3348b9) (cherry picked from commit e5978c182e4bd5d5c1d723d00e9f54ea958816c8) --- utils/sercmd/Makefile | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index 7072a7d..bc03b74 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -29,14 +29,29 @@ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ # from a module Makefile) #LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) +ifeq ($(OS), linux) + LIBS:= -lresolv +endif +ifeq ($(OS), solaris) + LIBS:= -lresolv -L$(LOCALBASE)/lib -lxnet -lnsl +endif +ifeq ($(OS), freebsd) + LIBS:= +endif ifeq ($(OS), dragonfly) LIBS:= -L$(LOCALBASE)/lib -else +endif +ifeq ($(OS), openbsd) + LIBS:= +endif +ifeq ($(OS), netbsd) + LIBS:= +endif +ifeq ($(OS), darwin) LIBS:= -lresolv endif - -ifeq ($(OS), solaris) - LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl +ifneq (,$(findstring cygwin, $(OS))) + LIBS:= -lresolv endif ifeq ($(use_readline),)

14 years, 5 months

git:sr_3.0: makefile: fix $DESTDIR

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 22350f4371eb7b7bf24c5bec32f8e083d587bc3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22350f4… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:40:41 2010 +0200 makefile: fix $DESTDIR This fixes Makefile.defs to properly handle $DESTDIR as a base installation directory for packaging, etc (equivalent to BASEDIR). Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit bef528185d7b2e6bfa4ae5ec4bfd4808e1dcf28f) --- Makefile.defs | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index cd5538d..5f3a550 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -263,9 +263,8 @@ endif # Doxygen directory doxygen_dir=doc/doxygen - # install location -DESTDIR ?= $(LOCALBASE) -PREFIX ?= $(DESTDIR) +# install location +PREFIX ?= $(LOCALBASE) prefix = $(PREFIX) # install path is $(basedir) $(prefix) # example: @@ -273,7 +272,7 @@ prefix = $(PREFIX) # basedir=/tmp # prefix=/usr/local -BASEDIR ?= +BASEDIR ?= $(DESTDIR) basedir = $(BASEDIR) # install prefixes for various stuff cfg_prefix = $(basedir)$(prefix)

14 years, 5 months

git:sr_3.0: sercmd: Patch to add Dragonfly BSD support (makefile)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 524e9b72859e67e5482ef6168581ee210c9c5d4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=524e9b7… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:49:40 2010 +0200 sercmd: Patch to add Dragonfly BSD support (makefile) Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit c39dd933973ba24b449c2b35756c593c093d5f4f) --- utils/sercmd/Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index fbf616d..7072a7d 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -29,7 +29,12 @@ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ # from a module Makefile) #LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) -LIBS:= -lresolv +ifeq ($(OS), dragonfly) + LIBS:= -L$(LOCALBASE)/lib +else + LIBS:= -lresolv +endif + ifeq ($(OS), solaris) LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl endif

14 years, 5 months

git:sr_3.0: makefile: Dragonfly BSD support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 75e5bc3dc823ec7b2abeec9f48360dbfa46d4836 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75e5bc3… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:58:04 2010 +0200 makefile: Dragonfly BSD support This also simplifies the platform directory path settings so that the ifeq() statements are not nested 5 levels deep. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit 7d27010d3aa8ead2d9fec4155c5146d4329b7c35) --- Makefile.defs | 89 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 75 insertions(+), 14 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 5f3a550..decc247 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -220,45 +220,54 @@ share_dir = share/$(MAIN_NAME)/ # lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k modules_dir = lib/$(MAIN_NAME)/ lib_dir = lib/$(MAIN_NAME)/ + +doc_dir = doc/$(MAIN_NAME)/ +man_dir = man/ +data_dir = $(MAIN_NAME)/ + ifeq ($(OS), linux) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = share/man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), freebsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), openbsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), netbsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/pkg -else -ifeq ($(OS), darwin) +endif + +ifeq ($(OS), dragonfly) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ - LOCALBASE ?= /usr/local -else - doc_dir = doc/$(MAIN_NAME)/ + LOCALBASE ?= /usr/pkg +endif + +ifeq ($(OS), darwin) + doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ - data_dir = $(MAIN_NAME)/ + data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local endif -endif -endif -endif -endif + +LOCALBASE ?= /usr/local # Doxygen directory doxygen_dir=doc/doxygen @@ -609,10 +618,18 @@ $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) # adds support for Application Server interface # Sometimes is needes correct non-quoted $OS. HACK: gcc translates known OS to number ('linux'), so there is added underscore +# Tell it that dragonflybsd is equivalent to compiling for freebsd. +# This will cause __OS_freebsd to be defined below. +ifeq ($(OS), dragonfly) + EQUIV_OS := freebsd +else + EQUIV_OS := $(OS) +endif + C_DEFS= $(extra_defs) \ -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ - -D__CPU_$(ARCH) -D__OS_$(OS) \ + -D__CPU_$(ARCH) -D__OS_$(EQUIV_OS) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ -DPKG_MALLOC \ @@ -1777,6 +1794,50 @@ $(info "old freebsd version (>= 7.0 needed) -- sctp disabled") endif # SCTP endif +ifeq ($(OS), dragonfly) + C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ + -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ + -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ + -DHAVE_NETINET_IN_SYSTM + ifneq ($(found_lock_method), yes) + C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems + found_lock_method=yes + LIBS+= -pthread #dlopen is in libc + else + LIBS= #dlopen is in libc + endif + # check for ver >= 4.1 + ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) + ifeq ($(NO_KQUEUE),) + C_DEFS+=-DHAVE_KQUEUE + endif + endif + ifeq ($(NO_SELECT),) + C_DEFS+=-DHAVE_SELECT + endif + YACC=yacc + # sctp support + ifeq ($(SCTP),1) + # test to see if the devfiles and lib are installed + sctp_dev_locations := /usr/include/netinet/sctp.h \ + $(LOCALBASE)/include/netinet/sctp.h + sctp_dev_path := $(wildcard $(sctp_dev_locations)) + ifeq ($(sctp_dev_path),) +$(info "sctp development files not installed -- sctp disabled") + override SCTP := + endif + ifeq ($(shell [ $(OSREL_N) -lt 7000 ] && echo sctp), sctp) +$(info "old freebsd version (>= 7.0 needed) -- sctp disabled") + override SCTP := + endif + + ifeq ($(SCTP),1) + C_DEFS+=-DUSE_SCTP + LIBS+= # no extra libs needed on freebsd + endif + endif # SCTP +endif + ifeq ($(OS), openbsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \ -DHAVE_UNION_SEMUN -DHAVE_MSGHDR_MSG_CONTROL \

14 years, 5 months

git:sr_3.0: NEWS: notes about Dragonfly BSD support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 1cfb5b678ec102cfa586babaf29618de5debc3bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cfb5b6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 17:04:14 2010 +0200 NEWS: notes about Dragonfly BSD support (cherry picked from commit f6b240d51684040572c75555b1f767df0100d970) --- INSTALL | 20 +++++++++++--------- NEWS | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL index d1731e3..9a8c0cd 100644 --- a/INSTALL +++ b/INSTALL @@ -10,18 +10,18 @@ $Id$ =========================================== Welcome to the SIP router! This is an amazingly flexible, robust - and secure SIP server built on years of experience in several Open + and secure SIP server built on years of experience in several Open Source projects. It's a merge of the SIP Express Router and the OpenSER/Kamailio products produced by a joint development team. This memo gives you hints how to set up SIP Router quickly. To understand how SIP Router works and how to configure it properly, - please read the admin's guide available from the SIP Router website. + please read the admin's guide available from the SIP Router website. - We also urge you to read latest ISSUES (available from SIP Router website + We also urge you to read latest ISSUES (available from SIP Router website too) and check for potential problems in this release. - Users of previous releases are encouraged to read NEWS to learn how to move to - this new SIP Router version. + Users of previous releases are encouraged to read NEWS to learn how to move + to this new SIP Router version. Table of Contents @@ -41,11 +41,13 @@ Table of Contents 1. Supported Architectures and Requirements ------------------------------------------- -Supported operating systems: Linux, FreeBSD, NetBSD, OpenBSD, Solaris, OS/X Darwin -Partially supported: Windows+Cygwin (core + static modules only, no IPv6, no TCP, -no dynamic modules) +Supported operating systems: Linux, FreeBSD, NetBSD, OpenBSD, Solaris, OS/X +Darwin, Dragonfly BSD. +Partially supported: Windows+Cygwin (core + static modules only, no IPv6, no +TCP, no dynamic modules) -Supported architectures: i386, x86_64 (amd64), armv4l, sparc64, powerpc, powerpc64 +Supported architectures: i386, x86_64 (amd64), armv4l, sparc64, powerpc, +powerpc64 Experimental architectures: mips1, mips2, sparc32, alpha (for other architectures the Makefiles might need to be edited) diff --git a/NEWS b/NEWS index 225eedc..247456e 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ $Id$ sip-router changes core: + - Dragonfly BSD support - type casts operators: (int), (str). - new operators eq, ne for string compares and ieq, ine for interger compares. The names are not yet final (use them at your own risk).

14 years, 5 months

git:sr_3.0: db_text(k) makefile: fix make use

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: d1c12a8b1facd9bfd65550264de796caad6116d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1c12a8… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:45:05 2010 +0200 db_text(k) makefile: fix make use This fixes a bug. It called make directly which breaks on platforms where it is being compiled under gmake. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit 5d8552087be74332c1a7812ffb01d8298060cc62) --- modules_k/db_text/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/db_text/Makefile b/modules_k/db_text/Makefile index dd35b11..36bc48b 100644 --- a/modules_k/db_text/Makefile +++ b/modules_k/db_text/Makefile @@ -24,7 +24,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-dbtext-scripts: $(bin_prefix)/$(bin_dir) - DBTEXTON=yes make -C ../../utils/kamctl/ install-modules + DBTEXTON=yes $(MAKE) -C ../../utils/kamctl/ install-modules install-scripts: install-dbtext-scripts

14 years, 5 months

git:sr_3.0: core: fix selects in optimized rvalue expressions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: d36e9bfbfda41773973ad1822c5905c0cd4dc71e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d36e9bf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jun 18 22:22:59 2010 +0200 core: fix selects in optimized rvalue expressions - do not attempt to resolve_select() twice the same select. This happened when a rve containing only a select was optimized, the select moved out of the rve and fix_expr() tried to "fix" the already resolved select later. - changed BUG() messages for failed resolve_select() into ERR(). (cherry picked from commit a7fa13ed757d74cfd4486f3c282ec50259929edc) --- route.c | 20 ++++++++++++++------ route_struct.h | 5 +++-- rvalue.c | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/route.c b/route.c index 13608a2..9d9e94d 100644 --- a/route.c +++ b/route.c @@ -580,7 +580,9 @@ int fix_expr(struct expr* exp) exp->r.re=re; exp->r_type=RE_ST; }else if (exp->r_type!=RE_ST && exp->r_type != AVP_ST - && exp->r_type != SELECT_ST && exp->r_type!= RVE_ST + && exp->r_type != SELECT_ST && + exp->r_type != SELECT_UNFIXED_ST && + exp->r_type!= RVE_ST && exp->r_type != PVAR_ST){ LOG(L_CRIT, "BUG: fix_expr : invalid type for match\n"); return E_BUG; @@ -593,19 +595,21 @@ int fix_expr(struct expr* exp) return ret; } } - if (exp->l_type==SELECT_O) { + if (exp->l_type==SELECT_UNFIXED_O) { if ((ret=resolve_select(exp->l.select)) < 0) { - BUG("Unable to resolve select\n"); + ERR("Unable to resolve select\n"); print_select(exp->l.select); return ret; } + exp->l_type=SELECT_O; } - if ((exp->r_type==SELECT_O)||(exp->r_type==SELECT_ST)) { + if (exp->r_type==SELECT_UNFIXED_ST) { if ((ret=resolve_select(exp->r.select)) < 0) { - BUG("Unable to resolve select\n"); - print_select(exp->l.select); + ERR("Unable to resolve select\n"); + print_select(exp->r.select); return ret; } + exp->r_type=SELECT_ST; } /* PVAR don't need fixing */ ret=0; @@ -1745,6 +1749,10 @@ inline static int eval_elem(struct run_act_ctx* h, struct expr* e, case PVAR_O: ret=comp_pvar(e->op, e->l.param, e->r_type, &e->r, msg, h); break; + + case SELECT_UNFIXED_O: + BUG("unexpected unfixed select operand %d\n", e->l_type); + break; /* default: LOG(L_CRIT, "BUG: eval_elem: invalid operand %d\n", diff --git a/route_struct.h b/route_struct.h index 4894bd5..3f7e854 100644 --- a/route_struct.h +++ b/route_struct.h @@ -76,7 +76,7 @@ enum _expr_l_type{ METHOD_O=51, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, DSTIP_O, DSTPORT_O, PROTO_O, AF_O, MSGLEN_O, ACTION_O, NUMBER_O, AVP_O, SNDIP_O, SNDPORT_O, TOIP_O, TOPORT_O, SNDPROTO_O, - SNDAF_O, RETCODE_O, SELECT_O, PVAR_O, RVEXP_O}; + SNDAF_O, RETCODE_O, SELECT_O, PVAR_O, RVEXP_O, SELECT_UNFIXED_O}; /* action types */ enum action_type{ FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, @@ -121,7 +121,8 @@ enum _operand_subtype{ SELECT_ST, PVAR_ST, LVAL_ST, RVE_ST, RETCODE_ST, CASE_ST, - BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST, MATCH_CONDTABLE_ST + BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST, MATCH_CONDTABLE_ST, + SELECT_UNFIXED_ST }; typedef enum _expr_l_type expr_l_type; diff --git a/rvalue.c b/rvalue.c index 22a7b2b..b17e664 100644 --- a/rvalue.c +++ b/rvalue.c @@ -2761,7 +2761,7 @@ static int fix_rval(struct rvalue* rv) return fix_actions(rv->v.action); case RV_SEL: if (resolve_select(&rv->v.sel)<0){ - BUG("Unable to resolve select\n"); + ERR("Unable to resolve select\n"); print_select(&rv->v.sel); } return 0;

14 years, 5 months

git:sr_3.0: sercmd: fix cfg. var name completion

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: b6f3ab32d17866b1234c6966f294bd95f9f80b4b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6f3ab3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 18:09:17 2010 +0200 sercmd: fix cfg. var name completion In some rare cases cfg. variable name completion did not work properly (e.g. reusing a command from history, editing it, changing the group and attempting command completion again). This was due to an assumption that the state would be re-initialized on new commands (which is mostly not true). (cherry picked from commit 261d8282e6dabf73a65904e7a8413ccec9faf2fd) --- utils/sercmd/sercmd.c | 49 ++++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 27 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 1f1a721..3b4432a 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -1802,36 +1802,31 @@ char** sercmd_completion(const char* text, int start, int end) } } #endif /* USE_MI */ -#ifdef USE_CFG_VARS }else if (crt_param_no==2){ - if (attempted_completion_state!=COMPLETE_CFG_GRP){ - for(i=0; complete_params_cfg_var[i]; i++){ - if ((cmd_len==strlen(complete_params_cfg_var[i])) && - (strncmp(&rl_line_buffer[cmd_start], +#ifdef USE_CFG_VARS + /* see if we complete cfg. var names for this command */ + for(i=0; complete_params_cfg_var[i]; i++){ + if ((cmd_len==strlen(complete_params_cfg_var[i])) && + (strncmp(&rl_line_buffer[cmd_start], complete_params_cfg_var[i], cmd_len)==0)){ - attempted_completion_state=COMPLETE_CFG_GRP; - /* find grp_start */ - for(j=cmd_end; (j<start) && ((rl_line_buffer[j]==' ') - || (rl_line_buffer[j]=='\t')); j++); - grp_start=j; - break; - } - } - } - if (attempted_completion_state==COMPLETE_CFG_GRP){ - /* get the group name from the grp_param */ - /* find first whitespace for the group name*/ - for(j=grp_start; (j<start) && (rl_line_buffer[j]!=' ') && - (rl_line_buffer[j]!='\t'); j++); - grp_len=j-grp_start; - for(grp=cfg_grp_lst; grp; grp=grp->next){ - if (grp_len==grp->grp_name.len && - memcmp(&rl_line_buffer[grp_start], grp->grp_name.s, - grp_len)==0) { - attempted_completion_state=COMPLETE_CFG_VAR; - crt_cfg_grp=grp; - goto end; + /* get the group name: */ + /* find grp_start */ + for(j=cmd_end; (j<start) && ((rl_line_buffer[j]==' ') || + (rl_line_buffer[j]=='\t')); j++); + grp_start=j; + /* find group end / grp_len*/ + for(j=grp_start; (j<start) && (rl_line_buffer[j]!=' ') && + (rl_line_buffer[j]!='\t'); j++); + grp_len=j-grp_start; + for(grp=cfg_grp_lst; grp; grp=grp->next){ + if (grp_len==grp->grp_name.len && + memcmp(&rl_line_buffer[grp_start], + grp->grp_name.s, grp_len)==0) { + attempted_completion_state=COMPLETE_CFG_VAR; + crt_cfg_grp=grp; + goto end; + } } } }

14 years, 5 months

git:sr_3.0: tcp: force eof after read if write side hangup

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 8fafff8a11a3d643de47f8d1f389d0c5e6316beb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8fafff8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Jun 20 19:40:55 2010 +0200 tcp: force eof after read if write side hangup Even if POLLRDHUP is not supported, but we detected a write side close (POLLHUP) or an error (POLLERR) or such an event was previously detected by tcp_main (F_CONN_EOF_SEEN), force connection closing after reading all the data in the socket buffer. In this case we can close() after the first short read and we save an extra system call (a read() that returns 0). (cherry picked from commit 28e313250503d6f8d06ebab15c8421c40e7f0fe4) --- tcp_read.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index d201765..9015a8b 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -970,13 +970,13 @@ again: con, con->id, atomic_get(&con->refcnt)); goto read_error; } + read_flags=(( #ifdef POLLRDHUP - read_flags=(((events & POLLRDHUP) | + (events & POLLRDHUP) | +#endif /* POLLRDHUP */ + (events & (POLLHUP|POLLERR)) | (con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF))) && !(events & POLLPRI))? RD_CONN_FORCE_EOF: 0; -#else /* POLLRDHUP */ - read_flags=0; -#endif /* POLLRDHUP */ resp=tcp_read_req(con, &ret, &read_flags); if (unlikely(resp<0)){ read_error:

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev