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

PIEthernet more accuracy construct

Browse Source 
PIThread windows fix
This commit is contained in:
Пелипенко Иван
2024-09-17 16:11:18 +03:00
parent e186e0adff
commit bdd18b614f
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/main/io_devices/piethernet.cpp
View File

@@ -119,7 +119,8 @@ PRIVATE_DEFINITION_END(PIEthernet)
PIEthernet::PIEthernet(): PIIODevice("", ReadWrite) {
construct();
setType(UDP);
eth_type = UDP;
setProperty("type", (int)UDP);
setParameters(PIEthernet::ReuseAddress | PIEthernet::MulticastLoop | PIEthernet::KeepConnection);
}
@@ -128,7 +129,8 @@ PIEthernet::PIEthernet(PIEthernet::Type type_, const PIString & ip_port, const P
: PIIODevice(ip_port, ReadWrite) {
construct();
addr_r.set(ip_port);
setType(type_);
eth_type = type_;
setProperty("type", (int)type_);
setParameters(params_);
if (type_ != UDP) init();
}
@@ -140,9 +142,10 @@ PIEthernet::PIEthernet(int sock_, PIString ip_port): PIIODevice("", ReadWrite) {
sock = sock_;
opened_ = connected_ = true;
is_server_client = true;
eth_type = TCP_Client;
setProperty("type", (int)TCP_Client);
init();
setParameters(PIEthernet::ReuseAddress | PIEthernet::MulticastLoop);
setType(TCP_Client, false);
setPath(ip_port);
ethNonblocking(sock);
PRIVATE->event.create();
@@ -162,8 +165,6 @@ PIEthernet::~PIEthernet() {
void PIEthernet::construct() {
// piCout << " PIEthernet" << uint(this);
setOption(BlockingWrite);
connected_ = connecting_ = listen_threaded = server_bounded = false;
sock = sock_s = -1;
setReadTimeout(10_s);
setWriteTimeout(10_s);
setTTL(64);
@@ -179,9 +180,9 @@ void PIEthernet::construct() {
}
bool PIEthernet::init() {
if (isOpened() || is_server_client) return true;
if (sock != -1) return true;
void PIEthernet::init() {
if (isOpened() || is_server_client) return;
if (sock != -1) return;
// piCout << "init " << type();
PRIVATE->event.destroy();
if (sock_s == sock) sock_s = -1;
@@ -204,13 +205,12 @@ bool PIEthernet::init() {
sock_s = sock;
if (sock == -1 || sock_s == -1) {
piCoutObj << "Can`t create socket," << ethErrorString();
return false;
return;
}
applyParameters();
applyTimeouts();
applyOptInt(IPPROTO_IP, IP_TTL, TTL());
// piCoutObj << "inited" << path();
return true;
}