Merge pull request #120 from Salanto/add-asset-packet

Add asset packet + network encoding

bin/config_sample/config.ini

@@ -20,6 +20,7 @@ maximum_statements=10
 multiclient_limit=15
 maximum_characters=256
 message_floodguard=250
+asset_url=Your WebAO asset url here.
 
 [Dice]
 max_value=100

include/server.h

@@ -317,6 +317,10 @@ class Server : public QObject {
      * @brief The minimum time between IC messages, in milliseconds.
      */
     int message_floodguard;
+    /**
+     * @brief URL send to the client during handshake to set the remote repository URL.
+     */
+    QUrl asset_url;
 
   public slots:
     /**

src/aoclient.cpp

@@ -265,6 +265,10 @@ void AOClient::sendPacket(AOPacket packet)
 #ifdef NET_DEBUG
     qDebug() << "Sent packet:" << packet.header << ":" << packet.contents;
 #endif
+    packet.contents.replaceInStrings("#", "<num>")
+                   .replaceInStrings("%", "<percent>")
+                   .replaceInStrings("$", "<dollar>")
+                   .replaceInStrings("&", "<and>");
     socket->write(packet.toUtf8());
     socket->flush();
 }

src/packets.cpp

@@ -63,6 +63,11 @@ void AOClient::pktSoftwareId(AreaData* area, int argc, QStringList argv, AOPacke
 
     sendPacket("PN", {QString::number(server->player_count), server->max_players});
     sendPacket("FL", feature_list);
+
+    if (server->asset_url.isValid()) {
+    QByteArray asset_url = server->asset_url.toEncoded(QUrl::EncodeSpaces);
+    sendPacket("ASS", {asset_url});
+    }
 }
 
 void AOClient::pktBeginLoad(AreaData* area, int argc, QStringList argv, AOPacket packet)

src/server.cpp

@@ -295,6 +295,9 @@ void Server::loadServerConfig()
     message_floodguard = config.value("message_floodguard", "250").toInt(&message_floodguard_conversion_success);
     if (!message_floodguard_conversion_success)
         message_floodguard = 30;
+    asset_url = config.value("asset_url","").toString().toUtf8();
+    if (!asset_url.isValid())
+        asset_url = NULL;
     config.endGroup();
 
     //Load dice values