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

solved conflicts between detectors about config files

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@184 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-05-31 07:46:53 +00:00
parent c14b98d938
commit 0ef003646e
8 changed files with 295 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -2584,7 +2584,7 @@ int set_port(int file_des) {
sd=bindSocket(p_number);
}
if (sd>=0) {
if (sd>=0 || sd==-10) {
ret=OK;
if (differentClients )
ret=FORCE_UPDATE;
@ -2592,11 +2592,7 @@ int set_port(int file_des) {
ret=FAIL;
sprintf(mess,"Could not bind port %d\n", p_number);
printf("Could not bind port %d\n", p_number);
if (sd==-10) {
sprintf(mess,"Port %d already set\n", p_number);
printf("Port %d already set\n", p_number);
}
}
n = sendDataOnly(file_des,&ret,sizeof(ret));
@ -2604,9 +2600,11 @@ int set_port(int file_des) {
n = sendDataOnly(file_des,mess,sizeof(mess));
} else {
n = sendDataOnly(file_des,&p_number,sizeof(p_number));
closeConnection(file_des);
exitServer(sockfd);
sockfd=sd;
if (sd>=0) {
closeConnection(file_des);
exitServer(sockfd);
sockfd=sd;
}
}