sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:2e54c3dd: matrix: removed mi command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2e54c3dd17012b1d38ab40575bb6cd4ebd2e2d60 URL: https://github.com/kamailio/kamailio/commit/2e54c3dd17012b1d38ab40575bb6cd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-30T14:58:48+01:00 matrix: removed mi command --- Modified: src/modules/matrix/Makefile Modified: src/modules/matrix/matrix.c --- Diff: https://github.com/kamailio/kamailio/commit/2e54c3dd17012b1d38ab40575bb6cd4… Patch: https://github.com/kamailio/kamailio/commit/2e54c3dd17012b1d38ab40575bb6cd4… --- diff --git a/src/modules/matrix/Makefile b/src/modules/matrix/Makefile index cad04e8..6eac968 100644 --- a/src/modules/matrix/Makefile +++ b/src/modules/matrix/Makefile @@ -8,6 +8,5 @@ LIBS= DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/kmi/kmi SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules diff --git a/src/modules/matrix/matrix.c b/src/modules/matrix/matrix.c index e7d3cb1..69131eb 100644 --- a/src/modules/matrix/matrix.c +++ b/src/modules/matrix/matrix.c @@ -22,7 +22,6 @@ #include "../../core/mem/shm_mem.h" #include "../../core/sr_module.h" -#include "../../lib/kmi/mi.h" #include "../../core/mem/mem.h" #include "../../core/usr_avp.h" #include "../../core/locking.h" @@ -84,14 +83,8 @@ static int lookup_matrix(struct sip_msg *msg, struct multiparam_t *_first, struc /* ---- module init functions: */ static int mod_init(void); static int child_init(int rank); -static int mi_child_init(void); static void mod_destroy(void); -/* --- fifo functions */ -struct mi_root * mi_reload_matrix(struct mi_root* cmd, void* param); /* usage: kamctl fifo reload_matrix */ - - - static cmd_export_t cmds[]={ { "matrix", (cmd_function)lookup_matrix, 3, matrix_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, @@ -111,22 +104,13 @@ static param_export_t params[] = { -/* Exported MI functions */ -static mi_export_t mi_cmds[] = { - { "reload_matrix", mi_reload_matrix, MI_NO_INPUT_FLAG, 0, mi_child_init }, - { 0, 0, 0, 0, 0} -}; - - - - struct module_exports exports= { "matrix", DEFAULT_DLFLAGS, cmds, params, 0, - mi_cmds, + 0, 0, 0, mod_init, @@ -535,24 +519,16 @@ static void destroy_shmlock(void) - -struct mi_root * mi_reload_matrix(struct mi_root* cmd, void* param) -{ - struct mi_root * tmp = NULL; - if(db_reload_matrix() >= 0) { - tmp = init_mi_tree( 200, MI_OK_S, MI_OK_LEN); - } else { - tmp = init_mi_tree( 500, "cannot reload matrix", 24); - } - - return tmp; -} - static void matrix_rpc_reload(rpc_t* rpc, void* c) { + if (matrix_db_open() != 0) { + rpc->fault(c, 500, "Failed to connect to db"); + return; + } if(db_reload_matrix() < 0) { rpc->fault(c, 500, "Reload failed"); } + matrix_db_close(); } static const char *matrix_rpc_reload_doc[2] = { @@ -609,10 +585,6 @@ static void destroy_matrix(void) static int mod_init(void) { - if(register_mi_mod(exports.name, mi_cmds)!=0) { - LM_ERR("failed to register MI commands\n"); - return -1; - } if(matrix_rpc_init()<0) { LM_ERR("failed to init RPC commands"); return -1; @@ -628,7 +600,6 @@ static int mod_init(void) - static int child_init(int rank) { if(rank==PROC_INIT || rank==PROC_TCP_MAIN) @@ -639,16 +610,6 @@ static int child_init(int rank) - -static int mi_child_init(void) -{ - if (matrix_db_open() != 0) return -1; - return 0; -} - - - - static void mod_destroy(void) { destroy_matrix();

7 years, 10 months

git:master:0a281a48: xcap_clinet: implemented rpc commands, removed mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a281a480ef0c231d7bd9e644f011865a5146fc6 URL: https://github.com/kamailio/kamailio/commit/0a281a480ef0c231d7bd9e644f01186… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-30T14:50:31+01:00 xcap_clinet: implemented rpc commands, removed mi commands --- Modified: src/modules/xcap_client/Makefile Modified: src/modules/xcap_client/doc/xcap_client_admin.xml Modified: src/modules/xcap_client/xcap_callbacks.c Modified: src/modules/xcap_client/xcap_client.c Modified: src/modules/xcap_client/xcap_client.h Modified: src/modules/xcap_client/xcap_functions.c Modified: src/modules/xcap_client/xcap_functions.h --- Diff: https://github.com/kamailio/kamailio/commit/0a281a480ef0c231d7bd9e644f01186… Patch: https://github.com/kamailio/kamailio/commit/0a281a480ef0c231d7bd9e644f01186…

