merge conflict from 3.0.1 to restream stop from recieveR

slsReceiverSoftware/include/DataStreamer.h

@@ -117,6 +117,12 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	 */
 	void CloseZmqSocket();
 
+	/**
+	 * Restream stop dummy packet
+	 * @return OK or FAIL
+	 */
+	int restreamStop();
+
  private:
 
 	/**

slsReceiverSoftware/include/UDPBaseImplementation.h

@@ -555,6 +555,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	void setStreamingSourceIP(const char* c);
 
+	/*
+	 * Restream stop dummy packet from receiver
+	 * @return OK or FAIL
+	 */
+	int restreamStop();
+
 	//***callback functions***
 	/**
 	 * Call back for start acquisition

slsReceiverSoftware/include/UDPInterface.h

@@ -643,6 +643,12 @@ class UDPInterface {
 	 */
 	virtual void setStreamingSourceIP(const char* c) = 0;
 
+	/*
+	 * Restream stop dummy packet from receiver
+	 * @return OK or FAIL
+	 */
+	virtual int restreamStop() = 0;
+
 
 	//***callback functions***
 	/**

slsReceiverSoftware/include/UDPStandardImplementation.h

@@ -184,6 +184,13 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
 	 */
 	void closeFiles();
 
+	/**
+	 * Restream stop dummy packet from receiver
+	 * @return OK or FAIL
+	 */
+	int restreamStop();
+
+
 private:
 
     /**

slsReceiverSoftware/include/slsReceiverTCPIPInterface.h

@@ -267,6 +267,9 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
 	/** enable gap pixels */
 	int enable_gap_pixels();
 
+	/** restream stop packet */
+	int restream_stop();
+
 
 
 	/** detector type */

slsReceiverSoftware/include/sls_receiver_funcs.h

@@ -62,6 +62,8 @@ enum recFuncs{
 	F_RECEIVER_STREAMING_SRC_IP,	/** < sets the receiver streaming source IP */
 	F_SET_RECEIVER_SILENT_MODE,		/** < sets the receiver silent mode */
 	F_ENABLE_GAPPIXELS_IN_RECEIVER,	/** < sets gap pixels in the receiver */
+	F_RESTREAM_STOP_FROM_RECEIVER,	/** < restream stop from receiver */
+
 	/* Always append functions hereafter!!! */