SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PICloud with streampacker

Browse Source
This commit is contained in:
Бычков Андрей
2021-04-07 14:38:32 +03:00
parent fcf9f0f80e
commit 1fd9851068
13 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libs/cloud/picloudserver.cpp
View File

@@ -21,10 +21,17 @@
PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), PICloudBase() {
PIString name = "PCS_" + PIString::fromNumber(randomi()%1000);
PIString server_name = "PCS_" + PIString::fromNumber(randomi()%1000);
tcp.setRole(PICloud::TCP::Server);
tcp.setServerName(name);
setName("cloud_server__" + name);
tcp.setServerName(server_name);
setName("cloud_server__" + server_name);
CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
CONNECTL(&eth, connected, [this](){tcp.sendStart();});
CONNECTL(&eth, disconnected, [this](bool){
piCoutObj << "disconnected";
opened_ = false;
piMSleep(100);
});
}
@@ -49,15 +56,7 @@ bool PICloudServer::openDevice() {
piCout << "PICloudServer open device" << path();
bool op = eth.connect(path(), false);
if (op) {
CONNECTU(&eth, threadedReadEvent, this, readed);
CONNECTL(&eth, connected, [this](){tcp.sendStart(&eth);});
CONNECTL(&eth, disconnected, [this](bool){
opened_ = false;
eth.close();
piCoutObj << "disconnected" << !isOpened() << isClosed();
});
eth.startThreadedRead();
tcp.sendStart(&eth);
return true;
}
eth.close();
@@ -87,12 +86,12 @@ int PICloudServer::writeDevice(const void * data, int max_size) {
void PICloudServer::clientDisconnect(uint client_id) {
tcp.sendDisconnected(&eth, client_id);
tcp.sendDisconnected(client_id);
}
int PICloudServer::sendData(const PIByteArray & data, uint client_id) {
return tcp.sendData(&eth, data, client_id);
return tcp.sendData(data, client_id);
}
@@ -138,8 +137,7 @@ void PICloudServer::Client::pushBuffer(const PIByteArray & ba) {
}
void PICloudServer::readed(uchar *data, int size) {
PIByteArray ba(data, size);
void PICloudServer::_readed(PIByteArray & ba) {
PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
if (hdr.second == tcp.role()) {
switch (hdr.first) {
@@ -147,7 +145,7 @@ void PICloudServer::readed(uchar *data, int size) {
uint id = tcp.parseConnect(ba);
Client * oc = index_clients.value(id, nullptr);
if (oc) {
tcp.sendDisconnected(&eth, id);
tcp.sendDisconnected(id);
} else {
Client * c = new Client(this, id);
clients << c;