From b14924bd645c9ca7ac3e723029cc9050cea195e8 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 8 Feb 2018 12:29:56 -0800
Subject: [PATCH] New macros - Tuomo Soini

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Macros/macro.Apcupsd     |  9 +++++++++
 Shorewall/Macros/macro.FreeIPA     | 16 ++++++++++++++++
 Shorewall/Macros/macro.Kpasswd     | 10 ++++++++++
 Shorewall/Macros/macro.RedisSecure |  9 +++++++++
 Shorewall/Macros/macro.Rwhois      |  9 +++++++++
 Shorewall/Macros/macro.SSDP        |  9 +++++++++
 Shorewall/Macros/macro.SSDPServer  |  9 +++++++++
 7 files changed, 71 insertions(+)
 create mode 100644 Shorewall/Macros/macro.Apcupsd
 create mode 100644 Shorewall/Macros/macro.FreeIPA
 create mode 100644 Shorewall/Macros/macro.Kpasswd
 create mode 100644 Shorewall/Macros/macro.RedisSecure
 create mode 100644 Shorewall/Macros/macro.Rwhois
 create mode 100644 Shorewall/Macros/macro.SSDP
 create mode 100644 Shorewall/Macros/macro.SSDPServer

diff --git a/Shorewall/Macros/macro.Apcupsd b/Shorewall/Macros/macro.Apcupsd
new file mode 100644
index 000000000..18f929c2f
--- /dev/null
+++ b/Shorewall/Macros/macro.Apcupsd
@@ -0,0 +1,9 @@
+#
+# Shorewall -- /usr/share/shorewall/macro.Apcupsd
+#
+# This macro handles apcupsd traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER
+
+PARAM	-	-	tcp	3551
diff --git a/Shorewall/Macros/macro.FreeIPA b/Shorewall/Macros/macro.FreeIPA
new file mode 100644
index 000000000..a2d893551
--- /dev/null
+++ b/Shorewall/Macros/macro.FreeIPA
@@ -0,0 +1,16 @@
+#
+# Shorewall -- /usr/share/shorewall/macro.FreeIPA
+#
+# This macro handles FreeIPA server traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER
+
+DNS
+HTTP
+HTTPS
+Kerberos
+Kpasswd
+LDAP
+LDAPS
+NTP
diff --git a/Shorewall/Macros/macro.Kpasswd b/Shorewall/Macros/macro.Kpasswd
new file mode 100644
index 000000000..f2b36b121
--- /dev/null
+++ b/Shorewall/Macros/macro.Kpasswd
@@ -0,0 +1,10 @@
+#
+# Shorewall -- /usr/share/shorewall/macro.Kpasswd
+#
+# This macro handles Kerberos "passwd" traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER
+
+PARAM	-	-	tcp	464
+PARAM	-	-	udp	464
diff --git a/Shorewall/Macros/macro.RedisSecure b/Shorewall/Macros/macro.RedisSecure
new file mode 100644
index 000000000..25f8a3f05
--- /dev/null
+++ b/Shorewall/Macros/macro.RedisSecure
@@ -0,0 +1,9 @@
+#
+# Shorewall -- /usr/share/shorewall/macro.RedisSecure
+#
+# This macro handles Redis Secure (SSL/TLS) traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER
+
+PARAM	-	-	tcp	6380
diff --git a/Shorewall/Macros/macro.Rwhois b/Shorewall/Macros/macro.Rwhois
new file mode 100644
index 000000000..4decf1887
--- /dev/null
+++ b/Shorewall/Macros/macro.Rwhois
@@ -0,0 +1,9 @@
+#
+# Shorewall -- /usr/share/shorewall/macro.Rwhois
+#
+# This macro handles Remote Who Is (rwhois) traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER
+
+PARAM	-	-	tcp	4321
diff --git a/Shorewall/Macros/macro.SSDP b/Shorewall/Macros/macro.SSDP
new file mode 100644
index 000000000..2507f7ce3
--- /dev/null
+++ b/Shorewall/Macros/macro.SSDP
@@ -0,0 +1,9 @@
+#
+# Shorewall -- /usr/share/shorewall/macro.SSDP
+#
+# This macro handles SSDP (used by DLNA/UPnP) client traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER
+
+PARAM	-	-	udp	1900
diff --git a/Shorewall/Macros/macro.SSDPServer b/Shorewall/Macros/macro.SSDPServer
new file mode 100644
index 000000000..2507f7ce3
--- /dev/null
+++ b/Shorewall/Macros/macro.SSDPServer
@@ -0,0 +1,9 @@
+#
+# Shorewall -- /usr/share/shorewall/macro.SSDP
+#
+# This macro handles SSDP (used by DLNA/UPnP) client traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER
+
+PARAM	-	-	udp	1900