summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/Makefile.am6
-rw-r--r--src/net/ea/loginhandler.cpp170
-rw-r--r--src/net/ea/loginhandler.h15
-rw-r--r--src/net/ea/loginrecv.cpp180
-rw-r--r--src/net/ea/loginrecv.h55
-rw-r--r--src/net/eathena/loginhandler.cpp171
-rw-r--r--src/net/eathena/loginhandler.h11
-rw-r--r--src/net/eathena/loginrecv.cpp201
-rw-r--r--src/net/eathena/loginrecv.h42
-rw-r--r--src/net/tmwa/loginhandler.cpp100
-rw-r--r--src/net/tmwa/loginhandler.h4
-rw-r--r--src/net/tmwa/loginrecv.cpp130
-rw-r--r--src/net/tmwa/loginrecv.h39
14 files changed, 706 insertions, 424 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc5cd7fab..d97683e4d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1379,6 +1379,8 @@ SET(SRCS_EVOL
net/ea/itemrecv.h
net/ea/loginhandler.cpp
net/ea/loginhandler.h
+ net/ea/loginrecv.cpp
+ net/ea/loginrecv.h
net/ea/network.cpp
net/ea/network.h
net/ea/npchandler.cpp
@@ -1441,6 +1443,8 @@ SET(SRCS_TMWA
net/tmwa/itemrecv.h
net/tmwa/loginhandler.cpp
net/tmwa/loginhandler.h
+ net/tmwa/loginrecv.cpp
+ net/tmwa/loginrecv.h
net/tmwa/messagehandler.cpp
net/tmwa/messagehandler.h
net/tmwa/messagein.cpp
@@ -1628,6 +1632,8 @@ SET(SRCS_EATHENA
net/eathena/itemrecv.h
net/eathena/loginhandler.cpp
net/eathena/loginhandler.h
+ net/eathena/loginrecv.cpp
+ net/eathena/loginrecv.h
net/eathena/mailhandler.cpp
net/eathena/mailhandler.h
net/eathena/maphandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 81b2f8caf..68f7a3338 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1221,6 +1221,8 @@ manaplus_SOURCES += main.cpp \
net/ea/itemrecv.h \
net/ea/loginhandler.cpp \
net/ea/loginhandler.h \
+ net/ea/loginrecv.cpp \
+ net/ea/loginrecv.h \
net/ea/network.cpp \
net/ea/network.h \
net/ea/npchandler.cpp \
@@ -1284,6 +1286,8 @@ manaplus_SOURCES += \
net/tmwa/itemrecv.h \
net/tmwa/loginhandler.cpp \
net/tmwa/loginhandler.h \
+ net/tmwa/loginrecv.cpp \
+ net/tmwa/loginrecv.h \
net/tmwa/messagehandler.cpp \
net/tmwa/messagehandler.h \
net/tmwa/messagein.cpp \
@@ -1474,6 +1478,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
net/eathena/itemrecv.h \
net/eathena/loginhandler.cpp \
net/eathena/loginhandler.h \
+ net/eathena/loginrecv.cpp \
+ net/eathena/loginrecv.h \
net/eathena/mailhandler.cpp \
net/eathena/mailhandler.h \
net/eathena/maphandler.cpp \
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index e967b76b6..0958434f0 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -37,6 +37,7 @@
#include "net/logindata.h"
#include "net/messagein.h"
+#include "net/ea/loginrecv.h"
#include "net/ea/token.h"
#include "debug.h"
@@ -44,30 +45,24 @@
namespace Ea
{
-std::string LoginHandler::mUpdateHost;
-Worlds LoginHandler::mWorlds;
-Token LoginHandler::mToken;
-bool LoginHandler::mVersionResponse = false;
-bool LoginHandler::mRegistrationEnabled = true;
-
LoginHandler::LoginHandler() :
Net::LoginHandler()
{
- mVersionResponse = false;
- mRegistrationEnabled = true;
- mUpdateHost.clear();
- mWorlds.clear();
- mToken.clear();
+ LoginRecv::mVersionResponse = false;
+ LoginRecv::mRegistrationEnabled = true;
+ LoginRecv::mUpdateHost.clear();
+ LoginRecv::mWorlds.clear();
+ LoginRecv::mToken.clear();
}
LoginHandler::~LoginHandler()
{
- delete_all(mWorlds);
+ delete_all(LoginRecv::mWorlds);
}
bool LoginHandler::isRegistrationEnabled() const
{
- return mRegistrationEnabled;
+ return LoginRecv::mRegistrationEnabled;
}
void LoginHandler::getRegistrationDetails() const
@@ -88,17 +83,25 @@ void LoginHandler::loginAccount(LoginData *const loginData1) const
void LoginHandler::chooseServer(const unsigned int server,
const bool persistentIp) const
{
- if (static_cast<size_t>(server) >= mWorlds.size() || !mWorlds[server])
+ if (static_cast<size_t>(server) >= LoginRecv::mWorlds.size() ||
+ !LoginRecv::mWorlds[server])
+ {
return;
+ }
ServerInfo *const charServer = getCharServer();
if (charServer)
{
if (config.getBoolValue("usePersistentIP") || persistentIp)
+ {
charServer->hostname = settings.serverName;
+ }
else
- charServer->hostname = ipToString(mWorlds[server]->address);
- charServer->port = mWorlds[server]->port;
+ {
+ charServer->hostname = ipToString(
+ LoginRecv::mWorlds[server]->address);
+ }
+ charServer->port = LoginRecv::mWorlds[server]->port;
}
client->setState(STATE_UPDATE);
@@ -131,137 +134,13 @@ void LoginHandler::registerAccount(const LoginData *const loginData1) const
const Worlds &LoginHandler::getWorlds() const
{
- return mWorlds;
+ return LoginRecv::mWorlds;
}
void LoginHandler::clearWorlds()
{
- delete_all(mWorlds);
- mWorlds.clear();
-}
-
-void LoginHandler::processUpdateHost(Net::MessageIn &msg)
-{
- const int len = msg.readInt16("len") - 4;
- mUpdateHost = msg.readString(len, "update host");
-
- if (!checkPath(mUpdateHost))
- {
- mUpdateHost.clear();
- logger->log1("Warning: incorrect update server name");
- }
- loginData.updateHost = mUpdateHost;
-
- logger->log("Received update host \"%s\" from login server.",
- mUpdateHost.c_str());
-}
-
-void LoginHandler::processLoginData(Net::MessageIn &msg)
-{
- msg.readInt16("len");
-
- loginHandler->clearWorlds();
-
- const int worldCount = (msg.getLength() - 47) / 32;
-
- mToken.session_ID1 = msg.readInt32("session id1");
- mToken.account_ID = msg.readBeingId("accound id");
- mToken.session_ID2 = msg.readInt32("session id2");
- msg.readInt32("old ip");
- loginData.lastLogin = msg.readString(24, "last login");
- msg.readInt16("unused");
-
- // reserve bits for future usage
- mToken.sex = Being::intToGender(static_cast<uint8_t>(
- msg.readUInt8("gender") & 3U));
-
- for (int i = 0; i < worldCount; i++)
- {
- WorldInfo *const world = new WorldInfo;
-
- world->address = msg.readInt32("ip address");
- world->port = msg.readInt16("port");
- world->name = msg.readString(20, "name");
- world->online_users = msg.readInt16("online number");
- config.setValue("updatehost", mUpdateHost);
- world->updateHost = mUpdateHost;
- msg.readInt16("maintenance");
- msg.readInt16("new");
-
- logger->log("Network: Server: %s (%s:%d)", world->name.c_str(),
- ipToString(world->address), world->port);
-
- mWorlds.push_back(world);
- }
- client->setState(STATE_WORLD_SELECT);
-}
-
-void LoginHandler::processLoginError(Net::MessageIn &msg)
-{
- const uint8_t code = msg.readUInt8("error");
- logger->log("Login::error code: %u", static_cast<unsigned int>(code));
- std::string date = msg.readString(20, "date");
-
- switch (code)
- {
- case 0:
- // TRANSLATORS: error message
- errorMessage = _("Unregistered ID.");
- break;
- case 1:
- // TRANSLATORS: error message
- errorMessage = _("Wrong password.");
- LoginDialog::savedPassword.clear();
- break;
- case 2:
- // TRANSLATORS: error message
- errorMessage = _("Account expired.");
- break;
- case 3:
- // TRANSLATORS: error message
- errorMessage = _("Rejected from server.");
- break;
- case 4:
- // TRANSLATORS: error message
- errorMessage = _("You have been permanently banned from "
- "the game. Please contact the GM team.");
- break;
- case 5:
- // TRANSLATORS: error message
- errorMessage = _("Client too old.");
- break;
- case 6:
- // TRANSLATORS: error message
- errorMessage = strprintf(_("You have been temporarily "
- "banned from the game until %s.\nPlease contact the GM "
- "team via the forums."), date.c_str());
- break;
- case 7:
- // TRANSLATORS: error message
- errorMessage = _("Server overpopulated.");
- break;
- case 9:
- // TRANSLATORS: error message
- errorMessage = _("This user name is already taken.");
- break;
- case 10:
- // TRANSLATORS: error message
- errorMessage = _("Wrong name.");
- break;
- case 11:
- // TRANSLATORS: error message
- errorMessage = _("Incorrect email.");
- break;
- case 99:
- // TRANSLATORS: error message
- errorMessage = _("Username permanently erased.");
- break;
- default:
- // TRANSLATORS: error message
- errorMessage = _("Unknown error.");
- break;
- }
- client->setState(STATE_ERROR);
+ delete_all(LoginRecv::mWorlds);
+ LoginRecv::mWorlds.clear();
}
void LoginHandler::loginOrRegister(LoginData *const data) const
@@ -302,4 +181,9 @@ void LoginHandler::unregisterAccount(const std::string &username A_UNUSED,
{
}
+const Token &LoginHandler::getToken() const
+{
+ return LoginRecv::mToken;
+}
+
} // namespace Ea
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 96a228b07..9dc559dab 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -70,8 +70,7 @@ class LoginHandler notfinal : public Net::LoginHandler
virtual ServerInfo *getCharServer() const A_WARN_UNUSED = 0;
- const Token &getToken() const A_WARN_UNUSED
- { return mToken; }
+ const Token &getToken() const A_WARN_UNUSED;
void logout() const override final;
@@ -86,21 +85,9 @@ class LoginHandler notfinal : public Net::LoginHandler
protected:
LoginHandler();
- static void processUpdateHost(Net::MessageIn &msg);
-
- static void processLoginData(Net::MessageIn &msg);
-
- static void processLoginError(Net::MessageIn &msg);
-
virtual void sendLoginRegister(const std::string &username,
const std::string &password,
const std::string &email) const = 0;
-
- static std::string mUpdateHost;
- static Worlds mWorlds;
- static Token mToken;
- static bool mVersionResponse;
- static bool mRegistrationEnabled;
};
} // namespace Ea
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
new file mode 100644
index 000000000..e3430bac8
--- /dev/null
+++ b/src/net/ea/loginrecv.cpp
@@ -0,0 +1,180 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/ea/loginrecv.h"
+
+#include "client.h"
+#include "configuration.h"
+#include "settings.h"
+
+#include "being/being.h"
+
+#include "gui/windows/logindialog.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+#include "utils/paths.h"
+
+#include "net/logindata.h"
+#include "net/messagein.h"
+
+#include "net/ea/token.h"
+
+#include "debug.h"
+
+namespace Ea
+{
+
+namespace LoginRecv
+{
+ std::string mUpdateHost;
+ Worlds mWorlds;
+ Token mToken;
+ bool mVersionResponse = false;
+ bool mRegistrationEnabled = true;
+} // namespace LoginRecv
+
+void LoginRecv::processUpdateHost(Net::MessageIn &msg)
+{
+ const int len = msg.readInt16("len") - 4;
+ mUpdateHost = msg.readString(len, "update host");
+
+ if (!checkPath(mUpdateHost))
+ {
+ mUpdateHost.clear();
+ logger->log1("Warning: incorrect update server name");
+ }
+ loginData.updateHost = mUpdateHost;
+
+ logger->log("Received update host \"%s\" from login server.",
+ mUpdateHost.c_str());
+}
+
+void LoginRecv::processLoginData(Net::MessageIn &msg)
+{
+ msg.readInt16("len");
+
+ loginHandler->clearWorlds();
+
+ const int worldCount = (msg.getLength() - 47) / 32;
+
+ mToken.session_ID1 = msg.readInt32("session id1");
+ mToken.account_ID = msg.readBeingId("accound id");
+ mToken.session_ID2 = msg.readInt32("session id2");
+ msg.readInt32("old ip");
+ loginData.lastLogin = msg.readString(24, "last login");
+ msg.readInt16("unused");
+
+ // reserve bits for future usage
+ mToken.sex = Being::intToGender(static_cast<uint8_t>(
+ msg.readUInt8("gender") & 3U));
+
+ for (int i = 0; i < worldCount; i++)
+ {
+ WorldInfo *const world = new WorldInfo;
+
+ world->address = msg.readInt32("ip address");
+ world->port = msg.readInt16("port");
+ world->name = msg.readString(20, "name");
+ world->online_users = msg.readInt16("online number");
+ config.setValue("updatehost", mUpdateHost);
+ world->updateHost = mUpdateHost;
+ msg.readInt16("maintenance");
+ msg.readInt16("new");
+
+ logger->log("Network: Server: %s (%s:%d)", world->name.c_str(),
+ ipToString(world->address), world->port);
+
+ mWorlds.push_back(world);
+ }
+ client->setState(STATE_WORLD_SELECT);
+}
+
+void LoginRecv::processLoginError(Net::MessageIn &msg)
+{
+ const uint8_t code = msg.readUInt8("error");
+ logger->log("Login::error code: %u", static_cast<unsigned int>(code));
+ std::string date = msg.readString(20, "date");
+
+ switch (code)
+ {
+ case 0:
+ // TRANSLATORS: error message
+ errorMessage = _("Unregistered ID.");
+ break;
+ case 1:
+ // TRANSLATORS: error message
+ errorMessage = _("Wrong password.");
+ LoginDialog::savedPassword.clear();
+ break;
+ case 2:
+ // TRANSLATORS: error message
+ errorMessage = _("Account expired.");
+ break;
+ case 3:
+ // TRANSLATORS: error message
+ errorMessage = _("Rejected from server.");
+ break;
+ case 4:
+ // TRANSLATORS: error message
+ errorMessage = _("You have been permanently banned from "
+ "the game. Please contact the GM team.");
+ break;
+ case 5:
+ // TRANSLATORS: error message
+ errorMessage = _("Client too old.");
+ break;
+ case 6:
+ // TRANSLATORS: error message
+ errorMessage = strprintf(_("You have been temporarily "
+ "banned from the game until %s.\nPlease contact the GM "
+ "team via the forums."), date.c_str());
+ break;
+ case 7:
+ // TRANSLATORS: error message
+ errorMessage = _("Server overpopulated.");
+ break;
+ case 9:
+ // TRANSLATORS: error message
+ errorMessage = _("This user name is already taken.");
+ break;
+ case 10:
+ // TRANSLATORS: error message
+ errorMessage = _("Wrong name.");
+ break;
+ case 11:
+ // TRANSLATORS: error message
+ errorMessage = _("Incorrect email.");
+ break;
+ case 99:
+ // TRANSLATORS: error message
+ errorMessage = _("Username permanently erased.");
+ break;
+ default:
+ // TRANSLATORS: error message
+ errorMessage = _("Unknown error.");
+ break;
+ }
+ client->setState(STATE_ERROR);
+}
+
+} // namespace Ea
diff --git a/src/net/ea/loginrecv.h b/src/net/ea/loginrecv.h
new file mode 100644
index 000000000..07e2f14bf
--- /dev/null
+++ b/src/net/ea/loginrecv.h
@@ -0,0 +1,55 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EA_LOGINRECV_H
+#define NET_EA_LOGINRECV_H
+
+#include "net/loginhandler.h"
+
+#include "net/registrationoptions.h"
+
+class LoginData;
+
+struct Token;
+
+namespace Net
+{
+ class MessageIn;
+}
+
+namespace Ea
+{
+ namespace LoginRecv
+ {
+ extern std::string mUpdateHost;
+ extern Worlds mWorlds;
+ extern Token mToken;
+ extern bool mVersionResponse;
+ extern bool mRegistrationEnabled;
+
+ void processUpdateHost(Net::MessageIn &msg);
+ void processLoginData(Net::MessageIn &msg);
+ void processLoginError(Net::MessageIn &msg);
+ } // namespace LoginRecv
+} // namespace Ea
+
+#endif // NET_EA_LOGINRECV_H
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index 0b965f38c..698e5854f 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -30,6 +30,9 @@
#include "net/logindata.h"
#include "net/serverfeatures.h"
+#include "net/ea/loginrecv.h"
+
+#include "net/eathena/loginrecv.h"
#include "net/eathena/messageout.h"
#include "net/eathena/network.h"
#include "net/eathena/protocol.h"
@@ -74,31 +77,31 @@ void LoginHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_LOGIN_DATA:
- processLoginData(msg);
+ Ea::LoginRecv::processLoginData(msg);
break;
case SMSG_LOGIN_ERROR:
- processLoginError(msg);
+ Ea::LoginRecv::processLoginError(msg);
break;
case SMSG_LOGIN_ERROR2:
- processLoginError2(msg);
+ LoginRecv::processLoginError2(msg);
break;
case SMSG_SERVER_VERSION_RESPONSE:
- processServerVersion(msg);
+ LoginRecv::processServerVersion(msg);
break;
case SMSG_UPDATE_HOST:
- processUpdateHost(msg);
+ Ea::LoginRecv::processUpdateHost(msg);
break;
case SMSG_LOGIN_CODING_KEY:
- processCondingKey(msg);
+ LoginRecv::processCondingKey(msg);
break;
case SMSG_CHAR_PASSWORD_RESPONSE:
- processCharPasswordResponse(msg);
+ LoginRecv::processCharPasswordResponse(msg);
break;
default:
@@ -175,105 +178,6 @@ ServerInfo *LoginHandler::getCharServer() const
return &charServer;
}
-void LoginHandler::processLoginError2(Net::MessageIn &msg)
-{
- const uint32_t code = msg.readInt32("error");
- msg.readString(20, "error message");
- logger->log("Login::error code: %u", code);
-
- switch (code)
- {
- case 0:
- // TRANSLATORS: error message
- errorMessage = _("Unregistered ID.");
- break;
- case 1:
- // TRANSLATORS: error message
- errorMessage = _("Wrong password.");
- LoginDialog::savedPassword.clear();
- break;
- case 2:
- // TRANSLATORS: error message
- errorMessage = _("Account expired.");
- break;
- case 3:
- // TRANSLATORS: error message
- errorMessage = _("Rejected from server.");
- break;
- case 4:
- // TRANSLATORS: error message
- errorMessage = _("You have been permanently banned from "
- "the game. Please contact the GM team.");
- break;
- case 5:
- // TRANSLATORS: error message
- errorMessage = _("Client too old.");
- break;
- case 6:
- // TRANSLATORS: error message
- errorMessage = strprintf(_("You have been temporarily "
- "banned from the game until "
- "%s.\nPlease contact the GM "
- "team via the forums."),
- msg.readString(20, "date").c_str());
- break;
- case 7:
- // look like unused
- // TRANSLATORS: error message
- errorMessage = _("Server overpopulated.");
- break;
- case 9:
- // look like unused
- // TRANSLATORS: error message
- errorMessage = _("This user name is already taken.");
- break;
- case 10:
- // look like unused
- // TRANSLATORS: error message
- errorMessage = _("Wrong name.");
- break;
- case 11:
- // look like unused
- // TRANSLATORS: error message
- errorMessage = _("Incorrect email.");
- break;
- case 99:
- // look like unused
- // TRANSLATORS: error message
- errorMessage = _("Username permanently erased.");
- break;
- default:
- // TRANSLATORS: error message
- errorMessage = _("Unknown error.");
- UNIMPLIMENTEDPACKET;
- break;
- }
- client->setState(STATE_ERROR);
-}
-
-void LoginHandler::processUpdateHost2(Net::MessageIn &msg)
-{
- const int len = msg.readInt16("len") - 4;
- const std::string updateHost = msg.readString(len, "host");
-
- splitToStringVector(loginData.updateHosts, updateHost, '|');
- FOR_EACH (StringVectIter, it, loginData.updateHosts)
- {
- if (!checkPath(*it))
- {
- logger->log1("Warning: incorrect update server name");
- loginData.updateHosts.clear();
- break;
- }
- }
-
- logger->log("Received update hosts \"%s\" from login server.",
- updateHost.c_str());
-
- if (client->getState() == STATE_PRE_LOGIN)
- client->setState(STATE_LOGIN);
-}
-
void LoginHandler::sendVersion() const
{
createOutPacket(CMSG_SERVER_VERSION_REQUEST);
@@ -285,25 +189,6 @@ void LoginHandler::sendVersion() const
generalHandler->flushSend();
}
-void LoginHandler::processServerVersion(Net::MessageIn &msg)
-{
- msg.readInt16("len");
- msg.readInt32("unused");
- serverVersion = msg.readInt32("server version");
- if (serverVersion > 0)
- logger->log("Evol2 server version: %d", serverVersion);
- else
- logger->log("Hercules without version");
- client->setState(STATE_LOGIN);
-}
-
-void LoginHandler::processCondingKey(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- const int sz = msg.readInt16("len") - 4;
- msg.readString(sz, "coding key");
-}
-
int LoginHandler::supportedOptionalActions() const
{
return serverFeatures->haveEmailOnRegister()
@@ -323,40 +208,4 @@ void LoginHandler::ping() const
outMsg.writeInt32(0, "unused");
}
-void LoginHandler::processCharPasswordResponse(Net::MessageIn &msg)
-{
- // 0: acc not found, 1: success, 2: password mismatch, 3: pass too short
- const uint8_t errMsg = msg.readUInt8("result code");
- // Successful pass change
- if (errMsg == 1)
- {
- client->setState(STATE_CHANGEPASSWORD_SUCCESS);
- }
- // pass change failed
- else
- {
- switch (errMsg)
- {
- case 0:
- errorMessage =
- // TRANSLATORS: error message
- _("Account was not found. Please re-login.");
- break;
- case 2:
- // TRANSLATORS: error message
- errorMessage = _("Old password incorrect.");
- break;
- case 3:
- // TRANSLATORS: error message
- errorMessage = _("New password too short.");
- break;
- default:
- // TRANSLATORS: error message
- errorMessage = _("Unknown error.");
- break;
- }
- client->setState(STATE_ACCOUNTCHANGE_ERROR);
- }
-}
-
} // namespace EAthena
diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h
index abca1d359..af44a2e51 100644
--- a/src/net/eathena/loginhandler.h
+++ b/src/net/eathena/loginhandler.h
@@ -62,17 +62,6 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
void ping() const override final;
- protected:
- static void processLoginError2(Net::MessageIn &msg);
-
- static void processUpdateHost2(Net::MessageIn &msg);
-
- static void processServerVersion(Net::MessageIn &msg);
-
- static void processCondingKey(Net::MessageIn &msg);
-
- static void processCharPasswordResponse(Net::MessageIn &msg);
-
private:
void sendLoginRegister(const std::string &restrict username,
const std::string &restrict password,
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
new file mode 100644
index 000000000..a7ddbf95b
--- /dev/null
+++ b/src/net/eathena/loginrecv.cpp
@@ -0,0 +1,201 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/eathena/loginrecv.h"
+
+#include "client.h"
+
+#include "gui/windows/logindialog.h"
+
+#include "net/generalhandler.h"
+#include "net/logindata.h"
+#include "net/serverfeatures.h"
+
+#include "net/eathena/messageout.h"
+#include "net/eathena/network.h"
+#include "net/eathena/protocol.h"
+
+#include "utils/gettext.h"
+#include "utils/paths.h"
+
+#include "debug.h"
+
+namespace EAthena
+{
+
+extern ServerInfo charServer;
+
+void LoginRecv::processLoginError2(Net::MessageIn &msg)
+{
+ const uint32_t code = msg.readInt32("error");
+ msg.readString(20, "error message");
+ logger->log("Login::error code: %u", code);
+
+ switch (code)
+ {
+ case 0:
+ // TRANSLATORS: error message
+ errorMessage = _("Unregistered ID.");
+ break;
+ case 1:
+ // TRANSLATORS: error message
+ errorMessage = _("Wrong password.");
+ LoginDialog::savedPassword.clear();
+ break;
+ case 2:
+ // TRANSLATORS: error message
+ errorMessage = _("Account expired.");
+ break;
+ case 3:
+ // TRANSLATORS: error message
+ errorMessage = _("Rejected from server.");
+ break;
+ case 4:
+ // TRANSLATORS: error message
+ errorMessage = _("You have been permanently banned from "
+ "the game. Please contact the GM team.");
+ break;
+ case 5:
+ // TRANSLATORS: error message
+ errorMessage = _("Client too old.");
+ break;
+ case 6:
+ // TRANSLATORS: error message
+ errorMessage = strprintf(_("You have been temporarily "
+ "banned from the game until "
+ "%s.\nPlease contact the GM "
+ "team via the forums."),
+ msg.readString(20, "date").c_str());
+ break;
+ case 7:
+ // look like unused
+ // TRANSLATORS: error message
+ errorMessage = _("Server overpopulated.");
+ break;
+ case 9:
+ // look like unused
+ // TRANSLATORS: error message
+ errorMessage = _("This user name is already taken.");
+ break;
+ case 10:
+ // look like unused
+ // TRANSLATORS: error message
+ errorMessage = _("Wrong name.");
+ break;
+ case 11:
+ // look like unused
+ // TRANSLATORS: error message
+ errorMessage = _("Incorrect email.");
+ break;
+ case 99:
+ // look like unused
+ // TRANSLATORS: error message
+ errorMessage = _("Username permanently erased.");
+ break;
+ default:
+ // TRANSLATORS: error message
+ errorMessage = _("Unknown error.");
+ UNIMPLIMENTEDPACKET;
+ break;
+ }
+ client->setState(STATE_ERROR);
+}
+
+void LoginRecv::processUpdateHost2(Net::MessageIn &msg)
+{
+ const int len = msg.readInt16("len") - 4;
+ const std::string updateHost = msg.readString(len, "host");
+
+ splitToStringVector(loginData.updateHosts, updateHost, '|');
+ FOR_EACH (StringVectIter, it, loginData.updateHosts)
+ {
+ if (!checkPath(*it))
+ {
+ logger->log1("Warning: incorrect update server name");
+ loginData.updateHosts.clear();
+ break;
+ }
+ }
+
+ logger->log("Received update hosts \"%s\" from login server.",
+ updateHost.c_str());
+
+ if (client->getState() == STATE_PRE_LOGIN)
+ client->setState(STATE_LOGIN);
+}
+
+void LoginRecv::processServerVersion(Net::MessageIn &msg)
+{
+ msg.readInt16("len");
+ msg.readInt32("unused");
+ serverVersion = msg.readInt32("server version");
+ if (serverVersion > 0)
+ logger->log("Evol2 server version: %d", serverVersion);
+ else
+ logger->log("Hercules without version");
+ client->setState(STATE_LOGIN);
+}
+
+void LoginRecv::processCondingKey(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ const int sz = msg.readInt16("len") - 4;
+ msg.readString(sz, "coding key");
+}
+
+void LoginRecv::processCharPasswordResponse(Net::MessageIn &msg)
+{
+ // 0: acc not found, 1: success, 2: password mismatch, 3: pass too short
+ const uint8_t errMsg = msg.readUInt8("result code");
+ // Successful pass change
+ if (errMsg == 1)
+ {
+ client->setState(STATE_CHANGEPASSWORD_SUCCESS);
+ }
+ // pass change failed
+ else
+ {
+ switch (errMsg)
+ {
+ case 0:
+ errorMessage =
+ // TRANSLATORS: error message
+ _("Account was not found. Please re-login.");
+ break;
+ case 2:
+ // TRANSLATORS: error message
+ errorMessage = _("Old password incorrect.");
+ break;
+ case 3:
+ // TRANSLATORS: error message
+ errorMessage = _("New password too short.");
+ break;
+ default:
+ // TRANSLATORS: error message
+ errorMessage = _("Unknown error.");
+ break;
+ }
+ client->setState(STATE_ACCOUNTCHANGE_ERROR);
+ }
+}
+
+} // namespace EAthena
diff --git a/src/net/eathena/loginrecv.h b/src/net/eathena/loginrecv.h
new file mode 100644
index 000000000..ccd34b7cc
--- /dev/null
+++ b/src/net/eathena/loginrecv.h
@@ -0,0 +1,42 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EATHENA_LOGINRECV_H
+#define NET_EATHENA_LOGINRECV_H
+
+#include "net/ea/loginhandler.h"
+
+#include "net/eathena/messagehandler.h"
+
+namespace EAthena
+{
+ namespace LoginRecv
+ {
+ void processLoginError2(Net::MessageIn &msg);
+ void processUpdateHost2(Net::MessageIn &msg);
+ void processServerVersion(Net::MessageIn &msg);
+ void processCondingKey(Net::MessageIn &msg);
+ void processCharPasswordResponse(Net::MessageIn &msg);
+ } // namespace LoginRecv
+} // namespace EAthena
+
+#endif // NET_EATHENA_LOGINRECV_H
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index c94a82327..880e951a9 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -27,6 +27,9 @@
#include "net/serverfeatures.h"
+#include "net/ea/loginrecv.h"
+
+#include "net/tmwa/loginrecv.h"
#include "net/tmwa/messageout.h"
#include "net/tmwa/network.h"
#include "net/tmwa/protocol.h"
@@ -42,11 +45,6 @@ namespace TmwAthena
extern ServerInfo charServer;
-enum ServerFlags
-{
- FLAG_REGISTRATION = 1
-};
-
LoginHandler::LoginHandler() :
MessageHandler(),
Ea::LoginHandler()
@@ -74,23 +72,23 @@ void LoginHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_CHAR_PASSWORD_RESPONSE:
- processCharPasswordResponse(msg);
+ LoginRecv::processCharPasswordResponse(msg);
break;
case SMSG_UPDATE_HOST:
- processUpdateHost(msg);
+ Ea::LoginRecv::processUpdateHost(msg);
break;
case SMSG_LOGIN_DATA:
- processLoginData(msg);
+ Ea::LoginRecv::processLoginData(msg);
break;
case SMSG_LOGIN_ERROR:
- processLoginError(msg);
+ Ea::LoginRecv::processLoginError(msg);
break;
case SMSG_SERVER_VERSION_RESPONSE:
- processServerVersion(msg);
+ LoginRecv::processServerVersion(msg);
break;
default:
@@ -114,7 +112,7 @@ bool LoginHandler::isConnected() const
if (!mNetwork)
return false;
- return mVersionResponse && mNetwork->isConnected();
+ return Ea::LoginRecv::mVersionResponse && mNetwork->isConnected();
}
void LoginHandler::disconnect()
@@ -170,50 +168,6 @@ void LoginHandler::requestUpdateHosts()
{
}
-void LoginHandler::processServerVersion(Net::MessageIn &msg)
-{
- const uint8_t b1 = msg.readUInt8("b1"); // -1
- const uint8_t b2 = msg.readUInt8("b2");
- const uint8_t b3 = msg.readUInt8("b3");
- msg.readUInt8("b4");
- if (b1 == 255)
- { // old TMWA
- const unsigned int options = msg.readInt32("options");
- mRegistrationEnabled = options & FLAG_REGISTRATION;
- serverVersion = 0;
- tmwServerVersion = 0;
- }
- else if (b1 >= 0x0d)
- { // new TMWA
- const unsigned int options = msg.readInt32("options");
- mRegistrationEnabled = options & FLAG_REGISTRATION;
- serverVersion = 0;
- tmwServerVersion = (b1 << 16) | (b2 << 8) | b3;
- }
- else
- { // eAthena
- const unsigned int options = msg.readInt32("options");
- mRegistrationEnabled = options & FLAG_REGISTRATION;
- serverVersion = 0;
- tmwServerVersion = 0;
- }
- if (serverVersion > 0)
- logger->log("Evol server version: %d", serverVersion);
- else if (tmwServerVersion > 0)
- logger->log("Tmw server version: x%06x", tmwServerVersion);
- else
- logger->log("Server without version");
-
- if (serverVersion < 5)
- {
- if (client->getState() != STATE_LOGIN)
- client->setState(STATE_LOGIN);
- }
-
- // Leave this last
- mVersionResponse = true;
-}
-
int LoginHandler::supportedOptionalActions() const
{
return Net::RegistrationOptions::SetGenderOnRegister;
@@ -223,42 +177,6 @@ void LoginHandler::sendVersion() const
{
}
-void LoginHandler::processCharPasswordResponse(Net::MessageIn &msg)
-{
- // 0: acc not found, 1: success, 2: password mismatch, 3: pass too short
- const uint8_t errMsg = msg.readUInt8("result code");
- // Successful pass change
- if (errMsg == 1)
- {
- client->setState(STATE_CHANGEPASSWORD_SUCCESS);
- }
- // pass change failed
- else
- {
- switch (errMsg)
- {
- case 0:
- errorMessage =
- // TRANSLATORS: error message
- _("Account was not found. Please re-login.");
- break;
- case 2:
- // TRANSLATORS: error message
- errorMessage = _("Old password incorrect.");
- break;
- case 3:
- // TRANSLATORS: error message
- errorMessage = _("New password too short.");
- break;
- default:
- // TRANSLATORS: error message
- errorMessage = _("Unknown error.");
- break;
- }
- client->setState(STATE_ACCOUNTCHANGE_ERROR);
- }
-}
-
void LoginHandler::ping() const
{
}
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 9db07dee5..48a9e060e 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -69,10 +69,6 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
const std::string &restrict password,
const std::string &restrict email)
const override final;
-
- static void processServerVersion(Net::MessageIn &msg);
-
- static void processCharPasswordResponse(Net::MessageIn &msg);
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/loginrecv.cpp b/src/net/tmwa/loginrecv.cpp
new file mode 100644
index 000000000..fb1a0eee7
--- /dev/null
+++ b/src/net/tmwa/loginrecv.cpp
@@ -0,0 +1,130 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/tmwa/loginrecv.h"
+
+#include "client.h"
+#include "logger.h"
+
+#include "net/serverfeatures.h"
+
+#include "net/ea/loginrecv.h"
+
+#include "net/tmwa/messageout.h"
+#include "net/tmwa/network.h"
+#include "net/tmwa/protocol.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+namespace TmwAthena
+{
+
+extern ServerInfo charServer;
+
+enum ServerFlags
+{
+ FLAG_REGISTRATION = 1
+};
+
+void LoginRecv::processServerVersion(Net::MessageIn &msg)
+{
+ const uint8_t b1 = msg.readUInt8("b1"); // -1
+ const uint8_t b2 = msg.readUInt8("b2");
+ const uint8_t b3 = msg.readUInt8("b3");
+ msg.readUInt8("b4");
+ if (b1 == 255)
+ { // old TMWA
+ const unsigned int options = msg.readInt32("options");
+ Ea::LoginRecv::mRegistrationEnabled = options & FLAG_REGISTRATION;
+ serverVersion = 0;
+ tmwServerVersion = 0;
+ }
+ else if (b1 >= 0x0d)
+ { // new TMWA
+ const unsigned int options = msg.readInt32("options");
+ Ea::LoginRecv::mRegistrationEnabled = options & FLAG_REGISTRATION;
+ serverVersion = 0;
+ tmwServerVersion = (b1 << 16) | (b2 << 8) | b3;
+ }
+ else
+ { // eAthena
+ const unsigned int options = msg.readInt32("options");
+ Ea::LoginRecv::mRegistrationEnabled = options & FLAG_REGISTRATION;
+ serverVersion = 0;
+ tmwServerVersion = 0;
+ }
+ if (serverVersion > 0)
+ logger->log("Evol server version: %d", serverVersion);
+ else if (tmwServerVersion > 0)
+ logger->log("Tmw server version: x%06x", tmwServerVersion);
+ else
+ logger->log("Server without version");
+
+ if (serverVersion < 5)
+ {
+ if (client->getState() != STATE_LOGIN)
+ client->setState(STATE_LOGIN);
+ }
+
+ // Leave this last
+ Ea::LoginRecv::mVersionResponse = true;
+}
+
+void LoginRecv::processCharPasswordResponse(Net::MessageIn &msg)
+{
+ // 0: acc not found, 1: success, 2: password mismatch, 3: pass too short
+ const uint8_t errMsg = msg.readUInt8("result code");
+ // Successful pass change
+ if (errMsg == 1)
+ {
+ client->setState(STATE_CHANGEPASSWORD_SUCCESS);
+ }
+ // pass change failed
+ else
+ {
+ switch (errMsg)
+ {
+ case 0:
+ errorMessage =
+ // TRANSLATORS: error message
+ _("Account was not found. Please re-login.");
+ break;
+ case 2:
+ // TRANSLATORS: error message
+ errorMessage = _("Old password incorrect.");
+ break;
+ case 3:
+ // TRANSLATORS: error message
+ errorMessage = _("New password too short.");
+ break;
+ default:
+ // TRANSLATORS: error message
+ errorMessage = _("Unknown error.");
+ break;
+ }
+ client->setState(STATE_ACCOUNTCHANGE_ERROR);
+ }
+}
+
+} // namespace TmwAthena
diff --git a/src/net/tmwa/loginrecv.h b/src/net/tmwa/loginrecv.h
new file mode 100644
index 000000000..0945a7066
--- /dev/null
+++ b/src/net/tmwa/loginrecv.h
@@ -0,0 +1,39 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_TMWA_LOGINRECV_H
+#define NET_TMWA_LOGINRECV_H
+
+#include "net/ea/loginhandler.h"
+
+#include "net/tmwa/messagehandler.h"
+
+namespace TmwAthena
+{
+ namespace LoginRecv
+ {
+ void processServerVersion(Net::MessageIn &msg);
+ void processCharPasswordResponse(Net::MessageIn &msg);
+ } // namespace LoginRecv
+} // namespace TmwAthena
+
+#endif // NET_TMWA_LOGINRECV_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 01:07:10 +0000