X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketHandle.cc;h=aa0cf61fef20b4dc9d9380cb2f993492516aa751;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=042d2671d0719557d6497980e79cbd643b28adb7;hpb=6f50bf49e282c0528f51faa0a245bbfa2b867399;p=senf.git diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc index 042d267..aa0cf61 100644 --- 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 // // 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 @@ -85,13 +88,6 @@ prefix_ std::string senf::detail::dumpState(SocketStateMap const & map) return s.str(); } -template -prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle handle) -{ - os << handle.dumpState(); - return os; -} - ///////////////////////////////cc.e//////////////////////////////////////// #undef prefix_ //#include "SocketHandle.mpp"