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

corected the rx_udpport change segmentation fault

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@432 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-01-17 10:53:39 +00:00
parent 2c38aedcf8
commit 47a9d34991
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4449,7 +4449,6 @@ int slsDetector::exitServer(){
char* slsDetector::setNetworkParameter(networkParameter index, string value) { char* slsDetector::setNetworkParameter(networkParameter index, string value) {
char* answer;
int i; int i;
switch (index) { switch (index) {
@ -4465,8 +4464,8 @@ char* slsDetector::setNetworkParameter(networkParameter index, string value) {
return setReceiverUDPMAC(value); return setReceiverUDPMAC(value);
case RECEIVER_UDP_PORT: case RECEIVER_UDP_PORT:
sscanf(value.c_str(),"%d",&i); sscanf(value.c_str(),"%d",&i);
sprintf(answer,"%d",setReceiverUDPPort(i)); setReceiverUDPPort(i);
return answer; return getReceiverUDPPort();
default: default:
return ("unknown network parameter"); return ("unknown network parameter");
} }

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2244,8 +2244,10 @@ string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int actio
t=RECEIVER_UDP_MAC; t=RECEIVER_UDP_MAC;
} else if (cmd=="rx_udpport") { } else if (cmd=="rx_udpport") {
t=RECEIVER_UDP_PORT; t=RECEIVER_UDP_PORT;
if (action==PUT_ACTION){
if (!(sscanf(args[1],"%d",&i))) if (!(sscanf(args[1],"%d",&i)))
return ("cannot parse argument") + string(args[1]); return ("cannot parse argument") + string(args[1]);
}
} else return ("unknown network parameter")+cmd; } else return ("unknown network parameter")+cmd;
if (action==PUT_ACTION) if (action==PUT_ACTION)