ngscopeclient · Mar 11, 2020
diff --git a/scopehal/AntikernelLogicAnalyzer.cpp b/scopehal/AntikernelLogicAnalyzer.cpp
@@ -93,6 +93,11 @@ AntikernelLogicAnalyzer::~AntikernelLogicAnalyzer()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Information queries
 
+string AntikernelLogicAnalyzer::GetTransportName()
+{
+	return m_transport->GetName();
+}
+
 string AntikernelLogicAnalyzer::GetTransportConnectionString()
 {
 	return m_transport->GetConnectionString();

diff --git a/scopehal/AntikernelLogicAnalyzer.h b/scopehal/AntikernelLogicAnalyzer.h
@@ -45,6 +45,7 @@ class AntikernelLogicAnalyzer
 	virtual ~AntikernelLogicAnalyzer();
 
 	virtual std::string GetTransportConnectionString();
+	virtual std::string GetTransportName();
 	virtual std::string GetDriverName();
 
 	virtual std::string GetName();

diff --git a/scopehal/Oscilloscope.cpp b/scopehal/Oscilloscope.cpp
@@ -172,7 +172,9 @@ string Oscilloscope::SerializeConfiguration(map<void*, int>& idmap, int& nextID)
 	config += tmp;
 	snprintf(tmp, sizeof(tmp), "        serial:         \"%s\"\n", GetSerial().c_str());
 	config += tmp;
-	snprintf(tmp, sizeof(tmp), "        transport:      \"%s\"\n", GetTransportConnectionString().c_str());
+	snprintf(tmp, sizeof(tmp), "        transport:      \"%s\"\n", GetTransportName().c_str());
+	config += tmp;
+	snprintf(tmp, sizeof(tmp), "        args:           \"%s\"\n", GetTransportConnectionString().c_str());
 	config += tmp;
 	snprintf(tmp, sizeof(tmp), "        driver:         \"%s\"\n", GetDriverName().c_str());
 	config += tmp;

diff --git a/scopehal/Oscilloscope.h b/scopehal/Oscilloscope.h
@@ -352,6 +352,11 @@ class Oscilloscope : public virtual Instrument
 	 */
 	virtual std::string GetTransportConnectionString() =0;
 
+	/**
+		@brief Gets the name of our transport
+	 */
+	virtual std::string GetTransportName() =0;
+
 	/**
 		@brief Gets the registered name of this driver
 	 */

diff --git a/scopehal/SCPIOscilloscope.cpp b/scopehal/SCPIOscilloscope.cpp
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ANTIKERNEL v0.1                                                                                                      *
 *                                                                                                                      *
-* Copyright (c) 2012-2019 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2020 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -48,6 +48,11 @@ SCPIOscilloscope::~SCPIOscilloscope()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Accessors
 
+string SCPIOscilloscope::GetTransportName()
+{
+	return m_transport->GetName();
+}
+
 string SCPIOscilloscope::GetTransportConnectionString()
 {
 	return m_transport->GetConnectionString();

diff --git a/scopehal/SCPIOscilloscope.h b/scopehal/SCPIOscilloscope.h
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ANTIKERNEL v0.1                                                                                                      *
 *                                                                                                                      *
-* Copyright (c) 2012-2019 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2020 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -41,6 +41,7 @@ class SCPIOscilloscope 	: public Oscilloscope
 	virtual ~SCPIOscilloscope();
 
 	virtual std::string GetTransportConnectionString();
+	virtual std::string GetTransportName();
 
 	virtual std::string GetName();
 	virtual std::string GetVendor();

diff --git a/scopehal/SCPISocketTransport.cpp b/scopehal/SCPISocketTransport.cpp
@@ -86,7 +86,7 @@ string SCPISocketTransport::GetTransportName()
 string SCPISocketTransport::GetConnectionString()
 {
 	char tmp[256];
-	snprintf(tmp, sizeof(tmp), "lan:%s:%u", m_hostname.c_str(), m_port);
+	snprintf(tmp, sizeof(tmp), "%s:%u", m_hostname.c_str(), m_port);
 	return string(tmp);
 }
 

diff --git a/scopehal/SCPITransport.h b/scopehal/SCPITransport.h
@@ -46,6 +46,7 @@ class SCPITransport
 	virtual ~SCPITransport();
 
 	virtual std::string GetConnectionString() =0;
+	virtual std::string GetName() =0;
 
 	virtual bool SendCommand(std::string cmd) =0;
 	virtual std::string ReadReply() =0;
@@ -69,7 +70,9 @@ class SCPITransport
 	static SCPITransport* CreateInstance(std::string args) \
 	{ \
 		return new T(args); \
-	}
+	} \
+	virtual std::string GetName() \
+	{ return GetTransportName(); }
 
 #define AddTransportClass(T) SCPITransport::DoAddTransportClass(T::GetTransportName(), T::CreateInstance)
 

diff --git a/scopehal/VICPSocketTransport.cpp b/scopehal/VICPSocketTransport.cpp
@@ -86,7 +86,7 @@ string VICPSocketTransport::GetTransportName()
 string VICPSocketTransport::GetConnectionString()
 {
 	char tmp[256];
-	snprintf(tmp, sizeof(tmp), "vicp:%s:%u", m_hostname.c_str(), m_port);
+	snprintf(tmp, sizeof(tmp), "%s:%u", m_hostname.c_str(), m_port);
 	return string(tmp);
 }