From ad64df01c7570f1f945cac9a1273deeadb4bd5b2 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Thu, 23 Nov 2017 14:53:40 +0100
Subject: [PATCH] somewhere

---
 .../include/UDPStandardImplementation.h            |  6 ------
 slsReceiverSoftware/include/ZmqSocket.h            | 14 ++++++++++++++
 .../src/UDPStandardImplementation.cpp              | 11 -----------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/slsReceiverSoftware/include/UDPStandardImplementation.h b/slsReceiverSoftware/include/UDPStandardImplementation.h
index 791e6ce47..43b4ff5e6 100644
--- a/slsReceiverSoftware/include/UDPStandardImplementation.h
+++ b/slsReceiverSoftware/include/UDPStandardImplementation.h
@@ -170,12 +170,6 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
 	 */
 	void closeFiles();
 
-	/**
-	 * Set streaming port and restart sockets if streaming was enabled
-	 * @param i streaming port
-	 */
-	void setStreamingPort(const uint32_t i);
-
 
 private:
 
diff --git a/slsReceiverSoftware/include/ZmqSocket.h b/slsReceiverSoftware/include/ZmqSocket.h
index 35164471b..4bc3e3548 100644
--- a/slsReceiverSoftware/include/ZmqSocket.h
+++ b/slsReceiverSoftware/include/ZmqSocket.h
@@ -160,6 +160,20 @@ public:
 
 	void* GetsocketDescriptor () { return socketDescriptor; };
 
+	/**
+	 * Connect client socket to server socket
+	 * @returns 1 for fail, 0 for success
+	 */
+	int Connect() {
+		if (zmq_connect(socketDescriptor, serverAddress) < 0) {
+			PrintError ();
+			Close ();
+			return 1;
+		}
+		return 0;
+	}
+
+
 	/**
 	 * Unbinds the Socket
 	 */
diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index b8599b645..e5d434099 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -571,17 +571,6 @@ void UDPStandardImplementation::closeFiles() {
 }
 
 
-void UDPStandardImplementation::setStreamingPort(const uint32_t i) {
-	streamingPort = i;
-
-	FILE_LOG(logINFO) << "Streaming Port: " << streamingPort;
-	if (dataStreamEnable) {
-		setDataStreamEnable(false);
-		setDataStreamEnable(true);
-	}
-}
-
-
 
 void UDPStandardImplementation::SetLocalNetworkParameters() {
 	//to increase socket receiver buffer size and max length of input queue by changing kernel settings