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

merge fix

Browse Source
This commit is contained in:
maliakal_d
2021-08-06 16:11:58 +02:00
parent 9f6b951988 2c53a134cd
commit cc3aede979
17 changed files with 126 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8321,7 +8321,7 @@ int set_datastream(int file_des) {
int get_veto_stream(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
enum ethernetInterface retval = NONE;
enum streamingInterface retval = NONE;
LOG(logDEBUG1, ("Getting veto stream\n"));
@ -8338,7 +8338,7 @@ int get_veto_stream(int file_des) {
int set_veto_stream(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
enum ethernetInterface arg = 0;
enum streamingInterface arg = 0;
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
@ -8370,7 +8370,7 @@ int set_veto_stream(int file_des) {
int get_veto_algorithm(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
enum ethernetInterface arg = NONE;
enum streamingInterface arg = NONE;
enum vetoAlgorithm retval = DEFAULT_ALGORITHM;
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
@ -8381,7 +8381,7 @@ int get_veto_algorithm(int file_des) {
functionNotImplemented();
#else
// get only
if (arg != I3GBE && arg != I10GBE) {
if (arg != LOW_LATENCY_LINK && arg != ETHERNET_10GB) {
ret = FAIL;
sprintf(mess, "Could not get vetoalgorithm. Invalid interface %d.\n",
arg);
@ -8402,7 +8402,7 @@ int set_veto_algorithm(int file_des) {
return printSocketReadError();
enum vetoAlgorithm alg = args[0];
enum ethernetInterface interface = args[1];
enum streamingInterface interface = args[1];
LOG(logINFO, ("Setting vetoalgorithm (interface: %d): %u\n", (int)interface,
(int)alg));
@ -8411,7 +8411,7 @@ int set_veto_algorithm(int file_des) {
#else
// only set
if (Server_VerifyLock() == OK) {
if (interface != I3GBE && interface != I10GBE) {
if (interface != LOW_LATENCY_LINK && interface != ETHERNET_10GB) {
ret = FAIL;
sprintf(mess,
"Could not set vetoalgorithm. Invalid interface %d.\n",