implement more packets

include/aoclient.h

@@ -17,6 +17,8 @@ public:
     QString getIpid();
 
     QHostAddress remote_ip;
+    QString password;
+    bool joined;
 
 private:
     QString hwid;

include/server.h

@@ -4,6 +4,7 @@
 #include "include/aopacket.h"
 #include "include/aoclient.h"
 
+#include <QDebug>
 #include <QApplication>
 #include <QString>
 #include <QSettings>
@@ -28,6 +29,7 @@ public slots:
 private:
   void handlePacket(AOPacket packet, QTcpSocket* socket);
   QTcpSocket* getClient(QString ipid);
+  void broadcast(AOPacket packet);
 
   QTcpServer* server;
 

src/advertiser.cpp

@@ -29,7 +29,7 @@ void Advertiser::readData()
   // The information coming back from the MS isn't very useful
   // However, it can be useful to see it when debugging
   // TODO: master network debug switch
-  qDebug() << "From MS:" << socket->readAll();
+  // qDebug() << "From MS:" << socket->readAll();
 }
 
 void Advertiser::socketConnected()
@@ -48,7 +48,8 @@ void Advertiser::socketConnected()
 
   socket->write(data);
   // TODO: master network debug switch
-  qDebug() << "To MS:" << data;
+  // should be a separate one for MS as well
+  // qDebug() << "To MS:" << data;
   socket->flush();
 }
 

src/aoclient.cpp

@@ -2,6 +2,8 @@
 
 AOClient::AOClient(QHostAddress p_remote_ip)
 {
+    joined = false;
+    password = "";
     remote_ip = p_remote_ip;
 }
 

src/aopacket.cpp

@@ -13,18 +13,22 @@ AOPacket::AOPacket(QString p_packet)
         // 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();
+    packet_contents.removeFirst(); // Remove header
+    packet_contents.removeLast(); // Remove anything trailing after delimiter
     contents = packet_contents;
 }
 

src/server.cpp

@@ -50,26 +50,25 @@ void Server::clientConnected()
     client->write(decryptor.toUtf8());
 
     qDebug() << client->peerAddress().toString() << "connected";
-    // TODO: only increment this once someone actually enters the coutroom
-    player_count++;
 }
 
 void Server::clientDisconnected()
 {
     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);
-        player_count--;
     }
 }
 
 void Server::clientData()
 {
-    // TODO: deal with more than one packet on wire
     if(QTcpSocket* client = dynamic_cast<QTcpSocket*>(sender())){
         QString data = QString::fromUtf8(client->readAll());
-        qDebug() << "From" << client->peerAddress() << ":" << data;
+        //qDebug() << "From" << client->peerAddress() << ":" << data;
 
         if(is_partial) {
             data = partial_packet + data;
@@ -78,13 +77,21 @@ void Server::clientData()
             is_partial = true;
         }
 
-        AOPacket packet(data);
+        QStringList all_packets = data.split("%");
-        handlePacket(packet, client);
+        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)
 {
+    qDebug() << "Received packet:" << packet.header << ":" << packet.contents;
+    AOClient* client = clients.value(socket);
     // Lord forgive me
     if(packet.header == "HI"){
         AOClient* client = clients.value(socket);
@@ -119,12 +126,36 @@ void Server::handlePacket(AOPacket packet, QTcpSocket* socket)
         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("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;
@@ -132,6 +163,15 @@ void Server::handlePacket(AOPacket packet, QTcpSocket* socket)
     socket->flush();
 }
 
+void Server::broadcast(AOPacket packet)
+{
+    for(QTcpSocket* client : clients.keys())
+    {
+        client->write(packet.toUtf8());
+        client->flush();
+    }
+}
+
 QTcpSocket* Server::getClient(QString ipid)
 {
     for(QTcpSocket* client : clients.keys())