sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: ec41cab0c1133893a4edeb21e448eafd526d41ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec41cab… 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 bfaff5f..05740c2 100644 --- a/cfg.y +++ b/cfg.y @@ -100,6 +100,8 @@ * added SHM_MEM_SZ (andrei) */ +%expect 5 + %{ #include <stdlib.h>

14 years, 9 months

git:sr_3.0: tls: doc: fix low_mem_treshold* name in examples

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: d39cdd6cb975aa7c29d5d7a1071e85723805c23d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d39cdd6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 16 11:13:19 2010 +0100 tls: doc: fix low_mem_treshold* name in examples The tls examples used low_memory_threshold[12] instead of low_mem_treshold[12]. Reported-by: Jan Janak <jan(a)iptel.org> (cherry picked from commit 915a0052092be70630f76a91c19c9a540da038df) --- modules/tls/README | 8 ++++---- modules/tls/doc/params.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/tls/README b/modules/tls/README index c30c1c7..fcdc5d9 100644 --- a/modules/tls/README +++ b/modules/tls/README @@ -444,9 +444,9 @@ low_mem_threshold1 (integer) See also low_mem_threshold2. - Example 15. Set low_memory_threshold1 parameter + Example 15. Set low_mem_threshold1 parameter ... -modparam("tls", "low_memory_threshold1", -1) +modparam("tls", "low_mem_threshold1", -1) ... low_mem_threshold2 (integer) @@ -470,9 +470,9 @@ low_mem_threshold2 (integer) See also low_mem_threshold1. - Example 16. Set low_memory_threshold2 parameter + Example 16. Set low_mem_threshold2 parameter ... -modparam("tls", "low_memory_threshold2", -1) +modparam("tls", "low_mem_threshold2", -1) ... tls_force_run (boolean) diff --git a/modules/tls/doc/params.xml b/modules/tls/doc/params.xml index f5bcd50..03748a5 100644 --- a/modules/tls/doc/params.xml +++ b/modules/tls/doc/params.xml @@ -322,10 +322,10 @@ modparam("tls", "tls_log", 10) See also <varname>low_mem_threshold2</varname>. </para> <example> - <title>Set <varname>low_memory_threshold1</varname> parameter</title> + <title>Set <varname>low_mem_threshold1</varname> parameter</title> <programlisting> ... -modparam("tls", "low_memory_threshold1", -1) +modparam("tls", "low_mem_threshold1", -1) ... </programlisting> </example> @@ -361,10 +361,10 @@ modparam("tls", "low_memory_threshold1", -1) See also <varname>low_mem_threshold1</varname>. </para> <example> - <title>Set <varname>low_memory_threshold2</varname> parameter</title> + <title>Set <varname>low_mem_threshold2</varname> parameter</title> <programlisting> ... -modparam("tls", "low_memory_threshold2", -1) +modparam("tls", "low_mem_threshold2", -1) ... </programlisting> </example>

14 years, 9 months

git:sr_3.0: mem: fix real_used stats for realloc

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: e3dc76b5830f40c08251d6df21cb502ba39f442e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3dc76b… 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); }

14 years, 9 months

git:sr_3.0: tls: documented is_peer_verified()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 8afc847ea624a1b8c917c5377aa398d4b2125537 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8afc847… 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=8af…

14 years, 9 months

git:sr_3.0: docbook: fix rm'ed files mentioned in .d build error

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 18f07d77b1fc5bdfd0ecbc75669b8f16fee12a77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18f07d7… 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>

14 years, 9 months

