sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:b72af394: modules: readme files regenerated - jsonrpc-s ...

by Kamailio Dev

Module: kamailio Branch: master Commit: b72af394936be5b69cb83ff768f11e2dc33bfc19 URL: https://github.com/kamailio/kamailio/commit/b72af394936be5b69cb83ff768f11e2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-02T09:16:18+01:00 modules: readme files regenerated - jsonrpc-s ... --- Modified: modules/jsonrpc-s/README --- Diff: https://github.com/kamailio/kamailio/commit/b72af394936be5b69cb83ff768f11e2… Patch: https://github.com/kamailio/kamailio/commit/b72af394936be5b69cb83ff768f11e2…

7 years, 11 months

git:master:10912437: jsonrpc-s: use same name when setting user/group via str/int values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 10912437a992048c4b5ab297ace4f29cbf9b9f3d URL: https://github.com/kamailio/kamailio/commit/10912437a992048c4b5ab297ace4f29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-02T09:01:34+01:00 jsonrpc-s: use same name when setting user/group via str/int values --- Modified: modules/jsonrpc-s/jsonrpc-s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/10912437a992048c4b5ab297ace4f29… Patch: https://github.com/kamailio/kamailio/commit/10912437a992048c4b5ab297ace4f29… --- diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index eb91b02..488ca62 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -155,9 +155,9 @@ static param_export_t params[] = { {"dgram_timeout", PARAM_INT, &jsonrpc_dgram_timeout}, {"dgram_mode", PARAM_INT, &jsonrpc_dgram_unix_socket_mode}, {"dgram_group", PARAM_STRING, &jsonrpc_dgram_unix_socket_gid_s}, - {"dgram_group_id", PARAM_INT, &jsonrpc_dgram_unix_socket_gid}, + {"dgram_group", PARAM_INT, &jsonrpc_dgram_unix_socket_gid}, {"dgram_user", PARAM_STRING, &jsonrpc_dgram_unix_socket_uid_s}, - {"dgram_user_id", PARAM_INT, &jsonrpc_dgram_unix_socket_uid}, + {"dgram_user", PARAM_INT, &jsonrpc_dgram_unix_socket_uid}, {0, 0, 0} };

7 years, 11 months

git:master:cf5a7487: jsonrpc-s: added documentation for datagram transport

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cf5a748719e4770e481601e75adb3e89b33d910b URL: https://github.com/kamailio/kamailio/commit/cf5a748719e4770e481601e75adb3e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-02T09:00:46+01:00 jsonrpc-s: added documentation for datagram transport --- Modified: modules/jsonrpc-s/doc/jsonrpc-s_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf5a748719e4770e481601e75adb3e8… Patch: https://github.com/kamailio/kamailio/commit/cf5a748719e4770e481601e75adb3e8…

7 years, 11 months

git:master:e8086c7d: kamctl: implemented moni command for jsonrpc engine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e8086c7db45d5b0136e4c5871cb1a2c5a0e1d5d5 URL: https://github.com/kamailio/kamailio/commit/e8086c7db45d5b0136e4c5871cb1a2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-02T08:43:10+01:00 kamctl: implemented moni command for jsonrpc engine --- Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/e8086c7db45d5b0136e4c5871cb1a2c… Patch: https://github.com/kamailio/kamailio/commit/e8086c7db45d5b0136e4c5871cb1a2c… --- diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index 5fa09a1..27929dd 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -204,15 +204,23 @@ rpc_kamailio_monitor() { cat < $path | filter_fl & cat > $RPCFIFOPATH <<EOF -:version:$name - +{ + "jsonrpc": "2.0", + "method": "core.version", + "reply_name": "${name}", + "id": $$ +} EOF wait cat < $path | filter_fl & cat > $RPCFIFOPATH << EOF -:uptime:$name - +{ + "jsonrpc": "2.0", + "method": "core.uptime", + "reply_name": "${name}", + "id": $$ +} EOF wait echo @@ -220,11 +228,13 @@ EOF mecho "Transaction Statistics: " cat < $path | filter_fl & cat > $RPCFIFOPATH <<EOF -:get_statistics:$name -UAS_transactions -UAC_transactions -inuse_transactions - +{ + "jsonrpc": "2.0", + "method": "stats.get_statistics", + "params": [ "UAS_transactions", "UAC_transactions", "inuse_transactions"], + "reply_name": "${name}", + "id": $$ +} EOF wait echo @@ -232,11 +242,13 @@ EOF mecho "Stateless Server Statistics: " cat < $path | filter_fl & cat > $RPCFIFOPATH <<EOF -:get_statistics:$name -sent_replies -sent_err_replies -received_ACKs - +{ + "jsonrpc": "2.0", + "method": "stats.get_statistics", + "params": [ "sent_replies", "sent_err_replies", "received_ACKs"], + "reply_name": "${name}", + "id": $$ +} EOF wait echo @@ -244,9 +256,13 @@ EOF mecho "UsrLoc Stats: " cat < $path | filter_fl & cat > $RPCFIFOPATH <<EOF -:get_statistics:$name -usrloc: - +{ + "jsonrpc": "2.0", + "method": "stats.get_statistics", + "params": [ "usrloc:"], + "reply_name": "${name}", + "id": $$ +} EOF wait

7 years, 11 months

git:master:3b8d7950: kamctl: added rpcfifo control engine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3b8d7950539be080770e3665ced07b491b9065bb URL: https://github.com/kamailio/kamailio/commit/3b8d7950539be080770e3665ced07b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-02T08:20:34+01:00 kamctl: added rpcfifo control engine - interact with kamailio via a fifo file using jsonrpc-s module - CTLENGINE has to be set to RPCFIFO - RPCFIFOPATH has to be set to the fifo file created by jsonrpc-s module - kamctl rpc command is available for sending raw jsonrpc commands - it forwards number cli parameters as number type in jsonrpc commands - the prefix s: or i: can be used to enforce type string or int for parameters kamctl rpc jsonrpc.eco abc 123 kamctl rpc jsonrpc.eco s:abc i:123 kamctl rpc jsonrpc.eco s:888 i:123 --- Added: utils/kamctl/kamctl.rpcfifo Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/3b8d7950539be080770e3665ced07b4… Patch: https://github.com/kamailio/kamailio/commit/3b8d7950539be080770e3665ced07b4…

7 years, 11 months

git:master:f2181d7c: jsonrpc-s: implemented datagram transport

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f2181d7cb461527747e2b720f2a37cfc987fa518 URL: https://github.com/kamailio/kamailio/commit/f2181d7cb461527747e2b720f2a37cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-01T23:00:57+01:00 jsonrpc-s: implemented datagram transport - via unix socket files or network sockets ipv4/ipv6 --- Added: modules/jsonrpc-s/jsonrpcs_fifo.c Added: modules/jsonrpc-s/jsonrpcs_sock.c Modified: modules/jsonrpc-s/jsonrpc-s_mod.c Modified: modules/jsonrpc-s/jsonrpc-s_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/f2181d7cb461527747e2b720f2a37cf… Patch: https://github.com/kamailio/kamailio/commit/f2181d7cb461527747e2b720f2a37cf…

7 years, 11 months

git:master:f611b341: kamunix: small adjustments to the code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f611b34157d135936f1b1e5e83f891201426936f URL: https://github.com/kamailio/kamailio/commit/f611b34157d135936f1b1e5e83f8912… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-01T21:16:24+01:00 kamunix: small adjustments to the code --- Modified: utils/kamunix/kamunix.c --- Diff: https://github.com/kamailio/kamailio/commit/f611b34157d135936f1b1e5e83f8912… Patch: https://github.com/kamailio/kamailio/commit/f611b34157d135936f1b1e5e83f8912… --- diff --git a/utils/kamunix/kamunix.c b/utils/kamunix/kamunix.c index b7c527c..7612a9e 100644 --- a/utils/kamunix/kamunix.c +++ b/utils/kamunix/kamunix.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2004 FhG FOKUS * * This file is part of Kamailio, a free SIP server. @@ -15,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -70,7 +68,7 @@ int main(int argc, char** argv) fprintf(stderr, "Error while opening socket: %s\n", strerror(errno)); return -1; } - + memset(&from, 0, sizeof(from)); from.sun_family = PF_LOCAL; @@ -78,10 +76,13 @@ int main(int argc, char** argv) if (chroot_dir == NULL) chroot_dir = ""; sprintf(name, "%s/tmp/Kamailio.%d.XXXXXX", chroot_dir, getpid()); - umask(0); /* set mode to 0666 for when Kamailio is running as non-root user and kamctl is running as root */ + umask(0); + /* set mode to 0666 for when Kamailio is running as non-root user + * and kamctl is running as root */ if (mkstemp(name) == -1) { - fprintf(stderr, "Error in mkstemp with name=%s: %s\n", name, strerror(errno)); + fprintf(stderr, "Error in mkstemp with name=%s: %s\n", + name, strerror(errno)); return -2; } if (unlink(name) == -1) { @@ -98,16 +99,18 @@ int main(int argc, char** argv) memset(&to, 0, sizeof(to)); to.sun_family = PF_LOCAL; strncpy(to.sun_path, argv[1], sizeof(to.sun_path) - 1); - + len = fread(buffer, 1, BUF_SIZE, stdin); if (len) { - if (sendto(sock, buffer, len, 0, (struct sockaddr*)&to, SUN_LEN(&to)) == -1) { + if (sendto(sock, buffer, len, 0, (struct sockaddr*)&to, + SUN_LEN(&to)) == -1) { fprintf(stderr, "Error in sendto: %s\n", strerror(errno)); goto err; } from_len = sizeof(from); - len = recvfrom(sock, buffer, BUF_SIZE, 0, (struct sockaddr*)&from, &from_len); + len = recvfrom(sock, buffer, BUF_SIZE, 0, + (struct sockaddr*)&from, &from_len); if (len == -1) { fprintf(stderr, "Error in recvfrom: %s\n", strerror(errno)); goto err;

