[sr-dev] git:master:e17853d8: misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs

Module: kamailio Branch: master Commit: e17853d8804fa7f10688676d313014ac6e313215 URL: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… Author: uts09 <uttamhoode(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-07T22:30:04+02:00 misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs - submitted via PR #1524 --- Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/scscf/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… Patch: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… --- diff --git a/misc/examples/ims/icscf/kamailio.cfg b/misc/examples/ims/icscf/kamailio.cfg index c694074c05..27fc8234f9 100644 --- a/misc/examples/ims/icscf/kamailio.cfg +++ b/misc/examples/ims/icscf/kamailio.cfg @@ -102,8 +102,6 @@ loadmodule "corex" # Control interfaces: loadmodule "ctl" loadmodule "cfg_rpc" -loadmodule "mi_rpc" -loadmodule "mi_fifo" #!ifdef WITH_XMLRPC loadmodule "xmlrpc" #!endif @@ -144,11 +142,13 @@ modparam("db_cluster", "connection", DB_URL2) modparam("db_cluster", "cluster", "cluster1=>con1=2s2s;con2=1s1s") #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # -- rr params -- # add value to ;lr param to make some broken UAs happy diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg index aaa1fa894d..8502ce6dc0 100644 --- a/misc/examples/ims/pcscf/kamailio.cfg +++ b/misc/examples/ims/pcscf/kamailio.cfg @@ -152,9 +152,7 @@ loadmodule "textopsx" loadmodule "siputils" loadmodule "sanity" loadmodule "ctl" -loadmodule "mi_rpc" loadmodule "cfg_rpc" -loadmodule "mi_fifo" loadmodule "xlog" loadmodule "auth" loadmodule "dispatcher" @@ -237,11 +235,13 @@ modparam("debugger", "mod_level", "rtpengine=3") modparam("debugger", "cfgtrace", 1) #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----------------- setting module-specific parameters --------------- #!ifdef DB_URL2 @@ -905,5 +905,3 @@ include_file "route/register.cfg" include_file "route/rtp.cfg" include_file "route/mo.cfg" include_file "route/mt.cfg" - - diff --git a/misc/examples/ims/scscf/kamailio.cfg b/misc/examples/ims/scscf/kamailio.cfg index 9d06af488c..97edf14350 100644 --- a/misc/examples/ims/scscf/kamailio.cfg +++ b/misc/examples/ims/scscf/kamailio.cfg @@ -135,8 +135,6 @@ loadmodule "uac" # Control interfaces: loadmodule "ctl" loadmodule "cfg_rpc" -loadmodule "mi_rpc" -loadmodule "mi_fifo" #!ifdef WITH_XMLRPC loadmodule "xmlrpc" #!endif @@ -188,17 +186,13 @@ modparam("presence", "db_url", DB_URL) modparam("presence", "db_update_period", 20) #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") - -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- modparam("ctl", "binrpc", "unix:/var/run/kamailio_scscf/kamailio_ctl") @@ -1227,4 +1221,3 @@ failure_route[PSTN_failure] { exit; } } -