topology_hiding: document callid not changed without dialog

(cherry picked from commit 4c25fc7)

modules/topology_hiding/README

@@ -10,7 +10,7 @@ Vlad Paiu
 
    <vladpaiu@opensips.org>
 
-   Copyright © 2015 OpenSIPs Foundation
+   Copyright � 2015 OpenSIPs Foundation
    Revision History
    Revision $Revision: 1 $ $Date$
      __________________________________________________________
@@ -74,7 +74,7 @@ Chapter 1. Admin Guide
 
    The following modules must be loaded before this module:
      * TM - Transaction Module.
-     * Dialog Module, if “force_dialog” module parameter is
+     * Dialog Module, if "force_dialog" module parameter is
        enabled, or a dialog is created from the configuration
        script.
 
@@ -91,7 +91,7 @@ Chapter 1. Admin Guide
    The string password that will be used for encoding/decoding the
    callid in case of topology_hiding with callid mangling.
 
-   Default value is “"OpenSIPS"”
+   Default value is ""OpenSIPS""
 
    Example 1.1. Set th_callid_passwd parameter
 ...
@@ -105,7 +105,7 @@ modparam("topology_hiding", "th_callid_passwd", "my_topo_hiding_secret")
    this value in case your SIP path contains multiple OpenSIPS
    boxes with topology hiding.
 
-   Default value is “"DLGCH_"”
+   Default value is ""DLGCH_""
 
    Example 1.2. Set th_callid_prefix parameter
 ...
@@ -119,7 +119,7 @@ modparam("topology_hiding", "th_callid_prefix", "MYCALLIDPREFIX_")
    be used when end-to-end functionality uses such Contact URI
    parameters.
 
-   Default value is “empty” - do not pass any parameters
+   Default value is "empty" - do not pass any parameters
 
    Example 1.3. Set th_passed_contact_uri_params parameter
 ...
@@ -134,7 +134,7 @@ myparam;custom_param")
    To be used when end-to-end functionality uses such Contact
    header parameters.
 
-   Default value is “empty” - do not pass any parameters
+   Default value is "empty" - do not pass any parameters
 
    Example 1.4. Set th_passed_contact_params parameter
 ...
@@ -148,7 +148,7 @@ ram;custom_param")
    not already created ). This will only work for INVITE based
    dialogs, and the dialog module must be loaded.
 
-   Default value is “0”
+   Default value is "0"
 
    Example 1.5. Set force_dialog parameter
 ...
@@ -163,7 +163,7 @@ modparam("topology_hiding", "force_dialog", 1)
    Contact URI param. The parameter configures the string password
    that will be used for encoding/decoding that specific param .
 
-   Default value is “"ToPoCtPaSS"”
+   Default value is ""ToPoCtPaSS""
 
    Example 1.6. Set th_callid_passwd parameter
 ...
@@ -179,7 +179,7 @@ modparam("topology_hiding", "th_contact_encode_passwd", "my_topoh_passwd
    Contact URI param. The parameter configures the respective
    parameter name.
 
-   Default value is “"thinfo"”
+   Default value is ""thinfo""
 
    Example 1.7. Set th_callid_passwd parameter
 ...
@@ -230,6 +230,10 @@ modparam("topology_hiding", "th_contact_encode_param", "customparam")
        variables related to the callid will represent the callid
        value for the caller side. If the callid for the callee
        side is needed, refer to the $TH_callee_callid pvar.
+       Note: Changing the callid of the call using the "C" flag is
+       only available when doing topology_hiding with dialog
+       support. Using this flag without dialog support will not
+       change the callid at all!.
 
    Example 1.8. topology_hiding usage
 ...

modules/topology_hiding/doc/topology_hiding_admin.xml

@@ -241,6 +241,11 @@ modparam("topology_hiding", "th_contact_encode_param", "customparam")
 					<para>
 					When using the "C" flag, the callid will be automatically encoded / decoded, transparent for the script writer - inside OpenSIPS (script,MI functions, etc ) all the variables related to the callid will represent the callid value for the caller side. If the callid for the callee side is needed, refer to the $TH_callee_callid pvar.
 					</para>
+					<para>
+						<emphasis>Note:</emphasis> Changing the callid of the call using the "C" flag is only
+						available when doing topology_hiding with <emphasis>dialog support</emphasis>. Using this
+						flag without dialog support will not change the callid at all!.
+					</para>
 				</listitem>
 			</itemizedlist>
 		</para>

modules/topology_hiding/topo_hiding_logic.c

@@ -920,6 +920,11 @@ static int topo_hiding_no_dlg(struct sip_msg *req,struct cell* t,int extra_flags
 	else
 		used_cb = th_no_dlg_onreply;
 
+	if (extra_flags & TOPOH_HIDE_CALLID)
+		LM_WARN("Cannot hide callid when dialog support is not engaged!\n");
+	if (extra_flags & TOPOH_DID_IN_USER)
+		LM_WARN("Cannot store DID in user when dialog support is not engaged!\n");
+
 	if (tm_api.register_tmcb( req, 0, TMCB_RESPONSE_FWDED,
 	used_cb,NULL, NULL)<0 ) {
 		LM_ERR("failed to register TMCB\n");