Default config.xml changes

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@227 09dcff7a-b715-0410-9601-b79a96267cd0

3 files changed, 33 insertions, 7 deletions

diff --git a/distribution/orkaudio-win32-binary/config.xml b/distribution/orkaudio-win32-binary/config.xml
index 29f2ccd..0c858a8 100644
--- a/distribution/orkaudio-win32-binary/config.xml
+++ b/distribution/orkaudio-win32-binary/config.xml
@@ -1,4 +1,7 @@
 <config>
+	<!-- This is an example configuration file for the Oreka orkaudio capture service on Windows -->
+	<!-- Copy this to config.xml and modify according to taste -->
+
 	<AudioOutputPath>./AudioRecordings</AudioOutputPath>
 
 	<!-- Uncomment the plugin you want to use -->
@@ -23,9 +26,16 @@
 	<AudioSegmentDuration>10</AudioSegmentDuration>
 	
 	<VoIpPlugin>
-		<!-- Microsoft Windows style network device. Use this if you want to force capture from a given device. -->
+		<!-- Use this if you want to force capture from a given list of devices. -->
 		<!-- All available devices are listed in orkaudio.log when the service is starting -->
-		<!--<Device>\Device\NPF_{E0E496FA-DABF-47C1-97C2-DD914DFD3354}</Device>-->
+		<!--<Devices>\Device\NPF_{E0E496FA-DABF-47C1-97C2-DD914DFD3354}, \Device\NPF_{ADE496FA-DABF-47C1-97C2-DD914DFDAB38}</Devices>-->
+		
+		<!-- If AllowedIpRanges is used, only packets with *both* source and destination -->
+		<!-- matching the list are retained -->
+		<!--<AllowedIpRanges>212.125.143.0/24, 82.150.0.0/16, 82.199.64.133</AllowedIpRanges>-->
+		<!-- If BlockedIpRanges is used, packets with *either* source or destination -->
+		<!-- matching the list are dropped -->
+		<!--<BlockedIpRanges>212.125.143.0/24, 82.150.0.0/16, 82.199.64.133</BlockedIpRanges>-->				
 		
 		<!-- LanMasks can be ignored if you have standard LAN addresses (192.168.x.x or 10.x.x.x) -->
 		<!-- LanMasks might be used to determine the direction of a call (incoming or outgoing into or from the LAN) -->
diff --git a/orkaudio/config-linux-template.xml b/orkaudio/config-linux-template.xml
index e73d636..d98d844 100644
--- a/orkaudio/config-linux-template.xml
+++ b/orkaudio/config-linux-template.xml
@@ -15,7 +15,7 @@
 	<StorageAudioFormat>gsm</StorageAudioFormat>
 
 	<!-- If you want to keep native audio files as well as compressed, change this to "no" -->
-	<DeleteNativeFile>yes</DeleteNativeFile>
+	<DeleteNativeFile>yes</DeleteNativeFile>	
 
 	<NumBatchThreads></NumBatchThreads>
 
@@ -26,10 +26,19 @@
 	<AudioSegmentation>false</AudioSegmentation>
 	<AudioSegmentDuration>10</AudioSegmentDuration>
 	
+	<BatchProcessingEnhancePriority>true</BatchProcessingEnhancePriority>	
+	
 	<VoIpPlugin>
-		<!-- Unix style network device. Use this if you want to force capture from a given device. -->
+		<!-- Use this if you want to force capture from a given list of devices. -->
 		<!-- All available devices are listed in /etc/orkaudio/orkaudio.log when the service is starting -->
-		<!--<Device>eth0</Device>-->
+		<!--<Devices>eth1, eth2</Devices>-->
+		
+		<!-- If AllowedIpRanges is used, only packets with *both* source and destination -->
+		<!-- matching the list are retained -->
+		<!--<AllowedIpRanges>212.125.143.0/24, 82.150.0.0/16, 82.199.64.133</AllowedIpRanges>-->
+		<!-- If BlockedIpRanges is used, packets with *either* source or destination -->
+		<!-- matching the list are dropped -->
+		<!--<BlockedIpRanges>212.125.143.0/24, 82.150.0.0/16, 82.199.64.133</BlockedIpRanges>-->		
 		
 		<!-- LanMasks can be ignored if you have standard LAN addresses (192.168.x.x or 10.x.x.x) -->
 		<!-- LanMasks might be used to determine the direction of a call (incoming or outgoing into or from the LAN) -->
diff --git a/orkaudio/config-template.xml b/orkaudio/config-template.xml
index ae5ae83..0c858a8 100644
--- a/orkaudio/config-template.xml
+++ b/orkaudio/config-template.xml
@@ -26,9 +26,16 @@
 	<AudioSegmentDuration>10</AudioSegmentDuration>
 	
 	<VoIpPlugin>
-		<!-- Microsoft Windows style network device. Use this if you want to force capture from a given device. -->
+		<!-- Use this if you want to force capture from a given list of devices. -->
 		<!-- All available devices are listed in orkaudio.log when the service is starting -->
-		<!--<Device>\Device\NPF_{E0E496FA-DABF-47C1-97C2-DD914DFD3354}</Device>-->
+		<!--<Devices>\Device\NPF_{E0E496FA-DABF-47C1-97C2-DD914DFD3354}, \Device\NPF_{ADE496FA-DABF-47C1-97C2-DD914DFDAB38}</Devices>-->
+		
+		<!-- If AllowedIpRanges is used, only packets with *both* source and destination -->
+		<!-- matching the list are retained -->
+		<!--<AllowedIpRanges>212.125.143.0/24, 82.150.0.0/16, 82.199.64.133</AllowedIpRanges>-->
+		<!-- If BlockedIpRanges is used, packets with *either* source or destination -->
+		<!-- matching the list are dropped -->
+		<!--<BlockedIpRanges>212.125.143.0/24, 82.150.0.0/16, 82.199.64.133</BlockedIpRanges>-->				
 		
 		<!-- LanMasks can be ignored if you have standard LAN addresses (192.168.x.x or 10.x.x.x) -->
 		<!-- LanMasks might be used to determine the direction of a call (incoming or outgoing into or from the LAN) -->