From 08488bbf3a1daf2bf600781cedce793c976efe30 Mon Sep 17 00:00:00 2001
From: Simon <simon@adlem.net>
Date: Sun, 10 Jul 2016 21:39:58 +0100
Subject: [PATCH] Additions to support separate network/rf access control

---
 MMDVM.ini      | 12 ++++++++----
 README.DMR_ACL | 14 +++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/MMDVM.ini b/MMDVM.ini
index 494a87b..f9a7f64 100644
--- a/MMDVM.ini
+++ b/MMDVM.ini
@@ -59,10 +59,14 @@ LookupFile=DMRIds.dat
 CallHang=3
 TXHang=4
 #Blacklist=
-#DstIdBlackListSlot1=
-#DstIdBlackListSlot2=
-#DstIdWhiteListSlot1=
-#DstIdWhiteListSlot2=
+#DstIdBlackListSlot1RF=
+#DstIdBlackListSlot2RF=
+#DstIdWhiteListSlot1RF=
+#DstIdWhiteListSlot2RF=
+#DstIdBlackListSlot1NET=
+#DstIdBlackListSlot2NET=
+#DstIdWhiteListSlot1NET=
+#DstIdWhiteListSlot2NET=
 
 [System Fusion]
 Enable=1
diff --git a/README.DMR_ACL b/README.DMR_ACL
index 9fb7a58..a4eccc2 100644
--- a/README.DMR_ACL
+++ b/README.DMR_ACL
@@ -1,10 +1,14 @@
 To use DMR Access Control you can add the following fields to your MMDVM.ini:
 
 Blacklist= <comma separated list of source-id's to block on RF>
-DstIdBlackListSlot1= <comma separated list TGs to block on RF and Network Slot1>
-DstIdBlackListSlot2= <comma separated list TGs to block on RF and Network Slot1>
-DstIdWhiteListSlot1= <comma separated list TGs to allow on RF and Network Slot1> 
-DstIdWhiteListSlot2= <comma separated list TGs to allow on RF and Network Slot1>
+DstIdBlackListSlot1RF= <comma separated list TGs to block on RF Slot1>
+DstIdBlackListSlot2RF= <comma separated list TGs to block on RF Slot2>
+DstIdWhiteListSlot1RF= <comma separated list TGs to allow on RF Slot1> 
+DstIdWhiteListSlot2RF= <comma separated list TGs to allow on RF Slot2>
+DstIdBlackListSlot1NET= <comma separated list TGs to block on NET Slot1>
+DstIdBlackListSlot2NET= <comma separated list TGs to block on NET Slot2>
+DstIdWhiteListSlot1NET= <comma separated list TGs to allow on NET Slot1> 
+DstIdWhiteListSlot2NET= <comma separated list TGs to allow on NET Slot2>
 
 So, for example:
 
@@ -24,5 +28,5 @@ You can use the blacklist with the whitelist if you want to specifically block I
 
 For example, to block users from disconnecting the reflectors, you could block ID 4000.
 
-To block users connecting to reflector 4400 you could add ID 4400 to the blacklist for that slot. 
+To block users connecting to reflector 4400 you could add ID 4400 to the network blacklist for that slot.