From cdadbdbd17d624dd45cca67f41309cbe776dc348 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 30 Jul 2011 19:49:42 +0300
Subject: Server configuration is now written when "/#setting whatever =
 whatever" is issued.

---
 src/server.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/server.h')

diff --git a/src/server.h b/src/server.h
index 1da004da5..c300d40e6 100644
--- a/src/server.h
+++ b/src/server.h
@@ -364,7 +364,8 @@ public:
 	*/
 
 	Server(
-		std::string mapsavedir
+		std::string mapsavedir,
+		std::string configpath
 	);
 	~Server();
 	void start(unsigned short port);
@@ -443,6 +444,13 @@ public:
 			dstream<<"WARNING: Auth not found for "<<name<<std::endl;
 		}
 	}
+	
+	// Saves g_settings to configpath given at initialization
+	void saveConfig()
+	{
+		if(m_configpath != "")
+			g_settings.updateConfigFile(m_configpath.c_str());
+	}
 
 private:
 
@@ -606,6 +614,9 @@ private:
 	// Map directory
 	std::string m_mapsavedir;
 
+	// Configuration path ("" = no configuration file)
+	std::string m_configpath;
+
 	bool m_shutdown_requested;
 	
 	/*
-- 
cgit v1.2.3


From f2051c98223d087c8ba3d7e4514935781c93ed1c Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 30 Jul 2011 20:10:16 +0300
Subject: fix to the former

---
 src/server.cpp | 15 ++++++++++-----
 src/server.h   |  3 +++
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/server.h')

diff --git a/src/server.cpp b/src/server.cpp
index 368f0acbf..07f9875c4 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1979,13 +1979,13 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 		{
 			net_proto_version = readU16(&data[2+1+PLAYERNAME_SIZE+PASSWORD_SIZE]);
 		}
-		if(net_proto_version == 0)
+		getClient(peer->id)->net_proto_version = net_proto_version;
+		/*if(net_proto_version == 0)
 		{
-			/*SendAccessDenied(m_con, peer_id,
+			SendAccessDenied(m_con, peer_id,
 					L"Your client is too old (network protocol)");
-			return;*/
-			SendChatMessage(peer_id, L"# Server: NOTE: YOUR CLIENT IS OLD AND DOES NOT WORK PROPERLY WITH THIS SERVER");
-		}
+			return;
+		}*/
 
 		/*
 			Set up player
@@ -2182,6 +2182,11 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 			BroadcastChatMessage(message);
 		}
 
+		if(getClient(peer->id)->net_proto_version == 0)
+		{
+			SendChatMessage(peer_id, L"# Server: NOTE: YOUR CLIENT IS OLD AND DOES NOT WORK PROPERLY WITH THIS SERVER");
+		}
+
 		return;
 	}
 
diff --git a/src/server.h b/src/server.h
index c300d40e6..4a2d667a8 100644
--- a/src/server.h
+++ b/src/server.h
@@ -235,6 +235,8 @@ public:
 	u16 peer_id;
 	// The serialization version to use with the client
 	u8 serialization_version;
+	//
+	u16 net_proto_version;
 	// Version is stored in here after INIT before INIT2
 	u8 pending_serialization_version;
 
@@ -244,6 +246,7 @@ public:
 	{
 		peer_id = 0;
 		serialization_version = SER_FMT_VER_INVALID;
+		net_proto_version = 0;
 		pending_serialization_version = SER_FMT_VER_INVALID;
 		m_nearest_unsent_d = 0;
 		m_nearest_unsent_reset_timer = 0.0;
-- 
cgit v1.2.3