X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketProtocol.cci;h=372ef3eccf3bc674ac431b3f34f295b034a599ee;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=f2a5fd5fdb04e74acb26f057b133414d47aeba44;hpb=31d85cd6b8e03c5ecc924ca8892906be1bab702f;p=senf.git

diff --git a/Socket/SocketProtocol.cci b/Socket/SocketProtocol.cci
index f2a5fd5..372ef3e 100644
--- a/Socket/SocketProtocol.cci
+++ b/Socket/SocketProtocol.cci
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,25 +27,39 @@
 //#include "SocketProtocol.ih"
 
 // Custom includes
-#include <boost/assert.hpp>
+#include "../Utils/senfassert.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
-prefix_ senf::SocketProtocol::SocketProtocol()
-    : body_(0)
-{}
+///////////////////////////////////////////////////////////////////////////
+// senf::SocketProtocol
 
-prefix_  senf::SocketProtocol::~SocketProtocol()
-{}
+prefix_ senf::FileHandle senf::SocketProtocol::fh()
+    const
+{
+    return body().handle();
+}
 
-prefix_ senf::SocketBody & senf::SocketProtocol::body()
+prefix_ int senf::SocketProtocol::fd()
     const
 {
-    BOOST_ASSERT( body_ );
-    return *body_;
+    return body().fd();
 }
 
+prefix_ void senf::SocketProtocol::fd(int fd)
+    const
+{
+    SENF_ASSERT(! body().valid());
+    body().fd(fd);
+}
+
+prefix_ senf::SocketProtocol::SocketProtocol()
+{}
+
+prefix_  senf::SocketProtocol::~SocketProtocol()
+{}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_
 
@@ -57,4 +71,5 @@ prefix_ senf::SocketBody & senf::SocketProtocol::body()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: