modules/ims* and modules/dialog2 - changed modules name to prepend ims_ to all IMS modules

As per mailing list and offline discussions have prepended _ims to all IMS modules and renamed dialog2 dialog_ng
New modules name:
dialog_ng
ims_auth
ims_icscf
ims_isc
ims_registrar_pcscf
ims_registrar_scscf
ims_usrloc_pcscf
ims_usrloc_scscf

modules/dialog2/Makefile → modules/dialog_ng/Makefile

@@ -4,7 +4,7 @@
 
 include ../../Makefile.defs
 auto_gen=
-NAME=dialog2.so
+NAME=dialog_ng.so
 LIBS= 
 
 ifeq ($(CFG_NAME),kamailio)

modules/dialog2/README → modules/dialog_ng/README

@@ -1,4 +1,4 @@
-dialog2 Module
+dialog_ng Module
 
 Bogdan-Andrei Iancu
 
@@ -247,13 +247,13 @@ Chapter 1. Admin Guide
 
 1. Overview
 
-   The dialog2 module provides dialog awareness to the Kamailio proxy. Its
+   The dialog_ng module provides dialog awareness to the Kamailio proxy. Its
    functionality is to keep track of the current dialogs, to offer
    information about them (like how many dialogs are active) or to manage
    them. The module exports several functions that could be used directly
-   from scripts. The dialog2 module extends the original dialog module by
+   from scripts. The dialog_ng module extends the original dialog module by
    providing support for forked calling and early dialog termination. It
-   is the intention that the dialog2 module will eventually replace the
+   is the intention that the dialog_ng module will eventually replace the
    dialog module.
 
    The module, via an internal API, also provide the foundation to build
@@ -337,7 +337,7 @@ Chapter 1. Admin Guide
 
 5.1.  enable_stats (integer)
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 5.2.  hash_size (integer)
@@ -355,7 +355,7 @@ Chapter 1. Admin Guide
 
    Example 1.1. Set hash_size parameter
 ...
-modparam("dialog2", "hash_size", 1024)
+modparam("dialog_ng", "hash_size", 1024)
 ...
 
 5.3.  rr_param (string)
@@ -367,7 +367,7 @@ modparam("dialog2", "hash_size", 1024)
 
    Example 1.2. Set rr_param parameter
 ...
-modparam("dialog2", "rr_param", "xyz")
+modparam("dialog_ng", "rr_param", "xyz")
 ...
 
 5.4.  dlg_flag (integer)
@@ -379,7 +379,7 @@ modparam("dialog2", "rr_param", "xyz")
 
    Example 1.3. Set dlg_flag parameter
 ...
-modparam("dialog2", "dlg_flag", 4)
+modparam("dialog_ng", "dlg_flag", 4)
 ...
 
 5.5.  timeout_avp (string)
@@ -392,7 +392,7 @@ modparam("dialog2", "dlg_flag", 4)
 
    Example 1.4. Set timeout_avp parameter
 ...
-modparam("dialog2", "timeout_avp", "$avp(i:10)")
+modparam("dialog_ng", "timeout_avp", "$avp(i:10)")
 ...
 
 5.6.  default_timeout (integer)
@@ -403,7 +403,7 @@ modparam("dialog2", "timeout_avp", "$avp(i:10)")
 
    Example 1.5. Set default_timeout parameter
 ...
-modparam("dialog2", "default_timeout", 21600)
+modparam("dialog_ng", "default_timeout", 21600)
 ...
 
 5.7.  dlg_extra_hdrs (string)
@@ -415,7 +415,7 @@ modparam("dialog2", "default_timeout", 21600)
 
    Example 1.6. Set dlf_extra_hdrs parameter
 ...
-modparam("dialog2", "dlg_extra_hdrs", "Hint: credit expired\r\n")
+modparam("dialog_ng", "dlg_extra_hdrs", "Hint: credit expired\r\n")
 ...
 
 5.8.  dlg_match_mode (integer)
@@ -436,28 +436,28 @@ modparam("dialog2", "dlg_extra_hdrs", "Hint: credit expired\r\n")
 
    Example 1.7. Set detect_spirals parameter
 ...
-modparam("dialog2", "detect_spirals", 1)
+modparam("dialog_ng", "detect_spirals", 1)
 ...
 
 5.10.  db_url (string)
 
-   Db storage not yet supported by dialog2 - this to be done in future.
+   Db storage not yet supported by dialog_ng - this to be done in future.
 
 5.11.  db_mode (integer)
 
-   Db storage not yet supported by dialog2 - this to be done in future.
+   Db storage not yet supported by dialog_ng - this to be done in future.
 
 5.12.  db_update_period (integer)
 
-   Db storage not yet supported by dialog2 - this to be done in future.
+   Db storage not yet supported by dialog_ng - this to be done in future.
 
 5.13.  db_fetch_rows (integer)
 
-   Db storage not yet supported by dialog2 - this to be done in future.
+   Db storage not yet supported by dialog_ng - this to be done in future.
 
 5.14.  table_name (string)
 
-   Db storage not yet supported by dialog2 - this to be done in future.
+   Db storage not yet supported by dialog_ng - this to be done in future.
 
 5.15.  profiles_with_value (string)
 
@@ -658,7 +658,7 @@ redlg_setflag("1");
 
 6.8.  dlg_terminate
 
-   Terminates a dialog. In dialog2 module this function now includes
+   Terminates a dialog. In dialog_ng module this function now includes
    support for early as well as confirmed dialogs.
 
    Meaning of the parameters is as follows:
@@ -676,28 +676,28 @@ dlg_terminate("all", "Insufficient QoS");
 
 6.9.  dlg_refer(side, address)
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 6.10.  dlg_manage()
 
-   This has been deprecated in dialog2. Instead set dialog flag for
+   This has been deprecated in dialog_ng. Instead set dialog flag for
    initial INVITE and Route-parameter-callback execution for within-dialog
    requests.
 
 6.11.  dlg_bridge(from, to, op)
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 6.12.  dlg_get(callid, ftag, ttag)
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 6.13.  is_known_dlg()
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 7. Exported statistics
@@ -710,27 +710,27 @@ dlg_terminate("all", "Insufficient QoS");
 
 7.1.  active_dialogs
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 7.2.  early_dialogs
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 7.3.  processed_dialogs
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 7.4.  expired_dialogs
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 7.5.  failed_dialogs
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 8. MI Commands
@@ -747,7 +747,7 @@ dlg_terminate("all", "Insufficient QoS");
 
    Lists the description of a dialog or of all dialogs (calls). If only
    one dialogs is to be listed, the dialog identifiers are to be passed as
-   parameter (callid and fromtag). In dialog2 module this also now also
+   parameter (callid and fromtag). In dialog_ng module this also now also
    lists all dlg_out entries for early dialogs.
 
    Name: dlg_list
@@ -769,18 +769,18 @@ dlg_terminate("all", "Insufficient QoS");
 
 8.2.  dlg_list_ctx
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 8.3.  dlg_end_dlg
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 8.4.  dlg_terminate_dlg
 
    Terminates a singe dialog, identified by the call_id, ftag, ttag. In
-   dialog2 module this dialog can be terminated in the early or confirmed
+   dialog_ng module this dialog can be terminated in the early or confirmed
    states.
 
    Name: dlg_terminate_dlg
@@ -799,17 +799,17 @@ dlg_terminate("all", "Insufficient QoS");
 
 8.5.  profile_get_size
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 8.6.  profile_list_dlgs
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 8.7.  dlg_bridge
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 9. Exported RPC Functions
@@ -825,42 +825,42 @@ dlg_terminate("all", "Insufficient QoS");
 
 9.1.  dlg.list
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 9.2.  dlg.list_ctx
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 9.3.  dlg.dlg_list
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 9.4.  dlg.dlg_list_ctx
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 9.5.  dlg.end_dlg
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 9.6.  dlg.profile_get_size
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 9.7.  dlg.profile_list
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 9.8.  dlg.bridge_dlg
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 10. Exported pseudo-variables
@@ -874,32 +874,32 @@ dlg_terminate("all", "Insufficient QoS");
 
 10.1.  $DLG_count
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 10.2.  $DLG_status
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 10.3.  $DLG_lifetime
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 10.4.  $dlg(...)
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 10.5.  $dlg_ctx(...)
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 10.6.  $dlg_var(key)
 
-   This function is currently not supported by the dialog2 module. To be
+   This function is currently not supported by the dialog_ng module. To be
    incorporated in the future.
 
 Chapter 2. Developer Guide
@@ -1007,7 +1007,7 @@ Chapter 2. Developer Guide
 Chapter 3. Frequently Asked Questions
 
    3.1. What happend with “use_tight_match” parameter?
