UDPExchange: add UDPSender and UDPReceiver

extensions/UDPExchange/Makefile.am

-bin_PROGRAMS 			= @PACKAGE@-udpexchange
+bin_PROGRAMS 			= @PACKAGE@-udpexchange @PACKAGE@-udpsender @PACKAGE@-udpreceiver
 
 lib_LTLIBRARIES 			= libUniSetUDP.la
 libUniSetUDP_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
@@ -6,7 +6,9 @@ libUniSetUDP_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
 								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
 								$(SIGC_LIBS) $(COMCPP_LIBS)
 libUniSetUDP_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
-libUniSetUDP_la_SOURCES 	= UDPPacket.cc UDPExchange.cc
+libUniSetUDP_la_SOURCES 	= UDPPacket.cc UDPExchange.cc UDPSender.cc UDPReceiver.cc
+
+#UDPSender.cc
 
 @PACKAGE@_udpexchange_SOURCES 	= udpexchange.cc
 @PACKAGE@_udpexchange_LDADD 	= libUniSetUDP.la $(top_builddir)/lib/libUniSet.la \
@@ -15,6 +17,20 @@ libUniSetUDP_la_SOURCES 	= UDPPacket.cc UDPExchange.cc
 									$(SIGC_LIBS) $(COMCPP_LIBS)
 @PACKAGE@_udpexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
 
+@PACKAGE@_udpsender_SOURCES 	= udpsender.cc
+@PACKAGE@_udpsender_LDADD 		= libUniSetUDP.la $(top_builddir)/lib/libUniSet.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(SIGC_LIBS) $(COMCPP_LIBS)
+@PACKAGE@_udpsender_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+
+@PACKAGE@_udpreceiver_SOURCES 		= udpreceiver.cc
+@PACKAGE@_udpreceiver_LDADD 		= libUniSetUDP.la $(top_builddir)/lib/libUniSet.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(SIGC_LIBS) $(COMCPP_LIBS)
+@PACKAGE@_udpreceiver_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+
 
 # install
 devel_include_HEADERS = *.h

extensions/UDPExchange/UDPReceiver.h

+// $Id: UDPExchange.h,v 1.1 2009/02/10 20:38:27 vpashka Exp $
+// -----------------------------------------------------------------------------
+#ifndef UDPExchange_H_
+#define UDPReceiver_H_
+// -----------------------------------------------------------------------------
+#include <ostream>
+#include <string>
+#include <vector>
+#include <cc++/socket.h>
+#include "UniSetObject_LT.h"
+#include "Trigger.h"
+#include "Mutex.h"
+#include "SMInterface.h"
+#include "SharedMemory.h"
+#include "ThreadCreator.h"
+#include "UDPPacket.h"
+// -----------------------------------------------------------------------------
+class UDPReceiver:
+	public UniSetObject_LT
+{
+	public:
+		UDPReceiver( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmID, SharedMemory* ic=0 );
+		virtual ~UDPReceiver();
+	
+		/*! глобальная функция для инициализации объекта */
+		static UDPReceiver* init_udpreceiver( int argc, char* argv[], 
+											UniSetTypes::ObjectId shmID, SharedMemory* ic=0 );
+
+		/*! глобальная функция для вывода help-а */
+		static void help_print( int argc, char* argv[] );
+
+		struct UItem
+		{
+			UItem():
+				val(0)
+			{}
+
+			IOController_i::SensorInfo si;
+			IOController::AIOStateList::iterator ait;
+			IOController::DIOStateList::iterator dit;
+			UniSetTypes::uniset_spin_mutex val_lock;
+			UniSetUDP::UDPMessage::UDPDataList::iterator pack_it;
+			long val;
+
+			friend std::ostream& operator<<( std::ostream& os, UItem& p );
+		};
+
+	protected:
+
+		xmlNode* cnode;
+		std::string s_field;
+		std::string s_fvalue;
+
+		SMInterface* shm;
+
+		void poll();
+		void recv();
+		void step();
+
+		virtual void processingMessage( UniSetTypes::VoidMessage *msg );
+		void sysCommand( UniSetTypes::SystemMessage *msg );
+		void sensorInfo( UniSetTypes::SensorMessage*sm );
+		void askSensors( UniversalIO::UIOCommand cmd );
+		void waitSMReady();
+
+		virtual bool activateObject();
+		
+		// действия при завершении работы
+		virtual void sigterm( int signo );
+
+		void initIterators();
+
+	private:
+		UDPReceiver();
+		bool initPause;
+		UniSetTypes::uniset_mutex mutex_start;
+
+		PassiveTimer ptHeartBeat;
+		UniSetTypes::ObjectId sidHeartBeat;
+		int maxHeartBeat;
+		IOController::AIOStateList::iterator aitHeartBeat;
+		UniSetTypes::ObjectId test_id;
+
+		int polltime;	/*!< переодичность обновления данных, [мсек] */
+
+		ost::UDPDuplex* udp;
+		ost::IPV4Host host;
+		ost::tpport_t port;
+
+		UniSetTypes::uniset_mutex pollMutex;
+		Trigger trTimeout;
+		int recvTimeout;
+		int sendTimeout;
+		
+		bool activated;
+		int activateTimeout;
+		
+		ThreadCreator<UDPReceiver>* thr;
+};
+// -----------------------------------------------------------------------------
+#endif // UDPReceiver_H_
+// -----------------------------------------------------------------------------

