pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1162 from ONLYOFFICE/hotfix/v7.3.3

Browse Source 
Add define for reconnect timeout
This commit is contained in:
Oleg Korshul
2023-04-14 17:25:52 +03:00
committed by GitHub
parent 6f4041b476 4910d69a40
commit a61c267941
6 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Common/Network/WebSocket/include/websocket.h
View File

@ -49,6 +49,7 @@ namespace NSNetwork
virtual void send(const std::string& message) = 0;
virtual void close() = 0;
virtual void setUrl(const std::string& url) = 0;
virtual bool setReconnectInfo(const int& attemtCount, const int& delay, const int& delayMax) { return false; }
virtual ~IWebSocket() {}
};

6
Common/Network/WebSocket/src/socketio/socketio_internal.cpp
View File

@ -64,5 +64,11 @@ namespace NSNetwork
{
delete m_internal;
}
bool CIOWebSocket::setReconnectInfo(const int& attemtCount, const int& delay, const int& delayMax)
{
m_internal->setReconnectInfo(attemtCount, delay, delayMax);
return true;
}
}
}

2
Common/Network/WebSocket/src/socketio/socketio_internal.h
View File

@ -63,6 +63,7 @@ namespace NSNetwork
virtual void open(const std::map<std::string, std::string>& query) = 0;
virtual void send(const std::string& message) = 0;
virtual void close() = 0;
virtual void setReconnectInfo(const int& attemtCount, const int& delay, const int& delayMax) = 0;
};
class CIOWebSocket: public CWebWorkerBase
@ -78,6 +79,7 @@ namespace NSNetwork
virtual void open(const std::map<std::string, std::string>& query) override;
virtual void send(const std::string& message) override;
virtual void close() override;
virtual bool setReconnectInfo(const int& attemtCount, const int& delay, const int& delayMax);
friend class CIOWebSocket_private;
friend class CIOWebSocket_private_tls;

7
Common/Network/WebSocket/src/socketio/socketio_internal_private.h
View File

@ -230,6 +230,13 @@ namespace NSNetwork
m_socket.reset();
}
virtual void setReconnectInfo(const int& attemtCount, const int& delay, const int& delayMax) override
{
m_socket->set_reconnect_attempts(attemtCount);
m_socket->set_reconnect_delay(delay);
m_socket->set_reconnect_delay_max(delayMax);
}
};
}
}

7
Common/Network/WebSocket/src/socketio/socketio_internal_private_no_tls.h
View File

@ -234,6 +234,13 @@ namespace NSNetwork
m_socket.reset();
}
virtual void setReconnectInfo(const int& attemtCount, const int& delay, const int& delayMax) override
{
m_socket->set_reconnect_attempts(attemtCount);
m_socket->set_reconnect_delay(delay);
m_socket->set_reconnect_delay_max(delayMax);
}
};
}
}

3
Common/Network/WebSocket/websocket.pri
View File

@ -59,7 +59,8 @@ libsocketio {
_WEBSOCKETPP_CPP11_CHRONO_ \
\
"SIO_TLS=1" \
"SIO_TLS_NO=0"
"SIO_TLS_NO=0" \
"PING_TIMEOUT_INTERVAL=20000"
include($$PWD/../../3dParty/boost/boost.pri)