From 7bcc472f73c774163285f71c235852ba0911e88e Mon Sep 17 00:00:00 2001 From: rubidium42 Date: Sun, 2 May 2021 08:43:11 +0200 Subject: Add: [Network] Reading std::string from a packet --- src/network/core/packet.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'src/network/core/packet.cpp') diff --git a/src/network/core/packet.cpp b/src/network/core/packet.cpp index 6f56e4a56..736970791 100644 --- a/src/network/core/packet.cpp +++ b/src/network/core/packet.cpp @@ -396,6 +396,35 @@ void Packet::Recv_string(char *buffer, size_t size, StringValidationSettings set str_validate(bufp, last, settings); } +/** + * Reads characters (bytes) from the packet until it finds a '\0', or reaches a + * maximum of \c length characters. + * When the '\0' has not been reached in the first \c length read characters, + * more characters are read from the packet until '\0' has been reached. However, + * these characters will not end up in the returned string. + * The length of the returned string will be at most \c length - 1 characters. + * @param length The maximum length of the string including '\0'. + * @param settings The string validation settings. + * @return The validated string. + */ +std::string Packet::Recv_string(size_t length, StringValidationSettings settings) +{ + assert(length > 1); + + /* Both loops with Recv_uint8 terminate when reading past the end of the + * packet as Recv_uint8 then closes the connection and returns 0. */ + std::string str; + char character; + while (--length > 0 && (character = this->Recv_uint8()) != '\0') str.push_back(character); + + if (length == 0) { + /* The string in the packet was longer. Read until the termination. */ + while (this->Recv_uint8() != '\0') {} + } + + return str_validate(str, settings); +} + /** * Get the amount of bytes that are still available for the Transfer functions. * @return The number of bytes that still have to be transfered. -- cgit v1.2.3-70-g09d2