Send update host also with registration response

The client would otherwise not know which update host to use after
registration.

Also, the update host is now always sent, even if it is empty. This
makes the message contents more deterministic.

Reviewed-by: Jared Adams

1 files changed, 8 insertions, 3 deletions

diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index fdffd911..002803e6 100644
--- a/src/account-server/accounthandler.cpp
+++ b/src/account-server/accounthandler.cpp
@@ -40,6 +40,12 @@
 #include "utils/tokendispenser.hpp"
 #include "utils/sha256.h"
 
+static void addUpdateHost(MessageOut *msg)
+{
+    std::string updateHost = Configuration::getValue("defaultUpdateHost", "");
+    msg->writeString(updateHost);
+}
+
 class AccountHandler : public ConnectionHandler
 {
 public:
@@ -255,9 +261,7 @@ void AccountHandler::handleLoginMessage(AccountClient &client, MessageIn &msg)
     client.status = CLIENT_CONNECTED;
 
     reply.writeByte(ERRMSG_OK);
-    std::string updateHost = Configuration::getValue("defaultUpdateHost","");
-    if (updateHost != "")
-        reply.writeString(updateHost);
+    addUpdateHost(&reply);
     client.send(reply); // Acknowledge login
 
     // Return information about available characters
@@ -399,6 +403,7 @@ void AccountHandler::handleRegisterMessage(AccountClient &client, MessageIn &msg
 
         storage->addAccount(acc);
         reply.writeByte(ERRMSG_OK);
+        addUpdateHost(&reply);
 
         // Associate account with connection
         client.setAccount(acc);