From 781841a156ebdc727b94d44bf6a106ed2173930b Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Wed, 20 Dec 2006 10:30:06 +0000
Subject: [PATCH] Renamed namespaces satcom::lib and satcom::pkf to senf
Renaned directory satscons to senfscons
---
Mainpage.dox | 14 +--
Packets/DataPacket.cc | 8 +-
Packets/DataPacket.cti | 4 +-
Packets/DataPacket.hh | 8 +-
Packets/EthernetPacket.cc | 19 ++-
Packets/EthernetPacket.cti | 6 +-
Packets/EthernetPacket.hh | 8 +-
Packets/EthernetPacket.test.cc | 4 +-
Packets/FUTURE | 8 +-
Packets/GenericPacket.ct | 8 +-
Packets/GenericPacket.cti | 30 ++---
Packets/GenericPacket.hh | 8 +-
Packets/IpV4Packet.cc | 11 +-
Packets/IpV4Packet.cti | 4 +-
Packets/IpV4Packet.hh | 8 +-
Packets/IpV4Packet.test.cc | 4 +-
Packets/Mainpage.dox | 83 +++++++++++++
Packets/Packet.cc | 46 ++++----
Packets/Packet.cci | 46 ++++----
Packets/Packet.ct | 28 ++---
Packets/Packet.cti | 10 +-
Packets/Packet.hh | 122 ++++----------------
Packets/Packet.ih | 14 +--
Packets/Packet.mpp | 14 +--
Packets/Packet.test.cc | 4 +-
Packets/PacketRegistry.cc | 6 +-
Packets/PacketRegistry.ct | 28 ++---
Packets/PacketRegistry.cti | 14 +--
Packets/PacketRegistry.hh | 10 +-
Packets/PacketRegistry.ih | 12 +-
Packets/PacketRegistry.test.cc | 4 +-
Packets/ParseArray.cti | 60 +++++-----
Packets/ParseArray.hh | 8 +-
Packets/ParseArray.ih | 4 +-
Packets/ParseArray.test.cc | 4 +-
Packets/ParseInt.hh | 8 +-
Packets/ParseInt.ih | 8 +-
Packets/ParseInt.test.cc | 4 +-
Packets/ParseListS.ct | 16 +--
Packets/ParseListS.cti | 64 +++++-----
Packets/ParseListS.hh | 8 +-
Packets/ParseListS.ih | 8 +-
Packets/ParseListS.test.cc | 4 +-
Packets/ParseVec.ct | 8 +-
Packets/ParseVec.cti | 72 ++++++------
Packets/ParseVec.hh | 8 +-
Packets/ParseVec.test.cc | 4 +-
Packets/ParserBase.cti | 20 ++--
Packets/ParserBase.hh | 10 +-
Packets/ParserBase.ih | 8 +-
Packets/ParserBase.test.cc | 36 +++---
Packets/RTCPPacket.cc | 6 +-
Packets/RTCPPacket.cti | 4 +-
Packets/RTCPPacket.hh | 8 +-
Packets/RTCPPacket.test.cc | 4 +-
Packets/RTPPacket.cc | 14 +--
Packets/RTPPacket.cti | 8 +-
Packets/RTPPacket.hh | 8 +-
Packets/RTPPacket.test.cc | 4 +-
Packets/UDPPacket.cc | 11 +-
Packets/UDPPacket.cti | 4 +-
Packets/UDPPacket.hh | 8 +-
Packets/UDPPacket.test.cc | 4 +-
Packets/docstub.hh | 2 +-
Packets/typeidvalue.cci | 18 +--
Packets/typeidvalue.cti | 12 +-
Packets/typeidvalue.hh | 8 +-
SConstruct | 2 +-
Scheduler/ReadHelper.cci | 4 +-
Scheduler/ReadHelper.ct | 28 ++---
Scheduler/ReadHelper.cti | 22 ++--
Scheduler/ReadHelper.hh | 12 +-
Scheduler/ReadHelper.ih | 6 +-
Scheduler/Scheduler.cc | 16 +--
Scheduler/Scheduler.cci | 6 +-
Scheduler/Scheduler.ct | 2 +-
Scheduler/Scheduler.cti | 6 +-
Scheduler/Scheduler.hh | 8 +-
Scheduler/Scheduler.test.cc | 4 +-
Scheduler/WriteHelper.ct | 30 ++---
Scheduler/WriteHelper.cti | 14 +--
Scheduler/WriteHelper.hh | 12 +-
Sniffer/Sniffer.cc | 18 +--
Socket/AddressingPolicy.hh | 8 +-
Socket/BSDSocketProtocol.cc | 12 +-
Socket/BSDSocketProtocol.hh | 8 +-
Socket/BufferingPolicy.cc | 10 +-
Socket/BufferingPolicy.hh | 8 +-
Socket/ClientSocketHandle.ct | 14 +--
Socket/ClientSocketHandle.cti | 54 ++++-----
Socket/ClientSocketHandle.hh | 10 +-
Socket/ClientSocketHandle.test.cc | 6 +-
Socket/CommunicationPolicy.cc | 6 +-
Socket/CommunicationPolicy.cti | 4 +-
Socket/CommunicationPolicy.hh | 8 +-
Socket/FileHandle.cc | 16 +--
Socket/FileHandle.cci | 78 ++++++-------
Socket/FileHandle.hh | 8 +-
Socket/FileHandle.ih | 10 +-
Socket/FileHandle.test.cc | 16 +--
Socket/FramingPolicy.hh | 8 +-
Socket/GenericAddressingPolicy.cc | 10 +-
Socket/GenericAddressingPolicy.cti | 12 +-
Socket/GenericAddressingPolicy.hh | 8 +-
Socket/GenericSockAddr.cci | 8 +-
Socket/GenericSockAddr.hh | 6 +-
Socket/INetAddressing.cc | 10 +-
Socket/INetAddressing.cci | 22 ++--
Socket/INetAddressing.hh | 8 +-
Socket/INetAddressing.test.cc | 6 +-
Socket/INetProtocol.cc | 26 ++---
Socket/INetProtocol.hh | 8 +-
Socket/LLAddressing.cc | 14 +--
Socket/LLAddressing.cci | 26 ++---
Socket/LLAddressing.ct | 8 +-
Socket/LLAddressing.cti | 4 +-
Socket/LLAddressing.hh | 8 +-
Socket/LLAddressing.ih | 8 +-
Socket/LLAddressing.test.cc | 18 +--
Socket/PacketSocketHandle.cc | 14 +--
Socket/PacketSocketHandle.ct | 4 +-
Socket/PacketSocketHandle.cti | 10 +-
Socket/PacketSocketHandle.hh | 8 +-
Socket/PacketSocketHandle.ih | 8 +-
Socket/PacketSocketHandle.test.cc | 20 ++--
Socket/ProtocolClientSocketHandle.cti | 24 ++--
Socket/ProtocolClientSocketHandle.hh | 8 +-
Socket/ProtocolClientSocketHandle.mpp | 10 +-
Socket/ProtocolClientSocketHandle.test.cc | 20 ++--
Socket/ProtocolServerSocketHandle.cti | 28 ++---
Socket/ProtocolServerSocketHandle.hh | 8 +-
Socket/ProtocolServerSocketHandle.mpp | 10 +-
Socket/ProtocolServerSocketHandle.test.cc | 24 ++--
Socket/ReadWritePolicy.cc | 10 +-
Socket/ReadWritePolicy.cti | 8 +-
Socket/ReadWritePolicy.hh | 8 +-
Socket/ServerSocketHandle.cti | 48 ++++----
Socket/ServerSocketHandle.hh | 8 +-
Socket/ServerSocketHandle.test.cc | 6 +-
Socket/SocketHandle.cc | 18 +--
Socket/SocketHandle.cci | 16 +--
Socket/SocketHandle.ct | 6 +-
Socket/SocketHandle.cti | 42 +++----
Socket/SocketHandle.hh | 8 +-
Socket/SocketHandle.ih | 8 +-
Socket/SocketHandle.test.cc | 28 ++---
Socket/SocketPolicy.ct | 4 +-
Socket/SocketPolicy.hh | 8 +-
Socket/SocketPolicy.ih | 10 +-
Socket/SocketPolicy.test.cc | 4 +-
Socket/SocketPolicy.test.hh | 22 ++--
Socket/SocketProtocol.cc | 4 +-
Socket/SocketProtocol.cci | 8 +-
Socket/SocketProtocol.cti | 8 +-
Socket/SocketProtocol.hh | 8 +-
Socket/SocketProtocol.test.cc | 4 +-
Socket/SocketProtocol.test.hh | 8 +-
Socket/TCPProtocol.cc | 14 +--
Socket/TCPProtocol.hh | 8 +-
Socket/TCPSocketHandle.cc | 12 +-
Socket/TCPSocketHandle.hh | 8 +-
Socket/TCPSocketHandle.test.cc | 20 ++--
Utils/DaemonTools.cc | 18 +--
Utils/DaemonTools.hh | 6 +-
Utils/Exception.cc | 6 +-
Utils/Exception.hh | 8 +-
Utils/MicroTime.cc | 2 +-
Utils/MicroTime.hh | 6 +-
Utils/MicroTime.test.cc | 2 +-
Utils/SafeBool.cci | 10 +-
Utils/SafeBool.cti | 10 +-
Utils/SafeBool.hh | 6 +-
Utils/TypeInfo.cc | 4 +-
Utils/TypeInfo.hh | 8 +-
Utils/TypeInfo.test.cc | 6 +-
Utils/impl/membind.hh | 2 +-
Utils/intrusive_refcount.cci | 18 +--
Utils/intrusive_refcount.hh | 12 +-
Utils/intrusive_refcount.test.cc | 4 +-
Utils/membind.hh | 6 +-
Utils/membind.test.cc | 6 +-
doclib/Doxyfile.global | 2 +-
doclib/doxy-header-overview.html | 2 +-
doclib/doxy-header.html | 2 +-
{satscons => senfscons}/BoostUnitTests.py | 0
{satscons => senfscons}/Dia2Png.py | 0
{satscons => senfscons}/Doxyfile | 0
{satscons => senfscons}/Doxyfile.template | 0
{satscons => senfscons}/Doxygen.py | 0
{satscons => senfscons}/SConfig.template | 0
{satscons => senfscons}/SConscript | 0
{satscons => senfscons}/SConscript.template | 0
{satscons => senfscons}/SConstruct.template | 2 +-
{satscons => senfscons}/SatSCons.py | 0
{satscons => senfscons}/__init__.py | 0
{satscons => senfscons}/nodeglob.py | 0
{satscons => senfscons}/pdflatex.py | 0
197 files changed, 1235 insertions(+), 1235 deletions(-)
create mode 100644 Packets/Mainpage.dox
rename {satscons => senfscons}/BoostUnitTests.py (100%)
rename {satscons => senfscons}/Dia2Png.py (100%)
rename {satscons => senfscons}/Doxyfile (100%)
rename {satscons => senfscons}/Doxyfile.template (100%)
rename {satscons => senfscons}/Doxygen.py (100%)
rename {satscons => senfscons}/SConfig.template (100%)
rename {satscons => senfscons}/SConscript (100%)
rename {satscons => senfscons}/SConscript.template (100%)
rename {satscons => senfscons}/SConstruct.template (92%)
rename {satscons => senfscons}/SatSCons.py (100%)
rename {satscons => senfscons}/__init__.py (100%)
rename {satscons => senfscons}/nodeglob.py (100%)
rename {satscons => senfscons}/pdflatex.py (100%)
diff --git a/Mainpage.dox b/Mainpage.dox
index 74b54758d..51f251561 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -167,7 +167,7 @@
\li Simple functions to manage daemon processes
\li Standard exception classes
- \li satcom::lib::intrusive_refcount to simplify the implementation
+ \li senf::intrusive_refcount to simplify the implementation
of classes usable with boost::intrusive_ptr
\li boost::bind extensions
\li An interface to the \c g++ demangler integrated with type_info
@@ -185,7 +185,7 @@
environment. Included are a number of templates to help
bootstrapping a new project or component.
- \see <a href="../../satscons/doc/html/index.html">SENFSCons
+ \see <a href="../../senfscons/doc/html/index.html">SENFSCons
reference</a>
*/
@@ -225,7 +225,7 @@
The default editor (probably VI) will be started with the current
value of the svn:externals property (which will probably be
- empty). Now add all the modules you want plus \c satscons and
+ empty). Now add all the modules you want plus \c senfscons and
possibly \c doclib (if you want to build the documentation). You
will almost certainly neeed the \c Utils module, since all other
modules depend on it.
@@ -234,7 +234,7 @@
module, the file will look like
<pre class="fragment">
- satscons http://svn.berlios.de/svnroot/repos/senf/trunk/satscons
+ senfscons http://svn.berlios.de/svnroot/repos/senf/trunk/senfscons
Utils http://svn.berlios.de/svnroot/repos/senf/trunk/Utils
Scheduler http://svn.berlios.de/svnroot/repos/senf/trunk/Scheduler
Socket http://svn.berlios.de/svnroot/repos/senf/trunk/Socket</pre>
@@ -250,7 +250,7 @@
\section new_conf Configuring SENFSCons
To set up the build environment, copy the
- <tt>satscons/SConstruct.template</tt> to <tt>Satscons</tt> in the
+ <tt>senfscons/SConstruct.template</tt> to <tt>Satscons</tt> in the
project root. The default setup of this file is to build all
subdirectories (using the \c SConscript files of the
subdirectories). You can add additonal global targets and
@@ -258,7 +258,7 @@
If you want to use a non-default compiler or the boost library is
not installed in the system directories, you will have to copy
- <tt>satscons/SConfig.template</tt> to <tt>SConfig</tt> in the
+ <tt>senfscons/SConfig.template</tt> to <tt>SConfig</tt> in the
project root and edit it there. You should \e never add \c SConfig
to the repository since it should only contain local settings
necessary for building on your local system. You should therefore
@@ -290,7 +290,7 @@
<pre class="fragment">
$ scons -u [target]</pre>
- \see <a href="../../satscons/doc/html/index.html">SENFSCons reference</a> \n
+ \see <a href="../../senfscons/doc/html/index.html">SENFSCons reference</a> \n
<a class="ext" href="http://www.scons.org/documentation.php">SCons documentation</a> \n
<a class="ext" href="http://svnbook.red-bean.com">Subversion online book</a> \n
<a class="ext" href="http://subversion.tigris.org">Subversion Homepage</a>
diff --git a/Packets/DataPacket.cc b/Packets/DataPacket.cc
index 91e80cfb3..f526f95f7 100644
--- a/Packets/DataPacket.cc
+++ b/Packets/DataPacket.cc
@@ -30,14 +30,14 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::pkf::DataPacket::v_nextInterpreter()
+prefix_ void senf::DataPacket::v_nextInterpreter()
const
{}
-prefix_ void satcom::pkf::DataPacket::v_finalize()
+prefix_ void senf::DataPacket::v_finalize()
{}
-prefix_ void satcom::pkf::DataPacket::v_dump(std::ostream & os)
+prefix_ void senf::DataPacket::v_dump(std::ostream & os)
const
{
os << "Payload:\n"
@@ -50,5 +50,5 @@ prefix_ void satcom::pkf::DataPacket::v_dump(std::ostream & os)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/DataPacket.cti b/Packets/DataPacket.cti
index f16bbb3c0..62b76f0cc 100644
--- a/Packets/DataPacket.cti
+++ b/Packets/DataPacket.cti
@@ -30,7 +30,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Arg>
-prefix_ satcom::pkf::DataPacket::DataPacket(Arg const & arg)
+prefix_ senf::DataPacket::DataPacket(Arg const & arg)
: Packet(arg)
{}
@@ -40,5 +40,5 @@ prefix_ satcom::pkf::DataPacket::DataPacket(Arg const & arg)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/DataPacket.hh b/Packets/DataPacket.hh
index 480f3cd85..4e1e6185a 100644
--- a/Packets/DataPacket.hh
+++ b/Packets/DataPacket.hh
@@ -28,8 +28,8 @@
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
/** \brief Non-interpreted Packet
@@ -64,7 +64,7 @@ namespace pkf {
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "DataPacket.cci"
@@ -75,5 +75,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/EthernetPacket.cc b/Packets/EthernetPacket.cc
index f0e468e0a..60c122e04 100644
--- a/Packets/EthernetPacket.cc
+++ b/Packets/EthernetPacket.cc
@@ -33,12 +33,11 @@
///////////////////////////////cc.p////////////////////////////////////////
namespace {
- namespace pkf = satcom::pkf;
- pkf::PacketRegistry<pkf::EtherTypes>::RegistrationProxy<pkf::EthVLanPacket>
+ senf::PacketRegistry<senf::EtherTypes>::RegistrationProxy<senf::EthVLanPacket>
registerEthVLanPacket(0x8100);
}
-prefix_ void satcom::pkf::EthernetPacket::v_nextInterpreter()
+prefix_ void senf::EthernetPacket::v_nextInterpreter()
const
{
// TODO: Add LLC/SNAP support -> only use the registry
@@ -48,7 +47,7 @@ prefix_ void satcom::pkf::EthernetPacket::v_nextInterpreter()
namespace {
- void dumpmac(std::ostream & os, satcom::pkf::EthernetPacket::Parse_MAC mac)
+ void dumpmac(std::ostream & os, senf::EthernetPacket::Parse_MAC mac)
{
for (unsigned i = 0; i < 6; ++i) {
if (i > 0)
@@ -60,7 +59,7 @@ namespace {
}
-prefix_ void satcom::pkf::EthernetPacket::v_dump(std::ostream & os)
+prefix_ void senf::EthernetPacket::v_dump(std::ostream & os)
const
{
if (type() <= 1500)
@@ -80,10 +79,10 @@ prefix_ void satcom::pkf::EthernetPacket::v_dump(std::ostream & os)
<< unsigned(type()) << "\n" << std::dec;
}
-prefix_ void satcom::pkf::EthernetPacket::v_finalize()
+prefix_ void senf::EthernetPacket::v_finalize()
{}
-prefix_ void satcom::pkf::EthVLanPacket::v_nextInterpreter()
+prefix_ void senf::EthVLanPacket::v_nextInterpreter()
const
{
// TODO: Add LLC/SNAP support -> only use the registry
@@ -91,10 +90,10 @@ prefix_ void satcom::pkf::EthVLanPacket::v_nextInterpreter()
registerInterpreter(type(),begin()+bytes(),end());
}
-prefix_ void satcom::pkf::EthVLanPacket::v_finalize()
+prefix_ void senf::EthVLanPacket::v_finalize()
{}
-prefix_ void satcom::pkf::EthVLanPacket::v_dump(std::ostream & os)
+prefix_ void senf::EthVLanPacket::v_dump(std::ostream & os)
const
{
os << "Ethernet 802.1q (VLAN):\n"
@@ -110,5 +109,5 @@ prefix_ void satcom::pkf::EthVLanPacket::v_dump(std::ostream & os)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/EthernetPacket.cti b/Packets/EthernetPacket.cti
index 132e2de81..43bcfaafd 100644
--- a/Packets/EthernetPacket.cti
+++ b/Packets/EthernetPacket.cti
@@ -30,12 +30,12 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Arg>
-prefix_ satcom::pkf::EthernetPacket::EthernetPacket(Arg const & arg)
+prefix_ senf::EthernetPacket::EthernetPacket(Arg const & arg)
: Packet(arg)
{}
template <class Arg>
-prefix_ satcom::pkf::EthVLanPacket::EthVLanPacket(Arg const & arg)
+prefix_ senf::EthVLanPacket::EthVLanPacket(Arg const & arg)
: Packet(arg)
{}
@@ -45,5 +45,5 @@ prefix_ satcom::pkf::EthVLanPacket::EthVLanPacket(Arg const & arg)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/EthernetPacket.hh b/Packets/EthernetPacket.hh
index ae4fdb280..53d1dca96 100644
--- a/Packets/EthernetPacket.hh
+++ b/Packets/EthernetPacket.hh
@@ -32,8 +32,8 @@
//#include "EthernetPacket.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
template <class Iterator=nil, class IPacket=nil>
struct Parse_Ethernet : public ParserBase<Iterator,IPacket>
@@ -136,7 +136,7 @@ namespace pkf {
friend class Packet;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
@@ -148,5 +148,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/EthernetPacket.test.cc b/Packets/EthernetPacket.test.cc
index 72e16d5cb..ad8e1e270 100644
--- a/Packets/EthernetPacket.test.cc
+++ b/Packets/EthernetPacket.test.cc
@@ -34,7 +34,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
BOOST_AUTO_UNIT_TEST(ethernetPacket_parser)
{
@@ -91,5 +91,5 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_chain)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/FUTURE b/Packets/FUTURE
index 36f879a4d..65d4484e5 100644
--- a/Packets/FUTURE
+++ b/Packets/FUTURE
@@ -14,15 +14,15 @@ next free typeid integer. This can then efficiently be returned by the
static retrieval function:
template <class T>
- struct satcom::vtable::impl::TypeRegistry
+ struct senf::vtable::impl::TypeRegistry
{
static unsigned id() {
- static satcom::vtable::impl::AutoTypeId typeid;
+ static senf::vtable::impl::AutoTypeId typeid;
return typeid.id();
}
};
- struct satcom::vtable::impl::AutoTypeId
+ struct senf::vtable::impl::AutoTypeId
{
AutoTypeId() : id(nextAutoTypeId()) {}
unsigned id;
@@ -36,7 +36,7 @@ static retrieval function:
This setup will assign id's uniquely. The Id's will be ordered by the
first TypeRegistry::id() call. To get the Type id of a type, just call
-satcom::vtable::impl::TypeRegistry<SomeType>::id().
+senf::vtable::impl::TypeRegistry<SomeType>::id().
The above is bogus ... we don't register the extensible types, we
register the extensions which are arbitrary types.
diff --git a/Packets/GenericPacket.ct b/Packets/GenericPacket.ct
index 842fa56a8..0a9768c10 100644
--- a/Packets/GenericPacket.ct
+++ b/Packets/GenericPacket.ct
@@ -30,18 +30,18 @@
///////////////////////////////ct.p////////////////////////////////////////
template <unsigned HEADER, unsigned TRAILER>
-prefix_ void satcom::pkf::GenericPacket<HEADER,TRAILER>::v_nextInterpreter()
+prefix_ void senf::GenericPacket<HEADER,TRAILER>::v_nextInterpreter()
const
{
this->registerInterpreter<DataPacket>(this->end_header(), this->begin_trailer());
}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ void satcom::pkf::GenericPacket<HEADER,TRAILER>::v_finalize()
+prefix_ void senf::GenericPacket<HEADER,TRAILER>::v_finalize()
{}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ void satcom::pkf::GenericPacket<HEADER,TRAILER>::v_dump(std::ostream & os)
+prefix_ void senf::GenericPacket<HEADER,TRAILER>::v_dump(std::ostream & os)
const
{
// TODO: implement v_dump()
@@ -53,5 +53,5 @@ prefix_ void satcom::pkf::GenericPacket<HEADER,TRAILER>::v_dump(std::ostream & o
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/GenericPacket.cti b/Packets/GenericPacket.cti
index 92c9e5968..618d0d239 100644
--- a/Packets/GenericPacket.cti
+++ b/Packets/GenericPacket.cti
@@ -31,59 +31,59 @@
template <unsigned HEADER, unsigned TRAILER>
template <class Arg>
-prefix_ satcom::pkf::GenericPacket<HEADER,TRAILER>::GenericPacket(Arg const & arg)
+prefix_ senf::GenericPacket<HEADER,TRAILER>::GenericPacket(Arg const & arg)
: Packet(arg)
{}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ void satcom::pkf::GenericPacket<HEADER,TRAILER>::init()
+prefix_ void senf::GenericPacket<HEADER,TRAILER>::init()
{
insert(begin(),HEADER,0);
insert(end(),TRAILER,0);
}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ typename satcom::pkf::GenericPacket<HEADER,TRAILER>::iterator
-satcom::pkf::GenericPacket<HEADER,TRAILER>::begin_header()
+prefix_ typename senf::GenericPacket<HEADER,TRAILER>::iterator
+senf::GenericPacket<HEADER,TRAILER>::begin_header()
const
{
return this->begin();
}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ typename satcom::pkf::GenericPacket<HEADER,TRAILER>::iterator
-satcom::pkf::GenericPacket<HEADER,TRAILER>::end_header()
+prefix_ typename senf::GenericPacket<HEADER,TRAILER>::iterator
+senf::GenericPacket<HEADER,TRAILER>::end_header()
const
{
return this->begin() + HEADER;
}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ typename satcom::pkf::GenericPacket<HEADER,TRAILER>::size_type
-satcom::pkf::GenericPacket<HEADER,TRAILER>::header_len()
+prefix_ typename senf::GenericPacket<HEADER,TRAILER>::size_type
+senf::GenericPacket<HEADER,TRAILER>::header_len()
{
return HEADER;
}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ typename satcom::pkf::GenericPacket<HEADER,TRAILER>::iterator
-satcom::pkf::GenericPacket<HEADER,TRAILER>::begin_trailer()
+prefix_ typename senf::GenericPacket<HEADER,TRAILER>::iterator
+senf::GenericPacket<HEADER,TRAILER>::begin_trailer()
const
{
return this->end() - TRAILER;
}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ typename satcom::pkf::GenericPacket<HEADER,TRAILER>::iterator
-satcom::pkf::GenericPacket<HEADER,TRAILER>::end_trailer()
+prefix_ typename senf::GenericPacket<HEADER,TRAILER>::iterator
+senf::GenericPacket<HEADER,TRAILER>::end_trailer()
const
{
return this->end();
}
template <unsigned HEADER, unsigned TRAILER>
-prefix_ typename satcom::pkf::GenericPacket<HEADER,TRAILER>::size_type
-satcom::pkf::GenericPacket<HEADER,TRAILER>::trailer_len()
+prefix_ typename senf::GenericPacket<HEADER,TRAILER>::size_type
+senf::GenericPacket<HEADER,TRAILER>::trailer_len()
{
return TRAILER;
}
@@ -94,5 +94,5 @@ satcom::pkf::GenericPacket<HEADER,TRAILER>::trailer_len()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/GenericPacket.hh b/Packets/GenericPacket.hh
index c8cd5d891..9af56fe87 100644
--- a/Packets/GenericPacket.hh
+++ b/Packets/GenericPacket.hh
@@ -28,8 +28,8 @@
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
/** \brief General packet comprised of header, trailer and payload
@@ -76,7 +76,7 @@ namespace pkf {
friend class Packet;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "GenericPacket.cci"
@@ -87,5 +87,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/IpV4Packet.cc b/Packets/IpV4Packet.cc
index 095a2f9ec..fd0402552 100644
--- a/Packets/IpV4Packet.cc
+++ b/Packets/IpV4Packet.cc
@@ -35,21 +35,20 @@
///////////////////////////////cc.p////////////////////////////////////////
namespace {
- namespace pkf = satcom::pkf;
- pkf::PacketRegistry<pkf::EtherTypes>::RegistrationProxy<pkf::IpV4Packet>
+ senf::PacketRegistry<senf::EtherTypes>::RegistrationProxy<senf::IpV4Packet>
registerIpV4Packet(0x0800);
}
-prefix_ void satcom::pkf::IpV4Packet::v_nextInterpreter()
+prefix_ void senf::IpV4Packet::v_nextInterpreter()
const
{
registerInterpreter(protocol(),begin()+bytes(),end());
}
-prefix_ void satcom::pkf::IpV4Packet::v_finalize()
+prefix_ void senf::IpV4Packet::v_finalize()
{}
-prefix_ void satcom::pkf::IpV4Packet::v_dump(std::ostream & os)
+prefix_ void senf::IpV4Packet::v_dump(std::ostream & os)
const
{
struct in_addr in;
@@ -79,5 +78,5 @@ prefix_ void satcom::pkf::IpV4Packet::v_dump(std::ostream & os)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/IpV4Packet.cti b/Packets/IpV4Packet.cti
index 9a8c96f58..423be2f48 100644
--- a/Packets/IpV4Packet.cti
+++ b/Packets/IpV4Packet.cti
@@ -30,7 +30,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Arg>
-prefix_ satcom::pkf::IpV4Packet::IpV4Packet(Arg const & arg)
+prefix_ senf::IpV4Packet::IpV4Packet(Arg const & arg)
: Packet(arg)
{}
@@ -42,5 +42,5 @@ prefix_ satcom::pkf::IpV4Packet::IpV4Packet(Arg const & arg)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/IpV4Packet.hh b/Packets/IpV4Packet.hh
index 0f9e296f6..0d126282c 100644
--- a/Packets/IpV4Packet.hh
+++ b/Packets/IpV4Packet.hh
@@ -32,8 +32,8 @@
//#include "IpV4Packet.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
template <class Iterator=nil, class IpV4Packet=nil>
struct Parse_IpV4 : public ParserBase<Iterator,IpV4Packet>
@@ -103,7 +103,7 @@ namespace pkf {
friend class Packet;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
@@ -115,5 +115,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/IpV4Packet.test.cc b/Packets/IpV4Packet.test.cc
index fd93c5ac6..afc47a20a 100644
--- a/Packets/IpV4Packet.test.cc
+++ b/Packets/IpV4Packet.test.cc
@@ -34,7 +34,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
BOOST_AUTO_UNIT_TEST(ipV4Packet_parser)
{
@@ -106,5 +106,5 @@ BOOST_AUTO_UNIT_TEST(ipV4Packet_packet)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/Mainpage.dox b/Packets/Mainpage.dox
new file mode 100644
index 000000000..2b25b406f
--- /dev/null
+++ b/Packets/Mainpage.dox
@@ -0,0 +1,83 @@
+/** \mainpage The SENF Packet Library
+
+ \section arch Overall Architecture
+
+ The general Architecture of the Packet Framework (pkf for short)
+ is seperated into two components: The basic packet handling and
+ the parser framework.
+
+ The basic packet handling implements a packet interpreter
+ chain. Every packet is represented as a chain of interpreters
+ where each interpreter is a facade looking into the same
+ packet. Each interpreter will interpret a specific header of a
+ packet. For example, an ethernet frame might have an interpreter
+ chain consisting of EthernetPacket, IPPacket, UDPPacket and
+ DataPacket. Each of these interpreters will interpret a section of
+ the raw data bytes. The interpreter ranges overlap since every
+ packet also includes it's payload.
+
+ The parser framework is used to interpret the raw bytes of a
+ specific packet and parse the values present in that packet. For
+ example, Parse_Ethernet will parse the ethernet source MAC,
+ destination MAC and ethertype given any random access iterator to
+ the first byte of the ethernet frame. Parsers are extremely light
+ classes. They are temporary classes passed around by value. In
+ most cases, they are just comprised of a single pointer adorned
+ with type information.
+
+ \section handling Packet Handling
+
+ The packet handling is implemented within
+ senf::Packet. This class is the baseclass to all packet
+ interpreter facades. To implement a new packet type, publically
+ derive from senf::Packet and implement the virtual
+ interface (see the class documentation for details).
+
+ \section framework Parser Framework
+
+ The parser framework provides an abstract framwork to parse packet
+ oriented data. A Parser is a template class taking an arbitrary
+ iterator as input and allowing random access to data elements of
+ the interpreted type, like source and destination MAC of an
+ ethernet frame. The parser framework is to be used hierarchically
+ and recursively, the parser methods should return further parsers
+ which can return further parsers and so on.
+
+ The parser framework contains some basic parsers to be used to
+ build up more complex parsers:
+
+ - ParseInt.hh: Lots of parsers for integer numbers like
+ senf::Parse_UInt8, for integer bitfields like
+ senf::Parse_UIntField and senf::Parse_Flag to
+ parse boolean flags.
+
+ - ParseArray.hh: The senf::Parse_Array parser to parse
+ arbitrary fixed-size arrays of fixed-size elements (that is
+ sub-parsers).
+
+ - ParseVec.hh: The senf::Parse_Vector parser to parse
+ dynamically sized arrays of fixed-size elements (that is
+ sub-parsers).
+
+ See senf::ParserBase for further information.
+
+ \section stuff Other Utilities
+
+ The pkf also comprises some additional utilities to support the
+ development of packet classes.
+
+ The senf::PacketRegistry implements a registry of packets
+ keyed by an arbitrary type. The registry is used to find a packet
+ type given some kind of id (like the ethertype value from the
+ ethernet header). Together with it's support classes (especially
+ senf::PacketRegistryMixin) this class greatly simplifies
+ implementing the needed table lookups.
+ */
+
+
+// Local Variables:
+// mode: c++
+// mode: flyspell
+// mode: auto-fill
+// ispell-local-dictionary: "american"
+// End:
diff --git a/Packets/Packet.cc b/Packets/Packet.cc
index c94f0368a..ef5752f34 100644
--- a/Packets/Packet.cc
+++ b/Packets/Packet.cc
@@ -63,7 +63,7 @@
// This is the custom deleter used for the pointers in the
// interpreters list. This deleter is only called, when the Packet is
// removed from the interpreters list.
-prefix_ void satcom::pkf::impl::ListPacketDeleter::operator()(Packet * p)
+prefix_ void senf::impl::ListPacketDeleter::operator()(Packet * p)
{
PacketImpl * impl = PacketImpl::impl(p);
if (impl->releaseInterpreter(p))
@@ -72,8 +72,8 @@ prefix_ void satcom::pkf::impl::ListPacketDeleter::operator()(Packet * p)
// struct PacketImpl
-prefix_ satcom::pkf::Packet::interpreter_list::iterator
-satcom::pkf::impl::PacketImpl::appendInterpreter(Packet * p)
+prefix_ senf::Packet::interpreter_list::iterator
+senf::impl::PacketImpl::appendInterpreter(Packet * p)
{
BOOST_ASSERT( p->impl_ == 0 );
@@ -87,8 +87,8 @@ satcom::pkf::impl::PacketImpl::appendInterpreter(Packet * p)
return p->self_;
}
-prefix_ satcom::pkf::Packet::interpreter_list::iterator
-satcom::pkf::impl::PacketImpl::prependInterpreter(Packet * p)
+prefix_ senf::Packet::interpreter_list::iterator
+senf::impl::PacketImpl::prependInterpreter(Packet * p)
{
BOOST_ASSERT( p->impl_ == 0 );
@@ -96,7 +96,7 @@ satcom::pkf::impl::PacketImpl::prependInterpreter(Packet * p)
SATCOM_PKF_REFC_MSG("] PacketImpl::prependInterpreter (" << this << "): refcount_ = " << refcount_ << "\n");
p->impl_ = this;
this->interpreters_.push_front(
- boost::shared_ptr<Packet>(p, pkf::impl::ListPacketDeleter()));
+ boost::shared_ptr<Packet>(p, impl::ListPacketDeleter()));
p->self_ = this->interpreters_.begin();
return p->self_;
@@ -104,7 +104,7 @@ satcom::pkf::impl::PacketImpl::prependInterpreter(Packet * p)
// Called, whenever a Packet is removed from the list by the
// ListPacketDeleter;
-prefix_ bool satcom::pkf::impl::PacketImpl::releaseInterpreter(Packet * p)
+prefix_ bool senf::impl::PacketImpl::releaseInterpreter(Packet * p)
{
// We have to be extra careful here: This method might be called
// AFTER the PacketImpl instance has already been destructed while
@@ -125,9 +125,9 @@ prefix_ bool satcom::pkf::impl::PacketImpl::releaseInterpreter(Packet * p)
}
namespace {
- bool whenceCmp(unsigned a, unsigned b, bool end, satcom::pkf::Packet::Whence whence)
+ bool whenceCmp(unsigned a, unsigned b, bool end, senf::Packet::Whence whence)
{
- using satcom::pkf::Packet;
+ using senf::Packet;
return ((whence == Packet::OUTSIDE && ! end)
|| whence == Packet::BEFORE
|| (whence == Packet::INSIDE && end)) ? a>=b : a>b;
@@ -135,7 +135,7 @@ namespace {
}
prefix_ void
-satcom::pkf::impl::PacketImpl::updateIterators(Packet::size_type index,
+senf::impl::PacketImpl::updateIterators(Packet::size_type index,
Packet::difference_type n,
Packet::interpreter_list::iterator self,
Packet::Whence whence)
@@ -159,14 +159,14 @@ satcom::pkf::impl::PacketImpl::updateIterators(Packet::size_type index,
}
}
-prefix_ void satcom::pkf::impl::PacketImpl::packet_add_ref(Packet const * p)
+prefix_ void senf::impl::PacketImpl::packet_add_ref(Packet const * p)
{
p->add_ref();
if (p->impl_)
p->impl_->add_ref();
}
-prefix_ void satcom::pkf::impl::PacketImpl::packet_release(Packet * p)
+prefix_ void senf::impl::PacketImpl::packet_release(Packet * p)
{
bool del (p->release());
if (p->impl_ && p->impl_->release())
@@ -180,7 +180,7 @@ prefix_ void satcom::pkf::impl::PacketImpl::packet_release(Packet * p)
///////////////////////////////////////////////////////////////////////////
// class Packet
-prefix_ satcom::pkf::Packet::ptr satcom::pkf::Packet::next()
+prefix_ senf::Packet::ptr senf::Packet::next()
const
{
interpreter_list::iterator n = boost::next(this->self_);
@@ -201,7 +201,7 @@ prefix_ satcom::pkf::Packet::ptr satcom::pkf::Packet::next()
return ptr(n->get(),true);
}
-prefix_ satcom::pkf::Packet::ptr satcom::pkf::Packet::last()
+prefix_ senf::Packet::ptr senf::Packet::last()
const
{
Packet * p = this->impl_->interpreters_.back().get();
@@ -215,7 +215,7 @@ prefix_ satcom::pkf::Packet::ptr satcom::pkf::Packet::last()
return ptr(p,true);
}
-prefix_ void satcom::pkf::Packet::i_registerInterpreter(Packet * p)
+prefix_ void senf::Packet::i_registerInterpreter(Packet * p)
const
{
BOOST_ASSERT( !p->impl_ );
@@ -224,7 +224,7 @@ prefix_ void satcom::pkf::Packet::i_registerInterpreter(Packet * p)
this->parsed_ = true;
}
-prefix_ void satcom::pkf::Packet::i_replaceInterpreter(Packet * p)
+prefix_ void senf::Packet::i_replaceInterpreter(Packet * p)
{
BOOST_ASSERT( !p->impl_ );
// We need to increment the refcount of impl_ beforehand,
@@ -234,14 +234,14 @@ prefix_ void satcom::pkf::Packet::i_replaceInterpreter(Packet * p)
impl->appendInterpreter(p);
}
-prefix_ void satcom::pkf::Packet::i_setInterpreter(impl::PacketImpl * i)
+prefix_ void senf::Packet::i_setInterpreter(impl::PacketImpl * i)
{
// Using prependInterpreter makes this usable for both, the
// create-from-data and wrap-packet constructors
i->prependInterpreter(this);
}
-prefix_ void satcom::pkf::Packet::insert(iterator pos, byte v, Whence whence)
+prefix_ void senf::Packet::insert(iterator pos, byte v, Whence whence)
{
size_type index(pos-impl_->data_.begin());
BOOST_ASSERT( index >= begin_ && index <= end_);
@@ -249,7 +249,7 @@ prefix_ void satcom::pkf::Packet::insert(iterator pos, byte v, Whence whence)
impl_->updateIterators(index,1,self_,whence);
}
-prefix_ void satcom::pkf::Packet::insert(iterator pos, size_type n, byte v, Whence whence)
+prefix_ void senf::Packet::insert(iterator pos, size_type n, byte v, Whence whence)
{
size_type index(pos-impl_->data_.begin());
BOOST_ASSERT( index >= begin_ && index <= end_ );
@@ -257,7 +257,7 @@ prefix_ void satcom::pkf::Packet::insert(iterator pos, size_type n, byte v, When
impl_->updateIterators(index,n,self_,whence);
}
-prefix_ void satcom::pkf::Packet::erase(iterator pos)
+prefix_ void senf::Packet::erase(iterator pos)
{
size_type index(pos-impl_->data_.begin());
BOOST_ASSERT( index >= begin_ && index < end_ );
@@ -265,7 +265,7 @@ prefix_ void satcom::pkf::Packet::erase(iterator pos)
impl_->updateIterators(index,-1,self_,INSIDE);
}
-prefix_ void satcom::pkf::Packet::erase(iterator first, iterator last)
+prefix_ void senf::Packet::erase(iterator first, iterator last)
{
size_type index(first-impl_->data_.begin());
size_type sz(last-first);
@@ -276,7 +276,7 @@ prefix_ void satcom::pkf::Packet::erase(iterator first, iterator last)
impl_->updateIterators(index,-sz,self_,INSIDE);
}
-prefix_ void satcom::pkf::Packet::dump(std::ostream & os)
+prefix_ void senf::Packet::dump(std::ostream & os)
const
{
v_dump(os);
@@ -291,5 +291,5 @@ prefix_ void satcom::pkf::Packet::dump(std::ostream & os)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/Packet.cci b/Packets/Packet.cci
index c3262eace..5a299df9d 100644
--- a/Packets/Packet.cci
+++ b/Packets/Packet.cci
@@ -29,19 +29,19 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::pkf::impl::PacketImpl::PacketImpl()
+prefix_ senf::impl::PacketImpl::PacketImpl()
: data_(), interpreters_(), refcount_(1)
{
SATCOM_PKF_REFC_MSG("] PacketImpl::PacketImpl (" << this << "): refcount_ = 1\n");
}
-prefix_ satcom::pkf::impl::PacketImpl::PacketImpl(unsigned size, Packet::byte initValue)
+prefix_ senf::impl::PacketImpl::PacketImpl(unsigned size, Packet::byte initValue)
: data_(size,initValue), interpreters_(), refcount_(1)
{
SATCOM_PKF_REFC_MSG("] PacketImpl::PacketImpl (" << this << "): refcount_ = 1\n");
}
-prefix_ satcom::pkf::impl::PacketImpl::~PacketImpl()
+prefix_ senf::impl::PacketImpl::~PacketImpl()
{
BOOST_ASSERT( !refcount_ );
SATCOM_PKF_REFC_MSG("] PacketImpl::~PacketImpl (" << this << ")\n");
@@ -49,13 +49,13 @@ prefix_ satcom::pkf::impl::PacketImpl::~PacketImpl()
// PacketImpl::add_ref and PacketImpl::release are only called from
// intrusive_ptr_add_ref and intrusive_ptr_release
-prefix_ void satcom::pkf::impl::PacketImpl::add_ref()
+prefix_ void senf::impl::PacketImpl::add_ref()
{
++refcount_;
SATCOM_PKF_REFC_MSG("] PacketImpl::add_ref (" << this << "): refcount_ = " << refcount_ << "\n");
}
-prefix_ bool satcom::pkf::impl::PacketImpl::release()
+prefix_ bool senf::impl::PacketImpl::release()
{
BOOST_ASSERT( refcount_ > 0 );
--refcount_;
@@ -63,25 +63,25 @@ prefix_ bool satcom::pkf::impl::PacketImpl::release()
return ! refcount_;
}
-prefix_ void satcom::pkf::impl::PacketImpl::truncateInterpreters(Packet const * p)
+prefix_ void senf::impl::PacketImpl::truncateInterpreters(Packet const * p)
{
BOOST_ASSERT( p->impl_ == this );
this->interpreters_.erase(p->self_,this->interpreters_.end());
}
-prefix_ void satcom::pkf::impl::PacketImpl::truncateInterpretersAfter(Packet const * p)
+prefix_ void senf::impl::PacketImpl::truncateInterpretersAfter(Packet const * p)
{
BOOST_ASSERT( p->impl_ == this );
this->interpreters_.erase(boost::next(p->self_),this->interpreters_.end());
}
-prefix_ satcom::pkf::impl::PacketImpl* satcom::pkf::impl::PacketImpl::impl(Packet const * p)
+prefix_ senf::impl::PacketImpl* senf::impl::PacketImpl::impl(Packet const * p)
{
return p->impl_;
}
/*
-prefix_ std::ostream & satcom::pkf::operator<<(std::ostream & os, Packet const & packet)
+prefix_ std::ostream & senf::operator<<(std::ostream & os, Packet const & packet)
{
packet.dump(os);
return os;
@@ -90,22 +90,22 @@ prefix_ std::ostream & satcom::pkf::operator<<(std::ostream & os, Packet const &
// These methods are called by the user codes Packet::ptr's. They
// refcount both the Packet and the owning PacketImpl.
-prefix_ void satcom::pkf::intrusive_ptr_add_ref(Packet const * p)
+prefix_ void senf::intrusive_ptr_add_ref(Packet const * p)
{
impl::PacketImpl::packet_add_ref(p);
}
-prefix_ void satcom::pkf::intrusive_ptr_release(Packet * p)
+prefix_ void senf::intrusive_ptr_release(Packet * p)
{
impl::PacketImpl::packet_release(p);
}
-prefix_ void satcom::pkf::impl::intrusive_ptr_add_ref(PacketImpl * p)
+prefix_ void senf::impl::intrusive_ptr_add_ref(PacketImpl * p)
{
p->add_ref();
}
-prefix_ void satcom::pkf::impl::intrusive_ptr_release(PacketImpl * p)
+prefix_ void senf::impl::intrusive_ptr_release(PacketImpl * p)
{
if (p->release())
delete p;
@@ -114,25 +114,25 @@ prefix_ void satcom::pkf::impl::intrusive_ptr_release(PacketImpl * p)
///////////////////////////////////////////////////////////////////////////
// class Packet
-prefix_ satcom::pkf::Packet::iterator satcom::pkf::Packet::begin()
+prefix_ senf::Packet::iterator senf::Packet::begin()
const
{
return impl_->data_.begin()+begin_;
}
-prefix_ satcom::pkf::Packet::iterator satcom::pkf::Packet::end()
+prefix_ senf::Packet::iterator senf::Packet::end()
const
{
return impl_->data_.begin()+end_;
}
-prefix_ size_t satcom::pkf::Packet::size()
+prefix_ size_t senf::Packet::size()
const
{
return end_-begin_;
}
-prefix_ satcom::pkf::Packet::ptr satcom::pkf::Packet::prev()
+prefix_ senf::Packet::ptr senf::Packet::prev()
const
{
if (this->self_ == this->impl_->interpreters_.begin())
@@ -143,7 +143,7 @@ prefix_ satcom::pkf::Packet::ptr satcom::pkf::Packet::prev()
return ptr(boost::prior(this->self_)->get(),true);
}
-prefix_ satcom::pkf::Packet::ptr satcom::pkf::Packet::head()
+prefix_ senf::Packet::ptr senf::Packet::head()
const
{
// Re-converting the to a smart pointer is correct here, since the
@@ -152,7 +152,7 @@ prefix_ satcom::pkf::Packet::ptr satcom::pkf::Packet::head()
return ptr(this->impl_->interpreters_.front().get(),true);
}
-prefix_ satcom::pkf::Packet::~Packet()
+prefix_ senf::Packet::~Packet()
{
// FIXME: This is bad ... we cannot check this since this
// assertion fails at the moment if the Packet constructor throws
@@ -162,14 +162,14 @@ prefix_ satcom::pkf::Packet::~Packet()
SATCOM_PKF_REFC_MSG("] Packet::~Packet (" << this << ")\n");
}
-prefix_ void satcom::pkf::Packet::add_ref()
+prefix_ void senf::Packet::add_ref()
const
{
++this->refcount_;
SATCOM_PKF_REFC_MSG("] Packet::add_ref (" << this << "): refcount_ = " << this->refcount_ << "\n");
}
-prefix_ bool satcom::pkf::Packet::release()
+prefix_ bool senf::Packet::release()
{
BOOST_ASSERT( this->refcount_ > 0 );
--this->refcount_;
@@ -177,7 +177,7 @@ prefix_ bool satcom::pkf::Packet::release()
return !this->refcount_ && !this->impl_;
}
-prefix_ bool satcom::pkf::Packet::unlink()
+prefix_ bool senf::Packet::unlink()
{
SATCOM_PKF_REFC_MSG("] Packet::unlink (" << this << "): refcount_ = " << this->refcount_ << "\n");
this->impl_ = 0;
@@ -191,5 +191,5 @@ prefix_ bool satcom::pkf::Packet::unlink()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/Packet.ct b/Packets/Packet.ct
index edc6518f9..ecb2fde09 100644
--- a/Packets/Packet.ct
+++ b/Packets/Packet.ct
@@ -32,8 +32,8 @@
///////////////////////////////ct.p////////////////////////////////////////
template <class OtherPacket, class InputIterator>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr
-satcom::pkf::Packet::create(InputIterator b, InputIterator e)
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr
+senf::Packet::create(InputIterator b, InputIterator e)
{
boost::intrusive_ptr<impl::PacketImpl> impl (new impl::PacketImpl(b,e),false);
if (!check<OtherPacket>(impl->data_.begin(),impl->data_.end()))
@@ -43,7 +43,7 @@ satcom::pkf::Packet::create(InputIterator b, InputIterator e)
}
template <class OtherPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::create()
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr senf::Packet::create()
{
boost::intrusive_ptr<impl::PacketImpl> impl (
new impl::PacketImpl(min_bytes<OtherPacket>(),0));
@@ -53,8 +53,8 @@ prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packe
}
template <class OuterPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OuterPacket>::ptr
-satcom::pkf::Packet::create(Packet::ptr payload)
+prefix_ typename senf::Packet::ptr_t<OuterPacket>::ptr
+senf::Packet::create(Packet::ptr payload)
{
// TODO: should I instead of using head() throw away all
// interpreters before payload? ... probably yes ...
@@ -65,7 +65,7 @@ satcom::pkf::Packet::create(Packet::ptr payload)
}
template <class OtherPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::reinterpret()
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr senf::Packet::reinterpret()
{
// THIS INVALIDATES this !!!!!!!
if (!check<OtherPacket>(begin(),end()))
@@ -75,8 +75,8 @@ prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packe
}
template <class OtherPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr
-satcom::pkf::Packet::registerInterpreter(raw_container::iterator begin,
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr
+senf::Packet::registerInterpreter(raw_container::iterator begin,
raw_container::iterator end)
const
{
@@ -94,7 +94,7 @@ satcom::pkf::Packet::registerInterpreter(raw_container::iterator begin,
#include BOOST_PP_ITERATE()
template <class OtherPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::find_next()
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr senf::Packet::find_next()
const
{
ptr p (next());
@@ -104,7 +104,7 @@ prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packe
}
template <class OtherPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::find_prev()
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr senf::Packet::find_prev()
const
{
ptr p (prev());
@@ -114,7 +114,7 @@ prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packe
}
template <class OtherPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::get_next()
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr senf::Packet::get_next()
const
{
typename ptr_t<OtherPacket>::ptr p (find_next<OtherPacket>());
@@ -123,7 +123,7 @@ prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packe
}
template <class OtherPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::get_prev()
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr senf::Packet::get_prev()
const
{
typename ptr_t<OtherPacket>::ptr p (find_prev<OtherPacket>());
@@ -132,7 +132,7 @@ prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packe
}
template <class InputIterator>
-prefix_ void satcom::pkf::Packet::insert(iterator pos, InputIterator f, InputIterator l,
+prefix_ void senf::Packet::insert(iterator pos, InputIterator f, InputIterator l,
Whence whence)
{
size_type index(pos-impl_->data_.begin());
@@ -148,5 +148,5 @@ prefix_ void satcom::pkf::Packet::insert(iterator pos, InputIterator f, InputIte
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/Packet.cti b/Packets/Packet.cti
index 364bd1702..79c32fa71 100644
--- a/Packets/Packet.cti
+++ b/Packets/Packet.cti
@@ -30,14 +30,14 @@
///////////////////////////////cti.p///////////////////////////////////////
template <typename OtherPacket>
-prefix_ bool satcom::pkf::Packet::is()
+prefix_ bool senf::Packet::is()
const
{
return dynamic_cast<OtherPacket const *>(this);
}
template <typename OtherPacket>
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::as()
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr senf::Packet::as()
{
return typename ptr_t<OtherPacket>::ptr(dynamic_cast<OtherPacket*>(this),true);
}
@@ -45,7 +45,7 @@ prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packe
// This constructor appends a new interreter to the interpreter chain
// of an existing Packet
template <class Operation>
-prefix_ satcom::pkf::Packet::Packet(Operation const & arg)
+prefix_ senf::Packet::Packet(Operation const & arg)
: impl_(0), begin_(arg.begin()), end_(arg.end()), self_(),
parsed_(false), refcount_(1)
{
@@ -57,7 +57,7 @@ prefix_ satcom::pkf::Packet::Packet(Operation const & arg)
}
template <class InputIterator>
-prefix_ satcom::pkf::impl::PacketImpl::PacketImpl(InputIterator begin, InputIterator end)
+prefix_ senf::impl::PacketImpl::PacketImpl(InputIterator begin, InputIterator end)
: data_(begin, end), interpreters_(), refcount_(1)
{
SATCOM_PKF_REFC_MSG("] PacketImpl::PacketImpl (" << this << "): refcount_ = 1\n")
@@ -69,5 +69,5 @@ prefix_ satcom::pkf::impl::PacketImpl::PacketImpl(InputIterator begin, InputIter
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/Packet.hh b/Packets/Packet.hh
index 14345e3d0..2511c8a97 100644
--- a/Packets/Packet.hh
+++ b/Packets/Packet.hh
@@ -37,83 +37,6 @@
// beginning. This really is just another type of deque
// implementation.
-
-/** \mainpage The SENF Packet Library
-
- \section arch Overall Architecture
-
- The general Architecture of the Packet Framework (pkf for short)
- is seperated into two components: The basic packet handling and
- the parser framework.
-
- The basic packet handling implements a packet interpreter
- chain. Every packet is represented as a chain of interpreters
- where each interpreter is a facade looking into the same
- packet. Each interpreter will interpret a specific header of a
- packet. For example, an ethernet frame might have an interpreter
- chain consisting of EthernetPacket, IPPacket, UDPPacket and
- DataPacket. Each of these interpreters will interpret a section of
- the raw data bytes. The interpreter ranges overlap since every
- packet also includes it's payload.
-
- The parser framework is used to interpret the raw bytes of a
- specific packet and parse the values present in that packet. For
- example, Parse_Ethernet will parse the ethernet source MAC,
- destination MAC and ethertype given any random access iterator to
- the first byte of the ethernet frame. Parsers are extremely light
- classes. They are temporary classes passed around by value. In
- most cases, they are just comprised of a single pointer adorned
- with type information.
-
- \section handling Packet Handling
-
- The packet handling is implemented within
- satcom::pkf::Packet. This class is the baseclass to all packet
- interpreter facades. To implement a new packet type, publically
- derive from satcom::pkf::Packet and implement the virtual
- interface (see the class documentation for details).
-
- \section framework Parser Framework
-
- The parser framework provides an abstract framwork to parse packet
- oriented data. A Parser is a template class taking an arbitrary
- iterator as input and allowing random access to data elements of
- the interpreted type, like source and destination MAC of an
- ethernet frame. The parser framework is to be used hierarchically
- and recursively, the parser methods should return further parsers
- which can return further parsers and so on.
-
- The parser framework contains some basic parsers to be used to
- build up more complex parsers:
-
- - ParseInt.hh: Lots of parsers for integer numbers like
- satcom::pkf::Parse_UInt8, for integer bitfields like
- satcom::pkf::Parse_UIntField and satcom::pkf::Parse_Flag to
- parse boolean flags.
-
- - ParseArray.hh: The satcom::pkf::Parse_Array parser to parse
- arbitrary fixed-size arrays of fixed-size elements (that is
- sub-parsers).
-
- - ParseVec.hh: The satcom::pkf::Parse_Vector parser to parse
- dynamically sized arrays of fixed-size elements (that is
- sub-parsers).
-
- See satcom::pkf::ParserBase for further information.
-
- \section stuff Other Utilities
-
- The pkf also comprises some additional utilities to support the
- development of packet classes.
-
- The satcom::pkf::PacketRegistry implements a registry of packets
- keyed by an arbitrary type. The registry is used to find a packet
- type given some kind of id (like the ethertype value from the
- ethernet header). Together with it's support classes (especially
- satcom::pkf::PacketRegistryMixin) this class greatly simplifies
- implementing the needed table lookups.
- */
-
/** \file
\brief Main packet interface
*/
@@ -133,8 +56,7 @@
#include "Packet.mpp"
// ////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
namespace impl { template <class OtherPacket> class PkReg_EntryImpl; }
namespace impl { class PacketImpl; }
@@ -145,7 +67,7 @@ namespace pkf {
This class is the base class of all Packets. It implements the
generic Packet interface and provides the packet management
- framework. satcom::pkf::Packet manages the necessary memory
+ framework. senf::Packet manages the necessary memory
resources and controlls the chain of packet interpreters.
The Packet user always interfaces with the pkf via a Packet
@@ -195,7 +117,7 @@ namespace pkf {
\code
class ExamplePacket
- : public satcom::pkf::Packet
+ : public senf::Packet
{
public:
typedef ptr_t<ExamplePacket>::ptr ptr;
@@ -210,7 +132,7 @@ namespace pkf {
private:
template <class Arg>
ExamplePacket(Arg arg [, other args ... ])
- : satcom::pkf::Packet(arg)
+ : senf::Packet(arg)
{}
virtual void v_nextInterpreter() const
@@ -225,14 +147,14 @@ namespace pkf {
// calculate checksum etc
}
- friend class satcom::pkf::Packet;
+ friend class senf::Packet;
};
\endcode
Please do not implement the methods inline to not clutter up
the header file. This is done here in the example to simplify
it. If a class is to be registered in some
- satcom:pkf::PacketRegistry, it must not take any additional
+ senf:PacketRegistry, it must not take any additional
constructor parameters.
After having implemented the bare framework, the most comman
@@ -246,8 +168,8 @@ namespace pkf {
\code
class ExamplePacket
- : public satcom::pkf::Packet,
- public Parse_Example<satcom::pkf::Packet::iterator,
+ : public senf::Packet,
+ public Parse_Example<senf::Packet::iterator,
ExamplePacket>
{
@@ -257,17 +179,17 @@ namespace pkf {
private:
template <class InputIterator>
ExamplePacket(InputIterator begin, InputIterator end)
- : satcom::pkf::Packet(begin,end)
+ : senf::Packet(begin,end)
{}
};
\endcode
- See the satcom::pkf::ParserBase Documentation for how to
+ See the senf::ParserBase Documentation for how to
implement Parse_Example.
The implementation of v_nextInterpreter most of the time
relies on some packet registry. This is simplified using the
- satcom::pkf::PacketRegistryMixin class as follows. Again, we
+ senf::PacketRegistryMixin class as follows. Again, we
only show the differences from the preceding Example:
\code
@@ -276,14 +198,14 @@ namespace pkf {
};
class ExamplePacket
- : public satcom::pkf::Packet,
- public Parse_Example<satcom::pkf::Packet::iterator,
+ : public senf::Packet,
+ public Parse_Example<senf::Packet::iterator,
ExamplePacket>,
- public satcom::pkf::PacketRegistryMixin<ExampleRegistry,
+ public senf::PacketRegistryMixin<ExampleRegistry,
ExamplePacket>
{
- using satcom::pkf::Packet::registerInterpreter;
- using satcom::pkf::PacketRegsitryMixin<ExampleRegistry,ExamplePacket>::registerInterpreter;
+ using senf::Packet::registerInterpreter;
+ using senf::PacketRegsitryMixin<ExampleRegistry,ExamplePacket>::registerInterpreter;
private:
virtual void v_nextInterpreter() const
{
@@ -296,7 +218,7 @@ namespace pkf {
\endcode
For further details on the packet registry, see
- satcom::pkf::PacketRegistry.
+ senf::PacketRegistry.
\section packet_impl Implementation details
@@ -307,7 +229,7 @@ namespace pkf {
imporved by either allocating some headroom/tailroom in the
vector and using this when inserting data at the beginning or
end. Alternatively, a new container class (like the
- satcom::lib::deque_list) could be used to support zero-copy
+ senf::deque_list) could be used to support zero-copy
semantics.
At the moment, we leave the implementation at
@@ -358,7 +280,7 @@ namespace pkf {
typedef std::vector<byte> raw_container;
typedef boost::shared_ptr<Packet> interpreter_list_ptr;
- typedef std::list<satcom::pkf::Packet::interpreter_list_ptr> interpreter_list;
+ typedef std::list<senf::Packet::interpreter_list_ptr> interpreter_list;
typedef unsigned refcount_t;
///@}
@@ -593,7 +515,7 @@ namespace pkf {
instance. The new instance is automatically added to the
interpreter chain after the current interpreter.
- See also satcom::pkf::PacketRegistryMixin on how to
+ See also senf::PacketRegistryMixin on how to
use a Registry to find the next interpreters implementing
class.
*/
@@ -689,7 +611,7 @@ namespace pkf {
struct TruncatedPacketException : public std::exception
{ virtual char const * what() const throw() { return "truncated packet"; } };
-}}
+}
// ////////////////////////////hh.e////////////////////////////////////////
#include "Packet.cci"
@@ -702,5 +624,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/Packet.ih b/Packets/Packet.ih
index 15203859a..550145c08 100644
--- a/Packets/Packet.ih
+++ b/Packets/Packet.ih
@@ -34,8 +34,8 @@
#define SATCOM_PKF_REFC_MSG(x)
#endif
-namespace satcom {
-namespace pkf {
+namespace senf {
+
namespace impl {
// This deleter is used in the PacketImpl list holding the
@@ -91,10 +91,10 @@ namespace impl {
// method invocations
void intrusive_ptr_add_ref(PacketImpl * p);
void intrusive_ptr_release(PacketImpl * p);
-}}}
+}}
-struct satcom::pkf::Packet::PacketOp_register
+struct senf::Packet::PacketOp_register
{
size_type b;
size_type e;
@@ -109,7 +109,7 @@ struct satcom::pkf::Packet::PacketOp_register
{ p->i_registerInterpreter(self); }
};
-struct satcom::pkf::Packet::PacketOp_replace
+struct senf::Packet::PacketOp_replace
{
Packet * p;
@@ -121,7 +121,7 @@ struct satcom::pkf::Packet::PacketOp_replace
{ p->i_replaceInterpreter(self); }
};
-struct satcom::pkf::Packet::PacketOp_set
+struct senf::Packet::PacketOp_set
{
impl::PacketImpl * i;
@@ -139,5 +139,5 @@ struct satcom::pkf::Packet::PacketOp_set
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/Packet.mpp b/Packets/Packet.mpp
index 3d47d96bf..36809a483 100644
--- a/Packets/Packet.mpp
+++ b/Packets/Packet.mpp
@@ -49,8 +49,8 @@ typename ptr_t<OtherPacket>::ptr reinterpret( BOOST_PP_ENUM( BOOST_PP_ITERATION(
// Packet::reinterpret implementation
template <class OtherPacket, BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), class A) >
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr
-satcom::pkf::Packet::reinterpret( BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) )
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr
+senf::Packet::reinterpret( BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) )
{
if (!OtherPacket::check(begin(),end()))
throw TruncatedPacketException();
@@ -75,8 +75,8 @@ typename ptr_t<OtherPacket>::ptr registerInterpreter(
// Packet::registerIterpreter implementation
template <class OtherPacket, BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), class A) >
-prefix_ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr
-satcom::pkf::Packet::registerInterpreter(raw_container::iterator begin,
+prefix_ typename senf::Packet::ptr_t<OtherPacket>::ptr
+senf::Packet::registerInterpreter(raw_container::iterator begin,
raw_container::iterator end,
BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) )
const
@@ -98,7 +98,7 @@ satcom::pkf::Packet::registerInterpreter(raw_container::iterator begin,
template < class OtherPacket, class InputIterator,
BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), class A) >
-static typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr create(
+static typename senf::Packet::ptr_t<OtherPacket>::ptr create(
InputIterator b, InputIterator e,
BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) );
@@ -108,7 +108,7 @@ static typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr create(
template < class OtherPacket, class InputIterator,
BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), class A) >
-typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::create(
+typename senf::Packet::ptr_t<OtherPacket>::ptr senf::Packet::create(
InputIterator b, InputIterator e,
BOOST_PP_ENUM( BOOST_PP_ITERATION(), pkARG, ) )
{
@@ -130,5 +130,5 @@ typename satcom::pkf::Packet::ptr_t<OtherPacket>::ptr satcom::pkf::Packet::creat
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc
index d41e8a0aa..5c0319a4f 100644
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -36,7 +36,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
// Since Packet is abstract, we can only test the Packet interface using
// a simple implementation: DataPacket and GenericPacket.
@@ -243,5 +243,5 @@ BOOST_AUTO_UNIT_TEST(Packet_new)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/PacketRegistry.cc b/Packets/PacketRegistry.cc
index 631d76391..ec0352b10 100644
--- a/Packets/PacketRegistry.cc
+++ b/Packets/PacketRegistry.cc
@@ -30,8 +30,8 @@
#define prefix_
///////////////////////////////PacketRegistry..p////////////////////////////////////////
-satcom::pkf::impl::PkReg_EntryImpl<satcom::pkf::DataPacket>
- satcom::pkf::impl::pkreg_dataEntry;
+senf::impl::PkReg_EntryImpl<senf::DataPacket>
+ senf::impl::pkreg_dataEntry;
///////////////////////////////PacketRegistry..e////////////////////////////////////////
#undef prefix_
@@ -39,5 +39,5 @@ satcom::pkf::impl::PkReg_EntryImpl<satcom::pkf::DataPacket>
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/PacketRegistry.ct b/Packets/PacketRegistry.ct
index e40f3ac12..ce424fa66 100644
--- a/Packets/PacketRegistry.ct
+++ b/Packets/PacketRegistry.ct
@@ -33,19 +33,19 @@
template <class KeyType>
template <class OtherPacket>
-prefix_ void satcom::pkf::impl::PacketRegistryImpl<KeyType>::registerPacket(key_t key)
+prefix_ void senf::impl::PacketRegistryImpl<KeyType>::registerPacket(key_t key)
{
// If this assertion fails, a Packet was registered with an already known key
BOOST_ASSERT( registry_.insert(std::make_pair(
key, Entry_ptr(new impl::PkReg_EntryImpl<OtherPacket>()))).second );
// If this assertion fails, the same Packet was registered with two different keys
BOOST_ASSERT( reverseRegistry_.insert(
- std::make_pair(satcom::lib::typeIdValue<OtherPacket>(), key)).second );
+ std::make_pair(senf::typeIdValue<OtherPacket>(), key)).second );
}
template <class KeyType>
-prefix_ typename satcom::pkf::impl::PacketRegistryImpl<KeyType>::key_t
-satcom::pkf::impl::PacketRegistryImpl<KeyType>::key(satcom::lib::TypeIdValue const & type)
+prefix_ typename senf::impl::PacketRegistryImpl<KeyType>::key_t
+senf::impl::PacketRegistryImpl<KeyType>::key(senf::TypeIdValue const & type)
{
typename ReversePacketMap::iterator i (reverseRegistry_.find(type));
if (i==reverseRegistry_.end())
@@ -55,7 +55,7 @@ satcom::pkf::impl::PacketRegistryImpl<KeyType>::key(satcom::lib::TypeIdValue con
template <class OtherPacket>
prefix_ void
-satcom::pkf::impl::PkReg_EntryImpl<OtherPacket>::registerInterpreter(Packet const * p,
+senf::impl::PkReg_EntryImpl<OtherPacket>::registerInterpreter(Packet const * p,
Packet::iterator b,
Packet::iterator e)
{
@@ -63,15 +63,15 @@ satcom::pkf::impl::PkReg_EntryImpl<OtherPacket>::registerInterpreter(Packet cons
}
template <class OtherPacket>
-prefix_ satcom::pkf::Packet::ptr
-satcom::pkf::impl::PkReg_EntryImpl<OtherPacket>::reinterpret(Packet * p)
+prefix_ senf::Packet::ptr
+senf::impl::PkReg_EntryImpl<OtherPacket>::reinterpret(Packet * p)
{
return p->template reinterpret<OtherPacket>();
}
template <class KeyType>
-prefix_ typename satcom::pkf::impl::PacketRegistryImpl<KeyType>::Entry *
-satcom::pkf::impl::PacketRegistryImpl<KeyType>::lookup(key_t key)
+prefix_ typename senf::impl::PacketRegistryImpl<KeyType>::Entry *
+senf::impl::PacketRegistryImpl<KeyType>::lookup(key_t key)
{
typename PacketMap::iterator i (registry_.find(key));
if (i==registry_.end())
@@ -81,8 +81,8 @@ satcom::pkf::impl::PacketRegistryImpl<KeyType>::lookup(key_t key)
template <class Tag>
template <class InputIterator>
-prefix_ satcom::pkf::Packet::ptr
-satcom::pkf::PacketRegistry<Tag>::create(typename Tag::key_t key, InputIterator b,
+prefix_ senf::Packet::ptr
+senf::PacketRegistry<Tag>::create(typename Tag::key_t key, InputIterator b,
InputIterator e)
{
Packet::ptr p (Packet::create<DataPacket>(b,e));
@@ -90,8 +90,8 @@ satcom::pkf::PacketRegistry<Tag>::create(typename Tag::key_t key, InputIterator
}
template <class Tag>
-prefix_ typename satcom::pkf::PacketRegistry<Tag>::Registry &
-satcom::pkf::PacketRegistry<Tag>::registry()
+prefix_ typename senf::PacketRegistry<Tag>::Registry &
+senf::PacketRegistry<Tag>::registry()
{
static Registry registry;
return registry;
@@ -103,5 +103,5 @@ satcom::pkf::PacketRegistry<Tag>::registry()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/PacketRegistry.cti b/Packets/PacketRegistry.cti
index 8c86ad89a..a09c249d3 100644
--- a/Packets/PacketRegistry.cti
+++ b/Packets/PacketRegistry.cti
@@ -32,14 +32,14 @@
template <class Tag>
template <class OtherPacket>
-prefix_ void satcom::pkf::PacketRegistry<Tag>::registerPacket(typename Tag::key_t key)
+prefix_ void senf::PacketRegistry<Tag>::registerPacket(typename Tag::key_t key)
{
registry().registerPacket<OtherPacket>(key);
}
template <class Tag>
template <class OtherPacket>
-prefix_ satcom::pkf::PacketRegistry<Tag>::RegistrationProxy<OtherPacket>::
+prefix_ senf::PacketRegistry<Tag>::RegistrationProxy<OtherPacket>::
RegistrationProxy(typename Tag::key_t key)
{
PacketRegistry<Tag>::template registerPacket<OtherPacket>(key);
@@ -47,15 +47,15 @@ RegistrationProxy(typename Tag::key_t key)
template <class Tag>
template <class OtherPacket>
-prefix_ typename Tag::key_t satcom::pkf::PacketRegistry<Tag>::key()
+prefix_ typename Tag::key_t senf::PacketRegistry<Tag>::key()
{
- return registry().key(satcom::lib::typeIdValue<OtherPacket>());
+ return registry().key(senf::typeIdValue<OtherPacket>());
}
template <class KeyType>
template <class OtherPacket>
prefix_ void
-satcom::pkf::impl::PacketRegistryImpl<KeyType>::registerInterpreter(Packet * p,
+senf::impl::PacketRegistryImpl<KeyType>::registerInterpreter(Packet * p,
Packet::iterator b,
Packet::iterator e)
{
@@ -64,7 +64,7 @@ satcom::pkf::impl::PacketRegistryImpl<KeyType>::registerInterpreter(Packet * p,
template <class Tag, class Derived>
prefix_ void
-satcom::pkf::PacketRegistryMixin<Tag,Derived>::registerInterpreter(typename Tag::key_t key,
+senf::PacketRegistryMixin<Tag,Derived>::registerInterpreter(typename Tag::key_t key,
Packet::iterator b,
Packet::iterator e)
const
@@ -79,5 +79,5 @@ satcom::pkf::PacketRegistryMixin<Tag,Derived>::registerInterpreter(typename Tag:
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/PacketRegistry.hh b/Packets/PacketRegistry.hh
index 94f93b1fb..96370a1b3 100644
--- a/Packets/PacketRegistry.hh
+++ b/Packets/PacketRegistry.hh
@@ -34,8 +34,8 @@
//#include "PacketRegistry.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
namespace impl { template <class key> class PacketRegistryImpl; }
@@ -152,7 +152,7 @@ namespace pkf {
This mixin class provides a new registerInterpreter
implementation which can be used besides the methods provided
- bei satcom::pkf::Packet to add a new interpreter to the
+ bei senf::Packet to add a new interpreter to the
interpreter chain.
\code
@@ -191,7 +191,7 @@ namespace pkf {
struct PacketTypeNotRegistered : public std::exception
{ virtual char const * what() const throw() { return "packet type not registered"; } };
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "PacketRegistry.cci"
@@ -202,5 +202,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/PacketRegistry.ih b/Packets/PacketRegistry.ih
index f01450655..80fd0379c 100644
--- a/Packets/PacketRegistry.ih
+++ b/Packets/PacketRegistry.ih
@@ -30,8 +30,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
namespace impl {
struct PkReg_Entry {
@@ -77,7 +77,7 @@ namespace impl {
template <class OtherPacket>
void registerPacket(key_t key);
- key_t key(satcom::lib::TypeIdValue const & type);
+ key_t key(senf::TypeIdValue const & type);
Entry * lookup(key_t key);
@@ -89,7 +89,7 @@ namespace impl {
typedef boost::shared_ptr<Entry> Entry_ptr;
typedef std::map<key_t, Entry_ptr> PacketMap;
- typedef std::map<satcom::lib::TypeIdValue, key_t> ReversePacketMap;
+ typedef std::map<senf::TypeIdValue, key_t> ReversePacketMap;
PacketMap registry_;
ReversePacketMap reverseRegistry_;
@@ -97,7 +97,7 @@ namespace impl {
extern PkReg_EntryImpl<DataPacket> pkreg_dataEntry;
-}}}
+}}
///////////////////////////////ih.e////////////////////////////////////////
#endif
@@ -105,5 +105,5 @@ namespace impl {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index 4d235c705..f33b60a98 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -39,7 +39,7 @@
namespace {
- using namespace satcom::pkf;
+ using namespace senf;
struct BaseTag {
typedef unsigned key_t;
@@ -167,5 +167,5 @@ BOOST_AUTO_UNIT_TEST(packetRegistry_test)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseArray.cti b/Packets/ParseArray.cti
index c932dd831..c6f46caac 100644
--- a/Packets/ParseArray.cti
+++ b/Packets/ParseArray.cti
@@ -37,31 +37,31 @@
///////////////////////////////cti.p///////////////////////////////////////
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::Parse_Array()
+prefix_ senf::Parse_Array<elements,Parser,Iterator,IPacket>::Parse_Array()
{}
template <unsigned elements, class Parser, class Iterator, class IPacket>
prefix_
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::Parse_Array(Iterator const & i)
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::Parse_Array(Iterator const & i)
: ParserBase<Iterator,IPacket>(i)
{}
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ unsigned satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::bytes()
+prefix_ unsigned senf::Parse_Array<elements,Parser,Iterator,IPacket>::bytes()
{
return elements*Parser::bytes();
}
template <unsigned elements, class Parser, class Iterator, class IPacket>
prefix_ bool
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::check(Iterator const & e)
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::check(Iterator const & e)
const
{
return e-this->i() >= bytes();
}
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ void satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::init()
+prefix_ void senf::Parse_Array<elements,Parser,Iterator,IPacket>::init()
const
{
iterator e=end();
@@ -71,47 +71,47 @@ prefix_ void satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::init()
///////////////////////////////////////////////////////////////////////////
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::size_type
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::size()
+prefix_ typename senf::Parse_Array<elements,Parser,Iterator,IPacket>::size_type
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::size()
{
return elements;
}
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::iterator
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::begin()
+prefix_ typename senf::Parse_Array<elements,Parser,Iterator,IPacket>::iterator
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::begin()
const
{
return iterator(this->i());
}
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::iterator
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::end()
+prefix_ typename senf::Parse_Array<elements,Parser,Iterator,IPacket>::iterator
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::end()
const
{
return iterator(this->i()+bytes());
}
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::range_type
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::range()
+prefix_ typename senf::Parse_Array<elements,Parser,Iterator,IPacket>::range_type
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::range()
const
{
return std::make_pair(begin(),end());
}
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::iterator
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::value()
+prefix_ typename senf::Parse_Array<elements,Parser,Iterator,IPacket>::iterator
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::value()
const
{
return begin();
}
template <unsigned elements, class Parser, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::value_type
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::operator[](difference_type i)
+prefix_ typename senf::Parse_Array<elements,Parser,Iterator,IPacket>::value_type
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::operator[](difference_type i)
const
{
return begin()[i];
@@ -119,8 +119,8 @@ satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::operator[](differenc
template <unsigned elements, class Parser, class Iterator, class IPacket>
template <class InputIterator>
-prefix_ satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket> const &
-satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::operator=(InputIterator const & i)
+prefix_ senf::Parse_Array<elements,Parser,Iterator,IPacket> const &
+senf::Parse_Array<elements,Parser,Iterator,IPacket>::operator=(InputIterator const & i)
{
copy_n(i,size(),begin());
}
@@ -128,40 +128,40 @@ satcom::pkf::Parse_Array<elements,Parser,Iterator,IPacket>::operator=(InputItera
///////////////////////////////////////////////////////////////////////////
template <class Parser, class Iterator>
-prefix_ Iterator satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::raw()
+prefix_ Iterator senf::impl::Parse_Array_iterator<Parser,Iterator>::raw()
const
{
return i_;
}
template <class Parser, class Iterator>
-prefix_ Parser satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::operator[](int i)
+prefix_ Parser senf::impl::Parse_Array_iterator<Parser,Iterator>::operator[](int i)
const
{
return (*this+i).dereference();
}
template <class Parser, class Iterator>
-prefix_ satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::Parse_Array_iterator()
+prefix_ senf::impl::Parse_Array_iterator<Parser,Iterator>::Parse_Array_iterator()
: i_()
{}
template <class Parser, class Iterator>
-prefix_ satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::
+prefix_ senf::impl::Parse_Array_iterator<Parser,Iterator>::
Parse_Array_iterator(Iterator const & i)
: i_(i)
{}
template <class Parser, class Iterator>
prefix_ Parser
-satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::dereference()
+senf::impl::Parse_Array_iterator<Parser,Iterator>::dereference()
const
{
return Parser(i_);
}
template <class Parser, class Iterator>
-prefix_ bool satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::
+prefix_ bool senf::impl::Parse_Array_iterator<Parser,Iterator>::
equal(Parse_Array_iterator const & other)
const
{
@@ -169,7 +169,7 @@ equal(Parse_Array_iterator const & other)
}
template <class Parser, class Iterator>
-prefix_ int satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::
+prefix_ int senf::impl::Parse_Array_iterator<Parser,Iterator>::
distance_to(Parse_Array_iterator const & other)
const
{
@@ -177,20 +177,20 @@ distance_to(Parse_Array_iterator const & other)
}
template <class Parser, class Iterator>
-prefix_ void satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::increment()
+prefix_ void senf::impl::Parse_Array_iterator<Parser,Iterator>::increment()
{
i_ += Parser::bytes();
}
template <class Parser, class Iterator>
-prefix_ void satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::decrement()
+prefix_ void senf::impl::Parse_Array_iterator<Parser,Iterator>::decrement()
{
i_ -= Parser::bytes();
}
template <class Parser, class Iterator>
prefix_ void
-satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::advance(int n)
+senf::impl::Parse_Array_iterator<Parser,Iterator>::advance(int n)
{
i_ += n*Parser::bytes();
}
@@ -202,5 +202,5 @@ satcom::pkf::impl::Parse_Array_iterator<Parser,Iterator>::advance(int n)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseArray.hh b/Packets/ParseArray.hh
index f4a0d4110..267cb7b9c 100644
--- a/Packets/ParseArray.hh
+++ b/Packets/ParseArray.hh
@@ -30,8 +30,8 @@
//#include "ParseArray.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
namespace impl { template <class,class> class Parse_Array_iterator; }
@@ -76,7 +76,7 @@ namespace pkf {
Parse_Array const & operator= (InputIterator const & i);
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ParseArray.cci"
@@ -87,5 +87,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseArray.ih b/Packets/ParseArray.ih
index 85e850f16..3ced579f2 100644
--- a/Packets/ParseArray.ih
+++ b/Packets/ParseArray.ih
@@ -29,7 +29,7 @@
///////////////////////////////ih.p////////////////////////////////////////
template <class Parser, class Iterator>
-class satcom::pkf::impl::Parse_Array_iterator
+class senf::impl::Parse_Array_iterator
: public boost::iterator_facade< Parse_Array_iterator<Parser,Iterator>,
Parser,
boost::random_access_traversal_tag,
@@ -65,5 +65,5 @@ private:
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseArray.test.cc b/Packets/ParseArray.test.cc
index 59a9898fc..0f9d9e7d2 100644
--- a/Packets/ParseArray.test.cc
+++ b/Packets/ParseArray.test.cc
@@ -35,7 +35,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
BOOST_AUTO_UNIT_TEST(parseArray_test)
{
@@ -63,5 +63,5 @@ BOOST_AUTO_UNIT_TEST(parseArray_test)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseInt.hh b/Packets/ParseInt.hh
index 1207eafe9..ba13aafcc 100644
--- a/Packets/ParseInt.hh
+++ b/Packets/ParseInt.hh
@@ -33,8 +33,8 @@
///////////////////////////////hh.p////////////////////////////////////////
#include "ParseInt.ih"
-namespace satcom {
-namespace pkf {
+namespace senf {
+
template <class Iterator=nil, class IPacket=nil>
struct Parse_Int8
@@ -305,7 +305,7 @@ namespace pkf {
Parse_Flag const & operator= (value_type other) { value(other); return *this; }
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ParseInt.cci"
@@ -316,5 +316,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseInt.ih b/Packets/ParseInt.ih
index fd58b04bc..48b5c9bc9 100644
--- a/Packets/ParseInt.ih
+++ b/Packets/ParseInt.ih
@@ -27,8 +27,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
namespace impl {
///////////////////////////////////////////////////////////////////////////
@@ -212,7 +212,7 @@ namespace impl {
: public parse_bitfield_i<Iterator,start/8,(end-1)/8-start/8,start%8,end-8*(start/8)>
{};
-}}}
+}}
///////////////////////////////ih.e////////////////////////////////////////
#endif
@@ -220,5 +220,5 @@ namespace impl {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseInt.test.cc b/Packets/ParseInt.test.cc
index 732535907..7965a01a6 100644
--- a/Packets/ParseInt.test.cc
+++ b/Packets/ParseInt.test.cc
@@ -35,7 +35,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
BOOST_AUTO_UNIT_TEST(parseInt_fixedSizes)
{
@@ -237,5 +237,5 @@ BOOST_AUTO_UNIT_TEST(parseInt_inherited)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseListS.ct b/Packets/ParseListS.ct
index 7e65fa968..297f2c4a0 100644
--- a/Packets/ParseListS.ct
+++ b/Packets/ParseListS.ct
@@ -31,7 +31,7 @@
///////////////////////////////ct.p////////////////////////////////////////
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ unsigned satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::bytes()
+prefix_ unsigned senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::bytes()
const
{
iterator i (begin());
@@ -46,7 +46,7 @@ prefix_ unsigned satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::byt
template <class Parser, class Sentinel, class Iterator, class IPacket>
prefix_ bool
-satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::check(Iterator const & e)
+senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::check(Iterator const & e)
const
{
byte_iterator i (this->i());
@@ -61,7 +61,7 @@ satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::check(Iterator const
}
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ void satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::init()
+prefix_ void senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::init()
const
{
iterator i (begin());
@@ -74,12 +74,12 @@ prefix_ void satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::init()
}
///////////////////////////////////////////////////////////////////////////
-// satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>
+// senf::Parse_ListS_wrapper<Parser,Sentinel,Container>
template <class Parser, class Sentinel, class Container>
template <class Value>
prefix_ void
-satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos,
+senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos,
Value const & t)
{
// FIXME: What, if pos == end() / default constructed iterator ?
@@ -91,7 +91,7 @@ satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos
template <class Parser, class Sentinel, class Container>
template <class Value>
prefix_ void
-satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos, size_type n,
+senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos, size_type n,
Value const & t)
{
size_type ix (pos.raw()-container_.begin());
@@ -104,7 +104,7 @@ satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos
template <class Parser, class Sentinel, class Container>
template <class InputIterator>
prefix_ void
-satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos,
+senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos,
InputIterator f,
InputIterator l)
{
@@ -117,5 +117,5 @@ satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseListS.cti b/Packets/ParseListS.cti
index db917578e..3a8a3e006 100644
--- a/Packets/ParseListS.cti
+++ b/Packets/ParseListS.cti
@@ -31,74 +31,74 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::Parse_ListS()
+prefix_ senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::Parse_ListS()
{}
template <class Parser, class Sentinel, class Iterator, class IPacket>
prefix_
-satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::Parse_ListS(Iterator const & i)
+senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::Parse_ListS(Iterator const & i)
: ParserBase<Iterator,IPacket>(i)
{}
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::size_type
-satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::size()
+prefix_ typename senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::size_type
+senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::size()
const
{
return std::distance(begin(),end());
}
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ bool satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::empty()
+prefix_ bool senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::empty()
const
{
return begin()==end();
}
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::iterator
-satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::begin()
+prefix_ typename senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::iterator
+senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::begin()
const
{
return iterator(this->i());
}
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::iterator
-satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::end()
+prefix_ typename senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::iterator
+senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::end()
const
{
return iterator();
}
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::range_type
-satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::range()
+prefix_ typename senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::range_type
+senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::range()
const
{
return std::make_pair(begin(),end());
}
template <class Parser, class Sentinel, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::range_type
-satcom::pkf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::value()
+prefix_ typename senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::range_type
+senf::Parse_ListS<Parser,Sentinel,Iterator,IPacket>::value()
const
{
return range();
}
///////////////////////////////////////////////////////////////////////////
-// satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>
+// senf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>
template <class Parser, class Sentinel, class Iterator>
prefix_
-satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::Parse_ListS_iterator()
+senf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::Parse_ListS_iterator()
: i_(), atEnd_(true)
{}
template <class Parser, class Sentinel, class Iterator>
prefix_
-satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::
+senf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::
Parse_ListS_iterator(Iterator const & i)
: i_(i), atEnd_(false)
{
@@ -106,7 +106,7 @@ Parse_ListS_iterator(Iterator const & i)
}
template <class Parser, class Sentinel, class Iterator>
-prefix_ Iterator satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::raw()
+prefix_ Iterator senf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::raw()
const
{
return i_;
@@ -114,14 +114,14 @@ prefix_ Iterator satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterato
template <class Parser, class Sentinel, class Iterator>
prefix_ Parser
-satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::dereference()
+senf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::dereference()
const
{
return Parser(i_);
}
template <class Parser, class Sentinel, class Iterator>
-prefix_ bool satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::
+prefix_ bool senf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::
equal(Parse_ListS_iterator const & other)
const
{
@@ -135,7 +135,7 @@ equal(Parse_ListS_iterator const & other)
}
template <class Parser, class Sentinel, class Iterator>
-prefix_ void satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::increment()
+prefix_ void senf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::increment()
{
BOOST_ASSERT( !atEnd_ );
i_ += dereference().bytes();
@@ -143,49 +143,49 @@ prefix_ void satcom::pkf::impl::Parse_ListS_iterator<Parser,Sentinel,Iterator>::
}
///////////////////////////////////////////////////////////////////////////
-// satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>
+// senf::Parse_ListS_wrapper<Parser,Sentinel,Container>
template <class Parser, class Sentinel, class Container>
template <class P, class S, class I, class IP>
-prefix_ satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::
+prefix_ senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::
Parse_ListS_wrapper(Parse_ListS<P,S,I,IP> const & list, Container & container)
: i_(list.i()-container.begin()), container_(container)
{}
template <class Parser, class Sentinel, class Container>
-prefix_ typename satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::size_type
-satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::size()
+prefix_ typename senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::size_type
+senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::size()
const
{
return std::distance(begin(),end());
}
template <class Parser, class Sentinel, class Container>
-prefix_ bool satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::empty()
+prefix_ bool senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::empty()
const
{
return begin()==end();
}
template <class Parser, class Sentinel, class Container>
-prefix_ typename satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::iterator
-satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::begin()
+prefix_ typename senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::iterator
+senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::begin()
const
{
return iterator(container_.begin()+i_);
}
template <class Parser, class Sentinel, class Container>
-prefix_ typename satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::iterator
-satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::end()
+prefix_ typename senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::iterator
+senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::end()
const
{
return iterator();
}
template <class Parser, class Sentinel, class Container>
-prefix_ typename satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::range_type
-satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::range()
+prefix_ typename senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::range_type
+senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::range()
const
{
return std::make_pair(begin(),end());
@@ -197,5 +197,5 @@ satcom::pkf::Parse_ListS_wrapper<Parser,Sentinel,Container>::range()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseListS.hh b/Packets/ParseListS.hh
index 2c75016b4..a480be6af 100644
--- a/Packets/ParseListS.hh
+++ b/Packets/ParseListS.hh
@@ -32,8 +32,8 @@
//#include "ParseListS.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
template <class Parser, class Sentinel, class Container> class Parse_ListS_wrapper;
namespace impl {
@@ -150,7 +150,7 @@ namespace pkf {
Container & container_;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ParseListS.cci"
@@ -161,5 +161,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseListS.ih b/Packets/ParseListS.ih
index 6dbeb24d6..0cd75b415 100644
--- a/Packets/ParseListS.ih
+++ b/Packets/ParseListS.ih
@@ -28,8 +28,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
namespace impl {
template <class Parser, class Sentinel, class Iterator>
@@ -56,7 +56,7 @@ namespace impl {
bool atEnd_;
};
-}}}
+}}
///////////////////////////////ih.e////////////////////////////////////////
@@ -65,5 +65,5 @@ namespace impl {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseListS.test.cc b/Packets/ParseListS.test.cc
index 464b33620..973be31d2 100644
--- a/Packets/ParseListS.test.cc
+++ b/Packets/ParseListS.test.cc
@@ -37,7 +37,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
namespace {
template <class Value>
@@ -170,5 +170,5 @@ BOOST_AUTO_UNIT_TEST(parse_ListS_wrapper)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseVec.ct b/Packets/ParseVec.ct
index a34f1c9ae..51ad0be28 100644
--- a/Packets/ParseVec.ct
+++ b/Packets/ParseVec.ct
@@ -32,7 +32,7 @@
template <class Parser, class SizeParser, class Container>
template <class Value>
prefix_ void
-satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator pos,
+senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator pos,
Value const & t)
{
size_type ix(pos.raw()-container_.begin());
@@ -43,7 +43,7 @@ satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator
template <class Parser, class SizeParser, class Container>
template <class Value>
prefix_ void
-satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator pos,
+senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator pos,
size_type n,
Value const & t)
{
@@ -57,7 +57,7 @@ satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator
template <class Parser, class SizeParser, class Container>
template <class InputIterator>
prefix_ void
-satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator pos,
+senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator pos,
InputIterator f,
InputIterator l)
{
@@ -77,5 +77,5 @@ satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseVec.cti b/Packets/ParseVec.cti
index 86f282f14..8631fabdd 100644
--- a/Packets/ParseVec.cti
+++ b/Packets/ParseVec.cti
@@ -30,19 +30,19 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Parser, class SizeParser, class Iterator, class IPacket>
-prefix_ satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::
+prefix_ senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::
Parse_Vector(SizeParser const & size)
: size_(size)
{}
template <class Parser, class SizeParser, class Iterator, class IPacket>
-prefix_ satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::
+prefix_ senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::
Parse_Vector(size_parser const & size, Iterator const & i)
: ParserBase<Iterator,IPacket>(i), size_(size)
{}
template <class Parser, class SizeParser, class Iterator, class IPacket>
-prefix_ unsigned satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::bytes()
+prefix_ unsigned senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::bytes()
const
{
return Parser::bytes()*size();
@@ -50,14 +50,14 @@ prefix_ unsigned satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::
template <class Parser, class SizeParser, class Iterator, class IPacket>
prefix_ void
-satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::check(Iterator const & e)
+senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::check(Iterator const & e)
const
{
return e-this->i() >= bytes();
}
template <class Parser, class SizeParser, class Iterator, class IPacket>
-prefix_ void satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::init()
+prefix_ void senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::init()
const
{
iterator e (end());
@@ -67,15 +67,15 @@ prefix_ void satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::init
///////////////////////////////////////////////////////////////////////////
template <class Parser, class SizeParser, class Iterator, class IPacket>
-prefix_ typename satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::size_type
-satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::size()
+prefix_ typename senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::size_type
+senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::size()
const
{
return size_.value();
}
template <class Parser, class SizeParser, class Iterator, class IPacket>
-prefix_ bool satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::empty()
+prefix_ bool senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::empty()
const
{
return size()==0;
@@ -83,8 +83,8 @@ prefix_ bool satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::empt
template <class Parser, class SizeParser, class Iterator, class IPacket>
prefix_
-typename satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::iterator
-satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::begin()
+typename senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::iterator
+senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::begin()
const
{
return iterator(this->i());
@@ -92,8 +92,8 @@ satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::begin()
template <class Parser, class SizeParser, class Iterator, class IPacket>
prefix_
-typename satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::iterator
-satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::end()
+typename senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::iterator
+senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::end()
const
{
return iterator(this->i()+bytes());
@@ -101,8 +101,8 @@ satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::end()
template <class Parser, class SizeParser, class Iterator, class IPacket>
prefix_
-typename satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::range_type
-satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::range()
+typename senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::range_type
+senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::range()
const
{
return std::make_pair(begin(),end());
@@ -110,8 +110,8 @@ satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::range()
template <class Parser, class SizeParser, class Iterator, class IPacket>
prefix_
-typename satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::range_type
-satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::value()
+typename senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::range_type
+senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::value()
const
{
return range();
@@ -119,73 +119,73 @@ satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::value()
template <class Parser, class SizeParser, class Iterator, class IPacket>
prefix_
-typename satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::value_type
-satcom::pkf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::operator[](difference_type i)
+typename senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::value_type
+senf::Parse_Vector<Parser,SizeParser,Iterator,IPacket>::operator[](difference_type i)
const
{
return begin()[i];
}
///////////////////////////////////////////////////////////////////////////
-// satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>
+// senf::Parse_Vector_wrapper<Parser,SizeParser,Container>
template <class Parser, class SizeParser, class Container>
template <class P, class SP, class I, class IP>
-prefix_ satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::
+prefix_ senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::
Parse_Vector_wrapper(Parse_Vector<P,SP,I,IP> const & vector, Container & container)
: i_(vector.i()-container.begin()), size_i_(vector.size_.i()-container.begin()),
container_(container)
{}
template <class Parser, class SizeParser, class Container>
-prefix_ typename satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::size_type
-satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::size()
+prefix_ typename senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::size_type
+senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::size()
const
{
return SizeParser(container_.begin()+size_i_).value();
}
template <class Parser, class SizeParser, class Container>
-prefix_ bool satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::empty()
+prefix_ bool senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::empty()
const
{
return size() == 0;
}
template <class Parser, class SizeParser, class Container>
-prefix_ typename satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::iterator
-satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::begin()
+prefix_ typename senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::iterator
+senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::begin()
const
{
return iterator(container_.begin() + i_);
}
template <class Parser, class SizeParser, class Container>
-prefix_ typename satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::iterator
-satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::end()
+prefix_ typename senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::iterator
+senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::end()
const
{
return iterator(container_.begin() + i_ + Parser::bytes()*size());
}
template <class Parser, class SizeParser, class Container>
-prefix_ typename satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::range_type
-satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::range()
+prefix_ typename senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::range_type
+senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::range()
const
{
return std::make_pair(begin(), end());
}
template <class Parser, class SizeParser, class Container>
-prefix_ typename satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::value_type
-satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::operator[](difference_type i)
+prefix_ typename senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::value_type
+senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::operator[](difference_type i)
const
{
return begin()[i];
}
template <class Parser, class SizeParser, class Container>
-prefix_ void satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::shift(iterator pos,
+prefix_ void senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::shift(iterator pos,
size_type n)
{
container_.insert(pos.raw(),n*Parser::bytes(),0);
@@ -193,7 +193,7 @@ prefix_ void satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::shi
}
template <class Parser, class SizeParser, class Container>
-prefix_ void satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::erase(iterator pos,
+prefix_ void senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::erase(iterator pos,
size_type n)
{
container_.erase(pos.raw(),pos.raw()+n*Parser::bytes());
@@ -201,14 +201,14 @@ prefix_ void satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::era
}
template <class Parser, class SizeParser, class Container>
-prefix_ void satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::erase(iterator f,
+prefix_ void senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::erase(iterator f,
iterator l)
{
erase(f,l-f);
}
template <class Parser, class SizeParser, class Container>
-prefix_ void satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::clear()
+prefix_ void senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::clear()
{
container_.erase(container_.begin()+i_,container_.begin()+i_+size()*Parser::bytes());
SizeParser(container_.begin()+size_i_) = 0;
@@ -220,5 +220,5 @@ prefix_ void satcom::pkf::Parse_Vector_wrapper<Parser,SizeParser,Container>::cle
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseVec.hh b/Packets/ParseVec.hh
index 3b2dc3827..a4b3033db 100644
--- a/Packets/ParseVec.hh
+++ b/Packets/ParseVec.hh
@@ -33,8 +33,8 @@
//#include "ParseVec.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
template <class Parser, class SizeParser, class Container> class Parse_Vector_wrapper;
@@ -160,7 +160,7 @@ namespace pkf {
Container & container_;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ParseVec.cci"
@@ -171,5 +171,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParseVec.test.cc b/Packets/ParseVec.test.cc
index 4743c2ae8..139dfdb8a 100644
--- a/Packets/ParseVec.test.cc
+++ b/Packets/ParseVec.test.cc
@@ -36,7 +36,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
BOOST_AUTO_UNIT_TEST(parseVec_test)
{
@@ -149,5 +149,5 @@ BOOST_AUTO_UNIT_TEST(parserTraits_test)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParserBase.cti b/Packets/ParserBase.cti
index 084c6253d..4a2b25270 100644
--- a/Packets/ParserBase.cti
+++ b/Packets/ParserBase.cti
@@ -30,58 +30,58 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Iterator, class IPacket>
-prefix_ Iterator satcom::pkf::ParserBase<Iterator,IPacket>::i()
+prefix_ Iterator senf::ParserBase<Iterator,IPacket>::i()
const
{
return static_cast<IPacket const *>(this)->begin();
}
template <class Iterator>
-prefix_ satcom::pkf::ParserBase<Iterator,satcom::pkf::nil>::ParserBase(Iterator const & i)
+prefix_ senf::ParserBase<Iterator,senf::nil>::ParserBase(Iterator const & i)
: i_(i)
{}
template <class Iterator>
-prefix_ Iterator satcom::pkf::ParserBase<Iterator,satcom::pkf::nil>::i()
+prefix_ Iterator senf::ParserBase<Iterator,senf::nil>::i()
const
{
return i_;
}
template <class Parser, class Iterator>
-prefix_ bool satcom::pkf::impl::check(Iterator const & b, Iterator const & e,
+prefix_ bool senf::impl::check(Iterator const & b, Iterator const & e,
impl::ParserBase *)
{
return impl::ParserCheck<Parser,Parser_traits<Parser>::fixed_size>::check(b,e);
}
template <class Parser, class Iterator>
-prefix_ bool satcom::pkf::impl::check(Iterator const & b, Iterator const & e,
+prefix_ bool senf::impl::check(Iterator const & b, Iterator const & e,
void *)
{
return Parser::check(b,e);
}
template <class Parser, class Iterator>
-prefix_ bool satcom::pkf::check(Iterator const & b, Iterator const & e)
+prefix_ bool senf::check(Iterator const & b, Iterator const & e)
{
return impl::check<Parser,Iterator>(b,e,static_cast<Parser*>(0));
}
template <class Parser>
-prefix_ unsigned satcom::pkf::impl::min_bytes(impl::ParserBase *)
+prefix_ unsigned senf::impl::min_bytes(impl::ParserBase *)
{
return impl::ParserMinBytes<Parser,Parser_traits<Parser>::fixed_size>::bytes();
}
template <class Parser>
-prefix_ unsigned satcom::pkf::impl::min_bytes(void *)
+prefix_ unsigned senf::impl::min_bytes(void *)
{
return 0;
}
template <class Parser>
-prefix_ unsigned satcom::pkf::min_bytes()
+prefix_ unsigned senf::min_bytes()
{
return impl::min_bytes<Parser>(static_cast<Parser*>(0));
}
@@ -92,5 +92,5 @@ prefix_ unsigned satcom::pkf::min_bytes()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParserBase.hh b/Packets/ParserBase.hh
index cb2eccea7..c414ab5d8 100644
--- a/Packets/ParserBase.hh
+++ b/Packets/ParserBase.hh
@@ -35,8 +35,8 @@
#include "ParserBase.ih"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
namespace impl { struct ParserBase; }
@@ -81,7 +81,7 @@ namespace pkf {
\code
template <class Iterator=nil, class IPacket=nil>
struct Parser_Example
- : protected satcom::pkf::ParserBase<Iterator,IPacket>
+ : protected senf::ParserBase<Iterator,IPacket>
{
// fixed interface of all parser classes
@@ -294,7 +294,7 @@ namespace pkf {
template <class Parser>
unsigned min_bytes();
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ParserBase.cci"
@@ -305,5 +305,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParserBase.ih b/Packets/ParserBase.ih
index 924189ac0..38698b9aa 100644
--- a/Packets/ParserBase.ih
+++ b/Packets/ParserBase.ih
@@ -27,8 +27,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
namespace impl {
struct ParserBase {};
@@ -87,7 +87,7 @@ namespace impl {
static unsigned bytes() { return Parser::bytes(); }
};
-}}}
+}}
///////////////////////////////ih.e////////////////////////////////////////
#endif
@@ -95,5 +95,5 @@ namespace impl {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/ParserBase.test.cc b/Packets/ParserBase.test.cc
index b1a898304..f0e410a79 100644
--- a/Packets/ParserBase.test.cc
+++ b/Packets/ParserBase.test.cc
@@ -36,8 +36,6 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-namespace pkf = satcom::pkf;
-
// The non-inherited Version is extensively tested in PaseInt.test.hh
BOOST_AUTO_UNIT_TEST(parserBase_inherited)
@@ -47,15 +45,15 @@ BOOST_AUTO_UNIT_TEST(parserBase_inherited)
namespace {
- template <class Iterator=pkf::nil, class IPacket=pkf::nil>
- struct Parse_Test : public pkf::ParserBase<Iterator,IPacket>
+ template <class Iterator=senf::nil, class IPacket=senf::nil>
+ struct Parse_Test : public senf::ParserBase<Iterator,IPacket>
{
- template <class I=pkf::nil, class P=pkf::nil>
+ template <class I=senf::nil, class P=senf::nil>
struct rebind { typedef Parse_Test<I,P> parser; };
typedef Iterator byte_iterator;
Parse_Test() {}
- Parse_Test(Iterator const & i) : pkf::ParserBase<Iterator,IPacket>(i) {}
+ Parse_Test(Iterator const & i) : senf::ParserBase<Iterator,IPacket>(i) {}
static unsigned bytes() { return 14; }
@@ -63,15 +61,15 @@ namespace {
};
- template <class Iterator=pkf::nil, class IPacket=pkf::nil>
- struct Parse_Test2 : public pkf::ParserBase<Iterator,IPacket>
+ template <class Iterator=senf::nil, class IPacket=senf::nil>
+ struct Parse_Test2 : public senf::ParserBase<Iterator,IPacket>
{
- template <class I=pkf::nil, class P=pkf::nil>
+ template <class I=senf::nil, class P=senf::nil>
struct rebind { typedef Parse_Test<I,P> parser; };
typedef Iterator byte_iterator;
Parse_Test2() {}
- Parse_Test2(Iterator const & i) : pkf::ParserBase<Iterator,IPacket>(i) {}
+ Parse_Test2(Iterator const & i) : senf::ParserBase<Iterator,IPacket>(i) {}
unsigned bytes() const { return 14; }
static unsigned check(Iterator a, Iterator b)
@@ -86,16 +84,16 @@ namespace {
BOOST_AUTO_UNIT_TEST(parserBase_construction)
{
- BOOST_STATIC_ASSERT( pkf::Parser_traits< Parse_Test<> >::fixed_size );
- BOOST_STATIC_ASSERT( ! pkf::Parser_traits< Parse_Test2<> >::fixed_size );
+ BOOST_STATIC_ASSERT( senf::Parser_traits< Parse_Test<> >::fixed_size );
+ BOOST_STATIC_ASSERT( ! senf::Parser_traits< Parse_Test2<> >::fixed_size );
- BOOST_CHECK_EQUAL( pkf::min_bytes< Parse_Test<int> >(), 14u );
- BOOST_CHECK( pkf::check< Parse_Test<int> >(0,14) );
- BOOST_CHECK( ! pkf::check< Parse_Test<int> >(2,15) );
+ BOOST_CHECK_EQUAL( senf::min_bytes< Parse_Test<int> >(), 14u );
+ BOOST_CHECK( senf::check< Parse_Test<int> >(0,14) );
+ BOOST_CHECK( ! senf::check< Parse_Test<int> >(2,15) );
- BOOST_CHECK_EQUAL( pkf::min_bytes< Parse_Test2<int> >(), 10u );
- BOOST_CHECK( pkf::check< Parse_Test2<int> >(2,13) );
- BOOST_CHECK( pkf::check< Parse_Test2<int> >(2,12) );
+ BOOST_CHECK_EQUAL( senf::min_bytes< Parse_Test2<int> >(), 10u );
+ BOOST_CHECK( senf::check< Parse_Test2<int> >(2,13) );
+ BOOST_CHECK( senf::check< Parse_Test2<int> >(2,12) );
}
///////////////////////////////cc.e////////////////////////////////////////
@@ -104,5 +102,5 @@ BOOST_AUTO_UNIT_TEST(parserBase_construction)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/RTCPPacket.cc b/Packets/RTCPPacket.cc
index f50b44dc1..54daf9351 100644
--- a/Packets/RTCPPacket.cc
+++ b/Packets/RTCPPacket.cc
@@ -31,13 +31,13 @@
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::pkf::RTCPPacket::v_nextInterpreter()
+prefix_ void senf::RTCPPacket::v_nextInterpreter()
const
{
registerInterpreter<DataPacket>(begin()+bytes(),end());
}
-prefix_ void satcom::pkf::RTCPPacket::v_finalize()
+prefix_ void senf::RTCPPacket::v_finalize()
{}
@@ -47,5 +47,5 @@ prefix_ void satcom::pkf::RTCPPacket::v_finalize()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/RTCPPacket.cti b/Packets/RTCPPacket.cti
index a652af010..9086b3d69 100644
--- a/Packets/RTCPPacket.cti
+++ b/Packets/RTCPPacket.cti
@@ -30,7 +30,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Arg>
-prefix_ satcom::pkf::RTCPPacket::RTCPPacket(Arg const & arg)
+prefix_ senf::RTCPPacket::RTCPPacket(Arg const & arg)
: Packet(arg)
{}
@@ -40,5 +40,5 @@ prefix_ satcom::pkf::RTCPPacket::RTCPPacket(Arg const & arg)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/RTCPPacket.hh b/Packets/RTCPPacket.hh
index 2518110de..2fcc837f6 100644
--- a/Packets/RTCPPacket.hh
+++ b/Packets/RTCPPacket.hh
@@ -34,8 +34,8 @@
//#include "RTCPPacket.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
template <class I=nil,class P=nil> struct Parse_RTCP_RR;
template <class I=nil,class P=nil> struct Parse_RTCP_SR;
@@ -299,7 +299,7 @@ namespace pkf {
friend class Packet;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
@@ -311,5 +311,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/RTCPPacket.test.cc b/Packets/RTCPPacket.test.cc
index 86e0d0a1e..3e168f64f 100644
--- a/Packets/RTCPPacket.test.cc
+++ b/Packets/RTCPPacket.test.cc
@@ -34,7 +34,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
BOOST_AUTO_UNIT_TEST(rtcpPacket_parser)
{
@@ -335,5 +335,5 @@ BOOST_AUTO_UNIT_TEST(rtcpPacket_packet)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/RTPPacket.cc b/Packets/RTPPacket.cc
index 593610ae9..e3e61530b 100644
--- a/Packets/RTPPacket.cc
+++ b/Packets/RTPPacket.cc
@@ -31,7 +31,7 @@
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::pkf::RTPPacket::v_nextInterpreter()
+prefix_ void senf::RTPPacket::v_nextInterpreter()
const
{
@@ -47,10 +47,10 @@ prefix_ void satcom::pkf::RTPPacket::v_nextInterpreter()
}
}
-prefix_ void satcom::pkf::RTPPacket::v_finalize()
+prefix_ void senf::RTPPacket::v_finalize()
{}
-prefix_ void satcom::pkf::RTPPacket::v_dump(std::ostream & os)
+prefix_ void senf::RTPPacket::v_dump(std::ostream & os)
const
{
os << "RTP:\n"
@@ -66,7 +66,7 @@ prefix_ void satcom::pkf::RTPPacket::v_dump(std::ostream & os)
<< " csrc list : <not shown>\n";
}
-prefix_ void satcom::pkf::RTPExtensionBasePacket::v_nextInterpreter()
+prefix_ void senf::RTPExtensionBasePacket::v_nextInterpreter()
const
{
@@ -85,14 +85,14 @@ prefix_ void satcom::pkf::RTPExtensionBasePacket::v_nextInterpreter()
registerInterpreter(get_prev<RTPPacket>()->payloadType(),begin()+p.bytes(),end()-paddingOctets);
}
-prefix_ void satcom::pkf::RTPExtensionBasePacket::v_dump(std::ostream & os)
+prefix_ void senf::RTPExtensionBasePacket::v_dump(std::ostream & os)
const
{
os << "RTP extension packet:\n"
<< " content not shown\n";
}
-prefix_ void satcom::pkf::RTPUnknownExtensionPacket::v_finalize()
+prefix_ void senf::RTPUnknownExtensionPacket::v_finalize()
{}
///////////////////////////////cc.e////////////////////////////////////////
@@ -101,5 +101,5 @@ prefix_ void satcom::pkf::RTPUnknownExtensionPacket::v_finalize()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/RTPPacket.cti b/Packets/RTPPacket.cti
index 18633bec5..8e750ee23 100644
--- a/Packets/RTPPacket.cti
+++ b/Packets/RTPPacket.cti
@@ -30,18 +30,18 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Arg>
-prefix_ satcom::pkf::RTPPacket::RTPPacket(Arg const & arg)
+prefix_ senf::RTPPacket::RTPPacket(Arg const & arg)
: Packet(arg)
{}
template <class Arg>
-prefix_ satcom::pkf::RTPExtensionBasePacket::
+prefix_ senf::RTPExtensionBasePacket::
RTPExtensionBasePacket(Arg const & arg)
: Packet(arg)
{}
template <class Arg>
-prefix_ satcom::pkf::RTPUnknownExtensionPacket::
+prefix_ senf::RTPUnknownExtensionPacket::
RTPUnknownExtensionPacket(Arg const & arg)
: RTPExtensionBasePacket(arg)
{}
@@ -52,5 +52,5 @@ RTPUnknownExtensionPacket(Arg const & arg)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/RTPPacket.hh b/Packets/RTPPacket.hh
index 9f4a6c787..3fe3c3e2a 100644
--- a/Packets/RTPPacket.hh
+++ b/Packets/RTPPacket.hh
@@ -33,8 +33,8 @@
//#include "RTPPacket.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
template <class Iterator=nil, class IPacket=nil>
struct Parse_RTP : public ParserBase<Iterator,IPacket>
@@ -208,7 +208,7 @@ namespace pkf {
friend class Packet;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
@@ -220,5 +220,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/RTPPacket.test.cc b/Packets/RTPPacket.test.cc
index ff3a58d82..29a882ef7 100644
--- a/Packets/RTPPacket.test.cc
+++ b/Packets/RTPPacket.test.cc
@@ -38,7 +38,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
BOOST_AUTO_UNIT_TEST(rtpPacket_parser)
{
@@ -242,5 +242,5 @@ BOOST_AUTO_UNIT_TEST(eth_rtpPacket_packet)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/UDPPacket.cc b/Packets/UDPPacket.cc
index 7f44028a5..e4a48b6f2 100644
--- a/Packets/UDPPacket.cc
+++ b/Packets/UDPPacket.cc
@@ -32,21 +32,20 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
namespace {
- namespace pkf = satcom::pkf;
- pkf::PacketRegistry<pkf::IpV4Types>::RegistrationProxy<pkf::UDPPacket>
+ senf::PacketRegistry<senf::IpV4Types>::RegistrationProxy<senf::UDPPacket>
registerUDPPacket(17);
}
-prefix_ void satcom::pkf::UDPPacket::v_nextInterpreter()
+prefix_ void senf::UDPPacket::v_nextInterpreter()
const
{
registerInterpreter<DataPacket>(begin()+bytes(),end());
}
-prefix_ void satcom::pkf::UDPPacket::v_finalize()
+prefix_ void senf::UDPPacket::v_finalize()
{}
-prefix_ void satcom::pkf::UDPPacket::v_dump(std::ostream & os)
+prefix_ void senf::UDPPacket::v_dump(std::ostream & os)
const
{
os << "UDP:\n"
@@ -62,5 +61,5 @@ prefix_ void satcom::pkf::UDPPacket::v_dump(std::ostream & os)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/UDPPacket.cti b/Packets/UDPPacket.cti
index b49e53088..21e332e3c 100644
--- a/Packets/UDPPacket.cti
+++ b/Packets/UDPPacket.cti
@@ -30,7 +30,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Arg>
-prefix_ satcom::pkf::UDPPacket::UDPPacket(Arg const & arg)
+prefix_ senf::UDPPacket::UDPPacket(Arg const & arg)
: Packet(arg)
{}
@@ -42,5 +42,5 @@ prefix_ satcom::pkf::UDPPacket::UDPPacket(Arg const & arg)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/UDPPacket.hh b/Packets/UDPPacket.hh
index 75cdf79b0..54cea7fb2 100644
--- a/Packets/UDPPacket.hh
+++ b/Packets/UDPPacket.hh
@@ -32,8 +32,8 @@
//#include "UDPPacket.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace pkf {
+namespace senf {
+
template <class Iterator=nil, class IPacket=nil>
struct Parse_UDP : public ParserBase<Iterator,IPacket>
@@ -80,7 +80,7 @@ namespace pkf {
friend class Packet;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
@@ -92,5 +92,5 @@ namespace pkf {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/UDPPacket.test.cc b/Packets/UDPPacket.test.cc
index afcb77d40..6441912a8 100644
--- a/Packets/UDPPacket.test.cc
+++ b/Packets/UDPPacket.test.cc
@@ -34,7 +34,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::pkf;
+using namespace senf;
BOOST_AUTO_UNIT_TEST(udpPacket_parser)
{
@@ -77,5 +77,5 @@ BOOST_AUTO_UNIT_TEST(udpPacket_packet)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/docstub.hh b/Packets/docstub.hh
index 3607b8f08..3ed13bf77 100644
--- a/Packets/docstub.hh
+++ b/Packets/docstub.hh
@@ -55,5 +55,5 @@ namespace std {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/typeidvalue.cci b/Packets/typeidvalue.cci
index 26d8c4fe8..b27eab3ea 100644
--- a/Packets/typeidvalue.cci
+++ b/Packets/typeidvalue.cci
@@ -29,41 +29,41 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::lib::TypeIdValue::TypeIdValue()
+prefix_ senf::TypeIdValue::TypeIdValue()
: value_(new ValueImpl<void>())
{}
-prefix_ satcom::lib::TypeIdValue::TypeIdValue(TypeIdValue const & other)
+prefix_ senf::TypeIdValue::TypeIdValue(TypeIdValue const & other)
{
value_.reset(other.value_->clone());
}
-prefix_ satcom::lib::TypeIdValue const &
-satcom::lib::TypeIdValue::operator=(TypeIdValue const & other)
+prefix_ senf::TypeIdValue const &
+senf::TypeIdValue::operator=(TypeIdValue const & other)
{
value_.reset(other.value_->clone());
return *this;
}
-prefix_ bool satcom::lib::TypeIdValue::operator==(TypeIdValue const & other)
+prefix_ bool senf::TypeIdValue::operator==(TypeIdValue const & other)
const
{
return value_->id() == other.value_->id();
}
-prefix_ bool satcom::lib::TypeIdValue::operator<(TypeIdValue const & other)
+prefix_ bool senf::TypeIdValue::operator<(TypeIdValue const & other)
const
{
return value_->id().before(other.value_->id());
}
-prefix_ std::string satcom::lib::TypeIdValue::name()
+prefix_ std::string senf::TypeIdValue::name()
const
{
return std::string(value_->id().name());
}
-prefix_ satcom::lib::TypeIdValue const satcom::lib::typeIdValue()
+prefix_ senf::TypeIdValue const senf::typeIdValue()
{
return TypeIdValue();
}
@@ -74,5 +74,5 @@ prefix_ satcom::lib::TypeIdValue const satcom::lib::typeIdValue()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/typeidvalue.cti b/Packets/typeidvalue.cti
index 9c78ae1e5..3dc341925 100644
--- a/Packets/typeidvalue.cti
+++ b/Packets/typeidvalue.cti
@@ -30,25 +30,25 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Type>
-prefix_ satcom::lib::TypeIdValue::TypeIdValue(Type *)
+prefix_ senf::TypeIdValue::TypeIdValue(Type *)
: value_(new ValueImpl<Type>())
{}
template <class Type>
-prefix_ std::type_info const & satcom::lib::TypeIdValue::ValueImpl<Type>::id()
+prefix_ std::type_info const & senf::TypeIdValue::ValueImpl<Type>::id()
{
return typeid(Type);
}
template <class Type>
-prefix_ satcom::lib::TypeIdValue::Value *
-satcom::lib::TypeIdValue::ValueImpl<Type>::clone()
+prefix_ senf::TypeIdValue::Value *
+senf::TypeIdValue::ValueImpl<Type>::clone()
{
return new ValueImpl<Type>();
}
template <class Type>
-prefix_ satcom::lib::TypeIdValue const satcom::lib::typeIdValue()
+prefix_ senf::TypeIdValue const senf::typeIdValue()
{
return TypeIdValue(static_cast<Type*>(0));
}
@@ -59,5 +59,5 @@ prefix_ satcom::lib::TypeIdValue const satcom::lib::typeIdValue()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Packets/typeidvalue.hh b/Packets/typeidvalue.hh
index bb03dbed3..632fe131a 100644
--- a/Packets/typeidvalue.hh
+++ b/Packets/typeidvalue.hh
@@ -32,8 +32,8 @@
//#include "typeidvalue.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
/** \brief Wrapper to use types as key's in a map
*/
@@ -89,7 +89,7 @@ namespace lib {
template <class Type>
TypeIdValue const typeIdValue();
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "typeidvalue.cci"
@@ -100,5 +100,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/SConstruct b/SConstruct
index 0dd571019..2745e8181 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,7 +1,7 @@
# -*- python -*-
import sys, glob
-sys.path.append('satscons')
+sys.path.append('senfscons')
import SatSCons
###########################################################################
diff --git a/Scheduler/ReadHelper.cci b/Scheduler/ReadHelper.cci
index 81d7e6ad5..3d1a0aa24 100644
--- a/Scheduler/ReadHelper.cci
+++ b/Scheduler/ReadHelper.cci
@@ -9,11 +9,11 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::lib::ReadUntil::ReadUntil(std::string target_)
+prefix_ senf::ReadUntil::ReadUntil(std::string target_)
: target(target_)
{}
-prefix_ std::string::size_type satcom::lib::ReadUntil::operator()(std::string data)
+prefix_ std::string::size_type senf::ReadUntil::operator()(std::string data)
{
return data.find(target);
}
diff --git a/Scheduler/ReadHelper.ct b/Scheduler/ReadHelper.ct
index 16d285061..6a5d0b73f 100644
--- a/Scheduler/ReadHelper.ct
+++ b/Scheduler/ReadHelper.ct
@@ -16,7 +16,7 @@
///////////////////////////////ct.p////////////////////////////////////////
template <class Handle>
-prefix_ satcom::lib::ReadHelper<Handle>::ReadHelper(Handle handle, std::string::size_type maxSize,
+prefix_ senf::ReadHelper<Handle>::ReadHelper(Handle handle, std::string::size_type maxSize,
InternalPredicate * predicate, Callback cb)
: handle_(handle), maxSize_(maxSize), predicate_(predicate), callback_(cb),
errno_(0), complete_(false)
@@ -25,23 +25,23 @@ prefix_ satcom::lib::ReadHelper<Handle>::ReadHelper(Handle handle, std::string::
// argumnet instead of a simple bound-member as callback to the
// scheduler. This ensures, that the refcount is at least 1 as
// long as the helper is registered with the scheduler.
- satcom::lib::Scheduler::instance()
+ senf::Scheduler::instance()
.add(handle,boost::bind(&ReadHelper::dispatchProcess,ptr(this),_1,_2),
- satcom::lib::Scheduler::EV_READ);
+ senf::Scheduler::EV_READ);
}
template <class Handle>
-prefix_ void satcom::lib::ReadHelper<Handle>::revoke()
+prefix_ void senf::ReadHelper<Handle>::revoke()
{
ptr guard (this); // To ensure, 'this' is deleted only after this method terminates ...
- satcom::lib::Scheduler::instance()
- .remove(handle_,satcom::lib::Scheduler::EV_READ);
+ senf::Scheduler::instance()
+ .remove(handle_,senf::Scheduler::EV_READ);
}
template <class Handle>
prefix_ void
-satcom::lib::ReadHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
- satcom::lib::Scheduler::EventId event)
+senf::ReadHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
+ senf::Scheduler::EventId event)
{
// since we have a 'ptr' argument, the instance cannot be deleted
// before this method returns
@@ -49,11 +49,11 @@ satcom::lib::ReadHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
}
template <class Handle>
-prefix_ void satcom::lib::ReadHelper<Handle>::process(Handle handle,
- satcom::lib::Scheduler::EventId event)
+prefix_ void senf::ReadHelper<Handle>::process(Handle handle,
+ senf::Scheduler::EventId event)
{
try {
- if (event != satcom::lib::Scheduler::EV_READ)
+ if (event != senf::Scheduler::EV_READ)
throw SystemException(EPIPE);
std::string rcv (handle.read(maxSize_ - data_.size()));
data_.append(rcv);
@@ -67,14 +67,14 @@ prefix_ void satcom::lib::ReadHelper<Handle>::process(Handle handle,
done();
}
}
- catch (satcom::lib::SystemException const & ex) {
+ catch (senf::SystemException const & ex) {
errno_ = ex.err;
done();
}
}
template <class Handle>
-prefix_ void satcom::lib::ReadHelper<Handle>::done()
+prefix_ void senf::ReadHelper<Handle>::done()
{
revoke();
callback_(ptr(this));
@@ -83,7 +83,7 @@ prefix_ void satcom::lib::ReadHelper<Handle>::done()
template <class Handle>
template <class Predicate>
prefix_ std::string::size_type
-satcom::lib::ReadHelper<Handle>::InternalPredicate::Dispatcher<Predicate>::
+senf::ReadHelper<Handle>::InternalPredicate::Dispatcher<Predicate>::
operator()(std::string const & data)
{
return predicate(data);
diff --git a/Scheduler/ReadHelper.cti b/Scheduler/ReadHelper.cti
index 75613d2d7..2e9a53318 100644
--- a/Scheduler/ReadHelper.cti
+++ b/Scheduler/ReadHelper.cti
@@ -13,8 +13,8 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Handle>
-prefix_ typename satcom::lib::ReadHelper<Handle>::ptr
-satcom::lib::ReadHelper<Handle>::dispatch(Handle handle, std::string::size_type maxSize,
+prefix_ typename senf::ReadHelper<Handle>::ptr
+senf::ReadHelper<Handle>::dispatch(Handle handle, std::string::size_type maxSize,
Callback callback)
{
return ptr(new ReadHelper(handle, maxSize, 0, callback));
@@ -22,8 +22,8 @@ satcom::lib::ReadHelper<Handle>::dispatch(Handle handle, std::string::size_type
template <class Handle>
template <class Predicate>
-prefix_ typename satcom::lib::ReadHelper<Handle>::ptr
-satcom::lib::ReadHelper<Handle>::dispatch(Handle handle, std::string::size_type maxSize,
+prefix_ typename senf::ReadHelper<Handle>::ptr
+senf::ReadHelper<Handle>::dispatch(Handle handle, std::string::size_type maxSize,
Predicate predicate, Callback callback)
{
return ptr(new ReadHelper(handle, maxSize,
@@ -32,49 +32,49 @@ satcom::lib::ReadHelper<Handle>::dispatch(Handle handle, std::string::size_type
}
template <class Handle>
-prefix_ Handle satcom::lib::ReadHelper<Handle>::handle()
+prefix_ Handle senf::ReadHelper<Handle>::handle()
const
{
return handle_;
}
template <class Handle>
-prefix_ unsigned satcom::lib::ReadHelper<Handle>::maxSize()
+prefix_ unsigned senf::ReadHelper<Handle>::maxSize()
const
{
return maxSize_;
}
template <class Handle>
-prefix_ std::string const & satcom::lib::ReadHelper<Handle>::data()
+prefix_ std::string const & senf::ReadHelper<Handle>::data()
const
{
return data_;
}
template <class Handle>
-prefix_ std::string const & satcom::lib::ReadHelper<Handle>::tail()
+prefix_ std::string const & senf::ReadHelper<Handle>::tail()
const
{
return tail_;
}
template <class Handle>
-prefix_ bool satcom::lib::ReadHelper<Handle>::complete()
+prefix_ bool senf::ReadHelper<Handle>::complete()
const
{
return complete_;
}
template <class Handle>
-prefix_ bool satcom::lib::ReadHelper<Handle>::error()
+prefix_ bool senf::ReadHelper<Handle>::error()
const
{
return errno_ != 0;
}
template <class Handle>
-prefix_ void satcom::lib::ReadHelper<Handle>::throw_error()
+prefix_ void senf::ReadHelper<Handle>::throw_error()
const
{
if (errno_ != 0) throw SystemException(errno_);
diff --git a/Scheduler/ReadHelper.hh b/Scheduler/ReadHelper.hh
index 8f38b1696..8fb80bf7e 100644
--- a/Scheduler/ReadHelper.hh
+++ b/Scheduler/ReadHelper.hh
@@ -19,12 +19,12 @@
//#include "ReadHelper.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
template <class Handle>
class ReadHelper
- : public satcom::lib::intrusive_refcount
+ : public senf::intrusive_refcount
{
public:
///////////////////////////////////////////////////////////////////////////
@@ -66,8 +66,8 @@ namespace lib {
ReadHelper(Handle handle, unsigned maxSize, InternalPredicate * predicate, Callback cb);
- static void dispatchProcess(ptr helper, Handle handle, satcom::lib::Scheduler::EventId event);
- void process(Handle handle, satcom::lib::Scheduler::EventId event);
+ static void dispatchProcess(ptr helper, Handle handle, senf::Scheduler::EventId event);
+ void process(Handle handle, senf::Scheduler::EventId event);
void done();
Handle handle_;
@@ -88,7 +88,7 @@ namespace lib {
std::string target;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "ReadHelper.cci"
diff --git a/Scheduler/ReadHelper.ih b/Scheduler/ReadHelper.ih
index e174b5f64..bca58bc86 100644
--- a/Scheduler/ReadHelper.ih
+++ b/Scheduler/ReadHelper.ih
@@ -9,8 +9,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
template <class Handle>
struct ReadHelper<Handle>::InternalPredicate
@@ -28,7 +28,7 @@ namespace lib {
virtual std::string::size_type operator()(std::string const & data) = 0;
};
-}}
+}
///////////////////////////////ih.e////////////////////////////////////////
diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 75ed7f8d7..62a5dfecf 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -78,25 +78,25 @@ static const int EPollInitialSize = 16;
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ satcom::lib::Scheduler::Scheduler & satcom::lib::Scheduler::instance()
+prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
{
static Scheduler instance;
return instance;
}
-prefix_ void satcom::lib::Scheduler::timeout(unsigned long timeout, TimerCallback const & cb)
+prefix_ void senf::Scheduler::timeout(unsigned long timeout, TimerCallback const & cb)
{
timerQueue_.push(TimerSpec(now()+1000*timeout,cb));
}
-prefix_ satcom::lib::Scheduler::Scheduler()
+prefix_ senf::Scheduler::Scheduler()
: epollFd_(epoll_create(EPollInitialSize))
{
if (epollFd_<0)
throw SystemException(errno);
}
-prefix_ void satcom::lib::Scheduler::do_add(int fd, SimpleCallback const & cb, int eventMask)
+prefix_ void senf::Scheduler::do_add(int fd, SimpleCallback const & cb, int eventMask)
{
FdTable::iterator i (fdTable_.find(fd));
int action (EPOLL_CTL_MOD);
@@ -120,7 +120,7 @@ prefix_ void satcom::lib::Scheduler::do_add(int fd, SimpleCallback const & cb, i
throw SystemException(errno);
}
-prefix_ void satcom::lib::Scheduler::do_remove(int fd, int eventMask)
+prefix_ void senf::Scheduler::do_remove(int fd, int eventMask)
{
FdTable::iterator i (fdTable_.find(fd));
if (i == fdTable_.end())
@@ -148,7 +148,7 @@ prefix_ void satcom::lib::Scheduler::do_remove(int fd, int eventMask)
}
-prefix_ int satcom::lib::Scheduler::EventSpec::epollMask()
+prefix_ int senf::Scheduler::EventSpec::epollMask()
const
{
int mask (0);
@@ -160,7 +160,7 @@ prefix_ int satcom::lib::Scheduler::EventSpec::epollMask()
return mask;
}
-prefix_ void satcom::lib::Scheduler::process()
+prefix_ void senf::Scheduler::process()
{
terminate_ = false;
while (! terminate_) {
@@ -226,5 +226,5 @@ prefix_ void satcom::lib::Scheduler::process()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index d33265434..f752d3e21 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -29,12 +29,12 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ void satcom::lib::Scheduler::terminate()
+prefix_ void senf::Scheduler::terminate()
{
terminate_ = true;
}
-prefix_ int satcom::lib::retrieve_filehandle(int fd)
+prefix_ int senf::retrieve_filehandle(int fd)
{
return fd;
}
@@ -45,5 +45,5 @@ prefix_ int satcom::lib::retrieve_filehandle(int fd)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Scheduler/Scheduler.ct b/Scheduler/Scheduler.ct
index 05afa48ce..1df75e3a3 100644
--- a/Scheduler/Scheduler.ct
+++ b/Scheduler/Scheduler.ct
@@ -35,5 +35,5 @@
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Scheduler/Scheduler.cti b/Scheduler/Scheduler.cti
index 0bd2d7f2f..62bfe382b 100644
--- a/Scheduler/Scheduler.cti
+++ b/Scheduler/Scheduler.cti
@@ -31,7 +31,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Handle>
-prefix_ void satcom::lib::Scheduler::add(Handle const & handle,
+prefix_ void senf::Scheduler::add(Handle const & handle,
typename GenericCallback<Handle>::Callback const & cb,
int eventMask)
{
@@ -42,7 +42,7 @@ prefix_ void satcom::lib::Scheduler::add(Handle const & handle,
}
template <class Handle>
-prefix_ void satcom::lib::Scheduler::remove(Handle const & handle, int eventMask)
+prefix_ void senf::Scheduler::remove(Handle const & handle, int eventMask)
{
// retrieve_filehandle is found via ADL
do_remove(retrieve_filehandle(handle),eventMask);
@@ -54,5 +54,5 @@ prefix_ void satcom::lib::Scheduler::remove(Handle const & handle, int eventMask
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh
index 785dce93f..cdcd4f6e4 100644
--- a/Scheduler/Scheduler.hh
+++ b/Scheduler/Scheduler.hh
@@ -42,8 +42,8 @@
//#include "scheduler.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
/** \brief Singleton class to manage the event loop
@@ -142,7 +142,7 @@ namespace lib {
int retrieve_filehandle(int fd);
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "Scheduler.cci"
@@ -153,5 +153,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc
index 6845277b5..6665f6e5d 100644
--- a/Scheduler/Scheduler.test.cc
+++ b/Scheduler/Scheduler.test.cc
@@ -44,7 +44,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::lib;
+using namespace senf;
namespace {
@@ -264,5 +264,5 @@ BOOST_AUTO_UNIT_TEST(scheduler)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct
index 8ef626da9..04a4f1c46 100644
--- a/Scheduler/WriteHelper.ct
+++ b/Scheduler/WriteHelper.ct
@@ -15,18 +15,18 @@
///////////////////////////////ct.p////////////////////////////////////////
template <class Handle>
-prefix_ satcom::lib::WriteHelper<Handle>::WriteHelper(Handle handle, std::string data,
+prefix_ senf::WriteHelper<Handle>::WriteHelper(Handle handle, std::string data,
Callback callback)
: handle_(handle), data_(data), callback_(callback),
offset_(0), errno_(0)
{
- satcom::lib::Scheduler::instance()
+ senf::Scheduler::instance()
.add(handle_, boost::bind(&WriteHelper::dispatchProcess, ptr(this), _1, _2),
- satcom::lib::Scheduler::EV_WRITE);
+ senf::Scheduler::EV_WRITE);
}
template <class Handle>
-prefix_ std::string const & satcom::lib::WriteHelper<Handle>::data()
+prefix_ std::string const & senf::WriteHelper<Handle>::data()
const
{
if (offset_ > 0) {
@@ -37,17 +37,17 @@ prefix_ std::string const & satcom::lib::WriteHelper<Handle>::data()
}
template <class Handle>
-prefix_ void satcom::lib::WriteHelper<Handle>::revoke()
+prefix_ void senf::WriteHelper<Handle>::revoke()
{
ptr guard (this); // To ensure, 'this' is deleted only after this method terminates ...
- satcom::lib::Scheduler::instance()
- .remove(handle_, satcom::lib::Scheduler::EV_WRITE);
+ senf::Scheduler::instance()
+ .remove(handle_, senf::Scheduler::EV_WRITE);
}
template <class Handle>
prefix_ void
-satcom::lib::WriteHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
- satcom::lib::Scheduler::EventId event)
+senf::WriteHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
+ senf::Scheduler::EventId event)
{
// since we have a 'ptr' argument, the instance cannot be deleted
// before this method returns
@@ -55,26 +55,26 @@ satcom::lib::WriteHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
}
template <class Handle>
-prefix_ void satcom::lib::WriteHelper<Handle>::process(Handle handle,
- satcom::lib::Scheduler::EventId event)
+prefix_ void senf::WriteHelper<Handle>::process(Handle handle,
+ senf::Scheduler::EventId event)
{
try {
- if (event != satcom::lib::Scheduler::EV_WRITE)
- throw satcom::lib::SystemException(EPIPE);
+ if (event != senf::Scheduler::EV_WRITE)
+ throw senf::SystemException(EPIPE);
offset_ += handle.write(data_.data()+offset_,data_.size()-offset_);
if (offset_ >= data_.size()) {
data_.erase();
done();
}
}
- catch (satcom::lib::SystemException const & ex) {
+ catch (senf::SystemException const & ex) {
errno_ = ex.err;
done();
}
}
template <class Handle>
-prefix_ void satcom::lib::WriteHelper<Handle>::done()
+prefix_ void senf::WriteHelper<Handle>::done()
{
revoke();
callback_(ptr(this));
diff --git a/Scheduler/WriteHelper.cti b/Scheduler/WriteHelper.cti
index e73fd1953..14437e91e 100644
--- a/Scheduler/WriteHelper.cti
+++ b/Scheduler/WriteHelper.cti
@@ -13,39 +13,39 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Handle>
-prefix_ typename satcom::lib::WriteHelper<Handle>::ptr
-satcom::lib::WriteHelper<Handle>::dispatch(Handle handle, std::string data, Callback callback)
+prefix_ typename senf::WriteHelper<Handle>::ptr
+senf::WriteHelper<Handle>::dispatch(Handle handle, std::string data, Callback callback)
{
return ptr(new WriteHelper(handle, data, callback));
}
template <class Handle>
-prefix_ Handle satcom::lib::WriteHelper<Handle>::handle()
+prefix_ Handle senf::WriteHelper<Handle>::handle()
const
{
return handle_;
}
template <class Handle>
-prefix_ bool satcom::lib::WriteHelper<Handle>::complete()
+prefix_ bool senf::WriteHelper<Handle>::complete()
const
{
return data_.empty();
}
template <class Handle>
-prefix_ bool satcom::lib::WriteHelper<Handle>::error()
+prefix_ bool senf::WriteHelper<Handle>::error()
const
{
return errno_ != 0;
}
template <class Handle>
-prefix_ void satcom::lib::WriteHelper<Handle>::throw_error()
+prefix_ void senf::WriteHelper<Handle>::throw_error()
const
{
if (errno_ != 0)
- throw satcom::lib::SystemException(errno_);
+ throw senf::SystemException(errno_);
}
diff --git a/Scheduler/WriteHelper.hh b/Scheduler/WriteHelper.hh
index 02c316124..f22cbfe3b 100644
--- a/Scheduler/WriteHelper.hh
+++ b/Scheduler/WriteHelper.hh
@@ -15,12 +15,12 @@
//#include "WriteHelper.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
template <class Handle>
class WriteHelper
- : public satcom::lib::intrusive_refcount
+ : public senf::intrusive_refcount
{
public:
///////////////////////////////////////////////////////////////////////////
@@ -53,8 +53,8 @@ namespace lib {
private:
WriteHelper(Handle handle, std::string data, Callback callback);
- static void dispatchProcess(ptr helper, Handle handle, satcom::lib::Scheduler::EventId event);
- void process(Handle handle, satcom::lib::Scheduler::EventId event);
+ static void dispatchProcess(ptr helper, Handle handle, senf::Scheduler::EventId event);
+ void process(Handle handle, senf::Scheduler::EventId event);
void done();
Handle handle_;
@@ -66,7 +66,7 @@ namespace lib {
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "WriteHelper.cci"
diff --git a/Sniffer/Sniffer.cc b/Sniffer/Sniffer.cc
index e2a499771..530bcb564 100644
--- a/Sniffer/Sniffer.cc
+++ b/Sniffer/Sniffer.cc
@@ -81,22 +81,22 @@ namespace {
void use_em()
{
// Pull in symbols from the wanted packets ...
- satcom::pkf::Packet::create<satcom::pkf::IpV4Packet>(0,0);
- satcom::pkf::Packet::create<satcom::pkf::UDPPacket>(0,0);
+ senf::Packet::create<senf::IpV4Packet>(0,0);
+ senf::Packet::create<senf::UDPPacket>(0,0);
}
}
int main (int argc, char const * argv[])
{
try {
- satcom::lib::PacketSocketHandle sock;
- sock.bind(satcom::lib::LLSocketAddress("eth0"));
- // sock.protocol().promisc("eth0",satcom::lib::PacketProtocol::Promiscuous);
+ senf::PacketSocketHandle sock;
+ sock.bind(senf::LLSocketAddress("eth0"));
+ // sock.protocol().promisc("eth0",senf::PacketProtocol::Promiscuous);
while (true) { // forever
std::string data (sock.read());
- satcom::pkf::EthernetPacket::ptr packet (
- satcom::pkf::Packet::create<satcom::pkf::EthernetPacket>(
+ senf::EthernetPacket::ptr packet (
+ senf::Packet::create<senf::EthernetPacket>(
data.begin(), data.end()));
packet->dump(std::cout);
hexdump(packet->last()->begin(),
@@ -105,7 +105,7 @@ int main (int argc, char const * argv[])
}
}
catch (std::exception const & ex) {
- std::cerr << satcom::lib::prettyName(typeid(ex)) << ": " << ex.what() << "\n";
+ std::cerr << senf::prettyName(typeid(ex)) << ": " << ex.what() << "\n";
}
}
@@ -116,5 +116,5 @@ int main (int argc, char const * argv[])
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/AddressingPolicy.hh b/Socket/AddressingPolicy.hh
index b13ac1d06..238dfcb17 100644
--- a/Socket/AddressingPolicy.hh
+++ b/Socket/AddressingPolicy.hh
@@ -29,13 +29,13 @@
//#include "AddressingPolicy.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
struct NoAddressingPolicy : public AddressingPolicyBase
{};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "AddressingPolicy.cci"
@@ -47,5 +47,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/BSDSocketProtocol.cc b/Socket/BSDSocketProtocol.cc
index f7df702b7..bb595ac3c 100644
--- a/Socket/BSDSocketProtocol.cc
+++ b/Socket/BSDSocketProtocol.cc
@@ -35,7 +35,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ std::pair<bool,unsigned> satcom::lib::BSDSocketProtocol::linger()
+prefix_ std::pair<bool,unsigned> senf::BSDSocketProtocol::linger()
const
{
struct linger ling;
@@ -46,7 +46,7 @@ prefix_ std::pair<bool,unsigned> satcom::lib::BSDSocketProtocol::linger()
return std::make_pair(ling.l_onoff, ling.l_linger);
}
-prefix_ void satcom::lib::BSDSocketProtocol::linger(bool enable, unsigned timeout)
+prefix_ void senf::BSDSocketProtocol::linger(bool enable, unsigned timeout)
const
{
struct linger ling;
@@ -56,7 +56,7 @@ prefix_ void satcom::lib::BSDSocketProtocol::linger(bool enable, unsigned timeou
throw SystemException(errno);
}
-prefix_ struct timeval satcom::lib::BSDSocketProtocol::timestamp()
+prefix_ struct timeval senf::BSDSocketProtocol::timestamp()
const
{
// BUG: Check, why this fails with ENOFILE (!!!!) at least when
@@ -69,7 +69,7 @@ prefix_ struct timeval satcom::lib::BSDSocketProtocol::timestamp()
///////////////////////////////////////////////////////////////////////////
-prefix_ bool satcom::lib::AddressableBSDSocketProtocol::reuseaddr()
+prefix_ bool senf::AddressableBSDSocketProtocol::reuseaddr()
const
{
int value;
@@ -79,7 +79,7 @@ prefix_ bool satcom::lib::AddressableBSDSocketProtocol::reuseaddr()
return value;
}
-prefix_ void satcom::lib::AddressableBSDSocketProtocol::reuseaddr(bool value)
+prefix_ void senf::AddressableBSDSocketProtocol::reuseaddr(bool value)
const
{
int ivalue (value);
@@ -94,5 +94,5 @@ prefix_ void satcom::lib::AddressableBSDSocketProtocol::reuseaddr(bool value)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/BSDSocketProtocol.hh b/Socket/BSDSocketProtocol.hh
index 3d3559919..39d19d855 100644
--- a/Socket/BSDSocketProtocol.hh
+++ b/Socket/BSDSocketProtocol.hh
@@ -30,8 +30,8 @@
//#include "BSDSocketProtocol.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
class BSDSocketProtocol
: public virtual SocketProtocol
@@ -51,7 +51,7 @@ namespace lib {
void reuseaddr(bool value) const;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
@@ -64,5 +64,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/BufferingPolicy.cc b/Socket/BufferingPolicy.cc
index e1c317183..8fdf27b54 100644
--- a/Socket/BufferingPolicy.cc
+++ b/Socket/BufferingPolicy.cc
@@ -35,7 +35,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ unsigned satcom::lib::SocketBufferingPolicy::rcvbuf(FileHandle handle)
+prefix_ unsigned senf::SocketBufferingPolicy::rcvbuf(FileHandle handle)
{
unsigned size;
socklen_t len (sizeof(size));
@@ -46,13 +46,13 @@ prefix_ unsigned satcom::lib::SocketBufferingPolicy::rcvbuf(FileHandle handle)
return size/2;
}
-prefix_ void satcom::lib::SocketBufferingPolicy::rcvbuf(FileHandle handle, unsigned size)
+prefix_ void senf::SocketBufferingPolicy::rcvbuf(FileHandle handle, unsigned size)
{
if (::setsockopt(handle.fd(),SOL_SOCKET,SO_RCVBUF,&size,sizeof(size)) < 0)
throw SystemException(errno);
}
-prefix_ unsigned satcom::lib::SocketBufferingPolicy::sndbuf(FileHandle handle)
+prefix_ unsigned senf::SocketBufferingPolicy::sndbuf(FileHandle handle)
{
unsigned size;
socklen_t len (sizeof(size));
@@ -64,7 +64,7 @@ prefix_ unsigned satcom::lib::SocketBufferingPolicy::sndbuf(FileHandle handle)
}
-prefix_ void satcom::lib::SocketBufferingPolicy::sndbuf(FileHandle handle, unsigned size)
+prefix_ void senf::SocketBufferingPolicy::sndbuf(FileHandle handle, unsigned size)
{
if (::setsockopt(handle.fd(),SOL_SOCKET,SO_SNDBUF,&size,sizeof(size)) < 0)
throw SystemException(errno);
@@ -77,5 +77,5 @@ prefix_ void satcom::lib::SocketBufferingPolicy::sndbuf(FileHandle handle, unsig
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/BufferingPolicy.hh b/Socket/BufferingPolicy.hh
index 9dccd88ac..6eb705c30 100644
--- a/Socket/BufferingPolicy.hh
+++ b/Socket/BufferingPolicy.hh
@@ -30,8 +30,8 @@
//#include "BufferingPolicy.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
// TODO: Should this be dependent on Read / WritePolicy ?
struct SocketBufferingPolicy : public BufferingPolicyBase
@@ -43,7 +43,7 @@ namespace lib {
static void sndbuf(FileHandle handle, unsigned size);
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "BufferingPolicy.cci"
@@ -55,5 +55,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct
index 50c80a81b..acd736b59 100644
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -30,7 +30,7 @@
///////////////////////////////ct.p////////////////////////////////////////
template <class Policy>
-prefix_ std::string satcom::lib::ClientSocketHandle<Policy>::read(unsigned limit)
+prefix_ std::string senf::ClientSocketHandle<Policy>::read(unsigned limit)
{
std::string rv;
this->read(rv,limit);
@@ -38,7 +38,7 @@ prefix_ std::string satcom::lib::ClientSocketHandle<Policy>::read(unsigned limit
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::read(std::string & buffer, unsigned limit)
+prefix_ void senf::ClientSocketHandle<Policy>::read(std::string & buffer, unsigned limit)
{
unsigned nread = available();
if (limit>0 && nread>limit)
@@ -52,7 +52,7 @@ prefix_ void satcom::lib::ClientSocketHandle<Policy>::read(std::string & buffer,
template <class Policy>
prefix_ std::pair<std::string, typename Policy::AddressingPolicy::Address>
-satcom::lib::ClientSocketHandle<Policy>::readfrom()
+senf::ClientSocketHandle<Policy>::readfrom()
{
std::string rv;
typename Policy::AddressingPolicy::Address addr;
@@ -61,7 +61,7 @@ satcom::lib::ClientSocketHandle<Policy>::readfrom()
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::
+prefix_ void senf::ClientSocketHandle<Policy>::
readfrom(std::string & buffer, typename Policy::AddressingPolicy::Address & from)
{
unsigned nread = available();
@@ -73,7 +73,7 @@ readfrom(std::string & buffer, typename Policy::AddressingPolicy::Address & from
}
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::write(std::string const & data)
+prefix_ unsigned senf::ClientSocketHandle<Policy>::write(std::string const & data)
{
unsigned written = this->write(data.data(),data.size());
if (written == 0)
@@ -94,7 +94,7 @@ prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::write(std::string cons
}
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::available()
+prefix_ unsigned senf::ClientSocketHandle<Policy>::available()
{
unsigned nread = this->protocol().available();
if (nread == 0 && this->blocking()) {
@@ -110,5 +110,5 @@ prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::available()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti
index eec7cf7e7..c6a934868 100644
--- a/Socket/ClientSocketHandle.cti
+++ b/Socket/ClientSocketHandle.cti
@@ -32,20 +32,20 @@
template <class Policy>
template <class OtherPolicy>
-prefix_ satcom::lib::ClientSocketHandle<Policy>::
+prefix_ senf::ClientSocketHandle<Policy>::
ClientSocketHandle(ClientSocketHandle<OtherPolicy> other,
typename SocketHandle<Policy>::template IsCompatible<OtherPolicy>::type *)
: SocketHandle<Policy>(other,true)
{}
template <class Policy>
-prefix_ satcom::lib::ClientSocketHandle<Policy>::ClientSocketHandle(FileHandle other,
+prefix_ senf::ClientSocketHandle<Policy>::ClientSocketHandle(FileHandle other,
bool isChecked)
: SocketHandle<Policy>(other, isChecked)
{}
template <class Policy>
-prefix_ satcom::lib::ClientSocketHandle<Policy>::
+prefix_ senf::ClientSocketHandle<Policy>::
ClientSocketHandle(std::auto_ptr<SocketProtocol> protocol, int fd)
: SocketHandle<Policy>(protocol,false)
{
@@ -54,8 +54,8 @@ ClientSocketHandle(std::auto_ptr<SocketProtocol> protocol, int fd)
template <class Policy>
template <class OtherPolicy>
-prefix_ typename satcom::lib::SocketHandle<Policy>::template IsCompatible<OtherPolicy>::type const &
-satcom::lib::ClientSocketHandle<Policy>::operator=(ClientSocketHandle<OtherPolicy> other)
+prefix_ typename senf::SocketHandle<Policy>::template IsCompatible<OtherPolicy>::type const &
+senf::ClientSocketHandle<Policy>::operator=(ClientSocketHandle<OtherPolicy> other)
{
assign(other);
return *this;
@@ -67,28 +67,28 @@ satcom::lib::ClientSocketHandle<Policy>::operator=(ClientSocketHandle<OtherPolic
// reading and writing
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::read(char * buffer,
+prefix_ unsigned senf::ClientSocketHandle<Policy>::read(char * buffer,
unsigned size)
{
return Policy::ReadPolicy::read(*this, buffer, size);
}
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::
+prefix_ unsigned senf::ClientSocketHandle<Policy>::
readfrom(char * buffer, unsigned size, typename Policy::AddressingPolicy::Address & from)
{
return Policy::ReadPolicy::readfrom(*this, buffer, size, from);
}
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::write(char const * buffer,
+prefix_ unsigned senf::ClientSocketHandle<Policy>::write(char const * buffer,
unsigned size)
{
return Policy::WritePolicy::write(*this, buffer, size);
}
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::
+prefix_ unsigned senf::ClientSocketHandle<Policy>::
writeto(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::param_type addr,
std::string const & data)
{
@@ -96,7 +96,7 @@ writeto(typename boost::call_traits<typename Policy::AddressingPolicy::Address>:
}
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::
+prefix_ unsigned senf::ClientSocketHandle<Policy>::
writeto(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::param_type addr,
char const * buffer, unsigned size)
{
@@ -108,7 +108,7 @@ writeto(typename boost::call_traits<typename Policy::AddressingPolicy::Address>:
template <class Policy>
prefix_ typename Policy::AddressingPolicy::Address
-satcom::lib::ClientSocketHandle<Policy>::peer()
+senf::ClientSocketHandle<Policy>::peer()
{
typename Policy::AddressingPolicy::Address addr;
this->peer(addr);
@@ -116,7 +116,7 @@ satcom::lib::ClientSocketHandle<Policy>::peer()
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::
+prefix_ void senf::ClientSocketHandle<Policy>::
peer(typename Policy::AddressingPolicy::Address & addr)
{
Policy::AddressingPolicy::peer(*this,addr);
@@ -124,7 +124,7 @@ peer(typename Policy::AddressingPolicy::Address & addr)
template <class Policy>
prefix_ typename Policy::AddressingPolicy::Address
-satcom::lib::ClientSocketHandle<Policy>::local()
+senf::ClientSocketHandle<Policy>::local()
{
typename Policy::AddressingPolicy::Address addr;
this->local(addr);
@@ -132,20 +132,20 @@ satcom::lib::ClientSocketHandle<Policy>::local()
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::
+prefix_ void senf::ClientSocketHandle<Policy>::
local(typename Policy::AddressingPolicy::Address & addr)
{
Policy::AddressingPolicy::local(*this,addr);
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::connect(AddressParam addr)
+prefix_ void senf::ClientSocketHandle<Policy>::connect(AddressParam addr)
{
Policy::AddressingPolicy::connect(*this,addr);
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::
+prefix_ void senf::ClientSocketHandle<Policy>::
bind(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::param_type addr)
{
Policy::AddressingPolicy::bind(*this,addr);
@@ -155,25 +155,25 @@ bind(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::pa
// Buffering
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::rcvbuf()
+prefix_ unsigned senf::ClientSocketHandle<Policy>::rcvbuf()
{
return Policy::BufferingPolicy::rcvbuf(*this);
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::rcvbuf(unsigned size)
+prefix_ void senf::ClientSocketHandle<Policy>::rcvbuf(unsigned size)
{
Policy::BufferingPolicy::rcvbuf(*this,size);
}
template <class Policy>
-prefix_ unsigned satcom::lib::ClientSocketHandle<Policy>::sndbuf()
+prefix_ unsigned senf::ClientSocketHandle<Policy>::sndbuf()
{
return Policy::BufferingPolicy::sndbuf(*this);
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::sndbuf(unsigned size)
+prefix_ void senf::ClientSocketHandle<Policy>::sndbuf(unsigned size)
{
Policy::BufferingPolicy::sndbuf(*this,size);
}
@@ -181,15 +181,15 @@ prefix_ void satcom::lib::ClientSocketHandle<Policy>::sndbuf(unsigned size)
///////////////////////////////////////////////////////////////////////////
template <class Policy>
-prefix_ satcom::lib::ClientSocketHandle<Policy>
-satcom::lib::ClientSocketHandle<Policy>::cast_static(FileHandle handle)
+prefix_ senf::ClientSocketHandle<Policy>
+senf::ClientSocketHandle<Policy>::cast_static(FileHandle handle)
{
return ClientSocketHandle(handle, true);
}
template <class Policy>
-prefix_ satcom::lib::ClientSocketHandle<Policy>
-satcom::lib::ClientSocketHandle<Policy>::cast_dynamic(FileHandle handle)
+prefix_ senf::ClientSocketHandle<Policy>
+senf::ClientSocketHandle<Policy>::cast_dynamic(FileHandle handle)
{
SocketHandle<Policy> h (SocketHandle<Policy>::cast_dynamic(handle));
if (static_cast<SocketBody&>(FileHandle::body(h)).isServer())
@@ -198,14 +198,14 @@ satcom::lib::ClientSocketHandle<Policy>::cast_dynamic(FileHandle handle)
}
template <class Policy>
-prefix_ void satcom::lib::ClientSocketHandle<Policy>::state(SocketStateMap & map, unsigned lod)
+prefix_ void senf::ClientSocketHandle<Policy>::state(SocketStateMap & map, unsigned lod)
{
map["handle"] = prettyName(typeid(*this));
this->body().state(map,lod);
}
template <class Policy>
-prefix_ std::string satcom::lib::ClientSocketHandle<Policy>::dumpState(unsigned lod)
+prefix_ std::string senf::ClientSocketHandle<Policy>::dumpState(unsigned lod)
{
SocketStateMap map;
state(map,lod);
@@ -218,5 +218,5 @@ prefix_ std::string satcom::lib::ClientSocketHandle<Policy>::dumpState(unsigned
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ClientSocketHandle.hh b/Socket/ClientSocketHandle.hh
index 4f9b98627..a4280e895 100644
--- a/Socket/ClientSocketHandle.hh
+++ b/Socket/ClientSocketHandle.hh
@@ -33,8 +33,8 @@
//#include "ClientSocketHandle.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
template <class Policy> class ServerSocketHandle;
@@ -138,10 +138,10 @@ namespace lib {
private:
unsigned available();
- friend class satcom::lib::ServerSocketHandle<Policy>;
+ friend class senf::ServerSocketHandle<Policy>;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ClientSocketHandle.cci"
@@ -152,5 +152,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ClientSocketHandle.test.cc b/Socket/ClientSocketHandle.test.cc
index e82c57da6..ab0733552 100644
--- a/Socket/ClientSocketHandle.test.cc
+++ b/Socket/ClientSocketHandle.test.cc
@@ -39,7 +39,7 @@
namespace {
- namespace sl = satcom::lib;
+ namespace sl = senf;
class MySocketHandle
: public sl::ClientSocketHandle<sl::test::SomeProtocol::Policy>
@@ -113,7 +113,7 @@ BOOST_AUTO_UNIT_TEST(clientSocketHandle)
}
BOOST_CHECK_NO_THROW( BOOST_CHECK_EQUAL( myh.write("TEST-WRITE"), 10u ) );
- BOOST_CHECK_THROW( myh.write("TEST"),satcom::lib::SystemException );
+ BOOST_CHECK_THROW( myh.write("TEST"),senf::SystemException );
BOOST_CHECK_NO_THROW( BOOST_CHECK_EQUAL( myh.write("TEST-WRITE9",10), 10u ) );
BOOST_CHECK_NO_THROW( BOOST_CHECK_EQUAL( myh.writeto(0,"TEST-WRITE"), 10u ) );
BOOST_CHECK_NO_THROW( BOOST_CHECK_EQUAL( myh.writeto(0,"TEST-WRITE9",10), 10u ) );
@@ -135,5 +135,5 @@ BOOST_AUTO_UNIT_TEST(clientSocketHandle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/CommunicationPolicy.cc b/Socket/CommunicationPolicy.cc
index bc2fa337b..816da3a77 100644
--- a/Socket/CommunicationPolicy.cc
+++ b/Socket/CommunicationPolicy.cc
@@ -36,13 +36,13 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::ConnectedCommunicationPolicy::listen(FileHandle handle,
+prefix_ void senf::ConnectedCommunicationPolicy::listen(FileHandle handle,
unsigned backlog)
{
::listen(handle.fd(),backlog);
}
-prefix_ int satcom::lib::ConnectedCommunicationPolicy::do_accept(FileHandle handle,
+prefix_ int senf::ConnectedCommunicationPolicy::do_accept(FileHandle handle,
struct sockaddr * addr,
unsigned len)
{
@@ -69,5 +69,5 @@ prefix_ int satcom::lib::ConnectedCommunicationPolicy::do_accept(FileHandle hand
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/CommunicationPolicy.cti b/Socket/CommunicationPolicy.cti
index f3be50d1e..98711da3e 100644
--- a/Socket/CommunicationPolicy.cti
+++ b/Socket/CommunicationPolicy.cti
@@ -30,7 +30,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Policy>
-prefix_ int satcom::lib::ConnectedCommunicationPolicy::
+prefix_ int senf::ConnectedCommunicationPolicy::
accept(ServerSocketHandle<Policy> handle,
typename ServerSocketHandle<Policy>::Address & address,
typename IfAddressingPolicyIsNot<Policy,NoAddressingPolicy>::type *)
@@ -44,5 +44,5 @@ accept(ServerSocketHandle<Policy> handle,
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/CommunicationPolicy.hh b/Socket/CommunicationPolicy.hh
index e5ad2076a..4d8cdce77 100644
--- a/Socket/CommunicationPolicy.hh
+++ b/Socket/CommunicationPolicy.hh
@@ -33,8 +33,8 @@
struct sockaddr;
-namespace satcom {
-namespace lib {
+namespace senf {
+
template <class Policy> class ServerSocketHandle;
@@ -52,7 +52,7 @@ namespace lib {
struct UnconnectedCommunicationPolicy : public CommunicationPolicyBase
{};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
@@ -64,5 +64,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/FileHandle.cc b/Socket/FileHandle.cc
index 4865ae643..687bde711 100644
--- a/Socket/FileHandle.cc
+++ b/Socket/FileHandle.cc
@@ -36,30 +36,30 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::FileBody::v_close()
+prefix_ void senf::FileBody::v_close()
{
if (::close(fd_) != 0)
throw SystemException(errno);
}
-prefix_ void satcom::lib::FileBody::v_terminate()
+prefix_ void senf::FileBody::v_terminate()
{
::close(fd_);
}
-prefix_ bool satcom::lib::FileBody::v_eof()
+prefix_ bool senf::FileBody::v_eof()
const
{
return false;
}
-prefix_ bool satcom::lib::FileBody::v_valid()
+prefix_ bool senf::FileBody::v_valid()
const
{
return true;
}
-prefix_ bool satcom::lib::FileBody::blocking()
+prefix_ bool senf::FileBody::blocking()
const
{
int flags = ::fcntl(fd(),F_GETFL);
@@ -67,7 +67,7 @@ prefix_ bool satcom::lib::FileBody::blocking()
return ! (flags & O_NONBLOCK);
}
-prefix_ void satcom::lib::FileBody::blocking(bool status)
+prefix_ void senf::FileBody::blocking(bool status)
{
int flags = ::fcntl(fd(),F_GETFL);
if (flags < 0) throw SystemException(errno);
@@ -76,7 +76,7 @@ prefix_ void satcom::lib::FileBody::blocking(bool status)
if (::fcntl(fd(), F_SETFL, flags) < 0) throw SystemException(errno);
}
-prefix_ bool satcom::lib::FileBody::pollCheck(int fd, bool incoming, bool block)
+prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, bool block)
const
{
struct ::pollfd pfd;
@@ -103,5 +103,5 @@ prefix_ bool satcom::lib::FileBody::pollCheck(int fd, bool incoming, bool block)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/FileHandle.cci b/Socket/FileHandle.cci
index bb366baac..f69d3e01c 100644
--- a/Socket/FileHandle.cci
+++ b/Socket/FileHandle.cci
@@ -32,13 +32,13 @@
///////////////////////////////cci.p///////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::FileBody
+// senf::FileBody
-prefix_ satcom::lib::FileBody::FileBody(int fd)
+prefix_ senf::FileBody::FileBody(int fd)
: fd_(fd)
{}
-prefix_ satcom::lib::FileBody::~FileBody()
+prefix_ senf::FileBody::~FileBody()
{
if (valid())
try {
@@ -49,7 +49,7 @@ prefix_ satcom::lib::FileBody::~FileBody()
}
}
-prefix_ void satcom::lib::FileBody::close()
+prefix_ void senf::FileBody::close()
{
if (!valid())
throw SystemException(EBADF);
@@ -57,7 +57,7 @@ prefix_ void satcom::lib::FileBody::close()
fd_ = -1;
}
-prefix_ void satcom::lib::FileBody::terminate()
+prefix_ void senf::FileBody::terminate()
{
if (valid()) {
v_terminate();
@@ -65,169 +65,169 @@ prefix_ void satcom::lib::FileBody::terminate()
}
}
-prefix_ int satcom::lib::FileBody::fd()
+prefix_ int senf::FileBody::fd()
const
{
return fd_;
}
-prefix_ void satcom::lib::FileBody::fd(int fd)
+prefix_ void senf::FileBody::fd(int fd)
{
fd_ = fd;
}
-prefix_ bool satcom::lib::FileBody::eof()
+prefix_ bool senf::FileBody::eof()
const
{
return v_eof();
}
-prefix_ bool satcom::lib::FileBody::valid()
+prefix_ bool senf::FileBody::valid()
const
{
return fd_!=-1 && v_valid();
}
-prefix_ bool satcom::lib::FileBody::readable()
+prefix_ bool senf::FileBody::readable()
const
{
return pollCheck(fd(),true);
}
-prefix_ void satcom::lib::FileBody::waitReadable()
+prefix_ void senf::FileBody::waitReadable()
const
{
pollCheck(fd(),true,true);
}
-prefix_ bool satcom::lib::FileBody::writeable()
+prefix_ bool senf::FileBody::writeable()
const
{
return pollCheck(fd(),false);
}
-prefix_ void satcom::lib::FileBody::waitWriteable()
+prefix_ void senf::FileBody::waitWriteable()
const
{
pollCheck(fd(),false,true);
}
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::FileHandle
+// senf::FileHandle
-prefix_ void satcom::lib::FileHandle::close()
+prefix_ void senf::FileHandle::close()
{
body().close();
}
-prefix_ void satcom::lib::FileHandle::terminate()
+prefix_ void senf::FileHandle::terminate()
{
body().terminate();
}
-prefix_ bool satcom::lib::FileHandle::readable()
+prefix_ bool senf::FileHandle::readable()
const
{
return body().readable();
}
-prefix_ void satcom::lib::FileHandle::waitReadable()
+prefix_ void senf::FileHandle::waitReadable()
const
{
body().waitReadable();
}
-prefix_ bool satcom::lib::FileHandle::writeable()
+prefix_ bool senf::FileHandle::writeable()
const
{
return body().writeable();
}
-prefix_ void satcom::lib::FileHandle::waitWriteable()
+prefix_ void senf::FileHandle::waitWriteable()
const
{
body().waitWriteable();
}
-prefix_ bool satcom::lib::FileHandle::blocking()
+prefix_ bool senf::FileHandle::blocking()
const
{
return body().blocking();
}
-prefix_ void satcom::lib::FileHandle::blocking(bool status)
+prefix_ void senf::FileHandle::blocking(bool status)
{
body().blocking(status);
}
-prefix_ bool satcom::lib::FileHandle::eof()
+prefix_ bool senf::FileHandle::eof()
const
{
return body().eof();
}
-prefix_ bool satcom::lib::FileHandle::valid()
+prefix_ bool senf::FileHandle::valid()
const
{
return body().valid();
}
-prefix_ bool satcom::lib::FileHandle::boolean_test()
+prefix_ bool senf::FileHandle::boolean_test()
const
{
return valid() && !eof();
}
-prefix_ int satcom::lib::FileHandle::fd()
+prefix_ int senf::FileHandle::fd()
const
{
return body().fd();
}
-prefix_ satcom::lib::FileHandle::FileHandle(std::auto_ptr<FileBody> body)
+prefix_ senf::FileHandle::FileHandle(std::auto_ptr<FileBody> body)
: body_(body.release())
{}
-prefix_ satcom::lib::FileBody & satcom::lib::FileHandle::body()
+prefix_ senf::FileBody & senf::FileHandle::body()
{
return *body_;
}
-prefix_ satcom::lib::FileBody const & satcom::lib::FileHandle::body()
+prefix_ senf::FileBody const & senf::FileHandle::body()
const
{
return *body_;
}
-prefix_ satcom::lib::FileBody & satcom::lib::FileHandle::body(FileHandle & handle)
+prefix_ senf::FileBody & senf::FileHandle::body(FileHandle & handle)
{
return handle.body();
}
-prefix_ satcom::lib::FileBody const &
-satcom::lib::FileHandle::body(FileHandle const & handle)
+prefix_ senf::FileBody const &
+senf::FileHandle::body(FileHandle const & handle)
{
return handle.body();
}
-prefix_ void satcom::lib::FileHandle::fd(int fd)
+prefix_ void senf::FileHandle::fd(int fd)
{
body().fd(fd);
}
-prefix_ satcom::lib::FileHandle::FileHandle
-satcom::lib::FileHandle::cast_static(FileHandle handle)
+prefix_ senf::FileHandle::FileHandle
+senf::FileHandle::cast_static(FileHandle handle)
{
return handle;
}
-prefix_ satcom::lib::FileHandle
-satcom::lib::FileHandle::cast_dynamic(FileHandle handle)
+prefix_ senf::FileHandle
+senf::FileHandle::cast_dynamic(FileHandle handle)
{
return handle;
}
-prefix_ int satcom::lib::retrieve_filehandle(FileHandle handle)
+prefix_ int senf::retrieve_filehandle(FileHandle handle)
{
return handle.fd();
}
@@ -238,5 +238,5 @@ prefix_ int satcom::lib::retrieve_filehandle(FileHandle handle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/FileHandle.hh b/Socket/FileHandle.hh
index 3bbbb9b60..963689d9b 100644
--- a/Socket/FileHandle.hh
+++ b/Socket/FileHandle.hh
@@ -40,8 +40,8 @@
///////////////////////////////hh.p////////////////////////////////////////
#include "FileHandle.ih"
-namespace satcom {
-namespace lib {
+namespace senf {
+
/** \brief
*/
@@ -103,7 +103,7 @@ namespace lib {
int retrieve_filehandle(FileHandle handle);
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "FileHandle.cci"
@@ -114,5 +114,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index 8e5973768..9ca832d98 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -29,13 +29,13 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
/** \brief
*/
class FileBody
- : public satcom::lib::intrusive_refcount
+ : public senf::intrusive_refcount
{
public:
///////////////////////////////////////////////////////////////////////////
@@ -91,7 +91,7 @@ namespace lib {
int fd_;
};
-}}
+}
///////////////////////////////ih.e////////////////////////////////////////
#endif
@@ -99,5 +99,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/FileHandle.test.cc b/Socket/FileHandle.test.cc
index c86a26b99..dd2243559 100644
--- a/Socket/FileHandle.test.cc
+++ b/Socket/FileHandle.test.cc
@@ -38,19 +38,19 @@
///////////////////////////////cc.p////////////////////////////////////////
namespace {
- class FHandle : public satcom::lib::FileHandle
+ class FHandle : public senf::FileHandle
{
public:
FHandle(int fd=-1)
- : satcom::lib::FileHandle(std::auto_ptr<satcom::lib::FileBody>(
- new satcom::lib::FileBody(fd))) {}
+ : senf::FileHandle(std::auto_ptr<senf::FileBody>(
+ new senf::FileBody(fd))) {}
FHandle(std::string name)
- : satcom::lib::FileHandle(std::auto_ptr<satcom::lib::FileBody>(
- new satcom::lib::FileBody()))
+ : senf::FileHandle(std::auto_ptr<senf::FileBody>(
+ new senf::FileBody()))
{
int rv = ::open(name.c_str(),O_RDWR|O_NONBLOCK) ;
if (rv<0)
- throw satcom::lib::SystemException(errno);
+ throw senf::SystemException(errno);
fd(rv);
}
};
@@ -71,7 +71,7 @@ BOOST_AUTO_UNIT_TEST(fileHandle)
BOOST_CHECK(fh.writeable());
BOOST_CHECK_NO_THROW(fh.close());
- BOOST_CHECK_THROW(fh.close(),satcom::lib::SystemException);
+ BOOST_CHECK_THROW(fh.close(),senf::SystemException);
BOOST_CHECK_NO_THROW(fh.terminate());
}
@@ -111,5 +111,5 @@ BOOST_AUTO_UNIT_TEST(fileHandle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/FramingPolicy.hh b/Socket/FramingPolicy.hh
index 96a4b98a3..97a440c26 100644
--- a/Socket/FramingPolicy.hh
+++ b/Socket/FramingPolicy.hh
@@ -29,8 +29,8 @@
//#include "FramingPolicy.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
struct StreamFramingPolicy : public FramingPolicyBase
{};
@@ -38,7 +38,7 @@ namespace lib {
struct DatagramFramingPolicy : public FramingPolicyBase
{};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "FramingPolicy.cci"
@@ -49,5 +49,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/GenericAddressingPolicy.cc b/Socket/GenericAddressingPolicy.cc
index abb99f575..a59d1746f 100644
--- a/Socket/GenericAddressingPolicy.cc
+++ b/Socket/GenericAddressingPolicy.cc
@@ -34,7 +34,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::GenericAddressingPolicy_Base::do_local(FileHandle handle,
+prefix_ void senf::GenericAddressingPolicy_Base::do_local(FileHandle handle,
struct sockaddr * addr,
unsigned len)
{
@@ -42,7 +42,7 @@ prefix_ void satcom::lib::GenericAddressingPolicy_Base::do_local(FileHandle hand
throw SystemException(errno);
}
-prefix_ void satcom::lib::GenericAddressingPolicy_Base::do_peer(FileHandle handle,
+prefix_ void senf::GenericAddressingPolicy_Base::do_peer(FileHandle handle,
struct sockaddr * addr,
unsigned len)
{
@@ -50,7 +50,7 @@ prefix_ void satcom::lib::GenericAddressingPolicy_Base::do_peer(FileHandle handl
throw SystemException(errno);
}
-prefix_ void satcom::lib::GenericAddressingPolicy_Base::do_bind(FileHandle handle,
+prefix_ void senf::GenericAddressingPolicy_Base::do_bind(FileHandle handle,
struct sockaddr const * addr,
unsigned len)
{
@@ -58,7 +58,7 @@ prefix_ void satcom::lib::GenericAddressingPolicy_Base::do_bind(FileHandle handl
throw SystemException(errno);
}
-prefix_ void satcom::lib::GenericAddressingPolicy_Base::do_connect(FileHandle handle,
+prefix_ void senf::GenericAddressingPolicy_Base::do_connect(FileHandle handle,
struct sockaddr const * addr,
unsigned len)
{
@@ -92,5 +92,5 @@ prefix_ void satcom::lib::GenericAddressingPolicy_Base::do_connect(FileHandle ha
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/GenericAddressingPolicy.cti b/Socket/GenericAddressingPolicy.cti
index cb0d40045..33e6120c5 100644
--- a/Socket/GenericAddressingPolicy.cti
+++ b/Socket/GenericAddressingPolicy.cti
@@ -30,11 +30,11 @@
///////////////////////////////cti.p///////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::GenericAddressingPolicy<Address>
+// senf::GenericAddressingPolicy<Address>
template <class Address>
template <class Policy>
-prefix_ void satcom::lib::GenericAddressingPolicy<Address>::
+prefix_ void senf::GenericAddressingPolicy<Address>::
peer(SocketHandle<Policy> handle, Address & addr,
typename IfCommunicationPolicyIs<Policy,ConnectedCommunicationPolicy>::type *)
{
@@ -44,7 +44,7 @@ peer(SocketHandle<Policy> handle, Address & addr,
template <class Address>
template <class Policy>
-prefix_ void satcom::lib::GenericAddressingPolicy<Address>::
+prefix_ void senf::GenericAddressingPolicy<Address>::
connect(SocketHandle<Policy> handle, Address const & addr,
typename IfCommunicationPolicyIs<Policy,ConnectedCommunicationPolicy>::type *)
{
@@ -52,7 +52,7 @@ connect(SocketHandle<Policy> handle, Address const & addr,
}
template <class Address>
-prefix_ void satcom::lib::GenericAddressingPolicy<Address>::local(FileHandle handle,
+prefix_ void senf::GenericAddressingPolicy<Address>::local(FileHandle handle,
Address & addr)
{
addr.clear();
@@ -60,7 +60,7 @@ prefix_ void satcom::lib::GenericAddressingPolicy<Address>::local(FileHandle han
}
template <class Address>
-prefix_ void satcom::lib::GenericAddressingPolicy<Address>::bind(FileHandle handle,
+prefix_ void senf::GenericAddressingPolicy<Address>::bind(FileHandle handle,
Address const & addr)
{
do_bind(handle,addr.sockaddr_p(),addr.sockaddr_len());
@@ -72,5 +72,5 @@ prefix_ void satcom::lib::GenericAddressingPolicy<Address>::bind(FileHandle hand
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/GenericAddressingPolicy.hh b/Socket/GenericAddressingPolicy.hh
index da55c11f7..fa7f5d193 100644
--- a/Socket/GenericAddressingPolicy.hh
+++ b/Socket/GenericAddressingPolicy.hh
@@ -32,8 +32,8 @@
//#include "GenericAddressingPolicy.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
struct GenericAddressingPolicy_Base
{
@@ -58,7 +58,7 @@ namespace lib {
static void bind(FileHandle handle, Address const & addr);
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "GenericAddressingPolicy.cci"
@@ -70,5 +70,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/GenericSockAddr.cci b/Socket/GenericSockAddr.cci
index 7ab43721d..81907cc4e 100644
--- a/Socket/GenericSockAddr.cci
+++ b/Socket/GenericSockAddr.cci
@@ -9,21 +9,21 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::lib::GenericSockAddr::GenericSockAddr()
+prefix_ senf::GenericSockAddr::GenericSockAddr()
{}
-prefix_ struct sockaddr * satcom::lib::GenericSockAddr::sockaddr_p()
+prefix_ struct sockaddr * senf::GenericSockAddr::sockaddr_p()
{
return reinterpret_cast<sockaddr *>(&addr_);
}
-prefix_ struct sockaddr const * satcom::lib::GenericSockAddr::sockaddr_p()
+prefix_ struct sockaddr const * senf::GenericSockAddr::sockaddr_p()
const
{
return reinterpret_cast<sockaddr const *>(&addr_);
}
-prefix_ unsigned satcom::lib::GenericSockAddr::sockaddr_len()
+prefix_ unsigned senf::GenericSockAddr::sockaddr_len()
const
{
return sizeof(addr_);
diff --git a/Socket/GenericSockAddr.hh b/Socket/GenericSockAddr.hh
index c05d1587a..7e1b43724 100644
--- a/Socket/GenericSockAddr.hh
+++ b/Socket/GenericSockAddr.hh
@@ -11,8 +11,8 @@
//#include "GenericSockAddr.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
class GenericSockAddr
{
@@ -27,7 +27,7 @@ namespace lib {
struct ::sockaddr_storage addr_;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "GenericSockAddr.cci"
diff --git a/Socket/INetAddressing.cc b/Socket/INetAddressing.cc
index 013704d73..404f86512 100644
--- a/Socket/INetAddressing.cc
+++ b/Socket/INetAddressing.cc
@@ -35,7 +35,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ satcom::lib::INet4Address::INet4Address(std::string host, unsigned port)
+prefix_ senf::INet4Address::INet4Address(std::string host, unsigned port)
{
clear();
// TODO: gethostbyname einbauen
@@ -44,7 +44,7 @@ prefix_ satcom::lib::INet4Address::INet4Address(std::string host, unsigned port)
addr_.sin_port = htons(port);
}
-prefix_ std::string satcom::lib::INet4Address::str()
+prefix_ std::string senf::INet4Address::str()
const
{
std::stringstream s;
@@ -52,13 +52,13 @@ prefix_ std::string satcom::lib::INet4Address::str()
return s.str();
}
-prefix_ void satcom::lib::INet4Address::clear()
+prefix_ void senf::INet4Address::clear()
{
::memset(&addr_,0,sizeof(addr_));
addr_.sin_family = AF_INET;
}
-prefix_ void satcom::lib::INet4Address::assignString(std::string address)
+prefix_ void senf::INet4Address::assignString(std::string address)
{
clear();
// TODO: gethostbyname einbauen
@@ -83,5 +83,5 @@ prefix_ void satcom::lib::INet4Address::assignString(std::string address)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/INetAddressing.cci b/Socket/INetAddressing.cci
index a04def2ab..7089881c5 100644
--- a/Socket/INetAddressing.cci
+++ b/Socket/INetAddressing.cci
@@ -28,59 +28,59 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::lib::INet4Address::INet4Address()
+prefix_ senf::INet4Address::INet4Address()
{
clear();
}
-prefix_ satcom::lib::INet4Address::INet4Address(char const * address)
+prefix_ senf::INet4Address::INet4Address(char const * address)
{
assignString(address);
}
-prefix_ satcom::lib::INet4Address::INet4Address(std::string address)
+prefix_ senf::INet4Address::INet4Address(std::string address)
{
assignString(address);
}
-prefix_ bool satcom::lib::INet4Address::operator==(INet4Address const & other)
+prefix_ bool senf::INet4Address::operator==(INet4Address const & other)
const
{
return addr_.sin_port == other.addr_.sin_port &&
addr_.sin_addr.s_addr == other.addr_.sin_addr.s_addr;
}
-prefix_ std::string satcom::lib::INet4Address::host()
+prefix_ std::string senf::INet4Address::host()
const
{
// FIXME: thread safety?
return std::string(::inet_ntoa(addr_.sin_addr));
}
-prefix_ unsigned satcom::lib::INet4Address::port()
+prefix_ unsigned senf::INet4Address::port()
const
{
return ntohs(addr_.sin_port);
}
-prefix_ struct sockaddr * satcom::lib::INet4Address::sockaddr_p()
+prefix_ struct sockaddr * senf::INet4Address::sockaddr_p()
{
return reinterpret_cast<struct sockaddr *>(&addr_);
}
-prefix_ struct sockaddr const * satcom::lib::INet4Address::sockaddr_p()
+prefix_ struct sockaddr const * senf::INet4Address::sockaddr_p()
const
{
return reinterpret_cast<struct sockaddr const *>(&addr_);
}
-prefix_ unsigned satcom::lib::INet4Address::sockaddr_len()
+prefix_ unsigned senf::INet4Address::sockaddr_len()
const
{
return sizeof(addr_);
}
-prefix_ std::ostream & satcom::lib::operator<<(std::ostream & os, INet4Address const & addr)
+prefix_ std::ostream & senf::operator<<(std::ostream & os, INet4Address const & addr)
{
os << addr.str();
return os;
@@ -92,5 +92,5 @@ prefix_ std::ostream & satcom::lib::operator<<(std::ostream & os, INet4Address c
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/INetAddressing.hh b/Socket/INetAddressing.hh
index 28a8a5915..60a71a22f 100644
--- a/Socket/INetAddressing.hh
+++ b/Socket/INetAddressing.hh
@@ -35,8 +35,8 @@
//#include "INetAddressing.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
// TODO: Implement real INet4Address datatype and
// rename this one to INet4SockAddress ...
@@ -98,7 +98,7 @@ namespace lib {
struct InvalidINetAddressException : public std::exception
{ char const * what() const throw() { return "invalid inet address"; } };
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "INetAddressing.cci"
@@ -110,5 +110,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/INetAddressing.test.cc b/Socket/INetAddressing.test.cc
index dea7b881d..04b66009c 100644
--- a/Socket/INetAddressing.test.cc
+++ b/Socket/INetAddressing.test.cc
@@ -36,8 +36,8 @@
BOOST_AUTO_UNIT_TEST(inet4Address)
{
- using satcom::lib::INet4Address;
- using satcom::lib::InvalidINetAddressException;
+ using senf::INet4Address;
+ using senf::InvalidINetAddressException;
{
INet4Address addr;
@@ -85,5 +85,5 @@ BOOST_AUTO_UNIT_TEST(inet6Address)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/INetProtocol.cc b/Socket/INetProtocol.cc
index b66e15d74..4fb2ff0eb 100644
--- a/Socket/INetProtocol.cc
+++ b/Socket/INetProtocol.cc
@@ -36,23 +36,23 @@
///////////////////////////////cc.p////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::INet4Protocol
+// senf::INet4Protocol
-prefix_ void satcom::lib::IPv4Protocol::connect(INet4Address const & address)
+prefix_ void senf::IPv4Protocol::connect(INet4Address const & address)
const
{
if (::connect(body().fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
throw SystemException(errno);
}
-prefix_ void satcom::lib::IPv4Protocol::bind(INet4Address const & address)
+prefix_ void senf::IPv4Protocol::bind(INet4Address const & address)
const
{
if (::bind(body().fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
throw SystemException(errno);
}
-prefix_ bool satcom::lib::IPv4Protocol::mcLoop()
+prefix_ bool senf::IPv4Protocol::mcLoop()
const
{
int value;
@@ -62,7 +62,7 @@ prefix_ bool satcom::lib::IPv4Protocol::mcLoop()
return value;
}
-prefix_ void satcom::lib::IPv4Protocol::mcLoop(bool value)
+prefix_ void senf::IPv4Protocol::mcLoop(bool value)
const
{
int ivalue (value);
@@ -70,7 +70,7 @@ prefix_ void satcom::lib::IPv4Protocol::mcLoop(bool value)
throw SystemException(errno);
}
-prefix_ void satcom::lib::IPv4Protocol::mcAddMembership(INet4Address const & mcAddr)
+prefix_ void senf::IPv4Protocol::mcAddMembership(INet4Address const & mcAddr)
const
{
struct ip_mreqn mreqn;
@@ -81,7 +81,7 @@ prefix_ void satcom::lib::IPv4Protocol::mcAddMembership(INet4Address const & mcA
throw SystemException(errno);
}
-prefix_ void satcom::lib::IPv4Protocol::mcAddMembership(INet4Address const & mcAddr,
+prefix_ void senf::IPv4Protocol::mcAddMembership(INet4Address const & mcAddr,
INet4Address const & localAddr)
const
{
@@ -93,7 +93,7 @@ prefix_ void satcom::lib::IPv4Protocol::mcAddMembership(INet4Address const & mcA
throw SystemException(errno);
}
-prefix_ void satcom::lib::IPv4Protocol::mcDropMembership(INet4Address const & mcAddr)
+prefix_ void senf::IPv4Protocol::mcDropMembership(INet4Address const & mcAddr)
const
{
struct ip_mreqn mreqn;
@@ -104,7 +104,7 @@ prefix_ void satcom::lib::IPv4Protocol::mcDropMembership(INet4Address const & mc
throw SystemException(errno);
}
-prefix_ void satcom::lib::IPv4Protocol::mcDropMembership(INet4Address const & mcAddr,
+prefix_ void senf::IPv4Protocol::mcDropMembership(INet4Address const & mcAddr,
INet4Address const & localAddr)
const
{
@@ -116,7 +116,7 @@ prefix_ void satcom::lib::IPv4Protocol::mcDropMembership(INet4Address const & mc
throw SystemException(errno);
}
-prefix_ void satcom::lib::IPv4Protocol::mcIface(std::string iface)
+prefix_ void senf::IPv4Protocol::mcIface(std::string iface)
const
{
struct ip_mreqn mreqn;
@@ -130,7 +130,7 @@ prefix_ void satcom::lib::IPv4Protocol::mcIface(std::string iface)
throw SystemException(errno);
}
-prefix_ unsigned satcom::lib::IPv4Protocol::mcTTL()
+prefix_ unsigned senf::IPv4Protocol::mcTTL()
const
{
int value;
@@ -140,7 +140,7 @@ prefix_ unsigned satcom::lib::IPv4Protocol::mcTTL()
return value;
}
-prefix_ void satcom::lib::IPv4Protocol::mcTTL(unsigned value)
+prefix_ void senf::IPv4Protocol::mcTTL(unsigned value)
const
{
if (::setsockopt(body().fd(),SOL_IP,IP_MULTICAST_TTL,&value,sizeof(value)) < 0)
@@ -155,5 +155,5 @@ prefix_ void satcom::lib::IPv4Protocol::mcTTL(unsigned value)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/INetProtocol.hh b/Socket/INetProtocol.hh
index a5a3cd60f..5c6bc7afa 100644
--- a/Socket/INetProtocol.hh
+++ b/Socket/INetProtocol.hh
@@ -38,8 +38,8 @@
//#include "INetProtocol.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
class IPv4Protocol
: public virtual SocketProtocol
@@ -74,7 +74,7 @@ namespace lib {
: public virtual SocketProtocol
{};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "INetProtocol.cci"
@@ -85,5 +85,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/LLAddressing.cc b/Socket/LLAddressing.cc
index 6ef950841..262500d68 100644
--- a/Socket/LLAddressing.cc
+++ b/Socket/LLAddressing.cc
@@ -38,7 +38,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ unsigned char satcom::lib::detail::hexnibble(char c)
+prefix_ unsigned char senf::detail::hexnibble(char c)
{
if (c>='0' && c<='9')
return c - '0';
@@ -49,7 +49,7 @@ prefix_ unsigned char satcom::lib::detail::hexnibble(char c)
throw InvalidLLSocketAddressException();
}
-prefix_ std::string satcom::lib::LLSocketAddress::interface()
+prefix_ std::string senf::LLSocketAddress::interface()
const
{
if (addr_.sll_ifindex == 0)
@@ -79,7 +79,7 @@ prefix_ std::string satcom::lib::LLSocketAddress::interface()
/*
-prefix_ void satcom::lib::LLSocketAddress::address(std::string address)
+prefix_ void senf::LLSocketAddress::address(std::string address)
{
typedef boost::split_iterator<std::string::iterator> StringSplitIterator;
StringSplitIterator i = boost::make_split_iterator(address, boost::token_finder(boost::is_any_of("-: ")));
@@ -94,7 +94,7 @@ prefix_ void satcom::lib::LLSocketAddress::address(std::string address)
}
*/
-prefix_ void satcom::lib::LLSocketAddress::interface(std::string interface)
+prefix_ void senf::LLSocketAddress::interface(std::string interface)
{
if (! interface.empty()) {
addr_.sll_ifindex = if_nametoindex(interface.c_str());
@@ -104,8 +104,8 @@ prefix_ void satcom::lib::LLSocketAddress::interface(std::string interface)
}
-prefix_ satcom::lib::detail::LLAddressFromStringRange
-satcom::lib::llAddress(std::string address)
+prefix_ senf::detail::LLAddressFromStringRange
+senf::llAddress(std::string address)
{
detail::StringSplitIterator i =
boost::make_split_iterator(address, boost::token_finder(boost::is_any_of("-: ")));
@@ -124,5 +124,5 @@ satcom::lib::llAddress(std::string address)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/LLAddressing.cci b/Socket/LLAddressing.cci
index 3de8a5ec7..f7dfdf997 100644
--- a/Socket/LLAddressing.cci
+++ b/Socket/LLAddressing.cci
@@ -29,37 +29,37 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::lib::LLSocketAddress::LLSocketAddress()
+prefix_ senf::LLSocketAddress::LLSocketAddress()
{
clear();
}
-prefix_ satcom::lib::LLSocketAddress::LLSocketAddress(unsigned protocol, std::string interface)
+prefix_ senf::LLSocketAddress::LLSocketAddress(unsigned protocol, std::string interface)
{
clear();
this->protocol(protocol);
this->interface(interface);
}
-prefix_ satcom::lib::LLSocketAddress::LLSocketAddress(std::string interface)
+prefix_ senf::LLSocketAddress::LLSocketAddress(std::string interface)
{
clear();
this->interface(interface);
}
-prefix_ void satcom::lib::LLSocketAddress::clear()
+prefix_ void senf::LLSocketAddress::clear()
{
::memset(&addr_,0,sizeof(addr_));
addr_.sll_family = AF_PACKET;
}
-prefix_ unsigned satcom::lib::LLSocketAddress::protocol()
+prefix_ unsigned senf::LLSocketAddress::protocol()
const
{
return ntohs(addr_.sll_protocol);
}
-prefix_ unsigned satcom::lib::LLSocketAddress::arptype()
+prefix_ unsigned senf::LLSocketAddress::arptype()
const
{
// TODO: Check, wether this is returned in network or host byte
@@ -67,7 +67,7 @@ prefix_ unsigned satcom::lib::LLSocketAddress::arptype()
return ntohs(addr_.sll_hatype);
}
-prefix_ unsigned satcom::lib::LLSocketAddress::pkttype()
+prefix_ unsigned senf::LLSocketAddress::pkttype()
const
{
// TODO: Check, wether this is returned in network or host byte
@@ -75,29 +75,29 @@ prefix_ unsigned satcom::lib::LLSocketAddress::pkttype()
return ntohs(addr_.sll_pkttype);
}
-prefix_ satcom::lib::LLSocketAddress::LLAddress satcom::lib::LLSocketAddress::address()
+prefix_ senf::LLSocketAddress::LLAddress senf::LLSocketAddress::address()
const
{
return LLAddress(&addr_.sll_addr[0], &addr_.sll_addr[addr_.sll_halen]);
}
-prefix_ void satcom::lib::LLSocketAddress::protocol(unsigned protocol)
+prefix_ void senf::LLSocketAddress::protocol(unsigned protocol)
{
addr_.sll_protocol = htons(protocol);
}
-prefix_ struct sockaddr * satcom::lib::LLSocketAddress::sockaddr_p()
+prefix_ struct sockaddr * senf::LLSocketAddress::sockaddr_p()
{
return reinterpret_cast<struct sockaddr *>(&addr_);
}
-prefix_ struct sockaddr const * satcom::lib::LLSocketAddress::sockaddr_p()
+prefix_ struct sockaddr const * senf::LLSocketAddress::sockaddr_p()
const
{
return reinterpret_cast<struct sockaddr const *>(&addr_);
}
-prefix_ unsigned satcom::lib::LLSocketAddress::sockaddr_len()
+prefix_ unsigned senf::LLSocketAddress::sockaddr_len()
const
{
return sizeof(addr_);
@@ -109,5 +109,5 @@ prefix_ unsigned satcom::lib::LLSocketAddress::sockaddr_len()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/LLAddressing.ct b/Socket/LLAddressing.ct
index cf38dd47b..c9b2086c4 100644
--- a/Socket/LLAddressing.ct
+++ b/Socket/LLAddressing.ct
@@ -33,7 +33,7 @@
///////////////////////////////ct.p////////////////////////////////////////
template <class ForwardRange>
-prefix_ void satcom::lib::LLSocketAddress::address(ForwardRange const & address)
+prefix_ void senf::LLSocketAddress::address(ForwardRange const & address)
{
if (boost::size(address) > sizeof(addr_.sll_addr))
throw InvalidLLSocketAddressException();
@@ -48,7 +48,7 @@ prefix_ void satcom::lib::LLSocketAddress::address(ForwardRange const & address)
template <class ForwardRange>
prefix_ std::string
-satcom::lib::llAddress(ForwardRange const & address,
+senf::llAddress(ForwardRange const & address,
typename boost::enable_if< boost::is_class<ForwardRange> >::type *)
{
if (boost::empty(address))
@@ -66,7 +66,7 @@ satcom::lib::llAddress(ForwardRange const & address,
}
template <class ForwardRange>
-prefix_ unsigned char satcom::lib::detail::HexConverter::operator()(ForwardRange const & v)
+prefix_ unsigned char senf::detail::HexConverter::operator()(ForwardRange const & v)
const
{
if (boost::size(v) != 2)
@@ -82,5 +82,5 @@ prefix_ unsigned char satcom::lib::detail::HexConverter::operator()(ForwardRange
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/LLAddressing.cti b/Socket/LLAddressing.cti
index c1a5e68e1..e8ffd94c9 100644
--- a/Socket/LLAddressing.cti
+++ b/Socket/LLAddressing.cti
@@ -31,7 +31,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class ForwardRange>
-prefix_ satcom::lib::LLSocketAddress::
+prefix_ senf::LLSocketAddress::
LLSocketAddress(ForwardRange const & address, std::string interface,
typename boost::enable_if_c<! boost::is_integral<ForwardRange>::value >::type *)
{
@@ -46,5 +46,5 @@ LLSocketAddress(ForwardRange const & address, std::string interface,
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/LLAddressing.hh b/Socket/LLAddressing.hh
index ce699bea9..e27ecff5d 100644
--- a/Socket/LLAddressing.hh
+++ b/Socket/LLAddressing.hh
@@ -39,8 +39,8 @@
#include "LLAddressing.ih"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
class LLSocketAddress
{
@@ -122,7 +122,7 @@ namespace lib {
struct InvalidLLSocketAddressException : public std::exception
{ char const * what() const throw() { return "invalid ll address"; } };
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "LLAddressing.cci"
@@ -134,5 +134,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/LLAddressing.ih b/Socket/LLAddressing.ih
index 57ec8b19e..004b29399 100644
--- a/Socket/LLAddressing.ih
+++ b/Socket/LLAddressing.ih
@@ -28,8 +28,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
namespace detail {
struct HexConverter {
@@ -44,7 +44,7 @@ namespace detail {
unsigned char hexnibble(char c);
-}}}
+}}
///////////////////////////////ih.e////////////////////////////////////////
#endif
@@ -52,5 +52,5 @@ namespace detail {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/LLAddressing.test.cc b/Socket/LLAddressing.test.cc
index cdbbe453c..69e0ee105 100644
--- a/Socket/LLAddressing.test.cc
+++ b/Socket/LLAddressing.test.cc
@@ -37,7 +37,7 @@
BOOST_AUTO_UNIT_TEST(llAddress)
{
{
- satcom::lib::LLSocketAddress a;
+ senf::LLSocketAddress a;
BOOST_CHECK_EQUAL( a.protocol(), 0u );
BOOST_CHECK_EQUAL( a.interface(), "" );
@@ -45,8 +45,8 @@ BOOST_AUTO_UNIT_TEST(llAddress)
BOOST_CHECK_EQUAL( a.pkttype(), 0u );
BOOST_CHECK_EQUAL( a.address(), "" );
- a.address(satcom::lib::llAddress("05-10-1A-2f-25-30"));
- BOOST_CHECK_EQUAL( satcom::lib::llAddress(a.address()), "05-10-1a-2f-25-30" );
+ a.address(senf::llAddress("05-10-1A-2f-25-30"));
+ BOOST_CHECK_EQUAL( senf::llAddress(a.address()), "05-10-1a-2f-25-30" );
a.interface("lo");
BOOST_CHECK_EQUAL( a.interface(), "lo" );
a.protocol(123);
@@ -54,24 +54,24 @@ BOOST_AUTO_UNIT_TEST(llAddress)
}
{
- satcom::lib::LLSocketAddress a (
- satcom::lib::llAddress("11-12-13-14-15-16"), "lo");
+ senf::LLSocketAddress a (
+ senf::llAddress("11-12-13-14-15-16"), "lo");
BOOST_CHECK_EQUAL( a.protocol(), 0u );
BOOST_CHECK_EQUAL( a.interface(), "lo" );
BOOST_CHECK_EQUAL( a.arptype(), 0u );
BOOST_CHECK_EQUAL( a.pkttype(), 0u );
- BOOST_CHECK_EQUAL( satcom::lib::llAddress(a.address()), "11-12-13-14-15-16" );
+ BOOST_CHECK_EQUAL( senf::llAddress(a.address()), "11-12-13-14-15-16" );
}
{
- satcom::lib::LLSocketAddress a (123, "lo");
+ senf::LLSocketAddress a (123, "lo");
BOOST_CHECK_EQUAL( a.protocol(), 123u );
BOOST_CHECK_EQUAL( a.interface(), "lo" );
BOOST_CHECK_EQUAL( a.arptype(), 0u );
BOOST_CHECK_EQUAL( a.pkttype(), 0u );
- BOOST_CHECK_EQUAL( satcom::lib::llAddress(a.address()), "" );
+ BOOST_CHECK_EQUAL( senf::llAddress(a.address()), "" );
}
}
@@ -81,5 +81,5 @@ BOOST_AUTO_UNIT_TEST(llAddress)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/PacketSocketHandle.cc b/Socket/PacketSocketHandle.cc
index 4dc8791a6..59bbab0da 100644
--- a/Socket/PacketSocketHandle.cc
+++ b/Socket/PacketSocketHandle.cc
@@ -38,7 +38,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::PacketProtocol::init_client(SocketType type, int protocol)
+prefix_ void senf::PacketProtocol::init_client(SocketType type, int protocol)
const
{
int socktype = SOCK_RAW;
@@ -52,13 +52,13 @@ prefix_ void satcom::lib::PacketProtocol::init_client(SocketType type, int proto
body().fd(sock);
}
-prefix_ std::auto_ptr<satcom::lib::SocketProtocol> satcom::lib::PacketProtocol::clone()
+prefix_ std::auto_ptr<senf::SocketProtocol> senf::PacketProtocol::clone()
const
{
return std::auto_ptr<SocketProtocol>(new PacketProtocol());
}
-prefix_ unsigned satcom::lib::PacketProtocol::available()
+prefix_ unsigned senf::PacketProtocol::available()
const
{
if (! body().readable())
@@ -69,13 +69,13 @@ prefix_ unsigned satcom::lib::PacketProtocol::available()
return l;
}
-prefix_ bool satcom::lib::PacketProtocol::eof()
+prefix_ bool senf::PacketProtocol::eof()
const
{
return false;
}
-prefix_ void satcom::lib::PacketProtocol::promisc(std::string interface, PromiscMode mode)
+prefix_ void senf::PacketProtocol::promisc(std::string interface, PromiscMode mode)
const
{
// The interface is really stupid: as far as i understand, it is possible to
@@ -100,7 +100,7 @@ prefix_ void satcom::lib::PacketProtocol::promisc(std::string interface, Promisc
throw SystemException(errno);
}
-prefix_ void satcom::lib::PacketProtocol::do_mc_i(std::string interface,
+prefix_ void senf::PacketProtocol::do_mc_i(std::string interface,
detail::LLAddressCopier const & copier, bool add)
const
{
@@ -123,5 +123,5 @@ prefix_ void satcom::lib::PacketProtocol::do_mc_i(std::string interface,
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/PacketSocketHandle.ct b/Socket/PacketSocketHandle.ct
index 964ca7689..bc2ac294d 100644
--- a/Socket/PacketSocketHandle.ct
+++ b/Socket/PacketSocketHandle.ct
@@ -31,7 +31,7 @@
template <class ForwardRange>
prefix_ unsigned
-satcom::lib::detail::Range_LLAddressCopier<ForwardRange>::operator()(unsigned char * target)
+senf::detail::Range_LLAddressCopier<ForwardRange>::operator()(unsigned char * target)
const
{
std::size_t len (0);
@@ -49,5 +49,5 @@ satcom::lib::detail::Range_LLAddressCopier<ForwardRange>::operator()(unsigned ch
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/PacketSocketHandle.cti b/Socket/PacketSocketHandle.cti
index a612e180a..c162b8ecf 100644
--- a/Socket/PacketSocketHandle.cti
+++ b/Socket/PacketSocketHandle.cti
@@ -30,7 +30,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class ForwardRange>
-prefix_ void satcom::lib::PacketProtocol::mcAdd(std::string interface,
+prefix_ void senf::PacketProtocol::mcAdd(std::string interface,
ForwardRange const & address)
const
{
@@ -38,7 +38,7 @@ prefix_ void satcom::lib::PacketProtocol::mcAdd(std::string interface,
}
template <class ForwardRange>
-prefix_ void satcom::lib::PacketProtocol::mcDrop(std::string interface,
+prefix_ void senf::PacketProtocol::mcDrop(std::string interface,
ForwardRange const & address)
const
{
@@ -46,13 +46,13 @@ prefix_ void satcom::lib::PacketProtocol::mcDrop(std::string interface,
}
template <class ForwardRange>
-prefix_ satcom::lib::detail::Range_LLAddressCopier<ForwardRange>::
+prefix_ senf::detail::Range_LLAddressCopier<ForwardRange>::
Range_LLAddressCopier(ForwardRange const & range)
: range_ (range)
{}
template <class ForwardRange>
-prefix_ void satcom::lib::PacketProtocol::do_mc(std::string interface,
+prefix_ void senf::PacketProtocol::do_mc(std::string interface,
ForwardRange const & address, bool add)
const
{
@@ -66,5 +66,5 @@ prefix_ void satcom::lib::PacketProtocol::do_mc(std::string interface,
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/PacketSocketHandle.hh b/Socket/PacketSocketHandle.hh
index 179d7aa93..1ab5e677e 100644
--- a/Socket/PacketSocketHandle.hh
+++ b/Socket/PacketSocketHandle.hh
@@ -38,8 +38,8 @@
#include "PacketSocketHandle.ih"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
typedef MakeSocketPolicy<
LLAddressingPolicy,
@@ -82,7 +82,7 @@ namespace lib {
typedef ProtocolClientSocketHandle<PacketProtocol> PacketSocketHandle;
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "PacketSocketHandle.cci"
@@ -94,5 +94,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/PacketSocketHandle.ih b/Socket/PacketSocketHandle.ih
index cc121b0ed..9ae920e19 100644
--- a/Socket/PacketSocketHandle.ih
+++ b/Socket/PacketSocketHandle.ih
@@ -27,8 +27,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
namespace detail {
struct LLAddressCopier
@@ -48,7 +48,7 @@ namespace detail {
ForwardRange const & range_;
};
-}}}
+}}
///////////////////////////////ih.e////////////////////////////////////////
#endif
@@ -56,5 +56,5 @@ namespace detail {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/PacketSocketHandle.test.cc b/Socket/PacketSocketHandle.test.cc
index 77ce52687..4e8ca91bd 100644
--- a/Socket/PacketSocketHandle.test.cc
+++ b/Socket/PacketSocketHandle.test.cc
@@ -41,15 +41,15 @@ BOOST_AUTO_UNIT_TEST(packetSocketHandle)
{
// We have a Problem here .. packet sockets are only allowed for root
if (getuid() != 0) {
- BOOST_WARN_MESSAGE(false, "Cannot test satcom::lib::PacketSocketHandle as non-root user");
+ BOOST_WARN_MESSAGE(false, "Cannot test senf::PacketSocketHandle as non-root user");
return;
}
{
- satcom::lib::PacketSocketHandle sock;
+ senf::PacketSocketHandle sock;
- BOOST_CHECK_NO_THROW( sock.bind(satcom::lib::LLSocketAddress("lo")) );
- satcom::lib::LLSocketAddress a;
+ BOOST_CHECK_NO_THROW( sock.bind(senf::LLSocketAddress("lo")) );
+ senf::LLSocketAddress a;
BOOST_CHECK_NO_THROW( sock.local(a) );
BOOST_CHECK_EQUAL( a.interface(), "lo" );
@@ -58,17 +58,17 @@ BOOST_AUTO_UNIT_TEST(packetSocketHandle)
// BUG: There are some failures here ... need to investigate
/*
BOOST_CHECK_NO_THROW( sock.protocol().promisc(
- "lo",satcom::lib::PacketProtocol::Promiscuous) );
+ "lo",senf::PacketProtocol::Promiscuous) );
BOOST_CHECK_NO_THROW( sock.protocol().promisc(
- "lo",satcom::lib::PacketProtocol::AllMulticast) );
+ "lo",senf::PacketProtocol::AllMulticast) );
BOOST_CHECK_NO_THROW( sock.protocol().promisc(
- "lo",satcom::lib::PacketProtocol::None) );
+ "lo",senf::PacketProtocol::None) );
*/
BOOST_CHECK_NO_THROW( sock.protocol().mcAdd(
- "lo",satcom::lib::llAddress("01-02-03-04-05-06")) );
+ "lo",senf::llAddress("01-02-03-04-05-06")) );
BOOST_CHECK_NO_THROW( sock.protocol().mcDrop(
- "lo",satcom::lib::llAddress("01-02-03-04-05-06")) );
+ "lo",senf::llAddress("01-02-03-04-05-06")) );
BOOST_CHECK_NO_THROW( sock.protocol().available() );
BOOST_CHECK( ! sock.eof() );
@@ -81,5 +81,5 @@ BOOST_AUTO_UNIT_TEST(packetSocketHandle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ProtocolClientSocketHandle.cti b/Socket/ProtocolClientSocketHandle.cti
index 0f01b8899..98d722ae4 100644
--- a/Socket/ProtocolClientSocketHandle.cti
+++ b/Socket/ProtocolClientSocketHandle.cti
@@ -30,9 +30,9 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::ProtocolClientSocketHandle()
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>::ProtocolClientSocketHandle()
: ClientSocketHandle<typename SocketProtocol::Policy>(
- std::auto_ptr<satcom::lib::SocketProtocol>(new SocketProtocol()))
+ std::auto_ptr<senf::SocketProtocol>(new SocketProtocol()))
{
this->protocol().init_client();
}
@@ -41,31 +41,31 @@ prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::ProtocolClientS
#include BOOST_PP_ITERATE()
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>::
ProtocolClientSocketHandle(FileHandle other, bool isChecked)
: ClientSocketHandle<typename Protocol::Policy>(other, isChecked)
{}
template <class SocketProtocol>
prefix_ SocketProtocol const &
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::protocol()
+senf::ProtocolClientSocketHandle<SocketProtocol>::protocol()
{
BOOST_ASSERT( dynamic_cast<SocketProtocol const *>(&this->body().protocol()) );
- // Need dynamic_cast here, since satcom::lib::SocketProtocol is a
+ // Need dynamic_cast here, since senf::SocketProtocol is a
// virtual base
return dynamic_cast<SocketProtocol const &>(this->body().protocol());
}
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::cast_static(FileHandle handle)
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>
+senf::ProtocolClientSocketHandle<SocketProtocol>::cast_static(FileHandle handle)
{
return ProtocolClientSocketHandle(handle,true);
}
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::cast_dynamic(FileHandle handle)
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>
+senf::ProtocolClientSocketHandle<SocketProtocol>::cast_dynamic(FileHandle handle)
{
ClientSocketHandle<typename SocketProtocol::Policy> h(
ClientSocketHandle<typename SocketProtocol::Policy>::cast_dynamic(handle));
@@ -76,7 +76,7 @@ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::cast_dynamic(FileHandle
template <class SocketProtocol>
prefix_ void
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::state(SocketStateMap & map,
+senf::ProtocolClientSocketHandle<SocketProtocol>::state(SocketStateMap & map,
unsigned lod)
{
map["handle"] = prettyName(typeid(*this));
@@ -85,7 +85,7 @@ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::state(SocketStateMap &
template <class SocketProtocol>
prefix_ std::string
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::dumpState(unsigned lod)
+senf::ProtocolClientSocketHandle<SocketProtocol>::dumpState(unsigned lod)
{
SocketStateMap map;
state(map,lod);
@@ -98,5 +98,5 @@ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::dumpState(unsigned lod)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ProtocolClientSocketHandle.hh b/Socket/ProtocolClientSocketHandle.hh
index eeca1e762..cf230441f 100644
--- a/Socket/ProtocolClientSocketHandle.hh
+++ b/Socket/ProtocolClientSocketHandle.hh
@@ -29,8 +29,8 @@
#include "ProtocolClientSocketHandle.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
template <class Protocol> class ProtocolServerSocketHandle;
@@ -73,7 +73,7 @@ namespace lib {
friend class ProtocolServerSocketHandle<Protocol>;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ProtocolClientSocketHandle.cci"
@@ -85,5 +85,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ProtocolClientSocketHandle.mpp b/Socket/ProtocolClientSocketHandle.mpp
index 28046823e..df539796a 100644
--- a/Socket/ProtocolClientSocketHandle.mpp
+++ b/Socket/ProtocolClientSocketHandle.mpp
@@ -45,7 +45,7 @@
//////
#if BOOST_PP_ITERATION_FLAGS()==1
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::
+// senf::ProtocolClientSocketHandle<SocketProtocol>::
// ProtocolClientSocketHandle (constructor) declaration
template < mpp_PCSH_TemplateParameters() >
@@ -54,15 +54,15 @@ ProtocolClientSocketHandle( mpp_PCSH_MethodParameters() );
//////
#elif BOOST_PP_ITERATION_FLAGS()==2
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::
+// senf::ProtocolClientSocketHandle<SocketProtocol>::
// ProtocolClientSocketHandle (constructor) implementation
template <class SocketProtocol>
template < mpp_PCSH_TemplateParameters() >
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>::
ProtocolClientSocketHandle( mpp_PCSH_MethodParameters() )
: ClientSocketHandle<typename SocketProtocol::Policy>(
- std::auto_ptr<satcom::lib::SocketProtocol>(new SocketProtocol()))
+ std::auto_ptr<senf::SocketProtocol>(new SocketProtocol()))
{
this->protocol().init_client( mpp_PCSH_CallParameters() );
}
@@ -89,5 +89,5 @@ ProtocolClientSocketHandle( mpp_PCSH_MethodParameters() )
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ProtocolClientSocketHandle.test.cc b/Socket/ProtocolClientSocketHandle.test.cc
index be924cec3..82c18f3f9 100644
--- a/Socket/ProtocolClientSocketHandle.test.cc
+++ b/Socket/ProtocolClientSocketHandle.test.cc
@@ -36,30 +36,30 @@
///////////////////////////////cc.p////////////////////////////////////////
namespace {
- struct MyProtocol : public satcom::lib::test::SomeProtocol
+ struct MyProtocol : public senf::test::SomeProtocol
{
- using satcom::lib::test::SomeProtocol::init_client;
+ using senf::test::SomeProtocol::init_client;
void init_client(char const *,unsigned) const {}
};
}
BOOST_AUTO_UNIT_TEST(protocolClientSocketHandle)
{
- typedef satcom::lib::ProtocolClientSocketHandle<MyProtocol> MySocketHandle;
+ typedef senf::ProtocolClientSocketHandle<MyProtocol> MySocketHandle;
{
- typedef satcom::lib::MakeSocketPolicy<
- satcom::lib::test::SomeFramingPolicy,
- satcom::lib::test::SomeReadPolicy,
- satcom::lib::test::SomeWritePolicy
+ typedef senf::MakeSocketPolicy<
+ senf::test::SomeFramingPolicy,
+ senf::test::SomeReadPolicy,
+ senf::test::SomeWritePolicy
>::policy OtherSocketPolicy;
- typedef satcom::lib::SocketHandle<OtherSocketPolicy> OtherSocketHandle;
+ typedef senf::SocketHandle<OtherSocketPolicy> OtherSocketHandle;
MySocketHandle h;
h.protocol();
OtherSocketHandle osh (h);
- h = satcom::lib::static_socket_cast<MySocketHandle>(osh);
+ h = senf::static_socket_cast<MySocketHandle>(osh);
}
{
@@ -73,5 +73,5 @@ BOOST_AUTO_UNIT_TEST(protocolClientSocketHandle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ProtocolServerSocketHandle.cti b/Socket/ProtocolServerSocketHandle.cti
index 76bb24237..45be81f36 100644
--- a/Socket/ProtocolServerSocketHandle.cti
+++ b/Socket/ProtocolServerSocketHandle.cti
@@ -31,9 +31,9 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::ProtocolServerSocketHandle()
+prefix_ senf::ProtocolServerSocketHandle<SocketProtocol>::ProtocolServerSocketHandle()
: ServerSocketHandle<typename SocketProtocol::Policy>(
- std::auto_ptr<satcom::lib::SocketProtocol>(new SocketProtocol()))
+ std::auto_ptr<senf::SocketProtocol>(new SocketProtocol()))
{}
#define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, "Socket/ProtocolServerSocketHandle.mpp", 2))
@@ -41,32 +41,32 @@ prefix_ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::ProtocolServerS
template <class SocketProtocol>
prefix_ SocketProtocol const &
-satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::protocol()
+senf::ProtocolServerSocketHandle<SocketProtocol>::protocol()
{
BOOST_ASSERT( dynamic_cast<SocketProtocol const *>(&this->body().protocol()) );
- // Need dynamic_cast here, since satcom::lib::SocketProtocol is a
+ // Need dynamic_cast here, since senf::SocketProtocol is a
// virtual base
return dynamic_cast<SocketProtocol const &>(this->body().protocol());
}
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>
-satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::accept()
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>
+senf::ProtocolServerSocketHandle<SocketProtocol>::accept()
{
return ProtocolClientSocketHandle<SocketProtocol>(
FileHandle(this->ServerSocketHandle<typename SocketProtocol::Policy>::accept()),true);
}
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>
-satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::cast_static(FileHandle handle)
+prefix_ senf::ProtocolServerSocketHandle<SocketProtocol>
+senf::ProtocolServerSocketHandle<SocketProtocol>::cast_static(FileHandle handle)
{
return ProtocolServerSocketHandle(handle,true);
}
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>
-satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::cast_dynamic(FileHandle handle)
+prefix_ senf::ProtocolServerSocketHandle<SocketProtocol>
+senf::ProtocolServerSocketHandle<SocketProtocol>::cast_dynamic(FileHandle handle)
{
ServerSocketHandle<typename SocketProtocol::Policy> h(
ServerSocketHandle<typename SocketProtocol::Policy>::cast_dynamic(handle));
@@ -77,7 +77,7 @@ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::cast_dynamic(FileHandle
template <class SocketProtocol>
prefix_ void
-satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::state(SocketStateMap & map,
+senf::ProtocolServerSocketHandle<SocketProtocol>::state(SocketStateMap & map,
unsigned lod)
{
map["handle"] = prettyName(typeid(*this));
@@ -86,7 +86,7 @@ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::state(SocketStateMap &
template <class SocketProtocol>
prefix_ std::string
-satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::dumpState(unsigned lod)
+senf::ProtocolServerSocketHandle<SocketProtocol>::dumpState(unsigned lod)
{
SocketStateMap map;
state(map,lod);
@@ -94,7 +94,7 @@ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::dumpState(unsigned lod)
}
template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::
+prefix_ senf::ProtocolServerSocketHandle<SocketProtocol>::
ProtocolServerSocketHandle(FileHandle other, bool isChecked)
: ServerSocketHandle<typename SocketProtocol::Policy>(other,isChecked)
{}
@@ -105,5 +105,5 @@ ProtocolServerSocketHandle(FileHandle other, bool isChecked)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ProtocolServerSocketHandle.hh b/Socket/ProtocolServerSocketHandle.hh
index c42ee11ab..268651013 100644
--- a/Socket/ProtocolServerSocketHandle.hh
+++ b/Socket/ProtocolServerSocketHandle.hh
@@ -29,8 +29,8 @@
#include "ProtocolServerSocketHandle.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
template <class Protocol> class ProtocolClientSocketHandle;
@@ -75,7 +75,7 @@ namespace lib {
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ProtocolServerSocketHandle.cci"
@@ -86,5 +86,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ProtocolServerSocketHandle.mpp b/Socket/ProtocolServerSocketHandle.mpp
index 029a99505..101d41b59 100644
--- a/Socket/ProtocolServerSocketHandle.mpp
+++ b/Socket/ProtocolServerSocketHandle.mpp
@@ -45,7 +45,7 @@
//////
#if BOOST_PP_ITERATION_FLAGS()==1
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::
+// senf::ProtocolServerSocketHandle<SocketProtocol>::
// ProtocolServerSocketHandle (constructor) declaration
template < mpp_PSSH_TemplateParameters() >
@@ -54,15 +54,15 @@ ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() );
//////
#elif BOOST_PP_ITERATION_FLAGS()==2
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::
+// senf::ProtocolServerSocketHandle<SocketProtocol>::
// ProtocolServerSocketHandle (constructor) implementation
template <class SocketProtocol>
template < mpp_PSSH_TemplateParameters() >
-prefix_ satcom::lib::ProtocolServerSocketHandle<SocketProtocol>::
+prefix_ senf::ProtocolServerSocketHandle<SocketProtocol>::
ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() )
: ServerSocketHandle<typename SocketProtocol::Policy>(
- std::auto_ptr<satcom::lib::SocketProtocol>(new SocketProtocol()))
+ std::auto_ptr<senf::SocketProtocol>(new SocketProtocol()))
{
this->protocol().init_server( mpp_PSSH_CallParameters() );
}
@@ -89,5 +89,5 @@ ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() )
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc
index 22b6cb4a5..7dff657f2 100644
--- a/Socket/ProtocolServerSocketHandle.test.cc
+++ b/Socket/ProtocolServerSocketHandle.test.cc
@@ -37,39 +37,39 @@
namespace {
- struct MyProtocol : public satcom::lib::test::SomeProtocol
+ struct MyProtocol : public senf::test::SomeProtocol
{
- using satcom::lib::test::SomeProtocol::init_server;
+ using senf::test::SomeProtocol::init_server;
void init_server(char const *,unsigned) const {}
};
}
BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
{
- typedef satcom::lib::ProtocolServerSocketHandle<MyProtocol> MySocketHandle;
+ typedef senf::ProtocolServerSocketHandle<MyProtocol> MySocketHandle;
{
- typedef satcom::lib::MakeSocketPolicy<
- satcom::lib::test::SomeFramingPolicy,
- satcom::lib::test::SomeReadPolicy,
- satcom::lib::test::SomeWritePolicy
+ typedef senf::MakeSocketPolicy<
+ senf::test::SomeFramingPolicy,
+ senf::test::SomeReadPolicy,
+ senf::test::SomeWritePolicy
>::policy OtherSocketPolicy;
- typedef satcom::lib::SocketHandle<OtherSocketPolicy> OtherSocketHandle;
+ typedef senf::SocketHandle<OtherSocketPolicy> OtherSocketHandle;
MySocketHandle h;
h.protocol();
OtherSocketHandle osh (h);
- h = satcom::lib::static_socket_cast<MySocketHandle>(osh);
+ h = senf::static_socket_cast<MySocketHandle>(osh);
MySocketHandle::ClientSocketHandle client = h.accept();
BOOST_CHECK_EQUAL( client.fd(), -1 );
BOOST_CHECK_EQUAL( h.dumpState(),
- "handle: satcom::lib::ProtocolServerSocketHandle<(anonymous namespace)::MyProtocol>\n"
+ "handle: senf::ProtocolServerSocketHandle<(anonymous namespace)::MyProtocol>\n"
"file.handle: -1\n"
"file.refcount: 2\n"
- "socket.policy: satcom::lib::SocketPolicy<satcom::lib::test::SomeAddressingPolicy, satcom::lib::test::SomeFramingPolicy, satcom::lib::test::SomeCommunicationPolicy, satcom::lib::test::SomeReadPolicy, satcom::lib::test::SomeWritePolicy, satcom::lib::test::SomeBufferingPolicy>\n"
+ "socket.policy: senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy, senf::test::SomeBufferingPolicy>\n"
"socket.protocol: (anonymous namespace)::MyProtocol\n"
"socket.server: true\n" );
@@ -86,5 +86,5 @@ BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ReadWritePolicy.cc b/Socket/ReadWritePolicy.cc
index 4f772e454..c441f198c 100644
--- a/Socket/ReadWritePolicy.cc
+++ b/Socket/ReadWritePolicy.cc
@@ -36,7 +36,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ unsigned satcom::lib::ReadablePolicy::read(FileHandle handle, char * buffer,
+prefix_ unsigned senf::ReadablePolicy::read(FileHandle handle, char * buffer,
unsigned size)
{
int rv = -1;
@@ -57,7 +57,7 @@ prefix_ unsigned satcom::lib::ReadablePolicy::read(FileHandle handle, char * buf
return rv;
}
-prefix_ unsigned satcom::lib::ReadablePolicy::do_readfrom(FileHandle handle, char * buffer,
+prefix_ unsigned senf::ReadablePolicy::do_readfrom(FileHandle handle, char * buffer,
unsigned size,
struct ::sockaddr * addr, socklen_t len)
{
@@ -78,7 +78,7 @@ prefix_ unsigned satcom::lib::ReadablePolicy::do_readfrom(FileHandle handle, cha
return rv;
}
-prefix_ unsigned satcom::lib::WriteablePolicy::do_write(FileHandle handle, char const * buffer,
+prefix_ unsigned senf::WriteablePolicy::do_write(FileHandle handle, char const * buffer,
unsigned size)
{
int rv = -1;
@@ -98,7 +98,7 @@ prefix_ unsigned satcom::lib::WriteablePolicy::do_write(FileHandle handle, char
return rv;
}
-prefix_ unsigned satcom::lib::WriteablePolicy::do_writeto(FileHandle handle,
+prefix_ unsigned senf::WriteablePolicy::do_writeto(FileHandle handle,
char const * buffer, unsigned size,
struct sockaddr * addr, socklen_t len)
{
@@ -126,5 +126,5 @@ prefix_ unsigned satcom::lib::WriteablePolicy::do_writeto(FileHandle handle,
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ReadWritePolicy.cti b/Socket/ReadWritePolicy.cti
index f4f7f84f2..84a378f35 100644
--- a/Socket/ReadWritePolicy.cti
+++ b/Socket/ReadWritePolicy.cti
@@ -30,7 +30,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class Policy>
-prefix_ unsigned satcom::lib::ReadablePolicy::
+prefix_ unsigned senf::ReadablePolicy::
readfrom(ClientSocketHandle<Policy> handle, char * buffer, unsigned size,
typename Policy::AddressingPolicy::Address & address,
typename IfCommunicationPolicyIs<Policy,UnconnectedCommunicationPolicy>::type *)
@@ -39,7 +39,7 @@ readfrom(ClientSocketHandle<Policy> handle, char * buffer, unsigned size,
}
template <class Policy>
-prefix_ unsigned satcom::lib::WriteablePolicy::
+prefix_ unsigned senf::WriteablePolicy::
write(ClientSocketHandle<Policy> handle, char const * buffer, unsigned size,
typename IfCommunicationPolicyIs<Policy,ConnectedCommunicationPolicy>::type *)
{
@@ -47,7 +47,7 @@ write(ClientSocketHandle<Policy> handle, char const * buffer, unsigned size,
}
template <class Policy>
-prefix_ unsigned satcom::lib::WriteablePolicy::
+prefix_ unsigned senf::WriteablePolicy::
writeto(ClientSocketHandle<Policy> handle,
typename boost::call_traits<typename Policy::AddressingPolicy::Address>::param_type addr,
char const * buffer, unsigned size,
@@ -62,5 +62,5 @@ writeto(ClientSocketHandle<Policy> handle,
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ReadWritePolicy.hh b/Socket/ReadWritePolicy.hh
index fa494819a..e5203aeaf 100644
--- a/Socket/ReadWritePolicy.hh
+++ b/Socket/ReadWritePolicy.hh
@@ -35,8 +35,8 @@
struct sockaddr;
-namespace satcom {
-namespace lib {
+namespace senf {
+
struct ReadablePolicy : public ReadPolicyBase
{
@@ -74,7 +74,7 @@ namespace lib {
struct NotWriteablePolicy : public WritePolicyBase
{};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
@@ -86,5 +86,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ServerSocketHandle.cti b/Socket/ServerSocketHandle.cti
index 0887c90b5..37bbe4486 100644
--- a/Socket/ServerSocketHandle.cti
+++ b/Socket/ServerSocketHandle.cti
@@ -32,22 +32,22 @@
template <class SocketPolicy>
template <class OtherPolicy>
-prefix_ satcom::lib::ServerSocketHandle<SocketPolicy>::
+prefix_ senf::ServerSocketHandle<SocketPolicy>::
ServerSocketHandle(ServerSocketHandle<OtherPolicy> other,
typename SocketHandle<SocketPolicy>::template IsCompatible<OtherPolicy>::type *)
: SocketHandle<SocketPolicy>(other,true)
{}
template <class SocketPolicy>
-prefix_ satcom::lib::ServerSocketHandle<SocketPolicy>::
+prefix_ senf::ServerSocketHandle<SocketPolicy>::
ServerSocketHandle(std::auto_ptr<SocketProtocol> protocol)
: SocketHandle<SocketPolicy>(protocol,true)
{}
template <class SocketPolicy>
template <class OtherPolicy>
-prefix_ typename satcom::lib::SocketHandle<SocketPolicy>::template IsCompatible<OtherPolicy>::type const &
-satcom::lib::ServerSocketHandle<SocketPolicy>::operator=(ServerSocketHandle<OtherPolicy> other)
+prefix_ typename senf::SocketHandle<SocketPolicy>::template IsCompatible<OtherPolicy>::type const &
+senf::ServerSocketHandle<SocketPolicy>::operator=(ServerSocketHandle<OtherPolicy> other)
{
assign(other);
return *this;
@@ -57,20 +57,20 @@ satcom::lib::ServerSocketHandle<SocketPolicy>::operator=(ServerSocketHandle<Othe
// Server socket interface
template <class Policy>
-prefix_ void satcom::lib::ServerSocketHandle<Policy>::bind(AddressParam addr)
+prefix_ void senf::ServerSocketHandle<Policy>::bind(AddressParam addr)
{
Policy::AddressingPolicy::bind(*this,addr);
}
template <class Policy>
-prefix_ void satcom::lib::ServerSocketHandle<Policy>::listen(unsigned backlog)
+prefix_ void senf::ServerSocketHandle<Policy>::listen(unsigned backlog)
{
Policy::CommunicationPolicy::listen(*this,backlog);
}
template <class Policy>
-prefix_ typename satcom::lib::ServerSocketHandle<Policy>::Address
-satcom::lib::ServerSocketHandle<Policy>::local()
+prefix_ typename senf::ServerSocketHandle<Policy>::Address
+senf::ServerSocketHandle<Policy>::local()
{
typename Policy::AddressingPolicy::Address addr;
this->local(addr);
@@ -78,23 +78,23 @@ satcom::lib::ServerSocketHandle<Policy>::local()
}
template <class Policy>
-prefix_ void satcom::lib::ServerSocketHandle<Policy>::local(Address & addr)
+prefix_ void senf::ServerSocketHandle<Policy>::local(Address & addr)
{
Policy::AddressingPolicy::local(*this,addr);
}
template <class Policy>
-prefix_ typename satcom::lib::ServerSocketHandle<Policy>::ClientSocketHandle
-satcom::lib::ServerSocketHandle<Policy>::accept()
+prefix_ typename senf::ServerSocketHandle<Policy>::ClientSocketHandle
+senf::ServerSocketHandle<Policy>::accept()
{
Address address;
return acceptfrom(address);
}
template <class Policy>
-prefix_ std::pair<typename satcom::lib::ServerSocketHandle<Policy>::ClientSocketHandle,
- typename satcom::lib::ServerSocketHandle<Policy>::Address>
-satcom::lib::ServerSocketHandle<Policy>::acceptfrom()
+prefix_ std::pair<typename senf::ServerSocketHandle<Policy>::ClientSocketHandle,
+ typename senf::ServerSocketHandle<Policy>::Address>
+senf::ServerSocketHandle<Policy>::acceptfrom()
{
Address address;
@@ -103,8 +103,8 @@ satcom::lib::ServerSocketHandle<Policy>::acceptfrom()
}
template <class Policy>
-prefix_ typename satcom::lib::ServerSocketHandle<Policy>::ClientSocketHandle
-satcom::lib::ServerSocketHandle<Policy>::acceptfrom(Address & addr)
+prefix_ typename senf::ServerSocketHandle<Policy>::ClientSocketHandle
+senf::ServerSocketHandle<Policy>::acceptfrom(Address & addr)
{
return ClientSocketHandle(this->protocol().clone(),
Policy::CommunicationPolicy::accept(*this,addr));
@@ -113,21 +113,21 @@ satcom::lib::ServerSocketHandle<Policy>::acceptfrom(Address & addr)
///////////////////////////////////////////////////////////////////////////
template <class Policy>
-prefix_ satcom::lib::ServerSocketHandle<Policy>::ServerSocketHandle(FileHandle other,
+prefix_ senf::ServerSocketHandle<Policy>::ServerSocketHandle(FileHandle other,
bool isChecked)
: SocketHandle<Policy>(other, isChecked)
{}
template <class Policy>
-prefix_ satcom::lib::ServerSocketHandle<Policy>
-satcom::lib::ServerSocketHandle<Policy>::cast_static(FileHandle handle)
+prefix_ senf::ServerSocketHandle<Policy>
+senf::ServerSocketHandle<Policy>::cast_static(FileHandle handle)
{
return ServerSocketHandle(handle,true);
}
template <class Policy>
-prefix_ satcom::lib::ServerSocketHandle<Policy>
-satcom::lib::ServerSocketHandle<Policy>::cast_dynamic(FileHandle handle)
+prefix_ senf::ServerSocketHandle<Policy>
+senf::ServerSocketHandle<Policy>::cast_dynamic(FileHandle handle)
{
SocketHandle<Policy> h (SocketHandle<Policy>::cast_dynamic(handle));
if (! static_cast<SocketBody&>(FileHandle::body(handle)).isServer())
@@ -136,14 +136,14 @@ satcom::lib::ServerSocketHandle<Policy>::cast_dynamic(FileHandle handle)
}
template <class Policy>
-prefix_ void satcom::lib::ServerSocketHandle<Policy>::state(SocketStateMap & map, unsigned lod)
+prefix_ void senf::ServerSocketHandle<Policy>::state(SocketStateMap & map, unsigned lod)
{
map["handle"] = prettyName(typeid(*this));
this->body().state(map,lod);
}
template <class Policy>
-prefix_ std::string satcom::lib::ServerSocketHandle<Policy>::dumpState(unsigned lod)
+prefix_ std::string senf::ServerSocketHandle<Policy>::dumpState(unsigned lod)
{
SocketStateMap map;
state(map,lod);
@@ -156,5 +156,5 @@ prefix_ std::string satcom::lib::ServerSocketHandle<Policy>::dumpState(unsigned
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ServerSocketHandle.hh b/Socket/ServerSocketHandle.hh
index 42a6bae39..a62636012 100644
--- a/Socket/ServerSocketHandle.hh
+++ b/Socket/ServerSocketHandle.hh
@@ -33,8 +33,8 @@
//#include "ServerSocketHandle.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
template <class Policy> class ClientSocketHandle;
@@ -110,7 +110,7 @@ namespace lib {
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "ServerSocketHandle.cci"
@@ -121,5 +121,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/ServerSocketHandle.test.cc b/Socket/ServerSocketHandle.test.cc
index 299524f8a..97546def8 100644
--- a/Socket/ServerSocketHandle.test.cc
+++ b/Socket/ServerSocketHandle.test.cc
@@ -39,7 +39,7 @@
namespace {
- namespace sl = satcom::lib;
+ namespace sl = senf;
class MySocketHandle
: public sl::ServerSocketHandle<sl::test::SomeProtocol::Policy>
@@ -70,7 +70,7 @@ BOOST_AUTO_UNIT_TEST(serverSocketHandle)
typedef sl::ServerSocketHandle<sl::MakeSocketPolicy<
OtherSocketPolicy,
- satcom::lib::NoAddressingPolicy
+ senf::NoAddressingPolicy
>::policy> SomeOtherSocketHandle;
typedef sl::ClientSocketHandle<OtherSocketPolicy> OtherClientHandle;
@@ -97,5 +97,5 @@ BOOST_AUTO_UNIT_TEST(serverSocketHandle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc
index d0e7e91a6..1400d35d7 100644
--- a/Socket/SocketHandle.cc
+++ b/Socket/SocketHandle.cc
@@ -34,7 +34,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::SocketBody::v_close()
+prefix_ void senf::SocketBody::v_close()
{
if (::shutdown(fd(),SHUT_RDWR) < 0)
throw SystemException(errno);
@@ -42,7 +42,7 @@ prefix_ void satcom::lib::SocketBody::v_close()
throw SystemException(errno);
}
-prefix_ void satcom::lib::SocketBody::v_terminate()
+prefix_ void senf::SocketBody::v_terminate()
{
struct linger ling;
ling.l_onoff = 0;
@@ -56,13 +56,13 @@ prefix_ void satcom::lib::SocketBody::v_terminate()
::close(fd());
}
-prefix_ bool satcom::lib::SocketBody::v_eof()
+prefix_ bool senf::SocketBody::v_eof()
const
{
return protocol().eof();
}
-prefix_ void satcom::lib::SocketBody::state(SocketStateMap & map, unsigned lod)
+prefix_ void senf::SocketBody::state(SocketStateMap & map, unsigned lod)
{
map["file.handle"] = fd();
map["file.refcount"] = refcount();
@@ -73,7 +73,7 @@ prefix_ void satcom::lib::SocketBody::state(SocketStateMap & map, unsigned lod)
}
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::detail::StateMapOrdering
+// senf::detail::StateMapOrdering
namespace {
bool contains(std::string::iterator b, std::string::iterator e, char c)
@@ -85,7 +85,7 @@ namespace {
}
}
-prefix_ bool satcom::lib::detail::StateMapOrdering::operator()(std::string a1, std::string a2)
+prefix_ bool senf::detail::StateMapOrdering::operator()(std::string a1, std::string a2)
const
{
std::string::iterator i1 (a1.begin());
@@ -120,7 +120,7 @@ prefix_ bool satcom::lib::detail::StateMapOrdering::operator()(std::string a1, s
return *i1 < *i2;
}
-prefix_ std::string satcom::lib::detail::dumpState(SocketStateMap const & map)
+prefix_ std::string senf::detail::dumpState(SocketStateMap const & map)
{
std::stringstream s;
SocketStateMap::const_iterator i (map.begin());
@@ -131,7 +131,7 @@ prefix_ std::string satcom::lib::detail::dumpState(SocketStateMap const & map)
}
template <class Policy>
-prefix_ std::ostream & satcom::lib::operator<<(std::ostream & os, SocketHandle<Policy> handle)
+prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle<Policy> handle)
{
os << handle.dumpState();
return os;
@@ -144,5 +144,5 @@ prefix_ std::ostream & satcom::lib::operator<<(std::ostream & os, SocketHandle<P
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketHandle.cci b/Socket/SocketHandle.cci
index f036df15e..60a522095 100644
--- a/Socket/SocketHandle.cci
+++ b/Socket/SocketHandle.cci
@@ -31,7 +31,7 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::lib::SocketBody::SocketBody(std::auto_ptr<SocketProtocol> protocol,
+prefix_ senf::SocketBody::SocketBody(std::auto_ptr<SocketProtocol> protocol,
bool isServer)
: protocol_(protocol), isServer_(isServer)
{
@@ -39,7 +39,7 @@ prefix_ satcom::lib::SocketBody::SocketBody(std::auto_ptr<SocketProtocol> protoc
protocol_->body_ = this;
}
-prefix_ satcom::lib::SocketBody::SocketBody(std::auto_ptr<SocketProtocol> protocol,
+prefix_ senf::SocketBody::SocketBody(std::auto_ptr<SocketProtocol> protocol,
bool isServer, int fd)
: FileBody(fd), protocol_(protocol), isServer_(isServer)
{
@@ -47,24 +47,24 @@ prefix_ satcom::lib::SocketBody::SocketBody(std::auto_ptr<SocketProtocol> protoc
protocol_->body_ = this;
}
-prefix_ satcom::lib::SocketProtocol const & satcom::lib::SocketBody::protocol()
+prefix_ senf::SocketProtocol const & senf::SocketBody::protocol()
const
{
return *protocol_;
}
-prefix_ bool satcom::lib::SocketBody::isServer()
+prefix_ bool senf::SocketBody::isServer()
{
return isServer_;
}
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::detail::ConvertibleString
+// senf::detail::ConvertibleString
-prefix_ satcom::lib::detail::ConvertibleString::ConvertibleString()
+prefix_ senf::detail::ConvertibleString::ConvertibleString()
{}
-prefix_ satcom::lib::detail::ConvertibleString::ConvertibleString(bool v)
+prefix_ senf::detail::ConvertibleString::ConvertibleString(bool v)
: std::string(v ? "true" : "false")
{}
@@ -74,5 +74,5 @@ prefix_ satcom::lib::detail::ConvertibleString::ConvertibleString(bool v)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketHandle.ct b/Socket/SocketHandle.ct
index 9a90bd8f8..0082ffbc8 100644
--- a/Socket/SocketHandle.ct
+++ b/Socket/SocketHandle.ct
@@ -31,8 +31,8 @@
///////////////////////////////ct.p////////////////////////////////////////
template <class T>
-prefix_ satcom::lib::detail::ConvertibleString &
-satcom::lib::detail::ConvertibleString::operator+=(ConvertibleString const & other)
+prefix_ senf::detail::ConvertibleString &
+senf::detail::ConvertibleString::operator+=(ConvertibleString const & other)
{
if (!empty())
this->std::string::operator+=(", ");
@@ -46,5 +46,5 @@ satcom::lib::detail::ConvertibleString::operator+=(ConvertibleString const & oth
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketHandle.cti b/Socket/SocketHandle.cti
index dde5bf78f..f573e4386 100644
--- a/Socket/SocketHandle.cti
+++ b/Socket/SocketHandle.cti
@@ -34,15 +34,15 @@
template <class SocketPolicy>
template <class OtherPolicy>
-prefix_ satcom::lib::SocketHandle<SocketPolicy>::SocketHandle(SocketHandle<OtherPolicy> other,
+prefix_ senf::SocketHandle<SocketPolicy>::SocketHandle(SocketHandle<OtherPolicy> other,
typename IsCompatible<OtherPolicy>::type *)
: FileHandle(other)
{}
template <class SocketPolicy>
template <class OtherPolicy>
-prefix_ typename satcom::lib::SocketHandle<SocketPolicy>::template IsCompatible<OtherPolicy>::type const &
-satcom::lib::SocketHandle<SocketPolicy>::operator=(SocketHandle<OtherPolicy> other)
+prefix_ typename senf::SocketHandle<SocketPolicy>::template IsCompatible<OtherPolicy>::type const &
+senf::SocketHandle<SocketPolicy>::operator=(SocketHandle<OtherPolicy> other)
{
assign(other);
return *this;
@@ -50,13 +50,13 @@ satcom::lib::SocketHandle<SocketPolicy>::operator=(SocketHandle<OtherPolicy> oth
template <class SocketPolicy>
prefix_
-satcom::lib::SocketHandle<SocketPolicy>::SocketHandle(std::auto_ptr<SocketProtocol> protocol,
+senf::SocketHandle<SocketPolicy>::SocketHandle(std::auto_ptr<SocketProtocol> protocol,
bool isServer)
: FileHandle(std::auto_ptr<FileBody>(new SocketBody(protocol,isServer)))
{}
template <class SocketPolicy>
-prefix_ satcom::lib::SocketHandle<SocketPolicy>::SocketHandle(FileHandle other, bool isChecked)
+prefix_ senf::SocketHandle<SocketPolicy>::SocketHandle(FileHandle other, bool isChecked)
: FileHandle(other)
{
BOOST_ASSERT( isChecked );
@@ -64,14 +64,14 @@ prefix_ satcom::lib::SocketHandle<SocketPolicy>::SocketHandle(FileHandle other,
}
template <class SocketPolicy>
-prefix_ satcom::lib::SocketBody & satcom::lib::SocketHandle<SocketPolicy>::body()
+prefix_ senf::SocketBody & senf::SocketHandle<SocketPolicy>::body()
{
BOOST_ASSERT( dynamic_cast<SocketBody *>(&FileHandle::body()) );
return static_cast<SocketBody &>(FileHandle::body());
}
template <class SocketPolicy>
-prefix_ satcom::lib::SocketBody const & satcom::lib::SocketHandle<SocketPolicy>::body()
+prefix_ senf::SocketBody const & senf::SocketHandle<SocketPolicy>::body()
const
{
BOOST_ASSERT( dynamic_cast<SocketBody const *>(&FileHandle::body()) );
@@ -79,28 +79,28 @@ prefix_ satcom::lib::SocketBody const & satcom::lib::SocketHandle<SocketPolicy>:
}
template <class SocketPolicy>
-prefix_ satcom::lib::SocketProtocol const & satcom::lib::SocketHandle<SocketPolicy>::protocol()
+prefix_ senf::SocketProtocol const & senf::SocketHandle<SocketPolicy>::protocol()
const
{
return body().protocol();
}
template <class SocketPolicy>
-prefix_ void satcom::lib::SocketHandle<SocketPolicy>::assign(FileHandle other)
+prefix_ void senf::SocketHandle<SocketPolicy>::assign(FileHandle other)
{
FileHandle::operator=(other);
}
template <class SocketPolicy>
-prefix_ satcom::lib::SocketHandle<SocketPolicy>
-satcom::lib::SocketHandle<SocketPolicy>::cast_static(FileHandle handle)
+prefix_ senf::SocketHandle<SocketPolicy>
+senf::SocketHandle<SocketPolicy>::cast_static(FileHandle handle)
{
return SocketHandle(handle,true);
}
template <class SocketPolicy>
-prefix_ satcom::lib::SocketHandle<SocketPolicy>
-satcom::lib::SocketHandle<SocketPolicy>::cast_dynamic(FileHandle handle)
+prefix_ senf::SocketHandle<SocketPolicy>
+senf::SocketHandle<SocketPolicy>::cast_dynamic(FileHandle handle)
{
// throws bad_cast if the body is not a SocketBody
SocketBody & body (dynamic_cast<SocketBody&>(FileHandle::body(handle)));
@@ -110,7 +110,7 @@ satcom::lib::SocketHandle<SocketPolicy>::cast_dynamic(FileHandle handle)
}
template <class Target, class Source>
-prefix_ Target satcom::lib::static_socket_cast(Source handle)
+prefix_ Target senf::static_socket_cast(Source handle)
{
BOOST_STATIC_ASSERT((
boost::is_convertible<Source*,FileHandle*>::value &&
@@ -122,7 +122,7 @@ prefix_ Target satcom::lib::static_socket_cast(Source handle)
}
template <class Target, class Source>
-prefix_ Target satcom::lib::dynamic_socket_cast(Source handle)
+prefix_ Target senf::dynamic_socket_cast(Source handle)
{
BOOST_STATIC_ASSERT((
boost::is_convertible<Source*,FileHandle*>::value &&
@@ -133,7 +133,7 @@ prefix_ Target satcom::lib::dynamic_socket_cast(Source handle)
}
template <class Target, class Source>
-prefix_ bool satcom::lib::check_socket_cast(Source handle)
+prefix_ bool senf::check_socket_cast(Source handle)
{
BOOST_STATIC_ASSERT((
boost::is_convertible<Source*,FileHandle*>::value &&
@@ -156,14 +156,14 @@ prefix_ bool satcom::lib::check_socket_cast(Source handle)
}
template <class SocketPolicy>
-prefix_ void satcom::lib::SocketHandle<SocketPolicy>::state(SocketStateMap & map, unsigned lod)
+prefix_ void senf::SocketHandle<SocketPolicy>::state(SocketStateMap & map, unsigned lod)
{
map["handle"] = prettyName(typeid(*this));
body().state(map,lod);
}
template <class SocketPolicy>
-prefix_ std::string satcom::lib::SocketHandle<SocketPolicy>::dumpState(unsigned lod)
+prefix_ std::string senf::SocketHandle<SocketPolicy>::dumpState(unsigned lod)
{
SocketStateMap map;
state(map,lod);
@@ -171,10 +171,10 @@ prefix_ std::string satcom::lib::SocketHandle<SocketPolicy>::dumpState(unsigned
}
///////////////////////////////////////////////////////////////////////////
-// satcom::lib::detail::ConvertibleString
+// senf::detail::ConvertibleString
template <class T>
-prefix_ satcom::lib::detail::ConvertibleString::ConvertibleString(T const & other)
+prefix_ senf::detail::ConvertibleString::ConvertibleString(T const & other)
: std::string(boost::lexical_cast<std::string>(other))
{}
@@ -184,5 +184,5 @@ prefix_ satcom::lib::detail::ConvertibleString::ConvertibleString(T const & othe
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketHandle.hh b/Socket/SocketHandle.hh
index e3ad05aee..9c1fd1c4d 100644
--- a/Socket/SocketHandle.hh
+++ b/Socket/SocketHandle.hh
@@ -37,8 +37,8 @@
///////////////////////////////hh.p////////////////////////////////////////
#include "SocketHandle.ih"
-namespace satcom {
-namespace lib {
+namespace senf {
+
/** \brief
*/
@@ -108,7 +108,7 @@ namespace lib {
template <class Target, class Source>
bool check_socket_cast(Source handle);
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "SocketHandle.cci"
@@ -119,5 +119,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketHandle.ih b/Socket/SocketHandle.ih
index f2e2a328d..5ad2b9924 100644
--- a/Socket/SocketHandle.ih
+++ b/Socket/SocketHandle.ih
@@ -31,8 +31,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
class SocketProtocol;
@@ -99,7 +99,7 @@ namespace lib {
bool isServer_;
};
-}}
+}
///////////////////////////////ih.e////////////////////////////////////////
#endif
@@ -107,5 +107,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc
index cc2def83c..8a3f6cdcd 100644
--- a/Socket/SocketHandle.test.cc
+++ b/Socket/SocketHandle.test.cc
@@ -37,7 +37,7 @@
///////////////////////////////cc.p////////////////////////////////////////
namespace {
- namespace sl = satcom::lib;
+ namespace sl = senf;
class MySocketHandle
: public sl::SocketHandle<sl::test::SomeProtocol::Policy>
@@ -50,12 +50,12 @@ namespace {
};
class FDHandle
- : public satcom::lib::FileHandle
+ : public senf::FileHandle
{
public:
FDHandle()
- : satcom::lib::FileHandle(std::auto_ptr<satcom::lib::FileBody>(
- new satcom::lib::FileBody())) {}
+ : senf::FileHandle(std::auto_ptr<senf::FileBody>(
+ new senf::FileBody())) {}
};
}
@@ -72,27 +72,27 @@ BOOST_AUTO_UNIT_TEST(socketHandle)
osh = myh;
typedef sl::SocketHandle<sl::test::SomeProtocol::Policy> SomeSocketHandle;
- SomeSocketHandle ssh = satcom::lib::static_socket_cast<SomeSocketHandle>(osh);
+ SomeSocketHandle ssh = senf::static_socket_cast<SomeSocketHandle>(osh);
- BOOST_CHECK_NO_THROW( satcom::lib::dynamic_socket_cast<SomeSocketHandle>(osh) );
+ BOOST_CHECK_NO_THROW( senf::dynamic_socket_cast<SomeSocketHandle>(osh) );
typedef sl::SocketHandle< sl::MakeSocketPolicy<
OtherSocketPolicy,
- satcom::lib::NoAddressingPolicy
+ senf::NoAddressingPolicy
>::policy> SomeOtherSocketHandle;
- BOOST_CHECK_THROW( satcom::lib::dynamic_socket_cast<SomeOtherSocketHandle>(osh),
+ BOOST_CHECK_THROW( senf::dynamic_socket_cast<SomeOtherSocketHandle>(osh),
std::bad_cast );
- BOOST_CHECK_THROW( satcom::lib::dynamic_socket_cast<SomeSocketHandle>(
- satcom::lib::FileHandle(FDHandle())),
+ BOOST_CHECK_THROW( senf::dynamic_socket_cast<SomeSocketHandle>(
+ senf::FileHandle(FDHandle())),
std::bad_cast );
BOOST_CHECK_EQUAL( myh.dumpState(),
- "handle: satcom::lib::SocketHandle<satcom::lib::SocketPolicy<satcom::lib::test::SomeAddressingPolicy, satcom::lib::test::SomeFramingPolicy, satcom::lib::test::SomeCommunicationPolicy, satcom::lib::test::SomeReadPolicy, satcom::lib::test::SomeWritePolicy, satcom::lib::test::SomeBufferingPolicy> >\n"
+ "handle: senf::SocketHandle<senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy, senf::test::SomeBufferingPolicy> >\n"
"file.handle: -1\n"
"file.refcount: 3\n"
- "socket.policy: satcom::lib::SocketPolicy<satcom::lib::test::SomeAddressingPolicy, satcom::lib::test::SomeFramingPolicy, satcom::lib::test::SomeCommunicationPolicy, satcom::lib::test::SomeReadPolicy, satcom::lib::test::SomeWritePolicy, satcom::lib::test::SomeBufferingPolicy>\n"
- "socket.protocol: satcom::lib::test::SomeProtocol\n"
+ "socket.policy: senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy, senf::test::SomeBufferingPolicy>\n"
+ "socket.protocol: senf::test::SomeProtocol\n"
"socket.server: false\n" );
}
@@ -103,5 +103,5 @@ BOOST_AUTO_UNIT_TEST(socketHandle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketPolicy.ct b/Socket/SocketPolicy.ct
index 277dc81eb..cc2191618 100644
--- a/Socket/SocketPolicy.ct
+++ b/Socket/SocketPolicy.ct
@@ -33,7 +33,7 @@
#define SP_TemplateParams(x1,x2,n,SomePolicy) BOOST_PP_COMMA_IF(n) BOOST_PP_CAT(SomePolicy,_)
template < BOOST_PP_SEQ_FOR_EACH_I( SP_TemplateArgs, , SATLIB_SOCKET_POLICIES ) >
-prefix_ void satcom::lib::SocketPolicy< BOOST_PP_SEQ_FOR_EACH_I( SP_TemplateParams, , SATLIB_SOCKET_POLICIES ) >::
+prefix_ void senf::SocketPolicy< BOOST_PP_SEQ_FOR_EACH_I( SP_TemplateParams, , SATLIB_SOCKET_POLICIES ) >::
checkBaseOf(SocketPolicyBase const & other)
{
# define SP_CheckPolicy(x1,x2,SomePolicy) (void) dynamic_cast<SomePolicy const &>(other.BOOST_PP_CAT(the,SomePolicy)());
@@ -50,5 +50,5 @@ checkBaseOf(SocketPolicyBase const & other)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketPolicy.hh b/Socket/SocketPolicy.hh
index a2a0c05ea..e821d925e 100644
--- a/Socket/SocketPolicy.hh
+++ b/Socket/SocketPolicy.hh
@@ -28,8 +28,8 @@
//#include "SocketPolicy.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
// This may be adapted to change the supported policies (however,
// ClientSocketHandle and ServerSocketHandle will probably have to
@@ -59,7 +59,7 @@ namespace lib {
// template SocketPolicy< ..policies.. >
// template MakeSocketPolicy< ..args.. >
// template SocketPolicyIsBaseOf< Base, Derived >
-}}
+}
//////////////////////////////hh.e////////////////////////////////////////
#include "SocketPolicy.ih"
@@ -71,5 +71,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketPolicy.ih b/Socket/SocketPolicy.ih
index b60fd941a..a6d9ebbc0 100644
--- a/Socket/SocketPolicy.ih
+++ b/Socket/SocketPolicy.ih
@@ -50,8 +50,8 @@
///////////////////////////////ih.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
# define SATLIB_SOCKET_POLICIES_N BOOST_PP_SEQ_SIZE( SATLIB_SOCKET_POLICIES )
@@ -205,7 +205,7 @@ namespace impl {
} // namespace impl
- template < BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( SATLIB_SOCKET_POLICIES_N, class T, satcom::lib::impl::nil ) >
+ template < BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( SATLIB_SOCKET_POLICIES_N, class T, senf::impl::nil ) >
class MakeSocketPolicy
: public boost::mpl::if_< boost::is_convertible< T0*, SocketPolicyBase* >,
impl::MakeSocketPolicy_impl< T0, boost::mpl::vector< BOOST_PP_ENUM_SHIFTED_PARAMS( SATLIB_SOCKET_POLICIES_N, T ) > >,
@@ -241,7 +241,7 @@ namespace impl {
# undef SP_DefineConditions
-}}
+}
///////////////////////////////ih.e////////////////////////////////////////
#endif
@@ -249,5 +249,5 @@ namespace impl {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketPolicy.test.cc b/Socket/SocketPolicy.test.cc
index af167a467..5b7aeb05b 100644
--- a/Socket/SocketPolicy.test.cc
+++ b/Socket/SocketPolicy.test.cc
@@ -38,7 +38,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-using namespace satcom::lib;
+using namespace senf;
namespace {
struct INetAddressingPolicy : public AddressingPolicyBase {};
@@ -136,5 +136,5 @@ BOOST_AUTO_UNIT_TEST(socketPolicy)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketPolicy.test.hh b/Socket/SocketPolicy.test.hh
index cebba2d2c..418707b48 100644
--- a/Socket/SocketPolicy.test.hh
+++ b/Socket/SocketPolicy.test.hh
@@ -30,11 +30,11 @@
//#include "SocketPolicy.test.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
namespace test {
- struct SomeAddressingPolicy : public satcom::lib::AddressingPolicyBase
+ struct SomeAddressingPolicy : public senf::AddressingPolicyBase
{
typedef unsigned Address;
@@ -48,16 +48,16 @@ namespace test {
{}
};
- struct SomeFramingPolicy : public satcom::lib::FramingPolicyBase
+ struct SomeFramingPolicy : public senf::FramingPolicyBase
{};
- struct SomeCommunicationPolicy : public satcom::lib::CommunicationPolicyBase
+ struct SomeCommunicationPolicy : public senf::CommunicationPolicyBase
{
static int accept(FileHandle handle, unsigned & addr)
{ addr = 3; return -1; }
};
- struct SomeReadPolicy : public satcom::lib::ReadPolicyBase
+ struct SomeReadPolicy : public senf::ReadPolicyBase
{
static unsigned const TEST_SIZE = 9;
@@ -75,7 +75,7 @@ namespace test {
}
};
- struct SomeWritePolicy : public satcom::lib::WritePolicyBase
+ struct SomeWritePolicy : public senf::WritePolicyBase
{
static unsigned write(FileHandle handle, char const * buffer, unsigned size)
{
@@ -92,7 +92,7 @@ namespace test {
}
};
- struct SomeBufferingPolicy : public satcom::lib::BufferingPolicyBase
+ struct SomeBufferingPolicy : public senf::BufferingPolicyBase
{
static unsigned rcvbuf(FileHandle handle)
{ return 0; }
@@ -105,7 +105,7 @@ namespace test {
{ return 0; }
};
- typedef satcom::lib::MakeSocketPolicy<
+ typedef senf::MakeSocketPolicy<
SomeAddressingPolicy,
SomeFramingPolicy,
SomeCommunicationPolicy,
@@ -114,7 +114,7 @@ namespace test {
SomeBufferingPolicy
>::policy SomeSocketPolicy;
-}}}
+}}
///////////////////////////////hh.e////////////////////////////////////////
//#include "SocketPolicy.test.cci"
@@ -126,5 +126,5 @@ namespace test {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketProtocol.cc b/Socket/SocketProtocol.cc
index f82cd5f89..d5afd7528 100644
--- a/Socket/SocketProtocol.cc
+++ b/Socket/SocketProtocol.cc
@@ -31,7 +31,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::SocketProtocol::state(SocketStateMap & map, unsigned lod)
+prefix_ void senf::SocketProtocol::state(SocketStateMap & map, unsigned lod)
const
{}
@@ -42,5 +42,5 @@ prefix_ void satcom::lib::SocketProtocol::state(SocketStateMap & map, unsigned l
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketProtocol.cci b/Socket/SocketProtocol.cci
index a10def64e..a8a848b93 100644
--- a/Socket/SocketProtocol.cci
+++ b/Socket/SocketProtocol.cci
@@ -30,14 +30,14 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::lib::SocketProtocol::SocketProtocol()
+prefix_ senf::SocketProtocol::SocketProtocol()
: body_(0)
{}
-prefix_ satcom::lib::SocketProtocol::~SocketProtocol()
+prefix_ senf::SocketProtocol::~SocketProtocol()
{}
-prefix_ satcom::lib::SocketBody & satcom::lib::SocketProtocol::body()
+prefix_ senf::SocketBody & senf::SocketProtocol::body()
const
{
BOOST_ASSERT( body_ );
@@ -50,5 +50,5 @@ prefix_ satcom::lib::SocketBody & satcom::lib::SocketProtocol::body()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketProtocol.cti b/Socket/SocketProtocol.cti
index f2b328726..ff56cc193 100644
--- a/Socket/SocketProtocol.cti
+++ b/Socket/SocketProtocol.cti
@@ -30,12 +30,12 @@
///////////////////////////////cti.p///////////////////////////////////////
template <class SocketPolicy>
-prefix_ satcom::lib::ConcreteSocketProtocol<SocketPolicy>::~ConcreteSocketProtocol()
+prefix_ senf::ConcreteSocketProtocol<SocketPolicy>::~ConcreteSocketProtocol()
{}
template <class SocketPolicy>
-prefix_ typename satcom::lib::ConcreteSocketProtocol<SocketPolicy>::Policy const &
-satcom::lib::ConcreteSocketProtocol<SocketPolicy>::policy()
+prefix_ typename senf::ConcreteSocketProtocol<SocketPolicy>::Policy const &
+senf::ConcreteSocketProtocol<SocketPolicy>::policy()
const
{
return policy_;
@@ -47,5 +47,5 @@ satcom::lib::ConcreteSocketProtocol<SocketPolicy>::policy()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketProtocol.hh b/Socket/SocketProtocol.hh
index e55cbf8b7..008716ed3 100644
--- a/Socket/SocketProtocol.hh
+++ b/Socket/SocketProtocol.hh
@@ -31,8 +31,8 @@
//#include "SocketProtocol.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
class SocketPolicyBase;
@@ -107,7 +107,7 @@ namespace lib {
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "SocketProtocol.cci"
@@ -118,5 +118,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketProtocol.test.cc b/Socket/SocketProtocol.test.cc
index fdd880ca6..a138d9878 100644
--- a/Socket/SocketProtocol.test.cc
+++ b/Socket/SocketProtocol.test.cc
@@ -38,7 +38,7 @@
BOOST_AUTO_UNIT_TEST(socketProtocol)
{
- satcom::lib::test::SomeProtocol protocol;
+ senf::test::SomeProtocol protocol;
// This would fail an assertion ...
// BOOST_CHECK( protocol.body() == 0 );
@@ -52,5 +52,5 @@ BOOST_AUTO_UNIT_TEST(socketProtocol)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/SocketProtocol.test.hh b/Socket/SocketProtocol.test.hh
index 047a6a933..680d8e110 100644
--- a/Socket/SocketProtocol.test.hh
+++ b/Socket/SocketProtocol.test.hh
@@ -31,8 +31,8 @@
//#include "SocketProtocol.test.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
namespace test {
class SomeProtocol
@@ -52,7 +52,7 @@ namespace test {
{ return false; }
};
-}}}
+}}
///////////////////////////////hh.e////////////////////////////////////////
//#include "SocketProtocol.test.cci"
@@ -64,5 +64,5 @@ namespace test {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/TCPProtocol.cc b/Socket/TCPProtocol.cc
index f444ac3bc..246eacd17 100644
--- a/Socket/TCPProtocol.cc
+++ b/Socket/TCPProtocol.cc
@@ -37,7 +37,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ bool satcom::lib::TCPProtocol::nodelay()
+prefix_ bool senf::TCPProtocol::nodelay()
const
{
int value;
@@ -47,7 +47,7 @@ prefix_ bool satcom::lib::TCPProtocol::nodelay()
return value;
}
-prefix_ void satcom::lib::TCPProtocol::nodelay(bool value)
+prefix_ void senf::TCPProtocol::nodelay(bool value)
const
{
int ivalue (value);
@@ -55,7 +55,7 @@ prefix_ void satcom::lib::TCPProtocol::nodelay(bool value)
throw SystemException(errno);
}
-prefix_ unsigned satcom::lib::TCPProtocol::siocinq()
+prefix_ unsigned senf::TCPProtocol::siocinq()
const
{
int n;
@@ -64,7 +64,7 @@ prefix_ unsigned satcom::lib::TCPProtocol::siocinq()
return n;
}
-prefix_ unsigned satcom::lib::TCPProtocol::siocoutq()
+prefix_ unsigned senf::TCPProtocol::siocoutq()
const
{
int n;
@@ -73,13 +73,13 @@ prefix_ unsigned satcom::lib::TCPProtocol::siocoutq()
return n;
}
-prefix_ unsigned satcom::lib::TCPProtocol::available()
+prefix_ unsigned senf::TCPProtocol::available()
const
{
return siocinq();
}
-prefix_ bool satcom::lib::TCPProtocol::eof()
+prefix_ bool senf::TCPProtocol::eof()
const
{
return body().readable() && available()==0;
@@ -93,5 +93,5 @@ prefix_ bool satcom::lib::TCPProtocol::eof()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/TCPProtocol.hh b/Socket/TCPProtocol.hh
index adf029fea..3dba9e291 100644
--- a/Socket/TCPProtocol.hh
+++ b/Socket/TCPProtocol.hh
@@ -29,8 +29,8 @@
//#include "TCPProtocol.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
class TCPProtocol
: public virtual SocketProtocol
@@ -45,7 +45,7 @@ namespace lib {
bool eof() const;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "TCPProtocol.cci"
@@ -56,5 +56,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/TCPSocketHandle.cc b/Socket/TCPSocketHandle.cc
index 0eb1446df..e7bb95cef 100644
--- a/Socket/TCPSocketHandle.cc
+++ b/Socket/TCPSocketHandle.cc
@@ -36,7 +36,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::TCPv4SocketProtocol::init_client()
+prefix_ void senf::TCPv4SocketProtocol::init_client()
const
{
int sock = ::socket(PF_INET,SOCK_STREAM,0);
@@ -46,14 +46,14 @@ prefix_ void satcom::lib::TCPv4SocketProtocol::init_client()
}
prefix_ void
-satcom::lib::TCPv4SocketProtocol::init_client(INet4Address const & address)
+senf::TCPv4SocketProtocol::init_client(INet4Address const & address)
const
{
init_client();
connect(address);
}
-prefix_ void satcom::lib::TCPv4SocketProtocol::init_server()
+prefix_ void senf::TCPv4SocketProtocol::init_server()
const
{
int sock = ::socket(PF_INET,SOCK_STREAM,0);
@@ -62,7 +62,7 @@ prefix_ void satcom::lib::TCPv4SocketProtocol::init_server()
body().fd(sock);
}
-prefix_ void satcom::lib::TCPv4SocketProtocol::init_server(INet4Address const & address,
+prefix_ void senf::TCPv4SocketProtocol::init_server(INet4Address const & address,
unsigned backlog)
const
{
@@ -73,7 +73,7 @@ prefix_ void satcom::lib::TCPv4SocketProtocol::init_server(INet4Address const &
throw SystemException(errno);
}
-prefix_ std::auto_ptr<satcom::lib::SocketProtocol> satcom::lib::TCPv4SocketProtocol::clone()
+prefix_ std::auto_ptr<senf::SocketProtocol> senf::TCPv4SocketProtocol::clone()
const
{
return std::auto_ptr<SocketProtocol>(new TCPv4SocketProtocol());
@@ -86,5 +86,5 @@ prefix_ std::auto_ptr<satcom::lib::SocketProtocol> satcom::lib::TCPv4SocketProto
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/TCPSocketHandle.hh b/Socket/TCPSocketHandle.hh
index 5d3b2c0e9..01819813b 100644
--- a/Socket/TCPSocketHandle.hh
+++ b/Socket/TCPSocketHandle.hh
@@ -40,8 +40,8 @@
//#include "TCPSocketHandle.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
typedef MakeSocketPolicy<
INet4AddressingPolicy,
@@ -92,7 +92,7 @@ namespace lib {
typedef ProtocolClientSocketHandle<TCPv6SocketProtocol> TCPv6ClientSocketHandle;
typedef ProtocolServerSocketHandle<TCPv6SocketProtocol> TCPv6ServerSocketHandle;
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "TCPSocketHandle.cci"
@@ -103,5 +103,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Socket/TCPSocketHandle.test.cc b/Socket/TCPSocketHandle.test.cc
index 2a8659b56..ac9d2d833 100644
--- a/Socket/TCPSocketHandle.test.cc
+++ b/Socket/TCPSocketHandle.test.cc
@@ -120,15 +120,15 @@ namespace {
BOOST_AUTO_UNIT_TEST(tcpv4ClientSocketHandle)
{
{
- satcom::lib::TCPv4ClientSocketHandle sock;
+ senf::TCPv4ClientSocketHandle sock;
- BOOST_CHECK_THROW( sock.connect(satcom::lib::INet4Address("127.0.0.1:12345")), satcom::lib::SystemException );
- BOOST_CHECK_THROW( sock.protocol().connect("127.0.0.1:12345"), satcom::lib::SystemException );
+ BOOST_CHECK_THROW( sock.connect(senf::INet4Address("127.0.0.1:12345")), senf::SystemException );
+ BOOST_CHECK_THROW( sock.protocol().connect("127.0.0.1:12345"), senf::SystemException );
}
{
start(server);
- satcom::lib::TCPv4ClientSocketHandle sock;
+ senf::TCPv4ClientSocketHandle sock;
BOOST_CHECK_NO_THROW( sock.bind("127.0.0.1:23456") );
BOOST_CHECK_NO_THROW( sock.connect("127.0.0.1:12345") );
BOOST_CHECK( sock.peer() == "127.0.0.1:12345" );
@@ -153,21 +153,21 @@ BOOST_AUTO_UNIT_TEST(tcpv4ClientSocketHandle)
}
{
- satcom::lib::TCPv4ClientSocketHandle sock;
+ senf::TCPv4ClientSocketHandle sock;
// Since this is a TCP socket, most of the calls will fail or
// are at least not sensible ...
// I'll have to move those to a UDPSocket test ... they should
// realy only be in the UDP Protocol implementation
BOOST_CHECK_NO_THROW( sock.protocol().mcTTL() );
- BOOST_CHECK_THROW( sock.protocol().mcTTL(1), satcom::lib::SystemException );
+ BOOST_CHECK_THROW( sock.protocol().mcTTL(1), senf::SystemException );
BOOST_CHECK_NO_THROW( sock.protocol().mcLoop() );
BOOST_CHECK_NO_THROW( sock.protocol().mcLoop(false) );
BOOST_CHECK_NO_THROW( sock.protocol().mcAddMembership("224.0.0.1:0") );
BOOST_CHECK_NO_THROW( sock.protocol().mcAddMembership("224.0.0.1:0","127.0.0.1:0") );
BOOST_CHECK_NO_THROW( sock.protocol().mcDropMembership("224.0.0.1:0","127.0.0.1:0") );
BOOST_CHECK_NO_THROW( sock.protocol().mcDropMembership("224.0.0.1:0") );
- BOOST_CHECK_THROW( sock.protocol().mcIface("lo"), satcom::lib::SystemException );
+ BOOST_CHECK_THROW( sock.protocol().mcIface("lo"), senf::SystemException );
// The following setsockopts are hard to REALLY test ...
BOOST_CHECK_NO_THROW( sock.protocol().nodelay(true) );
@@ -215,12 +215,12 @@ BOOST_AUTO_UNIT_TEST(tcpv4ServerSocketHandle)
{
{
BOOST_CHECKPOINT("Opening server socket");
- satcom::lib::TCPv4ServerSocketHandle server ("127.0.0.1:12346");
+ senf::TCPv4ServerSocketHandle server ("127.0.0.1:12346");
BOOST_CHECKPOINT("Starting client");
start(client);
BOOST_CHECKPOINT("Accepting connection");
- satcom::lib::TCPv4ClientSocketHandle client = server.accept();
+ senf::TCPv4ClientSocketHandle client = server.accept();
BOOST_CHECK_NO_THROW(client.write("QUIT"));
BOOST_CHECKPOINT("Stopping client");
@@ -235,5 +235,5 @@ BOOST_AUTO_UNIT_TEST(tcpv4ServerSocketHandle)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/DaemonTools.cc b/Utils/DaemonTools.cc
index 0dc3f0b2a..44165b6ba 100644
--- a/Utils/DaemonTools.cc
+++ b/Utils/DaemonTools.cc
@@ -20,25 +20,25 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::daemonize()
+prefix_ void senf::daemonize()
{
int pid = fork();
if (pid < 0)
- throw satcom::lib::SystemException("fork",errno);
+ throw senf::SystemException("fork",errno);
if (pid > 0)
::_exit(0);
if (::setsid() < 0)
- throw satcom::lib::SystemException("setsid",errno);
+ throw senf::SystemException("setsid",errno);
}
-prefix_ void satcom::lib::redirect_stdio(std::string const & path)
+prefix_ void senf::redirect_stdio(std::string const & path)
{
int fd = ::open(path.c_str(),O_RDWR);
- if (fd < 0) throw satcom::lib::SystemException("open",errno);
- if (dup2(fd,0) < 0) throw satcom::lib::SystemException("dup2",errno);
- if (dup2(fd,1) < 0) throw satcom::lib::SystemException("dup2",errno);
- if (dup2(fd,2) < 0) throw satcom::lib::SystemException("dup2",errno);
- if (::close(fd) < 0) throw satcom::lib::SystemException("close",errno);
+ if (fd < 0) throw senf::SystemException("open",errno);
+ if (dup2(fd,0) < 0) throw senf::SystemException("dup2",errno);
+ if (dup2(fd,1) < 0) throw senf::SystemException("dup2",errno);
+ if (dup2(fd,2) < 0) throw senf::SystemException("dup2",errno);
+ if (::close(fd) < 0) throw senf::SystemException("close",errno);
}
///////////////////////////////cc.e////////////////////////////////////////
diff --git a/Utils/DaemonTools.hh b/Utils/DaemonTools.hh
index e96ade69e..7fab85187 100644
--- a/Utils/DaemonTools.hh
+++ b/Utils/DaemonTools.hh
@@ -11,13 +11,13 @@
//#include "DaemonTools.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
void daemonize();
void redirect_stdio(std::string const & path = "/dev/null");
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "DaemonTools.cci"
diff --git a/Utils/Exception.cc b/Utils/Exception.cc
index c9a43f111..2798216ea 100644
--- a/Utils/Exception.cc
+++ b/Utils/Exception.cc
@@ -32,7 +32,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ void satcom::lib::SystemException::init()
+prefix_ void senf::SystemException::init()
{
std::stringstream s;
if (where)
@@ -41,7 +41,7 @@ prefix_ void satcom::lib::SystemException::init()
buffer_ = s.str();
}
-prefix_ char const * satcom::lib::SystemException::what()
+prefix_ char const * senf::SystemException::what()
const throw()
{
return buffer_.c_str();
@@ -53,5 +53,5 @@ prefix_ char const * satcom::lib::SystemException::what()
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/Exception.hh b/Utils/Exception.hh
index 1c5ca1ca7..7d5dbf1e5 100644
--- a/Utils/Exception.hh
+++ b/Utils/Exception.hh
@@ -30,8 +30,8 @@
//#include "Exception.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
struct SystemException : public std::exception
{
@@ -49,7 +49,7 @@ namespace lib {
std::string buffer_;
};
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "Exception.cci"
@@ -60,5 +60,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/MicroTime.cc b/Utils/MicroTime.cc
index 40e59c317..5006c5093 100644
--- a/Utils/MicroTime.cc
+++ b/Utils/MicroTime.cc
@@ -18,7 +18,7 @@
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-prefix_ satcom::lib::MicroTime satcom::lib::now()
+prefix_ senf::MicroTime senf::now()
{
struct timeval tv;
if (gettimeofday(&tv,0) < 0)
diff --git a/Utils/MicroTime.hh b/Utils/MicroTime.hh
index f4fc8cafa..d4495e1fd 100644
--- a/Utils/MicroTime.hh
+++ b/Utils/MicroTime.hh
@@ -11,14 +11,14 @@
//#include "MicroTime.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
typedef boost::uint64_t MicroTime;
MicroTime now();
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "MicroTime.cci"
diff --git a/Utils/MicroTime.test.cc b/Utils/MicroTime.test.cc
index 93dfd544d..cd3bc33fa 100644
--- a/Utils/MicroTime.test.cc
+++ b/Utils/MicroTime.test.cc
@@ -18,7 +18,7 @@
BOOST_AUTO_UNIT_TEST(microTime)
{
- BOOST_CHECK_NO_THROW( satcom::lib::now() );
+ BOOST_CHECK_NO_THROW( senf::now() );
}
///////////////////////////////cc.e////////////////////////////////////////
diff --git a/Utils/SafeBool.cci b/Utils/SafeBool.cci
index 4c49b5b52..8cce0e555 100644
--- a/Utils/SafeBool.cci
+++ b/Utils/SafeBool.cci
@@ -9,22 +9,22 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ void satcom::lib::SafeBoolBase::this_type_does_not_support_comparisons()
+prefix_ void senf::SafeBoolBase::this_type_does_not_support_comparisons()
const
{}
-prefix_ satcom::lib::SafeBoolBase::SafeBoolBase()
+prefix_ senf::SafeBoolBase::SafeBoolBase()
{}
-prefix_ satcom::lib::SafeBoolBase::SafeBoolBase(const SafeBoolBase&)
+prefix_ senf::SafeBoolBase::SafeBoolBase(const SafeBoolBase&)
{}
-prefix_ satcom::lib::SafeBoolBase& satcom::lib::SafeBoolBase::operator=(const SafeBoolBase&)
+prefix_ senf::SafeBoolBase& senf::SafeBoolBase::operator=(const SafeBoolBase&)
{
return *this;
}
-prefix_ satcom::lib::SafeBoolBase::~SafeBoolBase()
+prefix_ senf::SafeBoolBase::~SafeBoolBase()
{}
///////////////////////////////cci.e///////////////////////////////////////
diff --git a/Utils/SafeBool.cti b/Utils/SafeBool.cti
index 603ae8aef..f223f7524 100644
--- a/Utils/SafeBool.cti
+++ b/Utils/SafeBool.cti
@@ -12,7 +12,7 @@
///////////////////////////////cti.p///////////////////////////////////////
template <typename T>
-prefix_ satcom::lib::SafeBool<T>::operator bool_type()
+prefix_ senf::SafeBool<T>::operator bool_type()
const
{
return (static_cast<const T*>(this))->boolean_test()
@@ -20,24 +20,24 @@ prefix_ satcom::lib::SafeBool<T>::operator bool_type()
}
template <typename T>
-prefix_ bool satcom::lib::SafeBool<T>::operator!()
+prefix_ bool senf::SafeBool<T>::operator!()
const
{
return ! (static_cast<const T*>(this))->boolean_test();
}
template <typename T>
-prefix_ satcom::lib::SafeBool<T>::~SafeBool()
+prefix_ senf::SafeBool<T>::~SafeBool()
{}
template <typename T, typename U>
-prefix_ void satcom::lib::operator==(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
+prefix_ void senf::operator==(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
{
lhs.this_type_does_not_support_comparisons();
}
template <typename T, typename U>
-prefix_ void satcom::lib::operator!=(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
+prefix_ void senf::operator!=(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
{
lhs.this_type_does_not_support_comparisons();
}
diff --git a/Utils/SafeBool.hh b/Utils/SafeBool.hh
index 5bde30281..43e317bab 100644
--- a/Utils/SafeBool.hh
+++ b/Utils/SafeBool.hh
@@ -10,8 +10,8 @@
//#include "SafeBool.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
// This is a direct copy of a safe bool solution by Bjorn Karlsson
// from http://www.artima.com/cppsource/safebool.html
@@ -67,7 +67,7 @@ namespace lib {
template <typename T,typename U>
void operator!=(const SafeBool<T>& lhs,const SafeBool<U>& rhs);
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "SafeBool.cci"
diff --git a/Utils/TypeInfo.cc b/Utils/TypeInfo.cc
index c6860f507..9f0bd6a47 100644
--- a/Utils/TypeInfo.cc
+++ b/Utils/TypeInfo.cc
@@ -41,7 +41,7 @@
// interface isn't even explicitly exportet from libiberty. However, it is
// *EXTREMELY* helpful for debugging ...
-prefix_ std::string satcom::lib::prettyName(std::type_info const & type)
+prefix_ std::string senf::prettyName(std::type_info const & type)
{
char const * mangled = type.name();
char * demangled = ::cplus_demangle(mangled,DMGL_TYPES|DMGL_AUTO);
@@ -58,5 +58,5 @@ prefix_ std::string satcom::lib::prettyName(std::type_info const & type)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/TypeInfo.hh b/Utils/TypeInfo.hh
index 72168b6e4..98c3b38e3 100644
--- a/Utils/TypeInfo.hh
+++ b/Utils/TypeInfo.hh
@@ -30,12 +30,12 @@
//#include "TypeInfo.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
std::string prettyName(std::type_info const & type);
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "TypeInfo.cci"
@@ -47,5 +47,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/TypeInfo.test.cc b/Utils/TypeInfo.test.cc
index ac73a7eb9..1d05bfb1b 100644
--- a/Utils/TypeInfo.test.cc
+++ b/Utils/TypeInfo.test.cc
@@ -53,8 +53,8 @@ BOOST_AUTO_UNIT_TEST(prettyName)
TestType ob;
test::Base const & baseOb(ob);
- BOOST_CHECK_EQUAL( satcom::lib::prettyName(typeid(int)), "int");
- BOOST_CHECK_EQUAL( satcom::lib::prettyName(typeid(baseOb)), "test::Foo<test::Foo<test::Blub, 1>, 10>" );
+ BOOST_CHECK_EQUAL( senf::prettyName(typeid(int)), "int");
+ BOOST_CHECK_EQUAL( senf::prettyName(typeid(baseOb)), "test::Foo<test::Foo<test::Blub, 1>, 10>" );
}
///////////////////////////////cc.e////////////////////////////////////////
@@ -63,5 +63,5 @@ BOOST_AUTO_UNIT_TEST(prettyName)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/impl/membind.hh b/Utils/impl/membind.hh
index ef1850023..a0c619d83 100644
--- a/Utils/impl/membind.hh
+++ b/Utils/impl/membind.hh
@@ -20,7 +20,7 @@
// Free Software Foundation, Inc.,
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
-// NEVER INCLUDE DIRECTLY !! INCLUDE satcom/membind.hh
+// NEVER INCLUDE DIRECTLY !! INCLUDE senf/membind.hh
#if !BOOST_PP_IS_ITERATING
diff --git a/Utils/intrusive_refcount.cci b/Utils/intrusive_refcount.cci
index a6a9d1a99..3318a4d17 100644
--- a/Utils/intrusive_refcount.cci
+++ b/Utils/intrusive_refcount.cci
@@ -30,40 +30,40 @@
#define prefix_ inline
///////////////////////////////cci.p///////////////////////////////////////
-prefix_ satcom::lib::intrusive_refcount::refcount_t satcom::lib::intrusive_refcount::refcount()
+prefix_ senf::intrusive_refcount::refcount_t senf::intrusive_refcount::refcount()
{
return refcount_;
}
-prefix_ bool satcom::lib::intrusive_refcount::is_shared()
+prefix_ bool senf::intrusive_refcount::is_shared()
{
return refcount()>1;
}
-prefix_ satcom::lib::intrusive_refcount::intrusive_refcount()
+prefix_ senf::intrusive_refcount::intrusive_refcount()
: refcount_(0)
{}
-prefix_ satcom::lib::intrusive_refcount::~intrusive_refcount()
+prefix_ senf::intrusive_refcount::~intrusive_refcount()
{}
-prefix_ void satcom::lib::intrusive_refcount::add_ref()
+prefix_ void senf::intrusive_refcount::add_ref()
{
++refcount_;
}
-prefix_ bool satcom::lib::intrusive_refcount::release()
+prefix_ bool senf::intrusive_refcount::release()
{
BOOST_ASSERT(refcount_>0);
return --refcount_ == 0;
}
-prefix_ void satcom::lib::intrusive_ptr_add_ref(intrusive_refcount* p)
+prefix_ void senf::intrusive_ptr_add_ref(intrusive_refcount* p)
{
p->add_ref();
}
-prefix_ void satcom::lib::intrusive_ptr_release(intrusive_refcount* p)
+prefix_ void senf::intrusive_ptr_release(intrusive_refcount* p)
{
if (p->release())
delete p;
@@ -75,5 +75,5 @@ prefix_ void satcom::lib::intrusive_ptr_release(intrusive_refcount* p)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/intrusive_refcount.hh b/Utils/intrusive_refcount.hh
index a63dbe67d..60a60e69b 100644
--- a/Utils/intrusive_refcount.hh
+++ b/Utils/intrusive_refcount.hh
@@ -29,8 +29,8 @@
//#include "intrusive_refcount.mpp"
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
/** \brief
*/
@@ -54,14 +54,14 @@ namespace lib {
refcount_t refcount_;
- friend void satcom::lib::intrusive_ptr_add_ref(intrusive_refcount* p);
- friend void satcom::lib::intrusive_ptr_release(intrusive_refcount* p);
+ friend void senf::intrusive_ptr_add_ref(intrusive_refcount* p);
+ friend void senf::intrusive_ptr_release(intrusive_refcount* p);
};
void intrusive_ptr_add_ref(intrusive_refcount* p);
void intrusive_ptr_release(intrusive_refcount* p);
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
#include "intrusive_refcount.cci"
@@ -72,5 +72,5 @@ namespace lib {
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/intrusive_refcount.test.cc b/Utils/intrusive_refcount.test.cc
index f09e4bc6a..8ed877209 100644
--- a/Utils/intrusive_refcount.test.cc
+++ b/Utils/intrusive_refcount.test.cc
@@ -37,7 +37,7 @@
namespace {
struct Tester
- : public satcom::lib::intrusive_refcount
+ : public senf::intrusive_refcount
{
typedef boost::intrusive_ptr<Tester> ptr;
@@ -80,5 +80,5 @@ BOOST_AUTO_UNIT_TEST(intrusive_refcount)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/Utils/membind.hh b/Utils/membind.hh
index e624e761a..bc9b30de4 100644
--- a/Utils/membind.hh
+++ b/Utils/membind.hh
@@ -29,8 +29,8 @@
///////////////////////////////hh.p////////////////////////////////////////
-namespace satcom {
-namespace lib {
+namespace senf {
+
#define scOBTYPE T *
#include "Utils/impl/membind.hh"
@@ -40,7 +40,7 @@ namespace lib {
#include "Utils/impl/membind.hh"
#undef scOBTYPE
-}}
+}
///////////////////////////////hh.e////////////////////////////////////////
//#include "membind.cci"
diff --git a/Utils/membind.test.cc b/Utils/membind.test.cc
index 7c0595494..465e29c44 100644
--- a/Utils/membind.test.cc
+++ b/Utils/membind.test.cc
@@ -55,8 +55,8 @@ namespace {
BOOST_AUTO_UNIT_TEST(membind)
{
Test instance;
- boost::function<char const * ()> f1 (satcom::lib::membind(&Test::meth1,instance));
- boost::function<std::string (int,int)> f2 (satcom::lib::membind(&Test::meth2,instance));
+ boost::function<char const * ()> f1 (senf::membind(&Test::meth1,instance));
+ boost::function<std::string (int,int)> f2 (senf::membind(&Test::meth2,instance));
BOOST_CHECK_EQUAL( f1(), "meth1()" );
BOOST_CHECK_EQUAL( f2(1,2), "meth2(1,2)" );
@@ -68,5 +68,5 @@ BOOST_AUTO_UNIT_TEST(membind)
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
// End:
diff --git a/doclib/Doxyfile.global b/doclib/Doxyfile.global
index 54d2c9b1a..05a777790 100644
--- a/doclib/Doxyfile.global
+++ b/doclib/Doxyfile.global
@@ -83,7 +83,7 @@ FILE_PATTERNS = *.c *.cc *.cci *.ct *.cti *.h *.hh *.ih *.mmc *.dox
RECURSIVE = NO
EXCLUDE = doc
EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = *.test.cc *~ .*
+EXCLUDE_PATTERNS = *.test.cc .*
EXAMPLE_PATH =
EXAMPLE_PATTERNS = *
EXAMPLE_RECURSIVE = NO
diff --git a/doclib/doxy-header-overview.html b/doclib/doxy-header-overview.html
index 93c56920c..e0f52b30f 100644
--- a/doclib/doxy-header-overview.html
+++ b/doclib/doxy-header-overview.html
@@ -26,6 +26,6 @@ div.tabs ul li.$projectname a { background-color: #EDE497; }
<li class="libPackets"><a href="../../Packets/doc/html/index.html">libPackets</a></li>
<li class="libScheduler"><a href="../../Scheduler/doc/html/index.html">libScheduler</a></li>
<li class="libUtils"><a href="../../Utils/doc/html/index.html">libUtils</a></li>
- <li class="SENFSCons"><a href="../../satscons/doc/html/index.html">SENFSCons</a></li>
+ <li class="SENFSCons"><a href="../../senfscons/doc/html/index.html">SENFSCons</a></li>
</ul>
</div>
diff --git a/doclib/doxy-header.html b/doclib/doxy-header.html
index 471e46092..a630f59ec 100644
--- a/doclib/doxy-header.html
+++ b/doclib/doxy-header.html
@@ -26,6 +26,6 @@ div.tabs ul li.$projectname a { background-color: #EDE497; }
<li class="libPackets"><a href="../../../Packets/doc/html/index.html">libPackets</a></li>
<li class="libScheduler"><a href="../../../Scheduler/doc/html/index.html">libScheduler</a></li>
<li class="libUtils"><a href="../../../Utils/doc/html/index.html">libUtils</a></li>
- <li class="SENFSCons"><a href="../../../satscons/doc/html/index.html">SENFSCons</a></li>
+ <li class="SENFSCons"><a href="../../../senfscons/doc/html/index.html">SENFSCons</a></li>
</ul>
</div>
diff --git a/satscons/BoostUnitTests.py b/senfscons/BoostUnitTests.py
similarity index 100%
rename from satscons/BoostUnitTests.py
rename to senfscons/BoostUnitTests.py
diff --git a/satscons/Dia2Png.py b/senfscons/Dia2Png.py
similarity index 100%
rename from satscons/Dia2Png.py
rename to senfscons/Dia2Png.py
diff --git a/satscons/Doxyfile b/senfscons/Doxyfile
similarity index 100%
rename from satscons/Doxyfile
rename to senfscons/Doxyfile
diff --git a/satscons/Doxyfile.template b/senfscons/Doxyfile.template
similarity index 100%
rename from satscons/Doxyfile.template
rename to senfscons/Doxyfile.template
diff --git a/satscons/Doxygen.py b/senfscons/Doxygen.py
similarity index 100%
rename from satscons/Doxygen.py
rename to senfscons/Doxygen.py
diff --git a/satscons/SConfig.template b/senfscons/SConfig.template
similarity index 100%
rename from satscons/SConfig.template
rename to senfscons/SConfig.template
diff --git a/satscons/SConscript b/senfscons/SConscript
similarity index 100%
rename from satscons/SConscript
rename to senfscons/SConscript
diff --git a/satscons/SConscript.template b/senfscons/SConscript.template
similarity index 100%
rename from satscons/SConscript.template
rename to senfscons/SConscript.template
diff --git a/satscons/SConstruct.template b/senfscons/SConstruct.template
similarity index 92%
rename from satscons/SConstruct.template
rename to senfscons/SConstruct.template
index ef68cb92d..68034794b 100644
--- a/satscons/SConstruct.template
+++ b/senfscons/SConstruct.template
@@ -1,5 +1,5 @@
import sys, glob
-sys.path.append('satscons')
+sys.path.append('senfscons')
import SatSCons
###########################################################################
diff --git a/satscons/SatSCons.py b/senfscons/SatSCons.py
similarity index 100%
rename from satscons/SatSCons.py
rename to senfscons/SatSCons.py
diff --git a/satscons/__init__.py b/senfscons/__init__.py
similarity index 100%
rename from satscons/__init__.py
rename to senfscons/__init__.py
diff --git a/satscons/nodeglob.py b/senfscons/nodeglob.py
similarity index 100%
rename from satscons/nodeglob.py
rename to senfscons/nodeglob.py
diff --git a/satscons/pdflatex.py b/senfscons/pdflatex.py
similarity index 100%
rename from satscons/pdflatex.py
rename to senfscons/pdflatex.py
--
GitLab