X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FUDPServer.cc;h=783a565f59f4dca0eb56a0fb22368a06729f7551;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=7f7788442a812d0e38e2b48b55223d0f78c53225;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Utils/Console/UDPServer.cc b/senf/Utils/Console/UDPServer.cc index 7f77884..783a565 100644 --- a/senf/Utils/Console/UDPServer.cc +++ b/senf/Utils/Console/UDPServer.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -32,14 +32,14 @@ //#include "UDPServer.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// prefix_ senf::console::UDPServer::UDPServer(senf::INet4SocketAddress const & address) - : replies_ (true), emptyReplies_ (true), target_ (), - handle_ (senf::UDPv4ClientSocketHandle(address)), - readevent_ ("senf::console::UDPServer::readevent", - senf::membind(&UDPServer::handleInput, this), - handle_, + : replies_ (true), emptyReplies_ (true), target_ (), + handle_ (senf::UDPv4ClientSocketHandle(address)), + readevent_ ("senf::console::UDPServer::readevent", + senf::membind(&UDPServer::handleInput, this), + handle_, senf::scheduler::FdEvent::EV_READ), parser_ (), executor_ () { @@ -49,10 +49,10 @@ prefix_ senf::console::UDPServer::UDPServer(senf::INet4SocketAddress const & add } prefix_ senf::console::UDPServer::UDPServer(senf::INet6SocketAddress const & address) - : replies_ (true), target_ (), handle_ (senf::UDPv6ClientSocketHandle(address)), - readevent_ ("senf::console::UDPServer::readevent", - senf::membind(&UDPServer::handleInput, this), - handle_, + : replies_ (true), target_ (), handle_ (senf::UDPv6ClientSocketHandle(address)), + readevent_ ("senf::console::UDPServer::readevent", + senf::membind(&UDPServer::handleInput, this), + handle_, senf::scheduler::FdEvent::EV_READ), parser_ (), executor_ () { @@ -70,15 +70,17 @@ prefix_ senf::console::UDPServer & senf::console::UDPServer::replies(bool enable prefix_ senf::console::UDPServer & senf::console::UDPServer::replies(senf::INet4SocketAddress const & address) { - SENF_ASSERT( handle_.local().family() == senf::INet4SocketAddress::addressFamily ); - target_ = address; + SENF_ASSERT( handle_.local().family() == senf::INet4SocketAddress::addressFamily, + "Internal failure: INet6 address on INet4 socket ??" ); + target_ = address; return *this; } prefix_ senf::console::UDPServer & senf::console::UDPServer::replies(senf::INet6SocketAddress const & address) { - SENF_ASSERT( handle_.local().family() == senf::INet6SocketAddress::addressFamily ); + SENF_ASSERT( handle_.local().family() == senf::INet6SocketAddress::addressFamily, + "Internal failure: INet4 address on INet6 socket ??" ); target_ = address; return *this; } @@ -139,10 +141,10 @@ prefix_ void senf::console::UDPServer::handleInput(int events) stream << '\0'; handle_.writeto(address, stream.str()); } - + } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "UDPServer.mpp"