Changeset 14:bb6484eceb1e in xplra for src

Timestamp:

01/27/13 13:26:56 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Very basic client code works

Location:

src/client/c/hu/varadiistvan/xplra

Files:

• Exception.cc (added)
• Exception.h (added)
• Makefile.am (modified) (2 diffs)
• XPlane.cc (modified) (1 diff)
• XPlane.h (modified) (2 diffs)
• xplra.cc (added)
• xplra.h (added)

src/client/c/hu/varadiistvan/xplra/Makefile.am

@@ +1 @@
+AM_CXXFLAGS=$(VSCPL_CFLAGS) -I$(top_srcdir)/src/plugin/src
 
 lib_LTLIBRARIES=libxplra.la
 
 libxplra_la_SOURCES=\
-        XPlane.cc
+        XPlane.cc       \
+        Exception.cc    \
+        xplra.cc
+
+libxplra_la_LIBADD=$(VSCPL_LIBS)
 
 if TARGET_API_WIN32
@@ -11 +16 @@
 include_xplradir=$(includedir)/hu/varadiistvan/xplra
 include_xplra_HEADERS=\
-        XPlane.h
+        XPlane.h        \
+        Exception.h     \
+        xplra.h

src/client/c/hu/varadiistvan/xplra/XPlane.cc

@@ -31 +31 @@
 #include "XPlane.h"
 
+#include <hu/varadiistvan/scpl/io/LocalClientSocket.h>
+#include <hu/varadiistvan/scpl/io/DataStream.h>
+
+#include <xplra/Protocol.h>
+
+#include <memory>
+
 //------------------------------------------------------------------------------
 
 using hu::varadiistvan::xplra::XPlane;
 
+using hu::varadiistvan::scpl::io::LocalClientSocket;
+using hu::varadiistvan::scpl::io::LocalConnector;
+using hu::varadiistvan::scpl::io::DataStream;
+
+using xplra::Protocol;
+
+using std::auto_ptr;
+
 //------------------------------------------------------------------------------
