sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

git:kamailio_3.0: tls: documented is_peer_verified()
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: kamailio_3.0 Commit: 0d4b4f187d5be683fdf8a697fea4d3ca32e69070 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d4b4f1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 16 11:34:45 2010 +0100 tls: documented is_peer_verified() - documented is_peer_verified() - fixed the xmls, so that xmllint / make check does not return any errors - regenerated the README (cherry picked from commit f86da819836b7a8c832b4a80262d8f39a86563dd) --- modules/tls/README | 338 +++++++++++++++++++++++------------------ modules/tls/doc/functions.xml | 28 +++- modules/tls/doc/history.xml | 2 +- modules/tls/doc/params.xml | 2 +- modules/tls/doc/tls.xml | 5 +- 5 files changed, 218 insertions(+), 157 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0d4…

1 0

git:kamailio_3.0: perl(k): fix mk_action call
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: kamailio_3.0 Commit: 8f218aa1bed97ecafb266373c4ae3a62254e815a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f218aa… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Mar 14 17:13:40 2010 +0100 perl(k): fix mk_action call The mk_action() call used the old openser format, instead of the sip_router one. (cherry picked from commit a14aaf3f2fe11cdc0d56e1a12cb60ae0cd53b8f5) --- modules_k/perl/openserxs.xs | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/openserxs.xs index 418f1e3..4ee86b6 100644 --- a/modules_k/perl/openserxs.xs +++ b/modules_k/perl/openserxs.xs @@ -220,7 +220,6 @@ int moduleFunc(struct sip_msg *m, char *func, unsigned mod_ver; char *argv[2]; int argc = 0; - action_u_t elems[MAX_ACTIONS]; struct run_act_ctx ra_ctx; if (!func) { @@ -260,16 +259,12 @@ int moduleFunc(struct sip_msg *m, char *func, return -1; } - elems[0].type = MODULE_T; - elems[0].u.data = exp_func_struct; - elems[1].type = STRING_ST; - elems[1].u.data = argv[0]; - elems[2].type = STRING_ST; - elems[2].u.data = argv[1]; - act = mk_action( MODULE_T, - 3, - elems, - 0); + act = mk_action(MODULE_T, 4 /* number of (type, value) pairs */, + MODEXP_ST, exp_func_struct, /* function */ + NUMBER_ST, 2, /* parameter number */ + STRING_ST, argv[0], /* param. 1 */ + STRING_ST, argv[1] /* param. 2 */ + ); if (!act) {

1 0

git:kamailio_3.0: mem: fix real_used stats for realloc
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: kamailio_3.0 Commit: ff80e418e01e1c6a92b0a5a5c74defe2a52a2e42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff80e41… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 12 12:16:16 2010 +0100 mem: fix real_used stats for realloc A realloc that shrank an allocation accounted twice for the fragment overhead. Basically each shrinking realloc would introduce an error in the real_used mem stats, between 8 bytes (f_malloc, no debugging, 32 bits) and up to 96 bytes (q_malloc with debugging, 64 bits). This bug concerns only the accounting part. It does not cause any memory leak or any real runtime problem. It was introduced in commit fb9d6e50 (2005). (cherry picked from commit 75c1e9a735c693a6985a7a1786116b5fe4044fd9) --- mem/f_malloc.c | 4 +++- mem/q_malloc.c | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 2c05fe6..49c4b7a 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -491,7 +491,9 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size) fm_split_frag(qm, f, size); #endif #if defined(DBG_F_MALLOC) || defined(MALLOC_STATS) - qm->real_used-=(orig_size-f->size-FRAG_OVERHEAD); + /* fm_split frag already adds FRAG_OVERHEAD for the newly created + free frag, so here we only need orig_size-f->size for real used */ + qm->real_used-=(orig_size-f->size); qm->used-=(orig_size-f->size); #endif }else if (f->size<size){ diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 09cb5c7..04c6dc9 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -562,8 +562,11 @@ void* qm_realloc(struct qm_block* qm, void* p, unsigned long size) #else if(split_frag(qm, f, size)!=0){ #endif - /* update used sizes: freed the spitted frag */ - qm->real_used-=(orig_size-f->size-FRAG_OVERHEAD); + /* update used sizes: freed the splited frag */ + /* split frag already adds FRAG_OVERHEAD for the newly created + free frag, so here we only need orig_size-f->size for real used + */ + qm->real_used-=(orig_size-f->size); qm->used-=(orig_size-f->size); }

1 0

git:kamailio_3.0: make: on-the-fly dependency generation
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: kamailio_3.0 Commit: 07681e1b6e89a902d8f9bdeba9674de6a3d353f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07681e1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 10 09:25:13 2010 +0100 make: on-the-fly dependency generation - support on-the-fly dependency file generation with gcc >=3.0 (the dependency files are generated while compiling the object file, eliminating another gcc+sed invocation) - support for using makedepend -f- for generating dependencies E.g.: make cfg MKDEP="makedepend -f-". In general gcc should be preferred if available (use this if you don't have gcc and your compiler doesn't generate good deps). (cherry picked from commit 5a9014ee4977c6afbc4b0cf65a9fad6237c2e2a6) (cherry picked from commit 929598a19dfb09efcfcbb1aee57a83f45b12592f) --- Makefile.defs | 12 ++++++++++-- Makefile.rules | 22 +++++++++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 527743c..a6575a4 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -74,6 +74,9 @@ # from the host (andrei) # 2009-10-01 use -fsigned-char for gcc on ppc, ppc64, arm and arm6 # (on those archs char is unsigned by default) (andrei) +# 2010-03-10 added CC_MKDEP_OPTS, which contains to the list of options +# needed to generate dependencies on-the-fly while compiling +# or is empty if the compiler doesn't support it (andrei) quiet?=$(if $(filter 1 yes on,$(Q)),silent,verbose) @@ -350,7 +353,7 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) # -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 + MKDEP=$(CC) -MM -MG #transform gcc version into 2.9x or 3.0 CC_SHORTVER:=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ sed -e 's/[^0-9]*-$.*$/\1/'| \ @@ -359,7 +362,11 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) 's/3\.[4-9]/3.4/' -e 's/4\.[0-1]\..*/4.x/' -e \ 's/4\.[0-1]/4.x/' -e 's/4\.[2-9]\..*/4.2+/' -e \ 's/4\.[2-9]$$/4.2+/') -endif +ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+,$(CC_SHORTVER)))) + # dependencies can be generated on-the-fly while compiling *.c + CC_MKDEP_OPTS=-MMD -MP +endif # 3.0 <= $(CC_SHORTVER) <= 4.x +endif # gcc ifneq (, $(findstring Sun, $(CC_LONGVER))) CC_NAME=suncc @@ -1946,6 +1953,7 @@ export exported_vars saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ SRC_NAME RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ + CC_MKDEP_OPTS \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \ LIBS \ diff --git a/Makefile.rules b/Makefile.rules index 5ee7d76..93da8ec 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -25,6 +25,11 @@ # used only for "temporary" defines/includes inside modules or # libs, C_DEFS and C_INCLUDES are used for the common stuff) # (andrei) +# 2010-03-09 generate dependencies when compiling .o instead of on +# include .d and fix build errors when a .h is moved +# support for using MKDEP="makedepend-f-" (andrei) +# 2010-03-10 support for on the-fly dependency generation (while compiling, +# see CC_MKDEP_OPTS) (andrei) # check if the saved cfg corresponds with the current one @@ -59,6 +64,19 @@ cmd_CC=$(CC) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) -c $< -o $@ cmd_LD=$(LD) $(LDFLAGS) $(objs) $(extra_objs) $(ALL_LIBS) $(SER_RPATH) \ -o $(NAME) +ifeq (,$(CC_MKDEP_OPTS)) +# if CCC_MKDEP_OPTS is empty => CC cannot generate dependencies on the fly +cmd_MKDEP=$(MKDEP) $(filter -D% -I%,$(CFLAGS)) $(C_INCLUDES) $(INCLUDES) \ + $(C_DEFS) $(DEFS) $< \ + | sed -e 's/\#.*//' -e '/:[ ]*$$/d' -e '/^[ ]*$$/d' \ + -e 's|.*:|$@: $$(wildcard |' -e 's/$[^\\]$$$/\1)/'> $*.d +else +# deps can be generated on the fly by cmd_CC +cmd_CC+=$(CC_MKDEP_OPTS) +# no MKDEP command any more +cmd_MKDEP= +endif # CC_MKDEP_OPTS + # what will be displayed if quiet==silent silent_cmd_CC=CC ($(CC)) [$(strip $(crt_type) $(NAME))] $@ silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@ @@ -84,9 +102,7 @@ exec_cmd= $(if $($(quiet)_cmd_$(1)),\ #implicit rules %.o:%.c $(ALLDEP) $(call exec_cmd,CC) - @$(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $< \ - | sed -e 's/#.*//' -e '/:[ ]*$$/d' -e '/^[ ]*$$/d' \ - -e 's#.*:#$@: $$(wildcard #g' -e 's/$[^\\]$$$/\1)/'> $*.d + @$(call cmd_MKDEP) # use RPATH and SER_LIBS if needed (make install and the module depends # on some ser libs)

1 0

git:kamailio_3.0: docbook: fix rm'ed files mentioned in .d build error
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: kamailio_3.0 Commit: 6f8a76343d7737ab7348c27503e0670977883d0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f8a763… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 10 10:42:15 2010 +0100 docbook: fix rm'ed files mentioned in .d build error When some .xml include file is deleted or removed, but the .d already exists, the build will fail trying to build the apparently missing file, requiring a make proper. This fix enclosed the prerequisites in $(wildcard ...), when generating the .d file. (cherry picked from commit 111a87fef0868021d6585d32b879bac6cb07b310) --- docbook/dep.xsl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/docbook/dep.xsl b/docbook/dep.xsl index 0415f96..f65480d 100644 --- a/docbook/dep.xsl +++ b/docbook/dep.xsl @@ -8,8 +8,9 @@ <xsl:template match="/"> <xsl:document href="{$output}" method="text" indent="no" omit-xml-declaration="yes"> - <xsl:value-of select="concat($output, ': ')"/> + <xsl:value-of select="concat($output, ':$(wildcard ')"/> <xsl:apply-templates mode="subroot"/> + <xsl:text>)
</xsl:text> </xsl:document> </xsl:template>

1 0

git:kamailio_3.0: make: fix CPU reset in some conditions
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: kamailio_3.0 Commit: 2bb3d716821cf1ccfba16792c1ae168031f73fbb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bb3d71… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 10 17:30:39 2010 +0100 make: fix CPU reset in some conditions In some cases like trying to build a package with debug config (e.g. make cfg mode=debug; .... ; make deb), the CPU make variable was reset resulting in a build failure. This happens because in the debug config CPU is not set and hence is saved as empty. Trying to build a package will start a sub-make which will try to re-do the config without debugging (make cfg), but the CPU variable with and empty value will be inherited from the environment and thus the CPU?=something lines won't have any effect. The fix replaces CPU?=something with $(call set_if_empty,CPU,something) This works around having an empty CPU in the environment. Reported-by: Jan Janak <jan(a)iptel.org> (cherry picked from commit 0b2d2c6e99dac2bd171f1c24bfa6f285f6539273) --- Makefile.defs | 45 ++++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index a6575a4..97824b5 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -115,8 +115,11 @@ ifeq ($(quiet),verbose) $(info normal Makefile.defs exec) endif # verbose +# usage: $(call set_if_empty,VAR,value) +set_if_empty=$(if $($(1)),,$(eval override $(1)=$(2))) + # flavour: sip-router, ser or kamailio -FLAVOUR=kamailio +$(call set_if_empty,FLAVOUR,kamailio) #prefix for various configs and scripts #config name/name-prefix for distributed configs @@ -815,7 +818,7 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= athlon64 +$(call set_if_empty,CPU,athlon64) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -825,7 +828,7 @@ ifeq ($(CC_SHORTVER), 4.2+) else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CPU ?= athlon64 +$(call set_if_empty,CPU,athlon64) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -834,7 +837,7 @@ ifeq ($(CC_SHORTVER), 4.x) else #if gcc 3.4+ ifeq ($(CC_SHORTVER), 3.4) - CPU ?= athlon +$(call set_if_empty,CPU,athlon) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -mtune=$(CPU) @@ -842,7 +845,7 @@ ifeq ($(CC_SHORTVER), 3.4) else #if gcc 3.0+ ifeq ($(CC_SHORTVER), 3.0) - CPU ?= athlon +$(call set_if_empty,CPU,athlon) CFLAGS+=-minline-all-stringops \ -falign-loops \ -mcpu=$(CPU) @@ -890,7 +893,7 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= opteron +$(call set_if_empty,CPU,opteron) CFLAGS+=-m64 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -900,7 +903,7 @@ ifeq ($(CC_SHORTVER), 4.2+) else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CPU ?= opteron +$(call set_if_empty,CPU,opteron) CFLAGS+=-m64 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -909,14 +912,14 @@ ifeq ($(CC_SHORTVER), 4.x) else #if gcc 3.4 ifeq ($(CC_SHORTVER), 3.4) - CPU ?= athlon64 +$(call set_if_empty,CPU,athlon64) CFLAGS+=-m64 -minline-all-stringops \ -falign-loops LDFLAGS+=-m64 else #if gcc 3.0 ifeq ($(CC_SHORTVER), 3.0) - CPU ?= athlon64 +$(call set_if_empty,CPU,athlon64) CFLAGS+=-minline-all-stringops \ -falign-loops #-mcpu=$(CPU) \ # not working on all x86_64 gccs @@ -967,7 +970,7 @@ ifeq ($(CC_NAME), gcc) #-Wmissing-prototypes #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= ultrasparc +$(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc \ -mtune=$(CPU) \ @@ -981,7 +984,7 @@ ifeq ($(CC_SHORTVER), 4.2+) else #if gcc 4.x ifeq ($(CC_SHORTVER), 4.x) - CPU ?= ultrasparc +$(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc \ -mtune=$(CPU) \ @@ -990,14 +993,14 @@ ifeq ($(CC_SHORTVER), 4.x) else #if gcc 3.4 ifeq ($(CC_SHORTVER), 3.4) - CPU ?= ultrasparc +$(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPU) LDFLAGS+=-m64 else #if gcc 3.0 ifeq ($(CC_SHORTVER), 3.0) - CPU ?= ultrasparc +$(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPU) \ # -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu @@ -1058,7 +1061,7 @@ ifeq ($(CC_NAME), gcc) #-Wmissing-prototypes #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= v8 +$(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) \ -fno-strict-overflow \ @@ -1066,20 +1069,20 @@ ifeq ($(CC_SHORTVER), 4.2+) else #if gcc 4.x ifeq ($(CC_SHORTVER), 4.x) - CPU ?= v8 +$(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) \ -ftree-vectorize else #if gcc 3.4 ifeq ($(CC_SHORTVER), 3.4) - CPU ?= v8 +$(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) else #if gcc 3.0 ifeq ($(CC_SHORTVER), 3.0) - CPU ?= v8 +$(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) \ #-mno-epilogue #try to inline function exit code @@ -1399,14 +1402,14 @@ ifeq ($(CC_NAME), gcc) CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= powerpc +$(call set_if_empty,CPU,powerpc) CFLAGS+=-ftree-vectorize \ -fno-strict-overflow \ -mtune=$(CPU) -maltivec else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CPU ?= powerpc +$(call set_if_empty,CPU,powerpc) CFLAGS+=-ftree-vectorize \ -mtune=$(CPU) -maltivec else @@ -1448,14 +1451,14 @@ ifeq ($(CC_NAME), gcc) CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) - CPU ?= powerpc64 +$(call set_if_empty,CPU,powerpc64) CFLAGS+=-ftree-vectorize \ -fno-strict-overflow \ -mtune=$(CPU) -maltivec else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CPU ?= powerpc64 +$(call set_if_empty,CPU,powerpc64) CFLAGS+=-ftree-vectorize \ -mtune=$(CPU) -maltivec else

1 0

git:kamailio_3.0: cfg. parser: fix warnings
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: kamailio_3.0 Commit: 8b18772c4c5df2e96d89e2c56071eb5770fd7290 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b18772… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 10 09:45:28 2010 +0100 cfg. parser: fix warnings - removed flex input warnings - workaround for bison conflicts warnings (%expect ...) (cherry picked from commit 0dabc34afe64672f07f572acfcd9478fc3575c9d) --- cfg.lex | 1 + cfg.y | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index 3d41477..ef8cc6f 100644 --- a/cfg.lex +++ b/cfg.lex @@ -83,6 +83,7 @@ * 2010-01-10 added SHM_MEM_SZ (andrei) */ +%option noinput %{ #include "dprint.h" diff --git a/cfg.y b/cfg.y index f535d98..60ce707 100644 --- a/cfg.y +++ b/cfg.y @@ -100,6 +100,8 @@ * added SHM_MEM_SZ (andrei) */ +%expect 5 + %{ #include <stdlib.h>

1 0

git:kamailio_3.0: make: depends move/rm file fix & optimization
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: kamailio_3.0 Commit: ae9b1ec34994686c4d2d902582835ab0b2ed2c59 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae9b1ec… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 9 21:57:25 2010 +0100 make: depends move/rm file fix & optimization - fix for make failing if the depends were made and a *.h is moved or deleted - avoid restarting make when depends change (make the depends at the same moment when the .o are generated) (cherry picked from commit 965e651fbe84d370c05a647e022023cecf2d02bd) --- Makefile.rules | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 8f254f4..5ee7d76 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -84,11 +84,9 @@ exec_cmd= $(if $($(quiet)_cmd_$(1)),\ #implicit rules %.o:%.c $(ALLDEP) $(call exec_cmd,CC) - -%.d: %.c $(ALLDEP) - @set -e; $(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $<\ - | sed 's#$\($(*D)/$\{0,1\}$(*F)\)\.o[ :]*#$*.o $@ : #g' > $@; \ - test -s $@ || ( rm -f $@; false ) + @$(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $< \ + | sed -e 's/#.*//' -e '/:[ ]*$$/d' -e '/^[ ]*$$/d' \ + -e 's#.*:#$@: $$(wildcard #g' -e 's/$[^\\]$$$/\1)/'> $*.d # use RPATH and SER_LIBS if needed (make install and the module depends # on some ser libs) @@ -193,9 +191,6 @@ makecfg.lst: .PHONY: all all: $(NAME) every-module -.PHONY: dep -dep: $(depends) - .PHONY: static static: $(objs)

1 0

git:sr_3.0: makefile: fix install-cfg & install-utils on solaris
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: sr_3.0 Commit: d4028e0df24a97ccaacf867ab6bfe92f270b92e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4028e0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 16 18:15:56 2010 +0100 makefile: fix install-cfg & install-utils on solaris Reported-by: Nathaniel L Keeling keeling akan-tech com (cherry picked from commit ad57482b7d05417f7f0058cef8c698f18d6d9a39) --- Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0fcb418..0132d71 100644 --- a/Makefile +++ b/Makefile @@ -897,8 +897,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ fi - # other configs - @for r in $(C_INSTALL_CFGS) ; do \ + @# other configs + @for r in $(C_INSTALL_CFGS) ""; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ n=`basename "$$r"` ; \ @@ -985,8 +985,10 @@ install-utils: utils $(bin_prefix)/$(bin_dir) fi ;\ fi ; \ done; true - @for ut in $(C_INSTALL_UTILS) ; do \ - $(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\ + @for ut in $(C_INSTALL_UTILS) "" ; do \ + if [ -n "$$r" ]; then \ + $(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\ + fi ; \ done; true

1 0

git:sr_3.0: perl(k): fix mk_action call
by Andrei Pelinescu-Onciul 17 Mar '10

17 Mar '10

Module: sip-router Branch: sr_3.0 Commit: ecd96ad7a7b7158ea17dcb90dc13e51a6572b3bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecd96ad… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Mar 14 17:13:40 2010 +0100 perl(k): fix mk_action call The mk_action() call used the old openser format, instead of the sip_router one. (cherry picked from commit a14aaf3f2fe11cdc0d56e1a12cb60ae0cd53b8f5) --- modules_k/perl/openserxs.xs | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/openserxs.xs index 418f1e3..4ee86b6 100644 --- a/modules_k/perl/openserxs.xs +++ b/modules_k/perl/openserxs.xs @@ -220,7 +220,6 @@ int moduleFunc(struct sip_msg *m, char *func, unsigned mod_ver; char *argv[2]; int argc = 0; - action_u_t elems[MAX_ACTIONS]; struct run_act_ctx ra_ctx; if (!func) { @@ -260,16 +259,12 @@ int moduleFunc(struct sip_msg *m, char *func, return -1; } - elems[0].type = MODULE_T; - elems[0].u.data = exp_func_struct; - elems[1].type = STRING_ST; - elems[1].u.data = argv[0]; - elems[2].type = STRING_ST; - elems[2].u.data = argv[1]; - act = mk_action( MODULE_T, - 3, - elems, - 0); + act = mk_action(MODULE_T, 4 /* number of (type, value) pairs */, + MODEXP_ST, exp_func_struct, /* function */ + NUMBER_ST, 2, /* parameter number */ + STRING_ST, argv[0], /* param. 1 */ + STRING_ST, argv[1] /* param. 2 */ + ); if (!act) {

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010