Close socket after usage.

Jürgen Knödlseder
1 parent f0d40796
Showing 3 changed files with 19 additions and 9 deletions
include/GVOClient.hpp
src/vo/GVOClient.cpp
test/test_GVO.cpp
@@ -41,13 +41,16 @@
  *
  * This class implements a client for the Virtual Observatory. Upon
  * construction of an instance of the class, the client will search for a
- * SAMP Hub. If no such Hub exists, a GammaLib owned Hub will be started
- * using the GVOHub class. Once a Hub is running, the client will retrieve
- * its information and store it.
+ * VO Hub. The has_hub() method signals whether VO Hub information was
+ * found.
  *
- * The connect() and disconnect() methods exist to connect or disconnect
- * from the Hub. Connecting means opening a socket to the Hub and registering
- * the client to the Hub.
+ * The connect() method will connect the client to the VO Hub. If no VO
+ * Hub has been found or if the VO Hub that was found is not alive the
+ * client will start an own VO Hub using the GVOHub class. The
+ * is_connected() method signals whether the client is connected to a
+ * Hub.
+ * 
+ * The disconnect() method disconnects a client from the VO Hub.
  ***************************************************************************/
 class GVOClient : public GBase {
  
@@ -319,6 +319,12 @@ GXml GVOClient::execute(const std::string&amp; request) const
             xml = GXml(response.substr(start, std::string::npos));
         }
  
+        // Close socket
+        if (m_socket != -1) {
+            close(m_socket);
+            m_socket = -1;
+        }
+
     } // endif: connection has been established
  
     // Return response
@@ -363,11 +369,10 @@ std::string GVOClient::print(const GChatter&amp; chatter) const
                 if (!m_client_key.empty()) {
                     result.append("registered as \""+m_client_id);
                     result.append("\" on Hub \""+m_hub_id);
-                    result.append("\" via socket "+gammalib::str(m_socket));
+                    result.append("\".");
                 }
                 else {
-                    result.append("established on socket ");
-                    result.append(gammalib::str(m_socket));
+                    result.append("established.");
                 }
             }
         }
@@ -148,6 +148,7 @@ void TestGVO::test_GVOClient(void)
  
     // Connect client
     client.connect();
+    test_assert(client.is_connected(), "Check for connection.");
     //std::cout << client << std::endl;
  
     // Test ping
@@ -155,6 +156,7 @@ void TestGVO::test_GVOClient(void)
  
     // Disconnect client
     client.disconnect();
+    test_assert(!client.is_connected(), "Check for disconnection.");
     //std::cout << client << std::endl;
  
     // Test ping