sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:0cea8fe1: test/unit: update unit test 12

by Mikko Lehto

Module: kamailio Branch: master Commit: 0cea8fe1029c71644879e599c11aebc590139cca URL: https://github.com/kamailio/kamailio/commit/0cea8fe1029c71644879e599c11aebc… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:44:31+02:00 test/unit: update unit test 12 - sh instead of bash - mi_fifo is gone, use jsonrpcs - detect Debian specific netcat option -q --- Modified: test/unit/12.cfg Modified: test/unit/12.sh --- Diff: https://github.com/kamailio/kamailio/commit/0cea8fe1029c71644879e599c11aebc… Patch: https://github.com/kamailio/kamailio/commit/0cea8fe1029c71644879e599c11aebc… --- diff --git a/test/unit/12.cfg b/test/unit/12.cfg index e593d95..7560b6e 100644 --- a/test/unit/12.cfg +++ b/test/unit/12.cfg @@ -10,8 +10,9 @@ loadmodule "xlog" loadmodule "usrloc" loadmodule "registrar" loadmodule "pv" -loadmodule "mi_fifo" -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +loadmodule "jsonrpcs" +modparam("jsonrpcs", "transport", 2) +modparam("jsonrpcs", "fifo_name", "kamailio_rpc.fifo") request_route { xlog("received by kamailio[$pp] at '$Tf' from $si:$sp, method: $(rm{s.tolower}), transport: $rP:$Ri:$rp, user agent: $ua\n"); diff --git a/test/unit/12.sh b/test/unit/12.sh index 78f8084..adde1d7 100755 --- a/test/unit/12.sh +++ b/test/unit/12.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # configuration with pseudo-variables, transformations and xlog output # Copyright (C) 2007 1&1 Internet AG @@ -29,24 +29,28 @@ if ! (check_netcat && check_kamailio); then exit 0 fi ; -$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG &> $TMPFILE +$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > $TMPFILE 2>&1 ret=$? -sleep 1 +if ( have_netcat_quit_timer_patch ); then + NCOPTS='-q 1' +else + NCOPTS='-w 1' +fi +sleep 1 if [ "$ret" -eq 0 ] ; then # register a user - cat register.sip | nc -q 1 -u localhost 5060 > /dev/null - $CTL ul show | grep "AOR:: 1000" > /dev/null + cat register.sip | nc $NCOPTS -u localhost 5060 > /dev/null + $CTL ul show | grep '"AoR":"1000"' > /dev/null ret=$? # unregister the user - cat unregister.sip | nc -q 1 -u localhost 5060 > /dev/null + cat unregister.sip | nc $NCOPTS -u localhost 5060 > /dev/null fi ; - if [ "$ret" -eq 0 ] ; then - $CTL ul show | grep "AOR:: 1000" > /dev/null + $CTL ul show | grep '"AoR":"1000"' > /dev/null ret=$? if [ "$ret" -eq 0 ] ; then ret=1 @@ -83,7 +87,7 @@ if [ "$ret" -eq 0 ] ; then fi ; fi ; fi ; -cat $TMPFILE + kill_kamailio rm $TMPFILE

7 years, 11 months

git:master:9aacde29: test/unit: update unit test 2 & 4

by Mikko Lehto

