minor changes

flow/PacketPassConnector.c

@@ -31,9 +31,6 @@ static void input_handler_send (PacketPassConnector *o, uint8_t *data, int data_
     ASSERT(data_len >= 0)
     ASSERT(data_len <= o->input_mtu)
     ASSERT(o->in_len == -1)
-    if (o->output) {
-        ASSERT(!o->out_blocking)
-    }
     DebugObject_Access(&o->d_obj);
     
     // remember input packet
@@ -43,7 +40,6 @@ static void input_handler_send (PacketPassConnector *o, uint8_t *data, int data_
     if (o->output) {
         // schedule send
         PacketPassInterface_Sender_Send(o->output, o->in, o->in_len);
-        o->out_blocking = 1;
     }
 }
 
@@ -51,12 +47,8 @@ static void output_handler_done (PacketPassConnector *o)
 {
     ASSERT(o->in_len >= 0)
     ASSERT(o->output)
-    ASSERT(o->out_blocking)
     DebugObject_Access(&o->d_obj);
     
-    // output not blocking any more
-    o->out_blocking = 0;
-    
     // have no input packet
     o->in_len = -1;
     
@@ -110,13 +102,9 @@ void PacketPassConnector_ConnectOutput (PacketPassConnector *o, PacketPassInterf
     // init output
     PacketPassInterface_Sender_Init(o->output, (PacketPassInterface_handler_done)output_handler_done, o);
     
-    // set output not blocking
-    o->out_blocking = 0;
-    
     // if we have an input packet, schedule send
     if (o->in_len >= 0) {
         PacketPassInterface_Sender_Send(o->output, o->in, o->in_len);
-        o->out_blocking = 1;
     }
 }
 

flow/PacketPassConnector.h

@@ -43,7 +43,6 @@ typedef struct {
     int in_len;
     uint8_t *in;
     PacketPassInterface *output;
-    int out_blocking;
     DebugObject d_obj;
 } PacketPassConnector;
 

flow/PacketRecvConnector.c

@@ -29,9 +29,6 @@
 static void output_handler_recv (PacketRecvConnector *o, uint8_t *data)
 {
     ASSERT(!o->out_have)
-    if (o->input) {
-        ASSERT(!o->in_blocking)
-    }
     DebugObject_Access(&o->d_obj);
     
     // remember output packet
@@ -41,7 +38,6 @@ static void output_handler_recv (PacketRecvConnector *o, uint8_t *data)
     if (o->input) {
         // schedule receive
         PacketRecvInterface_Receiver_Recv(o->input, o->out);
-        o->in_blocking = 1;
     }
 }
 
@@ -49,12 +45,8 @@ static void input_handler_done (PacketRecvConnector *o, int data_len)
 {
     ASSERT(o->out_have)
     ASSERT(o->input)
-    ASSERT(o->in_blocking)
     DebugObject_Access(&o->d_obj);
     
-    // input not blocking any more
-    o->in_blocking = 0;
-    
     // have no output packet
     o->out_have = 0;
     
@@ -108,13 +100,9 @@ void PacketRecvConnector_ConnectInput (PacketRecvConnector *o, PacketRecvInterfa
     // init input
     PacketRecvInterface_Receiver_Init(o->input, (PacketRecvInterface_handler_done)input_handler_done, o);
     
-    // set input not blocking
-    o->in_blocking = 0;
-    
     // if we have an output packet, schedule receive
     if (o->out_have) {
         PacketRecvInterface_Receiver_Recv(o->input, o->out);
-        o->in_blocking = 1;
     }
 }
 

flow/PacketRecvConnector.h

@@ -43,7 +43,6 @@ typedef struct {
     int out_have;
     uint8_t *out;
     PacketRecvInterface *input;
-    int in_blocking;
     DebugObject d_obj;
 } PacketRecvConnector;
 

flow/StreamRecvConnector.c

@@ -30,9 +30,7 @@ static void output_handler_recv (StreamRecvConnector *o, uint8_t *data, int data
 {
     ASSERT(data_avail > 0)
     ASSERT(o->out_avail == -1)
-    if (o->input) {
-        ASSERT(!o->in_blocking)
-    }
+    DebugObject_Access(&o->d_obj);
     
     // remember output packet
     o->out_avail = data_avail;
@@ -41,7 +39,6 @@ static void output_handler_recv (StreamRecvConnector *o, uint8_t *data, int data
     if (o->input) {
         // schedule receive
         StreamRecvInterface_Receiver_Recv(o->input, o->out, o->out_avail);
-        o->in_blocking = 1;
     }
 }
 
@@ -51,10 +48,7 @@ static void input_handler_done (StreamRecvConnector *o, int data_len)
     ASSERT(data_len <= o->out_avail)
     ASSERT(o->out_avail > 0)
     ASSERT(o->input)
-    ASSERT(o->in_blocking)
-    
-    // input not blocking any more
-    o->in_blocking = 0;
+    DebugObject_Access(&o->d_obj);
     
     // have no output packet
     o->out_avail = -1;
@@ -103,13 +97,9 @@ void StreamRecvConnector_ConnectInput (StreamRecvConnector *o, StreamRecvInterfa
     // init input
     StreamRecvInterface_Receiver_Init(o->input, (StreamRecvInterface_handler_done)input_handler_done, o);
     
-    // set input not blocking
-    o->in_blocking = 0;
-    
     // if we have an output packet, schedule receive
     if (o->out_avail > 0) {
         StreamRecvInterface_Receiver_Recv(o->input, o->out, o->out_avail);
-        o->in_blocking = 1;
     }
 }
 

flow/StreamRecvConnector.h

@@ -42,7 +42,6 @@ typedef struct {
     int out_avail;
     uint8_t *out;
     StreamRecvInterface *input;
-    int in_blocking;
     DebugObject d_obj;
 } StreamRecvConnector;