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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d
2020-01-16 16:37:44 +01:00
parent de57146e1b c1fac7cdb7
commit 69dd5f3b5e
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/ClientInterface.cpp
View File

@ -320,7 +320,7 @@ int ClientInterface::send_update(Interface &socket) {
int64_t i64 = -1;
char cstring[MAX_STR_LENGTH]{};
sls::IpAddr ip = 0u;
sls::IpAddr ip;
ip = server->getLastClient();
n += socket.Send(&ip, sizeof(ip));
@ -920,7 +920,7 @@ int ClientInterface::set_streaming_port(Interface &socket) {
}
int ClientInterface::set_streaming_source_ip(Interface &socket) {
sls::IpAddr arg = 0u;
sls::IpAddr arg;
socket.Receive(arg);
verifyIdle(socket);
FILE_LOG(logDEBUG1) << "Setting streaming source ip:" << arg;

2
slsReceiverSoftware/src/Implementation.cpp
View File

@ -90,7 +90,7 @@ void Implementation::InitializeMembers() {
streamingFrequency = 1;
streamingTimerInMs = DEFAULT_STREAMING_TIMER_IN_MS;
streamingPort = 0;
streamingSrcIP = 0u;
streamingSrcIP = sls::IpAddr{};
additionalJsonHeader = "";
// detector parameters