sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:master: core: loadpath can now use a list of directories
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: master Commit: fdbb341c72c140516578e80e9e0823779e03d409 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fdbb341… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 17:31:01 2009 +0200 core: loadpath can now use a list of directories - loadpath can use a list of directories separated by ':', e.g.: loadpath "modules:modules_s:modules_k". First match wins (e.g. for loadmodule "textops" if modules/textops.so or modules/textops/textops.so exists, it will be loaded and the search will stop). --- NEWS | 6 ++++ sr_module.c | 90 ++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 62 insertions(+), 34 deletions(-) diff --git a/NEWS b/NEWS index d3d6418..ba832bf 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,10 @@ $Id$ sip-router changes core: + - module search path support: loadpath takes now a list of directories + separated by ':'. The list is searched in-order. For each directory d + $d/${module_name}.so and $d/${module_name}/${module_name}.so are tried. + - dns TXT, EBL and PTR support (both cache and non-cached resolver) - support for dual module interfaces: ser and kamailio config script changes: - script mode can be switched between ser compatible, kamailio compatible @@ -21,6 +25,8 @@ config script changes: - while() - max_while_loops - maximum iterations allowed for a while, can be changed at runtime. Default 100. +build system: + - multiple modules directories are now supported (defined in Makefile.dirs) diff --git a/sr_module.c b/sr_module.c index 24c1445..3ff127f 100644 --- a/sr_module.c +++ b/sr_module.c @@ -238,7 +238,7 @@ static inline int version_control(void *handle, char *path) * @param modname - path or module name * @return 0 on success , <0 on error */ -int load_module(char* path) +int load_module(char* mod_path) { void* handle; char* error; @@ -248,6 +248,10 @@ int load_module(char* path) struct sr_module* t; struct stat stat_buf; char* modname; + char* mdir; + char* nxt_mdir; + char* path; + int mdir_len; int len; int dlflags; int new_dlflags; @@ -257,49 +261,64 @@ int load_module(char* path) /* for openbsd */ #define RTLD_NOW DL_LAZY #endif - + path=mod_path; if (!strchr(path, '/') && !strchr(path, '.')) { /* module name was given, we try to construct the path */ modname = path; - - /* try path <MODS_DIR>/<modname>.so */ - path = (char*)pkg_malloc( - strlen(mods_dir) + 1 /* "/" */ + - strlen(modname) + 3 /* ".so" */ + 1); - strcpy(path, mods_dir); - len = strlen(path); - if (len != 0 && path[len - 1] != '/') { - strcat(path, "/"); - } - strcat(path, modname); - strcat(path, ".so"); - - if (stat(path, &stat_buf) == -1) { - DBG("load_module: module file not found <%s>\n", path); - pkg_free(path); - - /* try path <MODS_DIR>/<modname>/<modname>.so */ - path = (char*)pkg_malloc( - strlen(mods_dir) + 1 /* "/" */ + - strlen(modname) + 1 /* "/" */ + - strlen(modname) + 3 /* ".so" */ + 1); - strcpy(path, mods_dir); - len = strlen(path); - if (len != 0 && path[len - 1] != '/') { - strcat(path, "/"); + mdir=mods_dir; /* search path */ + do{ + nxt_mdir=strchr(mdir, ':'); + if (nxt_mdir) mdir_len=(int)(nxt_mdir-mdir); + else mdir_len=strlen(mdir); + + /* try path <MODS_DIR>/<modname>.so */ + path = (char*)pkg_malloc(mdir_len + 1 /* "/" */ + + strlen(modname) + 3 /* ".so" */ + 1); + if (path==0) goto error; + memcpy(path, mdir, mdir_len); + len = mdir_len; + if (len != 0 && path[len - 1] != '/'){ + path[len]='/'; + len++; } - strcat(path, modname); - strcat(path, "/"); + path[len]=0; strcat(path, modname); strcat(path, ".so"); if (stat(path, &stat_buf) == -1) { DBG("load_module: module file not found <%s>\n", path); pkg_free(path); - LOG(L_ERR, "ERROR: load_module: could not find module <%s>\n", - modname); - goto error; + + /* try path <MODS_DIR>/<modname>/<modname>.so */ + path = (char*)pkg_malloc( + mdir_len + 1 /* "/" */ + + strlen(modname) + 1 /* "/" */ + + strlen(modname) + 3 /* ".so" */ + 1); + if (path==0) goto error; + memcpy(path, mdir, mdir_len); + len = mdir_len; + if (len != 0 && path[len - 1] != '/') { + path[len]='/'; + len++; + } + path[len]=0; + strcat(path, modname); + strcat(path, "/"); + strcat(path, modname); + strcat(path, ".so"); + + if (stat(path, &stat_buf) == -1) { + DBG("load_module: module file not found <%s>\n", path); + pkg_free(path); + path=0; + } } + mdir=nxt_mdir?nxt_mdir+1:0; + }while(path==0 && mdir); + if (path==0){ + LOG(L_ERR, "ERROR: load_module: could not find module <%s> in" + " <%s>\n", modname, mods_dir); + goto error; } } retries=2; @@ -373,18 +392,21 @@ reload: } } if (register_module(*mod_if_ver, exp, path, handle)<0) goto error1; + if (path && path!=mod_path) + pkg_free(path); return 0; error1: dlclose(handle); error: skip: + if (path && path!=mod_path) + pkg_free(path); return -1; } - /* searches the module list for function name in module mod and returns * a pointer to the "name" function record union or 0 if not found * sets also *mod_if_ver to the module interface version (needed to know

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: master Commit: cf481d5d5412ef930f120bcb0f8be729a2bfa4bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf481d5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 16:32:24 2009 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: build system: support for multiple modules dirs ---

1 0

git:master: core: start with a complete module search path
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: master Commit: c82fe029711cf9eda4f49522d446285e97bc5ce2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c82fe02… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 18:30:30 2009 +0200 core: start with a complete module search path - set the default module search path in function of the selected modules_dirs. --- Makefile | 8 ++++++++ Makefile.defs | 5 +++-- main.c | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fe0c6b3..5ed6935 100644 --- a/Makefile +++ b/Makefile @@ -359,6 +359,14 @@ lex.yy.c: cfg.lex cfg.tab.h $(ALLDEP) cfg.tab.c cfg.tab.h: cfg.y $(ALLDEP) $(YACC) $(YACC_FLAGS) $< +nullstring= +space=$(nullstring) $(nullstring) + +modules_search_path=$(subst $(space),:,$(strip\ + $(addprefix $(modules_target),$(modules_dirs)))) + +main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"' + include Makefile.shared ifeq ($(config_mak),1) diff --git a/Makefile.defs b/Makefile.defs index e7794ad..2687d0a 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -239,6 +239,7 @@ lib_target = $(prefix)/$(lib_dir) doc_target = $(prefix)/$(doc_dir) + ifeq ($(OS), solaris) #use GNU versions INSTALL ?= ginstall @@ -466,10 +467,10 @@ 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) \ + -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ + -D__CPU_$(ARCH) -D__OS_$(OS) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ - -DMODS_DIR='"$(modules_target)"'\ -DPKG_MALLOC \ -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK \ diff --git a/main.c b/main.c index 868572f..228e6f3 100644 --- a/main.c +++ b/main.c @@ -194,7 +194,7 @@ static char help_msg[]= "\ Usage: " NAME " [options]\n\ Options:\n\ -f file Configuration file (default: " CFG_FILE ")\n\ - -L dir Modules directory (default: " MODS_DIR ")\n\ + -L path Modules search path (default: " MODS_DIR ")\n\ -c Check configuration file for errors\n\ -l address Listen on the specified address/interface (multiple -l\n\ mean listening on more addresses). The address format is\n\ @@ -283,7 +283,7 @@ void receive_stdin_loop() int own_pgid = 0; /* whether or not we have our own pgid (and it's ok to use kill(0, sig) */ -char* mods_dir = MODS_DIR; /* directory with dyn. loadable modules */ +char* mods_dir = MODS_DIR; /* search path for dyn. loadable modules */ char* cfg_file = 0; unsigned int maxbuffer = MAX_RECV_BUFFER_SIZE; /* maximum buffer size we do

1 0

git:master: build system: support for multiple modules dirs
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: master Commit: 27cdfd2c39e28b846c81640c84f00f1e282ab91c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27cdfd2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 27 20:44:36 2009 +0100 build system: support for multiple modules dirs Multiple modules directories are now supported. The list of the modules directories is in Makefile.dirs in $(modules_dirs). Name restrictions: the names must not match any makefile variable name and they shouldn't contain any '-' char. The modules and modules doc/READMEs will be installed in separate dirs (e.g. for modules_dirs="modules modules_s modules_k" , the modules will be installed in .../lib/ser/modules , ...lib/ser/modules_s and ...lib/ser/modules_k). The module man pages will all be installed in the same man dir (but so far only some ser modules have man pages so we should be safe). New make targets: every-module - make all the modules in all the module dirs install-every-module - like above, but install install-every-module-doc install-every-module-man Targets dependent on $(modules_dirs) content: $(m), $(m)-doc, $(m)-readme, $(m)-man, install-$(m), install-$(m)-doc, install-$(m)-man. E.g.: for modules_dirs=modules modules_k modules_s make modules - make all modules in the directory "modules". make modules_k - make all the modules in the directory modules_k. make every-module - make all the modules in the directories modules, modules_k and modules_s. make install-modules_s - install all the modules in the directory modules_s. --- Makefile | 315 +++++++++++++++++++++++++++++++++--------------------- Makefile.defs | 3 +- Makefile.dirs | 23 ++++ Makefile.modules | 16 ++-- Makefile.rules | 12 +- Makefile.sources | 2 +- Makefile.targets | 22 +++-- 7 files changed, 251 insertions(+), 142 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=27c…

1 0

git:master: Merge commit 'origin/ser_core_cvs'
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: master Commit: 583ea36b97bf1f2669086b30d022ba619c3fa1b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=583ea36… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 16:07:04 2009 +0200 Merge commit 'origin/ser_core_cvs' * commit 'origin/ser_core_cvs': Wrapper functions for regcomp, regexec, regfree, and regerror using shared make: minor optimizations make: fail if make version < 3.80 make: workaround for make 3.80 make: workaround for backwards compat. with make 3.80 dns: fix selecting neg. cname entry ---

1 0

git:ser_core_cvs: Wrapper functions for regcomp, regexec, regfree, and regerror using shared
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: e01a458045ad4363110dad04a774342a57b5851a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e01a458… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Apr 3 13:03:46 2009 +0000 Wrapper functions for regcomp, regexec, regfree, and regerror using shared memory allocators instead of libc malloc/realloc/free. Check the README file for more details. --- lib/Makefile | 2 +- lib/README | 22 ++++++-- lib/shm_regex/Makefile | 14 +++++ lib/shm_regex/README | 23 ++++++++ lib/shm_regex/shm_regex.c | 129 +++++++++++++++++++++++++++++++++++++++++++++ lib/shm_regex/shm_regex.h | 45 ++++++++++++++++ 6 files changed, 228 insertions(+), 7 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 431e37d..01bbc1d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -7,7 +7,7 @@ # -SUBDIRS=binrpc cds xcap presence +SUBDIRS=binrpc cds xcap presence shm_regex .PHONY: subdirs $(SUBDIRS) diff --git a/lib/README b/lib/README index 289b9f6..317fd3e 100644 --- a/lib/README +++ b/lib/README @@ -24,28 +24,32 @@ xcap - Common XCAP operations and structures (XCAP authorization documents requires external libraries: libxml2, libcurl3 (nonSER version) requires internal libraries: cds +shm_regex - Wrapper functions for regcomp, regexec, regfree and regerror + using shared memory. See 'man regex' for details. + Used by modules: pa, rls, dialog, rpa Usage: ----- -All libraries can be compiled "with ser" or "without ser". Compilation -without ser may be useful for debugging purposes or for example for +All libraries except shm_regex can be compiled "with ser" or "without ser". +Compilation without ser may be useful for debugging purposes or for example for searching for memory leaks with some tool like valgrind. +shm_regex library can be compiled only with ser. Compilation with ser: -------------------- Compilation and installation of these libraries is NOT DONE by running -main ser makefile now - it MUST be done MANUALLY. For this purpose -is there Makefile.ser. To compile and install libraries simply run +main ser makefile now - it MUST be done MANUALLY. To compile and install +libraries simply run - make -f Makefile.ser install + make install in lib directory. You can select destination directory like in the case of ser, for example: - make -f Makefile.ser install prefix="/my/ser/directory" + make install prefix="/my/ser/directory" AFTER COMPILATION of libraries you can COMPILE MODULES using this libraries like PA, RLS or dialog. @@ -61,6 +65,12 @@ you should set LD_LIBRARY_PATH=/usr/local/lib/ser. In the case of nonstandard installation, you can use something like LD_LIBRARY_PATH=/my/ser/directory/lib/ser. +Compilation without ser: +-------------------- +Use the alternate makefile, Makefile.noser: + + make -f Makefile.noser install + Documentation ------------- Documentation for all libraries is (or will be) in diff --git a/lib/shm_regex/Makefile b/lib/shm_regex/Makefile new file mode 100644 index 0000000..2a0c907 --- /dev/null +++ b/lib/shm_regex/Makefile @@ -0,0 +1,14 @@ +# +# makefile for shm_regex +# + +include ../../Makefile.defs +auto_gen= +NAME:=ser_shm_regex +MAJOR_VER=0 +MINOR_VER=1 +BUGFIX_VER=0 +LIBS= + +include ../../Makefile.libs + diff --git a/lib/shm_regex/README b/lib/shm_regex/README new file mode 100644 index 0000000..bfec807 --- /dev/null +++ b/lib/shm_regex/README @@ -0,0 +1,23 @@ +$Id$ + +Wrapper functions for regcomp, regexec, regfree, and regerror using shared +memory allocators instead of libc malloc/realloc/free. The original functions +are prefixed with "shm_". + +The regular expression compiled with shm_regcomp() can be used with shm_regexec() +simultaneously by multiple processes without locking, because regexec has its own +internal locks. It can be later on freed with shm_regfree() when the expression +is no longer used. Note however that + +1) shm_regexec allocates shared memory for the pattern buffer when it is successfully +called for the first time. + +2) shm_regexec temporary allocates and deallocates memory for storing the registers +for the pmatch array runtime if nmatch and pmatch parameters are not 0. This is +done also in shared memory, therefore use the shared memory wrappers for +regular expression based search-and-replace only if really necessary. + +See 'man regex' for the usage and parameters of the functions. + +Supported only with GNU C library. + diff --git a/lib/shm_regex/shm_regex.c b/lib/shm_regex/shm_regex.c new file mode 100644 index 0000000..165d535 --- /dev/null +++ b/lib/shm_regex/shm_regex.c @@ -0,0 +1,129 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * This file is part of ser, a free SIP server. + * + * ser 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 + * + * For a license to use the ser software under conditions + * other than those described here, or to purchase support for this + * software, please contact iptel.org by e-mail at the following addresses: + * info(a)iptel.org + * + * ser 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 + * ------- + * 2009-04-03 Initial version (Miklos) + */ + +#include <malloc.h> /* hook prototypes */ + +#include "../../mem/shm_mem.h" +#include "shm_regex.h" + +typedef void *(malloc_hook_t) (size_t, const void *); +typedef void *(realloc_hook_t) (void *, size_t, const void *); +typedef void (free_hook_t) (void *, const void *); + +/* The memory hooks are overwritten before calling regcomp(), regfree(), + * and regexec(), and shared memory function are called + * from the hooks instead of libc malloc/realloc/free. + */ + +static void *shm_malloc_hook(size_t size, const void *caller) +{ + return shm_malloc (size); +} + +static void *shm_realloc_hook(void *p, size_t size, const void *caller) +{ + return shm_realloc (p, size); +} + +static void shm_free_hook(void *ptr, const void *caller) +{ + if (ptr) shm_free (ptr); +} + +#define replace_malloc_hooks() \ + do { \ + orig_malloc_hook = __malloc_hook; \ + orig_realloc_hook = __realloc_hook; \ + orig_free_hook = __free_hook; \ + __malloc_hook = shm_malloc_hook; \ + __realloc_hook = shm_realloc_hook; \ + __free_hook = shm_free_hook; \ + } while (0) + +#define restore_malloc_hooks() \ + do { \ + __malloc_hook = orig_malloc_hook; \ + __realloc_hook = orig_realloc_hook; \ + __free_hook = orig_free_hook; \ + } while (0) + +int shm_regcomp(regex_t *preg, const char *regex, int cflags) +{ + malloc_hook_t *orig_malloc_hook; + realloc_hook_t *orig_realloc_hook; + free_hook_t *orig_free_hook; + int ret; + + replace_malloc_hooks(); + ret = regcomp(preg, regex, cflags); + restore_malloc_hooks(); + + return ret; +} + +void shm_regfree(regex_t *preg) +{ + malloc_hook_t *orig_malloc_hook; + realloc_hook_t *orig_realloc_hook; + free_hook_t *orig_free_hook; + + replace_malloc_hooks(); + regfree(preg); + restore_malloc_hooks(); +} + +int shm_regexec(const regex_t *preg, const char *string, size_t nmatch, + regmatch_t pmatch[], int eflags) +{ + malloc_hook_t *orig_malloc_hook; + realloc_hook_t *orig_realloc_hook; + free_hook_t *orig_free_hook; + int ret; + + /* regexec() allocates some memory for the pattern buffer + * when it is successfully called for the first time, therefore + * shared memory is required also here. + * The drawback is that shared memory allocation is also used + * needlessly for allocating the temporary space for + * the elements of pmatch. -- Does not happen if pmatch and + * nmatch are 0. + * It is safe to call regexec() concurrently without locking, + * because regexec() has its own locks. + * (Miklos) + */ + replace_malloc_hooks(); + ret = regexec(preg, string, nmatch, + pmatch, eflags); + restore_malloc_hooks(); + + return ret; +} + diff --git a/lib/shm_regex/shm_regex.h b/lib/shm_regex/shm_regex.h new file mode 100644 index 0000000..42ec52b --- /dev/null +++ b/lib/shm_regex/shm_regex.h @@ -0,0 +1,45 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * This file is part of ser, a free SIP server. + * + * ser 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 + * + * For a license to use the ser software under conditions + * other than those described here, or to purchase support for this + * software, please contact iptel.org by e-mail at the following addresses: + * info(a)iptel.org + * + * ser 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 + * ------- + * 2009-04-03 Initial version (Miklos) + */ + +#ifndef _SHM_REGEX_H +#define _SHM_REGEX_H + +#include <sys/types.h> +#include <regex.h> + +int shm_regcomp(regex_t *preg, const char *regex, int cflags); +void shm_regfree(regex_t *preg); +int shm_regexec(const regex_t *preg, const char *string, size_t nmatch, + regmatch_t pmatch[], int eflags); + +#define shm_regerror regerror + +#endif /* _SHM_REGEX_H */

1 0

git:ser_core_cvs: make: workaround for backwards compat. with make 3.80
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: 724ca0875cdc778cbc23154a998a03c3d4431c99 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=724ca08… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 2 18:42:58 2009 +0000 make: workaround for backwards compat. with make 3.80 - workaround for export not supported in gnu make 3.80 target specific variables: use $(mk_params) for each $(MAKE) invocation --- INSTALL | 2 +- Makefile | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/INSTALL b/INSTALL index cc2da92..0da2303 100644 --- a/INSTALL +++ b/INSTALL @@ -53,7 +53,7 @@ Requirements: - bison or yacc (Berkley yacc) - flex - GNU make (on Linux this is the standard "make", on *BSD and Solaris is - called "gmake") version >= 3.79. + called "gmake") version >= 3.80. - sed and tr (used in the makefiles) - GNU tar ("gtar" on Solaris) and gzip if you want "make tar" to work - GNU install, BSD install or Solaris install if you want "make diff --git a/Makefile b/Makefile index 1a12f9a..4c75fe0 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,9 @@ # added cfg-defs, new target that only rebuilds config.mak # 2009-03-10 replaced DEFS with C_DEFS (DEFS are now used only for # "temporary" defines inside modules or libs) (andrei) +# 2009-04-02 workaround for export not supported in gnu make 3.80 +# target specific variables: use mk_params for each +# $(MAKE) invocation (andrei) # auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc @@ -381,7 +384,8 @@ modules: modules.lst if [ -n "$$r" -a -r "$$r/Makefile" ]; then \ echo "" ; \ echo "" ; \ - if $(MAKE) -C $$r || [ ${err_fail} != 1 ] ; then \ + if $(MAKE) -C $$r $(mk_params) || [ ${err_fail} != 1 ] ; \ + then\ :; \ else \ exit 1; \ @@ -395,7 +399,7 @@ $(extra_objs): if [ -n "$$r" -a -r "$$r/Makefile" ]; then \ echo "" ; \ echo "Making static module $r" ; \ - if $(MAKE) -C $$r static ; then \ + if $(MAKE) -C $$r static $(mk_params) ; then \ :; \ else \ exit 1; \ @@ -409,7 +413,8 @@ utils: if [ -n "$$r" ]; then \ echo "" ; \ echo "" ; \ - if $(MAKE) -C $$r || [ ${err_fail} != 1 ] ; then \ + if $(MAKE) -C $$r $(mk_params) || [ ${err_fail} != 1 ] ; \ + then \ :; \ else \ exit 1; \ @@ -466,7 +471,7 @@ tar: .PHONY: bin bin: mkdir -p tmp/ser/usr/local - $(MAKE) install basedir=tmp/ser + $(MAKE) install basedir=tmp/ser $(mk_params) $(TAR) -C tmp/ser/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz . rm -rf tmp/ser @@ -484,7 +489,7 @@ deb: sunpkg: mkdir -p tmp/ser mkdir -p tmp/ser_sun_pkg - $(MAKE) install basedir=tmp/ser prefix=/usr/local + $(MAKE) install basedir=tmp/ser prefix=/usr/local $(mk_params) (cd pkg/solaris; \ pkgmk -r ../../tmp/ser/usr/local -o -d ../../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\ cd ../..) @@ -501,7 +506,7 @@ modules-doc: modules.lst if [ -n "$$r" ]; then \ echo "" ; \ echo "" ; \ - $(MAKE) -C $$r/doc $(doc_format) ; \ + $(MAKE) -C $$r/doc $(doc_format) $(mk_params); \ fi ; \ done @@ -514,7 +519,8 @@ README: modules.lst if [ -n "$$r" ]; then \ echo "" ; \ echo "" ; \ - if $(MAKE) -C $$r README || [ ${err_fail} != 1 ] ; then \ + if $(MAKE) -C $$r README $(mk_params) || \ + [ ${err_fail} != 1 ] ; then \ :; \ else \ exit 1; \ @@ -531,7 +537,8 @@ man: modules.lst if [ -n "$$r" ]; then \ echo "" ; \ echo "" ; \ - if $(MAKE) -C $$r man || [ ${err_fail} != 1 ] ; then \ + if $(MAKE) -C $$r man $(mk_params) || [ ${err_fail} != 1 ] ; \ + then \ :; \ else \ exit 1; \ @@ -540,7 +547,7 @@ man: modules.lst done; true .PHONY: install -install: export compile_for_install=yes +install: mk_params="compile_for_install=yes" install: install-bin install-modules install-cfg \ install-doc install-man install-utils install-share @@ -636,7 +643,8 @@ install-modules: modules.lst $(modules_prefix)/$(modules_dir) if [ -n "$$r" -a -r "$$r/Makefile" ]; then \ echo "" ; \ echo "" ; \ - if $(MAKE) -C $$r install || [ ${err_fail} != 1 ] ; then \ + if $(MAKE) -C $$r install $(mk_params) || \ + [ ${err_fail} != 1 ] ; then \ :; \ else \ exit 1; \

