Socket: BUGFIX: Move incorrect v-function call out of FileBody destructor

[senf.git] / Socket / SocketHandle.cc

diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc
index afd1d89..aa0cf61 100644 (file)
--- a/Socket/SocketHandle.cc
+++ b/Socket/SocketHandle.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// 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
@@ -36,6 +36,19 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::SocketBody
+
+prefix_ void senf::SocketBody::state(SocketStateMap & map, unsigned lod)
+{
+    map["file.handle"]     << fd();
+    map["file.refcount"]   << refcount();
+    map["socket.server"]   << isServer();
+    map["socket.protocol"] << v_protocolName();
+    map["socket.protocol.policy"]   << prettyName(typeid(protocol().policy()));
+    protocol().state(map,lod);
+}
+
 prefix_ void senf::SocketBody::v_close()
 {
     protocol().close();
@@ -52,16 +65,6 @@ prefix_ bool senf::SocketBody::v_eof()
     return protocol().eof();
 }
 
-prefix_ void senf::SocketBody::state(SocketStateMap & map, unsigned lod)
-{
-    map["file.handle"]     << fd();
-    map["file.refcount"]   << refcount();
-    map["socket.server"]   << isServer();
-    map["socket.protocol"] << v_protocolName();
-    map["socket.protocol.policy"]   << prettyName(typeid(protocol().policy()));
-    protocol().state(map,lod);
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // senf::detail::StateMapOrdering