Merge pull request #1703 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-11748 to master

* commit '47b2be3d':
  FS-11748 [mod_kazoo] better handling of interaction-id

src/mod/event_handlers/mod_kazoo/kazoo.conf.xml

@@ -903,7 +903,7 @@
 							value="Application-Response|variable_originate_disposition|variable_endpoint_disposition|#NONE" />
 						<field name="Disposition" type="first-of"
 							value="variable_originate_disposition|variable_endpoint_disposition" />
-						<field name="variable_last_bridge_hangup_cause" as="Bridge-Hangup-Cause" />
+						<field name="Bridge-Hangup-Cause" type="first-of" value="variable_last_bridge_hangup_cause|variable_bridge_hangup_cause" />
 						<field name="debug-call" type="reference" />
 					</fields>
 

src/mod/event_handlers/mod_kazoo/kazoo_ei.h

@@ -188,6 +188,7 @@ struct globals_s {
 	char **profile_vars_prefixes;
 	char **kazoo_var_prefixes;
 
+	int tweaks_restore_caller_id;
 };
 typedef struct globals_s globals_t;
 extern globals_t kazoo_globals;

src/mod/event_handlers/mod_kazoo/kazoo_ei_config.c

@@ -114,6 +114,7 @@ switch_status_t kazoo_ei_config(switch_xml_t cfg) {
 	kazoo_globals.io_fault_tolerance = 10;
 	kazoo_globals.json_encoding = ERLANG_TUPLE;
 	kazoo_globals.enable_legacy = SWITCH_FALSE;
+	kazoo_globals.tweaks_restore_caller_id = SWITCH_TRUE;
 
 
 	if ((child = switch_xml_child(cfg, "settings"))) {
@@ -188,6 +189,9 @@ switch_status_t kazoo_ei_config(switch_xml_t cfg) {
 			} else if (!strcmp(var, "enable-legacy")) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set enable-legacy: %s\n", val);
 				kazoo_globals.enable_legacy = switch_true(val);
+			} else if (!strcmp(var, "tweaks-restore-caller-id")) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set tweaks-restore-caller-id: %s\n", val);
+				kazoo_globals.tweaks_restore_caller_id = switch_true(val);
 			}
 		}
 	}