X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FConnectors.cci;h=3c3ad79b8220749cefba63e65b02421291f6e54a;hb=b52002fa2001e6472d6aa3dde263b85f654c6e8e;hp=1f3f192259d2e67ac27b6dc0f8ebb75334a07c06;hpb=122719831e4d0ce7c335a66ed7c80a7ffc2e00e8;p=senf.git diff --git a/PPI/Connectors.cci b/PPI/Connectors.cci index 1f3f192..3c3ad79 100644 --- a/PPI/Connectors.cci +++ b/PPI/Connectors.cci @@ -60,6 +60,7 @@ prefix_ senf::ppi::connector::Connector::~Connector() prefix_ void senf::ppi::connector::Connector::connect(Connector & target) { + BOOST_ASSERT( ! peer_ && ! target.peer_ ); peer_ = & target; target.peer_ = this; } @@ -89,9 +90,10 @@ prefix_ bool senf::ppi::connector::PassiveConnector::nativeThrottled() prefix_ void senf::ppi::connector::PassiveConnector::throttle() { - if (!throttled()) + if (!throttled()) { + nativeThrottled_ = true; emitThrottle(); - nativeThrottled_ = true; + } } prefix_ void senf::ppi::connector::PassiveConnector::unthrottle() @@ -191,6 +193,11 @@ prefix_ senf::ppi::connector::ActiveConnector::ActiveConnector() /////////////////////////////////////////////////////////////////////////// // senf::ppi::connector::InputConnector +prefix_ senf::Packet senf::ppi::connector::InputConnector::read() +{ + return operator()(); +} + prefix_ senf::ppi::connector::OutputConnector & senf::ppi::connector::InputConnector::peer() const { @@ -254,6 +261,11 @@ prefix_ void senf::ppi::connector::OutputConnector::operator()(Packet p) peer().enqueue(p); } +prefix_ void senf::ppi::connector::OutputConnector::write(Packet p) +{ + operator()(p); +} + prefix_ senf::ppi::connector::InputConnector & senf::ppi::connector::OutputConnector::peer() const {