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

udp_srcip defaulted to 127.0.0.1 for virtual servers

Browse Source
This commit is contained in:
maliakal_d 2022-02-15 10:48:14 +01:00
parent faa9ecf97c
commit c38f292613
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1675,7 +1675,7 @@ int setReadNRows(int value) {
} }
if (isHardwareVersion2()) { if (isHardwareVersion2()) {
LOG(logERROR, ("Could not set number of rows. Only available for " LOG(logERROR, ("Could not set number of rows. Only available for "
"Hardware Board version 2.0.\n")); "Hardware Board version 2.0.\n"));
return FAIL; return FAIL;
} }
@ -2175,7 +2175,7 @@ int getFlipRows() {
void setFlipRows(int arg) { void setFlipRows(int arg) {
if (isHardwareVersion2()) { if (isHardwareVersion2()) {
LOG(logERROR, ("Could not set flip rows. Only available for " LOG(logERROR, ("Could not set flip rows. Only available for "
"Hardware Board version 2.0.\n")); "Hardware Board version 2.0.\n"));
return; return;
} }
if (arg >= 0) { if (arg >= 0) {

5
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -37,6 +37,8 @@ const enum detectorType myDetectorType = GOTTHARD2;
const enum detectorType myDetectorType = GENERIC; const enum detectorType myDetectorType = GENERIC;
#endif #endif
#define LOCALHOSTIP_INT 2130706433
// Global variables from communication_funcs // Global variables from communication_funcs
extern int lockStatus; extern int lockStatus;
extern uint32_t lastClientIP; extern uint32_t lastClientIP;
@ -119,10 +121,11 @@ int printSocketReadError() {
} }
void init_detector() { void init_detector() {
memset(udpDetails, 0, sizeof(udpDetails));
#ifdef VIRTUAL #ifdef VIRTUAL
LOG(logINFO, ("This is a VIRTUAL detector\n")); LOG(logINFO, ("This is a VIRTUAL detector\n"));
udpDetails[0].srcip = LOCALHOSTIP_INT;
#endif #endif
memset(udpDetails, 0, sizeof(udpDetails));
udpDetails[0].srcport = DEFAULT_UDP_SRC_PORTNO; udpDetails[0].srcport = DEFAULT_UDP_SRC_PORTNO;
udpDetails[0].dstport = DEFAULT_UDP_DST_PORTNO; udpDetails[0].dstport = DEFAULT_UDP_DST_PORTNO;
#ifdef EIGERD #ifdef EIGERD