import(life): ...

1 files changed, 11 insertions, 27 deletions

diff --git a/works/life/computer-network-experiment/client.cpp b/works/life/computer-network-experiment/client.cpp
index 926ece6..aeb352f 100644
--- a/works/life/computer-network-experiment/client.cpp
+++ b/works/life/computer-network-experiment/client.cpp
@@ -2,32 +2,22 @@
  *  This is the client program.

  */

 

+#include "Common.h"

+#include "Output.h"

+

+#ifdef WIN32

 #include <Windows.h>

-#include <iostream>

-#include <string>

 #include <winsock.h>

-

-#pragma comment(lib, "ws2_32.lib")

+#endif

 

 const auto connect_address = "127.0.0.1"; // control connect address

 const u_short port = 1234;                // control connect port

 

-int main() {

-  WSADATA wsa_data;

-

-  if (WSAStartup(MAKEWORD(2, 2), &wsa_data)) // initialize wsa

-  {

-    std::cerr << "WSA start up error!\n";

-    WSACleanup();

-    return 1;

-  }

-

+int Main() {

   int client_socket;

 

   if ((client_socket = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {

-    std::cerr << "Failed to create socket!\n";

-    WSACleanup();

-    return 1;

+    PrintErrorMessageAndExit(CRUT("Failed to create socket!\n"));

   }

 

   sockaddr_in server_address;

@@ -39,28 +29,22 @@ int main() {
 

   if (connect(client_socket, (sockaddr *)&server_address, sizeof(sockaddr)) ==

       SOCKET_ERROR) {

-    std::cerr << "Failed to connect!";

-    WSACleanup();

-    return 1;

+    PrintErrorMessageAndExit(CRUT("Failed to connect!"));

   }

 

   const int buffer_size = 100;

-  char * buffer = new char[buffer_size];

+  char *buffer = new char[buffer_size];

 

   int received_number = recv(client_socket, buffer, buffer_size, 0);

 

   if (received_number == -1) {

-    std::cerr <<  "Failed to recv.";

-    WSACleanup();

-    return 1;

+    PrintErrorMessageAndExit(CRUT("Failed to recv."));

   }

 

   std::string s(buffer, received_number);

 

-  std::cout << "Received message:\n" << s; 

+  SendOutput(CRUT("Received message:\n"));

 

   closesocket(client_socket);

-  WSACleanup();

-

   return 0;

 }