detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

eiger virtual server bug fix, detectorip and detectormac of hostpc

Browse Source
This commit is contained in:
maliakal_d 2019-11-05 14:46:58 +01:00
parent 2f2e4da628
commit 96d64778ee
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -107,8 +107,6 @@ void basictests() {
memset(firmware_message, 0, MAX_STR_LENGTH); memset(firmware_message, 0, MAX_STR_LENGTH);
#ifdef VIRTUAL #ifdef VIRTUAL
FILE_LOG(logINFOBLUE, ("************ EIGER Virtual Server *****************\n\n")); FILE_LOG(logINFOBLUE, ("************ EIGER Virtual Server *****************\n\n"));
firmware_check_done = 1;
return;
#endif #endif
uint32_t ipadd = getDetectorIP(); uint32_t ipadd = getDetectorIP();
uint64_t macadd = getDetectorMAC(); uint64_t macadd = getDetectorMAC();
@ -140,6 +138,10 @@ void basictests() {
udpDetails.srcip = ipadd; udpDetails.srcip = ipadd;
udpDetails.srcmac = macadd; udpDetails.srcmac = macadd;
#ifdef VIRTUAL
firmware_check_done = 1;
return;
#endif
// return if debugflag is not zero, debug mode // return if debugflag is not zero, debug mode
if (debugflag) { if (debugflag) {
firmware_check_done = 1; firmware_check_done = 1;
@ -238,15 +240,16 @@ u_int32_t getDetectorNumber() {
u_int64_t getDetectorMAC() { u_int64_t getDetectorMAC() {
#ifdef VIRTUAL
return 0;
#else
char mac[255]=""; char mac[255]="";
u_int64_t res=0; u_int64_t res=0;
//execute and get address //execute and get address
char output[255]; char output[255];
#ifdef VIRTUAL
FILE* sysFile = popen("cat /sys/class/net/$(ip route show default | awk '/default/ {print $5}')/address", "r");
#else
FILE* sysFile = popen("more /sys/class/net/eth0/address", "r"); FILE* sysFile = popen("more /sys/class/net/eth0/address", "r");
#endif
//FILE* sysFile = popen("ifconfig eth0 | grep HWaddr | cut -d \" \" -f 11", "r"); //FILE* sysFile = popen("ifconfig eth0 | grep HWaddr | cut -d \" \" -f 11", "r");
fgets(output, sizeof(output), sysFile); fgets(output, sizeof(output), sysFile);
pclose(sysFile); pclose(sysFile);
@ -265,19 +268,19 @@ u_int64_t getDetectorMAC() {
//FILE_LOG(logINFO, ("mac:%llx\n",res)); //FILE_LOG(logINFO, ("mac:%llx\n",res));
return res; return res;
#endif
} }
u_int32_t getDetectorIP() { u_int32_t getDetectorIP() {
#ifdef VIRTUAL
return 0;
#endif
char temp[50]=""; char temp[50]="";
u_int32_t res=0; u_int32_t res=0;
//execute and get address //execute and get address
char output[255]; char output[255];
#ifdef VIRTUAL
FILE* sysFile = popen("ifconfig $(ip route show default | awk '/default/ {print $5}') | grep 'inet ' | cut -d ' ' -f10", "r");
#else
FILE* sysFile = popen("ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2", "r"); FILE* sysFile = popen("ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2", "r");
#endif
fgets(output, sizeof(output), sysFile); fgets(output, sizeof(output), sysFile);
pclose(sysFile); pclose(sysFile);