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
sockhand.cpp
+13 -13
View File
@@ -46,19 +46,19 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, st
std::thread recvThr(&SocketHandler::RecvMessages, this);
recvThr.detach();
{
uxlogger.Log(std::format("Send debug empty message"));
uxlogger.Debug(std::format("Send debug empty message"));
MessageHeader header(0);
auto rawHeader = header.Encode();
int wsize;
if ((wsize = write(sock, rawHeader.data(), rawHeader.size())) < 0) {
int errnoCopy = errno;
std::string error = std::strerror(errnoCopy);
uxlogger.Log(std::format("Write message error: {}", error));
uxlogger.Error(std::format("Write message error: {}", error));
return;
}
}
{
uxlogger.Log(std::format("Send address message"));
uxlogger.Debug(std::format("Send address message"));
uxcontrol::AddressMessage addrMsg;
auto meta = addrMsg.mutable_meta();
meta->set_kind(tunAddressMsg);
@@ -77,7 +77,7 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, st
if ((wsize = write(sock, rawPacket.data(), rawPacket.size())) < 0) {
int errnoCopy = errno;
std::string error = std::strerror(errnoCopy);
uxlogger.Log(std::format("Write message error: {}", error));
uxlogger.Error(std::format("Write message error: {}", error));
return;
}
}
@@ -96,7 +96,7 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, st
auto network = networkRes.value();
auto prefix = prefixRes.value();
uxlogger.Log(std::format("Send route message for {}/{}", network, prefix));
uxlogger.Info(std::format("Send route message for {}/{}", network, prefix));
uxcontrol::RouteMessage routeMsg;
auto meta = routeMsg.mutable_meta();
meta->set_kind(localRouteMsg);
@@ -115,7 +115,7 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, st
if ((wsize = write(sock, rawPacket.data(), rawPacket.size())) < 0) {
int errnoCopy = errno;
std::string error = std::strerror(errnoCopy);
uxlogger.Log(std::format("Write message error: {}", error));
uxlogger.Error(std::format("Write message error: {}", error));
return;
}
@@ -124,7 +124,7 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, st
sendThr.detach();
done.acquire();
uxlogger.Log("Handler done");
uxlogger.Debug("Handler done");
}
void SocketHandler::SendMessages(void) {
@@ -163,7 +163,7 @@ void SocketHandler::SendMessages(void) {
}
done.release();
uxlogger.Log("Send messages done");
uxlogger.Info("Send messages done");
}
void SocketHandler::RecvMessages(void) {
@@ -173,17 +173,17 @@ void SocketHandler::RecvMessages(void) {
if ((rsize = recv(sock, rawHeader.data(), rawHeader.size(), MSG_WAITALL)) < 0) {
int errnoCopy = 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 {} header bytes", rsize, msgHeaderSize));
uxlogger.Error(std::format("Read only {} from {} header 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()));
break;
}
auto pSize = header.PayloadSize();
@@ -194,7 +194,7 @@ void SocketHandler::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 simpleMsg;
@@ -218,5 +218,5 @@ void SocketHandler::RecvMessages(void) {
}
}
done.release();
uxlogger.Log("Recv messages done");
uxlogger.Info("Recv messages done");
}