sync win

djshaji · Nov 15, 2024 · 234efd4 · 234efd4
1 parent 804e3d6
commit 234efd4
Show file tree

Hide file tree

Showing 43 changed files with 292 additions and 14 deletions.
diff --git a/FileWriter.o b/FileWriter.o
diff --git a/LockFreeQueue.o b/LockFreeQueue.o
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 #~ GTKMM=`pkg-config --cflags --libs gtkmm-4.0` 
 
 TARGET=linux
-#TARGET=win32
+TARGET=win32
 
 VERSION=`git rev-list --count HEAD`
 
@@ -27,10 +27,10 @@ OPUS=`x86_64-w64-mingw32-pkg-config --cflags --libs opus opusfile`
 LAME=-llibmp3lame
 X11=
 GLIB=`mingw64-pkg-config glib-2.0 --libs --cflags`
-OPTIMIZE=-fast
+OPTIMIZE=-Ofast
 CC=x86_64-w64-mingw32-gcc -g -mwindows -mconsole
 CPP=x86_64-w64-mingw32-g++ -std=c++17 -g -mwindows -mconsole 
-DLFCN=-llibdl
+DLFCN=-llibdl -lws2_32 -lwsock32
 endif
 all: amprack
 
@@ -107,8 +107,8 @@ win32-release:
 sync.o: sync.cc sync.h server.o
 	$(CPP) -c sync.cc $(GTK)
 
-server.o: server.cc server.h client.cc client.h
-	$(CPP) -c server.cc client.cc $(GTK) -Wall
+server.o: server.cc server.h client.cc client.h winserver.cc winserver.h
+	$(CPP) -c winserver.cc server.cc client.cc $(GTK) -Wall 
 
 echo-client: echo-client.cc server.o
 	$(CPP) -o echo-client echo-client.cc client.cc $(GTK) -Wall

