clang format
This commit is contained in:
scatterflower
parent
e342c45806
commit
274c217e52
@ -1,28 +1,27 @@
|
||||
#ifndef AOCLIENT_H
|
||||
#define AOCLIENT_H
|
||||
|
||||
#include <QTcpSocket>
|
||||
#include <QHostAddress>
|
||||
#include <QCryptographicHash>
|
||||
#include <QHostAddress>
|
||||
#include <QTcpSocket>
|
||||
|
||||
class AOClient
|
||||
{
|
||||
class AOClient {
|
||||
public:
|
||||
AOClient(QHostAddress p_remote_ip);
|
||||
~AOClient();
|
||||
AOClient(QHostAddress p_remote_ip);
|
||||
~AOClient();
|
||||
|
||||
QString getHwid();
|
||||
void setHwid(QString p_hwid);
|
||||
QString getHwid();
|
||||
void setHwid(QString p_hwid);
|
||||
|
||||
QString getIpid();
|
||||
QString getIpid();
|
||||
|
||||
QHostAddress remote_ip;
|
||||
QString password;
|
||||
bool joined;
|
||||
QHostAddress remote_ip;
|
||||
QString password;
|
||||
bool joined;
|
||||
|
||||
private:
|
||||
QString hwid;
|
||||
QString ipid;
|
||||
QString hwid;
|
||||
QString ipid;
|
||||
};
|
||||
|
||||
#endif // AOCLIENT_H
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
#ifndef SERVER_H
|
||||
#define SERVER_H
|
||||
|
||||
#include "include/aopacket.h"
|
||||
#include "include/aoclient.h"
|
||||
#include "include/aopacket.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QApplication>
|
||||
#include <QString>
|
||||
#include <QDebug>
|
||||
#include <QMap>
|
||||
#include <QSettings>
|
||||
#include <QString>
|
||||
#include <QTcpServer>
|
||||
#include <QTcpSocket>
|
||||
#include <QMap>
|
||||
|
||||
class Server : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
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();
|
||||
|
||||
signals:
|
||||
@ -27,16 +27,16 @@ public slots:
|
||||
void clientData();
|
||||
|
||||
private:
|
||||
void handlePacket(AOPacket packet, QTcpSocket* socket);
|
||||
QTcpSocket* getClient(QString ipid);
|
||||
void handlePacket(AOPacket packet, QTcpSocket *socket);
|
||||
QTcpSocket *getClient(QString ipid);
|
||||
void broadcast(AOPacket packet);
|
||||
|
||||
QTcpServer* server;
|
||||
QTcpServer *server;
|
||||
|
||||
int port;
|
||||
int ws_port;
|
||||
|
||||
QMap<QTcpSocket*, AOClient*> clients;
|
||||
QMap<QTcpSocket *, AOClient *> clients;
|
||||
QString partial_packet;
|
||||
bool is_partial;
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ AkashiMain::AkashiMain(QWidget *parent)
|
||||
|
||||
AkashiMain::~AkashiMain()
|
||||
{
|
||||
delete ui;
|
||||
delete advertiser;
|
||||
delete server;
|
||||
delete ui;
|
||||
delete advertiser;
|
||||
delete server;
|
||||
}
|
||||
|
||||
@ -2,32 +2,25 @@
|
||||
|
||||
AOClient::AOClient(QHostAddress p_remote_ip)
|
||||
{
|
||||
joined = false;
|
||||
password = "";
|
||||
remote_ip = p_remote_ip;
|
||||
joined = false;
|
||||
password = "";
|
||||
remote_ip = p_remote_ip;
|
||||
}
|
||||
|
||||
QString AOClient::getHwid(){
|
||||
return hwid;
|
||||
}
|
||||
QString AOClient::getHwid() { return 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
|
||||
QString concat_ip_id = remote_ip.toString() + p_hwid;
|
||||
hash.addData(concat_ip_id.toUtf8());
|
||||
QCryptographicHash hash(QCryptographicHash::Md5); // Don't need security, just
|
||||
// hashing for uniqueness
|
||||
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()
|
||||
{
|
||||
return ipid;
|
||||
}
|
||||
QString AOClient::getIpid() { return ipid; }
|
||||
|
||||
AOClient::~AOClient()
|
||||
{
|
||||
|
||||
}
|
||||
AOClient::~AOClient() {}
|
||||
|
||||
@ -8,28 +8,29 @@ AOPacket::AOPacket(QString p_header, QStringList p_contents)
|
||||
|
||||
AOPacket::AOPacket(QString p_packet)
|
||||
{
|
||||
QStringList packet_contents = p_packet.split("#");
|
||||
if(p_packet.at(0) == '#') {
|
||||
// The header is encrypted with FantaCrypt
|
||||
// The server always uses the same key for FantaCrypt
|
||||
// That way, we can just hardcode FantaCrypted headers
|
||||
// TODO: replace this with a key/value map?
|
||||
packet_contents.removeFirst();
|
||||
if(packet_contents[0] == "48E0")
|
||||
header = "HI";
|
||||
else if(packet_contents[0] == "493F")
|
||||
header = "ID";
|
||||
else if(packet_contents[0] == "615810BC07D12A5A")
|
||||
header = "askchaa";
|
||||
else
|
||||
header = packet_contents[0]; // If no known decryption exists, just leave the packet as-is
|
||||
}
|
||||
else {
|
||||
header = packet_contents[0];
|
||||
}
|
||||
packet_contents.removeFirst(); // Remove header
|
||||
packet_contents.removeLast(); // Remove anything trailing after delimiter
|
||||
contents = packet_contents;
|
||||
QStringList packet_contents = p_packet.split("#");
|
||||
if (p_packet.at(0) == '#') {
|
||||
// The header is encrypted with FantaCrypt
|
||||
// The server always uses the same key for FantaCrypt
|
||||
// That way, we can just hardcode FantaCrypted headers
|
||||
// TODO: replace this with a key/value map?
|
||||
packet_contents.removeFirst();
|
||||
if (packet_contents[0] == "48E0")
|
||||
header = "HI";
|
||||
else if (packet_contents[0] == "493F")
|
||||
header = "ID";
|
||||
else if (packet_contents[0] == "615810BC07D12A5A")
|
||||
header = "askchaa";
|
||||
else
|
||||
header = packet_contents[0]; // If no known decryption exists, just leave
|
||||
// the packet as-is
|
||||
}
|
||||
else {
|
||||
header = packet_contents[0];
|
||||
}
|
||||
packet_contents.removeFirst(); // Remove header
|
||||
packet_contents.removeLast(); // Remove anything trailing after delimiter
|
||||
contents = packet_contents;
|
||||
}
|
||||
|
||||
QString AOPacket::toString()
|
||||
|
||||
286
src/server.cpp
286
src/server.cpp
@ -1,7 +1,6 @@
|
||||
#include "include/server.h"
|
||||
|
||||
Server::Server(int p_port, int p_ws_port, QObject* parent)
|
||||
: QObject(parent)
|
||||
Server::Server(int p_port, int p_ws_port, QObject *parent) : QObject(parent)
|
||||
{
|
||||
server = new QTcpServer(this);
|
||||
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()
|
||||
{
|
||||
// TODO: websockets lul
|
||||
// Maybe websockets should be handled by a separate intermediate part of the code?
|
||||
// The idea being that it is a websocket server, and all it does is create a
|
||||
// local connection to the raw tcp server.
|
||||
// The main issue with this is that it will cause problems with bans, ipids, etc
|
||||
// But perhaps this can be negotiated by sending some extra data over?
|
||||
// No idea. I'll wait for long to read this massive comment and DM me on discord
|
||||
//
|
||||
// Upon thinking about this a bit more, I realized basically all of the
|
||||
// communication only happens via QTcpSocket* pointers.
|
||||
// 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
|
||||
if(!server->listen(QHostAddress::Any, port))
|
||||
{
|
||||
// TODO: signal server start failed
|
||||
qDebug() << "Server error:" << server->errorString();
|
||||
}
|
||||
else
|
||||
{
|
||||
// TODO: signal server start success
|
||||
qDebug() << "Server listening on" << port;
|
||||
}
|
||||
// TODO: websockets lul
|
||||
// Maybe websockets should be handled by a separate intermediate part of the
|
||||
// code? The idea being that it is a websocket server, and all it does is
|
||||
// create a local connection to the raw tcp server. The main issue with this
|
||||
// is that it will cause problems with bans, ipids, etc But perhaps this can
|
||||
// be negotiated by sending some extra data over? No idea. I'll wait for long
|
||||
// to read this massive comment and DM me on discord
|
||||
//
|
||||
// Upon thinking about this a bit more, I realized basically all of the
|
||||
// communication only happens via QTcpSocket* pointers.
|
||||
// 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
|
||||
if (!server->listen(QHostAddress::Any, port)) {
|
||||
// TODO: signal server start failed
|
||||
qDebug() << "Server error:" << server->errorString();
|
||||
}
|
||||
else {
|
||||
// TODO: signal server start success
|
||||
qDebug() << "Server listening on" << port;
|
||||
}
|
||||
}
|
||||
|
||||
void Server::clientConnected()
|
||||
{
|
||||
QTcpSocket* client = server->nextPendingConnection();
|
||||
AOClient* ao_client = new AOClient(client->peerAddress());
|
||||
clients.insert(client, ao_client);
|
||||
connect(client, SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
|
||||
connect(client, SIGNAL(readyRead()), this, SLOT(clientData()));
|
||||
QTcpSocket *client = server->nextPendingConnection();
|
||||
AOClient *ao_client = new AOClient(client->peerAddress());
|
||||
clients.insert(client, ao_client);
|
||||
connect(client, SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
|
||||
connect(client, SIGNAL(readyRead()), this, SLOT(clientData()));
|
||||
|
||||
AOPacket decryptor("decryptor", {"34"});
|
||||
client->write(decryptor.toUtf8());
|
||||
AOPacket decryptor("decryptor", {"34"});
|
||||
client->write(decryptor.toUtf8());
|
||||
|
||||
qDebug() << client->peerAddress().toString() << "connected";
|
||||
qDebug() << client->peerAddress().toString() << "connected";
|
||||
}
|
||||
|
||||
void Server::clientDisconnected()
|
||||
{
|
||||
if(QTcpSocket* client = dynamic_cast<QTcpSocket*>(sender())){
|
||||
qDebug() << client->peerAddress() << "disconnected";
|
||||
if(clients.value(client)->joined)
|
||||
player_count--;
|
||||
if (QTcpSocket *client = dynamic_cast<QTcpSocket *>(sender())) {
|
||||
qDebug() << client->peerAddress() << "disconnected";
|
||||
if (clients.value(client)->joined)
|
||||
player_count--;
|
||||
|
||||
delete clients.value(client);
|
||||
clients.remove(client);
|
||||
}
|
||||
delete clients.value(client);
|
||||
clients.remove(client);
|
||||
}
|
||||
}
|
||||
|
||||
void Server::clientData()
|
||||
{
|
||||
if(QTcpSocket* client = dynamic_cast<QTcpSocket*>(sender())){
|
||||
QString data = QString::fromUtf8(client->readAll());
|
||||
//qDebug() << "From" << client->peerAddress() << ":" << data;
|
||||
if (QTcpSocket *client = dynamic_cast<QTcpSocket *>(sender())) {
|
||||
QString data = QString::fromUtf8(client->readAll());
|
||||
// qDebug() << "From" << client->peerAddress() << ":" << data;
|
||||
|
||||
if(is_partial) {
|
||||
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 (is_partial) {
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Server::handlePacket(AOPacket packet, QTcpSocket* socket)
|
||||
void Server::handlePacket(AOPacket packet, QTcpSocket *socket)
|
||||
{
|
||||
qDebug() << "Received packet:" << packet.header << ":" << packet.contents;
|
||||
AOClient* client = clients.value(socket);
|
||||
// Lord forgive me
|
||||
if(packet.header == "HI"){
|
||||
AOClient* client = clients.value(socket);
|
||||
client->setHwid(packet.contents[0]);
|
||||
qDebug() << "Received packet:" << packet.header << ":" << packet.contents;
|
||||
AOClient *client = clients.value(socket);
|
||||
// Lord forgive me
|
||||
if (packet.header == "HI") {
|
||||
AOClient *client = clients.value(socket);
|
||||
client->setHwid(packet.contents[0]);
|
||||
|
||||
AOPacket response("ID", {"271828", "akashi", QApplication::applicationVersion()});
|
||||
socket->write(response.toUtf8());
|
||||
} else if (packet.header == "ID"){
|
||||
QSettings config("config.ini", QSettings::IniFormat);
|
||||
config.beginGroup("Options");
|
||||
QString max_players = config.value("max_players").toString();
|
||||
config.endGroup();
|
||||
AOPacket response("ID",
|
||||
{"271828", "akashi", QApplication::applicationVersion()});
|
||||
socket->write(response.toUtf8());
|
||||
}
|
||||
else if (packet.header == "ID") {
|
||||
QSettings config("config.ini", QSettings::IniFormat);
|
||||
config.beginGroup("Options");
|
||||
QString max_players = config.value("max_players").toString();
|
||||
config.endGroup();
|
||||
|
||||
// Full feature list as of AO 2.8.5
|
||||
// The only ones that are critical to ensuring the server works are "noencryption" and "fastloading"
|
||||
// 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"};
|
||||
// Full feature list as of AO 2.8.5
|
||||
// The only ones that are critical to ensuring the server works are
|
||||
// "noencryption" and "fastloading"
|
||||
// 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_fl("FL", feature_list);
|
||||
socket->write(response_pn.toUtf8());
|
||||
socket->write(response_fl.toUtf8());
|
||||
} else if(packet.header == "askchaa"){
|
||||
// TODO: add user configurable content
|
||||
// For testing purposes, we will just send enough to get things working
|
||||
AOPacket response("SI", {"2", "0", "1"});
|
||||
socket->write(response.toUtf8());
|
||||
} else if(packet.header == "RC") {
|
||||
AOPacket response("SC", {"Phoenix", "Edgeworth"});
|
||||
socket->write(response.toUtf8());
|
||||
} else if(packet.header == "RM") {
|
||||
AOPacket response("SM", {"~stop.mp3"});
|
||||
socket->write(response.toUtf8());
|
||||
} else if(packet.header == "RD") {
|
||||
player_count++;
|
||||
client->joined = true;
|
||||
AOPacket response_pn("PN", {QString::number(player_count), max_players});
|
||||
AOPacket response_fl("FL", feature_list);
|
||||
socket->write(response_pn.toUtf8());
|
||||
socket->write(response_fl.toUtf8());
|
||||
}
|
||||
else if (packet.header == "askchaa") {
|
||||
// TODO: add user configurable content
|
||||
// For testing purposes, we will just send enough to get things working
|
||||
AOPacket response("SI", {"2", "0", "1"});
|
||||
socket->write(response.toUtf8());
|
||||
}
|
||||
else if (packet.header == "RC") {
|
||||
AOPacket response("SC", {"Phoenix", "Edgeworth"});
|
||||
socket->write(response.toUtf8());
|
||||
}
|
||||
else if (packet.header == "RM") {
|
||||
AOPacket response("SM", {"~stop.mp3"});
|
||||
socket->write(response.toUtf8());
|
||||
}
|
||||
else if (packet.header == "RD") {
|
||||
player_count++;
|
||||
client->joined = true;
|
||||
|
||||
AOPacket response_cc("CharsCheck", {"0", "0"});
|
||||
AOPacket response_op("OPPASS", {"DEADBEEF"});
|
||||
AOPacket response_done("DONE", {});
|
||||
socket->write(response_cc.toUtf8());
|
||||
socket->write(response_op.toUtf8());
|
||||
socket->write(response_done.toUtf8());
|
||||
} else if(packet.header == "PW") {
|
||||
client->password = packet.contents[0];
|
||||
} 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_cc("CharsCheck", {"0", "0"});
|
||||
AOPacket response_op("OPPASS", {"DEADBEEF"});
|
||||
AOPacket response_done("DONE", {});
|
||||
socket->write(response_cc.toUtf8());
|
||||
socket->write(response_op.toUtf8());
|
||||
socket->write(response_done.toUtf8());
|
||||
}
|
||||
else if (packet.header == "PW") {
|
||||
client->password = packet.contents[0];
|
||||
}
|
||||
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]});
|
||||
socket->write(response.toUtf8());
|
||||
} else if(packet.header == "MS") {
|
||||
// TODO: validate, validate, validate
|
||||
broadcast(packet);
|
||||
} else if(packet.header == "CT") {
|
||||
// TODO: commands
|
||||
// TODO: zalgo strip
|
||||
broadcast(packet);
|
||||
} else if(packet.header == "CH") {
|
||||
// Why does this packet exist
|
||||
AOPacket response("CHECK", {});
|
||||
socket->write(response.toUtf8());
|
||||
} else if(packet.header == "what") {
|
||||
AOPacket response("CT", {"Made with love", "by scatterflower and windrammer"});
|
||||
} else {
|
||||
qDebug() << "Unimplemented packet:" << packet.header;
|
||||
qDebug() << packet.contents;
|
||||
}
|
||||
socket->flush();
|
||||
AOPacket response("PV", {"271828", "CID", packet.contents[1]});
|
||||
socket->write(response.toUtf8());
|
||||
}
|
||||
else if (packet.header == "MS") {
|
||||
// TODO: validate, validate, validate
|
||||
broadcast(packet);
|
||||
}
|
||||
else if (packet.header == "CT") {
|
||||
// TODO: commands
|
||||
// TODO: zalgo strip
|
||||
broadcast(packet);
|
||||
}
|
||||
else if (packet.header == "CH") {
|
||||
// Why does this packet exist
|
||||
AOPacket response("CHECK", {});
|
||||
socket->write(response.toUtf8());
|
||||
}
|
||||
else if (packet.header == "what") {
|
||||
AOPacket response("CT",
|
||||
{"Made with love", "by scatterflower and windrammer"});
|
||||
}
|
||||
else {
|
||||
qDebug() << "Unimplemented packet:" << packet.header;
|
||||
qDebug() << packet.contents;
|
||||
}
|
||||
socket->flush();
|
||||
}
|
||||
|
||||
void Server::broadcast(AOPacket packet)
|
||||
{
|
||||
for(QTcpSocket* client : clients.keys())
|
||||
{
|
||||
client->write(packet.toUtf8());
|
||||
client->flush();
|
||||
}
|
||||
for (QTcpSocket *client : clients.keys()) {
|
||||
client->write(packet.toUtf8());
|
||||
client->flush();
|
||||
}
|
||||
}
|
||||
|
||||
QTcpSocket* Server::getClient(QString ipid)
|
||||
QTcpSocket *Server::getClient(QString ipid)
|
||||
{
|
||||
for(QTcpSocket* client : clients.keys())
|
||||
{
|
||||
if(clients.value(client)->getIpid() == ipid)
|
||||
return client;
|
||||
}
|
||||
return nullptr;
|
||||
for (QTcpSocket *client : clients.keys()) {
|
||||
if (clients.value(client)->getIpid() == ipid)
|
||||
return client;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user