Skip to content
Snippets Groups Projects
Commit ef55cdab authored by g0dil's avatar g0dil
Browse files

Socket: Renamed all protocol classes and files to end in SocketProtocol

parent 08ef4c49
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 141 additions and 141 deletions
Socket/ClientSocketHandle.test.cc
+ 4
− 4
View file @ ef55cdab
......@@ -40,13 +40,13 @@
namespace {
class MySocketHandle
: public senf::ClientSocketHandle<senf::test::SomeProtocol::Policy>
: public senf::ClientSocketHandle<senf::test::SomeSocketProtocol::Policy>
{
public:
MySocketHandle()
: senf::ClientSocketHandle<senf::test::SomeProtocol::Policy>(
: senf::ClientSocketHandle<senf::test::SomeSocketProtocol::Policy>(
std::auto_ptr<senf::SocketBody>(
new senf::ProtocolSocketBody<senf::test::SomeProtocol>(false)))
new senf::ProtocolSocketBody<senf::test::SomeSocketProtocol>(false)))
{}
};
......@@ -70,7 +70,7 @@ BOOST_AUTO_UNIT_TEST(clientSocketHandle)
OtherSocketHandle osh (myh);
BOOST_CHECKPOINT("Assigning socket handle");
osh = myh;
typedef senf::ClientSocketHandle<senf::test::SomeProtocol::Policy> SomeSocketHandle;
typedef senf::ClientSocketHandle<senf::test::SomeSocketProtocol::Policy> SomeSocketHandle;
BOOST_CHECKPOINT("static_casting socket handle");
SomeSocketHandle ssh =
senf::static_socket_cast<SomeSocketHandle>(osh);
......
Socket/Mainpage.dox
+ 3
− 3
View file @ ef55cdab
......@@ -150,7 +150,7 @@ namespace senf {
ProtocolClientSocketHandle or ProtocolServerSocketHandle. You will probably not use these
templates as is but use proper typedefs (for example TCPv4ClientSocketHandle or
PacketSocketHandle). The documentation for these socket handles are found in the protocol class
(for example TCPv4SocketProtocol or PacketProtocol).
(for example TCPv4SocketProtocol or PacketSocketProtocol).
\section usage_reusable Writing Reusable Components
......@@ -210,8 +210,8 @@ namespace senf {
After the protocol class has been defined, you will probably want to provide typedefs for the
new protocol sockets. If the new protocol is connection oriented, this will be like
\code
typedef ProtocolClientSocketHandle<MyProtocolClass> MyProtocolClientSocketHandle;
typedef ProtocolServerSocketHandle<MyProtocolClass> MyProtocolServerSocketHandle;
typedef ProtocolClientSocketHandle<MySocketProtocolClass> MySocketProtocolClientSocketHandle;
typedef ProtocolServerSocketHandle<MySocketProtocolClass> MySocketProtocolServerSocketHandle;
\endcode
\section extend_policy Extending the policy framework
......
Socket/ProtocolClientSocketHandle.test.cc
+ 3
− 3
View file @ ef55cdab
......@@ -36,16 +36,16 @@
///////////////////////////////cc.p////////////////////////////////////////
namespace {
struct MyProtocol : public senf::test::SomeProtocol
struct MySocketProtocol : public senf::test::SomeSocketProtocol
{
using senf::test::SomeProtocol::init_client;
using senf::test::SomeSocketProtocol::init_client;
void init_client(char const *,unsigned) const {}
};
}
BOOST_AUTO_UNIT_TEST(protocolClientSocketHandle)
{
typedef senf::ProtocolClientSocketHandle<MyProtocol> MySocketHandle;
typedef senf::ProtocolClientSocketHandle<MySocketProtocol> MySocketHandle;
{
typedef senf::MakeSocketPolicy<
......
Socket/ProtocolServerSocketHandle.test.cc
+ 5
− 5
View file @ ef55cdab
......@@ -37,16 +37,16 @@
namespace {
struct MyProtocol : public senf::test::SomeProtocol
struct MySocketProtocol : public senf::test::SomeSocketProtocol
{
using senf::test::SomeProtocol::init_server;
using senf::test::SomeSocketProtocol::init_server;
void init_server(char const *,unsigned) const {}
};
}
BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
{
typedef senf::ProtocolServerSocketHandle<MyProtocol> MySocketHandle;
typedef senf::ProtocolServerSocketHandle<MySocketProtocol> MySocketHandle;
{
typedef senf::MakeSocketPolicy<
......@@ -68,8 +68,8 @@ BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
BOOST_CHECK_EQUAL( h.dumpState(),
"file.handle: -1\n"
"file.refcount: 2\n"
"handle: senf::ProtocolServerSocketHandle<(anonymous namespace)::MyProtocol>\n"
"socket.protocol: (anonymous namespace)::MyProtocol\n"
"handle: senf::ProtocolServerSocketHandle<(anonymous namespace)::MySocketProtocol>\n"
"socket.protocol: (anonymous namespace)::MySocketProtocol\n"
"socket.protocol.policy: senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy>\n"
"socket.server: true\n" );
......
Socket/Protocols/DVB/DVBDemuxHandles.cc
+ 8
− 8
View file @ ef55cdab
......@@ -40,7 +40,7 @@
///////////////////////////////////////////////////////////////////////////
// senf::DVBDemuxHandles
prefix_ void senf::DVBDemuxSectionProtocol::init_client(unsigned short adapter, unsigned short device)
prefix_ void senf::DVBDemuxSectionSocketProtocol::init_client(unsigned short adapter, unsigned short device)
const
{
std::string devDemux = str( boost::format(
......@@ -51,13 +51,13 @@ prefix_ void senf::DVBDemuxSectionProtocol::init_client(unsigned short adapter,
fd(f);
}
prefix_ unsigned senf::DVBDemuxSectionProtocol::available()
prefix_ unsigned senf::DVBDemuxSectionSocketProtocol::available()
const
{
return 4096;
}
prefix_ void senf::DVBDemuxSectionProtocol::setSectionFilter(struct dmx_sct_filter_params *filter)
prefix_ void senf::DVBDemuxSectionSocketProtocol::setSectionFilter(struct dmx_sct_filter_params *filter)
const
{
if (::ioctl(fd(), DMX_SET_FILTER, filter) < 0)
......@@ -66,7 +66,7 @@ prefix_ void senf::DVBDemuxSectionProtocol::setSectionFilter(struct dmx_sct_filt
// ----------------------------------------------------------------
prefix_ void senf::DVBDemuxPESProtocol::init_client(unsigned short adapter, unsigned short device)
prefix_ void senf::DVBDemuxPESSocketProtocol::init_client(unsigned short adapter, unsigned short device)
const
{
std::string devDemux = str( boost::format(
......@@ -77,13 +77,13 @@ prefix_ void senf::DVBDemuxPESProtocol::init_client(unsigned short adapter, unsi
fd(f);
}
prefix_ unsigned senf::DVBDemuxPESProtocol::available()
prefix_ unsigned senf::DVBDemuxPESSocketProtocol::available()
const
{
return 4096; //???
}
prefix_ void senf::DVBDemuxPESProtocol::setPESFilter(struct dmx_pes_filter_params *filter)
prefix_ void senf::DVBDemuxPESSocketProtocol::setPESFilter(struct dmx_pes_filter_params *filter)
const
{
if (::ioctl(fd(), DMX_SET_PES_FILTER, filter) < 0)
......@@ -92,7 +92,7 @@ prefix_ void senf::DVBDemuxPESProtocol::setPESFilter(struct dmx_pes_filter_param
// ----------------------------------------------------------------
prefix_ void senf::DVBDvrProtocol::init_client(unsigned short adapter, unsigned short device)
prefix_ void senf::DVBDvrSocketProtocol::init_client(unsigned short adapter, unsigned short device)
const
{
std::string devDvr = str( boost::format(
......@@ -103,7 +103,7 @@ prefix_ void senf::DVBDvrProtocol::init_client(unsigned short adapter, unsigned
fd(f);
}
prefix_ unsigned senf::DVBDvrProtocol::available()
prefix_ unsigned senf::DVBDvrSocketProtocol::available()
const
{
return 188;
......
Socket/Protocols/DVB/DVBDemuxHandles.hh
+ 13
− 13
View file @ ef55cdab
......@@ -31,7 +31,7 @@
#include "../../../Socket/CommunicationPolicy.hh"
#include "../../../Socket/ReadWritePolicy.hh"
#include "../../../Socket/ProtocolClientSocketHandle.hh"
#include "DVBDemuxProtocol.hh"
#include "DVBDemuxSocketProtocol.hh"
//#include "DVBDemuxHandles.mpp"
///////////////////////////////hh.p////////////////////////////////////////
......@@ -51,9 +51,9 @@ namespace senf {
/** \brief xxx
*/
class DVBDemuxSectionProtocol
: public ConcreteSocketProtocol<DVBDemux_Policy, DVBDemuxSectionProtocol>,
public DVBDemuxProtocol
class DVBDemuxSectionSocketProtocol
: public ConcreteSocketProtocol<DVBDemux_Policy, DVBDemuxSectionSocketProtocol>,
public DVBDemuxSocketProtocol
{
public:
///////////////////////////////////////////////////////////////////////////
......@@ -78,15 +78,15 @@ namespace senf {
void setSectionFilter(struct dmx_sct_filter_params *filter) const;
};
typedef ProtocolClientSocketHandle<DVBDemuxSectionProtocol> DVBDemuxSectionHandle;
typedef ProtocolClientSocketHandle<DVBDemuxSectionSocketProtocol> DVBDemuxSectionHandle;
// ----------------------------------------------------------------
/** \brief xxx
*/
class DVBDemuxPESProtocol
: public ConcreteSocketProtocol<DVBDemux_Policy,DVBDemuxPESProtocol>,
public DVBDemuxProtocol
class DVBDemuxPESSocketProtocol
: public ConcreteSocketProtocol<DVBDemux_Policy,DVBDemuxPESSocketProtocol>,
public DVBDemuxSocketProtocol
{
public:
///////////////////////////////////////////////////////////////////////////
......@@ -111,7 +111,7 @@ namespace senf {
void setPESFilter(struct dmx_pes_filter_params *filter) const;
};
typedef ProtocolClientSocketHandle<DVBDemuxPESProtocol> DVBDemuxPESHandle;
typedef ProtocolClientSocketHandle<DVBDemuxPESSocketProtocol> DVBDemuxPESHandle;
// ----------------------------------------------------------------
......@@ -119,9 +119,9 @@ namespace senf {
/** \brief xxx
*/
class DVBDvrProtocol
: public ConcreteSocketProtocol<DVBDemux_Policy, DVBDvrProtocol>,
public DVBDemuxProtocol
class DVBDvrSocketProtocol
: public ConcreteSocketProtocol<DVBDemux_Policy, DVBDvrSocketProtocol>,
public DVBDemuxSocketProtocol
{
public:
///////////////////////////////////////////////////////////////////////////
......@@ -144,7 +144,7 @@ namespace senf {
///@}
};
typedef ProtocolClientSocketHandle<DVBDvrProtocol> DVBDvrHandle;
typedef ProtocolClientSocketHandle<DVBDvrSocketProtocol> DVBDvrHandle;
///@}
......
Socket/Protocols/DVB/DVBDemuxProtocol.cc → Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc
+ 9
− 9
View file @ ef55cdab
......@@ -21,10 +21,10 @@
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/** \file
\brief DVBDemuxProtocol non-inline non-template implementation */
\brief DVBDemuxSocketProtocol non-inline non-template implementation */
#include "DVBDemuxProtocol.hh"
//#include "DVBDemuxProtocol.ih"
#include "DVBDemuxSocketProtocol.hh"
//#include "DVBDemuxSocketProtocol.ih"
// Custom includes
#include <sys/socket.h>
......@@ -34,32 +34,32 @@
#include <linux/sockios.h>
#include "../../../Socket/SocketHandle.hh"
//#include "DVBDemuxProtocol.mpp"
//#include "DVBDemuxSocketProtocol.mpp"
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
prefix_ void senf::DVBDemuxProtocol::setBufferSize(unsigned long size)
prefix_ void senf::DVBDemuxSocketProtocol::setBufferSize(unsigned long size)
const
{
if (::ioctl(fd(), DMX_SET_BUFFER_SIZE, size) < 0)
throw SystemException();
}
prefix_ void senf::DVBDemuxProtocol::startFiltering()
prefix_ void senf::DVBDemuxSocketProtocol::startFiltering()
const
{
if (::ioctl(fd(), DMX_START) < 0)
throw SystemException();
}
prefix_ void senf::DVBDemuxProtocol::stopFiltering()
prefix_ void senf::DVBDemuxSocketProtocol::stopFiltering()
const
{
if (::ioctl(fd(), DMX_STOP) < 0)
throw SystemException();
}
prefix_ bool senf::DVBDemuxProtocol::eof()
prefix_ bool senf::DVBDemuxSocketProtocol::eof()
const
{
return false;
......@@ -67,7 +67,7 @@ prefix_ bool senf::DVBDemuxProtocol::eof()
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "DVBDemuxProtocol.mpp"
//#include "DVBDemuxSocketProtocol.mpp"
// Local Variables:
......
Socket/Protocols/DVB/DVBDemuxProtocol.hh → Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh
+ 8
− 8
View file @ ef55cdab
......@@ -21,17 +21,17 @@
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/** \file
\brief DVBDemuxProtocol public header */
\brief DVBDemuxSocketProtocol public header */
#ifndef HH_DVBDemuxProtocol_
#define HH_DVBDemuxProtocol_ 1
#ifndef HH_DVBDemuxSocketProtocol_
#define HH_DVBDemuxSocketProtocol_ 1
#include <linux/dvb/dmx.h>
// Custom includes
#include "../../../Socket/SocketProtocol.hh"
//#include "DVBProtocol.mpp"
//#include "DVBSocketProtocol.mpp"
///////////////////////////////hh.p////////////////////////////////////////
namespace senf {
......@@ -41,7 +41,7 @@ namespace senf {
/** xxx
*/
class DVBDemuxProtocol
class DVBDemuxSocketProtocol
: public virtual SocketProtocol
{
public:
......@@ -62,9 +62,9 @@ namespace senf {
}
///////////////////////////////hh.e////////////////////////////////////////
//#include "DVBDemuxProtocol.cci"
//#include "DVBDemuxProtocol.ct"
//#include "DVBDemuxProtocol.cti"
//#include "DVBDemuxSocketProtocol.cci"
//#include "DVBDemuxSocketProtocol.ct"
//#include "DVBDemuxSocketProtocol.cti"
#endif
......
Socket/Protocols/DVB/DVBFrontendHandle.cc
+ 4
− 4
View file @ ef55cdab
......@@ -40,7 +40,7 @@
///////////////////////////////////////////////////////////////////////////
// senf::DVBFrontendHandle
prefix_ void senf::DVBFrontendProtocol::init_client(uint8_t adapter, boost::uint8_t device)
prefix_ void senf::DVBFrontendSocketProtocol::init_client(uint8_t adapter, boost::uint8_t device)
const
{
std::string devFrontend = str( boost::format(
......@@ -51,19 +51,19 @@ prefix_ void senf::DVBFrontendProtocol::init_client(uint8_t adapter, boost::uint
fd(f);
}
prefix_ unsigned senf::DVBFrontendProtocol::available()
prefix_ unsigned senf::DVBFrontendSocketProtocol::available()
const
{
return 0;
}
prefix_ bool senf::DVBFrontendProtocol::eof()
prefix_ bool senf::DVBFrontendSocketProtocol::eof()
const
{
return false;
}
prefix_ void senf::DVBFrontendProtocol::signalStrength(int16_t *strength)
prefix_ void senf::DVBFrontendSocketProtocol::signalStrength(int16_t *strength)
const
{
if (::ioctl(fd(), FE_READ_SIGNAL_STRENGTH, strength) < 0)
......
Socket/Protocols/DVB/DVBFrontendHandle.hh
+ 3
− 3
View file @ ef55cdab
......@@ -53,8 +53,8 @@ namespace senf {
/** \brief xxx
*/
class DVBFrontendProtocol
: public ConcreteSocketProtocol<DVBFrontend_Policy, DVBFrontendProtocol>
class DVBFrontendSocketProtocol
: public ConcreteSocketProtocol<DVBFrontend_Policy, DVBFrontendSocketProtocol>
{
public:
///////////////////////////////////////////////////////////////////////////
......@@ -80,7 +80,7 @@ namespace senf {
void signalStrength(int16_t *strength) const;
};
typedef ProtocolClientSocketHandle<DVBFrontendProtocol> DVBFrontendHandle;
typedef ProtocolClientSocketHandle<DVBFrontendSocketProtocol> DVBFrontendHandle;
///@}
}
......
Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
+ 4
− 4
View file @ ef55cdab
......@@ -24,8 +24,8 @@
#define CONNECTEDRAWINETSOCKETHANDLE_HH_
// Custom includes
#include "INetProtocol.hh"
#include "RawINetProtocol.hh"
#include "INetSocketProtocol.hh"
#include "RawINetSocketProtocol.hh"
#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
#include "../../../Socket/FramingPolicy.hh"
#include "../../../Socket/CommunicationPolicy.hh"
......@@ -75,7 +75,7 @@ namespace senf {
*/
class ConnectedRawV4SocketProtocol
: public ConcreteSocketProtocol<ConnectedRawV4Socket_Policy, ConnectedRawV4SocketProtocol>,
public RawINetProtocol,
public RawINetSocketProtocol,
public BSDSocketProtocol,
public AddressableBSDSocketProtocol
{
......@@ -143,7 +143,7 @@ namespace senf {
*/
class ConnectedRawV6SocketProtocol
: public ConcreteSocketProtocol<ConnectedRawV6Socket_Policy, ConnectedRawV6SocketProtocol>,
public RawINetProtocol,
public RawINetSocketProtocol,
public BSDSocketProtocol,
public AddressableBSDSocketProtocol
{
......
Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
+ 4
− 4
View file @ ef55cdab
......@@ -31,8 +31,8 @@
#define HH_ConnectedUDPSocketHandle_ 1
// Custom includes
#include "INetProtocol.hh"
#include "UDPProtocol.hh"
#include "INetSocketProtocol.hh"
#include "UDPSocketProtocol.hh"
#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
#include "../../../Socket/FramingPolicy.hh"
#include "../../../Socket/CommunicationPolicy.hh"
......@@ -78,7 +78,7 @@ namespace senf {
*/
class ConnectedUDPv4SocketProtocol
: public ConcreteSocketProtocol<ConnectedUDPv4Socket_Policy, ConnectedUDPv4SocketProtocol>,
public UDPProtocol,
public UDPSocketProtocol,
public BSDSocketProtocol,
public AddressableBSDSocketProtocol
{
......@@ -137,7 +137,7 @@ namespace senf {
*/
class ConnectedUDPv6SocketProtocol
: public ConcreteSocketProtocol<ConnectedUDPv6Socket_Policy, ConnectedUDPv6SocketProtocol>,
public UDPProtocol,
public UDPSocketProtocol,
public BSDSocketProtocol,
public AddressableBSDSocketProtocol
{
......
Socket/Protocols/INet/INetProtocol.cc → Socket/Protocols/INet/INetSocketProtocol.cc
+ 9
− 9
View file @ ef55cdab
......@@ -23,8 +23,8 @@
/** \file
\brief INet[46]Protocol non-inline non-template implementation */
#include "INetProtocol.hh"
//#include "INetProtocol.ih"
#include "INetSocketProtocol.hh"
//#include "INetSocketProtocol.ih"
// Custom includes
#include <sys/socket.h>
......@@ -32,21 +32,21 @@
#include <net/if.h>
#include "../../../Utils/Exception.hh"
//#include "INetProtocol.mpp"
//#include "INetSocketProtocol.mpp"
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// senf::INetProtocol
// senf::INetSocketProtocol
prefix_ void senf::INetProtocol::bindInterface(std::string const & iface)
prefix_ void senf::INetSocketProtocol::bindInterface(std::string const & iface)
const
{
if (::setsockopt(fd(), SOL_SOCKET, SO_BINDTODEVICE, iface.c_str(), iface.size()) < 0)
throw SystemException("::setsockopt(SO_BINDTODEVICE)");
}
prefix_ std::string senf::INetProtocol::bindInterface()
prefix_ std::string senf::INetSocketProtocol::bindInterface()
{
char iface[IFNAMSIZ];
socklen_t size (sizeof(iface));
......@@ -58,14 +58,14 @@ prefix_ std::string senf::INetProtocol::bindInterface()
}
///////////////////////////////////////////////////////////////////////////
// senf::IPv4Protocol
// senf::IPv4SocketProtocol
///////////////////////////////////////////////////////////////////////////
// senf::IPv6Protocol
// senf::IPv6SocketProtocol
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "INetProtocol.mpp"
//#include "INetSocketProtocol.mpp"
// Local Variables:
......
Socket/Protocols/INet/INetProtocol.hh → Socket/Protocols/INet/INetSocketProtocol.hh
+ 7
− 7
View file @ ef55cdab
......@@ -30,8 +30,8 @@
for SOCK_DGRAM (UDP) and not SOCK_STREAM (TCP) sockets
*/
#ifndef HH_INetProtocol_
#define HH_INetProtocol_ 1
#ifndef HH_INetSocketProtocol_
#define HH_INetSocketProtocol_ 1
// Custom includes
#include "../../../Socket/SocketProtocol.hh"
......@@ -39,7 +39,7 @@
#include "../../../Socket/ClientSocketHandle.hh"
#include "../../../Socket/CommunicationPolicy.hh"
//#include "INetProtocol.mpp"
//#include "INetSocketProtocol.mpp"
///////////////////////////////hh.p////////////////////////////////////////
namespace senf {
......@@ -47,7 +47,7 @@ namespace senf {
/// \addtogroup protocol_facets_group
/// @{
class INetProtocol
class INetSocketProtocol
: public virtual SocketProtocol
{
public:
......@@ -74,9 +74,9 @@ namespace senf {
}
///////////////////////////////hh.e////////////////////////////////////////
//#include "INetProtocol.cci"
//#include "INetProtocol.ct"
//#include "INetProtocol.cti"
//#include "INetSocketProtocol.cci"
//#include "INetSocketProtocol.ct"
//#include "INetSocketProtocol.cti"
#endif
......
Socket/Protocols/INet/MulticastProtocol.cc → Socket/Protocols/INet/MulticastSocketProtocol.cc
+ 25
− 25
View file @ ef55cdab
......@@ -21,31 +21,31 @@
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/** \file
\brief MulticastProtocol non-inline non-template implementation */
\brief MulticastSocketProtocol non-inline non-template implementation */
#include "MulticastProtocol.hh"
//#include "MulticastProtocol.ih"
#include "MulticastSocketProtocol.hh"
//#include "MulticastSocketProtocol.ih"
// Custom includes
#include <sys/socket.h>
#include <netinet/in.h>
#include <net/if.h> // for if_nametoindex
//#include "MulticastProtocol.mpp"
//#include "MulticastSocketProtocol.mpp"
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// senf::MulticastProtocol
// senf::MulticastSocketProtocol
prefix_ void senf::MulticastProtocol::broadcastEnabled(bool v)
prefix_ void senf::MulticastSocketProtocol::broadcastEnabled(bool v)
{
int ivalue (v);
if (::setsockopt(fd(), SOL_SOCKET, SO_BROADCAST, &ivalue, sizeof(ivalue)) < 0)
throw SystemException("::setsockopt(SO_BROADCAST)");
}
prefix_ bool senf::MulticastProtocol::broadcastEnabled()
prefix_ bool senf::MulticastSocketProtocol::broadcastEnabled()
{
int value (0);
::socklen_t len (sizeof(value));
......@@ -54,7 +54,7 @@ prefix_ bool senf::MulticastProtocol::broadcastEnabled()
return value;
}
prefix_ bool senf::MulticastProtocol::mcLoop()
prefix_ bool senf::MulticastSocketProtocol::mcLoop()
const
{
int value;
......@@ -64,7 +64,7 @@ prefix_ bool senf::MulticastProtocol::mcLoop()
return value;
}
prefix_ void senf::MulticastProtocol::mcLoop(bool value)
prefix_ void senf::MulticastSocketProtocol::mcLoop(bool value)
const
{
int ivalue (value);
......@@ -72,7 +72,7 @@ prefix_ void senf::MulticastProtocol::mcLoop(bool value)
throw SystemException();
}
prefix_ void senf::MulticastProtocol::mcIface(std::string const & iface)
prefix_ void senf::MulticastSocketProtocol::mcIface(std::string const & iface)
const
{
struct ip_mreqn mreqn;
......@@ -86,7 +86,7 @@ prefix_ void senf::MulticastProtocol::mcIface(std::string const & iface)
throw SystemException();
}
prefix_ unsigned senf::MulticastProtocol::mcTTL()
prefix_ unsigned senf::MulticastSocketProtocol::mcTTL()
const
{
int value;
......@@ -96,7 +96,7 @@ prefix_ unsigned senf::MulticastProtocol::mcTTL()
return value;
}
prefix_ void senf::MulticastProtocol::mcTTL(unsigned value)
prefix_ void senf::MulticastSocketProtocol::mcTTL(unsigned value)
const
{
if (::setsockopt(fd(),SOL_IP,IP_MULTICAST_TTL,&value,sizeof(value)) < 0)
......@@ -104,9 +104,9 @@ prefix_ void senf::MulticastProtocol::mcTTL(unsigned value)
}
///////////////////////////////////////////////////////////////////////////
// senf::INet4MulticastProtocol
// senf::INet4MulticastSocketProtocol
prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const & mcAddr)
prefix_ void senf::INet4MulticastSocketProtocol::mcAddMembership(INet4Address const & mcAddr)
const
{
struct ip_mreqn mreqn;
......@@ -117,7 +117,7 @@ prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const &
throw SystemException("::setsockopt(IP_ADD_MEMBERSHIP");
}
prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const & mcAddr,
prefix_ void senf::INet4MulticastSocketProtocol::mcAddMembership(INet4Address const & mcAddr,
INet4Address const & localAddr)
const
{
......@@ -129,7 +129,7 @@ prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const &
throw SystemException("::setsockopt(IP_ADD_MEMBERSHIP");
}
prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const & mcAddr,
prefix_ void senf::INet4MulticastSocketProtocol::mcAddMembership(INet4Address const & mcAddr,
std::string const & iface)
const
{
......@@ -143,7 +143,7 @@ prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const &
throw SystemException("::setsockopt(IP_ADD_MEMBERSHIP");
}
prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const & mcAddr)
prefix_ void senf::INet4MulticastSocketProtocol::mcDropMembership(INet4Address const & mcAddr)
const
{
struct ip_mreqn mreqn;
......@@ -154,7 +154,7 @@ prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const &
throw SystemException();
}
prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const & mcAddr,
prefix_ void senf::INet4MulticastSocketProtocol::mcDropMembership(INet4Address const & mcAddr,
INet4Address const & localAddr)
const
{
......@@ -166,7 +166,7 @@ prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const &
throw SystemException();
}
prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const & mcAddr,
prefix_ void senf::INet4MulticastSocketProtocol::mcDropMembership(INet4Address const & mcAddr,
std::string const & iface)
const
{
......@@ -181,9 +181,9 @@ prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const &
}
///////////////////////////////////////////////////////////////////////////
// senf::INet6MulticastProtocol
// senf::INet6MulticastSocketProtocol
prefix_ void senf::INet6MulticastProtocol::mcAddMembership(INet6Address const & mcAddr)
prefix_ void senf::INet6MulticastSocketProtocol::mcAddMembership(INet6Address const & mcAddr)
const
{
struct ipv6_mreq mreqn;
......@@ -193,7 +193,7 @@ prefix_ void senf::INet6MulticastProtocol::mcAddMembership(INet6Address const &
throw SystemException("::setsockopt(IPV6_ADD_MEMBERSHIP");
}
prefix_ void senf::INet6MulticastProtocol::mcAddMembership(INet6Address const & mcAddr,
prefix_ void senf::INet6MulticastSocketProtocol::mcAddMembership(INet6Address const & mcAddr,
std::string const & iface)
{
struct ipv6_mreq mreqn;
......@@ -205,7 +205,7 @@ prefix_ void senf::INet6MulticastProtocol::mcAddMembership(INet6Address const &
throw SystemException("::setsockopt(IPV6_ADD_MEMBERSHIP");
}
prefix_ void senf::INet6MulticastProtocol::mcDropMembership(INet6Address const & mcAddr)
prefix_ void senf::INet6MulticastSocketProtocol::mcDropMembership(INet6Address const & mcAddr)
const
{
struct ipv6_mreq mreqn;
......@@ -216,7 +216,7 @@ prefix_ void senf::INet6MulticastProtocol::mcDropMembership(INet6Address const &
}
prefix_ void
senf::INet6MulticastProtocol::mcDropMembership(INet6Address const & mcAddr,
senf::INet6MulticastSocketProtocol::mcDropMembership(INet6Address const & mcAddr,
std::string const & iface)
const
{
......@@ -231,7 +231,7 @@ senf::INet6MulticastProtocol::mcDropMembership(INet6Address const & mcAddr,
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "MulticastProtocol.mpp"
//#include "MulticastSocketProtocol.mpp"
// Local Variables:
......
Socket/Protocols/INet/MulticastProtocol.hh → Socket/Protocols/INet/MulticastSocketProtocol.hh
+ 10
− 10
View file @ ef55cdab
......@@ -21,17 +21,17 @@
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/** \file
\brief MulticastProtocol public header */
\brief MulticastSocketProtocol public header */
#ifndef HH_MulticastProtocol_
#define HH_MulticastProtocol_ 1
#ifndef HH_MulticastSocketProtocol_
#define HH_MulticastSocketProtocol_ 1
// Custom includes
#include "../../../Socket/SocketProtocol.hh"
#include "INet4Address.hh"
#include "INet6Address.hh"
//#include "MulticastProtocol.mpp"
//#include "MulticastSocketProtocol.mpp"
///////////////////////////////hh.p////////////////////////////////////////
namespace senf {
......@@ -39,7 +39,7 @@ namespace senf {
///\addtogroup protocol_facets_group
///\{
class MulticastProtocol
class MulticastSocketProtocol
: public virtual SocketProtocol
{
public:
......@@ -67,7 +67,7 @@ namespace senf {
data from */
};
class INet4MulticastProtocol
class INet4MulticastSocketProtocol
: public virtual SocketProtocol
{
public:
......@@ -122,7 +122,7 @@ namespace senf {
\param[in] iface interface name */
};
class INet6MulticastProtocol
class INet6MulticastSocketProtocol
: public virtual SocketProtocol
{
public:
......@@ -178,9 +178,9 @@ namespace senf {
}
///////////////////////////////hh.e////////////////////////////////////////
//#include "MulticastProtocol.cci"
//#include "MulticastProtocol.ct"
//#include "MulticastProtocol.cti"
//#include "MulticastSocketProtocol.cci"
//#include "MulticastSocketProtocol.ct"
//#include "MulticastSocketProtocol.cti"
#endif
......
Socket/Protocols/INet/RawINetSocketHandle.hh
+ 9
− 9
View file @ ef55cdab
......@@ -25,9 +25,9 @@
// Custom includes
#include "INetProtocol.hh"
#include "RawINetProtocol.hh"
#include "MulticastProtocol.hh"
#include "INetSocketProtocol.hh"
#include "RawINetSocketProtocol.hh"
#include "MulticastSocketProtocol.hh"
#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
#include "../../../Socket/FramingPolicy.hh"
#include "../../../Socket/CommunicationPolicy.hh"
......@@ -75,11 +75,11 @@ namespace senf {
*/
class RawV4SocketProtocol
: public ConcreteSocketProtocol<RawV4Socket_Policy, RawV4SocketProtocol>,
public RawINetProtocol,
public RawINetSocketProtocol,
public BSDSocketProtocol,
public AddressableBSDSocketProtocol,
public MulticastProtocol,
public INet4MulticastProtocol
public MulticastSocketProtocol,
public INet4MulticastSocketProtocol
{
public:
///////////////////////////////////////////////////////////////////////////
......@@ -143,11 +143,11 @@ namespace senf {
*/
class RawV6SocketProtocol
: public ConcreteSocketProtocol<RawV6Socket_Policy,RawV6SocketProtocol>,
public RawINetProtocol,
public RawINetSocketProtocol,
public BSDSocketProtocol,
public AddressableBSDSocketProtocol,
public MulticastProtocol,
public INet4MulticastProtocol
public MulticastSocketProtocol,
public INet4MulticastSocketProtocol
{
public:
///////////////////////////////////////////////////////////////////////////
......
Socket/Protocols/INet/RawINetProtocol.cc → Socket/Protocols/INet/RawINetSocketProtocol.cc
+ 6
− 6
View file @ ef55cdab
// $Id: RawINetProtocol.cc 597 2008-01-15 09:16:20Z g0dil $
// $Id: RawINetSocketProtocol.cc 597 2008-01-15 09:16:20Z g0dil $
//
// Copyright (C) 2007
// Fraunhofer Institute for Open Communication Systems (FOKUS)
......@@ -21,7 +21,7 @@
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "RawINetProtocol.hh"
#include "RawINetSocketProtocol.hh"
// Custom includes
#include <sys/socket.h>
......@@ -31,11 +31,11 @@
#include <net/if.h> // for if_nametoindex
#include "../../../Socket/SocketHandle.hh"
//#include "UDPProtocol.mpp"
//#include "UDPSocketProtocol.mpp"
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
prefix_ unsigned senf::RawINetProtocol::available()
prefix_ unsigned senf::RawINetSocketProtocol::available()
const
{
int n;
......@@ -44,7 +44,7 @@ prefix_ unsigned senf::RawINetProtocol::available()
return n;
}
prefix_ bool senf::RawINetProtocol::eof()
prefix_ bool senf::RawINetSocketProtocol::eof()
const
{
return false;
......@@ -52,7 +52,7 @@ prefix_ bool senf::RawINetProtocol::eof()
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "UDPProtocol.mpp"
//#include "UDPSocketProtocol.mpp"
// Local Variables:
......
Socket/Protocols/INet/RawINetProtocol.hh → Socket/Protocols/INet/RawINetSocketProtocol.hh
+ 3
− 3
View file @ ef55cdab
// $Id: RawINetProtocol.hh 597 2008-01-15 09:16:20Z g0dil $
// $Id: RawINetSocketProtocol.hh 597 2008-01-15 09:16:20Z g0dil $
//
// Copyright (C) 2007
// Fraunhofer Institute for Open Communication Systems (FOKUS)
......@@ -25,7 +25,7 @@
// Custom includes
#include "INetAddressing.hh"
#include "INetProtocol.hh"
#include "INetSocketProtocol.hh"
#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
#include "../../../Socket/FramingPolicy.hh"
#include "../../../Socket/CommunicationPolicy.hh"
......@@ -43,7 +43,7 @@ namespace senf {
which are available on a PF_INET[6]/RAW socket.
*/
class RawINetProtocol
class RawINetSocketProtocol
: public virtual SocketProtocol
{
public:
......
Socket/Protocols/INet/TCPSocketHandle.hh
+ 4
− 4
View file @ ef55cdab
......@@ -31,8 +31,8 @@
#define HH_TCPSocketHandle_ 1
// Custom includes
#include "INetProtocol.hh"
#include "TCPProtocol.hh"
#include "INetSocketProtocol.hh"
#include "TCPSocketProtocol.hh"
#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
#include "../../../Socket/FramingPolicy.hh"
#include "../../../Socket/CommunicationPolicy.hh"
......@@ -80,7 +80,7 @@ namespace senf {
*/
class TCPv4SocketProtocol
: public ConcreteSocketProtocol<TCPv4Socket_Policy,TCPv4SocketProtocol>,
public TCPProtocol,
public TCPSocketProtocol,
public BSDSocketProtocol,
public AddressableBSDSocketProtocol
{
......@@ -155,7 +155,7 @@ namespace senf {
*/
class TCPv6SocketProtocol
: public ConcreteSocketProtocol<TCPv6Socket_Policy,TCPv6SocketProtocol>,
public TCPProtocol,
public TCPSocketProtocol,
public BSDSocketProtocol,
public AddressableBSDSocketProtocol
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Datenschutz und Impressum