sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
333 discussions

git:master:813507b1: kamctl: set default to use rpc fifo via jsonrpcs module
by Daniel-Constantin Mierla 19 Dec '16

19 Dec '16

Module: kamailio Branch: master Commit: 813507b1bc3d1ed8b847aea978883846d3b6cdd9 URL: https://github.com/kamailio/kamailio/commit/813507b1bc3d1ed8b847aea97888384… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-19T19:21:38+01:00 kamctl: set default to use rpc fifo via jsonrpcs module --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.rpcfifo Modified: utils/kamctl/kamctlrc --- Diff: … [View More]

1 0

git:master:45bbb8e7: modules: readme files regenerated - jsonrpcs ...
by Kamailio Dev 19 Dec '16

19 Dec '16

Module: kamailio Branch: master Commit: 45bbb8e73fea0c8cc9fa21cd62a9a52f2854e820 URL: https://github.com/kamailio/kamailio/commit/45bbb8e73fea0c8cc9fa21cd62a9a52… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-19T18:31:15+01:00 modules: readme files regenerated - jsonrpcs ... --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/45bbb8e73fea0c8cc9fa21cd62a9a52… … [View More]

1 0

git:master:72665844: jsonrpcs: updates to default trasports docs
by Daniel-Constantin Mierla 19 Dec '16

19 Dec '16

Module: kamailio Branch: master Commit: 72665844e30a42a383d698b61062d070b50b4c85 URL: https://github.com/kamailio/kamailio/commit/72665844e30a42a383d698b61062d07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-19T18:30:33+01:00 jsonrpcs: updates to default trasports docs --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:a83729bf: jsonrpcs: set default transports to fifo and udp unixsock
by Daniel-Constantin Mierla 19 Dec '16

19 Dec '16

Module: kamailio Branch: master Commit: a83729bf733a4fc6f3bba5cf57a139eae7e1b2ab URL: https://github.com/kamailio/kamailio/commit/a83729bf733a4fc6f3bba5cf57a139e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-19T18:20:32+01:00 jsonrpcs: set default transports to fifo and udp unixsock - default fifo file name is kamailio_rpc.fifo - default unix socket file name is kamailio_rpc.sock - they are created … [View More]in the runtime dir --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_mod.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/a83729bf733a4fc6f3bba5cf57a139e… Patch: https://github.com/kamailio/kamailio/commit/a83729bf733a4fc6f3bba5cf57a139e… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index 8a81064..e399328 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -38,7 +38,7 @@ #include "jsonrpcs_mod.h" /* FIFO server parameters */ -char *jsonrpc_fifo = NULL; /*!< FIFO file name */ +char *jsonrpc_fifo = NAME "_rpc.fifo"; /*!< FIFO file name */ char *jsonrpc_fifo_reply_dir = "/tmp/"; /*!< dir where reply fifos are allowed */ int jsonrpc_fifo_uid = -1; /*!< Fifo default UID */ char *jsonrpc_fifo_uid_s = 0; /*!< Fifo default User ID name */ diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index f0205fc..8bb2f6c 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -70,7 +70,7 @@ static str JSONRPC_REASON_OK = str_init("OK"); static str JSONRPC_CONTENT_TYPE_HTML = str_init("application/json"); /*!< 0 - all available; 1 - http; 2 - fifo; 4 - datagram */ -static int jsonrpc_transport = 0; +static int jsonrpc_transport = 6; /* fifo + datagram */ static int jsonrpc_pretty_format = 0; diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 0042411..fbc9f8f 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -74,7 +74,7 @@ static jsonrpc_dgram_sockaddr_t jsonrpc_dgram_addr; static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets; /* dgram unixsock specific parameters */ -char *jsonrpc_dgram_socket = 0; +char *jsonrpc_dgram_socket = NAME "_rpc.sock"; int jsonrpc_dgram_workers = 1; int jsonrpc_dgram_timeout = 2000; int jsonrpc_dgram_unix_socket_uid = -1; [View Less]

1 0

git:master:7ff4f214: modules: readme files regenerated - sanity ...
by Kamailio Dev 19 Dec '16

19 Dec '16

Module: kamailio Branch: master Commit: 7ff4f214be30cd077a44ffa7d5d1b0675366e58b URL: https://github.com/kamailio/kamailio/commit/7ff4f214be30cd077a44ffa7d5d1b06… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-19T14:31:26+01:00 modules: readme files regenerated - sanity ... --- Modified: src/modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/7ff4f214be30cd077a44ffa7d5d1b06… Patch:… [View More]

1 0

git:master:9b6824da: sanity: add check to ignore non-"digest" schemes
by Camille Oudot 19 Dec '16

19 Dec '16

Module: kamailio Branch: master Commit: 9b6824da31e121f236897d5669d41d49c1197acc URL: https://github.com/kamailio/kamailio/commit/9b6824da31e121f236897d5669d41d4… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-12-19T14:22:25+01:00 sanity: add check to ignore non-"digest" schemes resolves #892 --- Modified: src/modules/sanity/doc/sanity_admin.xml Modified: src/modules/sanity/mod_sanity.c Modified: src/modules/… [View More]

