Bug fixed on params type (78962c1f) · Commits · CTI Tools / Titan Test System Framework

ccsrc/Protocols/UDP/udp_layer.hh

+9 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,11 @@

		#include "layer.hh"

		<<<<<<< HEAD
		=======
		#include "params.hh"

		>>>>>>> Bug fixed on params type
		using namespace std; // Required for isnan()
		#include "Abstract_Socket.hh"

		@@ -27,7 +32,11 @@ using namespace std; // Required for isnan()
		* \brief This class provides description of ITS UDP/IP protocol layer
		*/
		class udp_layer : public layer, public PORT {
		<<<<<<< HEAD
		params _params; //! Layer parameters
		=======
		params _params; //! Layer parameters
		>>>>>>> Bug fixed on params type
		struct sockaddr_in _saddr; //! Source socket address description
		struct sockaddr_in _daddr; //! Destination socket address description
		bool _reuse_incoming_source_adddress;