Fixed some missing spots

loginserver/client.h

@@ -6,7 +6,7 @@
 #include "../common/random.h"
 #include "../common/eq_stream_intf.h"
 #include "../common/net/dns.h"
-#include "../common/net/daybreak_connection.h"
+#include "../common/net/reliable_stream_connection.h"
 #include "login_types.h"
 #include "../common/repositories/login_accounts_repository.h"
 #include <memory>

zone/api_service.cpp

@@ -82,7 +82,7 @@ Json::Value ApiGetPacketStatistics(EQ::Net::WebsocketServerConnection *connectio
 		auto connection            = client->Connection();
 		auto opts                  = connection->GetManager()->GetOptions();
 		auto eqs_stats             = connection->GetStats();
-		auto &stats                = eqs_stats.DaybreakStats;
+		auto &stats                = eqs_stats.ReliableStreamStats;
 		auto now                   = EQ::Net::Clock::now();
 		auto sec_since_stats_reset = std::chrono::duration_cast<std::chrono::duration<double>>(
 			now - stats.created

zone/gm_commands/show/network.cpp

@@ -16,17 +16,17 @@ void ShowNetwork(Client *c, const Seperator *sep)
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Max Packet Size") +
-		DialogueWindow::TableCell(Strings::Commify(opts.daybreak_options.max_packet_size))
+		DialogueWindow::TableCell(Strings::Commify(opts.reliable_stream_options.max_packet_size))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Max Connection Count") +
-		DialogueWindow::TableCell(Strings::Commify(opts.daybreak_options.max_connection_count))
+		DialogueWindow::TableCell(Strings::Commify(opts.reliable_stream_options.max_connection_count))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Keep Alive Delay") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.keepalive_delay_ms))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.keepalive_delay_ms))
 	);
 
 	popup_table += DialogueWindow::TableRow(
@@ -34,64 +34,64 @@ void ShowNetwork(Client *c, const Seperator *sep)
 		DialogueWindow::TableCell(
 			fmt::format(
 				"{:.2f}",
-				opts.daybreak_options.resend_delay_factor
+				opts.reliable_stream_options.resend_delay_factor
 			)
 		)
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Resend Delay") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.resend_delay_ms))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.resend_delay_ms))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Resend Delay Minimum") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.resend_delay_min))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.resend_delay_min))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Resend Delay Maximum") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.resend_delay_max))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.resend_delay_max))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Connect Delay") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.connect_delay_ms))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.connect_delay_ms))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Connect Stale") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.connect_stale_ms))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.connect_stale_ms))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Stale Connection") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.stale_connection_ms))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.stale_connection_ms))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("CRC Length") +
-		DialogueWindow::TableCell(Strings::Commify(opts.daybreak_options.crc_length))
+		DialogueWindow::TableCell(Strings::Commify(opts.reliable_stream_options.crc_length))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Hold Size") +
-		DialogueWindow::TableCell(Strings::Commify(opts.daybreak_options.hold_size))
+		DialogueWindow::TableCell(Strings::Commify(opts.reliable_stream_options.hold_size))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Hold Length") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.hold_length_ms))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.hold_length_ms))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Simulated In Packet Loss") +
-		DialogueWindow::TableCell(std::to_string(opts.daybreak_options.simulated_in_packet_loss))
+		DialogueWindow::TableCell(std::to_string(opts.reliable_stream_options.simulated_in_packet_loss))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Simulated Out Packet Loss") +
-		DialogueWindow::TableCell(std::to_string(opts.daybreak_options.simulated_out_packet_loss))
+		DialogueWindow::TableCell(std::to_string(opts.reliable_stream_options.simulated_out_packet_loss))
 	);
 
 	popup_table += DialogueWindow::TableRow(
@@ -99,34 +99,34 @@ void ShowNetwork(Client *c, const Seperator *sep)
 		DialogueWindow::TableCell(
 			fmt::format(
 				"{:.2f}",
-				opts.daybreak_options.tic_rate_hertz
+				opts.reliable_stream_options.tic_rate_hertz
 			)
 		)
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Resend Timeout") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.resend_timeout))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.resend_timeout))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Connection Close Time") +
-		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.daybreak_options.connection_close_time))
+		DialogueWindow::TableCell(Strings::MillisecondsToTime(opts.reliable_stream_options.connection_close_time))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Encode Passes (1)") +
-		DialogueWindow::TableCell(Strings::Commify(opts.daybreak_options.encode_passes[0]))
+		DialogueWindow::TableCell(Strings::Commify(opts.reliable_stream_options.encode_passes[0]))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Encode Passes (2)") +
-		DialogueWindow::TableCell(Strings::Commify(opts.daybreak_options.encode_passes[1]))
+		DialogueWindow::TableCell(Strings::Commify(opts.reliable_stream_options.encode_passes[1]))
 	);
 
 	popup_table += DialogueWindow::TableRow(
 		DialogueWindow::TableCell("Port") +
-		DialogueWindow::TableCell(Strings::Commify(opts.daybreak_options.port))
+		DialogueWindow::TableCell(Strings::Commify(opts.reliable_stream_options.port))
 	);
 
 	popup_table = DialogueWindow::Table(popup_table);

zone/gm_commands/show/network_stats.cpp

@@ -7,7 +7,7 @@ void ShowNetworkStats(Client *c, const Seperator *sep)
 	const auto opts       = connection->GetManager()->GetOptions();
 	const auto eqs_stats  = connection->GetStats();
 
-	const auto& stats = eqs_stats.DaybreakStats;
+	const auto& stats = eqs_stats.ReliableStreamStats;
 
 	const auto sec_since_stats_reset = std::chrono::duration_cast<std::chrono::duration<double>>(
 		EQ::Net::Clock::now() - stats.created
@@ -217,7 +217,7 @@ void ShowNetworkStats(Client *c, const Seperator *sep)
 		)
 	);
 
-	if (opts.daybreak_options.outgoing_data_rate > 0.0) {
+	if (opts.reliable_stream_options.outgoing_data_rate > 0.0) {
 		popup_table += DialogueWindow::TableRow(
 			DialogueWindow::TableCell("Outgoing Link Saturation") +
 			DialogueWindow::TableCell(
@@ -229,14 +229,14 @@ void ShowNetworkStats(Client *c, const Seperator *sep)
 							1.0 -
 							(
 								(
-									opts.daybreak_options.outgoing_data_rate -
+									opts.reliable_stream_options.outgoing_data_rate -
 									stats.datarate_remaining
 								) /
-								opts.daybreak_options.outgoing_data_rate
+								opts.reliable_stream_options.outgoing_data_rate
 							)
 						)
 					),
-					opts.daybreak_options.outgoing_data_rate
+					opts.reliable_stream_options.outgoing_data_rate
 				)
 			)
 		);