sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: tests: fix module paths
by Henning Westerholt 21 Apr '13

21 Apr '13

Module: sip-router Branch: master Commit: 731f1b2a72a04901b11e34de91bc1c276e47fce1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=731f1b2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Sun Apr 21 19:25:51 2013 +0200 tests: fix module paths --- test/unit/15.sh | 2 +- test/unit/39.sh | 2 +- test/unit/4.sh | 4 ++-- test/unit/43.sh | 2 +- test/unit/44.sh | 2 +- test/unit/45.cfg | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/unit/15.sh b/test/unit/15.sh index 14b0e08..820fc8b 100755 --- a/test/unit/15.sh +++ b/test/unit/15.sh @@ -28,7 +28,7 @@ if ! (check_kamailio); then exit 0 fi ; -echo "loadmodule \"../../modules_k/db_text/db_text.so\"" >> $CFG +echo "loadmodule \"../../modules/db_text/db_text.so\"" >> $CFG cat 2.cfg >> $CFG echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../utils/kamctl/dbtext/kamailio\")" >> $CFG diff --git a/test/unit/39.sh b/test/unit/39.sh index 91e4b1a..5b4d906 100755 --- a/test/unit/39.sh +++ b/test/unit/39.sh @@ -36,7 +36,7 @@ NR=25 cp $CFG $CFG.bak -echo "loadmodule \"$SR_DIR/modules_k/db_unixodbc/db_unixodbc.so\"" >> $CFG +echo "loadmodule \"$SR_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG diff --git a/test/unit/4.sh b/test/unit/4.sh index 4df2223..4901115 100755 --- a/test/unit/4.sh +++ b/test/unit/4.sh @@ -29,8 +29,8 @@ if ! (check_kamailio); then fi ; # setup config -echo -e "loadmodule \"$SR_DIR/modules_k/mi_fifo/mi_fifo.so\"" > $CFG -echo -e "loadmodule \"$SR_DIR/modules_k/kex/kex.so\"" >> $CFG +echo -e "loadmodule \"$SR_DIR/modules/mi_fifo/mi_fifo.so\"" > $CFG +echo -e "loadmodule \"$SR_DIR/modules/kex/kex.so\"" >> $CFG echo -e "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/kamailio_fifo\")" >> $CFG diff --git a/test/unit/43.sh b/test/unit/43.sh index 795941c..db5efbe 100755 --- a/test/unit/43.sh +++ b/test/unit/43.sh @@ -30,7 +30,7 @@ fi ; CFG=43.cfg TMPFILE=`mktemp -t kamailio-test.XXXXXXXXX` # setup config -echo "mpath=\"../../modules_k\"" > $CFG +echo "mpath=\"../../modules\"" > $CFG echo "loadmodule \"../../modules/tm/tm.so\"" >> $CFG echo "loadmodule \"sl/sl.so\"" >> $CFG echo "loadmodule \"mi_fifo/mi_fifo.so\"" >> $CFG diff --git a/test/unit/44.sh b/test/unit/44.sh index 722e66a..c8f0215 100755 --- a/test/unit/44.sh +++ b/test/unit/44.sh @@ -30,7 +30,7 @@ fi ; CFG=11.cfg cp $CFG $CFG.tmp -echo "loadmodule \"$SR_DIR/modules_k/db_unixodbc/db_unixodbc.so\"" >> $CFG +echo "loadmodule \"$SR_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG $BIN -w . -f $CFG > /dev/null diff --git a/test/unit/45.cfg b/test/unit/45.cfg index b289681..a77b564 100644 --- a/test/unit/45.cfg +++ b/test/unit/45.cfg @@ -10,7 +10,7 @@ dns=no rev_dns=no #-----------------------Loading Modules------------------------------------- -mpath="../../modules_k/" +mpath="../../modules/" loadmodule "../../modules/db_mysql/db_mysql.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so"

1 0

git:master: tests: remove some unnecessary directory changes
by Henning Westerholt 21 Apr '13

21 Apr '13

