ShaYmez/P25Clients
1
0
Fork 0
mirror of https://github.com/ShaYmez/P25Clients.git synced 2024-11-25 05:38:39 -05:00
Code Issues Projects Releases Wiki Activity

Remove logging from the parrot.

Browse Source
This commit is contained in:
Jonathan Naylor 2018-01-29 22:26:51 +00:00
parent 1bc75fc58e
commit 10a75649cd
13 changed files with 38 additions and 443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
P25Parrot/Log.cpp
View File

@ -1,136 +0,0 @@
/*
* Copyright (C) 2015,2016 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 "Log.h"
#if defined(_WIN32) || defined(_WIN64)
#include <Windows.h>
#else
#include <sys/time.h>
#endif
#include <cstdio>
#include <cstdlib>
#include <cstdarg>
#include <ctime>
#include <cassert>
#include <cstring>
static unsigned int m_fileLevel = 2U;
static std::string m_filePath;
static std::string m_fileRoot;
static FILE* m_fpLog = NULL;
static unsigned int m_displayLevel = 2U;
static struct tm m_tm;
static char LEVELS[] = " DMIWEF";
static bool LogOpen()
{
if (m_fileLevel == 0U)
return true;
time_t now;
::time(&now);
struct tm* tm = ::gmtime(&now);
if (tm->tm_mday == m_tm.tm_mday && tm->tm_mon == m_tm.tm_mon && tm->tm_year == m_tm.tm_year) {
if (m_fpLog != NULL)
return true;
} else {
if (m_fpLog != NULL)
::fclose(m_fpLog);
}
char filename[100U];
#if defined(_WIN32) || defined(_WIN64)
::sprintf(filename, "%s\\%s-%04d-%02d-%02d.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
#else
::sprintf(filename, "%s/%s-%04d-%02d-%02d.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
#endif
m_fpLog = ::fopen(filename, "a+t");
m_tm = *tm;
return m_fpLog != NULL;
}
bool LogInitialise(const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel)
{
m_filePath = filePath;
m_fileRoot = fileRoot;
m_fileLevel = fileLevel;
m_displayLevel = displayLevel;
return ::LogOpen();
}
void LogFinalise()
{
if (m_fpLog != NULL)
::fclose(m_fpLog);
}
void Log(unsigned int level, const char* fmt, ...)
{
assert(fmt != NULL);
char buffer[300U];
#if defined(_WIN32) || defined(_WIN64)
SYSTEMTIME st;
::GetSystemTime(&st);
::sprintf(buffer, "%c: %04u-%02u-%02u %02u:%02u:%02u.%03u ", LEVELS[level], st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
#else
struct timeval now;
::gettimeofday(&now, NULL);
struct tm* tm = ::gmtime(&now.tv_sec);
::sprintf(buffer, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U);
#endif
va_list vl;
va_start(vl, fmt);
::vsprintf(buffer + ::strlen(buffer), fmt, vl);
va_end(vl);
if (level >= m_fileLevel && m_fileLevel != 0U) {
bool ret = ::LogOpen();
if (!ret)
return;
::fprintf(m_fpLog, "%s\n", buffer);
::fflush(m_fpLog);
}
if (level >= m_displayLevel && m_displayLevel != 0U) {
::fprintf(stdout, "%s\n", buffer);
::fflush(stdout);
}
if (level == 6U) { // Fatal
::fclose(m_fpLog);
exit(1);
}
}

36
P25Parrot/Log.h
View File

@ -1,36 +0,0 @@
/*
* Copyright (C) 2015,2016 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(LOG_H)
#define LOG_H
#include <string>
#define LogDebug(fmt, ...) Log(1U, fmt, ##__VA_ARGS__)
#define LogMessage(fmt, ...) Log(2U, fmt, ##__VA_ARGS__)
#define LogInfo(fmt, ...) Log(3U, fmt, ##__VA_ARGS__)
#define LogWarning(fmt, ...) Log(4U, fmt, ##__VA_ARGS__)
#define LogError(fmt, ...) Log(5U, fmt, ##__VA_ARGS__)
#define LogFatal(fmt, ...) Log(6U, fmt, ##__VA_ARGS__)
extern void Log(unsigned int level, const char* fmt, ...);
extern bool LogInitialise(const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel);
extern void LogFinalise();
#endif

2
P25Parrot/Makefile
View File

@ -4,7 +4,7 @@ CFLAGS = -g -O3 -Wall -std=c++0x -pthread
LIBS = -lpthread LIBS = -lpthread
LDFLAGS = -g LDFLAGS = -g
OBJECTS = Log.o Network.o P25Parrot.o Parrot.o StopWatch.o Thread.o Timer.o UDPSocket.o Utils.o OBJECTS = Network.o P25Parrot.o Parrot.o StopWatch.o Thread.o Timer.o UDPSocket.o
all: P25Parrot all: P25Parrot

2
P25Parrot/Makefile.Solaris
View File

@ -4,7 +4,7 @@ CFLAGS = -g -O3 -Wall -std=c++0x -pthread
LIBS = -lsocket -lpthread LIBS = -lsocket -lpthread
LDFLAGS = -g LDFLAGS = -g
OBJECTS = Log.o Network.o P25Parrot.o Parrot.o StopWatch.o Thread.o Timer.o UDPSocket.o Utils.o OBJECTS = Network.o P25Parrot.o Parrot.o StopWatch.o Thread.o Timer.o UDPSocket.o
all: P25Parrot all: P25Parrot

12
P25Parrot/Network.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009-2014,2016 by Jonathan Naylor G4KLX * Copyright (C) 2009-2014,2016,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -17,8 +17,6 @@
*/ */
#include "Network.h" #include "Network.h"
#include "Utils.h"
#include "Log.h"
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
@ -40,7 +38,7 @@ CNetwork::~CNetwork()
bool CNetwork::open() bool CNetwork::open()
{ {
LogInfo("Opening P25 network connection"); ::fprintf(stdout, "Opening P25 network connection\n");
return m_socket.open(); return m_socket.open();
} }
@ -52,8 +50,6 @@ bool CNetwork::write(const unsigned char* data, unsigned int length)
assert(data != NULL); assert(data != NULL);
CUtils::dump(1U, "P25 Network Data Sent", data, length);
return m_socket.write(data, length, m_address, m_port); return m_socket.write(data, length, m_address, m_port);
} }
@ -70,8 +66,6 @@ void CNetwork::clock(unsigned int ms)
m_address.s_addr = address.s_addr; m_address.s_addr = address.s_addr;
m_port = port; m_port = port;
CUtils::dump(1U, "P25 Network Data Received", buffer, length);
if (buffer[0U] == 0xF0U) { // A poll if (buffer[0U] == 0xF0U) { // A poll
write(buffer, length); write(buffer, length);
} else if (buffer[0U] == 0xF1U) { // An unlink } else if (buffer[0U] == 0xF1U) { // An unlink
@ -108,5 +102,5 @@ void CNetwork::close()
{ {
m_socket.close(); m_socket.close();
LogInfo("Closing P25 network connection"); ::fprintf(stdout, "Closing P25 network connection\n");
} }

41
P25Parrot/P25Parrot.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016 by Jonathan Naylor G4KLX * Copyright (C) 2016,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -23,7 +23,6 @@
#include "Version.h" #include "Version.h"
#include "Thread.h" #include "Thread.h"
#include "Timer.h" #include "Timer.h"
#include "Log.h"
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
@ -32,7 +31,7 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (argc == 1) { if (argc == 1) {
::fprintf(stderr, "Usage: P25Parrot [-d|--debug] [-n|--nolog] <port>\n"); ::fprintf(stderr, "Usage: P25Parrot [-d|--debug] <port>\n");
return 1; return 1;
} }
@ -45,9 +44,6 @@ int main(int argc, char** argv)
if (::strcmp(argv[n], "-d") == 0 || ::strcmp(argv[n], "--debug") == 0) { if (::strcmp(argv[n], "-d") == 0 || ::strcmp(argv[n], "--debug") == 0) {
debug = true; debug = true;
} }
if (::strcmp(argv[n], "-n") == 0 || ::strcmp(argv[n], "--nolog") == 0) {
log = false;
}
} }
unsigned int port = ::atoi(argv[n]); unsigned int port = ::atoi(argv[n]);
@ -56,16 +52,15 @@ int main(int argc, char** argv)
return 1; return 1;
} }
CP25Parrot parrot(port, debug, log); CP25Parrot parrot(port, debug);
parrot.run(); parrot.run();
return 0; return 0;
} }
CP25Parrot::CP25Parrot(unsigned int port, bool debug, bool log) : CP25Parrot::CP25Parrot(unsigned int port, bool debug) :
m_port(port), m_port(port),
m_debug(debug), m_debug(debug)
m_log(log)
{ {
} }
@ -75,28 +70,12 @@ CP25Parrot::~CP25Parrot()
void CP25Parrot::run() void CP25Parrot::run()
{ {
int fileLevel = 0U;
if (m_log) {
fileLevel = m_debug ? 1U : 2U;
}
bool ret = ::LogInitialise(".", "P25Parrot", fileLevel, m_debug ? 1U : 2U);
if (!ret) {
::fprintf(stderr, "P25Parrot: unable to open the log file\n");
return;
}
LogInfo("Debug: %s", m_debug ? "enabled" : "disabled");
LogInfo("Logging to file: %s", m_log ? "enabled" : "disabled");
CParrot parrot(180U); CParrot parrot(180U);
CNetwork network(m_port); CNetwork network(m_port);
ret = network.open(); bool ret = network.open();
if (!ret) { if (!ret)
::LogFinalise();
return; return;
}
CStopWatch stopWatch; CStopWatch stopWatch;
stopWatch.start(); stopWatch.start();
@ -108,7 +87,7 @@ void CP25Parrot::run()
unsigned int count = 0U; unsigned int count = 0U;
bool playing = false; bool playing = false;
LogInfo("Starting P25Parrot-%s", VERSION); ::fprintf(stdout, "Starting P25Parrot-%s\n", VERSION);
for (;;) { for (;;) {
unsigned char buffer[200U]; unsigned char buffer[200U];
@ -119,7 +98,6 @@ void CP25Parrot::run()
watchdogTimer.start(); watchdogTimer.start();
if (buffer[0U] == 0x80U) { if (buffer[0U] == 0x80U) {
LogDebug("Received end of transmission");
turnaroundTimer.start(); turnaroundTimer.start();
watchdogTimer.stop(); watchdogTimer.stop();
parrot.end(); parrot.end();
@ -158,7 +136,6 @@ void CP25Parrot::run()
turnaroundTimer.clock(ms); turnaroundTimer.clock(ms);
if (watchdogTimer.isRunning() && watchdogTimer.hasExpired()) { if (watchdogTimer.isRunning() && watchdogTimer.hasExpired()) {
LogDebug("Network watchdog has expired");
turnaroundTimer.start(); turnaroundTimer.start();
watchdogTimer.stop(); watchdogTimer.stop();
parrot.end(); parrot.end();
@ -169,6 +146,4 @@ void CP25Parrot::run()
} }
network.close(); network.close();
::LogFinalise();
} }

5
P25Parrot/P25Parrot.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016 by Jonathan Naylor G4KLX * Copyright (C) 2016,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -22,7 +22,7 @@
class CP25Parrot class CP25Parrot
{ {
public: public:
CP25Parrot(unsigned int port, bool debug, bool log); CP25Parrot(unsigned int port, bool debug);
~CP25Parrot(); ~CP25Parrot();
void run(); void run();
@ -30,7 +30,6 @@ public:
private: private:
unsigned int m_port; unsigned int m_port;
bool m_debug; bool m_debug;
bool m_log;
}; };
#endif #endif

4
P25Parrot/P25Parrot.vcxproj
View File

@ -146,7 +146,6 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Log.h" />
<ClInclude Include="Network.h" /> <ClInclude Include="Network.h" />
<ClInclude Include="P25Parrot.h" /> <ClInclude Include="P25Parrot.h" />
<ClInclude Include="Parrot.h" /> <ClInclude Include="Parrot.h" />
@ -155,11 +154,9 @@
<ClInclude Include="Thread.h" /> <ClInclude Include="Thread.h" />
<ClInclude Include="Timer.h" /> <ClInclude Include="Timer.h" />
<ClInclude Include="UDPSocket.h" /> <ClInclude Include="UDPSocket.h" />
<ClInclude Include="Utils.h" />
<ClInclude Include="Version.h" /> <ClInclude Include="Version.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Log.cpp" />
<ClCompile Include="Network.cpp" /> <ClCompile Include="Network.cpp" />
<ClCompile Include="P25Parrot.cpp" /> <ClCompile Include="P25Parrot.cpp" />
<ClCompile Include="Parrot.cpp" /> <ClCompile Include="Parrot.cpp" />
@ -167,7 +164,6 @@
<ClCompile Include="Thread.cpp" /> <ClCompile Include="Thread.cpp" />
<ClCompile Include="Timer.cpp" /> <ClCompile Include="Timer.cpp" />
<ClCompile Include="UDPSocket.cpp" /> <ClCompile Include="UDPSocket.cpp" />
<ClCompile Include="Utils.cpp" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

12
P25Parrot/P25Parrot.vcxproj.filters
View File

@ -32,15 +32,9 @@
<ClInclude Include="UDPSocket.h"> <ClInclude Include="UDPSocket.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Utils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Version.h"> <ClInclude Include="Version.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Log.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Thread.h"> <ClInclude Include="Thread.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -64,12 +58,6 @@
<ClCompile Include="UDPSocket.cpp"> <ClCompile Include="UDPSocket.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Log.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Thread.cpp"> <ClCompile Include="Thread.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>

10
P25Parrot/RingBuffer.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2009,2012,2013,2015,2016 by Jonathan Naylor G4KLX * Copyright (C) 2006-2009,2012,2013,2015,2016,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -19,8 +19,6 @@
#ifndef RingBuffer_H #ifndef RingBuffer_H
#define RingBuffer_H #define RingBuffer_H
#include "Log.h"
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
@ -50,7 +48,7 @@ public:
bool addData(const T* buffer, unsigned int nSamples) bool addData(const T* buffer, unsigned int nSamples)
{ {
if (nSamples >= freeSpace()) { if (nSamples >= freeSpace()) {
LogError("**** Overflow in %s ring buffer, %u >= %u", m_name, nSamples, freeSpace()); ::fprintf(stderr, "**** Overflow in %s ring buffer, %u >= %u\n", m_name, nSamples, freeSpace());
return false; return false;
} }
@ -67,7 +65,7 @@ public:
bool getData(T* buffer, unsigned int nSamples) bool getData(T* buffer, unsigned int nSamples)
{ {
if (dataSize() < nSamples) { if (dataSize() < nSamples) {
LogError("**** Underflow in %s ring buffer, %u < %u", m_name, dataSize(), nSamples); ::fprintf(stderr, "**** Underflow in %s ring buffer, %u < %u\n", m_name, dataSize(), nSamples);
return false; return false;
} }
@ -84,7 +82,7 @@ public:
bool peek(T* buffer, unsigned int nSamples) bool peek(T* buffer, unsigned int nSamples)
{ {
if (dataSize() < nSamples) { if (dataSize() < nSamples) {
LogError("**** Underflow peek in %s ring buffer, %u < %u", m_name, dataSize(), nSamples); ::fprintf(stderr, "**** Underflow peek in %s ring buffer, %u < %u\n", m_name, dataSize(), nSamples);
return false; return false;
} }

39
P25Parrot/UDPSocket.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2016 by Jonathan Naylor G4KLX * Copyright (C) 2006-2016,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -17,7 +17,6 @@
*/ */
#include "UDPSocket.h" #include "UDPSocket.h"
#include "Log.h"
#include <cassert> #include <cassert>
@ -38,7 +37,7 @@ m_fd(-1)
WSAData data; WSAData data;
int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
if (wsaRet != 0) if (wsaRet != 0)
LogError("Error from WSAStartup"); ::fprintf(stderr, "Error from WSAStartup\n");
#endif #endif
} }
@ -51,7 +50,7 @@ m_fd(-1)
WSAData data; WSAData data;
int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
if (wsaRet != 0) if (wsaRet != 0)
LogError("Error from WSAStartup"); ::fprintf(stderr, "Error from WSAStartup\n");
#endif #endif
} }
@ -78,7 +77,7 @@ in_addr CUDPSocket::lookup(const std::string& hostname)
return addr; return addr;
} }
LogError("Cannot find address for host %s", hostname.c_str()); ::fprintf(stderr, "Cannot find address for host %s\n", hostname.c_str());
addr.s_addr = INADDR_NONE; addr.s_addr = INADDR_NONE;
return addr; return addr;
@ -95,7 +94,7 @@ in_addr CUDPSocket::lookup(const std::string& hostname)
return addr; return addr;
} }
LogError("Cannot find address for host %s", hostname.c_str()); ::fprintf(stderr, "Cannot find address for host %s\n", hostname.c_str());
addr.s_addr = INADDR_NONE; addr.s_addr = INADDR_NONE;
return addr; return addr;
@ -107,9 +106,9 @@ bool CUDPSocket::open()
m_fd = ::socket(PF_INET, SOCK_DGRAM, 0); m_fd = ::socket(PF_INET, SOCK_DGRAM, 0);
if (m_fd < 0) { if (m_fd < 0) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Cannot create the UDP socket, err: %lu", ::GetLastError()); ::fprintf(stderr, "Cannot create the UDP socket, err: %lu\n", ::GetLastError());
#else #else
LogError("Cannot create the UDP socket, err: %d", errno); ::fprintf(stderr, "Cannot create the UDP socket, err: %d\n", errno);
#endif #endif
return false; return false;
} }
@ -128,7 +127,7 @@ bool CUDPSocket::open()
addr.sin_addr.s_addr = ::inet_addr(m_address.c_str()); addr.sin_addr.s_addr = ::inet_addr(m_address.c_str());
#endif #endif
if (addr.sin_addr.s_addr == INADDR_NONE) { if (addr.sin_addr.s_addr == INADDR_NONE) {
LogError("The local address is invalid - %s", m_address.c_str()); ::fprintf(stderr, "The local address is invalid - %s\n", m_address.c_str());
return false; return false;
} }
} }
@ -136,23 +135,23 @@ bool CUDPSocket::open()
int reuse = 1; int reuse = 1;
if (::setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) { if (::setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Cannot set the UDP socket option, err: %lu", ::GetLastError()); ::fprintf(stderr, "Cannot set the UDP socket option, err: %lu\n", ::GetLastError());
#else #else
LogError("Cannot set the UDP socket option, err: %d", errno); ::fprintf(stderr, "Cannot set the UDP socket option, err: %d\n", errno);
#endif #endif
return false; return false;
} }
if (::bind(m_fd, (sockaddr*)&addr, sizeof(sockaddr_in)) == -1) { if (::bind(m_fd, (sockaddr*)&addr, sizeof(sockaddr_in)) == -1) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Cannot bind the UDP address, err: %lu", ::GetLastError()); ::fprintf(stderr, "Cannot bind the UDP address, err: %lu\n", ::GetLastError());
#else #else
LogError("Cannot bind the UDP address, err: %d", errno); ::fprintf(stderr, "Cannot bind the UDP address, err: %d\n", errno);
#endif #endif
return false; return false;
} }
LogInfo("Opening UDP port on %u", m_port); ::fprintf(stdout, "Opening UDP port on %u\n", m_port);
} }
return true; return true;
@ -180,9 +179,9 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, in_addr& addres
int ret = ::select(m_fd + 1, &readFds, NULL, NULL, &tv); int ret = ::select(m_fd + 1, &readFds, NULL, NULL, &tv);
if (ret < 0) { if (ret < 0) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Error returned from UDP select, err: %lu", ::GetLastError()); ::fprintf(stderr, "Error returned from UDP select, err: %lu\n", ::GetLastError());
#else #else
LogError("Error returned from UDP select, err: %d", errno); ::fprintf(stderr, "Error returned from UDP select, err: %d\n", errno);
#endif #endif
return -1; return -1;
} }
@ -204,9 +203,9 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, in_addr& addres
#endif #endif
if (len <= 0) { if (len <= 0) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Error returned from recvfrom, err: %lu", ::GetLastError()); ::fprintf(stderr, "Error returned from recvfrom, err: %lu\n", ::GetLastError());
#else #else
LogError("Error returned from recvfrom, err: %d", errno); ::fprintf(stderr, "Error returned from recvfrom, err: %d\n", errno);
#endif #endif
return -1; return -1;
} }
@ -236,9 +235,9 @@ bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const i
#endif #endif
if (ret < 0) { if (ret < 0) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Error returned from sendto, err: %lu", ::GetLastError()); ::fprintf(stderr, "Error returned from sendto, err: %lu\n", ::GetLastError());
#else #else
LogError("Error returned from sendto, err: %d", errno); ::fprintf(stderr, "Error returned from sendto, err: %d\n", errno);
#endif #endif
return false; return false;
} }

146
P25Parrot/Utils.cpp
View File

@ -1,146 +0,0 @@
/*
* Copyright (C) 2009,2014,2015,2016 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; version 2 of the License.
*
* 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.
*/
#include "Utils.h"
#include "Log.h"
#include <cstdio>
#include <cassert>
void CUtils::dump(const std::string& title, const unsigned char* data, unsigned int length)
{
assert(data != NULL);
dump(2U, title, data, length);
}
void CUtils::dump(int level, const std::string& title, const unsigned char* data, unsigned int length)
{
assert(data != NULL);
::Log(level, "%s", title.c_str());
unsigned int offset = 0U;
while (length > 0U) {
std::string output;
unsigned int bytes = (length > 16U) ? 16U : length;
for (unsigned i = 0U; i < bytes; i++) {
char temp[10U];
::sprintf(temp, "%02X ", data[offset + i]);
output += temp;
}
for (unsigned int i = bytes; i < 16U; i++)
output += " ";
output += " *";
for (unsigned i = 0U; i < bytes; i++) {
unsigned char c = data[offset + i];
if (::isprint(c))
output += c;
else
output += '.';
}
output += '*';
::Log(level, "%04X: %s", offset, output.c_str());
offset += 16U;
if (length >= 16U)
length -= 16U;
else
length = 0U;
}
}
void CUtils::dump(const std::string& title, const bool* bits, unsigned int length)
{
assert(bits != NULL);
dump(2U, title, bits, length);
}
void CUtils::dump(int level, const std::string& title, const bool* bits, unsigned int length)
{
assert(bits != NULL);
unsigned char bytes[100U];
unsigned int nBytes = 0U;
for (unsigned int n = 0U; n < length; n += 8U, nBytes++)
bitsToByteBE(bits + n, bytes[nBytes]);
dump(level, title, bytes, nBytes);
}
void CUtils::byteToBitsBE(unsigned char byte, bool* bits)
{
assert(bits != NULL);
bits[0U] = (byte & 0x80U) == 0x80U;
bits[1U] = (byte & 0x40U) == 0x40U;
bits[2U] = (byte & 0x20U) == 0x20U;
bits[3U] = (byte & 0x10U) == 0x10U;
bits[4U] = (byte & 0x08U) == 0x08U;
bits[5U] = (byte & 0x04U) == 0x04U;
bits[6U] = (byte & 0x02U) == 0x02U;
bits[7U] = (byte & 0x01U) == 0x01U;
}
void CUtils::byteToBitsLE(unsigned char byte, bool* bits)
{
assert(bits != NULL);
bits[0U] = (byte & 0x01U) == 0x01U;
bits[1U] = (byte & 0x02U) == 0x02U;
bits[2U] = (byte & 0x04U) == 0x04U;
bits[3U] = (byte & 0x08U) == 0x08U;
bits[4U] = (byte & 0x10U) == 0x10U;
bits[5U] = (byte & 0x20U) == 0x20U;
bits[6U] = (byte & 0x40U) == 0x40U;
bits[7U] = (byte & 0x80U) == 0x80U;
}
void CUtils::bitsToByteBE(const bool* bits, unsigned char& byte)
{
assert(bits != NULL);
byte = bits[0U] ? 0x80U : 0x00U;
byte |= bits[1U] ? 0x40U : 0x00U;
byte |= bits[2U] ? 0x20U : 0x00U;
byte |= bits[3U] ? 0x10U : 0x00U;
byte |= bits[4U] ? 0x08U : 0x00U;
byte |= bits[5U] ? 0x04U : 0x00U;
byte |= bits[6U] ? 0x02U : 0x00U;
byte |= bits[7U] ? 0x01U : 0x00U;
}
void CUtils::bitsToByteLE(const bool* bits, unsigned char& byte)
{
assert(bits != NULL);
byte = bits[0U] ? 0x01U : 0x00U;
byte |= bits[1U] ? 0x02U : 0x00U;
byte |= bits[2U] ? 0x04U : 0x00U;
byte |= bits[3U] ? 0x08U : 0x00U;
byte |= bits[4U] ? 0x10U : 0x00U;
byte |= bits[5U] ? 0x20U : 0x00U;
byte |= bits[6U] ? 0x40U : 0x00U;
byte |= bits[7U] ? 0x80U : 0x00U;
}

36
P25Parrot/Utils.h
View File

@ -1,36 +0,0 @@
/*
* Copyright (C) 2009,2014,2015 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; version 2 of the License.
*
* 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.
*/
#ifndef Utils_H
#define Utils_H
#include <string>
class CUtils {
public:
static void dump(const std::string& title, const unsigned char* data, unsigned int length);
static void dump(int level, const std::string& title, const unsigned char* data, unsigned int length);
static void dump(const std::string& title, const bool* bits, unsigned int length);
static void dump(int level, const std::string& title, const bool* bits, unsigned int length);
static void byteToBitsBE(unsigned char byte, bool* bits);
static void byteToBitsLE(unsigned char byte, bool* bits);
static void bitsToByteBE(const bool* bits, unsigned char& byte);
static void bitsToByteLE(const bool* bits, unsigned char& byte);
private:
};
#endif