ARCHIVE/sashimono
1
0
Fork 0
mirror of https://github.com/EvernodeXRPL/sashimono.git synced 2026-07-27 17:10:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changing Buffer Sizes for JSON List Command (#159)

Browse Source
This commit is contained in:
Udith Indrakantha
2022-07-15 16:42:29 +05:30
committed by GitHub
parent bcf741b5d0
commit 0c267b0873
5 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sashi-cli/cli-manager.cpp
View File

@@ -162,19 +162,38 @@ namespace cli
return -1;
}
// Resize the message to max length and resize to original read length after reading.
message.resize(BUFFER_SIZE);
const int res = read(ctx.socket_fd, message.data(), message.length());
// Read the length of the message to a buffer
uint8_t length_buffer[8];
int res = read(ctx.socket_fd, length_buffer, 8);
if (res == -1)
{
std::cerr << errno << " :Error while reading from the sashimono socket.\n";
std::cerr << errno << " :Error while reading message length from the sashimono socket.\n";
return -1;
}
const uint32_t message_length = uint32_from_bytes(length_buffer);
// Resize the message buffer to fit to the message length
message.resize(message_length);
res = read(ctx.socket_fd, message.data(), message_length);
if (res == -1)
{
std::cerr << errno << " :Error while reading the message from the sashimono socket.\n";
return -1;
}
message.resize(res);
return res;
}
// Convert byte buffer to uint32_t
uint32_t uint32_from_bytes(const uint8_t *data)
{
return ((uint32_t)data[0] << 24) +
((uint32_t)data[1] << 16) +
((uint32_t)data[2] << 8) +
((uint32_t)data[3]);
}
int get_json_output(std::string_view json_msg, std::string &output)
{
if (write_to_socket(json_msg) == -1 || read_from_socket(output) == -1)
@@ -229,7 +248,7 @@ namespace cli
return -1;
}
jsoncons::json content = jsoncons::json::parse(d["content"].as<std::string>(), jsoncons::strict_json_parsing());
jsoncons::json content = d["content"];
std::cout << jsoncons::pretty_print(content) << std::endl;
}
catch (const std::exception &e)