// $Id$
//
// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@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
// Custom includes
#include <string>
#include <iostream>
-#include "Scheduler/Scheduler.hh"
-#include "Utils/membind.hh"
-#include "Socket/Protocols/INet/TCPSocketHandle.hh"
-#include "Socket/Protocols/INet/INetAddressing.hh"
-
+#include <senf/Scheduler/Scheduler.hh>
+#include <senf/Utils/membind.hh>
+#include <senf/Socket/Protocols/INet.hh>
class Server
{
senf::TCPv4ServerSocketHandle serverSock;
+ senf::scheduler::FdEvent acceptevent;
+ senf::scheduler::FdEvent readevent;
public:
- Server(std::string const & host, unsigned int port)
- : serverSock(senf::INet4Address(host, port)) {}
-
- void run()
+ Server(senf::INet4Address const & host, unsigned int port)
+ : serverSock(senf::INet4SocketAddress(host, port)),
+ acceptevent("Server accept", senf::membind(&Server::accept, this),
+ serverSock, senf::scheduler::FdEvent::EV_READ),
+ readevent("Server read", 0)
+ {}
+
+ void run()
{
- senf::Scheduler::instance().add(
- serverSock,
- senf::membind(&Server::accept, this),
- senf::Scheduler::EV_READ);
- senf::Scheduler::instance().process();
+ senf::scheduler::process();
}
-
+
private:
- void accept(senf::FileHandle /* ignored */, senf::Scheduler::EventId event)
+ void accept(int event)
{
senf::TCPv4ClientSocketHandle clientSock (serverSock.accept());
- senf::Scheduler::instance().add(
- clientSock,
- senf::membind(&Server::readFromClient, this),
- senf::Scheduler::EV_READ);
+ readevent
+ .action(boost::bind(&Server::readFromClient, this, clientSock, _1))
+ .handle(clientSock)
+ .events(senf::scheduler::FdEvent::EV_READ)
+ .enable();
}
-
- void readFromClient(senf::TCPv4ClientSocketHandle clientSock, senf::Scheduler::EventId event)
+
+ void readFromClient(senf::TCPv4ClientSocketHandle clientSock, int event)
{
if (!clientSock) {
- senf::Scheduler::instance().remove(clientSock);
+ readevent.disable();
return;
}
std::string data (clientSock.read());
int main(int argc, char const * argv[])
{
try {
- Server myServer ("127.0.0.1", 4243);
+ Server myServer (senf::INet4Address::Loopback, 4243);
myServer.run();
}
catch (std::exception const & ex) {
}
return 0;
}
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u"
+// comment-column: 40
+// End: