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

fixed setup udp

Browse Source
This commit is contained in:
Erik Frojdh
2019-05-28 17:07:34 +02:00
parent 7a9dbd8b76
commit aa2bcfa308
3 changed files with 22 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -109,6 +109,7 @@ void slsReceiverTCPIPInterface::startTCPServer() {
int ret = OK; int ret = OK;
server = sls::make_unique<sls::ServerSocket>(portNumber); server = sls::make_unique<sls::ServerSocket>(portNumber);
while (true) { while (true) {
FILE_LOG(logDEBUG1) << "Start accept loop";
try { try {
auto socket = server->accept(); auto socket = server->accept();
constexpr int time_us = 5000000; constexpr int time_us = 5000000;
@ -422,8 +423,6 @@ int slsReceiverTCPIPInterface::update_client(sls::ServerInterface2 &socket) {
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
// no arg, check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr) if(receiver == nullptr)
NullObjectError(ret, mess); NullObjectError(ret, mess);
socket.sendResult(false, ret, nullptr, 0, mess); socket.sendResult(false, ret, nullptr, 0, mess);
@ -698,15 +697,16 @@ int slsReceiverTCPIPInterface::set_roi(sls::ServerInterface2 &socket) {
int slsReceiverTCPIPInterface::setup_udp(sls::ServerInterface2 &socket){ int slsReceiverTCPIPInterface::setup_udp(sls::ServerInterface2 &socket){
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
char args[6][MAX_STR_LENGTH]{}; char args[5][MAX_STR_LENGTH]{};
char retvals[2][MAX_STR_LENGTH]{}; char retvals[2][MAX_STR_LENGTH]{};
// get args, return if socket crashed, ret is fail if receiver is not null // get args, return if socket crashed, ret is fail if receiver is not null
socket.receiveArg(ret, mess, args, sizeof(args)); socket.receiveArg(ret, mess, args, sizeof(args));
if(receiver == nullptr){ if (receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
return FAIL; return FAIL;
} }
// base object not null // base object not null
if (ret == OK) { if (ret == OK) {
@ -716,18 +716,10 @@ int slsReceiverTCPIPInterface::setup_udp(sls::ServerInterface2 &socket){
//setup interfaces count //setup interfaces count
int numInterfaces = atoi(args[0]) > 1 ? 2 : 1; int numInterfaces = atoi(args[0]) > 1 ? 2 : 1;
int selInterface = atoi(args[1]) > 1 ? 2 : 1; char* ip1 = args[1];
char* ip2 = args[2];
char* ip1 = args[2]; uint32_t port1 = atoi(args[3]);
char* ip2 = args[3]; uint32_t port2 = atoi(args[4]);
uint32_t port1 = atoi(args[4]);
uint32_t port2 = atoi(args[5]);
// using the 2nd interface only
if (myDetectorType == JUNGFRAU && numInterfaces == 1 && selInterface == 2) {
ip1 = ip2;
port1 = port2;
}
// 1st interface // 1st interface
receiver->setUDPPortNumber(port1); receiver->setUDPPortNumber(port1);
@ -764,15 +756,8 @@ int slsReceiverTCPIPInterface::setup_udp(sls::ServerInterface2 &socket){
strcpy(mess,"failed to get mac adddress to listen to\n"); strcpy(mess,"failed to get mac adddress to listen to\n");
FILE_LOG(logERROR) << mess; FILE_LOG(logERROR) << mess;
} else { } else {
// using the 2nd interface only strcpy(retvals[0],temp.c_str());
if (myDetectorType == JUNGFRAU && numInterfaces == 1 && selInterface == 2) { FILE_LOG(logINFO) << "Receiver MAC Address: " << retvals[0];
strcpy(retvals[1],temp.c_str());
FILE_LOG(logINFO) << "Receiver MAC Address: " << retvals[1];
}
else {
strcpy(retvals[0],temp.c_str());
FILE_LOG(logINFO) << "Receiver MAC Address: " << retvals[0];
}
} }
} }
} }
@ -829,7 +814,6 @@ int slsReceiverTCPIPInterface::setup_udp(sls::ServerInterface2 &socket){
int slsReceiverTCPIPInterface::set_timer(sls::ServerInterface2 &socket) { int slsReceiverTCPIPInterface::set_timer(sls::ServerInterface2 &socket) {
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
@ -1037,17 +1021,13 @@ int slsReceiverTCPIPInterface::get_status(sls::ServerInterface2 &socket){
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
enum runStatus retval = ERROR; enum runStatus retval = ERROR;
// no arg, check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
if (ret == OK) { if (ret == OK) {
FILE_LOG(logDEBUG1) << "Getting Status"; FILE_LOG(logDEBUG1) << "Getting Status";
std::cout << "kalas\n";
retval = receiver->getStatus(); retval = receiver->getStatus();
std::cout << "puff\n";
FILE_LOG(logDEBUG1) << "Status:" << runStatusType(retval); FILE_LOG(logDEBUG1) << "Status:" << runStatusType(retval);
} }
return socket.sendResult(true, ret, &retval, sizeof(retval), mess); return socket.sendResult(true, ret, &retval, sizeof(retval), mess);
@ -1059,8 +1039,6 @@ int slsReceiverTCPIPInterface::start_receiver(sls::ServerInterface2 &socket){
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
// no arg, and check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
@ -1093,8 +1071,7 @@ int slsReceiverTCPIPInterface::stop_receiver(sls::ServerInterface2 &socket){
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
// no arg, and check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
@ -1230,8 +1207,6 @@ int slsReceiverTCPIPInterface::get_frame_index(sls::ServerInterface2 &socket){
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
int retval = -1; int retval = -1;
// no arg, check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
@ -1251,8 +1226,6 @@ int slsReceiverTCPIPInterface::get_frames_caught(sls::ServerInterface2 &socket){
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
int retval = -1; int retval = -1;
// no arg, check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
@ -1271,8 +1244,6 @@ int slsReceiverTCPIPInterface::reset_frames_caught(sls::ServerInterface2 &socket
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
// no arg, and check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
@ -1839,8 +1810,6 @@ int slsReceiverTCPIPInterface::restream_stop(sls::ServerInterface2 &socket){
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
// no arg, and check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
@ -1904,8 +1873,6 @@ int slsReceiverTCPIPInterface::get_additional_json_header(sls::ServerInterface2
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
char retval[MAX_STR_LENGTH] = {0}; char retval[MAX_STR_LENGTH] = {0};
// no arg, check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
@ -1964,8 +1931,6 @@ int slsReceiverTCPIPInterface::get_real_udp_socket_buffer_size(sls::ServerInterf
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
int64_t retval = -1; int64_t retval = -1;
// no arg, check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }
@ -2253,8 +2218,6 @@ int slsReceiverTCPIPInterface::get_dbit_list(sls::ServerInterface2 &socket) {
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
sls::FixedCapacityContainer<int, MAX_RX_DBIT> retval; sls::FixedCapacityContainer<int, MAX_RX_DBIT> retval;
// no arg, check receiver is null
socket.receiveArg(ret, mess, nullptr, 0);
if(receiver == nullptr){ if(receiver == nullptr){
NullObjectError(ret, mess); NullObjectError(ret, mess);
} }

4
slsSupportLib/include/logger.h
View File

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

12
slsSupportLib/src/ServerInterface2.cpp
View File

@ -1,5 +1,5 @@
#include "ServerInterface2.h" #include "ServerInterface2.h"
#include <cassert>
namespace sls { namespace sls {
int ServerInterface2::sendResult(bool update, int ret, void *retval, int ServerInterface2::sendResult(bool update, int ret, void *retval,
@ -24,9 +24,15 @@ int ServerInterface2::sendResult(bool update, int ret, void *retval,
int ServerInterface2::receiveArg(int &ret, char *mess, void *arg, int ServerInterface2::receiveArg(int &ret, char *mess, void *arg,
int sizeofArg) { int sizeofArg) {
if (sizeofArg && receiveData(arg, sizeofArg) < 0) assert(sizeofArg > 0);
int bytes_read = read(arg, sizeofArg);
if (bytes_read == sizeofArg) {
return defs::OK;
} else {
FILE_LOG(logERROR) << "Read: " << bytes_read << " instead of "
<< sizeofArg;
return defs::FAIL; return defs::FAIL;
return defs::OK; }
} }
} // namespace sls } // namespace sls