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-06 15:10:19 +02:00
parent eda9b8986b
commit 9540ac05d4
17 changed files with 849 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sockhand.cpp
+69 -46
View File
@@ -1,4 +1,8 @@
extern "C" {
#include <sys/socket.h>
}
#include <expected>
#include <string>
#include <iostream>
@@ -6,52 +10,43 @@
#include <chrono>
#include <cstring>
#include <semaphore>
#include <format>
#include <msgheader.hpp>
#include <sockhand.hpp>
#include <uxlogger.hpp>
//#include <uxcontrol.pb.h>
#include <uxcontrol.pb.h>
using namespace std::chrono_literals;
void SocketHandler::RecvMessages(void) {
while (true) {
uxlogger.Log("Handle socket");
int rsize = 0;
std::string rawHeader(msgHeaderSize, 0);
{
if ((rsize = read(sock, rawHeader.data(), rawHeader.size())) < 0) {
int errnoCopy = errno;
std::string error = std::strerror(errnoCopy);
uxlogger.Log(std::format("Read header error: {}", error));
break;
}
}
if (rsize < msgHeaderSize) {
uxlogger.Log(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()));
}
std::string rawMessage(header.PacketSize(), 0);
{
if ((rsize = read(sock, rawMessage.data(), rawMessage.size())) < 0) {
int errnoCopy = errno;
std::string error = std::strerror(errnoCopy);
uxlogger.Log(std::format("Read message error: {}", error));
break;
}
}
void SocketHandler::Handle(int newsock) {
sock = newsock;
auto createRes = interface.Create(std::format("uxsrv{}", sock));
if (!createRes) {
uxlogger.Log(createRes.error());
return;
}
done.release();
uxlogger.Log("RecvMessages done");
auto upRes = interface.Up();
if (!createRes) {
uxlogger.Log(createRes.error());
return;
}
std::thread sendThr(&SocketHandler::SendMessages, this);
sendThr.detach();
std::thread recvThr(&SocketHandler::RecvMessages, this);
recvThr.detach();
done.acquire();
uxlogger.Log("Handler done");
}
void SocketHandler::SendMessages(void) {
while (true) {
MessageHeader header(0);
@@ -68,20 +63,48 @@ void SocketHandler::SendMessages(void) {
std::this_thread::sleep_for(std::chrono::seconds(1));
}
done.release();
uxlogger.Log("SendMessages done");
uxlogger.Log("Send messages done");
}
void SocketHandler::Handle(int newsock) {
sock = newsock;
void SocketHandler::RecvMessages(void) {
while (true) {
int rsize = 0;
std::string rawHeader(msgHeaderSize, 0);
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));
break;
}
if (rsize < msgHeaderSize) {
uxlogger.Log(std::format("Read only {} from {} bytes", rsize, msgHeaderSize));
break;
}
uxlogger.Log(std::format("Receive header rsize {}", rsize));
std::thread sendThr(&SocketHandler::SendMessages, this);
sendThr.detach();
MessageHeader header;
auto decodeRes = header.Decode(rawHeader);
if (!decodeRes) {
uxlogger.Log(std::format("Decode header error: {}", decodeRes.error()));
break;
}
auto pSize = header.PacketSize();
uxlogger.Log(std::format("Message size {}", pSize));
std::thread recvThr(&SocketHandler::RecvMessages, this);
recvThr.detach();
done.acquire();
uxlogger.Log("Handler done");
if (pSize > 0) {
std::string rawMessage(pSize, 0);
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));
break;
}
uxlogger.Log(std::format("Receive message rsize {}", rsize));
uxcontrol::Message msg;
msg.ParseFromString(rawMessage);
uxlogger.Log(std::format("Receive message, kind {}", msg.meta().kind()));
}
}
done.release();
uxlogger.Log("Recv messages done");
}