From 174e729e3400f0d5403eb5b1676c9519bc15598c Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 31 May 2011 16:01:00 -0400
Subject: Add toggles to the ntop settings for merging interfaces and for ipv4
 only, default to the old behavior (no merging, v4 only.)

---
 config/ntop2/ntop.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/ntop2/ntop.xml b/config/ntop2/ntop.xml
index d5eaab0e..3f603dc9 100644
--- a/config/ntop2/ntop.xml
+++ b/config/ntop2/ntop.xml
@@ -92,6 +92,16 @@
 			<value>lan</value>
 			<multiple>true</multiple>
 		</field>
+		<field>
+			<fielddescr>Allow merging interfaces&lt;br&gt;(Def: Do not merge)</fielddescr>
+			<fieldname>allowmerge</fieldname>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Track all traffic&lt;br&gt;(Def: IPv4 only)</fielddescr>
+			<fieldname>alltraffic</fieldname>
+			<type>checkbox</type>
+		</field>
 	</fields>
 	<custom_php_global_functions>
 	<![CDATA[
@@ -115,6 +125,8 @@
 		if($ntop_config['password'] and $ntop_config['passwordagain']) {
 			if($ntop_config['password'] == $ntop_config['passwordagain']) {
 				$first = 0;
+				$mergeifs = ($ntop_config['allowmerge'] == "on") ? "" : "-M";
+				$alltraffic = ($ntop_config['alltraffic'] == "on") ? "" : "--ipv4";
 				foreach($ntop_config['interface_array'] as $iface) {
 				$if = convert_friendly_interface_to_real_interface_name($iface);
 				if($if) {
@@ -125,7 +137,7 @@
 				}
 				}
 				exec("/usr/local/bin/ntop --set-admin-password=" . $ntop_config['password'] . " &", $ntopout);
-				$start = "/usr/local/bin/ntop -i " . $ifaces_final . " -u root -d --ipv4 -M -x 8102 -X 8192 &";
+				$start = "/usr/local/bin/ntop -i {$ifaces_final} -u root -d {$alltraffic} {$mergeifs} -x 8102 -X 8192 &";
 				write_rcfile(array(
 							"file" => "ntop.sh",
 							"start" => $start,
-- 
cgit v1.2.3