Changeset 108:7b985f3a0ee1 in xplra for src

Timestamp:

12/15/22 19:27:40 (2 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The Python client can connect to X-Plane over TCP

File:

• src/client/python/xplra.py (modified) (2 diffs)

src/client/python/xplra.py

@@ -121 +121 @@
 ## Hotkey modifier: Control
 HOTKEY_MODIFIER_CONTROL = 0x0200
+
+#-------------------------------------------------------------------------------
+
+## The default TCP port ("XR")
+DEFAULT_TCP_PORT = 0x5852;
 
 #-------------------------------------------------------------------------------
@@ -296 +301 @@
         self._multiBuffers = []
 
-    def connect(self):
+    def connect(self, address = None):
         """Try to connect to X-Plane."""
         if self._stream is not None:
             return
 
-        if os.name=="nt":
-            pipe = Win32NamedPipe(r'\\.\pipe\\xplra')
-            self._stream = io.BufferedRWPair(pipe, pipe)
-        else:
-            import socket
-            s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            s.connect("/tmp/xplra-" + os.environ["LOGNAME"])
-            self._stream = s.makefile("rwb")
+        if address:
+            if address.startswith("tcp:"):
+                address = address[4:]
+                colonIndex = address.find(":")
+                if (colonIndex<=0):
+                    port = DEFAULT_TCP_PORT
+                else:
+                    port = int(address[colonIndex+1:])
+                    address = address[:colonIndex]
+
+                import socket
+                s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                print("Connecting to TCP address '%s':%d" %
+                      (address, port))
+                s.connect((address, port))
+                self._stream = s.makefile("rwb")
+            elif address!="local":
+                raise ValueError("Invalid address: " + address)
+
+        if self._stream is None:
+            if os.name=="nt":
+                pipe = Win32NamedPipe(r'\\.\pipe\\xplra')
+                self._stream = io.BufferedRWPair(pipe, pipe)
+            else:
+                import socket
+                s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+                s.connect("/tmp/xplra-" + os.environ["LOGNAME"])
+                self._stream = s.makefile("rwb")
 
         for multiBuffer in self._multiBuffers: