sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:kamailio_3.0: core: added new event SREV_CORE_STATS

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 47c89177ce276cdf8f6a2d06fdd3359ba283fe4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47c8917… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 20:47:35 2009 +0200 core: added new event SREV_CORE_STATS - to be used by Kamailio core statistics not included in stock SR core --- events.c | 12 ++++++++++++ events.h | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/events.c b/events.c index 0d07395..be98221 100644 --- a/events.c +++ b/events.c @@ -48,6 +48,11 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.net_data_out = f; else return -1; break; + case SREV_CORE_STATS: + if(_sr_events_list.core_stats==0) + _sr_events_list.core_stats = f; + else return -1; + break; default: return -1; } @@ -91,6 +96,13 @@ int sr_event_exec(int type, void *data) return ret; } else return 1; break; + case SREV_CORE_STATS: + if(unlikely(_sr_events_list.core_stats!=0)) + { + ret = _sr_events_list.core_stats(data); + return ret; + } else return 1; + break; default: return -1; } diff --git a/events.h b/events.h index 9fda619..9af0d71 100644 --- a/events.h +++ b/events.h @@ -25,12 +25,14 @@ #define SREV_NET_DATA_IN 1 #define SREV_NET_DATA_OUT 2 +#define SREV_CORE_STATS 3 typedef int (*sr_event_cb_f)(void *data); typedef struct sr_event_cb { sr_event_cb_f net_data_in; sr_event_cb_f net_data_out; + sr_event_cb_f core_stats; } sr_event_cb_t; void sr_event_cb_init(void);

15 years, 2 months

git:master: Fix path for dbtext

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2605ea2432193a75ded29f522df996ea8fbcb4f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2605ea2… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Oct 14 14:05:44 2009 +0300 Fix path for dbtext --- test/unit/15.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/unit/15.sh b/test/unit/15.sh index 3938e98..14b0e08 100755 --- a/test/unit/15.sh +++ b/test/unit/15.sh @@ -30,7 +30,7 @@ fi ; echo "loadmodule \"../../modules_k/db_text/db_text.so\"" >> $CFG cat 2.cfg >> $CFG -echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../scripts/dbtext/kamailio\")" >> $CFG +echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../utils/kamctl/dbtext/kamailio\")" >> $CFG $BIN -w . -f $CFG > /dev/null ret=$?

15 years, 2 months

git:master: Fixed loading of tm module in test

by Marius Zbihlei

Module: sip-router Branch: master Commit: 9e9f4383d19e891415469f5a06fa1734d73951b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e9f438… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Oct 14 13:13:15 2009 +0300 Fixed loading of tm module in test Fixed variable name ($fU instead of $fu) Test now runs ok --- test/unit/12.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/12.cfg b/test/unit/12.cfg index d1e11c7..1fcc96d 100644 --- a/test/unit/12.cfg +++ b/test/unit/12.cfg @@ -2,8 +2,8 @@ log_stderror=yes listen=127.0.0.1 loadpath "../../modules_k/" loadmodule "../../modules/db_mysql/db_mysql.so" -loadmodule "sl" loadmodule "../../modules/tm/tm.so" +loadmodule "sl" loadmodule "rr" loadmodule "maxfwd" loadmodule "textops" @@ -94,7 +94,7 @@ route[39] { $avp(i:82)=$(pu{uri.domain}); $avp(i:83)=$pu; xlog("L_ERR", "Getting identity from P-Preferred-Identity header\n"); - } else if ($fu) { + } else if ($fU) { $avp(i:81)=$(fu{uri.user}); $avp(i:82)=$(fu{uri.domain}); $avp(i:83)=$fu;

15 years, 2 months

git:kamailio_3.0: etc: add modules_k to search path of modules

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 974e91436a5cf2bdab0f0e6d9d94d4425c2320ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=974e914… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 23:46:46 2009 +0200 etc: add modules_k to search path of modules --- etc/kamailio.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index c85cd05..fc90e95 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -105,7 +105,7 @@ port=5060 ####### Modules Section ######## #set module path -mpath="/usr/local/lib/kamailio/modules/" +mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" /* uncomment next line for MySQL DB support */ #m#loadmodule "db_mysql.so"

15 years, 2 months

git:kamailio_3.0: core: combined Makefile with sr_3.0 version

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 3259e890c5ea9e142674c2487f3e9f28c26cd1a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3259e89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 23:30:53 2009 +0200 core: combined Makefile with sr_3.0 version - replaced previous version with sr_3.0 to install utils' tools - gen_ha1 still not to be installed - kamailio.cfg is installed as main config - check if cfg files to be installed exist -- $CFG_NAME-basic.cfg and $CFG_NAME-oob.cfg were attempted to be installed although not available for different flavours - install dictionary.kamailio used by K radius-related modules, instead of SR version --- Makefile | 141 +++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 107 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 2d9f6d3..95115a5 100644 --- a/Makefile +++ b/Makefile @@ -339,15 +339,27 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) #modules_full_path=$(join $(modules), $(addprefix /, $(modules_names))) -# which utils need compilation (directory path) and which to install -# (full path including file name) -utils_compile= utils/sercmd -utils_bin_install= utils/kamctl # sercmd is now installed by ctl -utils_script_install= -# This is the list of files to be installed into the arch-independent -# shared directory (by default /usr/local/share/$(MAIN_NAME)) -share_install= +# list of utils directories that should be compiled by make utils +C_COMPILE_UTILS= utils/sercmd +# list of binaries that should be installed alongside +# (they should be created after make utils, see C_COMPILE_UTILS) +C_INSTALL_BIN= # sercmd is now installed by ctl + +# which utils know to install themselves and should be installed +# along the core (list of utils directories) +C_INSTALL_UTILS= utils/kamctl +# list of scripts that should be installed along the core +# (here a script is something that doesn't have a Makefile) +C_INSTALL_SCRIPTS= +# list of extra configs that should be installed along the core +# Note: all the paths of the form /usr/*lib/$(CFG_NAME)/<module_dir> +# will be updated to the directory where the modules will be installed. +C_INSTALL_CFGS= +# list of files that should be installed in the arch-independent +# directory (by default /usr/local/share/$(MAIN_NAME))) +C_INSTALL_SHARE= + @@ -635,7 +647,7 @@ $(extra_objs): .PHONY: utils utils: - @for r in $(utils_compile) "" ; do \ + @for r in $(C_COMPILE_UTILS) "" ; do \ if [ -n "$$r" ]; then \ $(call oecho, "" ;) \ $(call oecho, "" ;) \ @@ -780,27 +792,67 @@ $(man_prefix)/$(man_dir)/man5: # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) install-cfg: $(cfg_prefix)/$(cfg_dir) - @sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/$(CFG_NAME)-basic.cfg > \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample - @chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample - @if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg ]; then \ - mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ + @if [ -f etc/$(CFG_NAME).cfg ]; then \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(CFG_NAME).cfg > \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample; \ + chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample; \ + if [ -z "${skip_cfg_install}" -a \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ + fi; \ fi - @sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/$(CFG_NAME)-oob.cfg \ - > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample - @chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample - @if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg ]; \ - then \ - mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ + @if [ -f etc/$(CFG_NAME)-basic.cfg ]; then \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(CFG_NAME)-basic.cfg > \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ + chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ + if [ -z "${skip_cfg_install}" -a \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg; \ + fi; \ + fi + @if [ -f etc/$(CFG_NAME)-oob.cfg ]; then \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(CFG_NAME)-oob.cfg \ + > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample; \ + chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample; \ + if [ -z "${skip_cfg_install}" -a \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg ]; \ + then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ + fi; \ fi + # other configs + @for r in $(C_INSTALL_CFGS) ; do \ + if [ -n "$$r" ]; then \ + if [ -f "$$r" ]; then \ + n=`basename "$$r"` ; \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < "$$r" \ + > "$(cfg_prefix)/$(cfg_dir)$$n.sample" ; \ + chmod 644 "$(cfg_prefix)/$(cfg_dir)$$n.sample" ; \ + if [ -z "${skip_cfg_install}" -a \ + ! -f "$(cfg_prefix)/$(cfg_dir)$$n" ]; \ + then \ + mv -f "$(cfg_prefix)/$(cfg_dir)$$n.sample" \ + "$(cfg_prefix)/$(cfg_dir)$$n"; \ + fi ; \ + else \ + echo "ERROR: $$r not found" ; \ + if [ ${err_fail} = 1 ] ; then \ + exit 1; \ + fi ; \ + fi ; \ + fi ; \ + done; true # radius dictionary $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) @@ -811,7 +863,7 @@ install-bin: $(bin_prefix)/$(bin_dir) $(NAME) install-share: $(share_prefix)/$(share_dir) - @for r in $(share_install) "" ; do \ + @for r in $(C_INSTALL_SHARE) "" ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ $(call try_err, $(INSTALL_TOUCH) \ @@ -835,18 +887,39 @@ install-every-module-doc: $(foreach mods,$(modules_dirs),install-$(mods)-doc) install-every-module-man: $(foreach mods,$(modules_dirs),install-$(mods)-man) install-utils: utils $(bin_prefix)/$(bin_dir) - @for r in $(utils_bin_install) "" ; do \ - if [ -d "$$r" ]; then \ - if [ -f "$$r/Makefile" ]; then \ - make -C "$$r" install; \ + @for r in $(C_INSTALL_BIN) "" ; do \ + if [ -n "$$r" ]; then \ + if [ -f "$$r" ]; then \ + $(call try_err, $(INSTALL_TOUCH) \ + $(bin_prefix)/$(bin_dir)/`basename "$$r"` ); \ + $(call try_err,\ + $(INSTALL_BIN) "$$r" $(bin_prefix)/$(bin_dir) ); \ else \ - echo "ERROR: $$r has no Makefile to install" ; \ + echo "ERROR: $$r not compiled" ; \ if [ ${err_fail} = 1 ] ; then \ exit 1; \ fi ; \ fi ;\ fi ; \ done; true + @for r in $(C_INSTALL_SCRIPTS) "" ; do \ + if [ -n "$$r" ]; then \ + if [ -f "$$r" ]; then \ + $(call try_err, $(INSTALL_TOUCH) \ + $(bin_prefix)/$(bin_dir)/`basename "$$r"` ); \ + $(call try_err,\ + $(INSTALL_SCRIPT) "$$r" $(bin_prefix)/$(bin_dir) ); \ + else \ + echo "ERROR: $$r not compiled" ; \ + if [ ${err_fail} = 1 ] ; then \ + exit 1; \ + fi ; \ + fi ;\ + fi ; \ + done; true + @for ut in $(C_INSTALL_UTILS) ; do \ + $(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\ + done; true install-modules-all: install-every-module install-every-module-doc

15 years, 2 months

git:kamailio_3.0: etc: renamed dictionary.radius to dictionary.kamailio

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 224faa34e6326a72cda7c9350c891abe83a587f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=224faa3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 23:37:53 2009 +0200 etc: renamed dictionary.radius to dictionary.kamailio - copes better with FLAVOUR setting - shows the target usage --- etc/{dictionary.radius => dictionary.kamailio} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/etc/dictionary.radius b/etc/dictionary.kamailio similarity index 100% rename from etc/dictionary.radius rename to etc/dictionary.kamailio

15 years, 2 months

git:kamailio_3.0: core: updated of CFG_NAME

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 8d668ebc5328755bbcfd40c7193953d6ccd58eeb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d668eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 23:35:35 2009 +0200 core: updated of CFG_NAME - default value set to kamailio for FLAVOUR==kamailio - this ensures that kamailio.cfg and kamailio radius dictionary are installed --- Makefile.defs | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index b312bbe..d623b9b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -115,6 +115,12 @@ endif # verbose # flavour: sip-router, ser or kamailio FLAVOUR=kamailio +#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 + ifeq ($(FLAVOUR),sip-router) # main binary name MAIN_NAME=ser @@ -124,17 +130,12 @@ MAIN_NAME=ser else ifeq ($(FLAVOUR),kamailio) # main binary name MAIN_NAME=kamailio +CFG_NAME=kamailio else # default: # main binary name 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 - # what to install INSTALL_FLAVOUR=$(FLAVOUR)