extensions/UDPExchange/UDPSender.h

+#ifndef UDPSender_H_
+#define UDPSender_H_
+// -----------------------------------------------------------------------------
+#include <ostream>
+#include <string>
+#include <vector>
+#include <cc++/socket.h>
+#include "UniSetObject_LT.h"
+#include "Trigger.h"
+#include "Mutex.h"
+#include "SMInterface.h"
+#include "SharedMemory.h"
+#include "ThreadCreator.h"
+#include "UDPPacket.h"
+// -----------------------------------------------------------------------------
+class UDPSender:
+	public UniSetObject_LT
+{
+	public:
+		UDPSender( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmID, SharedMemory* ic=0 );
+		virtual ~UDPSender();
+	
+		/*! глобальная функция для инициализации объекта */
+		static UDPSender* init_udpsender( int argc, char* argv[], 
+											UniSetTypes::ObjectId shmID, SharedMemory* ic=0 );
+
+		/*! глобальная функция для вывода help-а */
+		static void help_print( int argc, char* argv[] );
+
+		struct UItem
+		{
+			UItem():
+				val(0)
+			{}
+
+			IOController_i::SensorInfo si;
+			IOController::AIOStateList::iterator ait;
+			IOController::DIOStateList::iterator dit;
+			UniSetTypes::uniset_spin_mutex val_lock;
+			UniSetUDP::UDPMessage::UDPDataList::iterator pack_it;
+			long val;
+
+			friend std::ostream& operator<<( std::ostream& os, UItem& p );
+		};
+
+	protected:
+
+		xmlNode* cnode;
+		std::string s_field;
+		std::string s_fvalue;
+
+		SMInterface* shm;
+
+		void poll();
+		void recv();
+		void send();
+
+		void step();
+
+		virtual void processingMessage( UniSetTypes::VoidMessage *msg );
+		void sysCommand( UniSetTypes::SystemMessage *msg );
+		void sensorInfo( UniSetTypes::SensorMessage*sm );
+		void askSensors( UniversalIO::UIOCommand cmd );
+		void waitSMReady();
+
+		virtual bool activateObject();
+		
+		// действия при завершении работы
+		virtual void sigterm( int signo );
+
+		void initIterators();
+		bool initItem( UniXML_iterator& it );
+		bool readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec );
+
+		void readConfiguration();
+		bool check_item( UniXML_iterator& it );
+
+	private:
+		UDPSender();
+		bool initPause;
+		UniSetTypes::uniset_mutex mutex_start;
+
+		PassiveTimer ptHeartBeat;
+		UniSetTypes::ObjectId sidHeartBeat;
+		int maxHeartBeat;
+		IOController::AIOStateList::iterator aitHeartBeat;
+		UniSetTypes::ObjectId test_id;
+
+		int sendtime;	/*!< переодичность посылки данных, [мсек] */
+
+		ost::UDPSocket* udp;
+		ost::IPV4Host host;
+		ost::tpport_t port;
+
+		UniSetTypes::uniset_mutex sendMutex;
+		Trigger trTimeout;
+		int sendTimeout;
+		
+		bool activated;
+		int activateTimeout;
+		
+		UniSetUDP::UDPMessage mypack;
+		typedef std::vector<UItem> DMap;
+		DMap dlist;
+		int maxItem;
+		
+		
+		ThreadCreator<UDPSender>* thr;
+};
+// -----------------------------------------------------------------------------
+#endif // UDPSender_H_
+// -----------------------------------------------------------------------------

extensions/UDPExchange/start_fg.sh

 #!/bin/sh
 
-uniset-start.sh -f ./uniset-udpexchange --udp-name UDPExchange --udp-host localhost --udp-port 2049 \
+uniset-start.sh -f ./uniset-udpexchange --udp-name UDPExchange --udp-host 192.168.56.255 --udp-port 2050 --udp-broadcast 1 \
 	--confile test.xml \
 	--udp-filter-field udp --udp-filter-value 1 \
