Added SCPITransport::IsConnected() for error checking

ngscopeclient · May 25, 2020 · e04e0a0 · e04e0a0
1 parent bb56e70
commit e04e0a0
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 0 deletions.
diff --git a/scopehal/SCPILxiTransport.cpp b/scopehal/SCPILxiTransport.cpp
@@ -90,6 +90,11 @@ SCPILxiTransport::~SCPILxiTransport()
 	delete[] m_staging_buf;
 }
 
+bool SCPILxiTransport::IsConnected()
+{
+	return (m_device != LXI_ERROR);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Actual transport code
 

diff --git a/scopehal/SCPILxiTransport.h b/scopehal/SCPILxiTransport.h
@@ -54,6 +54,7 @@ class SCPILxiTransport : public SCPITransport
 	virtual void SendRawData(size_t len, const unsigned char* buf);
 
 	virtual bool IsCommandBatchingSupported();
+	virtual bool IsConnected();
 
 	TRANSPORT_INITPROC(SCPILxiTransport)
 

diff --git a/scopehal/SCPISocketTransport.cpp b/scopehal/SCPISocketTransport.cpp
@@ -61,11 +61,13 @@ SCPISocketTransport::SCPISocketTransport(string args)
 
 	if(!m_socket.Connect(m_hostname, m_port))
 	{
+		m_socket.Close();
 		LogError("Couldn't connect to socket\n");
 		return;
 	}
 	if(!m_socket.DisableNagle())
 	{
+		m_socket.Close();
 		LogError("Couldn't disable Nagle\n");
 		return;
 	}
@@ -75,6 +77,11 @@ SCPISocketTransport::~SCPISocketTransport()
 {
 }
 
+bool SCPISocketTransport::IsConnected()
+{
+	return m_socket.IsValid();
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Actual transport code
 

diff --git a/scopehal/SCPISocketTransport.h b/scopehal/SCPISocketTransport.h
@@ -56,6 +56,7 @@ class SCPISocketTransport : public SCPITransport
 	virtual void SendRawData(size_t len, const unsigned char* buf);
 
 	virtual bool IsCommandBatchingSupported();
+	virtual bool IsConnected();
 
 	TRANSPORT_INITPROC(SCPISocketTransport)
 

diff --git a/scopehal/SCPITransport.h b/scopehal/SCPITransport.h
@@ -54,6 +54,7 @@ class SCPITransport
 	virtual void SendRawData(size_t len, const unsigned char* buf) =0;
 
 	virtual bool IsCommandBatchingSupported() =0;
+	virtual bool IsConnected() =0;
 
 public:
 	typedef SCPITransport* (*CreateProcType)(std::string args);

diff --git a/scopehal/VICPSocketTransport.cpp b/scopehal/VICPSocketTransport.cpp
@@ -61,11 +61,13 @@ VICPSocketTransport::VICPSocketTransport(string args)
 
 	if(!m_socket.Connect(m_hostname, m_port))
 	{
+		m_socket.Close();
 		LogError("Couldn't connect to socket\n");
 		return;
 	}
 	if(!m_socket.DisableNagle())
 	{
+		m_socket.Close();
 		LogError("Couldn't disable Nagle\n");
 		return;
 	}
@@ -75,6 +77,11 @@ VICPSocketTransport::~VICPSocketTransport()
 {
 }
 
+bool VICPSocketTransport::IsConnected()
+{
+	return m_socket.IsValid();
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Actual transport code
 

diff --git a/scopehal/VICPSocketTransport.h b/scopehal/VICPSocketTransport.h
@@ -56,6 +56,7 @@ class VICPSocketTransport : public SCPITransport
 	virtual void SendRawData(size_t len, const unsigned char* buf);
 
 	virtual bool IsCommandBatchingSupported();
+	virtual bool IsConnected();
 
 	//VICP constant helpers
 	enum HEADER_OPS