15 years, 2 months

git:kamailio_3.0: kamctl: added install-if-newer in Makefile

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 418bbf80cfc3d4efa2334c1b3bdbfb6e91853f7a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=418bbf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 23:29:04 2009 +0200 kamctl: added install-if-newer in Makefile --- utils/kamctl/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 9c6d377..fd1129a 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -5,6 +5,8 @@ include $(COREPATH)/Makefile.defs all: @echo "No compilation needed for kamctl" +install-if-newer: install + install: install-cfg install-bin install-man install-modules install-cfg: $(cfg_prefix)/$(cfg_dir)

15 years, 2 months

git:sr_3.0: makefile: support self-installing utils, extra cfgs a.s.o.

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 8421aeb229ab00db385cbd2bc9fc0638303059d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8421aeb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 13 21:58:56 2009 +0200 makefile: support self-installing utils, extra cfgs a.s.o. - support for self-installing utils, they just need to be added to C_INSTALL_UTILS - support for extra installed config, they just need to be added to C_INSTALL_CFGS. Module paths inside them will be fixed automatically if they are of the form /usr/*lib/modules*/. - utils_compile renamed into C_COMPILE_UTILS - utils_bin_install renamed into C_INSTALL_BIN - utils_script_install renamed into C_INSTALL_SCRIPTS - share_install renamed into C_INSTALL_SHARE --- Makefile | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 51 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 768c080..80fcf22 100644 --- a/Makefile +++ b/Makefile @@ -339,15 +339,27 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) #modules_full_path=$(join $(modules), $(addprefix /, $(modules_names))) -# which utils need compilation (directory path) and which to install -# (full path including file name) -utils_compile= utils/gen_ha1 utils/sercmd -utils_bin_install= utils/gen_ha1/gen_ha1 # sercmd is now installed by ctl -utils_script_install= -# This is the list of files to be installed into the arch-independent -# shared directory (by default /usr/local/share/$(MAIN_NAME)) -share_install= +# list of utils directories that should be compiled by make utils +C_COMPILE_UTILS= utils/gen_ha1 utils/sercmd +# list of binaries that should be installed alongside +# (they should be created after make utils, see C_COMPILE_UTILS) +C_INSTALL_BIN= utils/gen_ha1/gen_ha1 # sercmd is now installed by ctl + +# which utils know to install themselves and should be installed +# along the core (list of utils directories) +C_INSTALL_UTILS= +# list of scripts that should be installed along the core +# (here a script is something that doesn't have a Makefile) +C_INSTALL_SCRIPTS= +# list of extra configs that should be installed along the core +# Note: all the paths of the form /usr/*lib/$(CFG_NAME)/<module_dir> +# will be updated to the directory where the modules will be installed. +C_INSTALL_CFGS= +# list of files that should be installed in the arch-independent +# directory (by default /usr/local/share/$(MAIN_NAME))) +C_INSTALL_SHARE= + @@ -635,7 +647,7 @@ $(extra_objs): .PHONY: utils utils: - @for r in $(utils_compile) "" ; do \ + @for r in $(C_COMPILE_UTILS) "" ; do \ if [ -n "$$r" ]; then \ $(call oecho, "" ;) \ $(call oecho, "" ;) \ @@ -801,6 +813,30 @@ 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 \ + if [ -n "$$r" ]; then \ + if [ -f "$$r" ]; then \ + n=`basename "$$r"` ; \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < "$$r" \ + > "$(cfg_prefix)/$(cfg_dir)$$n.sample" ; \ + chmod 644 "$(cfg_prefix)/$(cfg_dir)$$n.sample" ; \ + if [ -z "${skip_cfg_install}" -a \ + ! -f "$(cfg_prefix)/$(cfg_dir)$$n" ]; \ + then \ + mv -f "$(cfg_prefix)/$(cfg_dir)$$n.sample" \ + "$(cfg_prefix)/$(cfg_dir)$$n"; \ + fi ; \ + else \ + echo "ERROR: $$r not found" ; \ + if [ ${err_fail} = 1 ] ; then \ + exit 1; \ + fi ; \ + fi ; \ + fi ; \ + done; true # radius dictionary $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) @@ -811,7 +847,7 @@ install-bin: $(bin_prefix)/$(bin_dir) $(NAME) install-share: $(share_prefix)/$(share_dir) - @for r in $(share_install) "" ; do \ + @for r in $(C_INSTALL_SHARE) "" ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ $(call try_err, $(INSTALL_TOUCH) \ @@ -835,7 +871,7 @@ install-every-module-doc: $(foreach mods,$(modules_dirs),install-$(mods)-doc) install-every-module-man: $(foreach mods,$(modules_dirs),install-$(mods)-man) install-utils: utils $(bin_prefix)/$(bin_dir) - @for r in $(utils_bin_install) "" ; do \ + @for r in $(C_INSTALL_BIN) "" ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ $(call try_err, $(INSTALL_TOUCH) \ @@ -850,7 +886,7 @@ install-utils: utils $(bin_prefix)/$(bin_dir) fi ;\ fi ; \ done; true - @for r in $(utils_script_install) "" ; do \ + @for r in $(C_INSTALL_SCRIPTS) "" ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ $(call try_err, $(INSTALL_TOUCH) \ @@ -865,6 +901,9 @@ 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 ) ;\ + done; true install-modules-all: install-every-module install-every-module-doc

