From e030a79aba17bebd197415d3a109b944b57eced7 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 31 Oct 2016 14:36:13 +0100 Subject: [PATCH] trying --- slsReceiverSoftware/include/genericSocket.h | 10 ++-------- slsReceiverSoftware/src/UDPStandardImplementation.cpp | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h index ba4f559d6..c8bfdaa2b 100644 --- a/slsReceiverSoftware/include/genericSocket.h +++ b/slsReceiverSoftware/include/genericSocket.h @@ -584,7 +584,6 @@ enum communicationProtocol{ int ReceiveDataOnly(void* buf,int length=0){ if (buf==NULL) return -1; - cprintf(RED,"length:%d\n",length); total_sent=0; @@ -616,16 +615,11 @@ enum communicationProtocol{ /*int k = 0;*/ while(length>0){ - if(lengthpacket_size) ? packet_size:length; //works for eiger to get packets to discard image header packets - } nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length); - cprintf(BLUE,"read %d\n",nsending); if(nsent != nsending){ //if((nsent != nsending)){ && (nsent < packet_size)){ if(nsent && (nsent != header_packet_size) && (nsent != -1)) cprintf(RED,"Incomplete Packet size %d\n",nsent); diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index d53694126..d6d912efc 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -2142,7 +2142,7 @@ int UDPStandardImplementation::prepareAndListenBuffer(int ithread, int cSize, ch receivedSize = oneDataSize * packetsPerFrame; } - else{cprintf(BG_RED,"for only eiger or other dets. should not be here!!\n"); + else{ receivedSize = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + fifoBufferHeaderSize + cSize, (bufferSize * numberofJobsPerBuffer) - cSize); //eiger returns 0 when header packet caught while(receivedSize < onePacketSize && status != TRANSMITTING)