Module: sip-router Branch: master Commit: 65d2823cd6236cfebc26f4a1d5b6e5ee2a3d2156 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65d2823… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Sun Apr 21 18:54:48 2013 +0200 tests: remove some unnecessary directory changes --- test/unit/10.sh | 1 - test/unit/3.sh | 1 - test/unit/8.sh | 2 -- test/unit/9.sh | 1 - 4 files changed, 0 insertions(+), 5 deletions(-) diff --git a/test/unit/10.sh b/test/unit/10.sh index be3b746..42d0b8b 100755 --- a/test/unit/10.sh +++ b/test/unit/10.sh @@ -47,5 +47,4 @@ fi ; mv $CTLRC.bak $CTLRC mv $CTL.bak $CTL -cd ../test exit $ret \ No newline at end of file diff --git a/test/unit/3.sh b/test/unit/3.sh index 0a4fedb..e0bcb7f 100755 --- a/test/unit/3.sh +++ b/test/unit/3.sh @@ -62,5 +62,4 @@ mv $CTLRC.bak $CTLRC mv $DBCTL.mysql.bak $DBCTL.mysql mv $DBCTL.bak $DBCTL -cd ../test exit $ret diff --git a/test/unit/8.sh b/test/unit/8.sh index 98769c2..6412484 100755 --- a/test/unit/8.sh +++ b/test/unit/8.sh @@ -46,6 +46,4 @@ fi ; mv $CTLRC.bak $CTLRC mv $DBCTL.bak $DBCTL - -cd ../test exit $ret \ No newline at end of file diff --git a/test/unit/9.sh b/test/unit/9.sh index cd18c3e..a393b55 100755 --- a/test/unit/9.sh +++ b/test/unit/9.sh @@ -47,5 +47,4 @@ fi ; mv $CTLRC.bak $CTLRC mv $CTL.bak $CTL -cd ../test exit $ret \ No newline at end of file

1 0

git:master: tests: use bash compliant return values
by Henning Westerholt 21 Apr '13

21 Apr '13

