X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FConnectors.hh;h=bb0724e20cd3948399952ab5725150870c4b9633;hb=73c33f663ff0f65e4656ea5a5f6f07a43a2e1722;hp=0dfe9cfafaf797b720c54ea15456a4c0e16fd8c7;hpb=69b25a4904fa86324aedc7147502255ce4117885;p=senf.git

diff --git a/senf/PPI/Connectors.hh b/senf/PPI/Connectors.hh
index 0dfe9cf..bb0724e 100644
--- a/senf/PPI/Connectors.hh
+++ b/senf/PPI/Connectors.hh
@@ -63,8 +63,8 @@ namespace connector {
         We therefore have 4 connector types each of which is parameterized by the type of packet
         traversing the connector:
         \li senf::ppi::connector::ActiveInput
-        \li senf::ppi::connector::ActiveOutput 
-        \li senf::ppi::connector::PassiveInput 
+        \li senf::ppi::connector::ActiveOutput
+        \li senf::ppi::connector::PassiveInput
         \li senf::ppi::connector::PassiveOutput.
 
         Connectors are declared as module data members and are then externally connected to other
@@ -115,7 +115,7 @@ namespace connector {
             senf::ppi::connector::ActiveInputJack<senf::EthernetPacket> input;
             senf::ppi::connector::ActiveOutputJack<senf::EthernetPacket> output;
 
-            MyGroup() 
+            MyGroup()
                 : queue (), analyzer (), input (queue.input), output (analyzer.output)
             {
                 senf::ppi::connect(queue, analyzer);
@@ -186,10 +186,10 @@ namespace connector {
         void throttleTrace(char const * label, char const * type);
 
         void unregisterConnector();
-        
+
     private:
         virtual std::type_info const & packetTypeID();
-        
+
         virtual void v_disconnected() const;
 
         void setModule(module::Module & module);
@@ -348,7 +348,7 @@ namespace connector {
         typedef std::vector<ForwardingRoute*> NotifyRoutes;
         NotifyRoutes notifyRoutes_;
 
-        bool throttled_;        
+        bool throttled_;
 
         friend class senf::ppi::ForwardingRoute;
         friend class PassiveConnector;
@@ -389,9 +389,8 @@ namespace connector {
                                              dequeue a packet from the packet queue. If the
                                              connector is active, the connector will request new
                                              packets from the connected module. If the packet
-                                             request cannot be fulfilled, this is considered to be a
-                                             logic error in the module implementation and an
-                                             exception is raised. */
+                                             request cannot be fulfilled an in-valid Packet is
+                                             returned. */
 
         Packet read();                  ///< Alias for operator()()
 
@@ -463,6 +462,9 @@ namespace connector {
                                              QueueingDiscipline interface.
 
                                              \param[in] disc New queueing discipline */
+        void qdisc(QueueingDiscipline::None_t);
+                                        ///< Disable queueing discipline
+
 
     protected:
         GenericPassiveInput();
@@ -568,12 +570,12 @@ namespace connector {
 #else
 
     /** \brief Connector actively reading packets
-        
+
         \tparam PacketType Type of packet to read. Defaults to senf::Packet
 
         The %ActiveInput %connector template reads data actively from a connected %module. This
-        class is completely implemented via it's base-class, GenericActiveInput, the only 
-        difference is that read packets are returned as \a PacketType instead of generic 
+        class is completely implemented via it's base-class, GenericActiveInput, the only
+        difference is that read packets are returned as \a PacketType instead of generic
         senf::Packet references.
 
         \see GenericActiveInput \n
@@ -595,7 +597,7 @@ namespace connector {
         \tparam PacketType Type of packet to read. Defaults to senf::Packet
 
         The %PassiveInput %connector template receives packets sent to it from a connected
-        %module. This class is completely implemented via it's base-class, GenericPassiveInput, 
+        %module. This class is completely implemented via it's base-class, GenericPassiveInput,
         the only difference is that read packets are returned as \a PacketType instead of generic
         senf::Packet references.
 
@@ -617,7 +619,7 @@ namespace connector {
 
         \tparam PacketType Type of packet to send. Defaults to senf::Packet
 
-        The %ActiveOutput %connector template sends data actively to a connected %module. This 
+        The %ActiveOutput %connector template sends data actively to a connected %module. This
         class is completely implemented via it's base-class, GenericActiveOutput, the only
         difference is that it only sends packets of type \a PacketType.
 
@@ -636,9 +638,9 @@ namespace connector {
 
         \tparam PacketType Type of packet to send. Defaults to senf::Packet
 
-        The %PassiveOutput %connector template provides data passively to a connected %module 
-        whenever signaled. This class is completely implemented via it's base-class, 
-        GenericPassiveOutput, the only difference is that it only sends packets of type 
+        The %PassiveOutput %connector template provides data passively to a connected %module
+        whenever signaled. This class is completely implemented via it's base-class,
+        GenericPassiveOutput, the only difference is that it only sends packets of type
         \a PacketType.
 
         \see GenericPassiveOutput \n
@@ -658,7 +660,7 @@ namespace connector {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #include "Connectors.cci"
-//#include "Connectors.ct"
+#include "Connectors.ct"
 #include "Connectors.cti"
 #endif