- tor-commits - lists.torproject.org

[tor/master] Fix tabs in config.c
by nickm＠torproject.org 04 Oct '12

04 Oct '12

commit 91b18b12d9796d4a71854dd7465c32ee8d500629 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 4 10:34:46 2012 -0400 Fix tabs in config.c --- src/or/config.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index c04f2aa..bac2b2e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2553,10 +2553,10 @@ options_validate(or_options_t *old_options, or_options_t *options, if (!(options->UseEntryGuards) && (options->RendConfigLines != NULL)) { log_warn(LD_CONFIG, - "UseEntryGuards is disabled, but you have configured one or more " - "hidden services on this Tor instance. Your hidden services " - "will be very easy to locate using a well-known attack -- see " - "http://freehaven.net/anonbib/#hs-attack06 for details."); + "UseEntryGuards is disabled, but you have configured one or more " + "hidden services on this Tor instance. Your hidden services " + "will be very easy to locate using a well-known attack -- see " + "http://freehaven.net/anonbib/#hs-attack06 for details."); } if (!(options->LearnCircuitBuildTimeout) &&

1 0

[tor/master] Set (and reset) node_t.ipv6_preferred for bridges based on Bridge lines.
by nickm＠torproject.org 04 Oct '12

04 Oct '12

commit 9c5ba489d32f8a95c784e00308955d550740c94a Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Sep 19 17:12:22 2012 +0200 Set (and reset) node_t.ipv6_preferred for bridges based on Bridge lines. We used to set it only when ClientPreferIPv6ORPort was set which seems wrong. Fixes one part of #6757. --- src/or/circuitbuild.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 09eef64..a92e56b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5654,15 +5654,9 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) } } - /* Mark bridge as preferably connected to over IPv6 if its IPv6 - address is in a Bridge line and ClientPreferIPv6ORPort is - set. Unless both is true, a potential IPv6 OR port of this - bridge won't get selected. - - XXX ipv6_preferred is never reset (#6757) */ - if (get_options()->ClientPreferIPv6ORPort == 1 && - tor_addr_family(&bridge->addr) == AF_INET6) - node->ipv6_preferred = 1; + /* Mark which address to use based on which bridge_t we got. */ + node->ipv6_preferred = (tor_addr_family(&bridge->addr) == AF_INET6 && + !tor_addr_is_null(&node->ri->ipv6_addr)); /* XXXipv6 we lack support for falling back to another address for the same relay, warn the user */

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 04 Oct '12

04 Oct '12

commit d9847165e0f8b6528acdf3e7246c454c3c4b1597 Merge: 10b43f4 b1971d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 4 10:05:55 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug7022 | 3 +++ src/or/circuitbuild.c | 27 ++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --cc src/or/circuitbuild.c index be97b7c,a7d370c..230dd81 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@@ -2664,9 -2653,9 +2664,9 @@@ pathbias_count_first_hop(origin_circuit !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&first_hop_notice_limit, approx_time()))) { - log_info(LD_BUG, + log_notice(LD_BUG, "One-hop circuit has length %d. Path state is %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circ->build_state->desired_path_len, pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), @@@ -2782,9 -2768,9 +2787,9 @@@ pathbias_count_success(origin_circuit_ !circ->build_state->onehop_tunnel) { if ((rate_msg = rate_limit_log(&success_notice_limit, approx_time()))) { - log_info(LD_BUG, + log_notice(LD_BUG, "One-hop circuit has length %d. Path state is %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circ->build_state->desired_path_len, pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose),

1 0

[tor/master] properly free the return values of rate_limit_log()
by nickm＠torproject.org 04 Oct '12

04 Oct '12

commit b1971d89c8776f06ddce7f44d98dde79c3dfc223 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 3 13:15:27 2012 -0400 properly free the return values of rate_limit_log() resolves bug 7022. --- changes/bug7022 | 3 +++ src/or/circuitbuild.c | 27 ++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/changes/bug7022 b/changes/bug7022 new file mode 100644 index 0000000..10ac354 --- /dev/null +++ b/changes/bug7022 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix memory leaks whenever we logged any message about the "path + bias" detection. Fixes bug 7022; bugfix on 0.2.3.21-rc. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index ffc7b5e..a7d370c 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2655,12 +2655,13 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "One-hop circuit has length %d. Path state is %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circ->build_state->desired_path_len, pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } tor_fragile_assert(); } @@ -2674,11 +2675,12 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Opened circuit is in strange path state %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } @@ -2701,11 +2703,12 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Unopened circuit has strange path state %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } } else { @@ -2713,10 +2716,11 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Unopened circuit has no known guard. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } } @@ -2727,12 +2731,13 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "A %s circuit is in cpath state %d (opened: %d). " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circ->cpath->state, circ->has_opened, circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } } @@ -2765,12 +2770,13 @@ pathbias_count_success(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "One-hop circuit has length %d. Path state is %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circ->build_state->desired_path_len, pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } tor_fragile_assert(); } @@ -2795,11 +2801,12 @@ pathbias_count_success(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Succeeded circuit is in strange path state %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } @@ -2814,10 +2821,11 @@ pathbias_count_success(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Completed circuit has no known guard. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } } else { @@ -2826,11 +2834,12 @@ pathbias_count_success(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Opened circuit is in strange path state %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } }

1 0

[tor/maint-0.2.3] properly free the return values of rate_limit_log()
by nickm＠torproject.org 04 Oct '12

04 Oct '12

commit b1971d89c8776f06ddce7f44d98dde79c3dfc223 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 3 13:15:27 2012 -0400 properly free the return values of rate_limit_log() resolves bug 7022. --- changes/bug7022 | 3 +++ src/or/circuitbuild.c | 27 ++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/changes/bug7022 b/changes/bug7022 new file mode 100644 index 0000000..10ac354 --- /dev/null +++ b/changes/bug7022 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix memory leaks whenever we logged any message about the "path + bias" detection. Fixes bug 7022; bugfix on 0.2.3.21-rc. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index ffc7b5e..a7d370c 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2655,12 +2655,13 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "One-hop circuit has length %d. Path state is %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circ->build_state->desired_path_len, pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } tor_fragile_assert(); } @@ -2674,11 +2675,12 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Opened circuit is in strange path state %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } @@ -2701,11 +2703,12 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Unopened circuit has strange path state %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } } else { @@ -2713,10 +2716,11 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Unopened circuit has no known guard. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } } @@ -2727,12 +2731,13 @@ pathbias_count_first_hop(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "A %s circuit is in cpath state %d (opened: %d). " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circ->cpath->state, circ->has_opened, circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } } @@ -2765,12 +2770,13 @@ pathbias_count_success(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "One-hop circuit has length %d. Path state is %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circ->build_state->desired_path_len, pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } tor_fragile_assert(); } @@ -2795,11 +2801,12 @@ pathbias_count_success(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Succeeded circuit is in strange path state %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } @@ -2814,10 +2821,11 @@ pathbias_count_success(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Completed circuit has no known guard. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } } else { @@ -2826,11 +2834,12 @@ pathbias_count_success(origin_circuit_t *circ) approx_time()))) { log_info(LD_BUG, "Opened circuit is in strange path state %s. " - "Circuit is a %s currently %s. %s", + "Circuit is a %s currently %s.%s", pathbias_state_to_string(circ->path_state), circuit_purpose_to_string(circ->_base.purpose), circuit_state_to_string(circ->_base.state), rate_msg); + tor_free(rate_msg); } } }

1 0

[tor/master] pass the reason from the truncated cell to the controller
by nickm＠torproject.org 04 Oct '12

04 Oct '12

commit 10b43f4c46378c5d08aaba01ee00081c18002a44 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 3 23:56:34 2012 -0400 pass the reason from the truncated cell to the controller (rather than just always declaring that the reason is END_CIRC_REASON_OR_CONN_CLOSED) resolves bug 7039. --- changes/bug7039 | 7 +++++++ src/or/circuitbuild.c | 4 ++-- src/or/circuitbuild.h | 3 ++- src/or/relay.c | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/changes/bug7039 b/changes/bug7039 new file mode 100644 index 0000000..dc5111a --- /dev/null +++ b/changes/bug7039 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - When a Tor client gets a "truncated" relay cell, the first byte of + its payload specifies why the circuit was truncated. We were + ignoring this 'reason' byte when tearing down the circuit, resulting + in the controller not being told why the circuit closed. Now we + pass the reason from the truncated cell to the controller. Bugfix + on 0.1.2.3-alpha; fixes bug 7039. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 09eef64..be97b7c 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2999,7 +2999,7 @@ circuit_finish_handshake(origin_circuit_t *circ, uint8_t reply_type, * just give up: for circ to close, and return 0. */ int -circuit_truncated(origin_circuit_t *circ, crypt_path_t *layer) +circuit_truncated(origin_circuit_t *circ, crypt_path_t *layer, int reason) { // crypt_path_t *victim; // connection_t *stream; @@ -3012,7 +3012,7 @@ circuit_truncated(origin_circuit_t *circ, crypt_path_t *layer) * just give up. */ circuit_mark_for_close(TO_CIRCUIT(circ), - END_CIRC_REASON_FLAG_REMOTE|END_CIRC_REASON_OR_CONN_CLOSED); + END_CIRC_REASON_FLAG_REMOTE|reason); return 0; #if 0 diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index c3905ca..8ec48be 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -32,7 +32,8 @@ int circuit_init_cpath_crypto(crypt_path_t *cpath, const char *key_data, int reverse); int circuit_finish_handshake(origin_circuit_t *circ, uint8_t cell_type, const uint8_t *reply); -int circuit_truncated(origin_circuit_t *circ, crypt_path_t *layer); +int circuit_truncated(origin_circuit_t *circ, crypt_path_t *layer, + int reason); int onionskin_answer(or_circuit_t *circ, uint8_t cell_type, const char *payload, const char *keys); int circuit_all_predicted_ports_handled(time_t now, int *need_uptime, diff --git a/src/or/relay.c b/src/or/relay.c index 54f6634..4a50b71 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1251,7 +1251,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "'truncated' unsupported at non-origin. Dropping."); return 0; } - circuit_truncated(TO_ORIGIN_CIRCUIT(circ), layer_hint); + circuit_truncated(TO_ORIGIN_CIRCUIT(circ), layer_hint, + get_uint8(cell->payload + RELAY_HEADER_SIZE)); return 0; case RELAY_COMMAND_CONNECTED: if (conn) {

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Oct '12

04 Oct '12

commit 7981e08206c7aa96f007e3815456cf0adfece051 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 4 10:15:05 2012 +0000 Update translations for orbot --- values-ru/strings.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/values-ru/strings.xml b/values-ru/strings.xml index 81078b2..aa89294 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -72,6 +72,9 @@ <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string> + <string name="wizard_tips_duckgo">Приложение поисковой системы Duckduckgo</string> + <string name="wizard_tips_firefox">Firefox с дополнением Proxy Mobile (после отдельной установки)</string> + <string name="wizard_tips_twitter">Twitter поддерживает http прокси \"localhost:8118\"</string> <string name="wizard_proxy_help_info">Настройки Прокси</string> <string name="wizard_proxy_help_msg">Если используемое вами приложение для Android поддерживает HTTP или SOCKS прокси, то вы можете настроить его на подключение к Orbot и использование Tor.\n\n\n Значение хоста - 127.0.0.1 или \"localhost\". Для HTTP, номер порта - 8118. Для SOCKS прокси - 9050. По возможности используйте SOCKS4A или SOCKS5.\n\n \n Вы можете узнать больше о работе через прокси на Android, прочитав этот FAQ: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Программа Orbot готова к использованию!</string>

1 0

[orbot/master] fixes log layout for narrow screens
by n8fr8＠torproject.org 04 Oct '12

04 Oct '12

commit a593423e3a99f8ac72cf477ac1bfe426f3f00d42 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 4 11:26:12 2012 +0530 fixes log layout for narrow screens --- res/layout/layout_main.xml | 51 +++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 909d250..1d1bc18 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -76,53 +76,66 @@ android:text="@string/menu_log" ></Button> <RelativeLayout android:id="@+id/trafficRow" - android:gravity="bottom" + android:gravity="top" android:layout_width="fill_parent" android:visibility="invisible" android:layout_height="wrap_content" android:padding="6dp" android:layout_marginTop="6dp" android:background="#ee333333"> + + <RelativeLayout + android:id="@+id/rowTrafficDown" android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + > <TextView android:id="@+id/trafficDownLabel" android:textColor="#FFFFFFFF" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textSize="16sp" + android:layout_alignParentLeft="true" + android:textSize="20sp" android:text="@string/main_layout_download" - android:gravity="center_vertical|center_horizontal" + android:gravity="center_vertical" android:textStyle="bold" /> + <TextView - android:id="@+id/trafficUpLabel" - android:textColor="#FFFFFFFF" + android:id="@+id/trafficDown" + android:textColor="#FF00B627" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:text="@string/main_layout_upload" - android:textSize="16sp" - android:gravity="center_vertical|center_horizontal" + android:layout_alignParentRight="true" + android:textSize="20sp" + android:gravity="center_vertical" android:textStyle="bold" /> + </RelativeLayout> + <RelativeLayout + android:id="@+id/rowTrafficUp" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/rowTrafficDown" + > <TextView - android:id="@+id/trafficDown" - android:textColor="#FF00B627" + android:id="@+id/trafficUpLabel" + android:textColor="#FFFFFFFF" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@+id/trafficDownLabel" + android:layout_alignParentLeft="true" + android:text="@string/main_layout_upload" android:textSize="20sp" - android:gravity="center_vertical|center_horizontal" + android:gravity="center_vertical" android:textStyle="bold" /> <TextView android:id="@+id/trafficUp" android:textColor="#FF00B627" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@+id/trafficUpLabel" + android:layout_alignParentRight="true" android:textSize="20sp" - android:gravity="center_vertical|center_horizontal" + android:gravity="center_vertical" android:textStyle="bold" /> + </RelativeLayout> <TextView android:id="@+id/orbotLog" android:textColor="#FFFFFF" @@ -131,7 +144,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_below="@+id/trafficDown" + android:layout_below="@+id/rowTrafficUp" android:layout_marginTop="10dp" android:textIsSelectable="true" />

1 0

[orbot/master] updated display for setting data transfer UI
by n8fr8＠torproject.org 04 Oct '12

04 Oct '12

commit db128fbc2a708a491c98b0f62f08e1d8be783e0a Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 4 11:27:09 2012 +0530 updated display for setting data transfer UI --- src/org/torproject/android/Orbot.java | 38 +++++++++++++++++--------------- 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index b4040fd..bdad7ae 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -824,27 +824,29 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener String TotalUpload = ""; String TotalDownload = ""; - try { - TotalUpload = mService.getInfo("traffic/written"); - TotalDownload = mService.getInfo("traffic/read"); - - } catch (RemoteException e) { - Log.d(TAG,"Total bandwidth error"+e.getMessage()); - } - - try + if (mService != null) { - downloadText.setText(formatCount(datacount.Download) + " / " + formatTotal(Long.parseLong(TotalDownload))); - uploadText.setText(formatCount(datacount.Upload) + " / " + formatTotal(Long.parseLong(TotalUpload))); + try { + TotalUpload = mService.getInfo("traffic/written"); + TotalDownload = mService.getInfo("traffic/read"); + + } catch (RemoteException e) { + Log.d(TAG,"Total bandwidth error"+e.getMessage()); + } - downloadText.invalidate(); - uploadText.invalidate(); + try + { + downloadText.setText(formatCount(datacount.Download) + " / " + formatTotal(Long.parseLong(TotalDownload))); + uploadText.setText(formatCount(datacount.Upload) + " / " + formatTotal(Long.parseLong(TotalUpload))); + + downloadText.invalidate(); + uploadText.invalidate(); + } + catch (NumberFormatException nfe) + { + //just ignore/swallow + } } - catch (NumberFormatException nfe) - { - //just ignore/swallow - } - break; default:

1 0

[orbot/master] allows UDP packets to localhost for DNS
by n8fr8＠torproject.org 04 Oct '12

04 Oct '12

commit 6e45cab8ee8b221f15899ae101fc9bf90e6e1311 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 4 11:27:17 2012 +0530 allows UDP packets to localhost for DNS --- .../torproject/android/service/TorTransProxy.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 6db0437..bd2c58a 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -309,6 +309,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" || exit\n"); // Reject DNS that is not from Tor (order is important - first matched rule counts!) + /* script.append(ipTablesPath); script.append(modCmd); script.append(" -t filter"); @@ -319,6 +320,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(STANDARD_DNS_PORT); script.append(" -j REJECT"); script.append(" || exit\n"); + */ // Reject all other outbound TCP packets script.append(ipTablesPath); @@ -327,6 +329,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); script.append(" || exit\n"); @@ -337,6 +340,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p udp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); script.append(" || exit\n"); @@ -493,7 +497,7 @@ public class TorTransProxy implements TorServiceConstants { //flushIptables(context); int torUid = context.getApplicationInfo().uid; - + // Set up port redirection script.append(ipTablesPath); script.append(" -" + cmd + " OUTPUT"); @@ -580,20 +584,27 @@ public class TorTransProxy implements TorServiceConstants { } // Reject DNS that is not from Tor (order is important - first matched rule counts!) + /* script.append(ipTablesPath); script.append(" -" + cmd + " OUTPUT"); script.append(" -t filter"); + script.append(" -m owner ! --uid-owner "); + script.append(torUid); script.append(" -p udp"); script.append(" --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REJECT"); script.append(" || exit\n"); + */ // Reject all other outbound TCP packets script.append(ipTablesPath); script.append(" -" + cmd + " OUTPUT"); script.append(" -t filter"); + script.append(" -m owner ! --uid-owner "); + script.append(torUid); script.append(" -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); script.append(" || exit\n"); @@ -601,7 +612,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -" + cmd + " OUTPUT"); script.append(" -t filter"); + script.append(" -m owner ! --uid-owner "); + script.append(torUid); script.append(" -p udp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); script.append(" || exit\n");

1 0