sr-dev

sr-dev@lists.kamailio.org

15 participants
44233 discussions

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, 3 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, 3 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, 3 months

git:kamailio_3.0: Makefile: tunnings for K-3.0

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 3996abca9e4abd3b88e56c6749938dbae27a526a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3996abc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 20:44:03 2009 +0200 Makefile: tunnings for K-3.0 - do not install gen_ha1 (not needed) - install kamctl -- reuse refurbished 'install-utils' by calling 'make install' in tools' directory listed in utils_bin_install --- Makefile | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 768c080..2d9f6d3 100644 --- a/Makefile +++ b/Makefile @@ -341,8 +341,8 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # 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_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 @@ -836,29 +836,11 @@ 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 [ -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 not compiled" ; \ - if [ ${err_fail} = 1 ] ; then \ - exit 1; \ - fi ; \ - fi ;\ - fi ; \ - done; true - @for r in $(utils_script_install) "" ; 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) ); \ + if [ -d "$$r" ]; then \ + if [ -f "$$r/Makefile" ]; then \ + make -C "$$r" install; \ else \ - echo "ERROR: $$r not compiled" ; \ + echo "ERROR: $$r has no Makefile to install" ; \ if [ ${err_fail} = 1 ] ; then \ exit 1; \ fi ; \

15 years, 3 months

git:kamailio_3.0: kamctl: Makefile action for simple 'make'

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e77ff6f4c9fa32e0bc527d72dc54317658ac448a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e77ff6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 20:41:38 2009 +0200 kamctl: Makefile action for simple 'make' - avoid kamctl installation if 'make' is typed --- utils/kamctl/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index fbc39c3..9c6d377 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -2,6 +2,9 @@ COREPATH=../.. include $(COREPATH)/Makefile.defs +all: + @echo "No compilation needed for kamctl" + install: install-cfg install-bin install-man install-modules install-cfg: $(cfg_prefix)/$(cfg_dir)

15 years, 3 months

git:kamailio_3.0: core: update fwd_reqs stat

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 6a84eeebc2575d90d5795abb95af33ab37407aef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a84eee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 21:40:04 2009 +0200 core: update fwd_reqs stat --- forward.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index d7fb827..a9cfc7f 100644 --- a/forward.c +++ b/forward.c @@ -72,6 +72,7 @@ #include "config.h" #include "parser/msg_parser.h" #include "route.h" +#include "events.h" #include "dprint.h" #include "globals.h" #include "cfg_core.h" @@ -581,6 +582,8 @@ end: #endif if (buf) pkg_free(buf); /* received_buf & line_buf will be freed in receive_msg by free_lump_list*/ + if(ret==0) + sr_event_exec(SREV_CORE_STATS, (void*)1); return ret; }

15 years, 3 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, 3 months

install utils

by Daniel-Constantin Mierla

Hello, I see in the master Makefile that tools in utils directory are installed based on a list of files. Wouldn't be better to have the install action part of Makefile in the tool directory? There might be many files installed, some in bin, config or lib directories. Cheers, Daniel -- Daniel-Constantin Mierla * Kamailio SIP Masterclass, Nov 9-13, 2009, Berlin * http://www.asipto.com/index.php/sip-router-masterclass/

15 years, 3 months

git:andrei/pointer_alias_warnings: group: fix pointer aliasing warnings

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: 221e87850861f8772abf8cc98334970ab59dfa70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=221e878… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:53:27 2009 +0200 group: fix pointer aliasing warnings --- modules_k/group/re_group.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/group/re_group.c b/modules_k/group/re_group.c index 2e38d8c..542e02b 100644 --- a/modules_k/group/re_group.c +++ b/modules_k/group/re_group.c @@ -163,6 +163,7 @@ int get_user_group(struct sip_msg *req, char *user, char *avp) regmatch_t pmatch; char *c; int n; + int* pi; if (get_username_domain( req, (group_check_p)user, &username, &domain)!=0){ LM_ERR("failed to get username@domain\n"); @@ -179,7 +180,8 @@ int get_user_group(struct sip_msg *req, char *user, char *avp) goto error; } - *(int*)uri_buf = htonl(('s'<<24) + ('i'<<16) + ('p'<<8) + ':'); + pi=(int*)uri_buf; + *pi = htonl(('s'<<24) + ('i'<<16) + ('p'<<8) + ':'); c = uri_buf + 4; memcpy( c, username.s, username.len); c += username.len;

15 years, 3 months

git:andrei/pointer_alias_warnings: rr: pointer aliasing warning fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: 34dc702f619b9c647640811275d7087ffade8e93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34dc702… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:52:33 2009 +0200 rr: pointer aliasing warning fixes - use the avp data union --- modules_s/rr/avp_cookie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/rr/avp_cookie.c b/modules_s/rr/avp_cookie.c index d5a0b50..1e9d027 100644 --- a/modules_s/rr/avp_cookie.c +++ b/modules_s/rr/avp_cookie.c @@ -66,11 +66,11 @@ str *rr_get_avp_cookies(void) { if ((avp->flags&(AVP_NAME_STR|AVP_VAL_STR)) == AVP_NAME_STR) { /* avp type str, int value */ - avp_name = & ((struct str_int_data*)&avp->d.data[0])->name; + avp_name = & ((struct str_int_data*)avp->d.p)->name; } else if ((avp->flags&(AVP_NAME_STR|AVP_VAL_STR)) == (AVP_NAME_STR|AVP_VAL_STR)) { /* avp type str, str value */ - avp_name = & ((struct str_str_data*)&avp->d.data[0])->name; + avp_name = & ((struct str_str_data*)avp->d.p)->name; } else avp_name = 0; /* dummy */

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev