Merge branch 'master' of ssh://git.sip-router.org/sip-router

examples/icscf/kamailio.cfg

@@ -110,7 +110,7 @@ loadmodule "cdp.so"
 loadmodule "cdp_avp.so"
 loadmodule "xlog.so"
 
-loadmodule "icscf.so"
+loadmodule "ims_icscf.so"
 
 #!ifdef CAPTURE_NODE
 loadmodule "siptrace.so"
@@ -145,19 +145,19 @@ modparam("cdp","config_file","/etc/kamailio/icscf.xml")
 # ----- icscf params -----
 # Comment the following line to enable realm routing
 #!ifdef CXDX_FORCED_PEER
-modparam("icscf", "cxdx_forced_peer", CXDX_FORCED_PEER)
+modparam("ims_icscf", "cxdx_forced_peer", CXDX_FORCED_PEER)
 #!endif
-modparam("icscf","cxdx_dest_realm", NETWORKNAME)
+modparam("ims_icscf","cxdx_dest_realm", NETWORKNAME)
 # DB-URL, where information about S-CSCF-Server can be found:
-modparam("icscf","db_url", DB_URL)
-modparam("icscf","cxdx_dest_realm", NETWORKNAME)
+modparam("ims_icscf","db_url", DB_URL)
+modparam("ims_icscf","cxdx_dest_realm", NETWORKNAME)
 #!ifdef PEERING
 # Route which is executed, in case HSS returned "User-Unknown" on LIR request
-modparam("icscf","route_lir_user_unknown", "lir_term_user_unknown")
+modparam("ims_icscf","route_lir_user_unknown", "lir_term_user_unknown")
 #!endif
 #!ifdef FALLBACK_AUTH
 # Route which is executed, in case HSS returned "User-Unknown" on UAR request
-modparam("icscf","route_uar_user_unknown", "uar_term_user_unknown")
+modparam("ims_icscf","route_uar_user_unknown", "uar_term_user_unknown")
 #!endif
 
 #!ifdef WITH_TLS

examples/pcscf/kamailio.cfg

@@ -131,15 +131,15 @@ loadmodule "tm"
 loadmodule "pv"
 loadmodule "sl"
 loadmodule "rr"
-loadmodule "dialog2"
-loadmodule "usrloc_pcscf" 
+loadmodule "dialog_ng"
+loadmodule "ims_usrloc_pcscf" 
 loadmodule "textops"
 loadmodule "textopsx"
 loadmodule "maxfwd"
 loadmodule "xlog"
 loadmodule "pua"
 loadmodule "db_sqlite"
-loadmodule "registrar_pcscf"
+loadmodule "ims_registrar_pcscf"
 loadmodule "sanity"
 loadmodule "siputils"
 loadmodule "kex"
@@ -156,7 +156,7 @@ loadmodule "xmlrpc"
 #!ifdef WITH_RX
 loadmodule "cdp"
 loadmodule "cdp_avp"
-loadmodule "diameter_rx"
+loadmodule "ims_qos"
 #!endif
 
 #!ifdef CAPTURE_NODE
@@ -224,24 +224,24 @@ modparam("path", "use_received", 1)
 
 # -- usrloc params --
 #!ifdef WITH_DEBUG
-modparam("usrloc_pcscf", "enable_debug_file", 1)
-modparam("usrloc_pcscf", "usrloc_debug_file", "/var/log/usrloc_debug")
+modparam("ims_usrloc_pcscf", "enable_debug_file", 1)
+modparam("ims_usrloc_pcscf", "usrloc_debug_file", "/var/log/usrloc_debug")
 #!else
-modparam("usrloc_pcscf", "enable_debug_file", 0)
+modparam("ims_usrloc_pcscf", "enable_debug_file", 0)
 #!endif
 
 #!ifdef WITH_RX
 # -- CDP params --
 modparam("cdp","config_file","/etc/kamailio/pcscf.xml")
 # -- diameter_rx params --