1 0

[kamailio/kamailio] sanity: Authorization other than "digest" considered invalid (#892)
by Camille Oudot 19 Dec '16

19 Dec '16

when using the **sanity** module, with the **SANITY_CHECK_DIGEST** check enabled, if a message contains an "Authorization" header with a different scheme than "digest", the message is considered as invalid, although being perfectly valid. In your opinion, should the module be modified to not fail when the scheme is different than "digest", or should a new flag (e.g. **SANITY_CHECK_AUTHORIZATION**) be introduced, validating the digest parameters if the scheme is digest and returning success … [View More]

2 2

RFC: renaming the modules with - (dash) in name
by Daniel-Constantin Mierla 19 Dec '16

19 Dec '16

Hello, given the work for 5.0 which will bring major changes on source tree structure, I am considering to remove the - (dash) from the modules that have it in the name. There are 4 of them now: cpl-c janssonrpc-c jsonrpc-c jsonrpc-s One of the reasons is that this kind of name doesn't work for the feature of defining MOD_modname for each loaded module, because - is a separator for ids in config language grammar, so for example, MOD_jsonrpc-c cannot be used in an #!ifdef. More over, for … [View More]

1 1

git:master:ca036d85: kamctl: more updates to use either mi or jsonrpc
by Daniel-Constantin Mierla 17 Dec '16

17 Dec '16

Module: kamailio Branch: master Commit: ca036d85cdd1747fd3396e28ca541f8cdb6ca1d0 URL: https://github.com/kamailio/kamailio/commit/ca036d85cdd1747fd3396e28ca541f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-17T17:26:37+01:00 kamctl: more updates to use either mi or jsonrpc --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/ca036d85cdd1747fd3396e28ca541f8… … [View More]Patch: https://github.com/kamailio/kamailio/commit/ca036d85cdd1747fd3396e28ca541f8… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 1ca86c6..ecbb794 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -440,7 +440,7 @@ $CLAUSE;" # check_ul_alias() { require_ctlengine - RES=`$CTLCMD ul_show_contact "$ALS_TABLE" "$1@$2"` + RES=`ctl_cmd_run ul_show_contact ul.lookup "$ALS_TABLE" "$1@$2"` RET="$?" ALIAS_UL_EXISTS=0 if [ $RET -ne 0 ] ; then @@ -966,9 +966,14 @@ $AVP_USER_COLUMN='$OSERUSER' AND $AVP_DOMAIN_COLUMN='$OSERDOMAIN'" cisco_restart() { require_ctlengine myhost=`get_my_host` - CMD="t_uac_dlg NOTIFY $1 . . \"From:sip:daemon@$myhost\r\nTo:<$1>\r\nEvent:check-sync\r\nContact:sip:daemon@$myhost\r\n\"" - RET=`$CTLCMD $CMD | head -1` - print_status $RET + CMDPARAMS="t_uac_dlg tm.t_uac_start NOTIFY $1 . . \"From:sip:daemon@$myhost\r\nTo:<$1>\r\nEvent:check-sync\r\nContact:sip:daemon@$myhost\r\n\"" + + if [ $CTLENGINETYPE -eq 1 ] ; then + ctl_cmd_run $CMDPARAMS + else + RET=`ctl_cmd_run $CMDPARAMS | head -1` + print_status $RET + fi } # @@ -1209,11 +1214,11 @@ permissions_trusted() { case $1 in reload) require_ctlengine - $CTLCMD trusted_reload + ctl_cmd_run trusted_reload permissions.trustedReload ;; dump) require_ctlengine - $CTLCMD trusted_dump + ctl_cmd_run trusted_dump permissions.trustedDump ;; show) require_dbengine @@ -1284,12 +1289,12 @@ permissions_address() { case $1 in reload) require_ctlengine - $CTLCMD address_reload + ctl_cmd_run address_reload permissions.addressReload ;; dump) require_ctlengine - $CTLCMD address_dump - $CTLCMD subnet_dump + ctl_cmd_run address_dump permissions.addressDump + ctl_cmd_run subnet_dump permissions.subnetDump ;; show) require_dbengine @@ -1373,17 +1378,17 @@ lcr() { reload) merr "command disabled" exit 1 - $CTLCMD lcr.reload + ctl_cmd_run lcr.reload lcr.reload ;; dump_gws) merr "command disabled" exit 1 - $CTLCMD lcr.dump_gws + ctl_cmd_run lcr.dump_gws lcr.dump_gws ;; dump_routes) merr "command disabled" exit 1 - $CTLCMD lcr.dump_lcrs + ctl_cmd_run lcr.dump_lcrs lcr.dump_lcrs ;; eval_weights) shift @@ -1443,11 +1448,11 @@ cr() { $DBROCMD "$QUERY" ;; reload) - $CTLCMD cr_reload_routes + ctl_cmd_run cr_reload_routes cr.reload_routes ;; dump) - $CTLCMD cr_dump_routes + ctl_cmd_run cr_dump_routes cr.dump_routes ;; addcn) @@ -1926,9 +1931,13 @@ kamailio_stop() { options_ping() { myhost=`get_my_host` require_ctlengine - CMD="t_uac_dlg OPTIONS \"$1\" \".\" \".\" \"From:sip:daemon@$myhost"$'\r\n'"To:<$1>"$'\r\n'"Contact:sip:daemon@$myhost"$'\r\n'"\"" - RET=`$CTLCMD $CMD | head -1` - print_status $RET + CMDPARAMS="t_uac_dlg tm.t_uac_start OPTIONS \"$1\" \".\" \".\" \"From:sip:daemon@$myhost"$'\r\n'"To:<$1>"$'\r\n'"Contact:sip:daemon@$myhost"$'\r\n'"\"" + if [ $CTLENGINETYPE -eq 1 ] ; then + ctl_cmd_run $CMDPARAMS + else + RET=`ctl_cmd_run $CMDPARAMS | head -1` + print_status $RET + fi } # @@ -2879,7 +2888,8 @@ case $1 in online) require_ctlengine - $CTLCMD ul_dump | $EGREP -i aor | awk '{print $2}' | sort | sort -mu + ctl_cmd_run ul_dump ul.dump brief | $EGREP -i aor | $EGREP -v AoRs \ + | awk '{print $2}' | sed 's/"//g' | sort | sort -mu exit $? ;; [View Less]

1 0

git:master:525dfe54: kamctl: compact column based printing for moni command
by Daniel-Constantin Mierla 17 Dec '16

17 Dec '16

Module: kamailio Branch: master Commit: 525dfe54584ea2179424e644f787f5de583eddb5 URL: https://github.com/kamailio/kamailio/commit/525dfe54584ea2179424e644f787f5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-17T09:39:02+01:00 kamctl: compact column based printing for moni command --- Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]525dfe54584ea2179424e644f787f5d… Patch: https://github.com/kamailio/kamailio/commit/525dfe54584ea2179424e644f787f5d… --- diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index f529e0f..0e64520 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -201,8 +201,9 @@ rpc_kamailio_monitor() { # print_stats $name $path $attempt mecho "[cycle #: $attempt; if constant make sure server lives]" + mecho "Kamailio Runtime Details: " - cat < $path | filter_json | $EXPAND & + cat < $path | filter_json | $EXPAND | grep "result" | awk -F'"' '{ print $4 }' & cat > $RPCFIFOPATH <<EOF { "jsonrpc": "2.0", @@ -213,7 +214,7 @@ rpc_kamailio_monitor() { EOF wait - cat < $path | filter_json | $EXPAND & + cat < $path | filter_json | $EXPAND | egrep "now|up_since|uptime" | sed 's/[",]//g' & cat > $RPCFIFOPATH << EOF { "jsonrpc": "2.0", @@ -226,12 +227,12 @@ EOF echo mecho "Transaction Statistics: " - cat < $path | filter_json | $EXPAND & + cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column & cat > $RPCFIFOPATH <<EOF { "jsonrpc": "2.0", "method": "stats.get_statistics", - "params": [ "UAS_transactions", "UAC_transactions", "inuse_transactions"], + "params": [ "UAS_transactions", "UAC_transactions", "active_transactions", "inuse_transactions"], "reply_name": "${name}", "id": $$ } @@ -240,12 +241,12 @@ EOF echo mecho "Stateless Server Statistics: " - cat < $path | filter_json | $EXPAND & + cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column & cat > $RPCFIFOPATH <<EOF { "jsonrpc": "2.0", "method": "stats.get_statistics", - "params": [ "sent_replies", "sent_err_replies", "received_ACKs"], + "params": [ "sent_replies", "sent_err_replies"], "reply_name": "${name}", "id": $$ } @@ -253,8 +254,8 @@ EOF wait echo - mecho "UsrLoc Stats: " - cat < $path | filter_json | $EXPAND & + mecho "UsrLoc Statistics: " + cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column & cat > $RPCFIFOPATH <<EOF { "jsonrpc": "2.0", @@ -265,6 +266,34 @@ EOF } EOF wait + echo + + mecho "Core Statistics: " + cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column & + cat > $RPCFIFOPATH <<EOF +{ + "jsonrpc": "2.0", + "method": "stats.get_statistics", + "params": [ "rcv_requests", "fwd_requests", "rcv_replies", "fwd_replies"], + "reply_name": "${name}", + "id": $$ +} +EOF + wait + echo + + mecho "Shared Memory Statistics: " + cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column & + cat > $RPCFIFOPATH <<EOF +{ + "jsonrpc": "2.0", + "method": "stats.get_statistics", + "params": [ "shmem:"], + "reply_name": "${name}", + "id": $$ +} +EOF + wait if [ $loops -ne $attempt ] ; then sleep $WATCH_PERIOD [View Less]

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016