1 0

git:ser_core_cvs: make: minor optimizations
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: b89da7b7ccbbd80f2f7aedf1a9555cd75acdf05e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b89da7b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 11:38:34 2009 +0000 make: minor optimizations - make cfg should be a little faster --- Makefile | 6 +++--- Makefile.defs | 44 ++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index fd3a20e..003ba26 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ endif # status of the modules # the rest is excluded because it depends on external libraries # -static_modules= +static_modules:= ALLDEP=config.mak Makefile Makefile.sources Makefile.rules @@ -248,7 +248,7 @@ static_modules_path=$(addprefix modules/, $(static_modules)) extra_sources=$(wildcard $(addsuffix /*.c, $(static_modules_path))) extra_objs=$(extra_sources:.c=.o) -static_defs= $(foreach mod, $(static_modules), \ +static_defs:= $(foreach mod, $(static_modules), \ -DSTATIC_$(shell echo $(mod) | tr [:lower:] [:upper:]) ) override extra_defs+=$(static_defs) $(EXTRA_DEFS) @@ -275,7 +275,7 @@ endif # ifneq($(group_include),) endif # ifneq($(modules_configured),1) modules_names=$(shell echo $(modules)| \ sed -e 's/modules\/$[^/ ]*$\/*/\1.so/g' ) -modules_basenames=$(shell echo $(modules)| \ +modules_basenames:=$(shell echo $(modules)| \ sed -e 's/modules\/$[^/ ]*$\/*/\1/g' ) #modules_names=$(patsubst modules/%, %.so, $(modules)) #modules_full_path=$(join $(modules), $(addprefix /, $(modules_names))) diff --git a/Makefile.defs b/Makefile.defs index ffa884a..68e1e98 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -110,8 +110,8 @@ EXTRAVERSION = -dev23-make SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) ) -RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -OS = $(shell uname -s | sed -e s/SunOS/solaris/ -e s/CYGWIN.*/cygwin/ \ +RELEASE:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +OS := $(shell uname -s | sed -e s/SunOS/solaris/ -e s/CYGWIN.*/cygwin/ \ | tr "[A-Z]" "[a-z]") ifeq ($(OS),solaris) @@ -138,9 +138,9 @@ ifeq ($(ARCH),sparc) endif endif -OSREL = $(shell uname -r) +OSREL := $(shell uname -r) # numerical version (good for comparisons: A.B.C => A*1000000+B*1000+C) -OSREL_N= $(shell echo $(OSREL) | sed -e 's/^[^0-9]*//' \ +OSREL_N:= $(shell echo $(OSREL) | sed -e 's/^[^0-9]*//' \ -e 's/^$[0-9][0-9]*\(\.[0-9][0-9]*$*\).*$$/\1/g' | \ (IFS=. read A B C D; R=0; \ [ -n "$$A" ] && R=`expr $$R \* 1000 + $$A` && \ @@ -271,7 +271,7 @@ ifeq ($(CC),) CC=gcc endif LD= $(CC) -CC_LONGVER=$(shell if $(CC) -v 2>/dev/null; then \ +CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \ $(CC) -v 2>&1 ;\ else \ $(CC) -V 2>&1 ; \ @@ -282,14 +282,14 @@ MKTAGS=ctags -R . ifneq (,$(findstring gcc, $(CC_LONGVER))) CC_NAME=gcc - CC_VER=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|cut -d" " -f 3|\ - sed -e 's/^.*$[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$.*/\1/'\ + CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|cut -d" " -f 3\ + |sed -e 's/^.*$[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$.*/\1/'\ -e 's/^[^0-9].*$[0-9][0-9]*\.[0-9][0-9]*$.*/\1/') # sed with POSIX.1 regex doesn't support |, + or ? # (darwin, solaris ...) => this complicated expression MKDEP=$(CC) -MM #transform gcc version into 2.9x or 3.0 - CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ + CC_SHORTVER:=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ sed -e 's/[^0-9]*-$.*$/\1/'| \ sed -e 's/2\.9.*/2.9x/' -e 's/3\.[0-3]\..*/3.0/' -e \ 's/3\.[0-3]/3.0/' -e 's/3\.[4-9]\..*/3.4/' -e \ @@ -299,7 +299,7 @@ endif ifneq (, $(findstring Sun, $(CC_LONGVER))) CC_NAME=suncc - CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -n 1| \ + CC_SHORTVER:=$(shell echo "$(CC_LONGVER)"|head -n 1| \ sed -e 's/.*$[0-9]\.[0-9]$.*/\1/g' ) CC_VER=$(CC) $(CC_SHORTVER) MKDEP=$(CC) -xM1 @@ -308,9 +308,9 @@ endif ifneq (, $(findstring Intel(R) C++ Compiler, $(CC_LONGVER))) # very nice: gcc compatible CC_NAME=icc - CC_FULLVER=$(shell echo "$(CC_LONGVER)"|head -n 1| \ + CC_FULLVER:=$(shell echo "$(CC_LONGVER)"|head -n 1| \ sed -e 's/.*Version $[0-9]\.[0-9]\.[0-9]*$.*/\1/g' ) - CC_SHORTVER=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 ) + CC_SHORTVER:=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 ) CC_VER=$(CC) $(CC_FULLVER) MKDEP=$(CC) -MM endif @@ -533,18 +533,18 @@ endif # find ld & as name (gnu or solaris) ifeq ($(OS), solaris) ifeq ($(CC_NAME), gcc) - LDGCC=$(shell $(CC) -v 2>&1 | grep with-ld| \ + LDGCC:=$(shell $(CC) -v 2>&1 | grep with-ld| \ sed -e 's/.*--with-ld=$[^ ][^ ]*$.*/\1/' ) - ASGCC=$(shell $(CC) -v 2>&1 | grep with-as| \ + ASGCC:=$(shell $(CC) -v 2>&1 | grep with-as| \ sed -e 's/.*--with-as=$[^ ][^ ]*$.*/\1/' ) - LDPATH=$(shell if [ -z "$(LDGCC)" ] ; then echo "ld" ;\ + LDPATH:=$(shell if [ -z "$(LDGCC)" ] ; then echo "ld" ;\ else \ if $(LDGCC) -V 2>/dev/null 1>/dev/null; then \ echo $(LDGCC); \ else echo "ld" ; \ fi\ fi) - ASPATH=$(shell if [ -z "$(ASGCC)" ] ; then echo "as" ;\ + ASPATH:=$(shell if [ -z "$(ASGCC)" ] ; then echo "as" ;\ else \ if $(ASGCC) -V 2>/dev/null 1>/dev/null; then \ echo $(ASGCC); \ @@ -552,7 +552,7 @@ ifeq ($(CC_NAME), gcc) fi\ fi) - LDTYPE=$(shell if $(LDPATH) -V 1>/dev/null 2>/dev/null; then \ + LDTYPE:=$(shell if $(LDPATH) -V 1>/dev/null 2>/dev/null; then \ if $(LDPATH) -V 2>&1|grep GNU >/dev/null; \ then echo gnu; \ else \ @@ -563,13 +563,13 @@ ifeq ($(CC_NAME), gcc) fi \ fi \ fi) - ASTYPE=$(shell if $(ASPATH) -V 1>/dev/null 2>/dev/null </dev/null; \ + ASTYPE:=$(shell if $(ASPATH) -V 1>/dev/null 2>/dev/null </dev/null; \ then \ - if $(ASPATH) -V 2>&1 </dev/null |grep GNU >/dev/null; \ - then echo gnu; \ + if $(ASPATH) -V 2>&1 </dev/null | \ + grep GNU >/dev/null; then echo gnu; \ else \ - if $(ASPATH) -V 2>&1 </dev/null |grep Sun >/dev/null;\ - then echo solaris; \ + if $(ASPATH) -V 2>&1 </dev/null | \ + grep Sun >/dev/null; then echo solaris; \ else \ echo unknown ; \ fi \ @@ -1544,7 +1544,7 @@ ifeq ($(OS), openbsd) # no sched_yield on openbsd unless linking with c_r (not recommended) # unfortunately pthread is needed for sigwait LIBS= -lpthread - OPENBSD_IS_AOUT= $(shell echo "$(OSREL)" | \ + OPENBSD_IS_AOUT:= $(shell echo "$(OSREL)" | \ sed -e 's/^3\.[0-3][^0-9]*$$/yes/' |sed -e 's/^[0-2]\..*/yes/') # exception: on sparc openbsd 3.2 is elf and not aout ifeq ($(OSREL), 3.2)

