detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 07:20:01 +02:00
Code Issues Actions Packages Releases Activity

added the set & get functions for clientIP and clientMAC

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@76 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-01-06 10:11:56 +00:00
parent 1770045bce
commit 77d21d16f9
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -357,9 +357,9 @@ int slsDetector::initializeDetectorSize(detectorType type) {
strcpy(thisDetector->hostname,DEFAULT_HOSTNAME); strcpy(thisDetector->hostname,DEFAULT_HOSTNAME);
/** set client ip address */ /** set client ip address */
strcpy(thisDetector->clientIPAddress,"none"); strcpy(thisDetector->clientIP,"none");
/** set client mac address */ /** set client mac address */
strcpy(thisDetector->clientMacAddress,"none"); strcpy(thisDetector->clientMAC,"none");
/** sets onlineFlag to OFFLINE_FLAG */ /** sets onlineFlag to OFFLINE_FLAG */
thisDetector->onlineFlag=OFFLINE_FLAG; thisDetector->onlineFlag=OFFLINE_FLAG;
@ -5460,6 +5460,18 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
sprintf(answer,form,answer,oen[ie]); sprintf(answer,form,answer,oen[ie]);
} }
return string(answer); return string(answer);
}else if (var=="clientip") {
if (action==PUT_ACTION) {
sval=string(args[1]);
return string(setClientIP(sval));
} else
return getClientIP();
} else if (var=="clientmac") {
if (action==PUT_ACTION) {
sval=string(args[1]);
return string(setClientMAC(sval));
} else
return getClientMAC();
} }
@ -5473,6 +5485,7 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
if (setOnline()) if (setOnline())
setTCPSocket(); setTCPSocket();

14
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -312,9 +312,9 @@ typedef struct sharedSlsDetector {
/*extra gotthard members*/ /*extra gotthard members*/
/** is the ip address of the client for gotthard; read from configuration file **/ /** is the ip address of the client for gotthard; read from configuration file **/
char clientIPAddress[MAX_STR_LENGTH]; char clientIP[MAX_STR_LENGTH];
/** is the mac address of the client for gotthard; read from configuration file **/ /** is the mac address of the client for gotthard; read from configuration file **/
char clientMacAddress[MAX_STR_LENGTH]; char clientMAC[MAX_STR_LENGTH];
} sharedSlsDetector; } sharedSlsDetector;
@ -442,6 +442,16 @@ typedef struct sharedSlsDetector {
int disconnectStop(); int disconnectStop();
/** returns the client IP address for gotthard \sa sharedSlsDetector */
char* getClientIP() {return thisDetector->clientIP;};
/** returns the client MAC address for gotthard \sa sharedSlsDetector */
char* getClientMAC() {return thisDetector->clientMAC;};
/** sets the client IP address for gotthard \sa sharedSlsDetector */
char* setClientIP(string clientIP) {sprintf(thisDetector->clientIP,clientIP.c_str()); return thisDetector->clientIP;};
/** sets the client MAC address for gotthard \sa sharedSlsDetector */
char* setClientMAC(string clientMAC) {sprintf(thisDetector->clientMAC,clientMAC.c_str());return thisDetector->clientMAC;};
/* I/O */ /* I/O */
/** returns the detector trimbit/settings directory \sa sharedSlsDetector */ /** returns the detector trimbit/settings directory \sa sharedSlsDetector */
char* getSettingsDir() {return thisDetector->settingsDir;}; char* getSettingsDir() {return thisDetector->settingsDir;};