git:sr_3.0: make: fix CPU reset in some conditions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 4950c885cc89f946cecb7f51129f08ec7ddd875d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4950c88… 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 | 61 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 358e99c..d612d4a 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -115,8 +115,19 @@ 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=sip-router +$(call set_if_empty,FLAVOUR,sip-router) + +#prefix for various configs and scripts +#config name/name-prefix for distributed configs +CFG_NAME=sip-router +#config name/name-prefix for distributed scripts +SCR_NAME=sip-router +#name in source tree +SRC_NAME=sip-router ifeq ($(FLAVOUR),sip-router) # main binary name @@ -132,14 +143,6 @@ else # default: MAIN_NAME=sip-router endif -#prefix for various configs and scripts -#config name/name-prefix for distributed configs -CFG_NAME=sip-router -#config name/name-prefix for distributed scripts -SCR_NAME=sip-router -#name in source tree -SRC_NAME=sip-router - # what to install INSTALL_FLAVOUR=$(FLAVOUR) @@ -807,7 +810,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 \ @@ -817,7 +820,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 \ @@ -826,7 +829,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) @@ -834,7 +837,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) @@ -882,7 +885,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 \ @@ -892,7 +895,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 \ @@ -901,14 +904,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 @@ -959,7 +962,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) \ @@ -973,7 +976,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) \ @@ -982,14 +985,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 @@ -1050,7 +1053,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 \ @@ -1058,20 +1061,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 @@ -1391,14 +1394,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 @@ -1440,14 +1443,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

14 years, 9 months

git:sr_3.0: make: on-the-fly dependency generation

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 929598a19dfb09efcfcbb1aee57a83f45b12592f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=929598a… 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) --- Makefile.defs | 12 ++++++++++-- Makefile.rules | 22 +++++++++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index de2cf24..358e99c 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) @@ -345,7 +348,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/'| \ @@ -354,7 +357,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 @@ -1938,6 +1945,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)

14 years, 9 months

git:sr_3.0: make: depends move/rm file fix & optimization

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 26460ec021bb31601d820719f5ec27eb842fad2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26460ec… 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)

14 years, 9 months

[ openser-Patches-2826542 ] Add id parameter to pua_mi's send_publish

by SourceForge.net

Patches item #2826542, was opened at 2009-07-24 15:27 Message generated for change (Comment added) made by miconda You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=2826542&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x >Status: Closed >Resolution: Accepted Priority: 5 Private: No Submitted By: Alex Hermann (axlh) >Assigned to: Daniel-Constantin Mierla (miconda) Summary: Add id parameter to pua_mi's send_publish Initial Comment: When using presence with dialog-info, one needs to be able to specify an id, otherwise presentity from different calls for the same presentity-uri will overwrite each other. This patch makes it possible to specify an 'id' in the MI interface for send_publish. Unfortunately it breaks backward compatibility but it's the only way to use dialog-info with MI without having to manually store a the state of the ETag in the proxy. ---------------------------------------------------------------------- >Comment By: Daniel-Constantin Mierla (miconda) Date: 2010-03-17 21:37 Message: Patch applied in GIT devel version. ---------------------------------------------------------------------- Comment By: Alex Hermann (axlh) Date: 2010-03-02 12:05 Message: I don't think changing the API in a stable release is appropriate. So, no, I didn't commit it to 1.5. It might apply to git master too, but I haven't had time to use/evaluate SR yet and I don't feel comfortable with committing without testing. ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2010-03-01 21:02 Message: Just saw this one again. Alex, did you commit it? ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=2826542&group_…

14 years, 9 months

git:master: pua_mi: id parameter introduced in mi pua_publish

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8b7f0d9c8a79e5d2d5e7acd193a1ddace84a4a0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b7f0d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 17 20:32:40 2010 +0100 pua_mi: id parameter introduced in mi pua_publish - the parameter is before etag - required to refer to same call for dialog-info - patch by Alex Hermann (SF#2826542) --- modules_k/pua_mi/README | 122 +++++++++++++++++++------------- modules_k/pua_mi/doc/pua_mi_admin.xml | 13 ++++ modules_k/pua_mi/mi_func.c | 21 ++++++- 3 files changed, 105 insertions(+), 51 deletions(-) diff --git a/modules_k/pua_mi/README b/modules_k/pua_mi/README index 487b3d0..ecbc6ca 100644 --- a/modules_k/pua_mi/README +++ b/modules_k/pua_mi/README @@ -14,27 +14,26 @@ Juha Heinanen Copyright � 2006 voice-system.ro Revision History - Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Mi, 06 Aug 2008) $ - __________________________________________________________ + Revision $Revision$ $Date$ + __________________________________________________________________ Table of Contents 1. Admin Guide - 1.1. Overview - 1.2. Dependencies + 1. Overview + 2. Dependencies - 1.2.1. Kamailio Modules - 1.2.2. External Libraries or Applications + 2.1. Kamailio Modules + 2.2. External Libraries or Applications - 1.3. Exported Parameters - 1.4. Exported Functions - 1.5. Exported MI functions + 3. Exported Parameters + 4. Exported Functions + 5. Exported MI functions - 1.5.1. pua_publish + 5.1. pua_publish - 1.6. pua_subscribe + 6. pua_subscribe List of Examples @@ -42,44 +41,63 @@ Juha Heinanen Chapter 1. Admin Guide -1.1. Overview + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + 4. Exported Functions + 5. Exported MI functions + + 5.1. pua_publish + + 6. pua_subscribe - The pua_mi offers the possibility to publish presence - information and subscribe to presence information via MI - transports. +1. Overview - Using this module you can create independent - applications/scripts to publish not sip-related information - (e.g., system resources like CPU-usage, memory, number of - active subscribers ...). Also, this module allows non-SIP - speaking applications to subscribe presence information kept in - a SIP presence server. + The pua_mi offers the possibility to publish presence information and + subscribe to presence information via MI transports. -1.2. Dependencies + Using this module you can create independent applications/scripts to + publish not sip-related information (e.g., system resources like + CPU-usage, memory, number of active subscribers ...). Also, this module + allows non-SIP speaking applications to subscribe presence information + kept in a SIP presence server. -1.2.1. Kamailio Modules +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules The following modules must be loaded before this module: * pua -1.2.2. External Libraries or Applications +2.2. External Libraries or Applications - The following libraries or applications must be installed - before running Kamailio with this module loaded: + The following libraries or applications must be installed before + running Kamailio with this module loaded: * none -1.3. Exported Parameters +3. Exported Parameters * none -1.4. Exported Functions +4. Exported Functions + + The module does not export functions to be used in configuration + script. - The module does not export functions to be used in - configuration script. +5. Exported MI functions -1.5. Exported MI functions + 5.1. pua_publish -1.5.1. pua_publish +5.1. pua_publish Command parameters: * presentity_uri - e.g. sip:system@kamailio.org @@ -88,13 +106,18 @@ Chapter 1. Admin Guide information (e.g. presence). * content type - Content type of published information (e.g. application/pidf+xml) or . if no information is enclosed. - * ETag - ETag that publish should match or . if no ETag is - given. - * extra_headers - Extra headers added to PUBLISH request or . - if no extra headers. + * id - id for a series of related PUBLISHes to the same + presentity-uri or . to always use the same series. For example + dialog-info must reuse the same id for the same call otherwise + status will be lost when multiple parallel calls to/from the same + user take place. The dialog-id from the dialog-info body qualifies + as a suitable id here. + * ETag - ETag that publish should match or . if no ETag is given. + * extra_headers - Extra headers added to PUBLISH request or . if no + extra headers. * body - The body of the publish request containing published - information or missing if no published information. It has - to be a single line for FIFO transport. + information or missing if no published information. It has to be a + single line for FIFO transport. Example 1.1. pua_publish FIFO example ... @@ -106,20 +129,19 @@ presence application/pidf+xml . . -<?xml version='1.0'?><presence xmlns='urn:ietf:params:xml:ns:pidf' xmlns -:dm='urn:ietf:params:xml:ns:pidf:data-model' xmlns:rpid='urn:ietf:params -:xml:ns:pidf:rpid' xmlns:c='urn:ietf:params:xml:ns:pidf:cipid' entity='s -ystem(a)kamailio.org'><tuple id='0x81475a0'><status><basic>open</basic></s -tatus></tuple><dm:person id='pdd748945'><rpid:activities><rpid:away/>awa -y</rpid:activities><dm:note>CPU:16 MEM:476</dm:note></dm:person></presen -ce> - +. +<?xml version='1.0'?><presence xmlns='urn:ietf:params:xml:ns:pidf' xmlns:dm='urn +:ietf:params:xml:ns:pidf:data-model' xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpi +d' xmlns:c='urn:ietf:params:xml:ns:pidf:cipid' entity='system(a)kamailio.org'><tup +le id='0x81475a0'><status><basic>open</basic></status></tuple><dm:person id='pdd +748945'><rpid:activities><rpid:away/>away</rpid:activities><dm:note>CPU:16 MEM:4 +76</dm:note></dm:person></presence> -1.6. pua_subscribe +6. pua_subscribe Command parameters: * presentity_uri - e.g. sip:presentity@kamailio.org * watcher_uri - e.g. sip:watcher@kamailio.org * event package - * expires - Relative time in seconds for the desired validity - of the subscription. + * expires - Relative time in seconds for the desired validity of the + subscription. diff --git a/modules_k/pua_mi/doc/pua_mi_admin.xml b/modules_k/pua_mi/doc/pua_mi_admin.xml index 8602c49..5f332b8 100644 --- a/modules_k/pua_mi/doc/pua_mi_admin.xml +++ b/modules_k/pua_mi/doc/pua_mi_admin.xml @@ -120,6 +120,18 @@ </listitem> <listitem> <para> + <emphasis>id</emphasis> + - id for a series of related PUBLISHes to the same + presentity-uri or . to always use the same series. + For example dialog-info must reuse the same id for the + same call otherwise status will be lost when multiple + parallel calls to/from the same user take place. The + dialog-id from the dialog-info body qualifies as a suitable + id here. + </para> + </listitem> + <listitem> + <para> <emphasis>ETag</emphasis> - ETag that publish should match or . if no ETag is given. @@ -154,6 +166,7 @@ presence application/pidf+xml . . +. <?xml version='1.0'?><presence xmlns='urn:ietf:params:xml:ns:pidf' xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model' xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpid' xmlns:c='urn:ietf:params:xml:ns:pidf:cipid' entity='system(a)kamailio.org'><tuple id='0x81475a0'><status><basic>open</basic></status></tuple><dm:person id='pdd748945'><rpid:activities><rpid:away/>away</rpid:activities><dm:note>CPU:16 MEM:476</dm:note></dm:person></presence> ]]> </programlisting> diff --git a/modules_k/pua_mi/mi_func.c b/modules_k/pua_mi/mi_func.c index b8089aa..fe3fa3a 100644 --- a/modules_k/pua_mi/mi_func.c +++ b/modules_k/pua_mi/mi_func.c @@ -58,6 +58,7 @@ struct mi_root* mi_pua_publish(struct mi_root* cmd, void* param) publ_info_t publ; str event; str content_type; + str id; str etag; str extra_headers; int result; @@ -142,6 +143,19 @@ struct mi_root* mi_pua_publish(struct mi_root* cmd, void* param) if(node == NULL) return 0; + /* Get id */ + id= node->value; + if(id.s== NULL || id.len== 0) + { + LM_ERR("empty id parameter\n"); + return init_mi_tree(400, "Empty id parameter", 20); + } + LM_DBG("id '%.*s'\n", id.len, id.s); + + node = node->next; + if(node == NULL) + return 0; + /* Get etag */ etag= node->value; if(etag.s== NULL || etag.len== 0) @@ -213,7 +227,12 @@ struct mi_root* mi_pua_publish(struct mi_root* cmd, void* param) { publ.content_type= content_type; } - + + if(! (id.len== 1 && id.s[0]== '.')) + { + publ.id= id; + } + if(! (etag.len== 1 && etag.s[0]== '.')) { publ.etag= &etag;

14 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010