made udp socket in receiver use generic socket, included a incrememnt frame index in acquire before a break, got rid of infinite loop for unmatched index in receiver

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@350 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-11-19 16:29:17 +00:00
parent 1b7c42540a
commit 97ed3e8872
7 changed files with 65 additions and 101 deletions

View File

@ -7,6 +7,7 @@
#include "sls_detector_defs.h"
#include "receiver_defs.h"
#include "genericSocket.h"
#include <pthread.h>
#include <stdio.h>
@ -186,11 +187,11 @@ private:
/** File Descriptor */
static FILE *sfilefd;
/** UDP Socket - with server */
int udpSocket;
/** Receiver buffer */
char buffer[HALF_BUFFER_SIZE*2];
char buffer[BUFFER_SIZE];
/** UDP Socket between Receiver and Detector */
genericSocket* udpSocket;
/** Server UDP Port*/
int server_port;
@ -198,22 +199,6 @@ private:
};
/*
int getStartFrameIndex();
//int setUDPPortNumber(int p=-1); //sets/gets port number to listen to for data from the detector
//int setTCPPortNumber(int p=-1); //sets/get port number for communication to client
*/