detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

not much valuable change

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-06-10 12:23:38 +02:00
parent 4f88e831c4
commit 849d0de5cb
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/include/UDPBaseImplementation.h
View File

@ -491,14 +491,6 @@ protected:
unsigned char fnum[4]; unsigned char fnum[4];
unsigned char header_after[24]; unsigned char header_after[24];
} eiger_image_header; } eiger_image_header;
/** structure of an eiger image header*/
typedef struct
{
unsigned char header_before[19];
unsigned char fnum[4];
unsigned char header_after[25];
} eiger_image_header32;
/** structure of an eiger image header*/ /** structure of an eiger image header*/
typedef struct typedef struct

31
slsReceiverSoftware/include/genericSocket.h
View File

@ -99,6 +99,13 @@ typedef struct
unsigned char header_after[24]; unsigned char header_after[24];
} eiger_image_header; } 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) : genericSocket(const char* const host_ip_or_name, unsigned short int const port_number, communicationProtocol p, int ps = DEFAULT_PACKET_SIZE) :
// portno(port_number), // portno(port_number),
protocol(p), protocol(p),
@ -585,10 +592,32 @@ typedef struct
//if length given, listens to length, else listens for packetsize till length is reached //if length given, listens to length, else listens for packetsize till length is reached
if(length){ if(length){
/*int k = 0;*/
while(length>0){ while(length>0){
nsending = (length>packet_size) ? packet_size:length; 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); nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
if(!nsent) break; if(!nsent) break;
if(nsent == 16) { if(nsent == 16) {

2
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -26,8 +26,6 @@
using namespace std; using namespace std;
#define EIGER_32BIT_INITIAL_CONSTANT 0x17c