From b27f691d036a7171db732ff1c4e16a15f92164fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Br=C3=BCckner?= <martin.brueckner@psi.ch>
Date: Thu, 11 Jun 2015 11:30:40 +0200
Subject: [PATCH] Revert "Solved merge conflicts"

This reverts commit c222221d18bd5db7d9a8c86071fe2fbdc0ce25ac.
---
 slsReceiverSoftware/include/genericSocket.h | 33 +++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h
index e113f24b8..0ccc80adf 100644
--- a/slsReceiverSoftware/include/genericSocket.h
+++ b/slsReceiverSoftware/include/genericSocket.h
@@ -99,6 +99,13 @@ typedef struct
 	unsigned char  header_after[24];
 } eiger_image_header;
 
+typedef struct
+{
+	unsigned char header_before[19];
+	unsigned char  fnum[4];
+	unsigned char  header_after[25];
+} eiger_image_header32;
+
  genericSocket(const char* const host_ip_or_name, unsigned short int const port_number, communicationProtocol p, int ps = DEFAULT_PACKET_SIZE) :
    //   portno(port_number), 
 	 protocol(p),
@@ -585,16 +592,38 @@ typedef struct
 
 	 //if length given, listens to length, else listens for packetsize till length is reached
 	 if(length){
-
+/*int k = 0;*/
 
 		 while(length>0){
 			 nsending = (length>packet_size) ? packet_size:length;
 
+			 /*
 
+			 //created for debugging on 11.05.2015
+			 nsending=5000;
+			 nsent = recvfrom(socketDescriptor,(char*)buf,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
+			 if(nsent <1000){
+				 if(nsent < 48){
+					 cout << " "<<dec<<nsent<<" ";
+				 }else{
+					 cout << "nsent: " << dec<<nsent << "\tfnum:" <<
+						 htonl(*(unsigned int*)((eiger_image_header32 *)((char*)(buf)))->fnum)<< "\t";
+				 	 cout << k <<" packets" << endl;
+				 	 k = 0;
+				 }
+			 }
+			 else
+				 k++;
+	 */
+
+			 
 
 			 nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
 			 if(!nsent) break;
-			if (nsent == 16) continue;
+			 if(nsent == 16) {
+				 //cout << ".";
+				 continue;
+			 }
 			 length-=nsent;
 			 total_sent+=nsent;
 		 }