sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:997e2e14: kamctl: more compact jsonrpc output by expanding tabs to two whitespaces

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 997e2e141211450f1a1798b1d89cebe06f3b0079 URL: https://github.com/kamailio/kamailio/commit/997e2e141211450f1a1798b1d89cebe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-16T21:27:54+01:00 kamctl: more compact jsonrpc output by expanding tabs to two whitespaces --- Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/997e2e141211450f1a1798b1d89cebe… Patch: https://github.com/kamailio/kamailio/commit/997e2e141211450f1a1798b1d89cebe… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 1ca1cc0..8b2a8f0 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -89,6 +89,14 @@ if [ -z "$EXPR" ] ; then fi EXPR="$TOOLPATH" fi +if [ -z "$EXPAND" ] ; then + locate_tool expand + if [ -z "$TOOLPATH" ] ; then + EXPAND="cat" + else + EXPAND="$TOOLPATH -t 2" + fi +fi ##### ------------------------------------------------ ##### ### configuration for starting/stopping kamailio @@ -680,7 +688,7 @@ filter_json() n=split($0, a, ","); for (i=1; i<=n; i++) { if (i==1) { - m=split(a[i], b, "\["); + m=split(a[i], b, "["); print b[1] "["; if (substr(b[2], length(b[2]), 1)=="[" || substr(b[2], length(b[2]), 1)=="{") { print "\t\t" ltrim(b[2]); diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index 2742e81..f529e0f 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -121,7 +121,7 @@ rpc_cmd() # start reader now so that it is ready for replies # immediately after a request was sent out - cat < $path | filter_json & + cat < $path | filter_json | $EXPAND & # issue FIFO request (printf taken to deal with \n) printf "$CMD" > $RPCFIFOPATH @@ -202,7 +202,7 @@ rpc_kamailio_monitor() { # print_stats $name $path $attempt mecho "[cycle #: $attempt; if constant make sure server lives]" - cat < $path | filter_json & + cat < $path | filter_json | $EXPAND & cat > $RPCFIFOPATH <<EOF { "jsonrpc": "2.0", @@ -213,7 +213,7 @@ rpc_kamailio_monitor() { EOF wait - cat < $path | filter_json & + cat < $path | filter_json | $EXPAND & cat > $RPCFIFOPATH << EOF { "jsonrpc": "2.0", @@ -226,7 +226,7 @@ EOF echo mecho "Transaction Statistics: " - cat < $path | filter_json & + cat < $path | filter_json | $EXPAND & cat > $RPCFIFOPATH <<EOF { "jsonrpc": "2.0", @@ -240,7 +240,7 @@ EOF echo mecho "Stateless Server Statistics: " - cat < $path | filter_json & + cat < $path | filter_json | $EXPAND & cat > $RPCFIFOPATH <<EOF { "jsonrpc": "2.0", @@ -254,7 +254,7 @@ EOF echo mecho "UsrLoc Stats: " - cat < $path | filter_json & + cat < $path | filter_json | $EXPAND & cat > $RPCFIFOPATH <<EOF { "jsonrpc": "2.0",

8 years

git:master:a255cfce: kamctl: several control commands of kamctl made to work with mi or jsonrpc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a255cfce9003015428801ca3586ac110e4f63d84 URL: https://github.com/kamailio/kamailio/commit/a255cfce9003015428801ca3586ac11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-16T20:48:00+01:00 kamctl: several control commands of kamctl made to work with mi or jsonrpc --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/a255cfce9003015428801ca3586ac11… Patch: https://github.com/kamailio/kamailio/commit/a255cfce9003015428801ca3586ac11…

8 years

git:master:1dd6b54e: kamctl: added filter to format jsonrpc response

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1dd6b54ee0b899bbc5d69bffe51447c080429e54 URL: https://github.com/kamailio/kamailio/commit/1dd6b54ee0b899bbc5d69bffe51447c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-16T20:48:00+01:00 kamctl: added filter to format jsonrpc response --- Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/1dd6b54ee0b899bbc5d69bffe51447c… Patch: https://github.com/kamailio/kamailio/commit/1dd6b54ee0b899bbc5d69bffe51447c…

8 years

