Add MTU to first packet

Author: gistrec

src/Config.hpp

@@ -6,7 +6,7 @@
 std::string fileName;
 int mtu; // Max packet size to send and receive
 
-std::atomic<int> ttl; // Max time to wait new packets
+int ttl; // Max time to wait new packets
 int ttl_max;
 
 SOCKET _socket;

src/Receiver.cpp

@@ -50,7 +50,7 @@ void checkParts() {
 void run(cxxopts::ParseResult &options) {
     bool finish = false; // Sender finish transfering
 
-    char* buffer = new char[2 * mtu];
+    char* buffer;
 
     while (auto length = recvfrom(_socket, buffer, 2 * mtu, 0, (sockaddr*) &server_address, &server_address_length)) {
         // Sender is no longer available
@@ -65,9 +65,10 @@ void run(cxxopts::ParseResult &options) {
 
         if (strncmp(buffer, "NEW_PACKET", 10) == 0) {
             file_length = Utils::getIntFromBytes(buffer + 10, 4);
+            mtu = Utils::getIntFromBytes(buffer + 14, 4);
 
+            buffer = new char[2 * mtu];
             file = new char[file_length];
-            memset(file, 0, file_length);
 
             std::cout << "Receive information about new file size: " << file_length << std::endl;
             std::cout << "Part count: " << int((float)file_length / (float)mtu + 0.5) << std::endl;

src/Sender.cpp

@@ -42,10 +42,12 @@ void run(cxxopts::ParseResult &options) {
 
 
     snprintf(buffer, 11, "NEW_PACKET");                            //
-    Utils::writeBytesFromInt(buffer + 10, file_length, 4);         // Send information
+    Utils::writeBytesFromInt(buffer + 10, file_length, 4);         //
+    Utils::writeBytesFromInt(buffer + 14, mtu, 4);                 // Send information
     sendto(_socket, buffer, 14, 0, (sockaddr*) &broadcast_address, // about new file
-           sizeof(broadcast_address));                             //
-    std::cout << "Send information about new file with size " << (int) file_length << std::endl;
+           sizeof(broadcast_address));                             // + size and mtu
+    std::cout << "Send information about new file with size ";     //
+    std::cout << (int) file_length << " mtu " << mtu <<std::endl;  //
 
     int part_index = 0;
 

src/Utils.hpp

@@ -33,9 +33,6 @@
 #include "../lib/cxxopts/include/cxxopts.hpp"
 #include "Config.hpp"
 
-#define _WINSOCK_DEPRECATED_NO_WARNINGS
-#define async
-
 
 using namespace std::chrono_literals;
 
@@ -67,18 +64,6 @@ namespace Utils {
             buffer[count - i - 1] = (char) (value >> (i * 8));
         }
     }
-
-    /**
-     * Run in secondary thread
-     * Decrease ttl every second
-     * If ttl < 0 program should stop
-     */
-    void async checkTTL() {
-        while (ttl--) {
-            std::this_thread::sleep_for(1s);
-        }
-        std::cout << "Process no longer be working" << std::endl;
-    }
 }
 
 #endif //FILEBROADCASTER_UTILS_H