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

Merge branch 'master' into pisteampackerconfig

Browse Source 
# Conflicts:
#	libs/client_server/piclientserver_server.cpp
#	libs/crypt/picrypt.cpp
#	libs/io_utils/pistreampacker.cpp
#	main.cpp
This commit is contained in:
Бычков Андрей
2024-11-16 14:34:34 +03:00
parent 315966504e f6b9131f4a
commit d90c3f0991
83 changed files with 3583 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/client_server/piclientserver_server.cpp
View File

@@ -20,6 +20,7 @@
#include "piclientserver_client.h"
#include "piethernet.h"
#include "pitranslator.h"
PIClientServer::Server::Server() {
@@ -29,13 +30,13 @@ PIClientServer::Server::Server() {
CONNECTL(tcp_server, newConnection, [this](PIEthernet * c) {
PIMutexLocker guard(clients_mutex);
if (clients.size_s() >= max_clients) {
piCout << "Server::newConnection overflow clients count";
piCout << "Server::newConnection overflow clients count"_tr("PIClientServer");
delete c;
return;
}
auto sc = client_factory();
if (!sc) {
piCout << "ClientFactory returns nullptr!";
piCout << "ClientFactory returns nullptr!"_tr("PIClientServer");
return;
}
sc->createForServer(this, c);