MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make it compile cleanly under Visual Studio 2009.

Browse Source
This commit is contained in:
Jonathan Naylor
2024-07-03 13:44:34 +01:00
parent 80d08d43a9
commit 063217fde0
6 changed files with 115 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
FMIAXNetwork.cpp
View File

@@ -25,12 +25,12 @@
#include <cassert>
#include <cstring>
#if !defined(_WIN32) && !defined(_WIN64)
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <md5.h>
#endif
#define DEBUG_IAX
@@ -100,6 +100,10 @@ const unsigned char IAX_IE_RR_OOO = 51U;
const unsigned int BUFFER_LENGTH = 1500U;
#if !defined(MD5_DIGEST_STRING_LENGTH)
#define MD5_DIGEST_STRING_LENGTH 16
#endif
CFMIAXNetwork::CFMIAXNetwork(const std::string& callsign, const std::string& username, const std::string& password, const std::string& node, const std::string& localAddress, unsigned short localPort, const std::string& gatewayAddress, unsigned short gatewayPort, bool debug) :
m_callsign(callsign),
m_username(username),
@@ -127,6 +131,9 @@ m_rxDelay(0U),
m_rxDropped(0U),
m_rxOOO(0U),
m_keyed(false)
#if defined(_WIN32) || defined(_WIN64)
, m_provider(0UL)
#endif
{
assert(!callsign.empty());
assert(!username.empty());
@@ -157,6 +164,13 @@ bool CFMIAXNetwork::open()
LogMessage("Opening FM IAX network connection");
#if defined(_WIN32) || defined(_WIN64)
if (!::CryptAcquireContext(&m_provider, nullptr, nullptr, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
LogError("CryptAcquireContext failed: %ld", ::GetLastError());
return false;
}
#endif
bool ret = m_socket.open(m_addr);
if (!ret)
return false;
@@ -593,6 +607,11 @@ void CFMIAXNetwork::close()
m_retryTimer.stop();
m_pingTimer.stop();
#if defined(_WIN32) || defined(_WIN64)
::CryptReleaseContext(m_provider, 0UL);
m_provider = 0UL;
#endif
LogMessage("Closing FM IAX network connection");
}
@@ -650,7 +669,7 @@ bool CFMIAXNetwork::writeNew(bool retry)
buffer[length++] = IAX_PROTO_VERSION;
buffer[length++] = IAX_IE_CALLED_NUMBER;
buffer[length++] = m_node.size();
buffer[length++] = (unsigned char)m_node.size();
for (std::string::const_iterator it = m_node.cbegin(); it != m_node.cend(); ++it)
buffer[length++] = *it;
@@ -658,12 +677,12 @@ bool CFMIAXNetwork::writeNew(bool retry)
buffer[length++] = 0U;
buffer[length++] = IAX_IE_CALLING_NAME;
buffer[length++] = m_callsign.size();
buffer[length++] = (unsigned char)m_callsign.size();
for (std::string::const_iterator it = m_callsign.cbegin(); it != m_callsign.cend(); ++it)
buffer[length++] = *it;
buffer[length++] = IAX_IE_USERNAME;
buffer[length++] = m_username.size();
buffer[length++] = (unsigned char)m_username.size();
for (std::string::const_iterator it = m_username.cbegin(); it != m_username.cend(); ++it)
buffer[length++] = *it;
@@ -692,7 +711,29 @@ bool CFMIAXNetwork::writeAuthRep()
std::string password = m_seed + m_password;
char hash[MD5_DIGEST_STRING_LENGTH];
#if defined(_WIN32) || defined(_WIN64)
HCRYPTHASH hHash = 0;
if (!::CryptCreateHash(m_provider, CALG_MD5, 0, 0, &hHash)) {
LogError("CryptCreateHash failed: %ld", ::GetLastError());
return false;
}
if (!::CryptHashData(hHash, (BYTE*)password.c_str(), DWORD(password.size()), 0)) {
LogError("CryptHashData failed: %ld", ::GetLastError());
return false;
}
DWORD cbHash = MD5_DIGEST_STRING_LENGTH;
if (!::CryptGetHashParam(hHash, HP_HASHVAL, (BYTE*)hash, &cbHash, 0)) {
LogError("CryptGetHashParam failed: %ld", ::GetLastError());
return false;
}
::CryptDestroyHash(hHash);
#else
::MD5Data((unsigned char*)password.c_str(), password.size(), hash);
#endif
unsigned short sCall = m_sCallNo | 0x8000U;
unsigned int ts = m_timestamp.elapsed();
@@ -1033,15 +1074,16 @@ bool CFMIAXNetwork::writeHangup()
buffer[11U] = IAX_COMMAND_HANGUP;
buffer[12U] = IAX_IE_CAUSE;
buffer[13U] = ::strlen(REASON);
buffer[13U] = (unsigned char)::strlen(REASON);
::memcpy(buffer + 14U, REASON, ::strlen(REASON));
#if !defined(DEBUG_IAX)
if (m_debug)
#endif
CUtils::dump(1U, "FM IAX Network Data Sent", buffer, 14U + ::strlen(REASON));
return m_socket.write(buffer, 14U + ::strlen(REASON), m_addr, m_addrLen);
CUtils::dump(1U, "FM IAX Network Data Sent", buffer, 14U + (unsigned int)::strlen(REASON));
return m_socket.write(buffer, 14U + ::strlen(REASON), m_addr, (unsigned int)m_addrLen);
}
bool CFMIAXNetwork::writeRegReq(bool retry)
@@ -1082,16 +1124,38 @@ bool CFMIAXNetwork::writeRegReq(bool retry)
buffer[11U] = IAX_COMMAND_REGREQ;
buffer[12U] = IAX_IE_USERNAME;
buffer[13U] = m_username.size();
buffer[13U] = (unsigned char)m_username.size();
::memcpy(buffer + 14U, m_username.c_str(), m_username.size());
unsigned int offset = 14U + m_username.size();
unsigned int offset = 14U + (unsigned int)m_username.size();
if (m_dCallNo > 0U) {
std::string password = m_seed + m_password;
char hash[MD5_DIGEST_STRING_LENGTH];
#if defined(_WIN32) || defined(_WIN64)
HCRYPTHASH hHash = 0;
if (!::CryptCreateHash(m_provider, CALG_MD5, 0, 0, &hHash)) {
LogError("CryptCreateHash failed: %ld", ::GetLastError());
return false;
}
if (!::CryptHashData(hHash, (BYTE*)password.c_str(), DWORD(password.size()), 0)) {
LogError("CryptHashData failed: %ld", ::GetLastError());
return false;
}
DWORD cbHash = MD5_DIGEST_STRING_LENGTH;
if (!::CryptGetHashParam(hHash, HP_HASHVAL, (BYTE*)hash, &cbHash, 0)) {
LogError("CryptGetHashParam failed: %ld", ::GetLastError());
return false;
}
::CryptDestroyHash(hHash);
#else
::MD5Data((unsigned char*)password.c_str(), password.size(), hash);
#endif
buffer[offset++] = IAX_IE_MD5_RESULT;
buffer[offset++] = MD5_DIGEST_STRING_LENGTH;

9
FMIAXNetwork.h
View File

@@ -28,6 +28,12 @@
#include <cstdint>
#include <string>
#if defined(_WIN32) || defined(_WIN64)
#include <wincrypt.h>
#else
#include <md5.h>
#endif
enum IAX_STATUS {
IAXS_DISCONNECTED,
IAXS_CONNECTING,
@@ -85,6 +91,9 @@ private:
unsigned int m_rxDropped;
unsigned int m_rxOOO;
bool m_keyed;
#if defined(_WIN32) || defined(_WIN64)
HCRYPTPROV m_provider;
#endif
bool writeNew(bool retry);
bool writeAuthRep();

8
FMRAWNetwork.cpp
View File

@@ -25,10 +25,12 @@
#include <cassert>
#include <cstring>
#if !defined(_WIN32) && !defined(_WIN64)
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#endif
const unsigned int MMDVM_SAMPLERATE = 8000U;
@@ -276,9 +278,9 @@ void CFMRAWNetwork::close()
{
m_socket.close();
if (m_fd != -1) {
::close(m_fd);
m_fd = -1;
if (m_fp != NULL) {
::fclose(m_fp);
m_fp = NULL;
}
LogMessage("Closing FM RAW network connection");

4
FMUSRPNetwork.cpp
View File

@@ -25,10 +25,12 @@
#include <cassert>
#include <cstring>
#if !defined(_WIN32) && !defined(_WIN64)
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#endif
const unsigned int BUFFER_LENGTH = 1500U;
@@ -125,7 +127,7 @@ bool CFMUSRPNetwork::writeStart()
buffer[length++] = 0x08U;
// TLV Length
buffer[length++] = 3U + 4U + 3U + 1U + 1U + m_callsign.size() + 1U;
buffer[length++] = (unsigned char)(3U + 4U + 3U + 1U + 1U + m_callsign.size() + 1U);
// DMR Id
buffer[length++] = 0x00U;

6
MMDVMHost.vcxproj
View File

@@ -199,7 +199,10 @@
<ClInclude Include="DStarNetwork.h" />
<ClInclude Include="DStarSlowData.h" />
<ClInclude Include="FMControl.h" />
<ClInclude Include="FMIAXNetwork.h" />
<ClInclude Include="FMNetwork.h" />
<ClInclude Include="FMRAWNetwork.h" />
<ClInclude Include="FMUSRPNetwork.h" />
<ClInclude Include="Golay2087.h" />
<ClInclude Include="Golay24128.h" />
<ClInclude Include="Hamming.h" />
@@ -311,7 +314,10 @@
<ClCompile Include="DStarNetwork.cpp" />
<ClCompile Include="DStarSlowData.cpp" />
<ClCompile Include="FMControl.cpp" />
<ClCompile Include="FMIAXNetwork.cpp" />
<ClCompile Include="FMNetwork.cpp" />
<ClCompile Include="FMRAWNetwork.cpp" />
<ClCompile Include="FMUSRPNetwork.cpp" />
<ClCompile Include="Golay2087.cpp" />
<ClCompile Include="Golay24128.cpp" />
<ClCompile Include="Hamming.cpp" />

18
MMDVMHost.vcxproj.filters
View File

@@ -350,6 +350,15 @@
<ClInclude Include="SMeter.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FMIAXNetwork.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FMRAWNetwork.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FMUSRPNetwork.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="BPTC19696.cpp">
@@ -658,5 +667,14 @@
<ClCompile Include="SMeter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FMIAXNetwork.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FMRAWNetwork.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FMUSRPNetwork.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>