diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverBase.h b/slsReceiverSoftware/slsReceiver/slsReceiverBase.h index 97d21bec4..41408f7e7 100644 --- a/slsReceiverSoftware/slsReceiver/slsReceiverBase.h +++ b/slsReceiverSoftware/slsReceiver/slsReceiverBase.h @@ -232,6 +232,11 @@ public: */ virtual void setUDPPortNo(int p) = 0; + /** + * Set UDP Port Number + */ + virtual void setUDPPortNo2(int p) = 0; + /** * Set Ethernet Interface or IP to listen to */ diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp index 2ebfd3826..ef854bc59 100644 --- a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp @@ -613,10 +613,10 @@ int slsReceiverTCPIPInterface::setup_udp(){ ret=OK; strcpy(mess,"could not set up udp connection"); char retval[MAX_STR_LENGTH]=""; - char args[2][MAX_STR_LENGTH]; + char args[3][MAX_STR_LENGTH]; string temp; - int udpport; + int udpport,udpport2; char eth[MAX_STR_LENGTH]; @@ -641,8 +641,9 @@ int slsReceiverTCPIPInterface::setup_udp(){ else{ //set up udp port sscanf(args[1],"%d",&udpport); + sscanf(args[2],"%d",&udpport2); receiverBase->setUDPPortNo(udpport); - + receiverBase->setUDPPortNo2(udpport2); //setup udpip //get ethernet interface or IP to listen to temp = genericSocket::ipToName(args[0]); diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp index ac73e78c0..388272b6b 100644 --- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp +++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp @@ -443,9 +443,16 @@ void slsReceiverUDPFunctions::setEthernetInterface(char* c){ void slsReceiverUDPFunctions::setUDPPortNo(int p){ - for(int i=0;igetErrorStatus(); - if(iret){ + if(!iret) + cout << "UDP port opened at port " << server_port[i] << endl; + else{ #ifdef VERBOSE cout << "Could not create UDP socket on port " << server_port[i] << " error:" << iret << endl; #endif diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h index c955ee1c4..20c5d7633 100644 --- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h +++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h @@ -213,6 +213,11 @@ public: */ void setUDPPortNo(int p); + /** + * Set UDP Port Number2 + */ + void setUDPPortNo2(int p); + /* * Returns number of frames to receive * This is the number of frames to expect to receiver from the detector.