sr-dev October 2012

sr-dev@lists.kamailio.org

31 participants
241 discussions

git:master: kamctl: use kamcmd instead of sercmd

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9bacc95d2a0c949e81032dd0cc392dfaa7c0a2c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9bacc95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 24 12:17:30 2012 +0200 kamctl: use kamcmd instead of sercmd --- utils/kamctl/kamctl | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 69cf6a3..f29c543 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -60,21 +60,21 @@ else exit -1 fi -# locate sercmd +# locate kamcmd if [ -z "$SERCMD" ] ; then # try same dir as kamctl - SERCMD="$MYDIR/sercmd" + SERCMD="$MYDIR/kamcmd" if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then # try standard location installed from sources - SERCMD="/usr/local/sbin/sercmd" + SERCMD="/usr/local/sbin/kamcmd" if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then # try source tree location - SERCMD="$MYDIR/../sercmd/sercmd" + SERCMD="$MYDIR/../sercmd/kamcmd" if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then # try locate it with which - SERCMD=`which sercmd` + SERCMD=`which kamcmd` if [ ! -f "$SERCMD" -o ! -x "$SERCMD" ] ; then - mdbg "sercmd tool not found" + mdbg "kamcmd tool not found" fi fi fi @@ -143,9 +143,9 @@ fi ### CTLENGINE # -require_sercmd() { +require_kamcmd() { if [ -z "$SERCMD" ] ; then - merr "sercmd tool is missing" + merr "kamcmd tool is missing" exit -1 fi } @@ -168,7 +168,7 @@ case $CTLENGINE in fi ;; SER_MI|ser_mi|SERCMD_MI|sercmd_mi|SERCMDMI|sercmdmi) - require_sercmd + require_kamcmd if [ -f "$MYLIBDIR/kamctl.ser_mi" ]; then . "$MYLIBDIR/kamctl.ser_mi" CTLENGINELOADED=1 @@ -177,7 +177,7 @@ case $CTLENGINE in esac #### ------------------------------------------------- ##### -### Load sercmd interface +### Load kamcmd interface # if [ -f "$MYLIBDIR/kamctl.ser" ]; then . "$MYLIBDIR/kamctl.ser" @@ -2489,7 +2489,7 @@ case $1 in ;; ser|sercmd) - require_sercmd + require_kamcmd shift $SERCTLCMD "$@" ;;

11 years, 6 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Olle E. Johansson

Module: sip-router Branch: master Commit: c93d2d1b290c030f969ce1f62f106059226457ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c93d2d1… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Wed Oct 24 11:47:41 2012 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router I don't really know what this means and why this commit happens... * 'master' of ssh://git.sip-router.org/sip-router: .gitignore: added few more patterns to ignore pkg/kamailio/rpm: specs updated for rename of sercmd to kamcmd sercmd: added basic man page sercmd: builds and installs as kamcmd when FLAVOUR=kamailio Makefile.utils: new target to install manpage for util tools kamctl: replaced openser with kamailio in variable and function names core: print modparam type id in log when parameter not found modules/rtpproxy: added 't' flag to rtpproxy_destroy and force_rtp_proxy - Added new flag 't' to rtpproxy_destroy function that makes it possible do delete whole call even when To tag is present in request/reply. In force_rtp_proxy the flag is ignored. ---

11 years, 6 months

git:master: mtree Documentation fixes

by Olle E. Johansson