-   3.2. Why is there a dialog2 module and a dialog module?
+   3.2. Why is there a dialog_ng module and a dialog module?
    3.3. Where can I find more about Kamailio?
    3.4. Where can I post a question about this module?
    3.5. How can I report a bug?
@@ -1022,12 +1022,12 @@ Chapter 3. Frequently Asked Questions
 
    3.2.
 
-       Why is there a dialog2 module and a dialog module?
+       Why is there a dialog_ng module and a dialog module?
 
-       The dialog2 module addresses shortcomings in the intial dialog module
+       The dialog_ng module addresses shortcomings in the intial dialog module
        design. It makes some large changes to the API and therefore must be
        introduced slowly. It is currently in the early development stages.
-       Eventually the dialog2 module should replace the dialog module.
+       Eventually the dialog_ng module should replace the dialog module.
 
    3.3.
 

modules/dialog2/dialog.c → modules/dialog_ng/dialog.c

@@ -142,7 +142,7 @@ static mi_export_t mi_cmds[] = {
 static rpc_export_t rpc_methods[];
 
 struct module_exports exports = {
-    "dialog2", /* module's name */
+    "dialog_ng", /* module's name */
     DEFAULT_DLFLAGS, /* dlopen flags */
     cmds, /* exported functions */
     mod_params, /* param exports */

modules/auth_ims/doc/Makefile → modules/dialog_ng/doc/Makefile

@@ -1,4 +1,4 @@
-docs = auth_ims.xml
+docs = dialog_ng.xml
 
 docbook_dir = ../../../docbook
 include $(docbook_dir)/Makefile.module

modules/dialog2/doc/dialog2.xml → modules/dialog_ng/doc/dialog_ng.xml

@@ -10,7 +10,7 @@
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
-        <title>dialog2 Module</title>
+        <title>dialog_ng Module</title>
         <productname class="trade">&kamailioname;</productname>
         <authorgroup>
             <author>
@@ -94,8 +94,8 @@
     </bookinfo>
     <toc></toc>
 	
-    <xi:include href="dialog2_admin.xml"/>
-    <xi:include href="dialog2_devel.xml"/>
-    <xi:include href="dialog2_faq.xml"/>
+    <xi:include href="dialog_ng_admin.xml"/>
+    <xi:include href="dialog_ng_devel.xml"/>
+    <xi:include href="dialog_ng_faq.xml"/>
 	
 </book>

modules/dialog2/doc/dialog2_admin.xml → modules/dialog_ng/doc/dialog_ng_admin.xml

@@ -16,13 +16,13 @@
     <section>
         <title>Overview</title>
         <para>
-	The dialog2 module provides dialog awareness to the &kamailio; proxy. Its
+	The dialog_ng module provides dialog awareness to the &kamailio; proxy. Its
 	functionality is to keep track of the current dialogs, to offer information
 	about them (like how many dialogs are active) or to manage them. The module
 	exports several functions that could be used directly from scripts.
-        The dialog2 module extends the original dialog module by providing support
+        The dialog_ng module extends the original dialog module by providing support
         for forked calling and early dialog termination.  It is the intention that
-        the dialog2 module will eventually replace the dialog module.
+        the dialog_ng module will eventually replace the dialog module.
         </para>
         <para>
 	The module, via an internal API, also provide the foundation to build on
@@ -143,7 +143,7 @@
                 <varname>enable_stats</varname> (integer)
             </title>
             <para>
-		This function is currently not supported by the dialog2 module.
+		This function is currently not supported by the dialog_ng module.
                 To be incorporated in the future.
             </para>
         </section>
@@ -175,7 +175,7 @@
                 </title>
                 <programlisting format="linespecific">
 ...
-modparam("dialog2", "hash_size", 1024)
+modparam("dialog_ng", "hash_size", 1024)
 ...
                 </programlisting>
             </example>
@@ -201,7 +201,7 @@ modparam("dialog2", "hash_size", 1024)
                 </title>
                 <programlisting format="linespecific">
 ...
-modparam("dialog2", "rr_param", "xyz")
+modparam("dialog_ng", "rr_param", "xyz")
 ...
                 </programlisting>
             </example>
@@ -227,7 +227,7 @@ modparam("dialog2", "rr_param", "xyz")
                 </title>
                 <programlisting format="linespecific">
 ...
-modparam("dialog2", "dlg_flag", 4)
+modparam("dialog_ng", "dlg_flag", 4)
 ...
                 </programlisting>
             </example>
@@ -254,7 +254,7 @@ modparam("dialog2", "dlg_flag", 4)
                 </title>
                 <programlisting format="linespecific">
 ...
-modparam("dialog2", "timeout_avp", "$avp(i:10)")
+modparam("dialog_ng", "timeout_avp", "$avp(i:10)")
 ...
                 </programlisting>
             </example>
@@ -279,7 +279,7 @@ modparam("dialog2", "timeout_avp", "$avp(i:10)")
                 </title>
                 <programlisting format="linespecific">
 ...
-modparam("dialog2", "default_timeout", 21600)
+modparam("dialog_ng", "default_timeout", 21600)
 ...
                 </programlisting>
             </example>
@@ -305,7 +305,7 @@ modparam("dialog2", "default_timeout", 21600)
                 </title>
                 <programlisting format="linespecific">
 ...
-modparam("dialog2", "dlg_extra_hdrs", "Hint: credit expired\r\n")
+modparam("dialog_ng", "dlg_extra_hdrs", "Hint: credit expired\r\n")
 ...
                 </programlisting>
             </example>
@@ -342,7 +342,7 @@ modparam("dialog2", "dlg_extra_hdrs", "Hint: credit expired\r\n")
                 </title>
                 <programlisting format="linespecific">
 ...
-modparam("dialog2", "detect_spirals", 1)
+modparam("dialog_ng", "detect_spirals", 1)
 ...
                 </programlisting>
             </example>
@@ -353,7 +353,7 @@ modparam("dialog2", "detect_spirals", 1)
                 <varname>db_url</varname> (string)
             </title>
             <para>
-		Db storage not yet supported by dialog2 - this to be done in future.
+		Db storage not yet supported by dialog_ng - this to be done in future.
             </para>
         </section>
 
@@ -362,7 +362,7 @@ modparam("dialog2", "detect_spirals", 1)
                 <varname>db_mode</varname> (integer)
             </title>
             <para>
-		Db storage not yet supported by dialog2 - this to be done in future.
+		Db storage not yet supported by dialog_ng - this to be done in future.
             </para>
         </section>
 
@@ -371,7 +371,7 @@ modparam("dialog2", "detect_spirals", 1)
                 <varname>db_update_period</varname> (integer)
             </title>
             <para>
-		Db storage not yet supported by dialog2 - this to be done in future.
+		Db storage not yet supported by dialog_ng - this to be done in future.
             </para>
         </section>
 
@@ -380,7 +380,7 @@ modparam("dialog2", "detect_spirals", 1)
                 <varname>db_fetch_rows</varname> (integer)
             </title>
             <para>
-		Db storage not yet supported by dialog2 - this to be done in future.
+		Db storage not yet supported by dialog_ng - this to be done in future.
             </para>
         </section>
 
@@ -389,7 +389,7 @@ modparam("dialog2", "detect_spirals", 1)
                 <varname>table_name</varname> (string)
             </title>
             <para>
-		Db storage not yet supported by dialog2 - this to be done in future.
+		Db storage not yet supported by dialog_ng - this to be done in future.
             </para>
         </section>
 
@@ -774,7 +774,7 @@ redlg_setflag("1");
                 <function moreinfo="none">dlg_terminate</function>
             </title>
             <para>
-		Terminates a dialog.  In dialog2 module this function now
+		Terminates a dialog.  In dialog_ng module this function now
                 includes support for early as well as confirmed dialogs.
             </para>
             <para>Meaning of the parameters is as follows:</para>
@@ -812,7 +812,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <function moreinfo="none">dlg_refer(side, address)</function>
             </title>
             <para>
-		This function is currently not supported by the dialog2 module.
+		This function is currently not supported by the dialog_ng module.
                 To be incorporated in the future.
             </para>
         </section>
@@ -822,7 +822,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <function moreinfo="none">dlg_manage()</function>
             </title>
             <para>
-		This has been deprecated in dialog2. Instead set dialog flag for 
+		This has been deprecated in dialog_ng. Instead set dialog flag for 
                 initial INVITE and Route-parameter-callback execution for 
                 within-dialog requests.
             </para>
@@ -833,7 +833,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <function moreinfo="none">dlg_bridge(from, to, op)</function>
             </title>
             <para>
-		This function is currently not supported by the dialog2 module.
+		This function is currently not supported by the dialog_ng module.
                 To be incorporated in the future.
             </para>
         </section>
@@ -843,7 +843,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <function moreinfo="none">dlg_get(callid, ftag, ttag)</function>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -853,7 +853,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <function moreinfo="none">is_known_dlg()</function>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -868,7 +868,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>active_dialogs</varname>
             </title>
             <para>
-			This function is currently not supported by the dialog2 module.
+			This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -877,7 +877,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>early_dialogs</varname>
             </title>
             <para>
-			This function is currently not supported by the dialog2 module.
+			This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>		
@@ -886,7 +886,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>processed_dialogs</varname>
             </title>
             <para>
-			This function is currently not supported by the dialog2 module.
+			This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -895,7 +895,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>expired_dialogs</varname>
             </title>
             <para>
-			This function is currently not supported by the dialog2 module.
+			This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -904,7 +904,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>failed_dialogs</varname>
             </title>
             <para>
-			This function is currently not supported by the dialog2 module.
+			This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -921,7 +921,7 @@ dlg_terminate("all", "Insufficient QoS");
             <para>
 		Lists the description of a dialog or of all dialogs (calls). If only
 		one dialogs is to be listed, the dialog identifiers are to be passed
-		as parameter (callid and fromtag).  In dialog2 module this also now 
+		as parameter (callid and fromtag).  In dialog_ng module this also now 
                 also lists all dlg_out entries for early dialogs.
                 
             </para>
@@ -967,7 +967,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg_list_ctx</varname>
             </title>
             <para>
-		This function is currently not supported by the dialog2 module.
+		This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -977,7 +977,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg_end_dlg</varname>
             </title>
             <para>
-			This function is currently not supported by the dialog2 module.
+			This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -987,7 +987,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg_terminate_dlg</varname>
             </title>
             <para>
-		Terminates a singe dialog, identified by the call_id, ftag, ttag. In dialog2 module this
+		Terminates a singe dialog, identified by the call_id, ftag, ttag. In dialog_ng module this
                 dialog can be terminated in the early or confirmed states.
             </para>
             <para>
@@ -1030,7 +1030,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>profile_get_size</varname>
             </title>
             <para>
-		This function is currently not supported by the dialog2 module.
+		This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1040,7 +1040,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>profile_list_dlgs</varname>
             </title>
             <para>
-		This function is currently not supported by the dialog2 module.
+		This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1050,7 +1050,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg_bridge</varname>
             </title>
             <para>
-			This function is currently not supported by the dialog2 module.
+			This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1065,7 +1065,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg.list</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1075,7 +1075,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg.list_ctx</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1085,7 +1085,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg.dlg_list</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1095,7 +1095,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg.dlg_list_ctx</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1105,7 +1105,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg.end_dlg</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1115,7 +1115,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg.profile_get_size</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1125,7 +1125,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg.profile_list</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1135,7 +1135,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>dlg.bridge_dlg</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1151,7 +1151,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>$DLG_count</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1161,7 +1161,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>$DLG_status</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1171,7 +1171,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>$DLG_lifetime</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1180,7 +1180,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>$dlg(...)</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1189,7 +1189,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>$dlg_ctx(...)</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>
@@ -1199,7 +1199,7 @@ dlg_terminate("all", "Insufficient QoS");
                 <varname>$dlg_var(key)</varname>
             </title>
             <para>
-                    This function is currently not supported by the dialog2 module.
+                    This function is currently not supported by the dialog_ng module.
                     To be incorporated in the future.
             </para>
         </section>

modules/dialog2/doc/dialog2_faq.xml → modules/dialog_ng/doc/dialog_ng_faq.xml

@@ -29,14 +29,14 @@
 	</qandaentry>
         <qandaentry>
 		<question>
-		<para>Why is there a dialog2 module and a dialog module?</para>
+		<para>Why is there a dialog_ng module and a dialog module?</para>
 		</question>
 		<answer>
 		<para>
-			The dialog2 module addresses shortcomings in the intial dialog
+			The dialog_ng module addresses shortcomings in the intial dialog
                         module design.  It makes some large changes to the API and 
                         therefore must be introduced slowly.  It is currently in the
-                        early development stages.  Eventually the dialog2 module should
+                        early development stages.  Eventually the dialog_ng module should
                         replace the dialog module.
 		</para>
 		</answer>

modules/auth_ims/Makefile → modules/ims_auth/Makefile

@@ -7,7 +7,7 @@
 
 include ../../Makefile.defs
 auto_gen=
-NAME=auth_ims.so
+NAME=ims_auth.so
 LIBS=
 
 DEFS+=-DOPENSER_MOD_INTERFACE

modules/auth_ims/api.h → modules/ims_auth/api.h

@@ -43,8 +43,8 @@
  * 
  */
 
-#ifndef _AUTH_IMS_API_H_
-#define _AUTH_IMS_API_H_
+#ifndef _IMS_AUTH_API_H_
+#define _IMS_AUTH_API_H_
 
 #include "../../sr_module.h"
 #include "../../parser/msg_parser.h"
@@ -67,24 +67,24 @@ typedef enum auth_cfg_result {
 typedef int (*digest_authenticate_f)(struct sip_msg* msg, str *realm,
 				str *table, hdr_types_t hftype);
 /**
- * @brief AUTH_IMS API structure
+ * @brief IMS_AUTH API structure
  */
-typedef struct auth_ims_api {
+typedef struct ims_auth_api {
 	digest_authenticate_f digest_authenticate;
-} auth_ims_api_t;
+} ims_auth_api_t;
 
-typedef int (*bind_auth_ims_f)(auth_ims_api_t* api);
+typedef int (*bind_ims_auth_f)(ims_auth_api_t* api);
 
 /**
- * @brief Load the AUTH_IMS API
+ * @brief Load the IMS_AUTH API
  */
-static inline int auth_IMS_load_api(auth_ims_api_t *api)
+static inline int ims_auth_load_api(ims_auth_api_t *api)
 {
-	bind_auth_ims_f bindauthims;
+	bind_ims_auth_f bindauthims;
 
-	bindauthims = (bind_auth_ims_f)find_export("bind_auth_ims", 0, 0);
+	bindauthims = (bind_ims_auth_f)find_export("bind_ims_auth", 0, 0);
 	if(bindauthims == 0) {
-		LM_ERR("cannot find bind_auth_ims\n");
+		LM_ERR("cannot find bind_ims_auth\n");
 		return -1;
 	}
 	if (bindauthims(api)==-1)
@@ -95,4 +95,4 @@ static inline int auth_IMS_load_api(auth_ims_api_t *api)
 	return 0;
 }
 
-#endif /* _AUTH_IMS_API_H_ */
+#endif /* _IMS_AUTH_API_H_ */

modules/auth_ims/authims_mod.c → modules/ims_auth/authims_mod.c

@@ -119,7 +119,7 @@ static cmd_export_t cmds[] = {
     {"ims_www_challenge", (cmd_function) www_challenge, 1, challenge_fixup, 0, REQUEST_ROUTE},
     {"ims_proxy_authenticate", (cmd_function) proxy_authenticate, 1, auth_fixup, 0, REQUEST_ROUTE},
     {"ims_proxy_challenge", (cmd_function) proxy_challenge, 1, auth_fixup, 0, REQUEST_ROUTE},
-    {"bind_auth_ims", (cmd_function) bind_auth_ims, 0, 0, 0, 0},
+    {"bind_ims_auth", (cmd_function) bind_ims_auth, 0, 0, 0, 0},
     {0, 0, 0, 0, 0, 0}
 };
 
@@ -154,7 +154,7 @@ stat_export_t mod_stats[] = {
  * Module interface
  */
 struct module_exports exports = {
-    "auth_ims",
+    "ims_auth",
     DEFAULT_DLFLAGS, /* dlopen flags */
     cmds, /* Exported functions */
     params, /* Exported parameters */

modules/auth_ims/authims_mod.h → modules/ims_auth/authims_mod.h

@@ -50,6 +50,6 @@
 #include "../../lib/srdb1/db.h"
 #include "../../parser/msg_parser.h"
 
-#define MOD_NAME "auth_ims"
+#define MOD_NAME "ims_auth"
 
 #endif /* AUTHIMSMOD_H */

modules/auth_ims/authorize.c → modules/ims_auth/authorize.c

@@ -808,9 +808,9 @@ int proxy_authenticate(struct sip_msg* msg, char* _realm, char* str2) {
 }
 
 /**
- * @brief bind functions to AUTH_IMS API structure
+ * @brief bind functions to IMS AUTH API structure
  */
-int bind_auth_ims(auth_ims_api_t * api) {
+int bind_ims_auth(ims_auth_api_t * api) {
     if (!api) {
         ERR("Invalid parameter value\n");
         return -1;

modules/auth_ims/authorize.h → modules/ims_auth/authorize.h

@@ -143,9 +143,9 @@ int www_challenge(struct sip_msg* msg, char* _realm, char* str2);
 
 
 /*
- * Bind to AUTH_IMS API
+ * Bind to IMS_AUTH API
  */
-int bind_auth_ims(auth_ims_api_t* api);
+int bind_ims_auth(ims_auth_api_t* api);
 
 auth_vector* get_auth_vector(str private_identity,str public_identity,int status,str *nonce,unsigned int *hash);
 /*

modules/auth_ims/cxdx_mar.c → modules/ims_auth/cxdx_mar.c

@@ -46,7 +46,7 @@
 #include "stats.h"
 #include "../cdp/cdp_load.h"
 #include "../../modules/tm/tm_load.h"
-#include "../../modules/dialog2/dlg_load.h"
+#include "../../modules/dialog_ng/dlg_load.h"
 #include "api.h"
 #include "cxdx_avp.h"
 

modules/icscf/doc/Makefile → modules/ims_auth/doc/Makefile

@@ -1,4 +1,4 @@
-docs = icscf.xml
+docs = ims_auth.xml
 
 docbook_dir = ../../../docbook
 include $(docbook_dir)/Makefile.module

modules/icscf/doc/icscf.xml → modules/ims_auth/doc/ims_auth.xml

@@ -7,7 +7,7 @@
 ]>
 <book>
   <bookinfo>
-    <title>auth_ims Module</title>
+    <title>ims_auth Module</title>
 
     <authorgroup>
       <author>
@@ -60,6 +60,6 @@
 
   <toc/>
 
-  <xi:include href="icscf_admin.xml"
+  <xi:include href="ims_auth_admin.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </book>

modules/auth_ims/doc/auth_ims_admin.xml → modules/ims_auth/doc/ims_auth_admin.xml

@@ -14,7 +14,7 @@
 
     <para>This module contains all authentication related functions for an IMS
     environment. The module does not depend on the base Kamailio auth modules
-    as other auth modules do. Instead auth_ims is dependent on the CDP (C
+    as other auth modules do. Instead ims_auth is dependent on the CDP (C
     Diameter Peer) modules for communicating with HSS as specified in 3GPP
     specs.</para>
   </section>
@@ -66,7 +66,7 @@
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "name", "sip:scscf3.ims.smilecoms.com:6060")
+modparam("ims_auth", "name", "sip:scscf3.ims.smilecoms.com:6060")
 ...
 </programlisting>
       </example>
@@ -86,7 +86,7 @@ modparam("auth_ims", "name", "sip:scscf3.ims.smilecoms.com:6060")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "name", "sip:scscf3.ims.smilecoms.com:6060")
+modparam("ims_auth", "name", "sip:scscf3.ims.smilecoms.com:6060")
 ...
 </programlisting>
       </example>
@@ -106,7 +106,7 @@ modparam("auth_ims", "name", "sip:scscf3.ims.smilecoms.com:6060")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "auth_data_hash_size", 1024)
+modparam("ims_auth", "auth_data_hash_size", 1024)
 ...
 </programlisting>
       </example>
@@ -125,7 +125,7 @@ modparam("auth_ims", "auth_data_hash_size", 1024)
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "auth_vector_timeout", "domain")
+modparam("ims_auth", "auth_vector_timeout", "domain")
 ...
 </programlisting>
       </example>
@@ -143,7 +143,7 @@ modparam("auth_ims", "auth_vector_timeout", "domain")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "auth_data_timeout", 60)
+modparam("ims_auth", "auth_data_timeout", 60)
 ...
 </programlisting>
       </example>
@@ -161,7 +161,7 @@ modparam("auth_ims", "auth_data_timeout", 60)
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "av_request_at_once", 1)
+modparam("ims_auth", "av_request_at_once", 1)
 ...
 </programlisting>
       </example>
@@ -178,7 +178,7 @@ modparam("auth_ims", "av_request_at_once", 1)
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "av_request_at_sync", 1)
+modparam("ims_auth", "av_request_at_sync", 1)
 ...
 </programlisting>
       </example>
@@ -215,7 +215,7 @@ modparam("auth_ims", "av_request_at_sync", 1)
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "registration_default_algorithm", "HSS-Selected")
+modparam("ims_auth", "registration_default_algorithm", "HSS-Selected")
 ...
 </programlisting>
       </example>
@@ -234,7 +234,7 @@ modparam("auth_ims", "registration_default_algorithm", "HSS-Selected")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "load_credentials", "auth-int")
+modparam("ims_auth", "load_credentials", "auth-int")
 ...
 </programlisting>
       </example>
@@ -252,7 +252,7 @@ modparam("auth_ims", "load_credentials", "auth-int")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "cxdx_forced_peer", "hss.ims.smilecoms.com")
+modparam("ims_auth", "cxdx_forced_peer", "hss.ims.smilecoms.com")
 ...
 </programlisting>
       </example>
@@ -270,7 +270,7 @@ modparam("auth_ims", "cxdx_forced_peer", "hss.ims.smilecoms.com")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "cxdx_dest_realm", "ims.smilecoms.com")
+modparam("ims_auth", "cxdx_dest_realm", "ims.smilecoms.com")
 ...
 </programlisting>
       </example>

modules/icscf/Makefile → modules/ims_icscf/Makefile

@@ -1,13 +1,13 @@
 # $Id$
 #
-# ICSCF make file
+# IMS_ICSCF make file
 #
 # 
 
 
 include ../../Makefile.defs
 auto_gen=
-NAME=icscf.so
+NAME=ims_icscf.so
 LIBS=
 
 DEFS += -DOPENSER_MOD_INTERFACE

modules/icscf/cxdx_lir.c → modules/ims_icscf/cxdx_lir.c

@@ -45,7 +45,7 @@
 
 #include "stats.h"
 #include "../cdp/cdp_load.h"
-#include "../../modules/dialog2/dlg_load.h"
+#include "../../modules/dialog_ng/dlg_load.h"
 #include "cxdx_avp.h"
 #include "cxdx_lir.h"
 #include "mod.h"
@@ -140,7 +140,7 @@ void async_cdp_lir_callback(int is_timeout, void *param, AAAMessage *lia, long e
                         /* exec routing script */
                         init_run_actions_ctx(&ra_ctx);
                         if (run_actions(&ra_ctx, main_rt.rlist[route_uar_user_unknown_no], t->uas.request) < 0) {
-                            DBG("icscf: error while trying script\n");
+                            DBG("ims_icscf: error while trying script\n");
                         }
                     } else {
                         cscf_reply_transactional_async(t, t->uas.request, 604, MSG_604_USER_UNKNOWN);

modules/icscf/cxdx_uar.c → modules/ims_icscf/cxdx_uar.c

@@ -46,7 +46,7 @@
 #include "stats.h"
 #include "../cdp/cdp_load.h"
 #include "../../modules/tm/tm_load.h"
-#include "../../modules/dialog2/dlg_load.h"
+#include "../../modules/dialog_ng/dlg_load.h"
 #include "cxdx_avp.h"
 #include "cxdx_uar.h"
 #include "registration.h"
@@ -144,7 +144,7 @@ void async_cdp_uar_callback(int is_timeout, void *param, AAAMessage *uaa, long e
                         /* exec routing script */
                         init_run_actions_ctx(&ra_ctx);
                         if (run_actions(&ra_ctx, main_rt.rlist[route_uar_user_unknown_no], t->uas.request) < 0) {
-                            LM_DBG("icscf: error while trying script\n");
+                            LM_DBG("ims_icscf: error while trying script\n");
                         }
                     } else {
                         cscf_reply_transactional_async(t, t->uas.request, 403, MSG_403_USER_UNKNOWN);

modules/icscf/db.c → modules/ims_icscf/db.c

@@ -61,10 +61,10 @@
 #include "mod.h"
 
 static db_func_t dbf;						/**< db function bindings*/
-extern char * icscf_db_url;					/**< DB URL */
-extern char * icscf_db_nds_table;			/**< NDS table in DB */
-extern char * icscf_db_scscf_table;			/**< S-CSCF table in db */
-extern char * icscf_db_capabilities_table;	/**< S-CSCF capabilities table in db */
+extern char * ims_icscf_db_url;					/**< DB URL */
+extern char * ims_icscf_db_nds_table;			/**< NDS table in DB */
+extern char * ims_icscf_db_scscf_table;			/**< S-CSCF table in db */
+extern char * ims_icscf_db_capabilities_table;	/**< S-CSCF capabilities table in db */
 
 static db1_con_t *hdl_db=0;				/**< handle for the database queries */
 
@@ -74,13 +74,13 @@ static db1_con_t *hdl_db=0;				/**< handle for the database queries */
  * @param db_url - URL of the database
  * @returns 0 on success, -1 on error
  */
-int icscf_db_bind(char* db_url)
+int ims_icscf_db_bind(char* db_url)
 {
 
 	str db_url_str={db_url,strlen(db_url)};
 	
 	if (db_bind_mod(&db_url_str, &dbf) < 0) {
-		LM_ERR("icscf_db_bind: cannot bind to database module! "
+		LM_ERR("ims_icscf_db_bind: cannot bind to database module! "
 		"Did you forget to load a database module ?\n");
 		return -1;
 	}
@@ -96,7 +96,7 @@ int icscf_db_bind(char* db_url)
  * @param db_table_capabilities - name of the S-CSCF capabilities table
  * @returns 0 on success, -1 on error
  */
-int icscf_db_init(char* db_url,
+int ims_icscf_db_init(char* db_url,
 	char* db_table_nds,
 	char* db_table_scscf,
 	char* db_table_capabilities)
@@ -111,7 +111,7 @@ int icscf_db_init(char* db_url,
 	hdl_db=dbf.init(&db_url_str);
 
 	if (hdl_db==0){
-		LM_ERR("ERR:icscf_db_init: cannot initialize database connection\n");
+		LM_ERR("ERR:ims_icscf_db_init: cannot initialize database connection\n");
 		goto error;
 	}	
 
@@ -128,7 +128,7 @@ error:
 /**
  *  Close the database connection.
  */
-void icscf_db_close()
+void ims_icscf_db_close()
 {
 	if (!dbf.close) return;
 	if (hdl_db){
@@ -142,13 +142,13 @@ void icscf_db_close()
  * @param db_hdl - database handle to test
  * @returns 1 if connected, 0 if not
  */
-static inline int icscf_db_check_init(db1_con_t *db_hdl)
+static inline int ims_icscf_db_check_init(db1_con_t *db_hdl)
 {
 	if (db_hdl) return 1;
-	return (icscf_db_init( icscf_db_url,
-		icscf_db_nds_table,
-		icscf_db_scscf_table,
-		icscf_db_capabilities_table)==0);		
+	return (ims_icscf_db_init( ims_icscf_db_url,
+		ims_icscf_db_nds_table,
+		ims_icscf_db_scscf_table,
+		ims_icscf_db_capabilities_table)==0);		
 }
 
 
@@ -158,35 +158,35 @@ static str s_trusted_domain={"trusted_domain",14};
  * @param d - array of string to fill with the db contents
  * @returns 1 on success, 0 on error 
  */
-int icscf_db_get_nds(str *d[])
+int ims_icscf_db_get_nds(str *d[])
 {	
 	db_key_t   keys_ret[] = {&s_trusted_domain};
 	db1_res_t   * res = 0 ;	
-	str db_table_nds_str={icscf_db_nds_table,strlen(icscf_db_nds_table)};
+	str db_table_nds_str={ims_icscf_db_nds_table,strlen(ims_icscf_db_nds_table)};
 
 	str s;
 	int i;
 
-	if (!icscf_db_check_init(hdl_db))
+	if (!ims_icscf_db_check_init(hdl_db))
 		goto error;
 
-	LM_DBG("DBG:icscf_db_get_nds: fetching list of NDS for I-CSCF \n");
+	LM_DBG("DBG:ims_icscf_db_get_nds: fetching list of NDS for I-CSCF \n");
 
 	if (dbf.use_table(hdl_db, &db_table_nds_str)<0) {
-		LM_ERR("ERR:icscf_db_init: cannot select table \"%s\"\n",db_table_nds_str.s);
+		LM_ERR("ERR:ims_icscf_db_init: cannot select table \"%s\"\n",db_table_nds_str.s);
 		goto error;
 	}
 
 	if (dbf.query(hdl_db, 0, 0, 0, keys_ret, 0, 1, NULL, & res) < 0) {
-		LM_ERR("ERR:icscf_db_get_nds: db_query failed\n");
+		LM_ERR("ERR:ims_icscf_db_get_nds: db_query failed\n");
 		goto error;
 	}
 
 	if (res->n == 0) {
-		LM_DBG("DBG:icscf_db_get_nds: I-CSCF has no NDS trusted domains in db\n");
+		LM_DBG("DBG:ims_icscf_db_get_nds: I-CSCF has no NDS trusted domains in db\n");
 		*d=shm_malloc(sizeof(str));
 		if (*d==NULL){
-			LM_ERR("ERR:icscf_db_get_nds: failed shm_malloc for 0 domains\n");
+			LM_ERR("ERR:ims_icscf_db_get_nds: failed shm_malloc for 0 domains\n");
 			goto error;
 		}	
 		(*d)[0].s=0;
@@ -195,7 +195,7 @@ int icscf_db_get_nds(str *d[])
 	else {
 		*d=shm_malloc(sizeof(str)*(res->n+1));
 		if (*d==NULL){
-			LM_ERR("ERR:icscf_db_get_nds: failed shm_malloc for %d domains\n",
+			LM_ERR("ERR:ims_icscf_db_get_nds: failed shm_malloc for %d domains\n",
 				res->n);
 			goto error;
 		}	
@@ -204,7 +204,7 @@ int icscf_db_get_nds(str *d[])
 			s.len = strlen(s.s);
 			(*d)[i].s = shm_malloc(s.len);
 			if ((*d)[i].s==NULL) {
-				LM_ERR("ERR:icscf_db_get_nds: failed shm_malloc for %d bytes\n",
+				LM_ERR("ERR:ims_icscf_db_get_nds: failed shm_malloc for %d bytes\n",
 					s.len);
 				(*d)[i].len = 0;
 			}else{
@@ -216,7 +216,7 @@ int icscf_db_get_nds(str *d[])
 		(*d)[res->n].len=0;
 	}
 
-	LM_DBG("INF:icscf_db_get_nds: Loaded %d trusted domains\n",
+	LM_DBG("INF:ims_icscf_db_get_nds: Loaded %d trusted domains\n",
 		res->n);
 
 	dbf.free_result( hdl_db, res);
@@ -226,7 +226,7 @@ error:
 		dbf.free_result( hdl_db, res);
 	*d=shm_malloc(sizeof(str));
 	if (*d==NULL)
-		LM_ERR("ERR:icscf_db_get_nds: failed shm_malloc for 0 domains\n");
+		LM_ERR("ERR:ims_icscf_db_get_nds: failed shm_malloc for 0 domains\n");
 	else {
 		(*d)[0].s=0;
 		(*d)[0].len=0;
@@ -242,41 +242,41 @@ static str s_s_cscf_uri={"s_cscf_uri",10};
  * @param cap - array of scscf_capabilities to fill with the db contents for the S-CSCF names
  * @returns 1 on success, 0 on error 
  */
-int icscf_db_get_scscf(scscf_capabilities *cap[])
+int ims_icscf_db_get_scscf(scscf_capabilities *cap[])
 {
 
 	db_key_t   keys_ret[] = {&s_id,&s_s_cscf_uri};
 	db_key_t   key_ord = &s_id;
 	db1_res_t   * res = 0 ;	
-	str db_table_scscf_str={icscf_db_scscf_table,strlen(icscf_db_scscf_table)};
+	str db_table_scscf_str={ims_icscf_db_scscf_table,strlen(ims_icscf_db_scscf_table)};
 
 	int i;
 
 	*cap = 0;
 		
-	if (!icscf_db_check_init(hdl_db))
+	if (!ims_icscf_db_check_init(hdl_db))
 		goto error;
 
-	LM_DBG("DBG:icscf_db_get_scscf: fetching S-CSCFs \n");
+	LM_DBG("DBG:ims_icscf_db_get_scscf: fetching S-CSCFs \n");
 
 	if (dbf.use_table(hdl_db, &db_table_scscf_str)<0) {
-		LM_ERR("ERR:icscf_db_init: cannot select table \"%s\"\n",db_table_scscf_str.s);
+		LM_ERR("ERR:ims_icscf_db_init: cannot select table \"%s\"\n",db_table_scscf_str.s);
 		goto error;
 	}
 	
 	if (dbf.query(hdl_db, 0, 0, 0, keys_ret, 0, 2, key_ord, & res) < 0) {
-		LM_ERR("ERR:icscf_db_get_scscf: db_query failed\n");
+		LM_ERR("ERR:ims_icscf_db_get_scscf: db_query failed\n");
 		goto error;
 	}
 
 	if (res->n == 0) {
-		LM_ERR("ERR:icscf_db_get_scscf:  no S-CSCFs found\n");
+		LM_ERR("ERR:ims_icscf_db_get_scscf:  no S-CSCFs found\n");
 		goto error;
 	}
 	else {
 		*cap = shm_malloc(sizeof(scscf_capabilities)*res->n);
 		if (!(*cap)) {
-			LM_ERR("ERR:icscf_db_get_scscf: Error allocating %lx bytes\n",
+			LM_ERR("ERR:ims_icscf_db_get_scscf: Error allocating %lx bytes\n",
 				sizeof(scscf_capabilities)*res->n);
 			goto error;
 		}
@@ -286,7 +286,7 @@ int icscf_db_get_scscf(scscf_capabilities *cap[])
 			(*cap)[i].scscf_name.len = strlen(res->rows[i].values[1].val.string_val);
 			(*cap)[i].scscf_name.s = shm_malloc((*cap)[i].scscf_name.len);
 			if (!(*cap)[i].scscf_name.s){
-				LM_ERR("ERR:icscf_db_get_scscf: Error allocating %d bytes\n",
+				LM_ERR("ERR:ims_icscf_db_get_scscf: Error allocating %d bytes\n",
 					(*cap)[i].scscf_name.len);
 				(*cap)[i].scscf_name.len=0;
 				goto error;
@@ -314,12 +314,12 @@ static str s_capability={"capability",10};
  * @param cap - array of scscf_capabilities to fill with capabilities
  * @returns 1 on success, 0 on error 
  */
-int icscf_db_get_capabilities(scscf_capabilities *cap[],int cap_cnt)
+int ims_icscf_db_get_capabilities(scscf_capabilities *cap[],int cap_cnt)
 {
 	db_key_t   keys_ret[] = {&s_id_s_cscf,&s_capability};
 	db_key_t   key_ord = &s_id_s_cscf;
 	db1_res_t   * res = 0 ;	
-	str db_table_capabilities_str={icscf_db_capabilities_table,strlen(icscf_db_capabilities_table)};	
+	str db_table_capabilities_str={ims_icscf_db_capabilities_table,strlen(ims_icscf_db_capabilities_table)};	
 
 
 	int i,j;
@@ -327,23 +327,23 @@ int icscf_db_get_capabilities(scscf_capabilities *cap[],int cap_cnt)
 	int cnt;
 
 
-	if (!icscf_db_check_init(hdl_db))
+	if (!ims_icscf_db_check_init(hdl_db))
 		goto error;
 
-	LM_DBG("DBG:icscf_db_get_capabilities: fetching list of Capabilities for I-CSCF\n");
+	LM_DBG("DBG:ims_icscf_db_get_capabilities: fetching list of Capabilities for I-CSCF\n");
 
 	if (dbf.use_table(hdl_db, &db_table_capabilities_str)<0) {
-		LM_ERR("ERR:icscf_db_init: cannot select table \"%s\"\n",db_table_capabilities_str.s);
+		LM_ERR("ERR:ims_icscf_db_init: cannot select table \"%s\"\n",db_table_capabilities_str.s);
 		goto error;
 	}
 	
 	if (dbf.query(hdl_db, 0, 0, 0, keys_ret, 0, 2, key_ord, & res) < 0) {
-		LM_ERR("ERR:icscf_db_get_capabilities: db_query failed\n");
+		LM_ERR("ERR:ims_icscf_db_get_capabilities: db_query failed\n");
 		goto error;
 	}
 
 	if (res->n == 0) {
-		LM_DBG("DBG:icscf_db_get_capabilities: No Capabilites found... not critical...\n");
+		LM_DBG("DBG:ims_icscf_db_get_capabilities: No Capabilites found... not critical...\n");
 		return 1;
 	}
 	else {
@@ -354,7 +354,7 @@ int icscf_db_get_capabilities(scscf_capabilities *cap[],int cap_cnt)
 					cnt++;
 			(*cap)[i].capabilities = shm_malloc(sizeof(int)*cnt);
 			if (!(*cap)[i].capabilities) {
-				LM_ERR("ERR:icscf_db_get_capabilities: Error allocating %lx bytes\n",
+				LM_ERR("ERR:ims_icscf_db_get_capabilities: Error allocating %lx bytes\n",
 					sizeof(int)*cnt);
 				(*cap)[i].cnt=0;
 					goto error;
@@ -369,7 +369,7 @@ int icscf_db_get_capabilities(scscf_capabilities *cap[],int cap_cnt)
 		}
 			
 	} 
-	LM_DBG("INF:icscf_db_get_capabilities: Loaded %d capabilities for %d S-CSCFs (%d invalid entries in db)\n",
+	LM_DBG("INF:ims_icscf_db_get_capabilities: Loaded %d capabilities for %d S-CSCFs (%d invalid entries in db)\n",
 		ccnt,cap_cnt,res->n-ccnt);
 	dbf.free_result( hdl_db, res);
 	return 1;

modules/icscf/db.h → modules/ims_icscf/db.h

@@ -59,15 +59,15 @@
 #include "../../sr_module.h"
 #include "registration.h"
 
-int icscf_db_bind(char* db_url);
-int icscf_db_init(char* db_url,
+int ims_icscf_db_bind(char* db_url);
+int ims_icscf_db_init(char* db_url,
 	char* db_table_nds,
 	char* db_table_scscf,
 	char* db_table_capabilities);
-void icscf_db_close();
+void ims_icscf_db_close();
 
-int icscf_db_get_nds(str *d[]);
-int icscf_db_get_scscf(scscf_capabilities *cap[]);
-int icscf_db_get_capabilities(scscf_capabilities *cap[],int cap_cnt);
+int ims_icscf_db_get_nds(str *d[]);
+int ims_icscf_db_get_scscf(scscf_capabilities *cap[]);
+int ims_icscf_db_get_capabilities(scscf_capabilities *cap[],int cap_cnt);
 
 #endif /* I_CSCF_DB_H */

modules/dialog2/doc/Makefile → modules/ims_icscf/doc/Makefile

@@ -1,4 +1,4 @@
-docs = dialog2.xml
+docs = ims_icscf.xml
 
 docbook_dir = ../../../docbook
 include $(docbook_dir)/Makefile.module

modules/auth_ims/doc/auth_ims.xml → modules/ims_icscf/doc/ims_icscf.xml

@@ -7,7 +7,7 @@
 ]>
 <book>
   <bookinfo>
-    <title>auth_ims Module</title>
+    <title>ims_auth Module</title>
 
     <authorgroup>
       <author>
@@ -60,6 +60,6 @@
 
   <toc/>
 
-  <xi:include href="auth_ims_admin.xml"
+  <xi:include href="ims_icscf_admin.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </book>

modules/icscf/doc/icscf_admin.xml → modules/ims_icscf/doc/ims_icscf_admin.xml

@@ -12,7 +12,7 @@
   <section>
     <title>Overview</title>
 
-    <para>This module provides all functionality to build an ICSCF.</para>
+    <para>This module provides all functionality to build an IMS_ICSCF.</para>
   </section>
 
   <section>
@@ -66,7 +66,7 @@
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "name", "sip:scscf3.ims.smilecoms.com:6060")
+modparam("ims_auth", "name", "sip:scscf3.ims.smilecoms.com:6060")
 ...
 </programlisting>
       </example>
@@ -86,7 +86,7 @@ modparam("auth_ims", "name", "sip:scscf3.ims.smilecoms.com:6060")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "name", "sip:scscf3.ims.smilecoms.com:6060")
+modparam("ims_auth", "name", "sip:scscf3.ims.smilecoms.com:6060")
 ...
 </programlisting>
       </example>
@@ -106,7 +106,7 @@ modparam("auth_ims", "name", "sip:scscf3.ims.smilecoms.com:6060")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "auth_data_hash_size", 1024)
+modparam("ims_auth", "auth_data_hash_size", 1024)
 ...
 </programlisting>
       </example>
@@ -125,7 +125,7 @@ modparam("auth_ims", "auth_data_hash_size", 1024)
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "auth_vector_timeout", "domain")
+modparam("ims_auth", "auth_vector_timeout", "domain")
 ...
 </programlisting>
       </example>
@@ -143,7 +143,7 @@ modparam("auth_ims", "auth_vector_timeout", "domain")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "auth_data_timeout", 60)
+modparam("ims_auth", "auth_data_timeout", 60)
 ...
 </programlisting>
       </example>
@@ -161,7 +161,7 @@ modparam("auth_ims", "auth_data_timeout", 60)
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "av_request_at_once", 1)
+modparam("ims_auth", "av_request_at_once", 1)
 ...
 </programlisting>
       </example>
@@ -178,7 +178,7 @@ modparam("auth_ims", "av_request_at_once", 1)
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "av_request_at_sync", 1)
+modparam("ims_auth", "av_request_at_sync", 1)
 ...
 </programlisting>
       </example>
@@ -215,7 +215,7 @@ modparam("auth_ims", "av_request_at_sync", 1)
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "registration_default_algorithm", "HSS-Selected")
+modparam("ims_auth", "registration_default_algorithm", "HSS-Selected")
 ...
 </programlisting>
       </example>
@@ -234,7 +234,7 @@ modparam("auth_ims", "registration_default_algorithm", "HSS-Selected")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "load_credentials", "auth-int")
+modparam("ims_auth", "load_credentials", "auth-int")
 ...
 </programlisting>
       </example>
@@ -252,7 +252,7 @@ modparam("auth_ims", "load_credentials", "auth-int")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "cxdx_forced_peer", "hss.ims.smilecoms.com")
+modparam("ims_auth", "cxdx_forced_peer", "hss.ims.smilecoms.com")
 ...
 </programlisting>
       </example>
@@ -270,7 +270,7 @@ modparam("auth_ims", "cxdx_forced_peer", "hss.ims.smilecoms.com")
 
         <programlisting format="linespecific">
 ...
-modparam("auth_ims", "cxdx_dest_realm", "ims.smilecoms.com")
+modparam("ims_auth", "cxdx_dest_realm", "ims.smilecoms.com")
 ...
 </programlisting>
       </example>

modules/icscf/location.h → modules/ims_icscf/location.h

@@ -43,8 +43,8 @@
  * 
  */
 
-#ifndef ICSCF_LOCATION_H
-#define ICSCF_LOCATION_H
+#ifndef IMS_ICSCF_LOCATION_H
+#define IMS_ICSCF_LOCATION_H
 
 
 #include "scscf_list.h"

modules/icscf/mod.c → modules/ims_icscf/mod.c

@@ -64,12 +64,12 @@ sl_api_t slb;
 
 
 //module parameters
-char* icscf_db_url="mysql://icscf:heslo@localhost/hssdata";     /**< DB URL */
-char* icscf_db_nds_table="nds_trusted_domains";                         /**< NDS table in DB */
-char* icscf_db_scscf_table="s_cscf";                                            /**< S-CSCF table in db */
-char* icscf_db_capabilities_table="s_cscf_capabilities";        /**< S-CSCF capabilities table in db */
+char* ims_icscf_db_url="mysql://icscf:heslo@localhost/hssdata";     /**< DB URL */
+char* ims_icscf_db_nds_table="nds_trusted_domains";                         /**< NDS table in DB */
+char* ims_icscf_db_scscf_table="s_cscf";                                            /**< S-CSCF table in db */
+char* ims_icscf_db_capabilities_table="s_cscf_capabilities";        /**< S-CSCF capabilities table in db */
 
-int icscf_hash_size = 128;
+int ims_icscf_hash_size = 128;
 int scscf_entry_expiry = 300;
 
 /* parameters storage */
@@ -117,10 +117,10 @@ static param_export_t params[] = {
     {"route_lir_user_unknown", PARAM_STRING, &route_lir_user_unknown},
     {"route_uar_user_unknown", PARAM_STRING, &route_uar_user_unknown},
     {"scscf_entry_expiry", INT_PARAM, &scscf_entry_expiry},
-    {"db_url", 					STR_PARAM, &icscf_db_url},
-    {"db_nds_table", 			STR_PARAM, &icscf_db_nds_table},
-    {"db_scscf_table", 			STR_PARAM, &icscf_db_scscf_table},
-    {"db_capabilities_table", 	STR_PARAM, &icscf_db_capabilities_table},
+    {"db_url", 					STR_PARAM, &ims_icscf_db_url},
+    {"db_nds_table", 			STR_PARAM, &ims_icscf_db_nds_table},
+    {"db_scscf_table", 			STR_PARAM, &ims_icscf_db_scscf_table},
+    {"db_capabilities_table", 	STR_PARAM, &ims_icscf_db_capabilities_table},
     {"cxdx_forced_peer", STR_PARAM, &cxdx_forced_peer_s},
     {"cxdx_dest_realm", STR_PARAM, &cxdx_dest_realm_s},
     {0, 0, 0}
@@ -136,7 +136,7 @@ stat_export_t mod_stats[] = {
 
 /** module exports */
 struct module_exports exports = {
-    "icscf",
+    "ims_icscf",
     DEFAULT_DLFLAGS, /* dlopen flags */
     cmds, /* Exported functions */
     params,
@@ -180,7 +180,7 @@ static int mod_init(void) {
 #endif
 
 	/* initialising hash table*/
-	if (!i_hash_table_init(icscf_hash_size)) {
+	if (!i_hash_table_init(ims_icscf_hash_size)) {
 		LM_ERR("Error initializing the Hash Table for stored S-CSCF lists\n");
 		goto error;
 	}
@@ -205,7 +205,7 @@ static int mod_init(void) {
 
 	/* cache the trusted domain names and capabilities */
 	/* bind to the db module */
-	if (icscf_db_bind(icscf_db_url) < 0)
+	if (ims_icscf_db_bind(ims_icscf_db_url) < 0)
 		goto error;
 
 	/* bind the SL API */
@@ -214,15 +214,15 @@ static int mod_init(void) {
 		return -1;
 	}
 
-	icscf_db_init(icscf_db_url, icscf_db_nds_table, icscf_db_scscf_table,
-			icscf_db_capabilities_table);
+	ims_icscf_db_init(ims_icscf_db_url, ims_icscf_db_nds_table, ims_icscf_db_scscf_table,
+			ims_icscf_db_capabilities_table);
 
 	I_NDS_get_trusted_domains();
 	I_get_capabilities();
 
-	icscf_db_close();
+	ims_icscf_db_close();
 
-	if (!i_hash_table_init(icscf_hash_size)) {
+	if (!i_hash_table_init(ims_icscf_hash_size)) {
 		LOG(
 				L_ERR,
 				"ERR"M_NAME":mod_init: Error initializing the Hash Table for stored S-CSCF lists\n");
@@ -230,7 +230,7 @@ static int mod_init(void) {
 	}
 
 	/* register global timer used to get rid of stale scscf_lists*/
-	if (register_timer(icscf_timer_routine, 0, 60) < 0) {
+	if (register_timer(ims_icscf_timer_routine, 0, 60) < 0) {
 		LM_ERR("failed to register timer \n");
 		return -1;
 	}
@@ -239,12 +239,12 @@ static int mod_init(void) {
 	if (route_lir_user_unknown){
 		route_no=route_get(&main_rt, route_lir_user_unknown);
 		if (route_no==-1){
-			ERR("icscf: failed to fix route \"%s\": route_get() failed\n",
+			ERR("ims_icscf: failed to fix route \"%s\": route_get() failed\n",
 					route_lir_user_unknown);
 			return -1;
 		}
 		if (main_rt.rlist[route_no]==0){
-			WARN("icscf: icscf route \"%s\" is empty / doesn't exist\n",
+			WARN("ims_icscf: ims_icscf route \"%s\" is empty / doesn't exist\n",
 					route_lir_user_unknown);
 		}
 		route_lir_user_unknown_no=route_no;
@@ -253,22 +253,22 @@ static int mod_init(void) {
 	if (route_uar_user_unknown){
 		route_no=route_get(&main_rt, route_uar_user_unknown);
 		if (route_no==-1){
-			ERR("icscf: failed to fix route \"%s\": route_get() failed\n",
+			ERR("ims_icscf: failed to fix route \"%s\": route_get() failed\n",
 					route_uar_user_unknown);
 			return -1;
 		}
 		if (main_rt.rlist[route_no]==0){
-			WARN("icscf: icscf route \"%s\" is empty / doesn't exist\n",
+			WARN("ims_icscf: ims_icscf route \"%s\" is empty / doesn't exist\n",
 					route_uar_user_unknown);
 		}
 		route_uar_user_unknown_no=route_no;
 	}
 
-	LM_DBG("ICSCF module successfully initialised\n");
+	LM_DBG("ims_icscf module successfully initialised\n");
 
 	return 0;
 	error:
-	LM_ERR("Failed to initialise ICSCF module\n");
+	LM_ERR("Failed to initialise ims_icscf module\n");
 	return -1;
 }
 

modules/icscf/mod.h → modules/ims_icscf/mod.h

@@ -69,10 +69,10 @@
 #include "location.h"
 #include "../../sr_module.h"
 #include "../../modules/tm/tm_load.h"
-#include "../../modules/dialog2/dlg_load.h"
+#include "../../modules/dialog_ng/dlg_load.h"
 #include "../cdp_avp/mod_export.h"
 
-#define MOD_NAME "icscf"
+#define MOD_NAME "ims_icscf"
 
 /** Return and break the execution of routng script */
 #define CSCF_RETURN_BREAK	0 

modules/icscf/nds.c → modules/ims_icscf/nds.c

@@ -214,6 +214,6 @@ int I_NDS_get_trusted_domains()
 		}
 		shm_free(trusted_domains);
 	}
-	return icscf_db_get_nds(&trusted_domains);
+	return ims_icscf_db_get_nds(&trusted_domains);
 }
 

modules/icscf/scscf_list.c → modules/ims_icscf/scscf_list.c

@@ -75,9 +75,9 @@ int I_get_capabilities() {
         shm_free(SCSCF_Capabilities);
     }
 
-    SCSCF_Capabilities_cnt = icscf_db_get_scscf(&SCSCF_Capabilities);
+    SCSCF_Capabilities_cnt = ims_icscf_db_get_scscf(&SCSCF_Capabilities);
 
-    r = icscf_db_get_capabilities(&SCSCF_Capabilities, SCSCF_Capabilities_cnt);
+    r = ims_icscf_db_get_capabilities(&SCSCF_Capabilities, SCSCF_Capabilities_cnt);
 
     LM_DBG("DBG:------  S-CSCF Map with Capabilities  begin ------\n");
     if (SCSCF_Capabilities != 0) {
@@ -240,7 +240,7 @@ scscf_entry* new_scscf_entry(str name, int score, int orig) {
  * @param m - mandatory capabilities list requested
  * @param mcnt - mandatory capabilities list size
  * @param o - optional capabilities list
- * @param ocnt - optional capabilities list sizeint I_get_capab_match(icscf_capabilities *c,int *m,int mcnt,int *o,int ocnt)
+ * @param ocnt - optional capabilities list sizeint I_get_capab_match(ims_icscf_capabilities *c,int *m,int mcnt,int *o,int ocnt)
  * @returns - -1 if mandatory not satisfied, else count of matched optional capab
  */
 int I_get_capab_match(scscf_capabilities *c, int *m, int mcnt, int *o, int ocnt) {
@@ -530,7 +530,7 @@ int cscf_reply_transactional_async(struct cell* t, struct sip_msg *msg, int code
  * @returns the tmb.t_repy() result
  */
 
-void icscf_timer_routine() {
+void ims_icscf_timer_routine() {
     //run through scscf_list and decide if they should be removed!
     scscf_list *l, *tmp;
     int i;
@@ -538,7 +538,7 @@ void icscf_timer_routine() {
 
     int delete_list = -1;
 
-    LM_DBG("INF: ICSCF timer routine");
+    LM_DBG("INF: ims_icscf timer routine");
     //run through all entries and remove the whole list if one entry has expired
     for (i = 0; i < i_hash_size; i++) {
         i_lock(i);

modules/icscf/scscf_list.h → modules/ims_icscf/scscf_list.h

@@ -138,7 +138,7 @@ scscf_entry* new_scscf_entry(str name, int score, int orig);
  * @param m - mandatory capabilities list requested
  * @param mcnt - mandatory capabilities list size
  * @param o - optional capabilities list
- * @param ocnt - optional capabilities list sizeint I_get_capab_match(icscf_capabilities *c,int *m,int mcnt,int *o,int ocnt)
+ * @param ocnt - optional capabilities list sizeint I_get_capab_match(ims_icscf_capabilities *c,int *m,int mcnt,int *o,int ocnt)
  * @returns - -1 if mandatory not satisfied, else count of matched optional capab
  */
 int I_get_capabilities();
@@ -179,6 +179,6 @@ int cscf_reply_transactional_async(struct cell* t, struct sip_msg *msg, int code
  * @returns the tmb.t_repy() result
  */
 
-void icscf_timer_routine();
+void ims_icscf_timer_routine();
 
 #endif

modules/icscf/sip_messages.h → modules/ims_icscf/sip_messages.h

@@ -43,8 +43,8 @@
  * 
  */
   
-#ifndef ICSCF_SIP_MESSAGES_H_
-#define ICSCF_SIP_MESSAGES_H_
+#ifndef IMS_ICSCF_SIP_MESSAGES_H_
+#define IMS_ICSCF_SIP_MESSAGES_H_
 
 #define MSG_400_NO_PUBLIC_FROM "Bad Request - Public ID in P-Asserted-Identity or From header missing"
 #define MSG_400_NO_PUBLIC "Bad Request - Public ID in To header or Request-URI missing" 

modules/isc/Makefile → modules/ims_isc/Makefile

@@ -1,12 +1,12 @@
 # $Id$
 #
-# ISC make file
+# ims_isc make file
 #
 # 
 
 include ../../Makefile.defs
 auto_gen=
-NAME=isc.so
+NAME=ims_isc.so
 LIBS=
 
 DEFS += -DOPENSER_MOD_INTERFACE

modules/isc/mod.c → modules/ims_isc/mod.c

@@ -96,7 +96,7 @@ static param_export_t params[] = {
 };
 
 /** module exports */
-struct module_exports exports = {"isc", DEFAULT_DLFLAGS, /* dlopen flags */
+struct module_exports exports = {"ims_isc", DEFAULT_DLFLAGS, /* dlopen flags */
     cmds, /* Exported functions */
     params, 0, /* exported statistics */
     0, /* exported MI functions */

modules/isc/mod.h → modules/ims_isc/mod.h

@@ -49,7 +49,7 @@
 #include "../../sr_module.h"
 #include "../../modules/tm/tm_load.h"
 #include "../../qvalue.h"
-#include "../usrloc_scscf/usrloc.h"
+#include "../ims_usrloc_scscf/usrloc.h"
 
 #define STR_APPEND(dst,src)\
         {memcpy((dst).s+(dst).len,(src).s,(src).len);\

modules/registrar_pcscf/Makefile → modules/ims_registrar_pcscf/Makefile

@@ -7,7 +7,7 @@
 
 include ../../Makefile.defs
 auto_gen=
-NAME=registrar_pcscf.so
+NAME=ims_registrar_pcscf.so
 LIBS=
 
 DEFS+=-DOPENSER_MOD_INTERFACE -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2

modules/registrar_pcscf/reg_mod.c → modules/ims_registrar_pcscf/reg_mod.c

@@ -54,7 +54,7 @@
 #include "../../error.h"
 #include "../../socket_info.h"
 #include "../../pvar.h"
-#include "../usrloc_pcscf/usrloc.h"
+#include "../ims_usrloc_pcscf/usrloc.h"
 #include "../../lib/kcore/statistics.h"
 #include "../../modules/sl/sl.h"
 #include "../../mod_fix.h"
@@ -166,7 +166,7 @@ static pv_export_t mod_pvs[] = {
  * Module exports structure
  */
 struct module_exports exports = {
-	"registrar_pcscf",
+	"ims_registrar_pcscf",
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	cmds,        	/* Exported functions */
 	params,      	/* Exported parameters */
@@ -231,9 +231,9 @@ static int mod_init(void) {
 	}
 	LM_DBG("Successfully bound to TM module\n");
 
-	bind_usrloc = (bind_usrloc_t) find_export("ul_bind_usrloc_pcscf", 1, 0);
+	bind_usrloc = (bind_usrloc_t) find_export("ul_bind_ims_usrloc_pcscf", 1, 0);
 	if (!bind_usrloc) {
-		LM_ERR("can't bind usrloc_pcscf\n");
+		LM_ERR("can't bind ims_usrloc_pcscf\n");
 		return -1;
 	}
 

modules/registrar_pcscf/reg_mod.h → modules/ims_registrar_pcscf/reg_mod.h

@@ -49,7 +49,7 @@
 #include "../../parser/msg_parser.h"
 #include "../../qvalue.h"
 #include "../../usr_avp.h"
-#include "../usrloc_pcscf/usrloc.h"
+#include "../ims_usrloc_pcscf/usrloc.h"
 #include "../../modules/sl/sl.h"
 #include "../../modules/tm/tm_load.h"
 

modules/registrar_pcscf/save.h → modules/ims_registrar_pcscf/save.h

@@ -47,7 +47,7 @@
 #define SAVE_H
 
 #include "../../parser/msg_parser.h"
-#include "../../modules/usrloc_pcscf/usrloc.h"
+#include "../../modules/ims_usrloc_pcscf/usrloc.h"
 #include "../../lib/ims/ims_getters.h"
 
 /*! \brief

modules/registrar_pcscf/service_routes.h → modules/ims_registrar_pcscf/service_routes.h

@@ -24,7 +24,7 @@
 #define SERVICE_ROUTES_H
 
 #include "../../parser/msg_parser.h"
-#include "../usrloc_pcscf/usrloc.h"
+#include "../ims_usrloc_pcscf/usrloc.h"
 
 /**
  * Check, if a user-agent follows the indicated service-routes

modules/registrar_pcscf/ul_callback.h → modules/ims_registrar_pcscf/ul_callback.h

@@ -47,7 +47,7 @@
 #ifndef UL_CALLBACK_H_
 #define UL_CALLBACK_H_
 
-#include "../usrloc_pcscf/usrloc.h"
+#include "../ims_usrloc_pcscf/usrloc.h"
 //#include "../../modules_k/pua/pua_bind.h"
 
 //extern pua_api_t pua;

modules/registrar_scscf/Makefile → modules/ims_registrar_scscf/Makefile

@@ -7,7 +7,7 @@
 
 include ../../Makefile.defs
 auto_gen=
-NAME=registrar_scscf.so
+NAME=ims_registrar_scscf.so
 LIBS=
 
 DEFS+=-DOPENSER_MOD_INTERFACE