+
+inline void XPlane::checkStream() throw(NotConnectedException, IOException)
+{
+    if (stream==0) {
+        throw NotConnectedException();
+    } else if (stream->failed()) {
+        throw IOException(stream->getErrorCode());
+    }
+}
+
+//------------------------------------------------------------------------------
+
+void XPlane::checkResult(uint8_t result) throw(ProtocolException)
+{
+    switch(result) {
+      case Protocol::RESULT_OK:
+        return;
+      case Protocol::RESULT_INVALID_COMMAND:
+        throw ProtocolException(ProtocolException::INVALID_COMMAND);
+      case Protocol::RESULT_UNKNOWN_DATAREF:
+        throw ProtocolException(ProtocolException::UNKNOWN_DATAREF);
+      case Protocol::RESULT_INVALID_TYPE:
+        throw ProtocolException(ProtocolException::INVALID_TYPE);
+      case Protocol::RESULT_INVALID_LENGTH:
+        throw ProtocolException(ProtocolException::INVALID_LENGTH);
+      case Protocol::RESULT_INVALID_OFFSET:
+        throw ProtocolException(ProtocolException::INVALID_OFFSET);
+      case Protocol::RESULT_INVALID_COUNT:
+        throw ProtocolException(ProtocolException::INVALID_COUNT);
+      case Protocol::RESULT_INVALID_ID:
+        throw ProtocolException(ProtocolException::INVALID_ID);
+      case Protocol::RESULT_OTHER_ERROR:
+      default:
+        throw ProtocolException(ProtocolException::OTHER);
+    }
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+XPlane::~XPlane() throw()
+{
+    disconnect();
+}
+
+//------------------------------------------------------------------------------
+
+void XPlane::connect() throw(IOException)
+{
+    if (socket!=0) return;
+
+    auto_ptr<LocalClientSocket> clientSocket(new LocalClientSocket("xplra",
+                                                                   &waiter));
+    LocalConnector& connector = clientSocket->getConnector();
+
+    while (!connector.connect()) {
+        if (connector.failed()) {
+            throw IOException(connector.getErrorCode());
+        }
+        waiter.wait();
+        if (waiter.failed()) {
+            throw IOException(waiter.getErrorCode());
+        }
+    }
+
+    socket = clientSocket.release();
+    stream = new DataStream(*socket);
+}
+
+//------------------------------------------------------------------------------
+
+void XPlane::disconnect() throw()
+{
+    if (socket==0) return;
+
+    delete stream; stream = 0;
+    delete socket; socket = 0;
+}
+
+//------------------------------------------------------------------------------
+
+int XPlane::getInt(const char* name) throw(Exception)
+{
+    checkStream();
+
+    stream->writeU8(Protocol::COMMAND_GET_SINGLE);
+    stream->writeString(name, strlen(name));
+    stream->writeU8(Protocol::TYPE_INT);
+    if (!stream->flush()) checkStream();
+
+    uint8_t result = stream->readU8();
+    checkStream();
+    checkResult(result);
+
+    int value = stream->readS32();
+    checkStream();
+    return value;
+}
+
 //------------------------------------------------------------------------------
 

src/client/c/hu/varadiistvan/xplra/XPlane.h

@@ -29 +29 @@
 #ifndef HU_VARADIISTVAN_XPLRA_XPLANE_H
 #define HU_VARADIISTVAN_XPLRA_XPLANE_H
+//-----------------------------------------------------------------------------
+
+#include "Exception.h"
+
+#include <hu/varadiistvan/scpl/io/Waiter.h>
+
+#include <inttypes.h>
+
+//-----------------------------------------------------------------------------
+
+namespace hu { namespace varadiistvan { namespace scpl { namespace io {
+
+class LocalClientSocket;
+class DataStream;
+
+} /* namespace hu::varadiistvan::scpl::io */ } /* namespace hu::varadiistvan::scpl */ } /* namespace hu::varadiistvan */ } /* namespace hu */
+
 //------------------------------------------------------------------------------
 
@@ -35 +52 @@
 //------------------------------------------------------------------------------
 
+/**
+ * The main class to access X-Plane.
+ *
+ * The calls are synchronous and not thread-safe.
+ */
 class XPlane
 {
+private:
+    /**
+     * The waiter to use.
+     */
+    scpl::io::Waiter waiter;
+
+    /**
+     * The local client socket over which we are communicating with X-Plane.
+     */
+    scpl::io::LocalClientSocket* socket;
+
+    /**
+     * The data stream to handle the data conversions.
+     */
+    scpl::io::DataStream* stream;
+
+public:
+    /**
+     * Construct the object. It will not be connected to the simulator
+     * yet.
+     */
+    XPlane() throw();
+
+    /**
+     * Destroy the object. If connected, the connection will be
+     * closed.
+     */
+    ~XPlane() throw();
+
+    /**
+     * Connect to the simulator.
+     */
+    void connect() throw(IOException);
+
+    /**
+     * Check if we are connected to the simulator.
+     */
+    bool isConnected() const throw();
+
+    /**
+     * Disconnect from the simulator.
+     */
+    void disconnect() throw();
+
+    /**
+     * Get the integer value of the dataref with the given name.
+     */
+    int getInt(const char* name) throw(Exception);
+
+private:
+    /**
+     * Check if we have a stream and if it has not failed.
+     */
+    void checkStream() throw(NotConnectedException, IOException);
+
+    /**
+     * Check the given protocol result. If it signifies an error,
+     * throw a ProtocolException with the correct error code.
+     */
+    void checkResult(uint8_t result) throw(ProtocolException);
 };
+
+//------------------------------------------------------------------------------
+// Inline definitions
+//------------------------------------------------------------------------------
+
+inline XPlane::XPlane() throw() :
+    socket(0),
+    stream(0)
+{
+}
+
+//------------------------------------------------------------------------------
+
+inline bool XPlane::isConnected() const throw()
+{
+    return socket!=0;
+}
 
 //------------------------------------------------------------------------------