incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

suppress default color behavior in send_command's print_data call

Browse Source
This commit is contained in:
Martin Michelsen
2022-06-22 22:49:05 -07:00
parent 9082907468
commit edef53d3de
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SendCommands.cc
+6 -2
View File
@@ -71,7 +71,11 @@ void send_command(
case GameVersion::BB: { case GameVersion::BB: {
// BB has an annoying behavior here: command lengths must be multiples of // BB has an annoying behavior here: command lengths must be multiples of
// 4, but the actual data length must be a multiple of 8. If the size // 4, but the actual data length must be a multiple of 8. If the size
// field is not divisible by 8, 4 extra bytes are sent anyway. // field is not divisible by 8, 4 extra bytes are sent anyway. This
// behavior only applies when encryption is enabled - any commands sent
// before encryption is enabled have no size restrictions (except they
// must include a full header and must fit in the client's receive
// buffer), and no implicit extra bytes are sent.
PSOCommandHeaderBB header; PSOCommandHeaderBB header;
header.size = (sizeof(header) + size + 3) & ~3; header.size = (sizeof(header) + size + 3) & ~3;
header.command = command; header.command = command;
@@ -108,7 +112,7 @@ void send_command(
} }
log(INFO, "Sending%s (version=%s command=%04hX flag=%08X)", log(INFO, "Sending%s (version=%s command=%04hX flag=%08X)",
name_token.c_str(), name_for_version(version), command, flag); name_token.c_str(), name_for_version(version), command, flag);
print_data(stderr, send_data.data(), logical_size); print_data(stderr, send_data.data(), logical_size, 0, nullptr, PrintDataFlags::PRINT_ASCII | PrintDataFlags::DISABLE_COLOR);
if (use_terminal_colors) { if (use_terminal_colors) {
print_color_escape(stderr, TerminalFormat::NORMAL, TerminalFormat::END); print_color_escape(stderr, TerminalFormat::NORMAL, TerminalFormat::END);
} }