Module: kamailio Branch: master Commit: 9aacde29170458e6df15e19fbb4e0f43243fe68b URL: https://github.com/kamailio/kamailio/commit/9aacde29170458e6df15e19fbb4e0f4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:45:06+02:00 test/unit: update unit test 2 & 4 - mi_fifo changed to jsonrpcs - no more mi_datagram - sh instead of bash --- Modified: test/unit/2.cfg Modified: test/unit/2.sh Modified: test/unit/4.sh --- Diff: https://github.com/kamailio/kamailio/commit/9aacde29170458e6df15e19fbb4e0f4… Patch: https://github.com/kamailio/kamailio/commit/9aacde29170458e6df15e19fbb4e0f4… --- diff --git a/test/unit/2.cfg b/test/unit/2.cfg index c44c894..4fd962a 100644 --- a/test/unit/2.cfg +++ b/test/unit/2.cfg @@ -20,8 +20,7 @@ loadmodule "group" loadmodule "htable" loadmodule "imc" loadmodule "maxfwd" -loadmodule "mi_datagram" -loadmodule "mi_fifo" +loadmodule "jsonrpcs" loadmodule "msilo" loadmodule "nathelper" ##loadmodule "nat_traversal" @@ -51,8 +50,8 @@ loadmodule "rtpproxy/rtpproxy.so" loadmodule "xlog" loadmodule "pdb/pdb.so" -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_datagram", "socket_name", "/tmp/kamailio.sock") +modparam("jsonrpcs", "transport", 2) +modparam("jsonrpcs", "fifo_name", "kamailio_rpc.fifo") modparam("dialog", "dlg_flag", 10) modparam("dialog", "db_mode", 2) ##modparam("tm", "fr_inv_timer_avp", "$avp(i:704)") diff --git a/test/unit/2.sh b/test/unit/2.sh index aaa249d..66cb5fb 100755 --- a/test/unit/2.sh +++ b/test/unit/2.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # load all modules without external dependencies with mysql # Copyright (C) 2007 1&1 Internet AG @@ -35,8 +35,8 @@ cp $CFG $CFG.bak touch dispatcher.list -printf "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG -printf "modparam(\"dispatcher\", \"list_file\", \"dispatcher.list\")" >> $CFG +printf "loadmodule \"db_mysql/db_mysql.so\"\n" >> $CFG +printf "modparam(\"dispatcher\", \"list_file\", \"dispatcher.list\")\n" >> $CFG printf "\nrequest_route {\n ;\n}" >> $CFG # start diff --git a/test/unit/4.sh b/test/unit/4.sh index 41e599d..4cc81fd 100755 --- a/test/unit/4.sh +++ b/test/unit/4.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # test basic fifo functionality # Copyright (C) 2007 1&1 Internet AG @@ -29,18 +29,17 @@ if ! (check_kamailio); then fi ; # setup config -printf "loadmodule \"mi_fifo/mi_fifo.so\"" > $CFG -printf "loadmodule \"kex/kex.so\"" >> $CFG -printf "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/kamailio_fifo\")" >> $CFG +printf "loadmodule \"jsonrpcs.so\"\n" > $CFG +printf "modparam(\"jsonrpcs\", \"transport\", 2)\n" >> $CFG +printf "modparam(\"jsonrpcs\", \"fifo_name\", \"$RPCFIFOPATH\")\n" >> $CFG printf "\nrequest_route {\n ;\n}" >> $CFG - $BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null ret=$? if [ "$ret" -eq 0 ] ; then sleep 1 - $CTL version > /dev/null + $CTL rpc core.version > /dev/null ret=$? fi ;

7 years, 11 months

git:master:fe4c56f5: test/unit: update unit test 7

by Mikko Lehto

Module: kamailio Branch: master Commit: fe4c56f5c0b7db7d1ad3e6c01aed26feb46002d9 URL: https://github.com/kamailio/kamailio/commit/fe4c56f5c0b7db7d1ad3e6c01aed26f… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:44:24+02:00 test/unit: update unit test 7 - mi_fifo is gone - sh instead of bash --- Modified: test/unit/7.cfg Modified: test/unit/7.sh --- Diff: https://github.com/kamailio/kamailio/commit/fe4c56f5c0b7db7d1ad3e6c01aed26f… Patch: https://github.com/kamailio/kamailio/commit/fe4c56f5c0b7db7d1ad3e6c01aed26f… --- diff --git a/test/unit/7.cfg b/test/unit/7.cfg index bd5119e..12aee0c 100644 --- a/test/unit/7.cfg +++ b/test/unit/7.cfg @@ -169,11 +169,6 @@ loadmodule "xlog/xlog.so" modparam("xlog", "buf_size", 4096) modparam("xlog", "force_color", 0) -loadmodule "mi_fifo/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "reply_dir", "/tmp/") -modparam("mi_fifo", "reply_indent", "\t") - loadmodule "domain/domain.so" modparam("domain", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") modparam("domain", "domain_table", "domain") diff --git a/test/unit/7.sh b/test/unit/7.sh index 09db6e5..21c294c 100755 --- a/test/unit/7.sh +++ b/test/unit/7.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # loads a SIP proxy/registrar config with offnet-termination and accounting # Copyright (C) 2007 1&1 Internet AG

7 years, 11 months

git:master:3dff189e: test/unit: fix unit test 33

by Mikko Lehto

Module: kamailio Branch: master Commit: 3dff189e33dd74010a4112274868696d1e73f9d6 URL: https://github.com/kamailio/kamailio/commit/3dff189e33dd74010a4112274868696… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:44:12+02:00 test/unit: fix unit test 33 - mi_fifo is gone, use jsonrpcs - FreeBSD has different file name for core dump, try to detect - netcat option -q is Debian specific patch - sh instead of bash --- Modified: test/unit/33.cfg Modified: test/unit/33.sh Modified: test/unit/include/common --- Diff: https://github.com/kamailio/kamailio/commit/3dff189e33dd74010a4112274868696… Patch: https://github.com/kamailio/kamailio/commit/3dff189e33dd74010a4112274868696… --- diff --git a/test/unit/33.cfg b/test/unit/33.cfg index 3f0dfab..b34b07d 100644 --- a/test/unit/33.cfg +++ b/test/unit/33.cfg @@ -1,11 +1,12 @@ debug=3 -memlog=2 +#memlog=2 loadmodule "cfgutils.so" loadmodule "pv.so" loadmodule "xlog.so" -loadmodule "mi_fifo/mi_fifo.so" +loadmodule "jsonrpcs.so" -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("jsonrpcs", "transport", 2) +modparam("jsonrpcs", "fifo_name", "kamailio_rpc.fifo") modparam("cfgutils", "initial_probability", 15) modparam("cfgutils", "hash_file", "33.cfg") diff --git a/test/unit/33.sh b/test/unit/33.sh index 58cc5c3..ea6de3d 100755 --- a/test/unit/33.sh +++ b/test/unit/33.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # test cfgutils and pv module # Copyright (C) 2008 1&1 Internet AG @@ -19,20 +19,35 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -source include/common -source include/require +. include/common +. include/require.sh if ! (check_netcat && check_kamailio); then exit 0 fi; -if [ -e core ] ; then - echo "core file found, not run" - exit 0 +if ( have_netcat_quit_timer_patch ); then + NCOPTS='-q 1' +else + NCOPTS='-w 2' fi; CFG=33.cfg +CORE=$(sysctl kern.corefile 2> /dev/null) +echo $CORE | grep '^kern.corefile: %N\.core' > /dev/null +ret=$? +if [ $ret -eq 0 ] ; then + CORE='kamailio.core' +else + CORE='core' +fi + +if [ -e $CORE ] ; then + echo "core file found, not run" + exit 0 +fi; + cp $CFG $CFG.bak ulimit -c unlimited @@ -43,23 +58,24 @@ ret=$? sleep 1 if [ $ret -eq 0 ] ; then - $CTL mi check_config_hash | grep "The actual config file hash is identical to the stored one." >/dev/null + $CTL rpc cfgutils.check_config_hash | grep '"result":"Identical hash"' > /dev/null ret=$? fi; echo " " >> $CFG + if [ $ret -eq 0 ] ; then - $CTL mi check_config_hash | grep "The actual config file hash is identical to the stored one." >/dev/null + $CTL rpc cfgutils.check_config_hash | grep '"result":"Identical hash"' > /dev/null ret=$? fi if [ ! $ret -eq 0 ] ; then # send a message - cat register.sip | nc -q 1 -u 127.0.0.1 5060 > /dev/null + cat register.sip | nc $NCOPTS -u 127.0.0.1 5060 > /dev/null fi sleep 1 -kill_kamailio +kill_kamailio 2> /dev/null ret=$? if [ $ret -eq 0 ] ; then @@ -68,10 +84,10 @@ else ret=0 fi -if [ ! -e core ] ; then +if [ ! -e $CORE ] ; then ret=1 fi -rm -f core +rm -f $CORE mv $CFG.bak $CFG exit $ret diff --git a/test/unit/include/common b/test/unit/include/common index 2e2141e..b52457f 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -28,3 +28,10 @@ TEST_DIR="test/unit" kill_kamailio() { kill $(cat ${PIDFILE}) } + +export RPCFIFOPATH="${RUN_DIR}/kamailio_rpc.fifo" + +have_netcat_quit_timer_patch() { + nc -q 2>&1 | grep 'option requires an argument' > /dev/null + return $? +}

7 years, 11 months

[kamailio/kamailio] unittest updates (#923)

by Mikko Lehto

more bashism removal some mi_fifo to jsonrpcs conversions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/923 -- Commit Summary -- * test/unit: fix unit test 33 * test/unit: update unit test 7 * test/unit: update unit test 12 * test/unit: update unit test 2 & 4 * test/unit: update unit test 18 * test/unit: update unit test 19 * test/unit: update unit test 20 * test/unit: update unit test 27 * test/unit: update unit test 34 * test/unit: use sh instead of bash in unit test 5 -- File Changes -- M test/unit/12.cfg (5) M test/unit/12.sh (22) M test/unit/18.sh (4) M test/unit/19.cfg (5) M test/unit/19.sh (8) M test/unit/2.cfg (7) M test/unit/2.sh (6) M test/unit/20.cfg (5) M test/unit/20.sh (8) M test/unit/27.sh (2) M test/unit/33.cfg (7) M test/unit/33.sh (40) M test/unit/34.cfg (5) M test/unit/34.sh (12) M test/unit/4.sh (11) M test/unit/5.sh (2) M test/unit/7.cfg (5) M test/unit/7.sh (2) M test/unit/include/common (7) M test/unit/presence.cfg (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/923.patch https://github.com/kamailio/kamailio/pull/923.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/923

7 years, 11 months

git:master:09f66d69: permissions: fixed typo in rpc fault message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 09f66d693ac654de6c4c40bfbb0b00b439f1a24f URL: https://github.com/kamailio/kamailio/commit/09f66d693ac654de6c4c40bfbb0b00b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-11T09:18:46+01:00 permissions: fixed typo in rpc fault message - reported by Anthony Messina --- Modified: src/modules/permissions/rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/09f66d693ac654de6c4c40bfbb0b00b… Patch: https://github.com/kamailio/kamailio/commit/09f66d693ac654de6c4c40bfbb0b00b… --- diff --git a/src/modules/permissions/rpc.c b/src/modules/permissions/rpc.c index 99be594..4d28aac 100644 --- a/src/modules/permissions/rpc.c +++ b/src/modules/permissions/rpc.c @@ -102,7 +102,7 @@ void rpc_subnet_dump(rpc_t* rpc, void* c) { return; } if(subnet_table_rpc_print(*subnet_table, rpc, c) < 0) { - LM_DBG("failed to pria subnet table dump\n"); + LM_DBG("failed to print subnet table dump\n"); } return;

7 years, 11 months

git:master:11f9a91b: tm: migrated some old log macros to new style

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 11f9a91b29f235a401ce538a690c7bb5cacb98f6 URL: https://github.com/kamailio/kamailio/commit/11f9a91b29f235a401ce538a690c7bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-11T09:16:37+01:00 tm: migrated some old log macros to new style - coherent indentation across those files --- Modified: src/modules/tm/callid.c Modified: src/modules/tm/callid.h Modified: src/modules/tm/config.h Modified: src/modules/tm/defs.h Modified: src/modules/tm/dlg.c Modified: src/modules/tm/dlg.h --- Diff: https://github.com/kamailio/kamailio/commit/11f9a91b29f235a401ce538a690c7bb… Patch: https://github.com/kamailio/kamailio/commit/11f9a91b29f235a401ce538a690c7bb…

7 years, 11 months

Re: [sr-dev] [kamailio/kamailio] permissions: fixed rpc fault messages for several commands (bb132a7)

by Anthony Messina

spelling error -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/bb132a716628725c425e150565c2eb0…

7 years, 11 months

git:master:d081ee4e: dispatcher: use clang format across the module

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d081ee4e12e36e8f13d0a845f639b8699ac9d772 URL: https://github.com/kamailio/kamailio/commit/d081ee4e12e36e8f13d0a845f639b86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-10T23:37:00+01:00 dispatcher: use clang format across the module --- Modified: src/modules/dispatcher/api.h Modified: src/modules/dispatcher/config.c Modified: src/modules/dispatcher/config.h Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/ds_ht.c Modified: src/modules/dispatcher/ds_ht.h --- Diff: https://github.com/kamailio/kamailio/commit/d081ee4e12e36e8f13d0a845f639b86… Patch: https://github.com/kamailio/kamailio/commit/d081ee4e12e36e8f13d0a845f639b86…

7 years, 11 months

git:master:57a81bb4: modules: readme files regenerated - app_jsdt ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 57a81bb414413980a1f294aae91624bae416f2d5 URL: https://github.com/kamailio/kamailio/commit/57a81bb414413980a1f294aae91624b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-10T23:31:22+01:00 modules: readme files regenerated - app_jsdt ... --- Modified: src/modules/app_jsdt/README Modified: src/modules/app_lua/README Modified: src/modules/htable/README Modified: src/modules/ims_dialog/README Modified: src/modules/lcr/README Modified: src/modules/malloc_test/README Modified: src/modules/ratelimit/README Modified: src/modules/tsilo/README Modified: src/modules/uid_gflags/README Modified: src/modules/xhttp_pi/README --- Diff: https://github.com/kamailio/kamailio/commit/57a81bb414413980a1f294aae91624b… Patch: https://github.com/kamailio/kamailio/commit/57a81bb414413980a1f294aae91624b…

7 years, 11 months

← Newer
1
...
26
27
28
29
30
31
32
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017