3 files changed, 14 insertions, 11 deletions
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index ed54be0fb..3d472bf7a 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -174,12 +174,7 @@ std::string ModuleSpanningTree::TimeToStr(time_t secs)
 const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current)
 {
 	time_t secs_up = ServerInstance->Time() - Current->age;
-
-#ifndef WIN32
 	return (" [Up: " + TimeToStr(secs_up) + " Lag: "+ConvToStr(Current->rtt)+"ms]");
-#else
-	return (" [Up: " + TimeToStr(secs_up) + " Lag: "+ConvToStr(Current->rtt)+"s]");
-#endif
 }
 
 // WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS.
@@ -492,12 +487,10 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime)
 					sock->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" PING "+serv->GetName());
 					serv->SetNextPingTime(curtime + Utils->PingFreq);
 					serv->LastPing = curtime;
-#ifndef WIN32
 					timeval t;
 					gettimeofday(&t, NULL);
 					long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
 					serv->LastPingMsec = ts;
-#endif
 					serv->Warned = false;
 				}
 				else
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 527c0122b..88c7666bf 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -365,14 +365,10 @@ bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &p
 		if (ServerSource)
 		{
 			ServerSource->SetPingFlag();
-#ifndef WIN32
 			timeval t;
 			gettimeofday(&t, NULL);
 			long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
 			ServerSource->rtt = ts - ServerSource->LastPingMsec;
-#else
-			ServerSource->rtt = Instance->Time() - ServerSource->LastPing;
-#endif
 		}
 	}
 	else
diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 28ba8c252..3aef464e6 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -93,10 +93,24 @@ std::string SocketEngine::GetName()
 
 bool SocketEngine::BoundsCheckFd(EventHandler* eh)
 {       
+#ifdef WINDOWS
+	int * internal_fd;
+	if(!eh || eh->GetFd() < 0)
+		return false;
+
+	if(!eh->GetExt("internal_fd", internal_fd))
+		return false;
+
+	if(*internal_fd > MAX_DESCRIPTORS)
+		return false;
+
+	return true;
+#else
 	if (!eh)
 		return false;
 	if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS))
 		return false;
 	return true;
+#endif
 }