7 years, 10 months

git:master:b322206a: modules: readme files regenerated - cfgutils ...

by Kamailio Dev

Module: kamailio Branch: master Commit: b322206a37dfb1b1ba0f3587f2b831eeeca1b3be URL: https://github.com/kamailio/kamailio/commit/b322206a37dfb1b1ba0f3587f2b831e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-30T12:01:15+01:00 modules: readme files regenerated - cfgutils ... --- Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/b322206a37dfb1b1ba0f3587f2b831e… Patch: https://github.com/kamailio/kamailio/commit/b322206a37dfb1b1ba0f3587f2b831e…

7 years, 10 months

git:master:9067def6: auth_ephemeral: dump secrets rpc result is an array

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9067def6e1f84ed0c9e4209b477bb9da17709fda URL: https://github.com/kamailio/kamailio/commit/9067def6e1f84ed0c9e4209b477bb9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-30T11:58:45+01:00 auth_ephemeral: dump secrets rpc result is an array --- Modified: src/modules/auth_ephemeral/autheph_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9067def6e1f84ed0c9e4209b477bb9d… Patch: https://github.com/kamailio/kamailio/commit/9067def6e1f84ed0c9e4209b477bb9d… --- diff --git a/src/modules/auth_ephemeral/autheph_mod.c b/src/modules/auth_ephemeral/autheph_mod.c index 315f83b..4f23910 100644 --- a/src/modules/auth_ephemeral/autheph_mod.c +++ b/src/modules/auth_ephemeral/autheph_mod.c @@ -383,7 +383,7 @@ static const char* autheph_rpc_rm_secret_doc[2] = { rpc_export_t autheph_rpc_cmds[] = { {"autheph.dump_secrets", autheph_rpc_dump_secrets, - autheph_rpc_dump_secrets_doc, 0}, + autheph_rpc_dump_secrets_doc, RET_ARRAY}, {"autheph.add_secret", autheph_rpc_add_secret, autheph_rpc_add_secret_doc, 0}, {"autheph.add_secret", autheph_rpc_rm_secret,

7 years, 10 months

git:master:453290b8: cfgutils: implemented rpc commands, removed mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 453290b8b86a08e4762e0696135b16e58414170b URL: https://github.com/kamailio/kamailio/commit/453290b8b86a08e4762e0696135b16e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-30T11:58:45+01:00 cfgutils: implemented rpc commands, removed mi commands --- Modified: src/modules/cfgutils/Makefile Modified: src/modules/cfgutils/api.h Modified: src/modules/cfgutils/cfgutils.c Modified: src/modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/453290b8b86a08e4762e0696135b16e… Patch: https://github.com/kamailio/kamailio/commit/453290b8b86a08e4762e0696135b16e…

7 years, 10 months

git:master:98913416: modules: readme files regenerated - auth_ephemeral ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 98913416d4f943d9ef594364cf50d72ad3b3ad24 URL: https://github.com/kamailio/kamailio/commit/98913416d4f943d9ef594364cf50d72… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-30T11:16:25+01:00 modules: readme files regenerated - auth_ephemeral ... --- Modified: src/modules/auth_ephemeral/README Modified: src/modules/benchmark/README --- Diff: https://github.com/kamailio/kamailio/commit/98913416d4f943d9ef594364cf50d72… Patch: https://github.com/kamailio/kamailio/commit/98913416d4f943d9ef594364cf50d72…

7 years, 10 months

git:master:1d599a40: auth_ephemeral: added rpc commands, removed mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1d599a4020d4fd160113522f3c861a4d4efdc02b URL: https://github.com/kamailio/kamailio/commit/1d599a4020d4fd160113522f3c861a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-30T10:54:43+01:00 auth_ephemeral: added rpc commands, removed mi commands --- Modified: src/modules/auth_ephemeral/Makefile Modified: src/modules/auth_ephemeral/autheph_mod.c Modified: src/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1d599a4020d4fd160113522f3c861a4… Patch: https://github.com/kamailio/kamailio/commit/1d599a4020d4fd160113522f3c861a4…

7 years, 10 months

git:master:bc504aeb: benchmark: implemented rpc commands, removed mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bc504aeb7aa0cd222b6cfa07eeed999daa8be663 URL: https://github.com/kamailio/kamailio/commit/bc504aeb7aa0cd222b6cfa07eeed999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-30T10:23:35+01:00 benchmark: implemented rpc commands, removed mi commands --- Modified: src/modules/benchmark/Makefile Modified: src/modules/benchmark/benchmark.c Modified: src/modules/benchmark/doc/benchmark_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bc504aeb7aa0cd222b6cfa07eeed999… Patch: https://github.com/kamailio/kamailio/commit/bc504aeb7aa0cd222b6cfa07eeed999…

7 years, 10 months

git:master:634336dc: websocket: removed mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 634336dc7355d911b49222072d3671bdbe00a128 URL: https://github.com/kamailio/kamailio/commit/634336dc7355d911b49222072d3671b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-30T09:29:51+01:00 websocket: removed mi commands - corresponding rpc commands can be used --- Modified: src/modules/websocket/Makefile Modified: src/modules/websocket/config.c Modified: src/modules/websocket/config.h Modified: src/modules/websocket/utf8_decode.h Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.c Modified: src/modules/websocket/ws_frame.h Modified: src/modules/websocket/ws_handshake.c Modified: src/modules/websocket/ws_handshake.h --- Diff: https://github.com/kamailio/kamailio/commit/634336dc7355d911b49222072d3671b… Patch: https://github.com/kamailio/kamailio/commit/634336dc7355d911b49222072d3671b…

7 years, 10 months

git:master:6447de0c: app_perl: removed mi command (was not enabled anyhow)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6447de0c98a9c9036026dad06b5fc0ca703a76ad URL: https://github.com/kamailio/kamailio/commit/6447de0c98a9c9036026dad06b5fc0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-30T09:19:46+01:00 app_perl: removed mi command (was not enabled anyhow) --- Modified: src/modules/app_perl/Makefile Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6447de0c98a9c9036026dad06b5fc0c… Patch: https://github.com/kamailio/kamailio/commit/6447de0c98a9c9036026dad06b5fc0c… --- diff --git a/src/modules/app_perl/Makefile b/src/modules/app_perl/Makefile index eb23db5..6c1fb33 100644 --- a/src/modules/app_perl/Makefile +++ b/src/modules/app_perl/Makefile @@ -1,6 +1,6 @@ # perl module makefile # -# +# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs @@ -23,7 +23,6 @@ DEFS+=$(PERLCCOPTS) DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/kmi/kmi PODFILES=kamailioxs.xs `find lib/perl -name *.pm` diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index c55f7be..d7e1e5c 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Perl module for Kamailio * * Copyright (C) 2006 Collax GmbH @@ -36,7 +34,6 @@ #include "../../core/sr_module.h" #include "../../core/mem/mem.h" #include "../../core/mem/shm_mem.h" -#include "../../lib/kmi/mi.h" #include "../../modules/rr/api.h" #include "../../modules/sl/sl.h" @@ -98,13 +95,6 @@ static int mod_init(void); /* - * Reload perl interpreter - reload perl script. Forward declaration. - */ -struct mi_root* perl_mi_reload(struct mi_root *cmd_tree, void *param); - - - -/* * Exported functions */ static cmd_export_t cmds[] = { @@ -114,7 +104,7 @@ static cmd_export_t cmds[] = { { "perl_exec_simple", (cmd_function)perl_exec_simple2, 2, NULL, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, - { "perl_exec", (cmd_function)perl_exec1, 1, NULL, 0, + { "perl_exec", (cmd_function)perl_exec1, 1, NULL, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, { "perl_exec", (cmd_function)perl_exec2, 2, NULL, 0, @@ -138,19 +128,6 @@ static param_export_t params[] = { /* - * Exported MI functions - */ -static mi_export_t mi_cmds[] = { - /* FIXME This does not yet work... - { "perl_reload", perl_mi_reload, MI_NO_INPUT_FLAG, 0, 0 },*/ - { 0, 0, 0, 0, 0} - -}; - - - - -/* * Module info */ @@ -168,12 +145,12 @@ static mi_export_t mi_cmds[] = { * Module interface */ struct module_exports _app_perl_exports = { - "app_perl", + "app_perl", RTLD_NOW | RTLD_GLOBAL, cmds, /* Exported functions */ params, /* Exported parameters */ 0, /* exported statistics */ - mi_cmds, /* exported MI functions */ + 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* module initialization function */ @@ -325,21 +302,6 @@ int perl_reload(void) /* - * Reinit through fifo. - * Currently does not seem to work :(( - */ -struct mi_root* perl_mi_reload(struct mi_root *cmd_tree, void *param) -{ - if (perl_reload()<0) { - return init_mi_tree( 500, "Perl reload failed", 18); - } else { - return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); - } - -} - - -/* * mod_init * Called by kamailio at init time */ @@ -351,14 +313,7 @@ static int mod_init(void) { struct timeval t1; struct timeval t2; - if(register_mi_mod(_app_perl_exports.name, mi_cmds)!=0) - { - LM_ERR("failed to register MI commands\n"); - return -1; - } - - if(ap_init_rpc()<0) - { + if(ap_init_rpc()<0) { LM_ERR("failed to register RPC commands\n"); return -1; }

7 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
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