Changeset 30:d92d686b4d70 in xplra

Timestamp:

02/09/13 08:59:10 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Fixed problems with detecting a broken connection

Files:

• src/client/c/hu/varadiistvan/xplra/XPlane.cc (modified) (3 diffs)
• src/client/c/hu/varadiistvan/xplra/XPlane.h (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/multigetctest.c (modified) (3 diffs)
• test/multisetctest.c (added)

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

@@ -40 +40 @@
 
 #include <memory>
+
+#ifndef _WIN32
+#include <signal.h>
+#endif
 
 //------------------------------------------------------------------------------
@@ -96 +100 @@
 //------------------------------------------------------------------------------
 
-void XPlane::checkResult() throw(ProtocolException)
+void XPlane::checkResult() throw(ProtocolException, IOException)
 {
     uint8_t result = stream->readU8();
@@ -137 +141 @@
         }
     }
+
+#ifndef _WIN32
+    signal(SIGPIPE, SIG_IGN);
+#endif
 
     socket = clientSocket.release();

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

@@ -280 +280 @@
     /**
      * Read and check the result.  If it signifies an error,
-     * throw a ProtocolException with the correct error code.
-     */
-    void checkResult() throw(ProtocolException);
+     * throw a ProtocolException with the correct error code. If there
+     * is some problem with the stream, an IOException is thrown.
+     */
+    void checkResult() throw(ProtocolException, IOException);
 
     /**

test/Makefile.am

@@ -6 +6 @@
 endif
 
-noinst_PROGRAMS=ctest basictest basicctest multigettest multigetctest multisettest
+noinst_PROGRAMS=ctest basictest basicctest multigettest multigetctest multisettest multisetctest
 
 ctest_SOURCES=ctest.c
@@ -28 +28 @@
 
 multisettest_SOURCES=multisettest.cc
+
+multisetctest_SOURCES=multisetctest.c
+if TARGET_API_WIN32
+multisetctest_LDFLAGS=-lstdc++
+endif

test/multigetctest.c

@@ -35 +35 @@
 #include <string.h>
 
-#ifdef __windows__
+#ifdef _WIN32
 #include <windows.h>
 #else
@@ -240 +240 @@
 
     while(1) {
-        if (xplra_multi_execute(getterID)<0) return -1;
+        if (xplra_multi_execute(getterID)<0) goto error;
         printf("tail number: '%s', days: %d, zuluSec: %f\n",
                tailnum, *days, *zuluSec);
@@ -265 +265 @@
                busVolts[0], busVolts[1], busVolts[2], busVolts[3]);
         printf("\n");
-#ifdef __windows__
+#ifdef _WIN32
         Sleep(1000);
 #else