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

midpoint

Browse Source
This commit is contained in:
Erik Frojdh 2019-03-28 16:16:41 +01:00
parent 78fcb7eb98
commit 990848554c
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
integrationTests/src/a.cpp
View File

@ -41,6 +41,8 @@ int main() {
// std::cout << "sizeof(result):" << sizeof(hints) << '\n'; // std::cout << "sizeof(result):" << sizeof(hints) << '\n';
// std::cout << "sizeof(serverAddr):" << sizeof(serverAddr) << '\n'; // std::cout << "sizeof(serverAddr):" << sizeof(serverAddr) << '\n';
uint64_t ip{0};
int port = 1952; int port = 1952;
if (getaddrinfo(hostname.c_str(), NULL, &hints, &result) != 0) { if (getaddrinfo(hostname.c_str(), NULL, &hints, &result) != 0) {
@ -54,9 +56,10 @@ int main() {
memcpy(&serverAddr.sin_addr.s_addr, &((struct sockaddr_in *)result->ai_addr)->sin_addr, memcpy(&serverAddr.sin_addr.s_addr, &((struct sockaddr_in *)result->ai_addr)->sin_addr,
sizeof(in_addr_t)); sizeof(in_addr_t));
freeaddrinfo(result); freeaddrinfo(result);
ip = serverAddr.sin_addr.s_addr;
char address[INET_ADDRSTRLEN]; char address[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &serverAddr.sin_addr, address, INET_ADDRSTRLEN); inet_ntop(AF_INET, &ip, address, INET_ADDRSTRLEN);
std::cout << "ip of host is: " << address << '\n'; std::cout << "ip of host is: " << address << '\n';
sls::ClientSocket(false, serverAddr); sls::ClientSocket(false, serverAddr);

3
slsDetectorSoftware/include/slsDetector.h
View File

@ -163,7 +163,8 @@ struct sharedSlsDetector {
char detectorMAC2[MAX_STR_LENGTH]; char detectorMAC2[MAX_STR_LENGTH];
/** ip address of the detector **/ /** ip address of the detector **/
char detectorIP[MAX_STR_LENGTH]; // char detectorIP[MAX_STR_LENGTH];
uint64_t detectorIP;
/** ip address of the 2nd interface of the detector **/ /** ip address of the 2nd interface of the detector **/
char detectorIP2[MAX_STR_LENGTH]; char detectorIP2[MAX_STR_LENGTH];

33
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -323,7 +323,7 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
sls::strcpy_safe(detector_shm()->receiverUDPMAC2, "none"); sls::strcpy_safe(detector_shm()->receiverUDPMAC2, "none");
sls::strcpy_safe(detector_shm()->detectorMAC, DEFAULT_DET_MAC); sls::strcpy_safe(detector_shm()->detectorMAC, DEFAULT_DET_MAC);
sls::strcpy_safe(detector_shm()->detectorMAC2, DEFAULT_DET_MAC2); sls::strcpy_safe(detector_shm()->detectorMAC2, DEFAULT_DET_MAC2);
sls::strcpy_safe(detector_shm()->detectorIP, DEFAULT_DET_IP); // sls::strcpy_safe(detector_shm()->detectorIP, DEFAULT_DET_IP);
sls::strcpy_safe(detector_shm()->detectorIP2, DEFAULT_DET_IP2); sls::strcpy_safe(detector_shm()->detectorIP2, DEFAULT_DET_IP2);
detector_shm()->numUDPInterfaces = 1; detector_shm()->numUDPInterfaces = 1;
detector_shm()->selectedUDPInterface = 1; detector_shm()->selectedUDPInterface = 1;
@ -1614,7 +1614,12 @@ int slsDetector::configureMAC() {
snprintf(args[0], array_size, "%x", detector_shm()->receiverUDPPort); snprintf(args[0], array_size, "%x", detector_shm()->receiverUDPPort);
sls::strcpy_safe(args[1], detector_shm()->receiverUDPIP); sls::strcpy_safe(args[1], detector_shm()->receiverUDPIP);
sls::strcpy_safe(args[2], detector_shm()->receiverUDPMAC); sls::strcpy_safe(args[2], detector_shm()->receiverUDPMAC);
sls::strcpy_safe(args[3], detector_shm()->detectorIP);
char detectorIP[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &(detector_shm()->detectorIP), detectorIP, INET_ADDRSTRLEN);
sls::strcpy_safe(args[3], detectorIP);
sls::strcpy_safe(args[4], detector_shm()->detectorMAC); sls::strcpy_safe(args[4], detector_shm()->detectorMAC);
snprintf(args[5], array_size, "%x", detector_shm()->receiverUDPPort2); snprintf(args[5], array_size, "%x", detector_shm()->receiverUDPPort2);
@ -1711,10 +1716,10 @@ int slsDetector::configureMAC() {
FILE_LOG(logINFO) << detId << ": Detector MAC updated to " FILE_LOG(logINFO) << detId << ": Detector MAC updated to "
<< detector_shm()->detectorMAC; << detector_shm()->detectorMAC;
} }
if (strcasecmp(retvals[1], detector_shm()->detectorIP)) { if (strcasecmp(retvals[1], detectorIP)) {
// memset(detector_shm()->detectorIP, 0, MAX_STR_LENGTH); // memset(detector_shm()->detectorIP, 0, MAX_STR_LENGTH);
sls::strcpy_safe(detector_shm()->detectorIP, retvals[1]); // sls::strcpy_safe(detectorIP, retvals[1]);
FILE_LOG(logINFO) << detId << ": Detector IP updated to " << detector_shm()->detectorIP; FILE_LOG(logINFO) << detId << ": Detector IP updated to " << detectorIP;
} }
} }
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {
@ -2133,14 +2138,16 @@ std::string slsDetector::getDetectorMAC2() {
} }
std::string slsDetector::setDetectorIP(const std::string &detectorIP) { std::string slsDetector::setDetectorIP(const std::string &detectorIP) {
struct sockaddr_in sa; // struct sockaddr_in sa;
if (detectorIP.length() && detectorIP.length() < 16) { uint64_t ip{0};
int result = inet_pton(AF_INET, detectorIP.c_str(), &(sa.sin_addr)); if (detectorIP.length() && detectorIP.length() < INET_ADDRSTRLEN) {
int result = inet_pton(AF_INET, detectorIP.c_str(), &ip);
if (result == 0) { if (result == 0) {
throw RuntimeError( throw RuntimeError(
"setDetectorIP: IP Address should be VALID and in xxx.xxx.xxx.xxx format"); "setDetectorIP: IP Address should be VALID and in xxx.xxx.xxx.xxx format");
} else { } else {
sls::strcpy_safe(detector_shm()->detectorIP, detectorIP.c_str()); // sls::strcpy_safe(detector_shm()->detectorIP, detectorIP.c_str());
detector_shm()->detectorIP = ip;
if (!strcmp(detector_shm()->receiver_hostname, "none")) { if (!strcmp(detector_shm()->receiver_hostname, "none")) {
FILE_LOG(logDEBUG1) << "Receiver hostname not set yet"; FILE_LOG(logDEBUG1) << "Receiver hostname not set yet";
} else if (setUDPConnection() == FAIL) { } else if (setUDPConnection() == FAIL) {
@ -2148,11 +2155,15 @@ std::string slsDetector::setDetectorIP(const std::string &detectorIP) {
} }
} }
} }
return std::string(detector_shm()->detectorIP); char address[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &detector_shm()->detectorIP, address, INET_ADDRSTRLEN);
return address;
} }
std::string slsDetector::getDetectorIP() const { std::string slsDetector::getDetectorIP() const {
return std::string(detector_shm()->detectorIP); char address[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &detector_shm()->detectorIP, address, INET_ADDRSTRLEN);
return address;
} }
std::string slsDetector::setDetectorIP2(const std::string &detectorIP) { std::string slsDetector::setDetectorIP2(const std::string &detectorIP) {

2
slsSupportLib/include/logger.h
View File

@ -17,7 +17,7 @@
#endif #endif
#ifndef FILELOG_MAX_LEVEL #ifndef FILELOG_MAX_LEVEL
#define FILELOG_MAX_LEVEL logINFO #define FILELOG_MAX_LEVEL logDEBUG5
#endif #endif