X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketProtocol.cci;h=04be16c20dd9cf98ac1a0c3f9a2bedb322601c18;hb=6f50bf49e282c0528f51faa0a245bbfa2b867399;hp=7ecf0b04c83155e4587b7630aaf56c25753ed51c;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git

diff --git a/Socket/SocketProtocol.cci b/Socket/SocketProtocol.cci
index 7ecf0b0..04be16c 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,40 @@
 //#include "SocketProtocol.ih"
 
 // Custom includes
-#include <boost/assert.hpp>
+#include "../Utils/senfassert.hh"
+#include "../Utils/Logger/SenfLog.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_