Merge pull request #87 from nasa/86-client-connection-retry

Client.hh: Added a loop around initial client connection to allow the… closes #86

Author: prkunz

include/idf/Client.hh

@@ -66,23 +66,36 @@ class Client : public Manageable {
 
         // Establish first available connection.
         struct addrinfo *currentHost;
-        for (currentHost = results; currentHost != NULL; currentHost = currentHost->ai_next) {
-            if ((socketHandle = socket(currentHost->ai_family,
-              currentHost->ai_socktype, currentHost->ai_protocol)) == -1) {
-                continue;
-            }
-
-            if (connect(socketHandle, currentHost->ai_addr, currentHost->ai_addrlen) == 0) {
-                std::cout << "[Client] Connected  to " << serverName << ":" << serverPort << std::endl;
-                break;
-            }
-
-            ::close(socketHandle);
+        bool connected = false;
+
+        for (int ii=0; ii<retryLimit; ++ii) {
+           for (currentHost = results; currentHost != NULL; currentHost = currentHost->ai_next) {
+               if ((socketHandle = socket(currentHost->ai_family,
+                 currentHost->ai_socktype, currentHost->ai_protocol)) == -1) {
+                   continue;
+               }
+
+                  if (connect(socketHandle, currentHost->ai_addr, currentHost->ai_addrlen) == 0) {
+                      std::cout << "[Client] Connected  to " << serverName << ":" << serverPort << std::endl;
+                      connected = true;
+                      break;
+                  }
+
+               ::close(socketHandle);
+
+           }
+
+           if (connected) {
+              break;
+           } else {
+               std::cout << "[Client] Connection failed - attempting reconnect to " << serverName << ":" << serverPort << std::endl;
+               sleep(1);
+           }
         }
 
         freeaddrinfo(results);
 
-        if (currentHost == NULL) {
+        if (not connected) {
             stream.str("");
             stream << "Failed to connect to " << serverName << ":" << serverPort;
             throw IOException(stream.str());
@@ -114,6 +127,15 @@ class Client : public Manageable {
         Manageable::close();
     }
 
+    /**
+     * sets the retry limit for initial connection
+     *
+     * @param limit @copydoc retryLimit
+     */
+    void setRetryLimit(const int limit) {
+        retryLimit = limit;
+    }
+
     /**
      * sets the host to which this instance will attempt to connect the next
      * time open() is called
@@ -150,7 +172,8 @@ class Client : public Manageable {
     Client(const T& commandSource, const std::string& host, unsigned short port) :
         source(commandSource),
         serverName(host),
-        serverPort(port) {}
+        serverPort(port),
+        retryLimit(5) {}
 
     /**
      * packs commands from @a source into @a commands
@@ -178,6 +201,9 @@ class Client : public Manageable {
     /** the port on which the server is listening */
     unsigned short serverPort;
 
+    /** Number of times to retry establishing the initial connection */
+    int retryLimit;
+
     /** the socket */
     int socketHandle;
 

include/idf/Keyboard.hh

@@ -209,7 +209,7 @@ class Keyboard : public virtual InputLayout {
     /** , and < */
     SingleInput comma;
 
-    /** . and > */
+    /** \. and > */
     SingleInput period;
 
     /** / and ? */

include/idf/SerialEr7Orion.hh

@@ -27,6 +27,7 @@ class SerialEr7Orion : public SerialThrustMasterBase, public Er7Orion {
      * constructs a new instance whose open() will open the serial port at @a path
      *
      * @param path @copydoc path
+     * @param isMale @copydoc male
      */
     SerialEr7Orion(const char *path = "/dev/ttyACM0", bool isMale = true);
 

include/idf/SingleCameraController.hh

@@ -242,7 +242,7 @@ class SingleCameraController : public CameraController {
     /**
      * creates a new SingleCameraController mapped to @a XBoxOne using appropriate defaults
      *
-     * @param XBoxOne the inputs to use in the default mapping
+     * @param xBoxOne the inputs to use in the default mapping
      *
      * @return a new XBoxOne-based camera controller
      */

include/idf/SingleFlightController.hh

@@ -255,7 +255,7 @@ class SingleFlightController : public FlightController {
     /**
      * creates a new SingleFlightController mapped to @a XBoxOne using appropriate defaults
      *
-     * @param saitekX56Stick the inputs to use in the default mapping
+     * @param xBoxOne the inputs to use in the default mapping
      *
      * @return a new XboxOne-based flight controller
      */

include/idf/UsbKeyboard.hh

@@ -28,6 +28,7 @@ class UsbKeyboard : public UsbDevice, public Keyboard {
      *
      * @param vendor vendor ID
      * @param product product ID
+     * @param interface interface
      */
     UsbKeyboard(int vendor, int product, int interface = 0);