X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIOEvent.cc;h=ea70efcddad888bc753130ee89459422b65b0f3e;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=2010b6bfc92233090e2b095348569010e49c729b;hpb=81ffa1c459b96dd44472bcef37e1e373934ee138;p=senf.git

diff --git a/PPI/IOEvent.cc b/PPI/IOEvent.cc
index 2010b6b..ea70efc 100644
--- a/PPI/IOEvent.cc
+++ b/PPI/IOEvent.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// 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
@@ -27,7 +27,7 @@
 //#include "IOEvent.ih"
 
 // Custom includes
-#include <boost/bind.hpp>
+#include "../Utils/senfassert.hh"
 
 //#include "IOEvent.mpp"
 #define prefix_
@@ -41,19 +41,30 @@
 
 prefix_ void senf::ppi::IOEvent::v_enable()
 {
-    Scheduler::instance().add(fd_, boost::bind(&IOEvent::cb,this,_1,_2), 
-                              Scheduler::EventId(events_));
+    if (fd_ != -1)
+        event_.enable();
 }
 
 prefix_ void senf::ppi::IOEvent::v_disable()
 {
-    Scheduler::instance().remove(fd_, Scheduler::EventId(events_));
+    if (fd_ != -1)
+        event_.disable();
 }
 
-prefix_ void senf::ppi::IOEvent::cb(int, Scheduler::EventId event)
+prefix_ void senf::ppi::IOEvent::cb(int event)
 {
-    IOEventInfo info = { event };
-    callback(info);
+    if ((event & ~event_.events()) != 0) {
+        if (event & Err)
+            throw ErrorException();
+        else if (event & Hup)
+            throw HangupException();
+        else
+            // This cannot happen.
+            SENF_ASSERT(false);
+    } else {
+        IOEventInfo info = { event };
+        callback(info);
+    }
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////