Update to the latest tftp library version

Author: eoan-ermine

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "3rdparty/modules/tftp"]
+	path = 3rdparty/modules/tftp
+	url = git@github.com:eoan-ermine/tftp.git

3rdparty/modules/tftp

@@ -4,24 +4,24 @@ project(tftp_client)
 
 add_executable(tftp_client tftp_client/main.cpp)
 
-find_package(tftp_common 1.2.0)
+find_package(tftp 1.2.0)
 
-if (NOT tftp_common_FOUND)
+if (NOT tftp_FOUND)
 	include(FetchContent)
 
 	FetchContent_Declare(
-	  tftp_common
-	  URL https://github.com/eoan-ermine/tftp_common/archive/refs/tags/v1.2.0.zip
+	  tftp
+	  URL https://github.com/eoan-ermine/tftp/archive/refs/tags/v1.2.0.zip
 	)
 
-	FetchContent_GetProperties(tftp_common)
-	if (NOT tftp_common_POPULATED)
-		FetchContent_Populate(tftp_common)
+	FetchContent_GetProperties(tftp)
+	if (NOT tftp_POPULATED)
+		FetchContent_Populate(tftp)
 	endif()
 
-	add_library(tftp_common INTERFACE)
-	target_include_directories(tftp_common INTERFACE ${tftp_common_SOURCE_DIR})
-	target_link_libraries(tftp_client tftp_common)
+	add_library(tftp INTERFACE)
+	target_include_directories(tftp INTERFACE ${tftp_SOURCE_DIR})
+	target_link_libraries(tftp_client tftp)
 endif()
 
 

CMakeLists.txt

@@ -8,9 +8,9 @@ A simple Trivial File Transfer Protocol (TFTP) client.
 
 | Dependency name         | Minimum required version | Ubuntu 22.04                         |
 |-------------------------|--------------------------|--------------------------------------|
-| C++                     | C++17                    | sudo apt-get install build-essential |
-| tftp_common             | 1.2.0                    | ---                                  |
-| Boost.System, Boost.Program_Options | 1.74         | sudo apt install libboost-system-dev libboost-program-options-dev |
+| C++ | C++17 | sudo apt-get install build-essential |
+| tftp | [1efbec0864324e1dc18bb6879eff2b7c60aba6b4](https://github.com/eoan-ermine/tftp/commit/1efbec0864324e1dc18bb6879eff2b7c60aba6b4) | --- |
+| Boost.System, Boost.Program_Options | 1.74 | sudo apt install libboost-system-dev libboost-program-options-dev |
 
 ## Usage
 
@@ -41,6 +41,6 @@ tftp_client host [GET | PUT] source destination [--transfer_mode [netascii | oct
 | Extension | Implementation status |
 | ----------- | ----------------- |
 | [RFC 2347: TFTP Option Extension](https://datatracker.ietf.org/doc/html/rfc2347) | ${\color{green}\text{Done}}$ |
-| [RFC 2348: TFTP Blocksize Option](https://datatracker.ietf.org/doc/html/rfc2348) | ${\color{red}\text{Done}}$ |
+| [RFC 2348: TFTP Blocksize Option](https://datatracker.ietf.org/doc/html/rfc2348) | ${\color{green}\text{Done}}$ |
 | [RFC 2349: TFTP Timeout Interval and Transfer Size Options](https://datatracker.ietf.org/doc/html/rfc2349) | ${\color{red}\text{TODO}}$ |
 | [RFC 7440: TFTP Windowsize Option](https://datatracker.ietf.org/doc/html/rfc7440) | ${\color{red}\text{TODO}}$ |

README.md

@@ -1,30 +1,28 @@
 #include <boost/asio.hpp>
 
-#ifdef BUILD_EXAMPLES
-#include "../../../tftp_common/tftp_common.hpp"
-#else
-#include <tftp_common/tftp_common.hpp>
-#endif
+#include <tftp/tftp.hpp>
 
 #include <algorithm>
 #include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <string>
 
-using namespace tftp_common::packets;
+using namespace tftp::packets;
 using boost::asio::ip::udp;
 
 namespace tftp_client {
 
 template <typename Packet> bool try_parse(std::uint8_t *data, std::size_t len, Packet &packet) {
-    auto [result, _] = parse(data, len, packet);
-    if (result)
+    auto result = Parser<Packet>::parse(data, len);
+    packet = std::move(result.get().Packet);
+
+    if (result.isSuccess())
         return true;
     else {
         Error errPacket;
-        auto [result, _] = parse(data, len, errPacket);
-        if (result)
+        auto result = Parser<Error>::parse(data, len);
+        if (result.isSuccess())
             throw errPacket;
     }
     return false;
@@ -38,8 +36,7 @@ class TFTPClient {
     std::size_t blockSize = 512;
 
     std::size_t getBlockSize(const OptionAcknowledgment &packet) const {
-        const auto &Options = packet.getOptions();
-        if (Options.count("blksize") != 0) {
+        if (packet.hasOption("blksize")) {
             return std::atoi(packet.getOptionValue("blksize").data());
         }
         return 512;
@@ -58,7 +55,7 @@ class TFTPClient {
         if (!file && file.eof())
             return;
 
-        std::size_t packetSize = Request(Type::WriteRequest, toPath, transferMode, optionsNames, optionsValues)
+        std::size_t packetSize = Request(tftp::packets::types::Type::WriteRequest, toPath, transferMode, optionsNames, optionsValues)
                                      .serialize(sendBuffer.begin());
         socket.send_to(boost::asio::buffer(sendBuffer, packetSize), receiverEndpoint);
         std::size_t bytesRead = socket.receive_from(boost::asio::buffer(recvBuffer), senderEndpoint);
@@ -108,7 +105,7 @@ class TFTPClient {
         if (!file)
             return;
 
-        std::size_t packetSize = Request(Type::ReadRequest, fromPath, transferMode, optionsNames, optionsValues)
+        std::size_t packetSize = Request(tftp::packets::types::Type::ReadRequest, fromPath, transferMode, optionsNames, optionsValues)
                                      .serialize(sendBuffer.begin());
         socket.send_to(boost::asio::buffer(sendBuffer, packetSize), receiverEndpoint);
         std::size_t bytesRead = socket.receive_from(boost::asio::buffer(recvBuffer), senderEndpoint);

tftp_client/client.hpp

@@ -7,7 +7,7 @@
 #include <iostream>
 #include <string_view>
 
-using namespace tftp_common::packets;
+using namespace tftp::packets;
 using boost::asio::ip::udp;
 namespace po = boost::program_options;