1 0

git:ser_core_cvs: make: fail if make version < 3.80
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: 96d9c662abfdc108f64925ad89931c7a5df54c49 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96d9c66… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 11:06:57 2009 +0000 make: fail if make version < 3.80 --- INSTALL | 2 +- Makefile | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 0da2303..eca400b 100644 --- a/INSTALL +++ b/INSTALL @@ -53,7 +53,7 @@ Requirements: - bison or yacc (Berkley yacc) - flex - GNU make (on Linux this is the standard "make", on *BSD and Solaris is - called "gmake") version >= 3.80. + called "gmake") version >= 3.80 (recommended 3.81). - sed and tr (used in the makefiles) - GNU tar ("gtar" on Solaris) and gzip if you want "make tar" to work - GNU install, BSD install or Solaris install if you want "make diff --git a/Makefile b/Makefile index 4c75fe0..fd3a20e 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,16 @@ # $(MAKE) invocation (andrei) # +# check make version +# required 3.80, recommended 3.81 +req_ver=3.80 +# the check below works for version number of the type x.yy or x.yy.z* +# (from the GNU Make Cookbook) +ifeq (,$(filter $(req_ver),$(firstword $(sort $(MAKE_VERSION) $(req_ver))))) +$(error make version $(MAKE_VERSION) not supported, use at least $(req_ver)) +endif + + auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc auto_gen_others=cfg.tab.h # auto generated, non-c

