From b682d69e494acdbf5fc97a81109faa667ad1918f Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sun, 13 Jun 2021 22:16:41 -0500 Subject: Use new HTTP-based master server client --- src/packet_distribution.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/packet_distribution.cpp') diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index bcbc6671..44196764 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -67,8 +67,8 @@ void AOApplication::ms_packet_received(AOPacket *p_packet) } } else if (header == "AO2CHECK") { - send_ms_packet(new AOPacket("ID#AO2#" + get_version_string() + "#%")); - send_ms_packet(new AOPacket("HI#" + get_hdid() + "#%")); +// send_ms_packet(new AOPacket("ID#AO2#" + get_version_string() + "#%")); +// send_ms_packet(new AOPacket("HI#" + get_hdid() + "#%")); if (f_contents.size() < 1) goto end; @@ -718,21 +718,6 @@ end: delete p_packet; } -void AOApplication::send_ms_packet(AOPacket *p_packet) -{ - p_packet->net_encode(); - - QString f_packet = p_packet->to_string(); - - net_manager->ship_ms_packet(f_packet); - -#ifdef DEBUG_NETWORK - qDebug() << "S(ms):" << f_packet; -#endif - - delete p_packet; -} - void AOApplication::send_server_packet(AOPacket *p_packet, bool encoded) { if (encoded) -- cgit From cf12168ebd426d7658d7f7021c47be519caa215a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 22:22:30 -0600 Subject: Qt 5.9 compat; remove dead code --- src/packet_distribution.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/packet_distribution.cpp') diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index 44196764..37f58c8b 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -67,9 +67,6 @@ void AOApplication::ms_packet_received(AOPacket *p_packet) } } else if (header == "AO2CHECK") { -// send_ms_packet(new AOPacket("ID#AO2#" + get_version_string() + "#%")); -// send_ms_packet(new AOPacket("HI#" + get_hdid() + "#%")); - if (f_contents.size() < 1) goto end; -- cgit From e29a41b58ffdcaaa8dc7d73c7d8e7b6674f4f51a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Thu, 30 Dec 2021 21:47:35 -0600 Subject: Remove AO1 MS code You won't be missed :') --- src/packet_distribution.cpp | 97 --------------------------------------------- 1 file changed, 97 deletions(-) (limited to 'src/packet_distribution.cpp') diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index 9b56fae3..26abf962 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -6,103 +6,6 @@ #include "lobby.h" #include "networkmanager.h" -void AOApplication::ms_packet_received(AOPacket *p_packet) -{ - 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(); - -#ifdef DEBUG_NETWORK - if (header != "CHECK") - qDebug() << "R(ms):" << p_packet->to_string(); -#endif - - if (header == "ALL") { - server_list.clear(); - - for (QString i_string : p_packet->get_contents()) { - server_type f_server; - QStringList sub_contents = i_string.split("&"); - - if (sub_contents.size() < 4) { - qWarning() << "malformed packet"; - continue; - } - - f_server.name = sub_contents.at(0); - f_server.desc = sub_contents.at(1); - f_server.ip = sub_contents.at(2); - f_server.port = sub_contents.at(3).toInt(); - - server_list.append(f_server); - } - - if (lobby_constructed) { - w_lobby->list_servers(); - } - } - else if (header == "CT") { - QString f_name, f_message; - - if (f_contents.size() == 1) { - f_name = ""; - f_message = f_contents.at(0); - } - else if (f_contents.size() >= 2) { - f_name = f_contents.at(0); - f_message = f_contents.at(1); - } - else - goto end; - - if (lobby_constructed) { - w_lobby->append_chatmessage(f_name, f_message); - } - if (courtroom_constructed && courtroom_loaded) { - w_courtroom->append_server_chatmessage(tr("[Global] %1").arg(f_name), - f_message, "0"); - } - } - else if (header == "AO2CHECK") { - if (f_contents.size() < 1) - goto end; - - QStringList version_contents = f_contents.at(0).split("."); - - if (version_contents.size() < 3) - goto end; - - int f_release = version_contents.at(0).toInt(); - int f_major = version_contents.at(1).toInt(); - int f_minor = version_contents.at(2).toInt(); - - if (get_release() > f_release) - goto end; - else if (get_release() == f_release) { - if (get_major_version() > f_major) - goto end; - else if (get_major_version() == f_major) { - if (get_minor_version() >= f_minor) - goto end; - } - } - - call_notice(tr("Outdated version! Your version: %1\n" - "Please go to aceattorneyonline.com to update.") - .arg(get_version_string())); - destruct_courtroom(); - destruct_lobby(); - } - -end: - - delete p_packet; -} - void AOApplication::append_to_demofile(QString packet_string) { if (get_demo_logging_enabled() && !log_filename.isEmpty()) -- cgit