Cleanup the access control slightly.

g4klx · g4klx · commit 517d6a84f59e · 2017-07-16T19:31:27.000+01:00
diff --git a/DMRAccessControl.cpp b/DMRAccessControl.cpp
@@ -49,8 +49,10 @@ void CDMRAccessControl::init(const std::vector<unsigned int>& blacklist, const s
 bool CDMRAccessControl::validateSrcId(unsigned int id)
 {
 	if (m_selfOnly) {
-		if (m_id > 9999999U)									// Check that the Config DMR-ID is bigger than 7 digits
-			return (id == m_id / 10U) || (id == m_id / 100U);	// Does RF ID match Config ID / 10 or Config ID / 100
+		if (m_id > 99999999U)			// Check that the Config DMR-ID is bigger than 8 digits
+			return id == m_id / 100U;	// Does RF ID match Config ID / 100
+		else if (m_id > 9999999U)		// Check that the Config DMR-ID is bigger than 7 digits
+			return id == m_id / 10U;	// Does RF ID match Config ID / 10
 		else
 			return id == m_id;
 	}	

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,10 @@ void CDMRAccessControl::init(const std::vector<unsigned int>& blacklist, const s`
`49`	`49`	`bool CDMRAccessControl::validateSrcId(unsigned int id)`
`50`	`50`	`{`
`51`	`51`	`if (m_selfOnly) {`
`52`		`- if (m_id > 9999999U) // Check that the Config DMR-ID is bigger than 7 digits`
`53`		`- return (id == m_id / 10U) \|\| (id == m_id / 100U); // Does RF ID match Config ID / 10 or Config ID / 100`
	`52`	`+ if (m_id > 99999999U) // Check that the Config DMR-ID is bigger than 8 digits`
	`53`	`+ return id == m_id / 100U; // Does RF ID match Config ID / 100`
	`54`	`+ else if (m_id > 9999999U) // Check that the Config DMR-ID is bigger than 7 digits`
	`55`	`+ return id == m_id / 10U; // Does RF ID match Config ID / 10`
`54`	`56`	`else`
`55`	`57`	`return id == m_id;`
`56`	`58`	`}`