X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FUDPClientServer%2FudpServer.cc;h=218ee7476c8e37e181c6728043d13e2197de92da;hb=f08685d9795a3be20ce5c7a337087358ccd77eb5;hp=091b6ba8e3e8a14b59620754b7e09db6ab717c0c;hpb=67b2702fa6c55a2fa8e318e50271ed714796d597;p=senf.git

diff --git a/Examples/UDPClientServer/udpServer.cc b/Examples/UDPClientServer/udpServer.cc
index 091b6ba..218ee74 100644
--- a/Examples/UDPClientServer/udpServer.cc
+++ b/Examples/UDPClientServer/udpServer.cc
@@ -2,23 +2,29 @@
 //
 // Copyright (C) 2008
 // 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
+
 
 // Custom includes
 #include <string>
@@ -29,22 +35,23 @@
 class Server
 {
     senf::UDPv4ClientSocketHandle serverSock;
+    senf::scheduler::FdEvent event;
 
 public:
     Server(senf::INet4Address const & host, unsigned int port)
-        : serverSock(senf::INet4SocketAddress(host, port)) {}
+        : serverSock(senf::INet4SocketAddress(host, port)),
+          event("UDPv4ClientServer", senf::membind(&Server::readFromClient, this),
+                serverSock, senf::scheduler::FdEvent::EV_READ, false)
+        {}
 
     void run()
     {
-        senf::Scheduler::instance().add(
-                serverSock,
-                senf::membind(&Server::readFromClient, this),
-                senf::Scheduler::EV_READ);
-        senf::Scheduler::instance().process();
+        event.enable();
+        senf::scheduler::process();
     }
 
 private:
-    void readFromClient(senf::Scheduler::EventId event)
+    void readFromClient(int event)
     {
         std::string data (serverSock.read());
         std::cout << "> " << data<<std::endl ;
@@ -63,3 +70,14 @@ int main(int argc, char const * argv[])
     }
     return 0;
 }
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u"
+// End: