win32 sync compiles and ... works...?

djshaji · Nov 15, 2024 · 164aade · 164aade
1 parent 234efd4
commit 164aade
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -113,3 +113,5 @@ server.o: server.cc server.h client.cc client.h winserver.cc winserver.h
 echo-client: echo-client.cc server.o
 	$(CPP) -o echo-client echo-client.cc client.cc $(GTK) -Wall
 
+win-net: win_net.cc
+	$(CPP) -o win-net win_net.cc -lws2_32 -lwsock32
diff --git a/amprack.exe b/amprack.exe
diff --git a/main.o b/main.o
diff --git a/sync.o b/sync.o
diff --git a/version.h b/version.h
@@ -1 +1 @@
-#define VERSION 156
+#define VERSION 157
diff --git a/win-net.exe b/win-net.exe
diff --git a/win_net.cc b/win_net.cc
@@ -1,3 +1,4 @@
+#include <winsock2.h>
 #include <boost/asio.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/optional.hpp>
@@ -75,7 +76,7 @@ void run_client() {
 
         for (std::string msg : {"Hello World", "Bye World"}) {
             write(m_Socket, asio::buffer(msg));
-            std::this_thread::sleep_for(100ms);
+            sleep(100);
         }
     } catch (std::exception& e) {
         std::cerr << "Exception: " << e.what() << "\n";

diff --git a/winserver.cc b/winserver.cc
@@ -51,23 +51,28 @@ std::string Client::send_preset (json j) {
         std::cerr << "Exception: " << e.what() << "\n";
     }
 
-    return string ("");
+    return string ("{}}");
     OUT
 }
 
 void Server::close_socket () {
+    g_main_loop_quit (main_loop);
     ioc.stop();
     ioc.join();
 }
 
 void Client::close_socket () {
+
 }
 
 Server::Server () {
-
 }
 
 void Server::run () {
+    IN
     TheServer        server(ioc.get_executor(), 6906);    
+    main_loop = g_main_loop_new (null, true);
+    g_main_loop_run (main_loop);
+    OUT
 }
 
diff --git a/winserver.h b/winserver.h
@@ -30,14 +30,17 @@ class TheServer {
   private:
 
     void do_accept() {
+        IN
         m_Acceptor.async_accept([this](boost::system::error_code ec, tcp::socket s) {
             if (!ec) {
                 std::thread(read_session, std::move(s)).detach();
                 do_accept(); // and immediately accept new connection(s)
             } else {
-                std::cout << "Connection error (" << ec.message() << ")" << std::endl;
+                //~ std::cout << "Connection error (" << ec.message() << ")" << std::endl;
+                LOGD ("connection error %s", ec.message ().c_str ());
             }
         });
+        OUT
     }
 
     tcp::acceptor m_Acceptor;
@@ -75,6 +78,7 @@ class Server {
     void run();
 
     GMainContext * context ;
+    GMainLoop * main_loop ;
     void create();
     void close_socket();
     void serve();

diff --git a/winserver.o b/winserver.o