7 years, 11 months

git:master:9c94ffa8: kamunix: removed svn id from man page file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c94ffa85a2a55e746f6de505f8b47947bf7dbce URL: https://github.com/kamailio/kamailio/commit/9c94ffa85a2a55e746f6de505f8b479… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-01T21:03:26+01:00 kamunix: removed svn id from man page file --- Modified: utils/kamunix/kamunix.8 --- Diff: https://github.com/kamailio/kamailio/commit/9c94ffa85a2a55e746f6de505f8b479… Patch: https://github.com/kamailio/kamailio/commit/9c94ffa85a2a55e746f6de505f8b479… --- diff --git a/utils/kamunix/kamunix.8 b/utils/kamunix/kamunix.8 index 6035c56..afe0b3a 100644 --- a/utils/kamunix/kamunix.8 +++ b/utils/kamunix/kamunix.8 @@ -1,7 +1,6 @@ -.\" $Id$ -.TH kamunix 8 21.06.2006 kamailio "Kamailio" +.TH kamunix 8 21.06.2006 kamailio "Kamailio" .\" Process with -.\" groff -man -Tascii kamunix.8 +.\" groff -man -Tascii kamunix.8 .\" .SH NAME kamunix \- Kamailio UNIX socket wrapper @@ -20,7 +19,7 @@ This is a binary alternative to the textual FIFO interface. .B kamunix reads from standard input one .B Kamailio -command along with its paramters (if any) and prints the response +command along with its paramters (if any) and prints the response to standard output. .SH PARAMETERS @@ -32,7 +31,7 @@ external commands .SH EXAMPLES .PP An Kamailio commands consists in one ore more lines: first contains the -command name enclosed between ":", the following lines containing the +command name enclosed between ":", the following lines containing the command parameters, one per line. .PP echo ":uptime:" | kamunix /tmp/kamailio.sock @@ -40,7 +39,7 @@ echo ":uptime:" | kamunix /tmp/kamailio.sock .SH AUTHORS -see +see .B /usr/share/doc/kamailio/AUTHORS .SH SEE ALSO @@ -50,8 +49,8 @@ Full documentation on Kamailio is available at .I http://www.kamailio.org/. .PP Mailing lists: -.nf +.nf users(a)lists.kamailio.org - Kamailio user community -.nf +.nf devel(a)lists.kamailio.org - Kamailio development, new features and unstable version

7 years, 11 months

sipcapture sip-status and method

by David Villasmil

Hello all, The way sipcapture now works, for requests it inserts the actual method name into the "method" field. But for replies, it inserts the SIP Status (i.e. 200, 407) into the "method" field. It would be better to extract the actual method name from the CSEQ header and insert it into the "method" field, as well as adding a "status" field to the tables and inserting there the actual SIP Status. I've made a patch for sipcapture.c and sipcapture.h which do just that. I will also be submitting a PR to homer for this, as db tables need to be modified to accept the status field. How do i do the pull request? I don't seem to be allowed to do commits to a branch i created locally Regards, Regards, David Villasmil email: david.villasmil.work(a)gmail.com <https://mail.google.com/mail/?view=cm&fs=1&tf=1&to=david.villasmil.work@gma…> phone: +34669448337

7 years, 11 months

git:master:95d5be47: sl: updated the used of old style logging macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 95d5be47d77287320c0c4f40be834f636406ff85 URL: https://github.com/kamailio/kamailio/commit/95d5be47d77287320c0c4f40be834f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-01T14:22:48+01:00 sl: updated the used of old style logging macros --- Modified: modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/95d5be47d77287320c0c4f40be834f6… Patch: https://github.com/kamailio/kamailio/commit/95d5be47d77287320c0c4f40be834f6…

7 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016