git:master:7f1b5ed7: kamctl: install kamctl.rpcfifo file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7f1b5ed7ccacbf5df3a4a252d535f09d25d2c205 URL: https://github.com/kamailio/kamailio/commit/7f1b5ed7ccacbf5df3a4a252d535f09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-16T20:48:00+01:00 kamctl: install kamctl.rpcfifo file --- Modified: utils/kamctl/Makefile Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/7f1b5ed7ccacbf5df3a4a252d535f09… Patch: https://github.com/kamailio/kamailio/commit/7f1b5ed7ccacbf5df3a4a252d535f09… --- diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 3a00ac8..13dee83 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -36,7 +36,7 @@ install-bin: $(bin_prefix)/$(bin_dir) rm -fr $(kamctltmpdir)/kamctl sed -e "s#/usr/local/sbin#$(bin_target)#g" \ < kamctl.base > $(kamctltmpdir)/kamctl.base - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl $(INSTALL_TOUCH) \ $(modules_prefix)/$(lib_dir)/kamctl $(INSTALL_CFG) $(kamctltmpdir)/kamctl.base \ @@ -53,6 +53,11 @@ install-bin: $(bin_prefix)/$(bin_dir) $(modules_prefix)/$(lib_dir)/kamctl/kamctl.fifo rm -fr $(kamctltmpdir)/kamctl.fifo sed -e "s#/usr/local#$(bin_target)#g" \ + < kamctl.rpcfifo > $(kamctltmpdir)/kamctl.rpcfifo + $(INSTALL_CFG) $(kamctltmpdir)/kamctl.rpcfifo \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.rpcfifo + rm -fr $(kamctltmpdir)/kamctl.rpcfifo + sed -e "s#/usr/local#$(bin_target)#g" \ < kamctl.ser > $(kamctltmpdir)/kamctl.ser $(INSTALL_CFG) $(kamctltmpdir)/kamctl.ser \ $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index 27929dd..36088ad 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -82,7 +82,7 @@ rpc_cmd() fi if [ ! -w $RPCFIFOPATH ]; then merr "Error opening Kamailio's FIFO $RPCFIFOPATH" - merr "Make sure you have loaded the jsonrpc-s module and set FIFO transport parameters" + merr "Make sure you have loaded the jsonrpcs module and set FIFO transport parameters" if [ ! -z $CHROOT_DIR ]; then merr "[chrooted environment] Check that $RPCFIFOPATH is symlinked to ${CHROOT_DIR}${RPCFIFOPATH}" fi @@ -175,7 +175,7 @@ rpc_kamailio_monitor() { fi if [ ! -w $RPCFIFOPATH ]; then merr "Error opening Kamailio's FIFO $RPCFIFOPATH" - merr "Make sure you have loaded the jsonrpc-s module and set FIFO transport parameters" + merr "Make sure you have loaded the jsonrpcs module and set FIFO transport parameters" exit 1 fi if ! test -p $path; then @@ -189,9 +189,9 @@ rpc_kamailio_monitor() { trap "rm $path; clear; echo monitor ^C-ed; exit 1" 2 attempt=0 if [ "$2" = "" ]; then - loops=-1; + loops=-1; else - loops=$2; + loops=$2; fi clear while [ $loops -ne $attempt ] ; do

8 years

git:master:65f28d41: sipcapture: Fix $hep(0x007) and $hep(0x008)

by Holger Hans Peter Freyther

Module: kamailio Branch: master Commit: 65f28d41536fbd9fc4be7529de899970046fd38f URL: https://github.com/kamailio/kamailio/commit/65f28d41536fbd9fc4be7529de89997… Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Committer: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: 2016-12-16T16:17:20+01:00 sipcapture: Fix $hep(0x007) and $hep(0x008) Fix $hep(0x007) and $hep(0x008) access from the cfg file. In these two cases "i" would not be increased, ending in a infinite loop. Modify and goto done as well. --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/65f28d41536fbd9fc4be7529de89997… Patch: https://github.com/kamailio/kamailio/commit/65f28d41536fbd9fc4be7529de89997… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 6b1ae87..1533c5d 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -977,11 +977,11 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch case 7: hg->src_port = (hep_chunk_uint16_t *) (tmp); ret = pv_get_uintval(msg, param, res, ntohs(hg->src_port->data)); - break; + goto done; case 8: hg->dst_port = (hep_chunk_uint16_t *) (tmp); ret = pv_get_uintval(msg, param, res, ntohs(hg->dst_port->data)); - break; + goto done; case 9: hg->time_sec = (hep_chunk_uint32_t *) (tmp); hg->time_sec->data = ntohl(hg->time_sec->data);

8 years

git:master:0975a8ce: Merge pull request #891 from zecke/sipcapture/fix-hep-call

