ziggi/stvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-05-19 16:58:44 +02:00
parent 99b4f4586e
commit 4bed66d2bb
6 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uxclient.cpp
+11 -11
View File
@@ -87,22 +87,21 @@ void UxClient::RecvMessages(void) {
std::string rawHeader(msgHeaderSize, 0);
if ((rsize = recv(sock, rawHeader.data(), rawHeader.size(), MSG_WAITALL)) < 0) {
int errnoCopy = errno;
uxlogger.Log(std::format("Read0 header error: {}", errno));
std::string error = std::strerror(errnoCopy);
uxlogger.Log(std::format("Read header error: {}", error));
uxlogger.Error(std::format("Read header error: {}", error));
break;
}
if (rsize < msgHeaderSize) {
uxlogger.Log(std::format("Read only {} from {} bytes", rsize, msgHeaderSize));
uxlogger.Error(std::format("Read only {} from {} bytes", rsize, msgHeaderSize));
break;
}
MessageHeader header;
auto decodeRes = header.Decode(rawHeader);
if (!decodeRes) {
uxlogger.Log(std::format("Decode header error: {}", decodeRes.error()));
uxlogger.Error(std::format("Decode header error: {}", decodeRes.error()));
}
auto pSize = header.PayloadSize();
uxlogger.Log(std::format("Receive message with size {}", pSize));
uxlogger.Error(std::format("Receive message with size {}", pSize));
if (pSize == 0) {
continue;
}
@@ -111,14 +110,14 @@ void UxClient::RecvMessages(void) {
if ((rsize = recv(sock, rawMessage.data(), rawMessage.size(), MSG_WAITALL)) < 0) {
int errnoCopy = errno;
std::string error = std::strerror(errnoCopy);
uxlogger.Log(std::format("Read message error: {}", error));
uxlogger.Error(std::format("Read message error: {}", error));
break;
}
uxcontrol::SimpleMessage meta;
meta.ParseFromString(rawMessage);
auto metaPart = meta.meta();
auto kind = metaPart.kind();
uxlogger.Debug(std::format("Received message kind of {}", kind));
uxlogger.Debug(std::format("Received message kind: {}", kind));
if (kind == tunAddressMsg) {
uxcontrol::AddressMessage addrMessage;
@@ -176,7 +175,8 @@ void UxClient::SendMessages(void) {
while (true) {
auto readRes = interface.Read();
if (!readRes) {
uxlogger.Log(std::format("Read packet error: {}", readRes.error()));
uxlogger.Error(std::format("Read packet error: {}", readRes.error()));
break;
}
auto packet = readRes.value();
@@ -199,10 +199,10 @@ void UxClient::SendMessages(void) {
if ((wsize = send(sock, rawPacket.data(), rawPacket.size(), 0)) < 0) {
int errnoCopy = errno;
std::string error = std::strerror(errnoCopy);
uxlogger.Log(std::format("Write packet error: {}", error));
uxlogger.Error(std::format("Write packet error: {}", error));
break;
}
uxlogger.Log("Send message");
uxlogger.Debug("Send internet message");
}
done.release();
return;
@@ -247,7 +247,7 @@ std::expected<void, std::string> UxClient::Run(void) {
recvThr.detach();
done.acquire();
uxlogger.Log("Client done");
uxlogger.Info("Client done");
return {};
}