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

make send/receive message shorter for non-BB clients

Browse Source
This commit is contained in:
Martin Michelsen
2022-07-07 23:45:11 -07:00
parent 070db173dd
commit b0319d34a0
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Channel.cc
+19 -7
View File
@@ -213,11 +213,18 @@ Channel::Message Channel::recv(bool print_contents) {
print_color_escape(stderr, this->terminal_recv_color, TerminalFormat::BOLD, TerminalFormat::END); print_color_escape(stderr, this->terminal_recv_color, TerminalFormat::BOLD, TerminalFormat::END);
} }
command_data_log.info("Received from %s (version=%s command=%04hX flag=%08X)", if (version == GameVersion::BB) {
this->name.c_str(), command_data_log.info("Received from %s (version=BB command=%04hX flag=%08" PRIX32 ")",
name_for_version(this->version), this->name.c_str(),
header.command(this->version), header.command(this->version),
header.flag(this->version)); header.flag(this->version));
} else {
command_data_log.info("Received from %s (version=%s command=%02hX flag=%02" PRIX32 ")",
this->name.c_str(),
name_for_version(this->version),
header.command(this->version),
header.flag(this->version));
}
vector<struct iovec> iovs; vector<struct iovec> iovs;
iovs.emplace_back(iovec{.iov_base = header_data.data(), .iov_len = header_data.size()}); iovs.emplace_back(iovec{.iov_base = header_data.data(), .iov_len = header_data.size()});
@@ -319,8 +326,13 @@ void Channel::send(uint16_t cmd, uint32_t flag, const void* data, size_t size,
if (use_terminal_colors && this->terminal_send_color != TerminalFormat::NORMAL) { if (use_terminal_colors && this->terminal_send_color != TerminalFormat::NORMAL) {
print_color_escape(stderr, TerminalFormat::FG_YELLOW, TerminalFormat::BOLD, TerminalFormat::END); print_color_escape(stderr, TerminalFormat::FG_YELLOW, TerminalFormat::BOLD, TerminalFormat::END);
} }
command_data_log.info("Sending to %s (version=%s command=%04hX flag=%08X)", if (version == GameVersion::BB) {
this->name.c_str(), name_for_version(version), cmd, flag); command_data_log.info("Sending to %s (version=BB command=%04hX flag=%08" PRIX32 ")",
this->name.c_str(), cmd, flag);
} else {
command_data_log.info("Sending to %s (version=%s command=%02hX flag=%02" PRIX32 ")",
this->name.c_str(), name_for_version(version), cmd, flag);
}
print_data(stderr, send_data.data(), logical_size, 0, nullptr, PrintDataFlags::PRINT_ASCII | PrintDataFlags::DISABLE_COLOR); print_data(stderr, send_data.data(), logical_size, 0, nullptr, PrintDataFlags::PRINT_ASCII | PrintDataFlags::DISABLE_COLOR);
if (use_terminal_colors && this->terminal_send_color != TerminalFormat::NORMAL) { if (use_terminal_colors && this->terminal_send_color != TerminalFormat::NORMAL) {
print_color_escape(stderr, TerminalFormat::NORMAL, TerminalFormat::END); print_color_escape(stderr, TerminalFormat::NORMAL, TerminalFormat::END);