Module: kamailio Branch: master Commit: d74157a3a2d97a50dc5de98a0e5fc1c8aa75c09b URL: https://github.com/kamailio/kamailio/commit/d74157a3a2d97a50dc5de98a0e5fc1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-02-05T18:00:20+01:00 Merge pull request #2203 from nickvsnetworking/IMS_examples_refresh misc: examples; ims: Update kamailio.cfg example to function out of the box on current releases --- Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/pcscf/pcscf.cfg.sample --- Diff: https://github.com/kamailio/kamailio/commit/d74157a3a2d97a50dc5de98a0e5fc1c… Patch: https://github.com/kamailio/kamailio/commit/d74157a3a2d97a50dc5de98a0e5fc1c… --- diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg index 3ffa779eaf..b2660f134b 100644 --- a/misc/examples/ims/pcscf/kamailio.cfg +++ b/misc/examples/ims/pcscf/kamailio.cfg @@ -161,10 +161,11 @@ loadmodule "statistics" loadmodule "ims_dialog" loadmodule "ims_usrloc_pcscf" -loadmodule "ims_registrar_pcscf" #!ifdef WITH_IPSEC loadmodule "ims_ipsec_pcscf" #!endif +loadmodule "ims_registrar_pcscf" + #!ifdef WITH_XMLRPC loadmodule "xmlrpc" @@ -329,6 +330,7 @@ modparam("ctl", "binrpc", "unix:/run/kamailio_pcscf/kamailio_ctl") # ----------------- Settings for Dispatcher --------------- modparam("dispatcher", "list_file", "/etc/kamailio_pcscf/dispatcher.list") +#!ifdef WITH_SBC # Dispatcher: Enable Failover-Support modparam("dispatcher", "flags", 2) # Dispatcher: Overwrite Destination address, if required. @@ -343,6 +345,7 @@ modparam("dispatcher", "sock_avp", "$avp(DISPATCHER_SOCK_AVP)") modparam("dispatcher", "ds_ping_interval", 15) # Actively query the gateways: modparam("dispatcher", "ds_probing_mode", 1) +#!endif # -- usrloc params -- #!ifdef DB_URL @@ -353,7 +356,6 @@ modparam("ims_usrloc_pcscf", "db_url", DB_URL) #!endif modparam("ims_usrloc_pcscf", "db_mode", 1) #!endif -modparam("ims_usrloc_pcscf", "hashing_type", 2) modparam("ims_usrloc_pcscf", "enable_debug_file", 0) modparam("ims_usrloc_pcscf", "match_contact_host_port", 1) modparam("ims_registrar_pcscf", "is_registered_fallback2ip", 1) diff --git a/misc/examples/ims/pcscf/pcscf.cfg.sample b/misc/examples/ims/pcscf/pcscf.cfg.sample index 6b7a7231ca..4d26357764 100644 --- a/misc/examples/ims/pcscf/pcscf.cfg.sample +++ b/misc/examples/ims/pcscf/pcscf.cfg.sample @@ -1,14 +1,14 @@ # IP-Adress for incoming SIP-Traffic, in the following format: # SIP / UDP -listen=udp:11.22.33.44:5060 +listen=udp:0.0.0.0:5060 # SIP / TCP -#listen=tcp:11.22.33.44:5060 +#listen=tcp:0.0.0.0:5060 # SIP / TCP/TLS -#listen=tls:11.22.33.44:5061 +#listen=tls:0.0.0.0:5061 # IPSEC / UDP -#!define IPSEC_LISTEN_ADDR "11.22.33.44" +#!define IPSEC_LISTEN_ADDR "0.0.0.0" #!define IPSEC_CLIENT_PORT 5062 #!define IPSEC_SERVER_PORT 5063 @@ -33,7 +33,7 @@ alias=pcscf.mnc001.mcc001.3gppnetwork.org ##!define XMLRPC_WHITELIST_3 "127.0.0.1" # Databases: -#!define DB_URL "con1=>mysql://pcscf:heslo@127.0.0.1/pcscf" +#!define DB_URL "mysql://pcscf:heslo@127.0.0.1/pcscf" ##!define DB_URL2 "con2=>mysql://pcscf:heslo@127.0.0.1/pcscf" #!define SQLOPS_DBURL "pcscf=>mysql://pcscf:heslo@127.0.0.1/pcscf" @@ -109,4 +109,4 @@ alias=pcscf.mnc001.mcc001.3gppnetwork.org ##!define WITH_REGINFO ##!define WITH_RTPPING ##!define WITH_WEBSOCKET -##!define WITH_IPSEC +#!define WITH_IPSEC