1 0

git:ser_core_cvs: dns: fix selecting neg. cname entry
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: 25ba1f0f4cd2b059e3f2a27d619ca054122cf4cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25ba1f0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 31 18:11:25 2009 +0000 dns: fix selecting neg. cname entry - do not select a neg. cache cname entry as a response, unless the request is for a cname. This fixes an unlikely bug: someone makes a specific cname request (from ser) for a name that doesn't resolve and then later when a normal non-cname request is made (e.g. A) the empty negative cname entry is selected, leading to a coredump. So far there is no code in ser that could trigger this bug. Only dns.lookup cname ... from sip-router could trigger it. --- dns_cache.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index b0e7a4d..a5167c4 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -580,8 +580,11 @@ again: #endif #endif return e; - }else if ((e->type==T_CNAME) && (e->name_len==name->len) && - (strncasecmp(e->name, name->s, e->name_len)==0)){ + }else if ((e->type==T_CNAME) && !((e->rr_lst==0) || e->err_flags) && + (e->name_len==name->len) && + (strncasecmp(e->name, name->s, e->name_len)==0)){ + /*if CNAME matches and CNAME is entry is not a neg. cache entry + (could be produced by a specific CNAME lookup)*/ e->last_used=now; #ifdef DNS_LU_LST /* add it at the end */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009