updated tcp beacons app

tenbergen · Mar 23, 2022 · d990685 · d990685
1 parent 28f5bba
commit d990685
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 27 deletions.
diff --git a/utilities/TCPBeacons_CPP/Application/TCPBeaconsClient.exe b/utilities/TCPBeacons_CPP/Application/TCPBeaconsClient.exe
diff --git a/utilities/TCPBeacons_CPP/Application/TCPBeaconsServer.exe b/utilities/TCPBeacons_CPP/Application/TCPBeaconsServer.exe
diff --git a/utilities/TCPBeacons_CPP/TCPBeacons.exe b/utilities/TCPBeacons_CPP/TCPBeacons.exe
diff --git a/utilities/TCPBeacons_CPP/TCPBeacons/main.cpp b/utilities/TCPBeacons_CPP/TCPBeacons/main.cpp
@@ -26,7 +26,7 @@ int __cdecl main(int argc, char* argv[])
 {
     // >>>>>>> FILE HANDLER <<<<<<<
 
-    // init attributes
+     // init attributes
     std::string fileName, mode1, mode2;
     int innerDelay = 10;
     int outerDelay = 1000;

diff --git a/utilities/TCPBeacons_CPP/TCPBeaconsClient.exe b/utilities/TCPBeacons_CPP/TCPBeaconsClient.exe
diff --git a/utilities/TCPBeacons_CPP/TCPBeaconsServer/TCPBeaconsServer.vcxproj b/utilities/TCPBeacons_CPP/TCPBeaconsServer/TCPBeaconsServer.vcxproj
@@ -72,7 +72,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\Application</OutDir>
+    <OutDir>..\Application\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>

diff --git a/utilities/TCPBeacons_CPP/TCPBeaconsServer/main.cpp b/utilities/TCPBeacons_CPP/TCPBeaconsServer/main.cpp
@@ -13,9 +13,7 @@
 #include <thread>         
 #include <chrono>       
 
-
 #pragma comment (lib, "ws2_32.lib")
-
 #define LISTENING_PORT 1901
 
 
@@ -40,10 +38,9 @@ void sendBeacons(SOCKET sock_, std::vector<std::string> beacons, int innerDelay,
 
             }
         }
-
-        Sleep(outerDelay);
+        std::cout << "Stop sending beacons..." << std::endl;
+        Sleep(300); 
     }
-
 }
 
 void receiveBeacons(SOCKET sock_, std::vector<std::string> beacons, int innerDelay, int outerDelay)
@@ -55,40 +52,30 @@ void receiveBeacons(SOCKET sock_, std::vector<std::string> beacons, int innerDel
     {
         for (std::size_t i = 0; i < beacons.size(); i++)
         {
-            if (sock_ != SOCKET_ERROR)
-            {
+
 
                 // echo beacons sent from client
                 ZeroMemory(buf, 4096);
                 int byteRecv = recv(sock_, buf, 4096, 0);
                 if (byteRecv == 0)
                 {
                     std::cout << "Client disconnected" << std::endl;
-                    if (byteRecv == SOCKET_ERROR)
-                    {
-                        std::cerr << "Error in recv(). Quitting" << std::endl;
-                        break;
-                    }
-
                     break;
                 }
-
                 // echo the message
                 std::cout << std::string(buf, 0, byteRecv) << std::endl;
-
                 // exit when user hit esc
                 if (GetAsyncKeyState(VK_ESCAPE)) {
                     exit = true;
                     break;
                 }
                 Sleep(innerDelay);
 
-            }
         }
-
-        Sleep(outerDelay);
+        std::cout << "" << std::endl;
+        std::cout << "Client disconnected..." << std::endl;
+        Sleep(300);
     }
-
 }
 
 int __cdecl main(int argc, char* argv[])
@@ -99,6 +86,7 @@ int __cdecl main(int argc, char* argv[])
     std::vector<std::string> beacons;
     sockaddr_in hint;
     fd_set master; // select()::fd_set master is a set of 1 listening value and multiple client values 
+    std::vector<std::thread> threads;
 
 
 
@@ -238,7 +226,6 @@ int __cdecl main(int argc, char* argv[])
                     std::cout << host << " connected on port " << ntohs(client.sin_port) << std::endl;
                 }
 
-
                 // Send a message to client to inform connected
                 std::string welcomeMsg = "Connected to the listening server on port " + std::to_string(LISTENING_PORT);
                 send(clientSocket, welcomeMsg.c_str(), welcomeMsg.size() + 1, 0);
@@ -251,22 +238,21 @@ int __cdecl main(int argc, char* argv[])
                 // Send beacons to clients
                 std::cout << std::endl;
                 std::cout << "Sending TCP/IP beacons to " << host << "! Start now!" << std::endl;
-
-                bool exit = false;
+
                 char buf[4096];
 
                 // Server sends beacons to clients through multi threads
                 std::thread sendThread(sendBeacons, clientSocket, beacons, innerDelay, outerDelay);
                 sendThread.detach();
                 std::thread recvThread(receiveBeacons, clientSocket, beacons, innerDelay, outerDelay);
                 recvThread.detach();
-
             }
-
         }
+
+
 
     }
-
+    
 	// Cleanup winsock
 	WSACleanup();
     system("pause");