sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
539 discussions

Broken: kamailio/kamailio#3505 (master - c735576)
by Travis CI 07 Jan '17

07 Jan '17

Build Update for kamailio/kamailio ------------------------------------- Build: #3505 Status: Broken Duration: 6 minutes and 7 seconds Commit: c735576 (master) Author: Daniel-Constantin Mierla Message: jsonrpcs: hanlde delayed response for jsonrpc over http View the changeset: https://github.com/kamailio/kamailio/compare/9c14592d4561...c73557694a0c View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/189767109 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:c7355769: jsonrpcs: hanlde delayed response for jsonrpc over http
by Daniel-Constantin Mierla 07 Jan '17

07 Jan '17

Module: kamailio Branch: master Commit: c73557694a0c985a5e5f1d67c2063f2951294c8e URL: https://github.com/kamailio/kamailio/commit/c73557694a0c985a5e5f1d67c2063f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-07T12:30:34+01:00 jsonrpcs: hanlde delayed response for jsonrpc over http --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c Modified: src/modules/jsonrpcs/jsonrpcs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/c73557694a0c985a5e5f1d67c2063f2… Patch: https://github.com/kamailio/kamailio/commit/c73557694a0c985a5e5f1d67c2063f2…

1 0

Update: removing MI code
by Daniel-Constantin Mierla 07 Jan '17

07 Jan '17

Hello, based on lib linking in Makefiles, the following modules still use MI, categorized by their state from my point of view. Hopefully some other people will help with those listed in 2) to 6). 1) to be removed - mi_datagram - mi_fifo - mi_rpc - mi_xmlrpc - pua_mi 2) rpc commands implemented - dialog - others modules depend on some mi callback from it (qos and sst) - qos - this looks ready to wipe out the mi code, but didn't get the time not analyze properly as I don't use it usually 3) some rpc commands implemented and the rest should not be very complex - carrierroute - I implemented the dump rpc command, but it was reported that it has issues, so it needs follow up. 4) rpc commands have to be implemented, expecting not to be very complex - cplc - imc 5) expecting some degree of complexity, but they are important modules - rtpengine - rtpproxy 6) not familiar with the mi commands in these modules, so not able to assert what to expect - ims_dialog - some rpc commands are implemented, not sure if the rest of MI are used/usefull - mohqueue - it doesn't seem complex to implement rpc commands at first sight, but the indentation style didn't allowed a fast analyze on a quick look - p_usrloc - several mi commands - sst - uses some callback for MI from dialog module. qos has something similar with rpc alternative already implemented - userblacklist - several mi commands - utils - there are few mi commands related to some forwarding rules: https://www.kamailio.org/docs/modules/devel/modules/utils.html#idp21741924 The 1) to 5) should be done in a way or another, before of after freeze of 5.0.0. But 6) would require the devs of the modules (or the MI parts) to help if they want those commands via RPC. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

3 7

git:master:9c14592d: mohqueue: switched from MI to RPC commands
by Robert Boisvert 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 9c14592d4561335d01f4d24960d5489e4caceb65 URL: https://github.com/kamailio/kamailio/commit/9c14592d4561335d01f4d24960d5489… Author: Robert Boisvert <rdbprog(a)gmail.com> Committer: Robert Boisvert <rdbprog(a)gmail.com> Date: 2017-01-06T15:00:03-05:00 mohqueue: switched from MI to RPC commands --- Modified: src/modules/mohqueue/Makefile Modified: src/modules/mohqueue/README Modified: src/modules/mohqueue/doc/mohqueue_admin.xml Modified: src/modules/mohqueue/mohq_common.h Modified: src/modules/mohqueue/mohq_db.c Modified: src/modules/mohqueue/mohq_funcs.c Modified: src/modules/mohqueue/mohq_funcs.h Modified: src/modules/mohqueue/mohq_locks.c Modified: src/modules/mohqueue/mohq_locks.h Modified: src/modules/mohqueue/mohqueue_mod.c Modified: src/modules/mohqueue/mohqueue_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/9c14592d4561335d01f4d24960d5489… Patch: https://github.com/kamailio/kamailio/commit/9c14592d4561335d01f4d24960d5489…

1 0

git:master:cc40fb7c: ctl: one more revert in handlig rpc struct in response
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: cc40fb7cbc7b646750fd7c056ea752bd69748ef3 URL: https://github.com/kamailio/kamailio/commit/cc40fb7cbc7b646750fd7c056ea752b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T15:38:48+01:00 ctl: one more revert in handlig rpc struct in response --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/cc40fb7cbc7b646750fd7c056ea752b… Patch: https://github.com/kamailio/kamailio/commit/cc40fb7cbc7b646750fd7c056ea752b… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 4adad72..7c497ce 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -1099,7 +1099,7 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) } clist_append(&s->substructs, rs, next, prev); *(va_arg(ap, void**))=rs; - break; + goto end; case 'f': avp.type=BINRPC_T_DOUBLE; avp.u.fval=va_arg(ap, double); @@ -1114,6 +1114,7 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) goto error; } } +end: va_end(ap); return 0; error_mem:

1 0

git:master:053ddb5b: clt: treat rpc array as a structure, otherwise kamcmd fails
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 053ddb5ba56adc8f241052161da66a8ece12e2f3 URL: https://github.com/kamailio/kamailio/commit/053ddb5ba56adc8f241052161da66a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T15:32:04+01:00 clt: treat rpc array as a structure, otherwise kamcmd fails - no proper array support for binrpc breaks the ctl-kamcmd. The array is displayed as a structure, like it was done in the past - for proper json output, use kamctl or kamcli --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/053ddb5ba56adc8f241052161da66a8… Patch: https://github.com/kamailio/kamailio/commit/053ddb5ba56adc8f241052161da66a8… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 0f4f1a5..4adad72 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -974,18 +974,12 @@ static int rpc_add(struct binrpc_ctx* ctx, char* fmt, ...) break; case '{': case '[': - if(*fmt == '{') - err=binrpc_start_struct(&ctx->out.pkt); - else - err=binrpc_start_array(&ctx->out.pkt); + err=binrpc_start_struct(&ctx->out.pkt); if (err<0) goto error_add; rs=new_rpc_struct(); if (rs==0) goto error_mem; rs->offset=binrpc_pkt_len(&ctx->out.pkt); - if(*fmt == '{') - err=binrpc_end_struct(&ctx->out.pkt); - else - err=binrpc_end_array(&ctx->out.pkt); + err=binrpc_end_struct(&ctx->out.pkt); if (err<0) goto error_add; clist_append(&ctx->out.structs, rs, next, prev); *(va_arg(ap, void**))=rs; @@ -1086,10 +1080,7 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) break; case '{': case '[': - if(*fmt == '{') - avp.type=BINRPC_T_STRUCT; - else - avp.type=BINRPC_T_ARRAY; + avp.type=BINRPC_T_STRUCT; err=binrpc_addavp(&s->pkt, &avp); if (err<0){ LM_ERR("failed to add attribute-value (%c)\n", *fmt); @@ -1101,10 +1092,7 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) goto error_mem; } rs->offset=binrpc_pkt_len(&s->pkt); - if(*fmt == '{') - err=binrpc_end_struct(&s->pkt); - else - err=binrpc_end_array(&s->pkt); + err=binrpc_end_struct(&s->pkt); if (err<0) { LM_ERR("failed to end struct (%c)\n", *fmt); goto error_add; @@ -1168,18 +1156,12 @@ static int rpc_array_add(struct rpc_struct_l* s, char* fmt, ...) break; case '{': case '[': - if(*fmt == '{') - err=binrpc_start_struct(&s->pkt); - else - err=binrpc_start_array(&s->pkt); + err=binrpc_start_struct(&s->pkt); if (err<0) goto error_add; rs=new_rpc_struct(); if (rs==0) goto error_mem; rs->offset=binrpc_pkt_len(&s->pkt); - if(*fmt == '{') - err=binrpc_end_struct(&s->pkt); - else - err=binrpc_end_array(&s->pkt); + err=binrpc_end_struct(&s->pkt); if (err<0) goto error_add; clist_append(&s->substructs, rs, next, prev); *(va_arg(ap, void**))=rs;

1 0

git:master:ec98abde: kamctl: fixed small typo
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: ec98abde9b57c4569237616089908d39557ad7c2 URL: https://github.com/kamailio/kamailio/commit/ec98abde9b57c4569237616089908d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T15:31:18+01:00 kamctl: fixed small typo --- Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/ec98abde9b57c4569237616089908d3… Patch: https://github.com/kamailio/kamailio/commit/ec98abde9b57c4569237616089908d3… --- diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index 951e166..372721e 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -406,7 +406,7 @@ void print_binrpc_val(struct binrpc_val* v, int ident) int r; if ((v->type==BINRPC_T_STRUCT) && !v->u.end) - ident--; /* fix to have strut beg. idented differently */ + ident--; /* fix to have struct beg. idented differently */ for (r=0; r<ident; r++) putchar(' '); if (v->name.s){ printf("%.*s: ", v->name.len, v->name.s);

1 0

git:master:0252969c: ctl: proper handling of rpc array type in response
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 0252969c39ccda27c8cd78a9a4ad58d0f2b77354 URL: https://github.com/kamailio/kamailio/commit/0252969c39ccda27c8cd78a9a4ad58d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T15:10:25+01:00 ctl: proper handling of rpc array type in response --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/0252969c39ccda27c8cd78a9a4ad58d… Patch: https://github.com/kamailio/kamailio/commit/0252969c39ccda27c8cd78a9a4ad58d… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 4adad72..0f4f1a5 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -974,12 +974,18 @@ static int rpc_add(struct binrpc_ctx* ctx, char* fmt, ...) break; case '{': case '[': - err=binrpc_start_struct(&ctx->out.pkt); + if(*fmt == '{') + err=binrpc_start_struct(&ctx->out.pkt); + else + err=binrpc_start_array(&ctx->out.pkt); if (err<0) goto error_add; rs=new_rpc_struct(); if (rs==0) goto error_mem; rs->offset=binrpc_pkt_len(&ctx->out.pkt); - err=binrpc_end_struct(&ctx->out.pkt); + if(*fmt == '{') + err=binrpc_end_struct(&ctx->out.pkt); + else + err=binrpc_end_array(&ctx->out.pkt); if (err<0) goto error_add; clist_append(&ctx->out.structs, rs, next, prev); *(va_arg(ap, void**))=rs; @@ -1080,7 +1086,10 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) break; case '{': case '[': - avp.type=BINRPC_T_STRUCT; + if(*fmt == '{') + avp.type=BINRPC_T_STRUCT; + else + avp.type=BINRPC_T_ARRAY; err=binrpc_addavp(&s->pkt, &avp); if (err<0){ LM_ERR("failed to add attribute-value (%c)\n", *fmt); @@ -1092,7 +1101,10 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) goto error_mem; } rs->offset=binrpc_pkt_len(&s->pkt); - err=binrpc_end_struct(&s->pkt); + if(*fmt == '{') + err=binrpc_end_struct(&s->pkt); + else + err=binrpc_end_array(&s->pkt); if (err<0) { LM_ERR("failed to end struct (%c)\n", *fmt); goto error_add; @@ -1156,12 +1168,18 @@ static int rpc_array_add(struct rpc_struct_l* s, char* fmt, ...) break; case '{': case '[': - err=binrpc_start_struct(&s->pkt); + if(*fmt == '{') + err=binrpc_start_struct(&s->pkt); + else + err=binrpc_start_array(&s->pkt); if (err<0) goto error_add; rs=new_rpc_struct(); if (rs==0) goto error_mem; rs->offset=binrpc_pkt_len(&s->pkt); - err=binrpc_end_struct(&s->pkt); + if(*fmt == '{') + err=binrpc_end_struct(&s->pkt); + else + err=binrpc_end_array(&s->pkt); if (err<0) goto error_add; clist_append(&s->substructs, rs, next, prev); *(va_arg(ap, void**))=rs;

