Merge branch 'SimpleDMR' into AX25_FM

Conf.cpp

@@ -78,6 +78,7 @@ m_logDisplayLevel(0U),
 m_logFileLevel(0U),
 m_logFilePath(),
 m_logFileRoot(),
+m_logFileRotate(true),
 m_cwIdEnabled(false),
 m_cwIdTime(10U),
 m_cwIdCallsign(),
@@ -456,6 +457,8 @@ bool CConf::read()
 				m_logFileLevel = (unsigned int)::atoi(value);
 			else if (::strcmp(key, "DisplayLevel") == 0)
 				m_logDisplayLevel = (unsigned int)::atoi(value);
+			else if (::strcmp(key, "FileRotate") == 0)
+				m_logFileRotate = ::atoi(value) == 1;
 		} else if (section == SECTION_CWID) {
 			if (::strcmp(key, "Enable") == 0)
 				m_cwIdEnabled = ::atoi(value) == 1;
@@ -1101,6 +1104,11 @@ std::string CConf::getLogFileRoot() const
 	return m_logFileRoot;
 }
 
+bool CConf::getLogFileRotate() const
+{
+	return m_logFileRotate;
+}
+
 bool CConf::getCWIdEnabled() const
 {
 	return m_cwIdEnabled;

Conf.h

@@ -48,6 +48,7 @@ class CConf
   unsigned int getLogFileLevel() const;
   std::string  getLogFilePath() const;
   std::string  getLogFileRoot() const;
+  bool         getLogFileRotate() const;
 
   // The CW ID section
   bool         getCWIdEnabled() const;
@@ -352,6 +353,7 @@ class CConf
   unsigned int m_logFileLevel;
   std::string  m_logFilePath;
   std::string  m_logFileRoot;
+  bool         m_logFileRotate;
 
   bool         m_cwIdEnabled;
   unsigned int m_cwIdTime;

Log.cpp

@@ -35,6 +35,7 @@
 static unsigned int m_fileLevel = 2U;
 static std::string m_filePath;
 static std::string m_fileRoot;
+static bool m_fileRotate = true;
 
 static FILE* m_fpLog = NULL;
 static bool m_daemon = false;
@@ -45,7 +46,7 @@ static struct tm m_tm;
 
 static char LEVELS[] = " DMIWEF";
 
-static bool LogOpen()
+static bool logOpenRotate()
 {
 	bool status = false;
 
@@ -86,13 +87,51 @@ static bool LogOpen()
 	return status;
 }
 
-bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel)
+static bool logOpenNoRotate()
+{
+	bool status = false;
+
+	if (m_fileLevel == 0U)
+		return true;
+
+	if (m_fpLog != NULL)
+		return true;
+
+	char filename[200U];
+#if defined(_WIN32) || defined(_WIN64)
+	::sprintf(filename, "%s\\%s.log", m_filePath.c_str(), m_fileRoot.c_str());
+#else
+	::sprintf(filename, "%s/%s.log", m_filePath.c_str(), m_fileRoot.c_str());
+#endif
+
+	if ((m_fpLog = ::fopen(filename, "a+t")) != NULL) {
+		status = true;
+
+#if !defined(_WIN32) && !defined(_WIN64)
+		if (m_daemon)
+			dup2(fileno(m_fpLog), fileno(stderr));
+#endif
+	}
+
+	return status;
+}
+
+bool LogOpen()
+{
+	if (m_fileRotate)
+		return logOpenRotate();
+	else
+		return logOpenNoRotate();
+}
+
+bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel, bool rotate)
 {
 	m_filePath     = filePath;
 	m_fileRoot     = fileRoot;
 	m_fileLevel    = fileLevel;
 	m_displayLevel = displayLevel;
 	m_daemon       = daemon;
+	m_fileRotate   = rotate;
 
 	if (m_daemon)
 		m_displayLevel = 0U;

Log.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2020 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
@@ -30,7 +30,7 @@
 
 extern void Log(unsigned int level, const char* fmt, ...);
 
-extern bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel);
+extern bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel, bool rotate);
 extern void LogFinalise();
 
 #endif

MMDVM.ini

@@ -20,6 +20,7 @@ DisplayLevel=1
 FileLevel=1
 FilePath=.
 FileRoot=MMDVM
+FileRotate=1
 
 [CW Id]
 Enable=1

MMDVMHost.cpp

@@ -250,9 +250,9 @@ int CMMDVMHost::run()
 #endif
 
 #if !defined(_WIN32) && !defined(_WIN64)
-	ret = ::LogInitialise(m_daemon, m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
+	ret = ::LogInitialise(m_daemon, m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel(), m_conf.getLogFileRotate());
 #else
-	ret = ::LogInitialise(false, m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
+	ret = ::LogInitialise(false, m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel(), m_conf.getLogFileRotate());
 #endif
 	if (!ret) {
 		::fprintf(stderr, "MMDVMHost: unable to open the log file\n");

RemoteCommand.cpp

@@ -53,7 +53,7 @@ m_port(port)
 {
 	CUDPSocket::startup();
 
-	::LogInitialise(false, ".", "RemoteCommand", 2U, 2U);
+	::LogInitialise(false, ".", "RemoteCommand", 2U, 2U, false);
 }
 
 CRemoteCommand::~CRemoteCommand()

UDPSocket.cpp

@@ -289,6 +289,12 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag
 		LogError("Error returned from recvfrom, err: %lu", ::GetLastError());
 #else
 		LogError("Error returned from recvfrom, err: %d", errno);
+
+		if (len == -1 && errno == ENOTSOCK) {
+			LogMessage("Re-opening UDP port on %u", m_port);
+			close();
+			open();
+		}
 #endif
 		return -1;
 	}

Version.h

@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20201013";
+const char* VERSION = "20201031";
 
 #endif