-modparam("diameter_rx", "rx_dest_realm", NETWORKNAME)
+modparam("ims_qos", "rx_dest_realm", NETWORKNAME)
 #!endif
 
-# -- dialog2 params --
-modparam("dialog2", "dlg_flag", FLT_DIALOG)
-modparam("dialog2", "timeout_avp", "$avp(DLG_TIMEOUT_AVP)")
-modparam("dialog2", "detect_spirals", 0)
-modparam("dialog2", "profiles_no_value", "orig ; term")
+# -- dialog_ng params --
+modparam("dialog_ng", "dlg_flag", FLT_DIALOG)
+modparam("dialog_ng", "timeout_avp", "$avp(DLG_TIMEOUT_AVP)")
+modparam("dialog_ng", "detect_spirals", 0)
+modparam("dialog_ng", "profiles_no_value", "orig ; term")
 
 #!ifdef WITH_TLS
 # ----- tls params -----

examples/scscf/kamailio.cfg

@@ -96,7 +96,7 @@ loadmodule "tm.so"
 loadmodule "pv.so"
 loadmodule "sl.so"
 loadmodule "rr.so"
-loadmodule "dialog2.so"
+loadmodule "dialog_ng.so"
 loadmodule "textops.so"
 loadmodule "maxfwd.so"
 loadmodule "xlog.so"
@@ -120,13 +120,13 @@ loadmodule "xmlrpc"
 loadmodule "cdp.so"
 loadmodule "cdp_avp.so"
 #!ifdef WITH_RO
-loadmodule "diameter_ro.so"
+loadmodule "ims_diameter_ro.so"
 #!endif
 
-loadmodule "usrloc_scscf.so" 
-loadmodule "registrar_scscf.so"
-loadmodule "auth_ims.so"
-loadmodule "isc.so"
+loadmodule "ims_usrloc_scscf.so" 
+loadmodule "ims_registrar_scscf.so"
+loadmodule "ims_auth.so"
+loadmodule "ims_isc.so"
 
 #!ifdef CAPTURE_NODE
 loadmodule "siptrace.so"
@@ -186,18 +186,18 @@ modparam("rr", "add_username", 1)
 modparam("rr", "custom_user_avp", "$avp(RR_CUSTOM_USER_AVP)")
 
 # -- usrloc params --
-modparam("usrloc_scscf", "enable_debug_file", 1)
-modparam("usrloc_scscf", "usrloc_debug_file", "/var/log/usrloc_debug")
-modparam("usrloc_scscf", "matching_mode", 0)
+modparam("ims_usrloc_scscf", "enable_debug_file", 1)
+modparam("ims_usrloc_scscf", "usrloc_debug_file", "/var/log/usrloc_debug")
+modparam("ims_usrloc_scscf", "matching_mode", 0)
 
 # -- CDP params --
 modparam("cdp","config_file","/etc/kamailio/scscf.xml")
 
-# -- dialog2 params --
-modparam("dialog2", "dlg_flag", FLT_DIALOG)
-modparam("dialog2", "timeout_avp", "$avp(DLG_TIMEOUT_AVP)")
-modparam("dialog2", "detect_spirals", 1)
-modparam("dialog2", "profiles_no_value", "orig ; term")
+# -- dialog_ng params --
+modparam("dialog_ng", "dlg_flag", FLT_DIALOG)
+modparam("dialog_ng", "timeout_avp", "$avp(DLG_TIMEOUT_AVP)")
+modparam("dialog_ng", "detect_spirals", 1)
+modparam("dialog_ng", "profiles_no_value", "orig ; term")
 
 #!ifdef WITH_XMLRPC
 # ----- xmlrpc params -----
@@ -220,44 +220,44 @@ modparam("siptrace", "trace_flag", FLT_CAPTURE)
 modparam("siptrace", "hep_mode_on", 1)
 #!endif
 