Module: sip-router Branch: master Commit: 59117e598386d013d9c9f62282aa434dc5806c03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59117e5… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Sun Apr 21 18:30:21 2013 +0200 tests: use bash compliant return values --- test/unit/include/database | 12 ++++++------ test/unit/include/require | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/unit/include/database b/test/unit/include/database index ddc357f..d5e6a0f 100644 --- a/test/unit/include/database +++ b/test/unit/include/database @@ -27,12 +27,12 @@ function check_mysql() { $MYSQL "select * from location;" > /dev/null if ! [ "$?" -eq 0 ] ; then echo "can't read from database" - return -1 + return 1 fi; $MYSQL "insert into location (user_agent) values ('___test___');" > /dev/null if ! [ "$?" -eq 0 ] ; then echo "can't write to database" - return -1 + return 1 fi; $MYSQL "delete from location where user_agent ='___test___';" > /dev/null return 0 @@ -42,12 +42,12 @@ function check_postgres() { $PSQL "select * from location;" > /dev/null if ! [ "$?" -eq 0 ] ; then echo "can't read from database" - return -1 + return 1 fi; $PSQL "insert into location (user_agent) values ('___test___');" > /dev/null if ! [ "$?" -eq 0 ] ; then echo "can't write to database" - return -1 + return 1 fi; $PSQL "delete from location where user_agent ='___test___';" > /dev/null return 0 @@ -57,12 +57,12 @@ function check_unixodbc() { echo "select * from location;" | $ISQL > /dev/null if ! [ "$?" -eq 0 ] ; then echo "can't read from database" - return -1 + return 1 fi; echo "insert into location (id, user_agent) values ('$RANDOM', '___test___');" | $ISQL > /dev/null if ! [ "$?" -eq 0 ] ; then echo "can't write to database" - return -1 + return 1 fi; echo "delete from location where user_agent ='___test___';" | $ISQL > /dev/null return 0 diff --git a/test/unit/include/require b/test/unit/include/require index f94b877..d08b64b 100644 --- a/test/unit/include/require +++ b/test/unit/include/require @@ -21,7 +21,7 @@ source include/common function check_kamailio() { if ! (test -e $BIN) ; then echo "kamailio not found, not run" - return -1 + return 1 fi; return 0 } @@ -29,7 +29,7 @@ function check_kamailio() { function check_module() { if [ $# -ne 1 ]; then echo "wrong number of params in check_module()" - return -1 + return 1 fi if ! (test -e $SR_DIR/modules_k/$1/$1.so) ; then @@ -39,7 +39,7 @@ function check_module() { fi; if ! (test -e $SR_DIR/modules/$1/$1.so) ; then echo "$SR_DIR/modules/$1/$1.so not found, not run" - return -1 + return 1 fi; return 0 } @@ -47,7 +47,7 @@ function check_module() { function check_netcat() { if ! ( which nc > /dev/null ); then echo "netcat not found, not run" - return -1 + return 1 fi; return 0 } @@ -55,7 +55,7 @@ function check_netcat() { function check_sipp() { if ! ( which sipp > /dev/null ); then echo "sipp not found, not run" - return -1 + return 1 fi; return 0 } @@ -63,7 +63,7 @@ function check_sipp() { function check_sipsak() { if ! ( which sipsak > /dev/null ); then echo "sipsak not found, not run" - return -1 + return 1 fi; return 0 }

1 0

DNSsec and DANE
by Olle E. Johansson 21 Apr '13

21 Apr '13

Marius, Just some ideas for the future. In order to move ahead with DNSsec and DANE - certificate handling - we need an entry in the NAPTR, SRV and A records on whether they was verified with DNSsec. This propably needs to be added to the resolver cache. If they are all verified, we have a verified path and can check TLSA records for certificates or validation or CAs. If not, we have to resort to traditional TLS. Parse this as some random notes after reading up on the DANE drafts on SRV records. :-) http://tools.ietf.org/html/draft-ietf-dane-srv-02 /O

1 0

git:master: modules/dnssec: added support for libval query parameter flags
by Marius Zbihlei 21 Apr '13

21 Apr '13

Module: sip-router Branch: master Commit: b3682521361ce0cdbaf50f843a2d80bcb1b8b41d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b368252… Author: Marius Zbihlei <mariuszbi(a)gmail.com> Committer: Marius Zbihlei <mariuszbi(a)gmail.com> Date: Sun Apr 21 15:26:05 2013 +0100 modules/dnssec: added support for libval query parameter flags Documentation in the README --- modules/dnssec/README | 63 ++++++++++++++++++++ modules/dnssec/dnssec_func.c | 111 +++++++++++++++++++++------------- modules/dnssec/dnssec_func.h | 15 +++++- modules/dnssec/dnssec_mod.c | 18 ++++-- modules/dnssec/doc/dnssec_admin.xml | 54 +++++++++++++++++ 5 files changed, 212 insertions(+), 49 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b36…

1 0

git:master: pv: updated link to wiki site
by Daniel-Constantin Mierla 21 Apr '13

21 Apr '13

Module: sip-router Branch: master Commit: ebeb18ffed8e81ae472b4c07097b58fbea115b5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebeb18f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 21 16:07:34 2013 +0200 pv: updated link to wiki site --- modules/pv/README | 8 ++++---- modules/pv/doc/pv_admin.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/pv/README b/modules/pv/README index 64a9030..edfd000 100644 --- a/modules/pv/README +++ b/modules/pv/README @@ -103,7 +103,7 @@ Chapter 1. Admin Guide This module collects the core pseudo-variables that can be used in configuration file. They are listed in Dokuwiki: - http://www.kamailio.org/dokuwiki/, in Pseudo-Variables section + http://www.kamailio.org/wiki/, in Pseudo-Variables section 2. Dependencies @@ -219,7 +219,7 @@ if(pv_isset("$avp("s:x")")) pv_unset("$avp("s:x")"); ... -4.3. is_int(pvar) +4.3. is_int(pvar) Function checks if pvar argument contains integer value and returns 1 if it does and -1 otherwise. @@ -233,7 +233,7 @@ if (is_int("$var(foo)")) { } ... -4.4. typeof(pvar, vtype) +4.4. typeof(pvar, vtype) Returns true if the type of pseudo-variable matches the second parameter. The second parameter can be: 'int' - type is integer; 'str' @@ -248,7 +248,7 @@ if (typeof("$var(foo)", "str")) { } ... -4.5. not_empty(pvar) +4.5. not_empty(pvar) Returns true if the pseudo-variables has the type string and is not empty value. diff --git a/modules/pv/doc/pv_admin.xml b/modules/pv/doc/pv_admin.xml index 884e1ad..c3f97cc 100644 --- a/modules/pv/doc/pv_admin.xml +++ b/modules/pv/doc/pv_admin.xml @@ -18,7 +18,7 @@ <para> This module collects the core pseudo-variables that can be used in configuration file. They are listed in Dokuwiki: - <ulink url="http://www.kamailio.org/dokuwiki/">http://www.kamailio.org/dokuwiki/</ulink>, + <ulink url="http://www.kamailio.org/wiki/">http://www.kamailio.org/wiki/</ulink>, in Pseudo-Variables section </para> </section>

1 0

git:master: acc: updated link to pseudo-variables cookbook
by Daniel-Constantin Mierla 21 Apr '13

21 Apr '13

Module: sip-router Branch: master Commit: f0c467f64c044de0b0f37addccb97d3ccff78706 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0c467f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 21 16:06:56 2013 +0200 acc: updated link to pseudo-variables cookbook --- modules/acc/README | 2 +- modules/acc/doc/acc_admin.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/acc/README b/modules/acc/README index 27e586f..694f43d 100644 --- a/modules/acc/README +++ b/modules/acc/README @@ -400,7 +400,7 @@ if (uri=~"sip:+40") /* calls to Romania */ { * extra_definition = log_name '=' pseudo_variable The full list of supported pseudo-variables in Kamailio is available - at: http://kamailio.org/dokuwiki/doku.php/pseudovariables:devel + at: http://www.kamailio.org/wiki/cookbooks/devel/pseudovariables Note: For all the ACK processed by tm, the registered callbacks (like acc module) will be called with the corresponding INVITE transaction diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index d418942..869ea8c 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -184,8 +184,8 @@ if (uri=~"sip:+40") /* calls to Romania */ { <para> The full list of supported pseudo-variables in &kamailio; is available at: - <ulink url="http://kamailio.org/dokuwiki/doku.php/pseudovariables:devel"> - http://kamailio.org/dokuwiki/doku.php/pseudovariables:devel</ulink> + <ulink url="http://www.kamailio.org/wiki/cookbooks/devel/pseudovariables"> + http://www.kamailio.org/wiki/cookbooks/devel/pseudovariables</ulink> </para> <para> Note: For all the ACK processed by tm, the registered callbacks

1 0

DNSsec module dnssec_mod.c
by Olle E. Johansson 21 Apr '13

21 Apr '13

static param_export_t params[]={ {"sampling_time_unit", INT_PARAM, &time_unit}, {0,0,0} }; This parameter doesn't seem to be used, nor is it documented in the README. /O

2 1

git:master: modules/dnssec: removed unused variable
by Marius Zbihlei 21 Apr '13

21 Apr '13

Module: sip-router Branch: master Commit: a5a7d62271bf1674015d8ab1d928c0325224b77e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5a7d62… Author: Marius Zbihlei <mariuszbi(a)gmail.com> Committer: Marius Zbihlei <mariuszbi(a)gmail.com> Date: Sun Apr 21 13:32:26 2013 +0100 modules/dnssec: removed unused variable --- modules/dnssec/dnssec_mod.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/dnssec/dnssec_mod.c b/modules/dnssec/dnssec_mod.c index 4afcdac..4394eb8 100644 --- a/modules/dnssec/dnssec_mod.c +++ b/modules/dnssec/dnssec_mod.c @@ -49,7 +49,6 @@ static int dnssec_exit(void); /* parameters */ -static int time_unit = 2; /* global variables */ gen_lock_t* timer_lock=0;

1 0

git:master: modules/dnssec: removed bogus param
by Marius Zbihlei 21 Apr '13

21 Apr '13

Module: sip-router Branch: master Commit: 61519687d5cca6e77ba2ba456f845c140a66ccc1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6151968… Author: Marius Zbihlei <mariuszbi(a)gmail.com> Committer: Marius Zbihlei <mariuszbi(a)gmail.com> Date: Sun Apr 21 13:30:16 2013 +0100 modules/dnssec: removed bogus param --- modules/dnssec/dnssec_mod.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/dnssec/dnssec_mod.c b/modules/dnssec/dnssec_mod.c index 55d4266..4afcdac 100644 --- a/modules/dnssec/dnssec_mod.c +++ b/modules/dnssec/dnssec_mod.c @@ -61,7 +61,6 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"sampling_time_unit", INT_PARAM, &time_unit}, {0,0,0} };

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013