From 6f793abca8522dad001f3d0d0ac68d24178f8b7b Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 20 Dec 2012 11:11:53 +0000 Subject: [PATCH] added receiver mac to be compatible with aldos receiver git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@417 951219d9-93cf-4727-9268-0efd64621fa3 --- .../commonFiles/sls_detector_defs.h | 3 ++- .../gotthardDetectorServer/svnInfoGotthard.h | 6 +++--- .../mythenDetectorServer/svnInfoMythen.h | 12 +++++------ .../mythenDetectorServer/svnInfoMythenTmp.h | 10 +++++----- .../slsDetector/slsDetector.cpp | 20 +++++++++++++++++++ slsDetectorSoftware/slsDetector/slsDetector.h | 4 ++++ .../slsDetector/slsDetectorCommand.cpp | 9 ++++++++- slsDetectorSoftware/slsDetector/svnInfoLib.h | 6 +++--- .../slsReceiver/svnInfoReceiver.h | 6 +++--- 9 files changed, 54 insertions(+), 22 deletions(-) diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index cf0f9c0e9..758e7b600 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -185,7 +185,8 @@ enum networkParameter { DETECTOR_IP, /**< detector IP */ RECEIVER_HOSTNAME, /**< receiver IP/hostname */ RECEIVER_UDP_IP, /**< receiever UDP IP */ - RECEIVER_UDP_PORT /**< receiever UDP Port */ + RECEIVER_UDP_PORT, /**< receiever UDP Port */ + RECEIVER_UDP_MAC /**< receiever UDP MAC */ }; /** diff --git a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h index a28dddc3f..aa44dc176 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x413 +//#define SVNREV 0x416 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x413 -#define SVNDATE 0x20121217 +#define SVNREV 0x416 +#define SVNDATE 0x20121218 // diff --git a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h index 0eb636a31..8d5d11b6d 100644 --- a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h +++ b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define MYTHENSVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" +#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" //#define SVNREPPATH "" -#define MYTHENSVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x412 +#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" +//#define SVNREV 0x414 //#define SVNKIND "" //#define SVNSCHED "" -#define MYTHENSVNAUTH "l_maliakal_d" -#define MYTHENSVNREV 0x412 -#define MYTHENSVNDATE 0x20121217 +#define SVNAUTH "l_maliakal_d" +#define SVNREV 0x414 +#define SVNDATE 0x20121218 // diff --git a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h index 7822cb97c..58e48f497 100644 --- a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h +++ b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define MYTHENSVNURL "" +#define SVNURL "" //#define SVNREPPATH "" -#define MYTHENSVNREPUUID "" +#define SVNREPUUID "" //#define SVNREV "" //#define SVNKIND "" //#define SVNSCHED "" -#define MYTHENSVNAUTH "" -#define MYTHENSVNREV "" -#define MYTHENSVNDATE "" +#define SVNAUTH "" +#define SVNREV "" +#define SVNDATE "" // diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index a48899960..f2a959757 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -4461,6 +4461,8 @@ char* slsDetector::setNetworkParameter(networkParameter index, string value) { return setReceiver(value); case RECEIVER_UDP_IP: return setReceiverUDPIP(value); + case RECEIVER_UDP_MAC: + return setReceiverUDPMAC(value); case RECEIVER_UDP_PORT: sscanf(value.c_str(),"%d",&i); sprintf(answer,"%d",setReceiverUDPPort(i)); @@ -4488,6 +4490,9 @@ char* slsDetector::getNetworkParameter(networkParameter index) { case RECEIVER_UDP_IP: return getReceiverUDPIP(); break; + case RECEIVER_UDP_MAC: + return getReceiverUDPMAC(); + break; case RECEIVER_UDP_PORT: return getReceiverUDPPort(); break; @@ -4571,6 +4576,21 @@ char* slsDetector::setReceiverUDPIP(string udpip){ +char* slsDetector::setReceiverUDPMAC(string udpmac){ + if(udpmac.length()==17){ + if((udpmac[2]==':')&&(udpmac[5]==':')&&(udpmac[8]==':')&& + (udpmac[11]==':')&&(udpmac[14]==':')) + strcpy(thisDetector->receiverUDPMAC,udpmac.c_str()); + else + return("receiver udp mac address should be in xx:xx:xx:xx:xx:xx format"); + } + else + return("receiver udp mac address should be in xx:xx:xx:xx:xx:xx format"); + + return thisDetector->receiverUDPMAC; +} + + int slsDetector::setReceiverUDPPort(int udpport){ thisDetector->receiverUDPPort = udpport; diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index c9d160f2e..ed727a842 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -1633,6 +1633,8 @@ class slsDetector : public slsDetectorUtils, public energyConversion { char* getReceiver() {return thisDetector->receiver_hostname;}; /** returns the receiver UDP IP address \sa sharedSlsDetector */ char* getReceiverUDPIP() {return thisDetector->receiverUDPIP;}; + /** returns the receiver UDP MAC address \sa sharedSlsDetector */ + char* getReceiverUDPMAC() {return thisDetector->receiverUDPMAC;}; /** returns the receiver UDP IP address \sa sharedSlsDetector */ char* getReceiverUDPPort() {char *c= new char[MAX_STR_LENGTH];sprintf(c,"%d",thisDetector->receiverUDPPort); return c;}; @@ -1644,6 +1646,8 @@ class slsDetector : public slsDetectorUtils, public energyConversion { char* setReceiver(string receiver); /** validates the format of receiver udp ip and sets it \sa sharedSlsDetector */ char* setReceiverUDPIP(string udpip); + /** validates the format of receiver udp mac and sets it \sa sharedSlsDetector */ + char* setReceiverUDPMAC(string udpmac); /** sets the receiver udp port \sa sharedSlsDetector */ int setReceiverUDPPort(int udpport); diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index f0cdff57e..ce46ca079 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -329,6 +329,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter; i++; + descrToFuncMap[i].m_pFuncName="rx_udpmac"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter; + i++; + descrToFuncMap[i].m_pFuncName="rx_udpport"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter; i++; @@ -2236,6 +2240,8 @@ string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int actio t=RECEIVER_HOSTNAME; } else if (cmd=="rx_udpip") { t=RECEIVER_UDP_IP; + } else if (cmd=="rx_udpmac") { + t=RECEIVER_UDP_MAC; } else if (cmd=="rx_udpport") { t=RECEIVER_UDP_PORT; if (!(sscanf(args[1],"%d",&i))) @@ -2259,13 +2265,14 @@ string slsDetectorCommand::helpNetworkParameter(int narg, char *args[], int acti os << "detectorip ip \n sets detector ip to ip"<< std::endl; os << "rx_hostname name \n sets receiver ip/hostname to name"<< std::endl; os << "rx_udpip ip \n sets receiver udp ip to ip"<< std::endl; + os << "rx_udpmac mac \n sets receiver udp mac to mac"<< std::endl; os << "rx_udpport port \n sets receiver udp port to port"<< std::endl; } if (action==GET_ACTION || action==HELP_ACTION) { os << "detectormac \n gets detector mac "<< std::endl; os << "detectorip \n gets detector ip "<< std::endl; os << "rx_hostname \n gets receiver ip "<< std::endl; - os << "rx_udpip \n gets receiver udp ip "<< std::endl; + os << "rx_udpmac \n gets receiver udp mac "<< std::endl; os << "rx_udpport \n gets receiver udp port "<< std::endl; } return os.str(); diff --git a/slsDetectorSoftware/slsDetector/svnInfoLib.h b/slsDetectorSoftware/slsDetector/svnInfoLib.h index 612cda5a6..e3884089f 100644 --- a/slsDetectorSoftware/slsDetector/svnInfoLib.h +++ b/slsDetectorSoftware/slsDetector/svnInfoLib.h @@ -2,10 +2,10 @@ #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" //#define SVNREPPATH "" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x413 +//#define SVNREV 0x416 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "l_maliakal_d" -#define SVNREVLIB 0x413 -#define SVNDATELIB 0x20121217 +#define SVNREVLIB 0x416 +#define SVNDATELIB 0x20121218 // diff --git a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h index 832678961..477866e53 100644 --- a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h +++ b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x409 +//#define SVNREV 0x415 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x409 -#define SVNDATE 0x20121217 +#define SVNREV 0x415 +#define SVNDATE 0x20121218 //