Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang format

Browse Source
This commit is contained in:
scatterflower 2020-08-25 01:51:57 -05:00
parent e342c45806
commit 274c217e52
6 changed files with 210 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/aoclient.h
View File

@ -1,28 +1,27 @@
#ifndef AOCLIENT_H #ifndef AOCLIENT_H
#define AOCLIENT_H #define AOCLIENT_H
#include <QTcpSocket>
#include <QHostAddress>
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QHostAddress>
#include <QTcpSocket>
class AOClient class AOClient {
{
public: public:
AOClient(QHostAddress p_remote_ip); AOClient(QHostAddress p_remote_ip);
~AOClient(); ~AOClient();
QString getHwid(); QString getHwid();
void setHwid(QString p_hwid); void setHwid(QString p_hwid);
QString getIpid(); QString getIpid();
QHostAddress remote_ip; QHostAddress remote_ip;
QString password; QString password;
bool joined; bool joined;
private: private:
QString hwid; QString hwid;
QString ipid; QString ipid;
}; };
#endif // AOCLIENT_H #endif // AOCLIENT_H

18
include/server.h
View File

@ -1,22 +1,22 @@
#ifndef SERVER_H #ifndef SERVER_H
#define SERVER_H #define SERVER_H
#include "include/aopacket.h"
#include "include/aoclient.h" #include "include/aoclient.h"
#include "include/aopacket.h"
#include <QDebug>
#include <QApplication> #include <QApplication>
#include <QString> #include <QDebug>
#include <QMap>
#include <QSettings> #include <QSettings>
#include <QString>
#include <QTcpServer> #include <QTcpServer>
#include <QTcpSocket> #include <QTcpSocket>
#include <QMap>
class Server : public QObject { class Server : public QObject {
Q_OBJECT Q_OBJECT
public: public:
Server(int p_port, int p_ws_port, QObject* parent = nullptr); Server(int p_port, int p_ws_port, QObject *parent = nullptr);
void start(); void start();
signals: signals:
@ -27,16 +27,16 @@ public slots:
void clientData(); void clientData();
private: private:
void handlePacket(AOPacket packet, QTcpSocket* socket); void handlePacket(AOPacket packet, QTcpSocket *socket);
QTcpSocket* getClient(QString ipid); QTcpSocket *getClient(QString ipid);
void broadcast(AOPacket packet); void broadcast(AOPacket packet);
QTcpServer* server; QTcpServer *server;
int port; int port;
int ws_port; int ws_port;
QMap<QTcpSocket*, AOClient*> clients; QMap<QTcpSocket *, AOClient *> clients;
QString partial_packet; QString partial_packet;
bool is_partial; bool is_partial;

6
src/akashimain.cpp
View File

@ -36,7 +36,7 @@ AkashiMain::AkashiMain(QWidget *parent)
AkashiMain::~AkashiMain() AkashiMain::~AkashiMain()
{ {
delete ui; delete ui;
delete advertiser; delete advertiser;
delete server; delete server;
} }

31
src/aoclient.cpp
View File

@ -2,32 +2,25 @@
AOClient::AOClient(QHostAddress p_remote_ip) AOClient::AOClient(QHostAddress p_remote_ip)
{ {
joined = false; joined = false;
password = ""; password = "";
remote_ip = p_remote_ip; remote_ip = p_remote_ip;
} }
QString AOClient::getHwid(){ QString AOClient::getHwid() { return hwid; }
return hwid;
}
void AOClient::setHwid(QString p_hwid) void AOClient::setHwid(QString p_hwid)
{ {
hwid = p_hwid; hwid = p_hwid;
QCryptographicHash hash(QCryptographicHash::Md5); // Don't need security, just hashing for uniqueness QCryptographicHash hash(QCryptographicHash::Md5); // Don't need security, just
QString concat_ip_id = remote_ip.toString() + p_hwid; // hashing for uniqueness
hash.addData(concat_ip_id.toUtf8()); QString concat_ip_id = remote_ip.toString() + p_hwid;
hash.addData(concat_ip_id.toUtf8());
ipid = hash.result().toHex().right(8); ipid = hash.result().toHex().right(8);
} }
QString AOClient::getIpid() QString AOClient::getIpid() { return ipid; }
{
return ipid;
}
AOClient::~AOClient() AOClient::~AOClient() {}
{
}

45
src/aopacket.cpp
View File

@ -8,28 +8,29 @@ AOPacket::AOPacket(QString p_header, QStringList p_contents)
AOPacket::AOPacket(QString p_packet) AOPacket::AOPacket(QString p_packet)
{ {
QStringList packet_contents = p_packet.split("#"); QStringList packet_contents = p_packet.split("#");
if(p_packet.at(0) == '#') { if (p_packet.at(0) == '#') {
// The header is encrypted with FantaCrypt // The header is encrypted with FantaCrypt
// The server always uses the same key for FantaCrypt // The server always uses the same key for FantaCrypt
// That way, we can just hardcode FantaCrypted headers // That way, we can just hardcode FantaCrypted headers
// TODO: replace this with a key/value map? // TODO: replace this with a key/value map?
packet_contents.removeFirst(); packet_contents.removeFirst();
if(packet_contents[0] == "48E0") if (packet_contents[0] == "48E0")
header = "HI"; header = "HI";
else if(packet_contents[0] == "493F") else if (packet_contents[0] == "493F")
header = "ID"; header = "ID";
else if(packet_contents[0] == "615810BC07D12A5A") else if (packet_contents[0] == "615810BC07D12A5A")
header = "askchaa"; header = "askchaa";
else else
header = packet_contents[0]; // If no known decryption exists, just leave the packet as-is header = packet_contents[0]; // If no known decryption exists, just leave
} // the packet as-is
else { }
header = packet_contents[0]; else {
} header = packet_contents[0];
packet_contents.removeFirst(); // Remove header }
packet_contents.removeLast(); // Remove anything trailing after delimiter packet_contents.removeFirst(); // Remove header
contents = packet_contents; packet_contents.removeLast(); // Remove anything trailing after delimiter
contents = packet_contents;
} }
QString AOPacket::toString() QString AOPacket::toString()

286
src/server.cpp
View File

@ -1,7 +1,6 @@
#include "include/server.h" #include "include/server.h"
Server::Server(int p_port, int p_ws_port, QObject* parent) Server::Server(int p_port, int p_ws_port, QObject *parent) : QObject(parent)
: QObject(parent)
{ {
server = new QTcpServer(this); server = new QTcpServer(this);
connect(server, SIGNAL(newConnection()), this, SLOT(clientConnected())); connect(server, SIGNAL(newConnection()), this, SLOT(clientConnected()));
@ -14,170 +13,185 @@ Server::Server(int p_port, int p_ws_port, QObject* parent)
void Server::start() void Server::start()
{ {
// TODO: websockets lul // TODO: websockets lul
// Maybe websockets should be handled by a separate intermediate part of the code? // Maybe websockets should be handled by a separate intermediate part of the
// The idea being that it is a websocket server, and all it does is create a // code? The idea being that it is a websocket server, and all it does is
// local connection to the raw tcp server. // create a local connection to the raw tcp server. The main issue with this
// The main issue with this is that it will cause problems with bans, ipids, etc // is that it will cause problems with bans, ipids, etc But perhaps this can
// But perhaps this can be negotiated by sending some extra data over? // be negotiated by sending some extra data over? No idea. I'll wait for long
// No idea. I'll wait for long to read this massive comment and DM me on discord // to read this massive comment and DM me on discord
// //
// Upon thinking about this a bit more, I realized basically all of the // Upon thinking about this a bit more, I realized basically all of the
// communication only happens via QTcpSocket* pointers. // communication only happens via QTcpSocket* pointers.
// If the Qt WebSocket server gives me QTcpSockets to work with, // If the Qt WebSocket server gives me QTcpSockets to work with,
// then they can all go into the same object. I doubt this is the case, though // then they can all go into the same object. I doubt this is the case, though
if(!server->listen(QHostAddress::Any, port)) if (!server->listen(QHostAddress::Any, port)) {
{ // TODO: signal server start failed
// TODO: signal server start failed qDebug() << "Server error:" << server->errorString();
qDebug() << "Server error:" << server->errorString(); }
} else {
else // TODO: signal server start success
{ qDebug() << "Server listening on" << port;
// TODO: signal server start success }
qDebug() << "Server listening on" << port;
}
} }
void Server::clientConnected() void Server::clientConnected()
{ {
QTcpSocket* client = server->nextPendingConnection(); QTcpSocket *client = server->nextPendingConnection();
AOClient* ao_client = new AOClient(client->peerAddress()); AOClient *ao_client = new AOClient(client->peerAddress());
clients.insert(client, ao_client); clients.insert(client, ao_client);
connect(client, SIGNAL(disconnected()), this, SLOT(clientDisconnected())); connect(client, SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
connect(client, SIGNAL(readyRead()), this, SLOT(clientData())); connect(client, SIGNAL(readyRead()), this, SLOT(clientData()));
AOPacket decryptor("decryptor", {"34"}); AOPacket decryptor("decryptor", {"34"});
client->write(decryptor.toUtf8()); client->write(decryptor.toUtf8());
qDebug() << client->peerAddress().toString() << "connected"; qDebug() << client->peerAddress().toString() << "connected";
} }
void Server::clientDisconnected() void Server::clientDisconnected()
{ {
if(QTcpSocket* client = dynamic_cast<QTcpSocket*>(sender())){ if (QTcpSocket *client = dynamic_cast<QTcpSocket *>(sender())) {
qDebug() << client->peerAddress() << "disconnected"; qDebug() << client->peerAddress() << "disconnected";
if(clients.value(client)->joined) if (clients.value(client)->joined)
player_count--; player_count--;
delete clients.value(client); delete clients.value(client);
clients.remove(client); clients.remove(client);
} }
} }
void Server::clientData() void Server::clientData()
{ {
if(QTcpSocket* client = dynamic_cast<QTcpSocket*>(sender())){ if (QTcpSocket *client = dynamic_cast<QTcpSocket *>(sender())) {
QString data = QString::fromUtf8(client->readAll()); QString data = QString::fromUtf8(client->readAll());
//qDebug() << "From" << client->peerAddress() << ":" << data; // qDebug() << "From" << client->peerAddress() << ":" << data;
if(is_partial) { if (is_partial) {
data = partial_packet + data; data = partial_packet + data;
}
if(!data.endsWith("%")){
is_partial = true;
}
QStringList all_packets = data.split("%");
all_packets.removeLast(); // Remove the entry after the last delimiter
for(QString single_packet : all_packets)
{
AOPacket packet(single_packet);
handlePacket(packet, client);
}
} }
if (!data.endsWith("%")) {
is_partial = true;
}
QStringList all_packets = data.split("%");
all_packets.removeLast(); // Remove the entry after the last delimiter
for (QString single_packet : all_packets) {
AOPacket packet(single_packet);
handlePacket(packet, client);
}
}
} }
void Server::handlePacket(AOPacket packet, QTcpSocket* socket) void Server::handlePacket(AOPacket packet, QTcpSocket *socket)
{ {
qDebug() << "Received packet:" << packet.header << ":" << packet.contents; qDebug() << "Received packet:" << packet.header << ":" << packet.contents;
AOClient* client = clients.value(socket); AOClient *client = clients.value(socket);
// Lord forgive me // Lord forgive me
if(packet.header == "HI"){ if (packet.header == "HI") {
AOClient* client = clients.value(socket); AOClient *client = clients.value(socket);
client->setHwid(packet.contents[0]); client->setHwid(packet.contents[0]);
AOPacket response("ID", {"271828", "akashi", QApplication::applicationVersion()}); AOPacket response("ID",
socket->write(response.toUtf8()); {"271828", "akashi", QApplication::applicationVersion()});
} else if (packet.header == "ID"){ socket->write(response.toUtf8());
QSettings config("config.ini", QSettings::IniFormat); }
config.beginGroup("Options"); else if (packet.header == "ID") {
QString max_players = config.value("max_players").toString(); QSettings config("config.ini", QSettings::IniFormat);
config.endGroup(); config.beginGroup("Options");
QString max_players = config.value("max_players").toString();
config.endGroup();
// Full feature list as of AO 2.8.5 // Full feature list as of AO 2.8.5
// The only ones that are critical to ensuring the server works are "noencryption" and "fastloading" // The only ones that are critical to ensuring the server works are
// TODO: make the rest of these user configurable // "noencryption" and "fastloading"
QStringList feature_list = {"noencryption", "yellowtext", "prezoom", "flipping", "customobjections", "fastloading", "deskmod", "evidence", "cccc_ic_support", "arup", "casing_alserts", "modcall_reason", "looping_sfx", "additive", "effects"}; // TODO: make the rest of these user configurable
QStringList feature_list = {
"noencryption", "yellowtext", "prezoom", "flipping",
"customobjections", "fastloading", "deskmod", "evidence",
"cccc_ic_support", "arup", "casing_alserts", "modcall_reason",
"looping_sfx", "additive", "effects"};
AOPacket response_pn("PN", {QString::number(player_count), max_players}); AOPacket response_pn("PN", {QString::number(player_count), max_players});
AOPacket response_fl("FL", feature_list); AOPacket response_fl("FL", feature_list);
socket->write(response_pn.toUtf8()); socket->write(response_pn.toUtf8());
socket->write(response_fl.toUtf8()); socket->write(response_fl.toUtf8());
} else if(packet.header == "askchaa"){ }
// TODO: add user configurable content else if (packet.header == "askchaa") {
// For testing purposes, we will just send enough to get things working // TODO: add user configurable content
AOPacket response("SI", {"2", "0", "1"}); // For testing purposes, we will just send enough to get things working
socket->write(response.toUtf8()); AOPacket response("SI", {"2", "0", "1"});
} else if(packet.header == "RC") { socket->write(response.toUtf8());
AOPacket response("SC", {"Phoenix", "Edgeworth"}); }
socket->write(response.toUtf8()); else if (packet.header == "RC") {
} else if(packet.header == "RM") { AOPacket response("SC", {"Phoenix", "Edgeworth"});
AOPacket response("SM", {"~stop.mp3"}); socket->write(response.toUtf8());
socket->write(response.toUtf8()); }
} else if(packet.header == "RD") { else if (packet.header == "RM") {
player_count++; AOPacket response("SM", {"~stop.mp3"});
client->joined = true; socket->write(response.toUtf8());
}
else if (packet.header == "RD") {
player_count++;
client->joined = true;
AOPacket response_cc("CharsCheck", {"0", "0"}); AOPacket response_cc("CharsCheck", {"0", "0"});
AOPacket response_op("OPPASS", {"DEADBEEF"}); AOPacket response_op("OPPASS", {"DEADBEEF"});
AOPacket response_done("DONE", {}); AOPacket response_done("DONE", {});
socket->write(response_cc.toUtf8()); socket->write(response_cc.toUtf8());
socket->write(response_op.toUtf8()); socket->write(response_op.toUtf8());
socket->write(response_done.toUtf8()); socket->write(response_done.toUtf8());
} else if(packet.header == "PW") { }
client->password = packet.contents[0]; else if (packet.header == "PW") {
} else if(packet.header == "CC") { client->password = packet.contents[0];
// TODO: properly implement this when adding characters }
qDebug() << client->getIpid() << "chose character" << packet.contents[1] << "using password" << client->password; else if (packet.header == "CC") {
// TODO: properly implement this when adding characters
qDebug() << client->getIpid() << "chose character" << packet.contents[1]
<< "using password" << client->password;
AOPacket response("PV", {"271828", "CID", packet.contents[1]}); AOPacket response("PV", {"271828", "CID", packet.contents[1]});
socket->write(response.toUtf8()); socket->write(response.toUtf8());
} else if(packet.header == "MS") { }
// TODO: validate, validate, validate else if (packet.header == "MS") {
broadcast(packet); // TODO: validate, validate, validate
} else if(packet.header == "CT") { broadcast(packet);
// TODO: commands }
// TODO: zalgo strip else if (packet.header == "CT") {
broadcast(packet); // TODO: commands
} else if(packet.header == "CH") { // TODO: zalgo strip
// Why does this packet exist broadcast(packet);
AOPacket response("CHECK", {}); }
socket->write(response.toUtf8()); else if (packet.header == "CH") {
} else if(packet.header == "what") { // Why does this packet exist
AOPacket response("CT", {"Made with love", "by scatterflower and windrammer"}); AOPacket response("CHECK", {});
} else { socket->write(response.toUtf8());
qDebug() << "Unimplemented packet:" << packet.header; }
qDebug() << packet.contents; else if (packet.header == "what") {
} AOPacket response("CT",
socket->flush(); {"Made with love", "by scatterflower and windrammer"});
}
else {
qDebug() << "Unimplemented packet:" << packet.header;
qDebug() << packet.contents;
}
socket->flush();
} }
void Server::broadcast(AOPacket packet) void Server::broadcast(AOPacket packet)
{ {
for(QTcpSocket* client : clients.keys()) for (QTcpSocket *client : clients.keys()) {
{ client->write(packet.toUtf8());
client->write(packet.toUtf8()); client->flush();
client->flush(); }
}
} }
QTcpSocket* Server::getClient(QString ipid) QTcpSocket *Server::getClient(QString ipid)
{ {
for(QTcpSocket* client : clients.keys()) for (QTcpSocket *client : clients.keys()) {
{ if (clients.value(client)->getIpid() == ipid)
if(clients.value(client)->getIpid() == ipid) return client;
return client; }
} return nullptr;
return nullptr;
} }