Changeset 104:a41f04cda4c2 in xplra

Timestamp:

12/15/22 19:15:24 (17 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

The plugin accepts connections over TCP as well

Location:

src/plugin/src/xplra

Files:

• ListenThread.cc (modified) (4 diffs)
• ListenThread.h (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• ServerThread.cc (modified) (2 diffs)
• ServerThread.h (modified) (2 diffs)

src/plugin/src/xplra/ListenThread.cc

@@ -1 @@
-// Copyright (c) 2013 by István Váradi
+// Copyright (c) 2022 by István Váradi
 
 // This file is part of XPLRA, a remote-access plugin for X-Plane
@@ -35 +35 @@
 #include <hu/varadiistvan/scpl/io/LocalServerSocket.h>
 #include <hu/varadiistvan/scpl/io/LocalAcceptor.h>
+#include <hu/varadiistvan/scpl/io/TCPServerSocket.h>
+#include <hu/varadiistvan/scpl/io/TCPAcceptor.h>
 #include <hu/varadiistvan/xplcommon/Util.h>
 
@@ -43 +45 @@
 using hu::varadiistvan::scpl::io::LocalServerSocket;
 using hu::varadiistvan::scpl::io::LocalAcceptor;
+using hu::varadiistvan::scpl::io::TCPServerSocket;
+using hu::varadiistvan::scpl::io::TCPAcceptor;
 using hu::varadiistvan::xplcommon::Util;
 
@@ -51 +55 @@
     Util::debug("xplra::ListenThread::run: started\n");
 
-    LocalServerSocket socket("xplra", &waiter);
-    LocalAcceptor& acceptor = socket.getAcceptor();
-    while(!quitEvent.check() && !quitEvent.failed() && !acceptor.failed()) {
-        while (acceptor.accept()) {
+    LocalServerSocket localSocket("xplra", &waiter);
+    LocalAcceptor& localAcceptor = localSocket.getAcceptor();
+
+    TCPServerSocket tcpSocket(defaultTCPPort, &waiter);
+    TCPAcceptor& tcpAcceptor = tcpSocket.getAcceptor();
+
+    while(!quitEvent.check() && !quitEvent.failed() &&
+          !localAcceptor.failed() && !tcpAcceptor.failed()) {
+        while (localAcceptor.accept()) {
             ServerThread* serverThread = new ServerThread(*this,
                                                           requestQueue,
-                                                          acceptor);
+                                                          localAcceptor);
+            serverThread->start();
+        }
+        while (tcpAcceptor.accept()) {
+            ServerThread* serverThread = new ServerThread(*this,
+                                                          requestQueue,
+                                                          tcpAcceptor);
             serverThread->start();
         }

src/plugin/src/xplra/ListenThread.h

@@ -56 +56 @@
 class ListenThread : public hu::varadiistvan::scpl::Thread
 {
+public:
+    /**
+     * The default TCP port number ("XR")
+     */
+    static const unsigned short defaultTCPPort = 0x5852;
+
 private:
     /**

src/plugin/src/xplra/Makefile.am

@@ -72 +72 @@
 win_xpl_SOURCES=$(SRCS)
 
-win_xpl_LDADD=$(LIBXPLCOMMON_LIBS) $(VSCPL_LIBS)
+win_xpl_LDADD=$(LIBXPLCOMMON_LIBS) $(VSCPL_LIBS) -lws2_32
 win_xpl_LDADD+=@XPSDK_LDFLAGS@
 if TARGET_API_WIN64

src/plugin/src/xplra/ServerThread.cc

@@ -54 +54 @@
 using xplra::ServerThread;
 
-using hu::varadiistvan::scpl::io::LocalAcceptor;
+using hu::varadiistvan::scpl::io::BufferedStreamAcceptor;
 using hu::varadiistvan::scpl::Mutex;
 using hu::varadiistvan::xplcommon::Util;
@@ -97 +97 @@
 
 ServerThread::ServerThread(ListenThread& listenThread,
-                           RequestQueue& requestQueue, LocalAcceptor& acceptor) :
+                           RequestQueue& requestQueue,
+                           BufferedStreamAcceptor& acceptor) :
     listenThread(listenThread),
     requestQueue(requestQueue),
-    bufferedStream(acceptor.getSocket(&waiter)),
+    bufferedStream(acceptor.getAcceptedBufferedStream(&waiter)),
     stream(*bufferedStream),
     nextGetMultiRequestID(1),

src/plugin/src/xplra/ServerThread.h

@@ -38 +38 @@
 #include <hu/varadiistvan/scpl/io/BufferedStream.h>
 #include <hu/varadiistvan/scpl/io/DataStream.h>
-#include <hu/varadiistvan/scpl/io/LocalAcceptor.h>
+#include <hu/varadiistvan/scpl/io/BufferedStreamAcceptor.h>
 
 #include <hu/varadiistvan/scpl/Mutex.h>
@@ -154 +154 @@
      */
     ServerThread(ListenThread& listenThread, RequestQueue& requestQueue,
-                 hu::varadiistvan::scpl::io::LocalAcceptor& acceptor);
+                 hu::varadiistvan::scpl::io::BufferedStreamAcceptor& acceptor);
 
     /**