Add a rudimentary block list.

YSFReflector/BlockList.cpp

@@ -0,0 +1,137 @@
+/*
+ *   Copyright (C) 2021 by Jonathan Naylor G4KLX
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "BlockList.h"
+#include "YSFDefines.h"
+#include "Log.h"
+
+#include <algorithm>
+
+#include <cstdio>
+#include <cassert>
+
+const int BUFFER_SIZE = 500;
+
+CBlockList::CBlockList(const std::string& file, unsigned int time) :
+m_file(file),
+m_time(time),
+m_callsigns(),
+m_timer(1000U, time * 60U),
+m_checksum(0U)
+{
+}
+
+CBlockList::~CBlockList()
+{
+}
+
+bool CBlockList::start()
+{
+	loadFile();
+
+	m_timer.start();
+
+	return true;
+}
+
+bool CBlockList::check(const unsigned char* callsign) const
+{
+	assert(callsign != NULL);
+
+	std::string call = std::string((char*)callsign, YSF_CALLSIGN_LENGTH);
+	std::for_each(call.begin(), call.end(), [](char& c) {
+		c = std::toupper(c);
+	});
+
+	for (std::vector<std::string>::const_iterator it = m_callsigns.cbegin(); it != m_callsigns.cend(); ++it) {
+		const std::string blocked = *it;
+		if (call.find(blocked) != std::string::npos)
+			return false;
+	}
+
+	return true;
+}
+
+void CBlockList::clock(unsigned int ms)
+{
+	m_timer.clock(ms);
+
+	if (m_timer.isRunning() && m_timer.hasExpired()) {
+		loadFile();
+		m_timer.start();
+	}
+}
+
+bool CBlockList::loadFile()
+{
+	FILE* fp = ::fopen(m_file.c_str(), "rt");
+	if (fp == NULL)
+		return false;
+
+	char buffer[BUFFER_SIZE];
+
+	// First perform the checksum (Fletcher 16)
+	uint16_t sum1 = 0U;
+	uint16_t sum2 = 0U;
+	while (::fgets(buffer, BUFFER_SIZE, fp) != NULL) {
+		for (char* p = buffer; *p != '\0'; p++) {
+			sum1 = (sum1 + uint8_t(*p)) % 255U;
+			sum2 = (sum2 + sum1) % 255U;
+		}
+	}
+
+	uint16_t checksum = (sum2 << 8) | sum1;
+	if (checksum == m_checksum) {
+		::fclose(fp);
+		return false;
+	}
+
+	m_checksum = checksum;
+
+	// Rewind the file
+	::fseek(fp, 0L, SEEK_SET);
+
+	// Read the callsigns into the array
+	m_callsigns.clear();
+	unsigned int n = 0U;
+
+	while (::fgets(buffer, BUFFER_SIZE, fp) != NULL) {
+		char* p;
+		if ((p = ::strchr(buffer, '\n')) != NULL)
+			*p = '\0';
+		if ((p = ::strchr(buffer, '\r')) != NULL)
+			*p = '\0';
+
+		if (::strlen(buffer) > 0U) {
+			std::string callsign = std::string(buffer);
+
+			std::for_each(callsign.begin(), callsign.end(), [](char& c) {
+				c = std::toupper(c);
+			});
+
+			m_callsigns.push_back(callsign);
+			n++;
+		}
+	}
+
+	::fclose(fp);
+
+	LogInfo("Loaded %u callsigns from the block list", n);
+
+	return true;
+}

YSFReflector/BlockList.h

@@ -0,0 +1,50 @@
+/*
+ *   Copyright (C) 2021 by Jonathan Naylor G4KLX
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#if !defined(BLOCKLIST_H)
+#define	BLOCKLIST_H
+
+#include "Timer.h"
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+class CBlockList
+{
+public:
+	CBlockList(const std::string& file, unsigned int time);
+	~CBlockList();
+
+	bool start();
+
+	bool check(const unsigned char* callsign) const;
+
+	void clock(unsigned int ms);
+
+private:
+	std::string              m_file;
+	unsigned int             m_time;
+	std::vector<std::string> m_callsigns;
+	CTimer                   m_timer;
+	uint16_t                 m_checksum;
+
+	bool loadFile();
+};
+
+#endif

YSFReflector/Conf.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2020,2021 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -31,7 +31,8 @@ enum SECTION {
   SECTION_GENERAL,
   SECTION_INFO,
   SECTION_LOG,
-  SECTION_NETWORK
+  SECTION_NETWORK,
+  SECTION_BLOCKLIST
 };
 
 CConf::CConf(const std::string& file) :
@@ -46,7 +47,9 @@ m_logFilePath(),
 m_logFileRoot(),
 m_logFileRotate(true),
 m_networkPort(0U),
-m_networkDebug(false)
+m_networkDebug(false),
+m_blockListFile(),
+m_blockListTime(5U)
 {
 }
 
@@ -78,6 +81,8 @@ bool CConf::read()
 			  section = SECTION_LOG;
 		  else if (::strncmp(buffer, "[Network]", 9U) == 0)
 			  section = SECTION_NETWORK;
+		  else if (::strncmp(buffer, "[Block List]", 12U) == 0)
+			  section = SECTION_BLOCKLIST;
 		  else
 			  section = SECTION_NONE;
 
@@ -135,6 +140,11 @@ bool CConf::read()
 			  m_networkPort = (unsigned int)::atoi(value);
 		  else if (::strcmp(key, "Debug") == 0)
 			  m_networkDebug = ::atoi(value) == 1;
+	  } else if (section == SECTION_BLOCKLIST) {
+		  if (::strcmp(key, "File") == 0)
+			  m_blockListFile = value;
+		  else if (::strcmp(key, "Time") == 0)
+			  m_blockListTime = (unsigned int)::atoi(value);
 	  }
   }
 
@@ -198,3 +208,12 @@ bool CConf::getNetworkDebug() const
 	return m_networkDebug;
 }
 
+std::string CConf::getBlockListFile() const
+{
+	return m_blockListFile;
+}
+
+unsigned int CConf::getBlockListTime() const
+{
+	return m_blockListTime;
+}

YSFReflector/Conf.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2020,2021 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -49,6 +49,10 @@ public:
   unsigned int getNetworkPort() const;
   bool         getNetworkDebug() const;
 
+  // The Block List section
+  std::string  getBlockListFile() const;
+  unsigned int getBlockListTime() const;
+
 private:
   std::string  m_file;
   bool         m_daemon;
@@ -65,6 +69,9 @@ private:
 
   unsigned int m_networkPort;
   bool         m_networkDebug;
+
+  std::string  m_blockListFile;
+  unsigned int m_blockListTime;
 };
 
 #endif

YSFReflector/Makefile

@@ -4,7 +4,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DUDP_SOCKET_MAX=2
 LIBS    = -lpthread
 LDFLAGS = -g
 
-OBJECTS = Conf.o Log.o Network.o StopWatch.o Thread.o Timer.o UDPSocket.o Utils.o YSFReflector.o
+OBJECTS = BlockList.o Conf.o Log.o Network.o StopWatch.o Thread.o Timer.o UDPSocket.o Utils.o YSFReflector.o
 
 all:		YSFReflector
 

YSFReflector/Version.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2020,2021 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20201124";
+const char* VERSION = "20210213";
 
 #endif

YSFReflector/YSFReflector.cpp

@@ -1,5 +1,5 @@
 /*
-*   Copyright (C) 2016,2018,2020 by Jonathan Naylor G4KLX
+*   Copyright (C) 2016,2018,2020,2021 by Jonathan Naylor G4KLX
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 */
 
 #include "YSFReflector.h"