-	--udp-ip \
 	--dlog-add-levels info,crit,warn
 

extensions/UDPExchange/start_fg_receiver.sh

+#!/bin/sh
+
+uniset-start.sh -f ./uniset-udpreceiver --udp-name UDPExchange \
+	--udp-host 192.168.56.255 --udp-port 2050 \
+	--confile test.xml \
+	--udp-filter-field udp --udp-filter-value 1 \
+	--dlog-add-levels info,crit,warn
+

extensions/UDPExchange/start_fg_sender.sh

+#!/bin/sh
+
+uniset-start.sh -f ./uniset-udpsender --udp-name UDPExchange \
+	--udp-host 192.168.56.255 --udp-port 2050 --udp-broadcast 1\
+	--udp-sendtime 100 \
+	--confile test.xml \
+	--dlog-add-levels info,crit,warn
+#	--udp-filter-field udp --udp-filter-value 1 \

extensions/UDPExchange/udpexchange.cc

@@ -11,6 +11,46 @@ using namespace UniSetExtensions;
 // -----------------------------------------------------------------------------
 int main( int argc, char** argv )
 {
+	ost::IPV4Host host = "192.168.56.10";
+	ost::tpport_t port = 2050;
+	try
+	{
+		ost::UDPSocket* udp = new ost::UDPSocket();
+		udp->setPeer(host,port);
+//		udp->UDPTransmit::setBroadcast(false);
+//		udp->UDPTransmit::setRouting(false);
+		UniSetUDP::UDPHeader h;
+		h.nodeID = 20;
+		h.procID = 20;
+		h.dcount = 0;
+		
+//		udp->connect(host,port);
+		
+		
+//		ost::IPV4Host h1 = udp->getPeer();
+//		cout << "peer: " << h1 << endl;
+		
+		//if( udp->isOutputReady(5000) )
+		while(1)
+		{
+		  ssize_t ret = udp->send((char*)(&h),sizeof(h));
+		  if( ret<(ssize_t)sizeof(h) )
+		  {
+			  cerr << "(send data header): ret=" << ret << " sizeof=" << sizeof(h) << endl;
+//			  return 0;
+		  }
+		  else
+			  cout << "SEND OK..." << endl;
+		  
+		  msleep(1000);
+		}
+	}
+	catch( ost::SockException& e )
+	{
+		cerr  << e.getString() << ": " << e.getSystemErrorString() << endl;
+		return 0;
+	}  
+  
 	try
 	{
 		if( argc>1 && (!strcmp(argv[1],"--help") || !strcmp(argv[1],"-h")) )

extensions/UDPExchange/udpreceiver.cc

+// $Id: udpexchange.cc,v 1.1 2009/02/10 20:38:27 vpashka Exp $
+// -----------------------------------------------------------------------------
+#include <sstream>
+#include "ObjectsActivator.h"
+#include "Extensions.h"
+#include "UDPReceiver.h"
+// -----------------------------------------------------------------------------
+using namespace std;
+using namespace UniSetTypes;
+using namespace UniSetExtensions;
+// -----------------------------------------------------------------------------
+int main( int argc, char** argv )
+{
+	try
+	{
+		if( argc>1 && (!strcmp(argv[1],"--help") || !strcmp(argv[1],"-h")) )
+		{
+			cout << "--smemory-id objectName  - SharedMemory objectID. Default: read from <SharedMemory>" << endl;
+			cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
+			cout << "--udp-logfile filename    - logfilename. Default: udpexchange.log" << endl;
+			cout << endl;
+			UDPReceiver::help_print(argc,argv);
+			return 0;
+		}
+
+		string confile=UniSetTypes::getArgParam("--confile",argc,argv,"configure.xml");
+		conf = new Configuration( argc, argv, confile );
+
+		string logfilename(conf->getArgParam("--udp-logfile"));
+		if( logfilename.empty() )
+			logfilename = "udpexchange.log";
+	
+		conf->initDebug(dlog,"dlog");
+	
+		std::ostringstream logname;
+		string dir(conf->getLogDir());
+		logname << dir << logfilename;
+		unideb.logFile( logname.str() );
+		dlog.logFile( logname.str() );
+
+		ObjectId shmID = DefaultObjectId;
+		string sID = conf->getArgParam("--smemory-id");
+		if( !sID.empty() )
+			shmID = conf->getControllerID(sID);
+		else
+			shmID = getSharedMemoryID();
+
+		if( shmID == DefaultObjectId )
+		{
+			cerr << sID << "? SharedMemoryID not found in " << conf->getControllersSection() << " section" << endl;
+			return 1;
+		}
+
+		UDPReceiver* udp = UDPReceiver::init_udpreceiver(argc,argv,shmID);
+		if( !udp )
+		{
+			dlog[Debug::CRIT] << "(udpreceiver): init не прошёл..." << endl;
+			return 1;
+		}
+
+		ObjectsActivator act;
+		act.addObject(static_cast<class UniSetObject*>(udp));
+
+		SystemMessage sm(SystemMessage::StartUp); 
+		act.broadcast( sm.transport_msg() );
+
+		unideb(Debug::ANY) << "\n\n\n";
+		unideb[Debug::ANY] << "(main): -------------- UDPRecevier START -------------------------\n\n";
+		dlog(Debug::ANY) << "\n\n\n";
+		dlog[Debug::ANY] << "(main): -------------- UDPReceiver START -------------------------\n\n";
+
+		act.run(false);
+//		msleep(500);
+//		rs->execute();
+	}
+	catch( Exception& ex )
+	{
+		dlog[Debug::CRIT] << "(udpexchange): " << ex << std::endl;
+	}
+	catch( ost::SockException& e )
+	{
+		ostringstream s;
+		s << e.getString() << ": " << e.getSystemErrorString();
+		dlog[Debug::CRIT] << s.str() << endl;
+	}
+	catch(...)
+	{
+		dlog[Debug::CRIT] << "(udpexchange): catch ..." << std::endl;
+	}
+
+	return 0;
+}

extensions/UDPExchange/udpsender.cc

+#include <sstream>
+#include "ObjectsActivator.h"
+#include "Extensions.h"
+#include "UDPSender.h"
+// -----------------------------------------------------------------------------
+using namespace std;
+using namespace UniSetTypes;
+using namespace UniSetExtensions;
+// -----------------------------------------------------------------------------
+int main( int argc, char** argv )
+{
+	try
+	{
+		if( argc>1 && (!strcmp(argv[1],"--help") || !strcmp(argv[1],"-h")) )
+		{
+			cout << "--smemory-id objectName  - SharedMemory objectID. Default: read from <SharedMemory>" << endl;
+			cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
+			cout << "--udp-logfile filename    - logfilename. Default: udpexchange.log" << endl;
+			cout << endl;
+			UDPSender::help_print(argc,argv);
+			return 0;
+		}
+
+		string confile=UniSetTypes::getArgParam("--confile",argc,argv,"configure.xml");
+		conf = new Configuration( argc, argv, confile );
+
+		string logfilename(conf->getArgParam("--udp-logfile"));
+		if( logfilename.empty() )
+			logfilename = "udpexchange.log";
+	
+		conf->initDebug(dlog,"dlog");
+	
+		std::ostringstream logname;
+		string dir(conf->getLogDir());
+		logname << dir << logfilename;
+		unideb.logFile( logname.str() );
+		dlog.logFile( logname.str() );
+
+		ObjectId shmID = DefaultObjectId;
+		string sID = conf->getArgParam("--smemory-id");
+		if( !sID.empty() )
+			shmID = conf->getControllerID(sID);
+		else
+			shmID = getSharedMemoryID();
+
+		if( shmID == DefaultObjectId )
+		{
+			cerr << sID << "? SharedMemoryID not found in " << conf->getControllersSection() << " section" << endl;
+			return 1;
+		}
+
+		UDPSender* udp = UDPSender::init_udpsender(argc,argv,shmID);
+		if( !udp )
+		{
+			dlog[Debug::CRIT] << "(udpsender): init не прошёл..." << endl;
+			return 1;
+		}
+
+		ObjectsActivator act;
+		act.addObject(static_cast<class UniSetObject*>(udp));
+
+		SystemMessage sm(SystemMessage::StartUp); 
+		act.broadcast( sm.transport_msg() );
+
+		unideb(Debug::ANY) << "\n\n\n";
+		unideb[Debug::ANY] << "(main): -------------- UDPSender START -------------------------\n\n";
+		dlog(Debug::ANY) << "\n\n\n";
+		dlog[Debug::ANY] << "(main): -------------- UDPSender START -------------------------\n\n";
+
+		act.run(false);
+//		msleep(500);
+//		rs->execute();
+	}
+	catch( Exception& ex )
+	{
+		dlog[Debug::CRIT] << "(udpsender): " << ex << std::endl;
+	}
+	catch( ost::SockException& e )                                                                                                                                                  
+	{                                                                                                                                                                               
+        dlog[Debug::CRIT] << "(udpsender): " << e.getSystemErrorString() << endl;
+    }    	
+	catch(...)
+	{
+		dlog[Debug::CRIT] << "(udpsender): catch ..." << std::endl;
+	}
+
+	return 0;
+}