by GitHub

Module: kamailio Branch: master Commit: 0975a8ced468700b8dfa8441ec1c910904c7ded9 URL: https://github.com/kamailio/kamailio/commit/0975a8ced468700b8dfa8441ec1c910… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-12-16T17:01:03+01:00 Merge pull request #891 from zecke/sipcapture/fix-hep-call sipcapture: Fix $hep(0x007) and $hep(0x008) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/0975a8ced468700b8dfa8441ec1c910… Patch: https://github.com/kamailio/kamailio/commit/0975a8ced468700b8dfa8441ec1c910… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 6b1ae87..1533c5d 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -977,11 +977,11 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch case 7: hg->src_port = (hep_chunk_uint16_t *) (tmp); ret = pv_get_uintval(msg, param, res, ntohs(hg->src_port->data)); - break; + goto done; case 8: hg->dst_port = (hep_chunk_uint16_t *) (tmp); ret = pv_get_uintval(msg, param, res, ntohs(hg->dst_port->data)); - break; + goto done; case 9: hg->time_sec = (hep_chunk_uint32_t *) (tmp); hg->time_sec->data = ntohl(hg->time_sec->data);

8 years

git:master:6fe92201: Merge pull request #890 from tverlaan/fix_statsd_module

by GitHub

Module: kamailio Branch: master Commit: 6fe92201a654e3ef991f870c546dfd020ab9f7a8 URL: https://github.com/kamailio/kamailio/commit/6fe92201a654e3ef991f870c546dfd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-12-16T16:51:42+01:00 Merge pull request #890 from tverlaan/fix_statsd_module statsd: include usr_avp.h instead of usr_avp.c --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/6fe92201a654e3ef991f870c546dfd0… Patch: https://github.com/kamailio/kamailio/commit/6fe92201a654e3ef991f870c546dfd0… --- diff --git a/src/modules/statsd/statsd.c b/src/modules/statsd/statsd.c index 655e5f4..8ff7845 100644 --- a/src/modules/statsd/statsd.c +++ b/src/modules/statsd/statsd.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include "../../core/sr_module.h" -#include "../../core/usr_avp.c" +#include "../../core/usr_avp.h" #include "../../core/pvar.h" #include "../../core/lvalue.h" #include "lib_statsd.h"

8 years

git:master:344baa0b: statsd: include usr_avp.h instead of usr_avp.c

by Timmo Verlaan

Module: kamailio Branch: master Commit: 344baa0bae643f235e85ad8f670f412acadab0f1 URL: https://github.com/kamailio/kamailio/commit/344baa0bae643f235e85ad8f670f412… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2016-12-16T14:52:08+01:00 statsd: include usr_avp.h instead of usr_avp.c --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/344baa0bae643f235e85ad8f670f412… Patch: https://github.com/kamailio/kamailio/commit/344baa0bae643f235e85ad8f670f412… --- diff --git a/src/modules/statsd/statsd.c b/src/modules/statsd/statsd.c index 655e5f4..8ff7845 100644 --- a/src/modules/statsd/statsd.c +++ b/src/modules/statsd/statsd.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include "../../core/sr_module.h" -#include "../../core/usr_avp.c" +#include "../../core/usr_avp.h" #include "../../core/pvar.h" #include "../../core/lvalue.h" #include "lib_statsd.h"

8 years

[kamailio/kamailio] statsd: include usr_avp.h instead of usr_avp.c (#890)

by Timmo Verlaan

The start and stop function currently doesn't work since the AVP used by that function is not succesfully added because usr_avp is referenced wrongly. It does work when not compiled with `-Wl,-Bsymbolic-functions`, however that is the default under Ubuntu. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/890 -- Commit Summary -- * statsd: include usr_avp.h instead of usr_avp.c -- File Changes -- M src/modules/statsd/statsd.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/890.patch https://github.com/kamailio/kamailio/pull/890.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/890

8 years

Dispatcher database connections

by Olle E. Johansson

Hi! From looking at the code (still need to run tests) it looks like if you use a database with dispatcher, it will keep an open connection for the lifetime of the kamailio process. Is there any problem with opening the connection for loading the dispatcher table, then closing and doing the same at reload RPC/MI commands? There are situations where open connections are an issue, like when you pay for capacity somewhere. I suspect other modules do the same, even if they don’t use the connections, like dialplan. /O

8 years

← Newer
1
...
10
11
12
13
14
15
16
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016