X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FServer.hh;h=1974a748bfe5f7d5c99a8b3a65e363a2e63ac9ed;hb=4e2b741f18b63e97ab4eef30fcee1dec999541be;hp=1756e14717b3fb79164ddf869691c1ffda1f69be;hpb=7638cc0391abf8f10bc29eb87851dac5f4e765b2;p=senf.git

diff --git a/Console/Server.hh b/Console/Server.hh
index 1756e14..1974a74 100644
--- a/Console/Server.hh
+++ b/Console/Server.hh
@@ -35,8 +35,6 @@
 #include "../Socket/Protocols/INet/TCPSocketHandle.hh"
 #include "../Socket/ServerSocketHandle.hh"
 #include "../Scheduler/Scheduler.hh"
-#include "../Scheduler/Binding.hh"
-#include "../Scheduler/Timer.hh"
 #include "../Scheduler/ReadHelper.hh"
 #include "Parse.hh"
 #include "Executor.hh"
@@ -81,8 +79,6 @@ namespace console {
 
         ///////////////////////////////////////////////////////////////////////////
 
-        ~Server();
-
         static Server & start(senf::INet4SocketAddress const & address);
                                         ///< Start server on given IPv4 address/port
         static Server & start(senf::INet6SocketAddress const & address);
@@ -129,10 +125,11 @@ namespace console {
 
         static Server & start(ServerHandle handle);
 
-        void newClient(Scheduler::EventId event);
+        void newClient(int event);
         void removeClient(Client & client);
         
         ServerHandle handle_;
+        scheduler::FdEvent event_;
         DirectoryNode::ptr root_;
         Mode mode_;
         
@@ -196,8 +193,8 @@ namespace console {
         
         Server & server_;
         ClientHandle handle_;
-        SchedulerBinding binding_;
-        SchedulerTimer timer_;
+        scheduler::FdEvent readevent_;
+        scheduler::TimerEvent timer_;
         CommandParser parser_;
         Executor executor_;
         std::string name_;