mirror of
https://github.com/g4klx/DMRGateway.git
synced 2026-01-20 07:10:19 +01:00
Re-organise the UDP handling.
This commit is contained in:
parent
11683af7e4
commit
2b81fe225b
|
|
@ -102,6 +102,10 @@ bool CDMRNetwork::open()
|
|||
|
||||
LogMessage("%s, Opening DMR Network", m_name.c_str());
|
||||
|
||||
bool ret = m_socket.open(m_addr);
|
||||
if (!ret)
|
||||
return false;
|
||||
|
||||
m_status = WAITING_CONNECT;
|
||||
m_timeoutTimer.stop();
|
||||
m_retryTimer.start();
|
||||
|
|
@ -325,16 +329,12 @@ void CDMRNetwork::clock(unsigned int ms)
|
|||
if (m_status == WAITING_CONNECT) {
|
||||
m_retryTimer.clock(ms);
|
||||
if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) {
|
||||
bool ret = m_socket.open(m_addr);
|
||||
if (ret) {
|
||||
ret = writeLogin();
|
||||
if (!ret)
|
||||
return;
|
||||
|
||||
m_status = WAITING_LOGIN;
|
||||
m_timeoutTimer.start();
|
||||
}
|
||||
bool ret = writeLogin();
|
||||
if (!ret)
|
||||
return;
|
||||
|
||||
m_status = WAITING_LOGIN;
|
||||
m_timeoutTimer.start();
|
||||
m_retryTimer.start();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue