From adc360b042321b87279080331c4c0caa55caa79a Mon Sep 17 00:00:00 2001
From: Simon <simon@adlem.net>
Date: Sun, 10 Jul 2016 17:48:09 +0100
Subject: [PATCH] Add network bool value to validateAccess

---
 DMRAccessControl.cpp | 5 +++--
 DMRAccessControl.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/DMRAccessControl.cpp b/DMRAccessControl.cpp
index 2e38481..5cd8457 100644
--- a/DMRAccessControl.cpp
+++ b/DMRAccessControl.cpp
@@ -111,9 +111,10 @@ bool DMRAccessControl::validateSrcId(unsigned int id)
 	}
 }
 
-bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot) 
+bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network) 
 {
-    if (!DMRAccessControl::validateSrcId(src_id)) {
+    // source ID validation is only applied to RF traffic 
+    if (!network && !DMRAccessControl::validateSrcId(src_id)) {
 	 LogMessage("DMR Slot %u, invalid access attempt from %u (blacklisted)", slot, src_id);
 	 return false;
     
diff --git a/DMRAccessControl.h b/DMRAccessControl.h
index 8bc1449..9aa8eef 100644
--- a/DMRAccessControl.h
+++ b/DMRAccessControl.h
@@ -24,7 +24,7 @@ public:
 	
 	static bool validateSrcId(unsigned int id);
 	
-	static bool validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot);
+	static bool validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network);
 	
  	static void init(const std::vector<unsigned int>& DstIdBlacklistSlot1, const std::vector<unsigned int>& DstIdWhitelistSlot1, const std::vector<unsigned int>& DstIdBlacklistSlot2, const std::vector<unsigned int>& DstIdWhitelistSlot2, const std::vector<unsigned int>& SrcIdBlacklist, bool selfOnly, const std::vector<unsigned int>& prefixes,unsigned int id);