connection between 2 systems and bug fixes (#14)

This commit is contained in:
tompzf
2026-07-03 14:53:48 +02:00
committed by GitHub
parent 0fb5660d27
commit 46842200f1
284 changed files with 35200 additions and 8265 deletions

View File

@@ -16,6 +16,8 @@
#include <support/toml.h>
#include "com_channel.h"
#include "marshall_object.h"
#include <support/app_control.h>
#include <support/any.h>
thread_local CChannelConnector* CCommunicationControl::m_pConnectorContext = nullptr;
@@ -40,7 +42,7 @@ void CCommunicationControl::OnShutdown()
std::unique_lock<std::mutex> lock(m_mtxChannels);
auto vecInitialConnectMon = std::move(m_vecInitialConnectMon);
lock.unlock();
for (std::thread& rthread : vecInitialConnectMon)
for (sdv::core::secure_thread& rthread : vecInitialConnectMon)
{
if (rthread.joinable())
rthread.join();
@@ -63,10 +65,11 @@ sdv::com::TConnectionID CCommunicationControl::CreateServerConnection(/*in*/ sdv
switch (eChannelType)
{
case sdv::com::EChannelType::local_channel:
ssChannelServer = "LocalChannelControl";
ssChannelServer = static_cast<std::string>(sdv::app::GetAppSettingsAttribute("Communication.DefaultProvider"));
break;
case sdv::com::EChannelType::remote_channel:
ssChannelServer = "RemoteChannelControl";
// Currently not supported
ssChannelServer = "UnknownComProvider";
break;
default:
return {};