From e3827bbd1b88fa34d5a36ab1b2e506e2dbfd08ce Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Tue, 2 May 2017 15:58:15 +0100
Subject: [PATCH] Simplify the link reversion logic.

---
 YSFGateway/YSFGateway.cpp | 45 +++++++++++++--------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/YSFGateway/YSFGateway.cpp b/YSFGateway/YSFGateway.cpp
index 23efd39..4f2fb28 100644
--- a/YSFGateway/YSFGateway.cpp
+++ b/YSFGateway/YSFGateway.cpp
@@ -346,41 +346,26 @@ int CYSFGateway::run()
 		inactivityTimer.clock(ms);
 		if (inactivityTimer.isRunning() && inactivityTimer.hasExpired()) {
 			if (m_linked) {
-				if (revert) {
-					CYSFReflector* reflector = m_wiresX->getReflector(startup);
-					if (reflector != NULL) {
-						LogMessage("Reverting connection to %s", reflector->m_id.c_str());
+				CYSFReflector* reflector = NULL;
+				if (revert && !startup.empty() && m_wiresX != NULL)
+					reflector = m_wiresX->getReflector(startup);
 
-						if (m_wiresX != NULL)
-							m_wiresX->processConnect(reflector);
+				if (reflector != NULL) {
+					LogMessage("Reverting connection to %5.5s", reflector->m_id.c_str());
 
-						m_netNetwork->writeUnlink();
-						m_netNetwork->writeUnlink();
-						m_netNetwork->writeUnlink();
-
-						m_netNetwork->setDestination(reflector->m_address, reflector->m_port);
-						m_netNetwork->writePoll();
-						m_netNetwork->writePoll();
-						m_netNetwork->writePoll();
-
-						lostTimer.start();
-						pollTimer.start();
-					} else {
-						LogMessage("Disconnecting due to inactivity");
+					m_wiresX->processConnect(reflector);
 
-						if (m_wiresX != NULL)
-							m_wiresX->processDisconnect();
-
-						m_netNetwork->writeUnlink();
-						m_netNetwork->writeUnlink();
-						m_netNetwork->writeUnlink();
-						m_netNetwork->clearDestination();
+					m_netNetwork->writeUnlink();
+					m_netNetwork->writeUnlink();
+					m_netNetwork->writeUnlink();
 
-						lostTimer.stop();
-						pollTimer.stop();
+					m_netNetwork->setDestination(reflector->m_address, reflector->m_port);
+					m_netNetwork->writePoll();
+					m_netNetwork->writePoll();
+					m_netNetwork->writePoll();
 
-						m_linked = false;
-					}
+					lostTimer.start();
+					pollTimer.start();
 				} else {
 					LogMessage("Disconnecting due to inactivity");