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

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

4
slsDetectorSoftware/MySocketTCP/MySocketTCP.h
View File

@ -53,8 +53,8 @@ developed and
class MySocketTCP: public genericSocket { class MySocketTCP: public genericSocket {
public: public:
MySocketTCP(const char* const host_ip_or_name, unsigned short int const port_number): genericSocket(host_ip_or_name, port_number,TCP), last_keep_connection_open_action_was_a_send(0){setPacketSize(TCP_PACKET_SIZE);}; // sender (client): where to? ip MySocketTCP(const char* const host_ip_or_name, unsigned short int const port_number): genericSocket(host_ip_or_name, port_number,TCP), last_keep_connection_open_action_was_a_send(0){setPacketSize(TCP_PACKET_SIZE);}; // sender (client): where to? ip
MySocketTCP(unsigned short int const port_number):genericSocket(port_number,TCP), last_keep_connection_open_action_was_a_send(0) {setPacketSize(TCP_PACKET_SIZE);}; // receiver (server) local no need for ip MySocketTCP(unsigned short int const port_number):genericSocket(port_number,TCP), last_keep_connection_open_action_was_a_send(0) {setPacketSize(TCP_PACKET_SIZE);}; // receiver (server) local no need for ip
//The following two functions will connectioned->send/receive->disconnect //The following two functions will connectioned->send/receive->disconnect

4
slsDetectorSoftware/MySocketTCP/genericSocket.h
View File

@ -89,7 +89,7 @@ enum communicationProtocol{
}; };
genericSocket(const char* const host_ip_or_name, unsigned short int const port_number, communicationProtocol p) : genericSocket(const char* const host_ip_or_name, unsigned short int const port_number, communicationProtocol p) :
// portno(port_number), // portno(port_number),
protocol(p), is_a_server(0), socketDescriptor(-1),file_des(-1), packet_size(DEFAULT_PACKET_SIZE)// sender (client): where to? ip protocol(p), is_a_server(0), socketDescriptor(-1),file_des(-1), packet_size(DEFAULT_PACKET_SIZE)// sender (client): where to? ip
{ {
@ -138,7 +138,7 @@ protocol(p), is_a_server(0), socketDescriptor(-1),file_des(-1), packet_size(DEFA
*/ */
genericSocket(unsigned short int const port_number, communicationProtocol p, const char *eth=NULL): genericSocket(unsigned short int const port_number, communicationProtocol p, const char *eth=NULL):
//portno(port_number), //portno(port_number),
protocol(p), is_a_server(1),socketDescriptor(-1), file_des(-1), packet_size(DEFAULT_PACKET_SIZE){ protocol(p), is_a_server(1),socketDescriptor(-1), file_des(-1), packet_size(DEFAULT_PACKET_SIZE){

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");
} }

6
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 (!(sscanf(args[1],"%d",&i))) if (action==PUT_ACTION){
return ("cannot parse argument") + string(args[1]); if (!(sscanf(args[1],"%d",&i)))
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)