Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle packet decoding separately for SC packet (#433)

Browse Source 
Should fix special (escaped) characters not being parsed correctly in character list.
This commit is contained in:
Skye Deving 2021-01-24 18:26:39 -06:00 committed by GitHub
parent f4c359733a
commit 5d9309b1b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/aopacket.h
View File

@ -17,6 +17,8 @@ public:
void net_encode(); void net_encode();
void net_decode(); void net_decode();
static void escape(QStringList &contents);
static void unescape(QStringList &contents);
private: private:
QString m_header; QString m_header;

27
src/aopacket.cpp
View File

@ -12,25 +12,34 @@ QString AOPacket::to_string(bool encoded)
{ {
QStringList contents = m_contents; QStringList contents = m_contents;
if (encoded) if (encoded)
contents.replaceInStrings("#", "<num>") escape(contents);
.replaceInStrings("%", "<percent>")
.replaceInStrings("$", "<dollar>")
.replaceInStrings("&", "<and>");
return m_header + "#" + contents.join("#") + "#%"; return m_header + "#" + contents.join("#") + "#%";
} }
void AOPacket::net_encode() void AOPacket::net_encode()
{ {
m_contents.replaceInStrings("#", "<num>") escape(m_contents);
.replaceInStrings("%", "<percent>")
.replaceInStrings("$", "<dollar>")
.replaceInStrings("&", "<and>");
} }
void AOPacket::net_decode() void AOPacket::net_decode()
{ {
m_contents.replaceInStrings("<num>", "#") unescape(m_contents);
}
void AOPacket::escape(QStringList &contents)
{
contents.replaceInStrings("#", "<num>")
.replaceInStrings("%", "<percent>")
.replaceInStrings("$", "<dollar>")
.replaceInStrings("&", "<and>");
}
void AOPacket::unescape(QStringList &contents)
{
contents.replaceInStrings("<num>", "#")
.replaceInStrings("<percent>", "%") .replaceInStrings("<percent>", "%")
.replaceInStrings("<dollar>", "$") .replaceInStrings("<dollar>", "$")
.replaceInStrings("<and>", "&"); .replaceInStrings("<and>", "&");
} }

9
src/packet_distribution.cpp
View File

@ -8,9 +8,12 @@
void AOApplication::ms_packet_received(AOPacket *p_packet) void AOApplication::ms_packet_received(AOPacket *p_packet)
{ {
p_packet->net_decode();
QString header = p_packet->get_header(); QString header = p_packet->get_header();
// Some packets need to handle decode/encode separately
if (header != "SC") {
p_packet->net_decode();
}
QStringList f_contents = p_packet->get_contents(); QStringList f_contents = p_packet->get_contents();
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK
@ -333,6 +336,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
for (int n_element = 0; n_element < f_contents.size(); ++n_element) { for (int n_element = 0; n_element < f_contents.size(); ++n_element) {
QStringList sub_elements = f_contents.at(n_element).split("&"); QStringList sub_elements = f_contents.at(n_element).split("&");
AOPacket::unescape(sub_elements);
char_type f_char; char_type f_char;
f_char.name = sub_elements.at(0); f_char.name = sub_elements.at(0);
if (sub_elements.size() >= 2) if (sub_elements.size() >= 2)