15 years, 2 months

git:kamailio_3.0: kex: support to update core stats via core events

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: ea5ee19268c6a7e6f69df674b16fb19d2a2d6409 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea5ee19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 21:28:42 2009 +0200 kex: support to update core stats via core events --- modules_k/kex/core_stats.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index 121bb15..466dd11 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -36,6 +36,7 @@ #include "../../lib/kcore/statistics.h" #include "../../lib/kmi/mi.h" +#include "../../events.h" #include "../../dprint.h" #include "../../timer.h" #include "../../parser/msg_parser.h" @@ -127,6 +128,49 @@ static int km_cb_rpl_stats(struct sip_msg *msg, return 1; } + +static int sts_update_core_stats(void *data) +{ + int type; + + type = (int)data; + switch(type) { + case 1: + /* fwd_requests */ + update_stat(fwd_reqs, 1); + break; + case 2: + /* fwd_replies */ + update_stat(fwd_rpls, 1); + break; + case 3: + /* drop_requests */ + update_stat(drp_reqs, 1); + break; + case 4: + /* drop_replies */ + update_stat(drp_rpls, 1); + break; + case 5: + /* err_requests */ + update_stat(err_reqs, 1); + break; + case 6: + /* err_replies */ + update_stat(err_rpls, 1); + break; + case 7: + /* bad_URIs_rcvd */ + update_stat(bad_URIs, 1); + break; + case 8: + /* bad_msg_hdr */ + update_stat(bad_msg_hdr, 1); + break; + } + return 0; +} + int register_core_stats(void) { /* register core statistics */ @@ -147,6 +191,7 @@ int register_core_stats(void) LM_ERR("failed to register PRE request callback\n"); return -1; } + sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); return 0; }

15 years, 2 months

← Newer
1
...
24
25
26
27
28
29
30
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009