diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-02 13:22:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-02 13:22:07 -0400 |
| commit | bfcfeaed0772cd9238c3fa4d1c4a6db4f23ad2a3 (patch) | |
| tree | d322687e01ae0e8cec9edde3bdf4c7688dc3f4c6 /src/test | |
| parent | cf8c3abff179b4550404bb9978a9d2b5ad18fc34 (diff) | |
| parent | 46b06cd6999439608f4a8a34bb68f6fe6a6311e9 (diff) | |
| download | tor-bfcfeaed0772cd9238c3fa4d1c4a6db4f23ad2a3.tar.gz tor-bfcfeaed0772cd9238c3fa4d1c4a6db4f23ad2a3.zip | |
Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_relaycell.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 841174982c..1bd17b73bf 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -240,11 +240,26 @@ test_circbw_relay(void *arg) circ->cpath); ASSERT_UNCOUNTED_BW(); - /* Sendme on stream: not counted */ + /* Sendme on valid stream: counted */ ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, circ->cpath); + ASSERT_COUNTED_BW(); + + /* Sendme on valid stream with full window: not counted */ + ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; + PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); + edgeconn->package_window = 500; + connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, + circ->cpath); + ASSERT_UNCOUNTED_BW(); + + /* Sendme on unknown stream: not counted */ + ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; + PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); + connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, + circ->cpath); ASSERT_UNCOUNTED_BW(); /* Sendme on circuit with full window: not counted */ |