-# -- auth_ims params --
-modparam("auth_ims", "name", URI)
-modparam("auth_ims", "registration_default_algorithm", REG_AUTH_DEFAULT_ALG)
-modparam("auth_ims","ignore_failed_auth",1)
+# -- ims_auth params --
+modparam("ims_auth", "name", URI)
+modparam("ims_auth", "registration_default_algorithm", REG_AUTH_DEFAULT_ALG)
+modparam("ims_auth","ignore_failed_auth",1)
 #!ifdef CXDX_FORCED_PEER
-modparam("auth_ims", "cxdx_forced_peer", CXDX_FORCED_PEER)
+modparam("ims_auth", "cxdx_forced_peer", CXDX_FORCED_PEER)
 #!endif
-modparam("auth_ims", "cxdx_dest_realm", NETWORKNAME)
+modparam("ims_auth", "cxdx_dest_realm", NETWORKNAME)
 
-# -- registrar_scscf params --
+# -- ims_registrar_scscf params --
 #!ifdef WITH_DEBUG
-modparam("registrar_scscf", "default_expires", 60)
-modparam("registrar_scscf", "min_expires", 60)
-modparam("registrar_scscf", "max_expires", 60)
+modparam("ims_registrar_scscf", "default_expires", 60)
+modparam("ims_registrar_scscf", "min_expires", 60)
+modparam("ims_registrar_scscf", "max_expires", 60)
 #!else
-modparam("registrar_scscf", "default_expires",  604800)
-modparam("registrar_scscf", "min_expires", 3600)
-modparam("registrar_scscf", "max_expires",  604800)
+modparam("ims_registrar_scscf", "default_expires",  604800)
+modparam("ims_registrar_scscf", "min_expires", 3600)
+modparam("ims_registrar_scscf", "max_expires",  604800)
 #!endif
-modparam("registrar_scscf", "use_path", 1)
-modparam("registrar_scscf", "support_wildcardPSI",1)
-modparam("registrar_scscf", "user_data_xsd","/etc/kamailio/CxDataType_Rel7.xsd")
-modparam("registrar_scscf", "scscf_name", URI)
-modparam("registrar_scscf", "cxdx_dest_realm", NETWORKNAME)
+modparam("ims_registrar_scscf", "use_path", 1)
+modparam("ims_registrar_scscf", "support_wildcardPSI",1)
+modparam("ims_registrar_scscf", "user_data_xsd","/etc/kamailio/CxDataType_Rel7.xsd")
+modparam("ims_registrar_scscf", "scscf_name", URI)
+modparam("ims_registrar_scscf", "cxdx_dest_realm", NETWORKNAME)
 
-# ----- isc params -----
-modparam("isc", "my_uri", HOSTNAME)
+# ----- ims_isc params -----
+modparam("ims_isc", "my_uri", HOSTNAME)
 
 #!ifdef WITH_RO
-# ----- diameter_ro params -----
-modparam("diameter_ro", "ro_origin_host", HOSTNAME);
+# ----- ims_diameter_ro params -----
+modparam("ims_diameter_ro", "ro_origin_host", HOSTNAME);
 #!ifdef RO_FORCED_PEER
-modparam("diameter_ro", "ro_forced_peer", RO_FORCED_PEER);
+modparam("ims_diameter_ro", "ro_forced_peer", RO_FORCED_PEER);
 #!endif
-modparam("diameter_ro", "ro_dest_realm", NETWORKNAME);
+modparam("ims_diameter_ro", "ro_dest_realm", NETWORKNAME);
 
-modparam("diameter_ro","interim_request_credits",30);
-modparam("diameter_ro","timer_buffer",5);
+modparam("ims_diameter_ro","interim_request_credits",30);
+modparam("ims_diameter_ro","timer_buffer",5);
 #!endif
 
 # ----- enum params -----