[springlobby] 01/04: New upstream version 0.258+dfsg

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository springlobby.

commit 2e12212557549c5cb8cb6d6ca7bf9e7601a09330
Author: Markus Koschany <apo at debian.org>
Date:   Sat Oct 7 18:54:29 2017 +0200

    New upstream version 0.258+dfsg
---
 CMakeLists.txt       |  2 +-
 ChangeLog            | 10 +++++++++-
 VERSION              |  2 +-
 springlobby_config.h |  2 +-
 src/tasserver.cpp    | 20 +++++++++++++++-----
 src/tasserver.h      |  4 +++-
 6 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a65ff01..71bee1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,7 +137,7 @@ ELSE (WIN32)
 	install(FILES AUTHORS COPYING README THANKS NEWS DESTINATION "${CMAKE_INSTALL_PREFIX}${SHARE_INSTALL_DIR}/doc/springlobby")
 	install(FILES src/images/springlobby.svg DESTINATION "${CMAKE_INSTALL_PREFIX}${SHARE_INSTALL_DIR}/icons/hicolor/scalable/apps")
 	install(FILES src/springlobby.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}${SHARE_INSTALL_DIR}/applications")
-	install(FILES share/freedesktop.org/springlobby.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}${SHARE_INSTALL_DIR}/appdata")
+	install(FILES share/freedesktop.org/springlobby.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}${SHARE_INSTALL_DIR}/metainfo")
 ENDIF (WIN32)
 
 add_custom_target(pack ${CMAKE_MAKE_PROGRAM} package
diff --git a/ChangeLog b/ChangeLog
index 01ac19a..f975e48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
 ChangeLog of Springlobby
+
+## 0.258
+ - fix regression #787: broken user registering due TLS support
+ - Install appdata file into canonical directory
+
 ## 0.257
  - fix unit restrictions
- - add experimental tls support (default disabled)
+ - add tls support
+ - battleroom: Add a promote button that sends !promote
+ - settings: make the lobby remember account password by default
+ - Edit->Autojoin channels joins immidiately if possible.
 
 ## 0.256
  - lazy init of unitsync (faster startup)
diff --git a/VERSION b/VERSION
index d6aadf1..7cf6512 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.257
+0.258
diff --git a/springlobby_config.h b/springlobby_config.h
index 3482b07..b756602 100644
--- a/springlobby_config.h
+++ b/springlobby_config.h
@@ -6,6 +6,6 @@
 #undef VERSION
 
 /* the git tag / commit we build from */
-#define VERSION "0.257"
+#define VERSION "0.258"
 
 #endif	/* SPRINGLOBBY_HEADERGUARD_CONFIG_H */
diff --git a/src/tasserver.cpp b/src/tasserver.cpp
index 23209ce..68d94c1 100644
--- a/src/tasserver.cpp
+++ b/src/tasserver.cpp
@@ -76,6 +76,7 @@ TASServer::TASServer()
     , m_server_lanmode(false)
     , m_account_id_count(0)
     , m_do_finalize_join_battle(false)
+    , m_do_register(false)
     , m_finalize_join_battle_id(-1)
 {
 	m_se = new ServerEvents(*this);
@@ -324,7 +325,7 @@ bool TASServer::IsOnline() const
 void TASServer::Register(const ServerLoginInfo& server)
 {
 	Connect(server);
-	SendCmd("REGISTER", server.username + std::string(" ") + GetPasswordHash(server.password));
+	m_do_register = true;
 }
 
 
@@ -537,11 +538,15 @@ void TASServer::ExecuteCommand(const std::string& cmd, const std::string& inpara
 		} else {
 #endif
 			m_ser_ver = GetIntParam(params);
-			const std::string supported_spring_version = GetWordParam(params);
+			m_supported_spring_version = GetWordParam(params);
 			m_nat_helper_port = (unsigned long)GetIntParam(params);
-			const bool lanmode = GetBoolParam(params);
-			m_server_lanmode = lanmode;
-			m_se->OnConnected(m_serverinfo.description, "", (m_ser_ver > 0), supported_spring_version, lanmode);
+			m_server_lanmode = GetBoolParam(params);
+
+			if (m_do_register) {
+				SendCmd("REGISTER", m_serverinfo.username + std::string(" ") + GetPasswordHash(m_serverinfo.password));
+			} else {
+				m_se->OnConnected(m_serverinfo.description, "", true, m_supported_spring_version, m_server_lanmode);
+			}
 #ifdef SSL_SUPPORT
 		}
 #endif
@@ -941,7 +946,9 @@ void TASServer::ExecuteCommand(const std::string& cmd, const std::string& inpara
 		const std::string scriptpw = GetWordParam(params);
 		m_se->OnForceJoinBattle(battleID, scriptpw);
 	} else if (cmd == "REGISTRATIONACCEPTED") {
+		m_do_register = false;
 		m_se->RegistrationAccepted(GetUserName(), GetPassword());
+		m_se->OnConnected(m_serverinfo.description, "", true, m_supported_spring_version, m_server_lanmode);
 	} else if (cmd == "REGISTRATIONDENIED") {
 		m_se->RegistrationDenied(params);
 	} else if (cmd == "LISTSUBSCRIPTION") {
@@ -1788,6 +1795,9 @@ void TASServer::OnDisconnected(wxSocketError err)
 	m_relay_host_manager_list.clear();
 	m_last_id = 0;
 	m_pinglist.clear();
+	m_do_register = false;
+	m_server_lanmode = false;
+	m_supported_spring_version.clear();
 	if (m_se != NULL) {
 		IServer::Reset();
 		m_se->OnDisconnected(connectionwaspresent);
diff --git a/src/tasserver.h b/src/tasserver.h
index 07f3d73..fe8dd52 100644
--- a/src/tasserver.h
+++ b/src/tasserver.h
@@ -44,7 +44,6 @@ public:
 	void Register(const ServerLoginInfo& server) override;
 	void AcceptAgreement() override;
 
-	void Connect(const ServerLoginInfo& server) override;
 	void Disconnect() override;
 	bool IsConnected() override;
 
@@ -120,6 +119,7 @@ public:
 	void SendScriptToProxy(const std::string& script) override;
 
 private:
+	void Connect(const ServerLoginInfo& server) override;
 	void SendUdpSourcePort(int udpport);
 	void SendNATHelperInfos(const std::string& username, const std::string& ip, int port);
 
@@ -218,12 +218,14 @@ private:
 	std::string m_delayed_open_command;
 
 	bool m_do_finalize_join_battle;
+	bool m_do_register;
 	int m_finalize_join_battle_id;
 	std::string m_finalize_join_battle_pw;
 
 	std::string m_current_chan_name_mutelist;
 	std::string m_relay_host_bot;
 	std::string m_relay_host_manager;
+	std::string m_supported_spring_version;
 };
 
 #endif // SPRINGLOBBY_HEADERGUARD_TASSERVER_H

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git