6 files changed, 8 insertions, 1 deletions
diff --git a/src/base.cpp b/src/base.cpp
index b24646ab8..7e0cf482a 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -23,7 +23,6 @@ const int inverted_bitfields[]  =       {~1,~2,~4,~8,~16,~32,~64,~128};
 
 classbase::classbase()
 {
-	this->age = time(NULL);
 }
 
 bool Extensible::Shrink(const std::string &key)
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 80f2c0b99..8d21d5cc8 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -79,9 +79,11 @@ class IdentRequestSocket : public EventHandler
 	bool done;			/* True if lookup is finished */
 	std::string result;		/* Holds the ident string if done */
  public:
+	time_t age;
 
 	IdentRequestSocket(InspIRCd *Server, User* u) : user(u), ServerInstance(Server), result(u->ident)
 	{
+		age = ServerInstance->Time();
 		socklen_t size = 0;
 
 		SetFd(socket(user->server_sa.sa.sa_family, SOCK_STREAM, 0));
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index b6ec7a305..97aab7266 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -30,6 +30,7 @@
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id)
 						: ServerInstance(Instance), ServerName(Name.c_str()), ServerDesc(Desc), Utils(Util)
 {
+	age = Instance->Time();
 	bursting = false;
 	Parent = NULL;
 	VersionString.clear();
@@ -50,6 +51,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide)
 	: ServerInstance(Instance), Parent(Above), ServerName(Name.c_str()), ServerDesc(Desc), Socket(Sock), Utils(Util), Hidden(Hide)
 {
+	age = Instance->Time();
 	bursting = true;
 	VersionString.clear();
 	ServerUserCount = ServerOperCount = 0;
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index f39778eb0..e8db09cdf 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -52,6 +52,7 @@ class TreeServer : public classbase
 	void SetID(const std::string &id);
 
  public:
+	time_t age;
 
 	bool Warned;				/* True if we've warned opers about high latency on this server */
 	bool bursting;				/* whether or not this server is bursting */
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 6d99c2a76..3c736b341 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -93,6 +93,7 @@ class TreeSocket : public BufferedSocket
 	bool auth_challenge;			/* Did we auth using challenge/response */
  public:
 	HandshakeTimer* hstimer;		/* Handshake timer, needed to work around I/O hook buffering */
+	time_t age;
 
 	/** Because most of the I/O gubbins are encapsulated within
 	 * BufferedSocket, we just call the superclass constructor for
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 46f2657ff..9706271bf 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -39,6 +39,7 @@
 TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string shost, int iport, unsigned long maxtime, const std::string &ServerName, const std::string &bindto, Module* HookMod)
 	: BufferedSocket(SI, shost, iport, maxtime, bindto), Utils(Util), Hook(HookMod)
 {
+	age = SI->Time();
 	myhost = ServerName;
 	theirchallenge.clear();
 	ourchallenge.clear();
@@ -56,6 +57,7 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string sh
 TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, int newfd, char* ip, Module* HookMod)
 	: BufferedSocket(SI, newfd, ip), Utils(Util), Hook(HookMod)
 {
+	age = SI->Time();
 	this->LinkState = WAIT_AUTH_1;
 	theirchallenge.clear();
 	ourchallenge.clear();