[sr-dev] git:5.3:b90fa312: misc: examples: IMS PCSCF kamailio.cfg update

[Henning Westerholt]

Module: kamailio
Branch: 5.3
Commit: b90fa312cdd9df21472559fd0f5cda9418e7d9ba
URL: https://github.com/kamailio/kamailio/commit/b90fa312cdd9df21472559fd0f5cda9418e7d9ba

Author: Nick <nick at nickvsnetworking.com>
Committer: Henning Westerholt <hw at skalatan.de>
Date: 2020-02-09T17:23:24+01:00

misc: examples: IMS PCSCF kamailio.cfg update

Minor changes to make the example functional in the current stable release and higher.

- removed modparam("ims_usrloc_pcscf", "hashing_type", 2) This parameter was removed under a466c7bf1f1908461b8ab9dbf10ab4c90b65e52a
https://github.com/kamailio/kamailio/commit/a466c7bf1f1908461b8ab9dbf10ab4c90b65e52a#diff-bd9d5dd4265257881c8e19ea24ab533f
- Dispatcher parameters only loaded if #!WITH_SBC defined
- Load IPsec IMS Module by default (IPsec module is required for IMS Usrloc to load)

(cherry picked from commit 74e6daa71bf7dde64b907b7a1b9b3ebf925fad2b)

---

Modified: misc/examples/ims/pcscf/kamailio.cfg

---

Diff:  https://github.com/kamailio/kamailio/commit/b90fa312cdd9df21472559fd0f5cda9418e7d9ba.diff
Patch: https://github.com/kamailio/kamailio/commit/b90fa312cdd9df21472559fd0f5cda9418e7d9ba.patch

---

diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg
index 0c3f65de77..55cdd0b214 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:/var/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)