Module: sip-router Branch: master Commit: c4b3b04eb59de8b1b72675decfa06ff3cb779934 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4b3b04… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 21 20:09:07 2012 +0200 mtree Documentation fixes --- modules/mtree/README | 18 +++++++++--------- modules/mtree/doc/mtree_admin.xml | 18 +++++++++++++----- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index 8d76777..3be2e53 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -164,8 +164,8 @@ modparam("mtree", "db_url", "dbdriver://username:password@dbhost/dbname") 3.2. db_table (string) - Name of DB table where data for trees is store. It is ignored if a - 'mtree' parameter is defined. + Name of database table where data for trees is stored. It is ignored if + a 'mtree' parameter is defined. Default value is "mtrees". @@ -242,7 +242,7 @@ modparam("mtree", "char_list", "0123456789*+") 3.9. pv_value (string) - The PV spec where to store the matched value. It can be any writtable + The PV spec where to store the matched value. It can be any writable PV. Default value is "$avp(s:tvalue)". @@ -305,12 +305,12 @@ modparam("mtree", "mt_allow_duplicates", 1) 4.1. mt_match(mtree, pv, mode) Match 'pv' value against 'mtree'. If 'mtree' type is 0 or 2 and value - of 'mode' is NOT 2, sets a value of longest matching prefix to pseudo - variable specified by pv_value parameter. If 'mtree' type is 0 or 2 and - value of 'mode' is 2, sets values of all matching prefixes to avp - specified by pv_values parameter so that a value of longest matching - prefix is in avp index 0. Parameter 'mode' can be an integer constant - or a pseudo variable with integer value. + of 'mode' is NOT 2, sets a value of the longest matching prefix to + pseudo variable specified by pv_value parameter. If 'mtree' type is 0 + or 2 and value of 'mode' is 2, sets values of all matching prefixes to + avp specified by pv_values parameter so that a value of longest + matching prefix is in avp index 0. Parameter 'mode' can be an integer + constant or a pseudo variable with integer value. Example 1.14. mt_match usage ... diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index a58429c..8558ccd 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -76,7 +76,7 @@ modparam("mtree", "db_url", "&exampledb;") <section> <title><varname>db_table</varname> (string)</title> <para> - Name of DB table where data for trees is store. It is ignored if a + Name of database table where data for trees is stored. It is ignored if a 'mtree' parameter is defined. </para> <para> @@ -218,7 +218,7 @@ modparam("mtree", "char_list", "0123456789*+") <title><varname>pv_value</varname> (string)</title> <para> The PV spec where to store the matched value. It can be any - writtable PV. + writable PV. </para> <para> <emphasis> @@ -238,7 +238,8 @@ modparam("mtree", "pv_value", "$var(mtval)") <section> <title><varname>pv_values</varname> (string)</title> <para> - The PV spec where to store the matched values when mtree is of type 0 or 2 and mode of mt_match() call has value 2. It can be any AVP. + The PV spec where to store the matched values when mtree is of type + 0 or 2 and mode of mt_match() call has value 2. It can be any AVP. </para> <para> <emphasis> @@ -258,7 +259,8 @@ modparam("mtree", "pv_values", "$avp(mtvals)") <section> <title><varname>mt_tree_type</varname> (integer)</title> <para> - Default payload type for trees data stored in 'db_table'. Documented values are 0 for string payloads and 2 for integer payloads. + Default payload type for trees data stored in 'db_table'. Documented + values are 0 for string payloads and 2 for integer payloads. </para> <para> <emphasis> @@ -324,7 +326,13 @@ modparam("mtree", "mt_allow_duplicates", 1) <function moreinfo="none">mt_match(mtree, pv, mode)</function> </title> <para> - Match 'pv' value against 'mtree'. If 'mtree' type is 0 or 2 and value of 'mode' is NOT 2, sets a value of longest matching prefix to pseudo variable specified by pv_value parameter. If 'mtree' type is 0 or 2 and value of 'mode' is 2, sets values of all matching prefixes to avp specified by pv_values parameter so that a value of longest matching prefix is in avp index 0. Parameter 'mode' can be an integer constant or a pseudo variable with integer value. + Match 'pv' value against 'mtree'. If 'mtree' type is 0 or 2 and value + of 'mode' is NOT 2, sets a value of the longest matching prefix to + pseudo variable specified by pv_value parameter. If 'mtree' type is + 0 or 2 and value of 'mode' is 2, sets values of all matching prefixes + to avp specified by pv_values parameter so that a value of longest + matching prefix is in avp index 0. Parameter 'mode' can be an integer + constant or a pseudo variable with integer value. </para> <example> <title><function>mt_match</function> usage</title>

11 years, 6 months

sercmd compiles and installs as kamcmd for kamailio

by Daniel-Constantin Mierla

Hello, short note to let everyone know that sercmd tool compiles and installs as kamcmd for flavour kamailio as of today in the master git branch. There was a conflict when trying to install both flavours from packages, because of overlapping sercmd file. I added a basic manpage for the tool, a recommendation for each binary app in many linux distros. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, Nov 5-8, 2012 - http://asipto.com/u/kat Kamailio Advanced Training, Miami, USA, Nov 12-14, 2012 - http://asipto.com/u/katu

11 years, 6 months

git:master: .gitignore: added few more patterns to ignore

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7e67e6bad8f56e8ed25673b24f132e0f5d9d17fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e67e6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 24 08:39:59 2012 +0200 .gitignore: added few more patterns to ignore - kamcmd binary and second vi swap file --- .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index e076c44..11e0e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -24,10 +24,12 @@ tags TAGS # vi swaps .*.swp +.*.swo # various other binaries test/udp_flood utils/gen_ha1/gen_ha1 utils/sercmd/sercmd +utils/sercmd/kamcmd utils/pdbt/pdb_server utils/pdbt/pdbt # Emacs backup files

11 years, 6 months

git:master: pkg/kamailio/rpm: specs updated for rename of sercmd to kamcmd

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 02b389ec2bca98dc158cd6ce255ad8c4aa1f570e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02b389e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 24 00:16:58 2012 +0200 pkg/kamailio/rpm: specs updated for rename of sercmd to kamcmd --- pkg/kamailio/fedora/16/kamailio.spec | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 0d46990..e4e49c7 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -682,7 +682,7 @@ fi %{_sbindir}/kamailio %{_sbindir}/kamctl %{_sbindir}/kamdbctl -%{_sbindir}/sercmd +%{_sbindir}/kamcmd %dir %{_libdir}/kamailio/kamctl %{_libdir}/kamailio/kamctl/kamctl.base diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 4170ee7..6b396c7 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -538,7 +538,7 @@ fi %{_sbindir}/kamailio %{_sbindir}/kamctl %{_sbindir}/kamdbctl -%{_sbindir}/sercmd +%{_sbindir}/kamcmd %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.py %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyc %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyo

11 years, 6 months

git:master: sercmd: added basic man page

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e6bdf8a0317c1a62931c07a8bd40fbc65fa1398e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6bdf8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 24 00:06:48 2012 +0200 sercmd: added basic man page --- utils/sercmd/sercmd.8 | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/utils/sercmd/sercmd.8 b/utils/sercmd/sercmd.8 new file mode 100644 index 0000000..843de18 --- /dev/null +++ b/utils/sercmd/sercmd.8 @@ -0,0 +1,35 @@ +.\" $Id$ +.TH sercmd 8 23.10.2012 sip-router "sip-router" +.\" Process with +.\" groff -man -Tascii sercmd.8 +.\" +.SH NAME +sercmd \- sip-router command line tool +.SH SYNOPSIS +.B sercmd +[ +.B \-h +] + +.SH DESCRIPTION +.B sercmd +is a command line to interact with +.B sip-router SIP server +It can be used to manage users, domains, aliases and other server options. + +.SH OPTIONS +.TP 12 +.B \-h +display a short usage description, including all available options. + +.SH AUTHORS + +see +.B /usr/share/doc/sip-router/AUTHORS + +.SH SEE ALSO +.BR sip-router(8), +.BR sip-router.cfg(5) +.PP +Full documentation on sip-router is available at +.I http://www.sip-router.org/.

11 years, 6 months

git:master: Makefile.utils: new target to install manpage for util tools

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e378b3c1038eab768a0d1304166a7aa2ef6e361a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e378b3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 24 00:04:11 2012 +0200 Makefile.utils: new target to install manpage for util tools --- Makefile.utils | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Makefile.utils b/Makefile.utils index 8476969..3198ea5 100644 --- a/Makefile.utils +++ b/Makefile.utils @@ -84,7 +84,7 @@ modules: .PHONY: install .PHONY: install-libs -install: $(NAME) $(util_dst) install-libs +install: $(NAME) $(util_dst) install-libs install-util-man $(INSTALL_TOUCH) $(util_dst)/$(NAME) $(INSTALL_BIN) $(NAME) $(util_dst) @@ -133,6 +133,21 @@ man: endif +.PHONY: install-util-man +#src-name man page install rules +ifneq (,$(wildcard $(UTIL_SRC_NAME).8)) +install-util-man: $(man_prefix)/$(man_dir)/man8 + sed -e "s#$(UTIL_SRC_NAME)#$(UTIL_NAME)#g" \ + -e "s#$(SRC_NAME)#$(MAIN_NAME)#g" \ + < $(UTIL_SRC_NAME).8 > $(man_prefix)/$(man_dir)/man8/$(UTIL_NAME).8 + chmod 644 $(man_prefix)/$(man_dir)/man8/$(UTIL_NAME).8 + +else + +install-util-man: + +endif + endif # ifeq($(makefile_defs),1) include $(COREPATH)/Makefile.cfg

11 years, 6 months

git:master: kamctl: replaced openser with kamailio in variable and function names

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e102ae728214192184397b8e802228f9695f45f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e102ae7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 23 16:49:29 2012 +0200 kamctl: replaced openser with kamailio in variable and function names --- utils/kamctl/kamctl | 20 ++++++------ utils/kamctl/kamctl.ctlbase | 4 +- utils/kamctl/kamctl.db_berkeley | 2 +- utils/kamctl/kamctl.fifo | 8 ++-- utils/kamctl/kamctl.oracle | 14 ++++---- utils/kamctl/kamctl.ser_mi | 2 +- utils/kamctl/kamctl.unixsock | 4 +- utils/kamctl/kamctlrc | 2 +- utils/kamctl/kamdbctl | 32 ++++++++++---------- utils/kamctl/kamdbctl.db_berkeley | 56 ++++++++++++++++++------------------ utils/kamctl/kamdbctl.dbtext | 8 ++-- utils/kamctl/kamdbctl.mysql | 12 ++++---- utils/kamctl/kamdbctl.oracle | 22 +++++++------- utils/kamctl/kamdbctl.pgsql | 12 ++++---- utils/kamctl/kamdbctl.sqlite | 12 ++++---- 15 files changed, 105 insertions(+), 105 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e10…

11 years, 7 months

git:master: core: print modparam type id in log when parameter not found

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 22dd8d6524a95b8bf0246adca99f0049c16fb76f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22dd8d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 23 16:17:24 2012 +0200 core: print modparam type id in log when parameter not found --- modparam.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modparam.c b/modparam.c index 8661b90..01b91ce 100644 --- a/modparam.c +++ b/modparam.c @@ -147,8 +147,9 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) } } else { - LOG(L_ERR, "set_mod_param_regex: parameter <%s> not found in" - " module <%s>\n", name, t->exports.name); + LOG(L_ERR, "set_mod_param_regex: parameter <%s>" + " of type <%d> not found in" + " module <%s>\n", name, type, t->exports.name); regfree(&preg); pkg_free(reg); return -3;

11 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2012