From bbd4bcb4c972f6df43c40b119419abcea3daad21 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Wed, 17 May 2023 00:42:48 -0500
Subject: mdns: T5227: Add support for browse domains and service filters

Allow listing additional browse domains (in addition to the default
'local') so that custom domains can be reflected.

Additionally, allow filtering the services that are allowed to be
reflected across multiple (V)LANs.
---
 data/templates/mdns-repeater/avahi-daemon.j2       |  6 +++++
 interface-definitions/service-mdns-repeater.xml.in | 26 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/data/templates/mdns-repeater/avahi-daemon.j2 b/data/templates/mdns-repeater/avahi-daemon.j2
index 65bb5a306..3aaa7fc82 100644
--- a/data/templates/mdns-repeater/avahi-daemon.j2
+++ b/data/templates/mdns-repeater/avahi-daemon.j2
@@ -2,6 +2,9 @@
 use-ipv4=yes
 use-ipv6=yes
 allow-interfaces={{ interface | join(', ') }}
+{% if browse_domain is vyos_defined and browse_domain | length %}
+browse-domains={{ browse_domain | join(', ') }}
+{% endif %}
 disallow-other-stacks=no
 
 [wide-area]
@@ -16,3 +19,6 @@ publish-workstation=no
 
 [reflector]
 enable-reflector=yes
+{% if allow_service is vyos_defined and allow_service | length %}
+reflect-filters={{ allow_service | join(', ') }}
+{% endif %}
diff --git a/interface-definitions/service-mdns-repeater.xml.in b/interface-definitions/service-mdns-repeater.xml.in
index 9a94f1488..2cd92dbf2 100644
--- a/interface-definitions/service-mdns-repeater.xml.in
+++ b/interface-definitions/service-mdns-repeater.xml.in
@@ -15,6 +15,32 @@
             <children>
               #include <include/generic-disable-node.xml.i>
               #include <include/generic-interface-multi.xml.i>
+              <leafNode name="browse-domain">
+                <properties>
+                  <help>mDNS browsing domains in addition to the default one</help>
+                  <valueHelp>
+                    <format>txt</format>
+                    <description>mDNS browsing domain</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="fqdn"/>
+                  </constraint>
+                  <multi/>
+                </properties>
+              </leafNode>
+              <leafNode name="allow-service">
+                <properties>
+                  <help>Allowed mDNS services to be repeated</help>
+                  <valueHelp>
+                    <format>txt</format>
+                    <description>mDNS service</description>
+                  </valueHelp>
+                  <constraint>
+                    #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
+                  </constraint>
+                  <multi/>
+                </properties>
+              </leafNode>
               <leafNode name="vrrp-disable">
                 <properties>
                   <help>Disables mDNS repeater on VRRP interfaces not in MASTER state</help>
-- 
cgit v1.2.3