1 0

git:master:506ea5cf: kamcmd: removed mi related code
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 506ea5cfce5008781ceb14dc9bdf3bb477ca2bd1 URL: https://github.com/kamailio/kamailio/commit/506ea5cfce5008781ceb14dc9bdf3bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T14:54:32+01:00 kamcmd: removed mi related code --- Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/506ea5cfce5008781ceb14dc9bdf3bb… Patch: https://github.com/kamailio/kamailio/commit/506ea5cfce5008781ceb14dc9bdf3bb…

1 0

git:master:3c09e0ed: kamcmd: removed snv id from version output
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 3c09e0ed178fba801adf1b3721a10b565f316c0e URL: https://github.com/kamailio/kamailio/commit/3c09e0ed178fba801adf1b3721a10b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T14:40:33+01:00 kamcmd: removed snv id from version output - on darwin, use gnu readline from /opt/local if available - version set to 1.5 --- Modified: utils/kamcmd/Makefile Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/3c09e0ed178fba801adf1b3721a10b5… Patch: https://github.com/kamailio/kamailio/commit/3c09e0ed178fba801adf1b3721a10b5… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index 4dc4674..1af68e2 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -6,7 +6,7 @@ include $(COREPATH)/Makefile.defs include $(COREPATH)/Makefile.targets auto_gen= -RELEASE=0.2 +RELEASE=1.5 UTIL_SRC_NAME=kamcmd ifeq ($(FLAVOUR),ser) NAME?=sercmd @@ -56,6 +56,9 @@ ifeq ($(OS), netbsd) LIBS:= endif ifeq ($(OS), darwin) +readline_locations= /opt/local/include/readline/readline.h \ + /usr/include/readline/readline.h \ + $(LOCALBASE)/include/readline/readline.h LIBS:= -lresolv endif ifneq (,$(findstring cygwin, $(OS))) @@ -74,9 +77,14 @@ endif endif ifeq ($(use_readline),1) +ifneq (,$(findstring opt, $(readline_path))) + DEFS+=-DUSE_READLINE -I /opt/local/include + LIBS+=-L /opt/local/lib -lreadline -lncurses +else DEFS+=-DUSE_READLINE LIBS+=-lreadline -lncurses endif +endif include $(COREPATH)/Makefile.utils @@ -92,7 +100,7 @@ $(info "to force readline support try 'make use_readline=1'") endif endif # ifeq (,$(quiet)) -$(NAME).o: +$(NAME).o: .PHONY: msg msg: diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index a504b26..f18af8b 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2006 iptelorg GmbH * * This file is part of kamailio, a free SIP server. @@ -20,19 +18,13 @@ * 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 */ /* * send commands using binrpc * - * History: - * -------- - * 2006-02-14 created by andrei - * 2009-06-29 command line completion for cfg groups and vars (andrei) - * 2009-06-30 command line completion for mi cmds (andrei) - * 2010-08-08 command line completion for counters/statistic (andrei) */ @@ -68,10 +60,10 @@ #ifndef NAME -#define NAME "sercmd" +#define NAME "kamcmd" #endif #ifndef VERSION -#define VERSION "0.2" +#define VERSION "1.5" #endif #define IOVEC_CNT 20 @@ -85,7 +77,6 @@ #define UNIX_PATH_MAX 104 #endif -static char id[]="$Id$"; static char version[]= NAME " " VERSION; #ifdef VERSION_NODATE static char compiled[] = ""; @@ -1793,7 +1784,6 @@ static int sercmd_help(int s, struct binrpc_cmd* cmd) static int sercmd_ver(int s, struct binrpc_cmd* cmd) { printf("%s\n", version); - printf("%s\n", id); printf("%s compiled on %s \n", __FILE__, compiled); #ifdef USE_READLINE printf("interactive mode command completion support\n"); @@ -2198,7 +2188,6 @@ int main(int argc, char** argv) switch(c){ case 'V': printf("version: %s\n", version); - printf("%s\n", id); printf("%s compiled on %s \n", __FILE__, compiled); exit(0);

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017