+#include "BlockList.h"
 #include "StopWatch.h"
 #include "Network.h"
 #include "Version.h"
@@ -175,7 +176,10 @@ void CYSFReflector::run()
 		::LogFinalise();
 		return;
 	}
-	
+
+	CBlockList blockList(m_conf.getBlockListFile(), m_conf.getBlockListTime());
+	blockList.start();
+
 	network.setCount(0);
 	
 	CStopWatch stopWatch;
@@ -231,37 +235,42 @@ void CYSFReflector::run()
 				}
 				network.setCount(m_repeaters.size());
 			} else if (::memcmp(buffer + 0U, "YSFD", 4U) == 0 && rpt != NULL) {
-				if (!watchdogTimer.isRunning()) {
+				// Is this user allowed?
-					::memcpy(tag, buffer + 4U, YSF_CALLSIGN_LENGTH);
+				if (blockList.check(buffer + 14U)) {
+					if (!watchdogTimer.isRunning()) {
+						::memcpy(tag, buffer + 4U, YSF_CALLSIGN_LENGTH);
 
-					if (::memcmp(buffer + 14U, "          ", YSF_CALLSIGN_LENGTH) != 0)
+						if (::memcmp(buffer + 14U, "          ", YSF_CALLSIGN_LENGTH) != 0)
-						::memcpy(src, buffer + 14U, YSF_CALLSIGN_LENGTH);
-					else
-						::memcpy(src, "??????????", YSF_CALLSIGN_LENGTH);
-
-					if (::memcmp(buffer + 24U, "          ", YSF_CALLSIGN_LENGTH) != 0)
-						::memcpy(dst, buffer + 24U, YSF_CALLSIGN_LENGTH);
-					else
-						::memcpy(dst, "??????????", YSF_CALLSIGN_LENGTH);
-
-					LogMessage("Received data from %10.10s to %10.10s at %10.10s", src, dst, buffer + 4U);
-				} else {
-					if (::memcmp(tag, buffer + 4U, YSF_CALLSIGN_LENGTH) == 0) {
-						bool changed = false;
-
-						if (::memcmp(buffer + 14U, "          ", YSF_CALLSIGN_LENGTH) != 0 && ::memcmp(src, "??????????", YSF_CALLSIGN_LENGTH) == 0) {
 							::memcpy(src, buffer + 14U, YSF_CALLSIGN_LENGTH);
-							changed = true;
+						else
-						}
+							::memcpy(src, "??????????", YSF_CALLSIGN_LENGTH);
 
-						if (::memcmp(buffer + 24U, "          ", YSF_CALLSIGN_LENGTH) != 0 && ::memcmp(dst, "??????????", YSF_CALLSIGN_LENGTH) == 0) {
+						if (::memcmp(buffer + 24U, "          ", YSF_CALLSIGN_LENGTH) != 0)
 							::memcpy(dst, buffer + 24U, YSF_CALLSIGN_LENGTH);
-							changed = true;
+						else
-						}
+							::memcpy(dst, "??????????", YSF_CALLSIGN_LENGTH);
 
-						if (changed)
+						LogMessage("Received data from %10.10s to %10.10s at %10.10s", src, dst, buffer + 4U);
-							LogMessage("Received data from %10.10s to %10.10s at %10.10s", src, dst, buffer + 4U);
+					} else {
+						if (::memcmp(tag, buffer + 4U, YSF_CALLSIGN_LENGTH) == 0) {
+							bool changed = false;
+
+							if (::memcmp(buffer + 14U, "          ", YSF_CALLSIGN_LENGTH) != 0 && ::memcmp(src, "??????????", YSF_CALLSIGN_LENGTH) == 0) {
+								::memcpy(src, buffer + 14U, YSF_CALLSIGN_LENGTH);
+								changed = true;
+							}
+
+							if (::memcmp(buffer + 24U, "          ", YSF_CALLSIGN_LENGTH) != 0 && ::memcmp(dst, "??????????", YSF_CALLSIGN_LENGTH) == 0) {
+								::memcpy(dst, buffer + 24U, YSF_CALLSIGN_LENGTH);
+								changed = true;
+							}
+
+							if (changed)
+								LogMessage("Received data from %10.10s to %10.10s at %10.10s", src, dst, buffer + 4U);
+						}
 					}
+				} else {
+					LogDebug("Data from %10.10s at %10.10s blocked", buffer + 14U, buffer + 4U);
 				}
 
 				watchdogTimer.start();
@@ -317,6 +326,8 @@ void CYSFReflector::run()
 			dumpTimer.start();
 		}
 
+		blockList.clock(ms);
+
 		if (ms < 5U)
 			CThread::sleep(5U);
 	}

YSFReflector/YSFReflector.ini

@@ -20,3 +20,6 @@ FileRotate=1
 Port=42000
 Debug=0
 
+[Block List]
+File=BlockList.txt
+Time=5

YSFReflector/YSFReflector.vcxproj

@@ -146,6 +146,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="BlockList.h" />
     <ClInclude Include="Conf.h" />
     <ClInclude Include="Log.h" />
     <ClInclude Include="Network.h" />
@@ -159,6 +160,7 @@
     <ClInclude Include="YSFReflector.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="BlockList.cpp" />
     <ClCompile Include="Conf.cpp" />
     <ClCompile Include="Log.cpp" />
     <ClCompile Include="Network.cpp" />

YSFReflector/YSFReflector.vcxproj.filters

@@ -44,6 +44,9 @@
     <ClInclude Include="Thread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="BlockList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Network.cpp">
@@ -73,5 +76,8 @@
     <ClCompile Include="Thread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="BlockList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>