diff --git a/Plugin.o b/Plugin.o
diff --git a/PluginControl.o b/PluginControl.o
diff --git a/SharedLibrary.o b/SharedLibrary.o
diff --git a/a.out b/a.out
diff --git a/amprack b/amprack
diff --git a/amprack.exe b/amprack.exe
diff --git a/cairo.o b/cairo.o
diff --git a/client.cc b/client.cc
@@ -1,3 +1,4 @@
+#ifdef __linux__
 #include "client.h"
 
 Client::Client(string host, int port) {
@@ -189,3 +190,4 @@ Client::get_response() {
     OUT
     return true;
 }
+#endif
diff --git a/client.o b/client.o
diff --git a/defs.h b/defs.h
@@ -2,8 +2,8 @@
 #define DEFS_H
 
 #define null NULL
-#define true TRUE
-#define false FALSE
+//~ #define true TRUE
+//~ #define false FALSE
 #define oooooh -1
 #define File FILE
 #define reutern return
@@ -13,8 +13,8 @@
 #define vodi void
 #define MinusOne -1
 #define simply
-#define yes true
-#define no false
+//~ #define yes true
+//~ #define no false
 #define brake break
 #define wtf LOGD
 #define GW (GtkWidget *) 

diff --git a/dictionary.o b/dictionary.o
diff --git a/engine.o b/engine.o
diff --git a/jack.o b/jack.o
diff --git a/knob.o b/knob.o
diff --git a/log.o b/log.o
diff --git a/lv2_ext.o b/lv2_ext.o
diff --git a/main.o b/main.o
diff --git a/mem.o b/mem.o
diff --git a/objects.o b/objects.o
diff --git a/pango.o b/pango.o
diff --git a/pluginui.o b/pluginui.o
diff --git a/presets.o b/presets.o
diff --git a/process.o b/process.o
diff --git a/rack.o b/rack.o
diff --git a/server.cc b/server.cc
@@ -1,6 +1,8 @@
-#include "server.h"
+#ifdef __linux__
 #include "sync.h"
 
+#include "server.h"
+
 Server::Server() {
     IN
     // setup variables
@@ -209,3 +211,5 @@ Server::send_response(int client, string response) {
     //~ close_socket ();
     return true;
 }
+
+#endif
diff --git a/server.h b/server.h
@@ -39,3 +39,4 @@ class Server {
     int buflen_;
     char* buf_;
 };
+
diff --git a/server.o b/server.o
diff --git a/settings.o b/settings.o
diff --git a/snd.o b/snd.o
diff --git a/sync.cc b/sync.cc
@@ -1,5 +1,8 @@
 # include "sync.h"
+
+# ifdef __linux__
 # include "net.cc"
+#endif
 
 void sync_send (Sync * sync) {
     IN

diff --git a/sync.h b/sync.h
@@ -2,10 +2,16 @@
 # define __SYNC_H
 
 # include "rack.h"
-# include "defs.h"
-# include "server.h"
+//# include "defs.h"
+
+# ifdef __linux__
+    # include "server.h"
+    # include "client.h"
+# else
+    # include "winserver.h"
+# endif
+
 # include "util.h"
-# include "client.h"
 # include "random"
 
 class Sync {

diff --git a/sync.o b/sync.o
diff --git a/upwaker.o b/upwaker.o
diff --git a/util.o b/util.o
diff --git a/version.h b/version.h
@@ -1 +1 @@
-#define VERSION 155
+#define VERSION 156
diff --git a/vringbuffer.o b/vringbuffer.o
diff --git a/win_net.cc b/win_net.cc
@@ -0,0 +1,91 @@
+#include <boost/asio.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/optional.hpp>
+#include <iomanip>
+#include <iostream>
+
+namespace asio = boost::asio;
+using asio::ip::tcp;
+using namespace std::chrono_literals;
+using boost::system::error_code;
+
+void read_session(tcp::socket sock) {
+    std::cout << "Connection established " << sock.remote_endpoint() << std::endl;
+
+    std::array<char, 1000> buffer;
+
+    for (error_code ec;;) {
+        size_t n = sock.read_some(asio::buffer(buffer), ec);
+        std::cout << "Received " << n << " " << quoted(std::string(buffer.data(), n)) << " (" << ec.message() << ")" << std::endl;
+
+        if (ec.failed())
+            break;
+    }
+
+    std::cout << "Connection closed" << std::endl;
+}
+
+class TheServer {
+  public:
+    TheServer(asio::any_io_executor ex, uint16_t port)   //
+        : m_Acceptor{ex, tcp::endpoint{tcp::v4(), port}} //
+    {
+        m_Acceptor.set_option(tcp::acceptor::reuse_address(true));
+        do_accept();
+    }
+
+  private:
+    void do_accept() {
+        m_Acceptor.async_accept([this](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;
+            }
+        });
+    }
+
+    tcp::acceptor m_Acceptor;
+};
+
+constexpr uint16_t s_port = 1900;
+
+void run_server() {
+    asio::thread_pool ioc(1);
+    TheServer        server(ioc.get_executor(), s_port);
+
+    std::cout << "Press Enter to quit" << std::endl;
+    std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+
+    ioc.stop();
+    ioc.join();
+}
+
+void run_client() {
+    std::cout << "Starting client" << std::endl;
+
+    asio::io_service ioc(1);
+
+    try {
+        tcp::socket m_Socket(ioc);
+        m_Socket.connect({{}, s_port});
+
+        std::cout << "Client connected" << std::endl;
+
+        for (std::string msg : {"Hello World", "Bye World"}) {
+            write(m_Socket, asio::buffer(msg));
+            std::this_thread::sleep_for(100ms);
+        }
+    } catch (std::exception& e) {
+        std::cerr << "Exception: " << e.what() << "\n";
+    }
+}
+
+int main(int argc, char**) {
+    if (argc>1)
+        run_server();
+    else
+        run_client();
+}
+
diff --git a/winserver.cc b/winserver.cc
@@ -0,0 +1,73 @@
+#include "winserver.h"
+
+asio::thread_pool ioc(1);
+
+
+void read_session(tcp::socket sock) {
+    std::cout << "Connection established " << sock.remote_endpoint() << std::endl;
+
+    std::array<char, 1000> buffer;
+
+    for (boost::system::error_code ec;;) {
+        size_t n = sock.read_some(asio::buffer(buffer), ec);
+        std::cout << "Received " << n << " " << quoted(std::string(buffer.data(), n)) << " (" << ec.message() << ")" << std::endl;
+
+        if (ec.failed())
+            break;
+    }
+
+    std::cout << "Connection closed" << std::endl;
+}
+
+void Client::create () {
+    IN
+
+    OUT
+}
+
+Client::Client (string host, int port) {
+    IN
+    host_ = host ;
+    port_ = port ;
+    OUT
+}
+
+std::string Client::send_preset (json j) {
+    IN
+    asio::io_service ioc(1);
+
+    try {
+        tcp::socket m_Socket(ioc);
+        ///| todo enter hostname here
+        m_Socket.connect({{}, port_});
+
+        std::cout << "Client connected" << std::endl;
+
+        ///| todo: add extra } here
+        std::string msg = j.dump ().append (string ("}")) ;
+        write(m_Socket, asio::buffer(msg));
+        std::this_thread::sleep_for(100ms);
+    } catch (std::exception& e) {
+        std::cerr << "Exception: " << e.what() << "\n";
+    }
+
+    return string ("");
+    OUT
+}
+
+void Server::close_socket () {
+    ioc.stop();
+    ioc.join();
+}
+
+void Client::close_socket () {
+}
+
+Server::Server () {
+
+}
+
+void Server::run () {
+    TheServer        server(ioc.get_executor(), 6906);    
+}
+
diff --git a/winserver.h b/winserver.h
@@ -0,0 +1,98 @@
+# ifndef WINSERVER
+# define WINSERVER
+# include "presets.h"
+#include <winsock2.h>
+#include <boost/asio.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/optional.hpp>
+#include <iomanip>
+#include <iostream>
+
+using namespace std;
+using json = nlohmann::json;
+
+namespace asio = boost::asio;
+using asio::ip::tcp;
+using namespace std::chrono_literals;
+using boost::system::error_code;
+
+void read_session(tcp::socket sock) ;
+
+class TheServer {
+  public:
+    TheServer(asio::any_io_executor ex, uint16_t port)   //
+        : m_Acceptor{ex, tcp::endpoint{tcp::v4(), port}} //
+    {
+        m_Acceptor.set_option(tcp::acceptor::reuse_address(true));
+        do_accept();
+    }
+
+  private:
+
+    void do_accept() {
+        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;
+            }
+        });
+    }
+
+    tcp::acceptor m_Acceptor;
+};
+
+class Client {
+public:
+    Client(string host, int port);
+    ~Client();
+
+    void run();
+    std::string send_preset(json j) ;
+    virtual void create();
+    virtual void close_socket();
+    void echo();
+    bool get_response();
+
+private:
+    bool send_request(string);
+
+    string host_;
+    int port_;
+    int server_;
+    int buflen_;
+    char* buf_;
+};
+
+class Server {
+public:
+    Server();
+    ~Server();
+
+    Presets * presets ;
+    void * sync ;
+    void run();
+
+    GMainContext * context ;
+    void create();
+    void close_socket();
+    void serve();
+    void handle(int);
+    string get_request(int);
+    bool send_response(int, string);
+
+    int port_;
+    int server_;
+    int buflen_;
+    char* buf_;
+};
+
+
+class NET {
+    public:
+    vector <string> addresses;
+} ;
+
+
+# endif
diff --git a/winserver.o b/winserver.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,3 +39,4 @@ class Server {
		int buflen_;
		char* buf_;
		};