From 2ea284dca898b7f8b13967a443130f0ee8592658 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 29 Aug 2012 15:41:29 -0400
Subject: Add options to Avahi to selectively disable IPv6 (and IPv4)

---
 config/avahi/avahi.inc |  6 ++++--
 config/avahi/avahi.xml | 12 ++++++++++++
 pkg_config.8.xml       |  2 +-
 pkg_config.8.xml.amd64 |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc
index f848763d..7b093276 100644
--- a/config/avahi/avahi.inc
+++ b/config/avahi/avahi.inc
@@ -86,6 +86,8 @@ function avahi_write_config() {
 	$enable = $config['installedpackages']['avahi']['config'][0]['enable'];
 	$browsedomains = $config['installedpackages']['avahi']['config'][0]['browsedomains'];
 	$denyif = $config['installedpackages']['avahi']['config'][0]['denyinterfaces'];
+	$useipv4 = ($config['installedpackages']['avahi']['config'][0]['disable_ipv4']) ? "no" : "yes";
+	$useipv6 = ($config['installedpackages']['avahi']['config'][0]['disable_ipv6']) ? "no" : "yes";
 
 	// No supplied domains?  Use the defaults.
 	if(!$browsedomains)
@@ -116,8 +118,8 @@ host-name={$hostname}
 domain-name={$domain}
 browse-domains="{$browsedomains}"
 deny-interfaces={$denyinterfaces}
-use-ipv4=yes
-use-ipv6=yes
+use-ipv4={$useipv4}
+use-ipv6={$useipv6}
 enable-dbus=no
 #check-response-ttl=no
 #use-iff-running=no
diff --git a/config/avahi/avahi.xml b/config/avahi/avahi.xml
index 339e9dec..ef229af1 100644
--- a/config/avahi/avahi.xml
+++ b/config/avahi/avahi.xml
@@ -68,6 +68,18 @@
 			<type>interfaces_selection</type>
 			<multiple>true</multiple>
 		</field>
+		<field>
+			<fielddescr>Disable IPv6</fielddescr>
+			<fieldname>disable_ipv6</fieldname>
+			<description>Disable IPv6 support in Avahi</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Disable IPv4</fielddescr>
+			<fieldname>disable_ipv4</fieldname>
+			<description>Disable IPv4 support in Avahi</description>
+			<type>checkbox</type>
+		</field>
 	</fields>
 	<additional_files_needed>
 		<prefix>/root/</prefix>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 3418051e..fd22198f 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -256,7 +256,7 @@
 		</build_pbi>
 		<depends_on_package>avahi-app-0.6.29_1.tbz</depends_on_package>
 		<depends_on_package_pbi>avahi-0.6.29-i386.pbi</depends_on_package_pbi>
-		<version>0.6.29 pkg v1.01</version>
+		<version>0.6.29 pkg v1.02</version>
 		<status>ALPHA</status>
 		<required_version>1.2.3</required_version>
 		<config_file>http://www.pfsense.com/packages/config/avahi/avahi.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index b378433b..dcdd2fe4 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -243,7 +243,7 @@
 		</build_pbi>
 		<depends_on_package>avahi-0.6.29.tbz</depends_on_package>
 		<depends_on_package_pbi>avahi-0.6.29-amd64.pbi</depends_on_package_pbi>
-		<version>0.6.29 pkg v1.01</version>
+		<version>0.6.29 pkg v1.02</version>
 		<status>ALPHA</status>
 		<required_version>1.2.3</required_version>
 		<config_file>http://www.pfsense.com/packages/config/avahi/avahi.xml</config_file>
-- 
cgit v1.2.3