December 2014 - tor-commits - lists.torproject.org

[tor/master] Using channel state lookup macros in channeltls.c
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit 668edc51323e507be88b50fb8a49f20bef779bc8 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 21:02:00 2014 +0200 Using channel state lookup macros in channeltls.c --- src/or/channeltls.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index db044ae..987dd9b 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -855,10 +855,10 @@ channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, /* Make sure the base connection state makes sense - shouldn't be error, * closed or listening. */ - tor_assert(base_chan->state == CHANNEL_STATE_OPENING || - base_chan->state == CHANNEL_STATE_OPEN || - base_chan->state == CHANNEL_STATE_MAINT || - base_chan->state == CHANNEL_STATE_CLOSING); + tor_assert(CHANNEL_IS_OPENING(base_chan) || + CHANNEL_IS_OPEN(base_chan) || + CHANNEL_IS_MAINT(base_chan) || + CHANNEL_IS_CLOSING(base_chan)); /* Did we just go to state open? */ if (state == OR_CONN_STATE_OPEN) { @@ -872,7 +872,7 @@ channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, * Not open, so from CHANNEL_STATE_OPEN we go to CHANNEL_STATE_MAINT, * otherwise no change. */ - if (base_chan->state == CHANNEL_STATE_OPEN) { + if (CHANNEL_IS_OPEN(base_chan)) { channel_change_state(base_chan, CHANNEL_STATE_MAINT); } }

1 0

[tor/master] Using channel state lookup macros in circuitbias.c.
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit 5a7dd44d6e0996f8dec376f049551fd10b4b6b6c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 21:12:47 2014 +0200 Using channel state lookup macros in circuitbias.c. --- src/or/circpathbias.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c index a6858a3..e5e3326 100644 --- a/src/or/circpathbias.c +++ b/src/or/circpathbias.c @@ -768,8 +768,8 @@ pathbias_send_usable_probe(circuit_t *circ) /* Can't probe if the channel isn't open */ if (circ->n_chan == NULL || - (circ->n_chan->state != CHANNEL_STATE_OPEN - && circ->n_chan->state != CHANNEL_STATE_MAINT)) { + (!CHANNEL_IS_OPEN(circ->n_chan) + && !CHANNEL_IS_MAINT(circ->n_chan))) { log_info(LD_CIRC, "Skipping pathbias probe for circuit %d: Channel is not open.", ocirc->global_identifier);

1 0

[tor/master] Using CHANNEL_FINISHED macro in connection.c
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit fc7d5e598bb2494bd121e73038cf29854a23d9d5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 21:34:41 2014 +0200 Using CHANNEL_FINISHED macro in connection.c --- src/or/connection.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index c9c371c..16b359d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -544,8 +544,7 @@ connection_free_(connection_t *conn) or_conn, TLS_CHAN_TO_BASE(or_conn->chan), U64_PRINTF_ARG( TLS_CHAN_TO_BASE(or_conn->chan)->global_identifier)); - if (!(TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_CLOSED || - TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_ERROR)) { + if (!CHANNEL_FINISHED(TLS_CHAN_TO_BASE(or_conn->chan))) { channel_close_for_error(TLS_CHAN_TO_BASE(or_conn->chan)); }

1 0

[tor/master] Using channel state lookup macros in circuitlist.c.
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit 551221bad6a852750a9f0bd0e4e521192dbc7999 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 21:27:15 2014 +0200 Using channel state lookup macros in circuitlist.c. --- src/or/circuitlist.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index c7287f9..fad79c1 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1752,9 +1752,7 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line, if (circ->n_chan) { circuit_clear_cell_queue(circ, circ->n_chan); /* Only send destroy if the channel isn't closing anyway */ - if (!(circ->n_chan->state == CHANNEL_STATE_CLOSING || - circ->n_chan->state == CHANNEL_STATE_CLOSED || - circ->n_chan->state == CHANNEL_STATE_ERROR)) { + if (!CHANNEL_CONDEMNED(circ->n_chan)) { channel_send_destroy(circ->n_circ_id, circ->n_chan, reason); } circuitmux_detach_circuit(circ->n_chan->cmux, circ); @@ -1786,9 +1784,7 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line, if (or_circ->p_chan) { circuit_clear_cell_queue(circ, or_circ->p_chan); /* Only send destroy if the channel isn't closing anyway */ - if (!(or_circ->p_chan->state == CHANNEL_STATE_CLOSING || - or_circ->p_chan->state == CHANNEL_STATE_CLOSED || - or_circ->p_chan->state == CHANNEL_STATE_ERROR)) { + if (!CHANNEL_CONDEMNED(or_circ->p_chan)) { channel_send_destroy(or_circ->p_circ_id, or_circ->p_chan, reason); } circuitmux_detach_circuit(or_circ->p_chan->cmux, circ);

1 0

[tor/master] Using CHANNEL_IS_OPEN macro in circuitbuild.c
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit 74731607651998bc6bdce9559c3352d57c60008c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 21:17:15 2014 +0200 Using CHANNEL_IS_OPEN macro in circuitbuild.c --- src/or/circuitbuild.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 42c4870..847a0c0 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -671,7 +671,7 @@ circuit_deliver_create_cell(circuit_t *circ, const create_cell_t *create_cell, if (CIRCUIT_IS_ORIGIN(circ)) { /* Update began timestamp for circuits starting their first hop */ if (TO_ORIGIN_CIRCUIT(circ)->cpath->state == CPATH_STATE_CLOSED) { - if (circ->n_chan->state != CHANNEL_STATE_OPEN) { + if (!CHANNEL_IS_OPEN(circ->n_chan)) { log_warn(LD_CIRC, "Got first hop for a circuit without an opened channel. " "State: %s.", channel_state_to_string(circ->n_chan->state));

1 0

[tor/master] Using channel state lookup macros in connection_or.c.
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit f6cc4d35b0e79a675b56bdb3d919a6e5c6e840b3 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 21:42:46 2014 +0200 Using channel state lookup macros in connection_or.c. --- src/or/connection_or.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 29b8804..e26e0bc 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1144,9 +1144,7 @@ connection_or_notify_error(or_connection_t *conn, if (conn->chan) { chan = TLS_CHAN_TO_BASE(conn->chan); /* Don't transition if we're already in closing, closed or error */ - if (!(chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR)) { + if (!CHANNEL_CONDEMNED(chan)) { channel_close_for_error(chan); } } @@ -1305,9 +1303,7 @@ connection_or_close_normally(or_connection_t *orconn, int flush) if (orconn->chan) { chan = TLS_CHAN_TO_BASE(orconn->chan); /* Don't transition if we're already in closing, closed or error */ - if (!(chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR)) { + if (!CHANNEL_CONDEMNED(chan)) { channel_close_from_lower_layer(chan); } } @@ -1328,9 +1324,7 @@ connection_or_close_for_error(or_connection_t *orconn, int flush) if (orconn->chan) { chan = TLS_CHAN_TO_BASE(orconn->chan); /* Don't transition if we're already in closing, closed or error */ - if (!(chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR)) { + if (!CHANNEL_CONDEMNED(chan)) { channel_close_for_error(chan); } }

1 0

[tor/master] Merge branch 'ticket7356_squashed'
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit 1c05dfd0b6ae9303d1f815a4d610655f32c0cc50 Merge: 647a90b af1469b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 21 14:48:53 2014 -0500 Merge branch 'ticket7356_squashed' changes/bug7356 | 5 ++ src/or/channel.c | 119 +++++++++++++++++------------------------------- src/or/channel.h | 33 ++++++++++++++ src/or/channeltls.c | 14 +++--- src/or/circpathbias.c | 4 +- src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 8 +--- src/or/connection.c | 3 +- src/or/connection_or.c | 12 ++--- 9 files changed, 95 insertions(+), 105 deletions(-) diff --cc src/or/channel.c index 5ee0748,5651bb4..4826bdd --- a/src/or/channel.c +++ b/src/or/channel.c @@@ -1772,12 -1664,9 +1743,12 @@@ channel_write_cell_queue_entry(channel_ } } + /* For statistical purposes, figure out how big this cell is */ + cell_bytes = channel_get_cell_queue_entry_size(chan, q); + /* Can we send it right out? If so, try */ if (TOR_SIMPLEQ_EMPTY(&chan->outgoing_queue) && - chan->state == CHANNEL_STATE_OPEN) { + CHANNEL_IS_OPEN(chan)) { /* Pick the right write function for this cell type and save the result */ switch (q->type) { case CELL_QUEUE_FIXED: @@@ -1826,16 -1708,8 +1797,16 @@@ */ tmp = cell_queue_entry_dup(q); TOR_SIMPLEQ_INSERT_TAIL(&chan->outgoing_queue, tmp, next); + /* Update global counters */ + ++n_channel_cells_queued; + ++n_channel_cells_in_queues; + n_channel_bytes_queued += cell_bytes; + n_channel_bytes_in_queues += cell_bytes; + channel_assert_counter_consistency(); + /* Update channel queue size */ + chan->bytes_in_queue += cell_bytes; /* Try to process the queue? */ - if (chan->state == CHANNEL_STATE_OPEN) channel_flush_cells(chan); + if (CHANNEL_IS_OPEN(chan)) channel_flush_cells(chan); } } @@@ -2302,15 -2098,11 +2273,15 @@@ channel_flush_some_cells_from_outgoing_ if (!unlimited && num_cells <= flushed) return 0; /* If we aren't in CHANNEL_STATE_OPEN, nothing goes through */ - if (chan->state == CHANNEL_STATE_OPEN) { + if (CHANNEL_IS_OPEN(chan)) { while ((unlimited || num_cells > flushed) && NULL != (q = TOR_SIMPLEQ_FIRST(&chan->outgoing_queue))) { + free_q = 0; + handed_off = 0; if (1) { + /* Figure out how big it is for statistical purposes */ + cell_size = channel_get_cell_queue_entry_size(chan, q); /* * Okay, we have a good queue entry, try to give it to the lower * layer.

1 0

[tor/master] Changes file for 7356
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit ed0b46e71116e510bb24eb2a2b9af81cdb972f62 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 21:52:50 2014 +0200 Changes file for 7356 --- changes/bug7356 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug7356 b/changes/bug7356 new file mode 100644 index 0000000..be31d1f --- /dev/null +++ b/changes/bug7356 @@ -0,0 +1,5 @@ + o Code simplifications and refactoring: + - Add inline functions and convenience macros for quick lookup of + state component of channel_t structure. Refactor various parts of + codebase to use convenience macros instead of checking state + member of channel_t directly. Fixes issue 7356.

1 0

[tor/master] Fixing mistake in comment.
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit af1469b9a3298382de39dca87b02410e829399a2 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Dec 16 20:52:05 2014 +0200 Fixing mistake in comment. --- src/or/channeltls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 987dd9b..47f5d34 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -852,8 +852,8 @@ channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, base_chan = TLS_CHAN_TO_BASE(chan); - /* Make sure the base connection state makes sense - shouldn't be error, - * closed or listening. */ + /* Make sure the base connection state makes sense - shouldn't be error + * or closed. */ tor_assert(CHANNEL_IS_OPENING(base_chan) || CHANNEL_IS_OPEN(base_chan) ||

1 0

[tor/master] Fix transparent proxy checks to allow OS X to use ipfw or pf
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit d93516c445cfb25904da3d86fd6096cce1179b59 Author: teor <teor2345(a)gmail.com> Date: Sat Dec 20 22:27:21 2014 +1100 Fix transparent proxy checks to allow OS X to use ipfw or pf OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent proxy option checks to allow for both ipfw and pf on OS X. Fixes bug 14002. --- changes/bug14002-osx-transproxy-ipfw-pf | 4 ++++ src/or/config.c | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/changes/bug14002-osx-transproxy-ipfw-pf b/changes/bug14002-osx-transproxy-ipfw-pf new file mode 100644 index 0000000..a08bbdc --- /dev/null +++ b/changes/bug14002-osx-transproxy-ipfw-pf @@ -0,0 +1,4 @@ + o Minor bugfixes: + - OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent + proxy option checks to allow for both ipfw and pf on OS X. + Fixes bug 14002. diff --git a/src/or/config.c b/src/or/config.c index 28f1df0..da756f6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2597,20 +2597,24 @@ options_validate(or_options_t *old_options, or_options_t *options, if (!strcasecmp(options->TransProxyType, "default")) { options->TransProxyType_parsed = TPT_DEFAULT; } else if (!strcasecmp(options->TransProxyType, "pf-divert")) { -#ifndef __OpenBSD__ - REJECT("pf-divert is a OpenBSD-specific feature."); +#if !defined(__OpenBSD__) && !defined( DARWIN ) + /* Later versions of OS X have pf */ + REJECT("pf-divert is a OpenBSD-specific " + "and OS X/Darwin-specific feature."); #else options->TransProxyType_parsed = TPT_PF_DIVERT; #endif } else if (!strcasecmp(options->TransProxyType, "tproxy")) { -#ifndef __linux__ +#if !defined(__linux__) REJECT("TPROXY is a Linux-specific feature."); #else options->TransProxyType_parsed = TPT_TPROXY; #endif } else if (!strcasecmp(options->TransProxyType, "ipfw")) { -#ifndef __FreeBSD__ - REJECT("ipfw is a FreeBSD-specific feature."); +#if !defined(__FreeBSD__) && !defined( DARWIN ) + /* Earlier versions of OS X have ipfw */ + REJECT("ipfw is a FreeBSD-specific" + "and OS X/Darwin-specific feature."); #else options->TransProxyType_parsed = TPT_IPFW; #endif

1 0