- tor-commits - lists.torproject.org

[metrics-db/master] Don't overwrite past bridge network statuses unless we have to.
by karsten＠torproject.org 13 Jan '12

13 Jan '12

commit b63021a84f9dc43efe62cfb14c704aeaeec150dc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 13 12:27:11 2012 +0100 Don't overwrite past bridge network statuses unless we have to. In theory, overwriting files with the same content doesn't hurt. But it makes it harder to identify only the files changed in the past 3 days for the rsync/ directory. --- .../ernie/db/SanitizedBridgesWriter.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 520fd1f..a3ead19 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -982,6 +982,13 @@ public class SanitizedBridgesWriter { return; } + /* Check if we need to overwrite the status file on disk. */ + if (new String(data).equals(scrubbed)) { + this.logger.fine("The bridge network status published " + published + + " has not changed, so we're not attempting to rewrite it."); + return; + } + try { /* Determine file name. */ String syear = published.substring(0, 4);

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 13 Jan '12

13 Jan '12

commit 39960cfbe2b1353316b2043bb193c942fc0db0f2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 13 09:45:08 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 1 + values-ca/strings.xml | 1 + values-de/strings.xml | 1 + values-el/strings.xml | 1 + values-es/strings.xml | 1 + values-eu/strings.xml | 1 + values-fa/strings.xml | 1 + values-fr/strings.xml | 1 + values-hu/strings.xml | 1 + values-it/strings.xml | 1 + values-mk/strings.xml | 1 + values-nb/strings.xml | 1 + values-nl/strings.xml | 1 + values-pl/strings.xml | 1 + values-pt/strings.xml | 1 + values-ru/strings.xml | 1 + values-sv/strings.xml | 1 + values-zh/strings.xml | 1 + values/strings.xml | 5 +++-- 19 files changed, 21 insertions(+), 2 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 67653f9..5be5f99 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -187,6 +187,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index 4bd44cb..e13a6ed 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -187,6 +187,7 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-de/strings.xml b/values-de/strings.xml index 680b807..ee0977b 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -188,6 +188,7 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version"></string> <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string> <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string> <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string> diff --git a/values-el/strings.xml b/values-el/strings.xml index f1d01c5..401482d 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -177,6 +177,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-es/strings.xml b/values-es/strings.xml index 4017f77..093878d 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -187,6 +187,7 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="libevent_version">Libevent v1.4.13: http://www.monkey.org/ ~ provos / libevent /</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version"></string> <string name="hidden_service_request">Una aplicación esta intentando abrir el siguiente puerto %S a la red Tor. Esto es seguro, si confía en la aplicación, que lo esta intentando abrir.</string> <string name="found_existing_tor_process">Se ha encontrado proceso activo de Tor ...</string> <string name="something_bad_happened">Algo ha ocurrido con el normal funcionamiento de la aplicacion. Compruebe el log de registro del sistema Tor</string> diff --git a/values-eu/strings.xml b/values-eu/strings.xml index 54b38f0..f80e370 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -177,6 +177,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index c2d50b5..b84edf5 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -177,6 +177,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 75d7de7..56e157c 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -182,6 +182,7 @@ <string name="libevent_version">Libevent v1.4.13 : http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12 : http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7 : http://www.netfilter.org</string> + <string name="openssl_version"></string> <string name="hidden_service_request">Une application veut ouvrir le port %S du serveur caché sur le réseau Tor. C\'est sécuritaire si vous faites confiance à l\'application.</string> <string name="found_existing_tor_process">trouvé un processus existant de Tor ...</string> <string name="something_bad_happened">Quelque chose d\'incorrect s\'est passé. Vérifiez le journal</string> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 22b0526..46d1e7a 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -181,6 +181,7 @@ <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version"></string> <string name="hidden_service_request">Egy alkalmazás a %S rejtett szerver portot próbálja megnyitni. Ez biztonságos, ha megbízik az alkalmazásban.</string> <string name="found_existing_tor_process">létező Tor folyamat találva...</string> <string name="something_bad_happened">Valami rossz történt. Nézze meg a log fájlt.</string> diff --git a/values-it/strings.xml b/values-it/strings.xml index 4eb49e8..bf48d3c 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -182,6 +182,7 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 8fc7d5f..f27f24f 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -181,6 +181,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 36911fb..217e5f6 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -177,6 +177,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 493f1e3..fb5ed30 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -187,6 +187,7 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version"></string> <string name="hidden_service_request">Een app wil hidden service poort %S openen naar het Tor netwerk. Dit is veilig als je de app vertrouwd.</string> <string name="found_existing_tor_process">bestaand Tor proces gevonden...</string> <string name="something_bad_happened">Er is iets slechts gebeurt. Controleer de log</string> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index ca014d9..98cdcb6 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -181,6 +181,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index e8fe84f..e06ca97 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -177,6 +177,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index 5c32868..acadd9a 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -181,6 +181,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index f7bea6e..eea56c4 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -177,6 +177,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index b603e22..3e64485 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -180,6 +180,7 @@ <string name="libevent_version"></string> <string name="privoxy_version"></string> <string name="iptables_version"></string> + <string name="openssl_version"></string> <string name="hidden_service_request"></string> <string name="found_existing_tor_process"></string> <string name="something_bad_happened"></string> diff --git a/values/strings.xml b/values/strings.xml index 57818fc..d4bd0ef 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -92,7 +92,7 @@ <string name="wizard_permissions_title">Permissions</string> <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> - <string name="wizard_permissions_no_root_msg">Your device is running in standard mode, and does not support root or \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> + <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> @@ -177,10 +177,11 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string> + <string name="tor_version">Tor v0.2.3.10-alpha: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string>

1 0

[metrics-web/master] Remove statusentry indices.
by karsten＠torproject.org 13 Jan '12

13 Jan '12

commit 4a4f070c7de19b3266988f74ec9f16431bc717aa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 13 09:03:25 2012 +0100 Remove statusentry indices. Now that we partitioned the statusentry table, we should only have indices on the partitions, not on the parent table. --- db/tordir.sql | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index 6d3b617..7ae0afe 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -168,16 +168,6 @@ CREATE TABLE connbidirect ( CONSTRAINT connbidirect_pkey PRIMARY KEY (source, statsend) ); --- Create the various indexes we need for searching relays -CREATE INDEX statusentry_address ON statusentry (address); -CREATE INDEX statusentry_fingerprint ON statusentry (fingerprint); -CREATE INDEX statusentry_nickname ON statusentry (LOWER(nickname)); -CREATE INDEX statusentry_validafter ON statusentry (validafter); - --- And create an index that we use for precalculating statistics -CREATE INDEX statusentry_descriptor ON statusentry (descriptor); -CREATE INDEX statusentry_validafter_date ON statusentry (DATE(validafter)); - -- TABLE network_size CREATE TABLE network_size ( date DATE NOT NULL,

1 0

[metrics-web/master] Tell users when we don't have enough data to answer their request.
by karsten＠torproject.org 13 Jan '12

13 Jan '12

commit 7314596e198da7581eed449c80d688195b1ed5df Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 13 08:36:18 2012 +0100 Tell users when we don't have enough data to answer their request. Fixes #4895. --- .../torproject/ernie/web/RelaySearchServlet.java | 35 ++++++++++++++++++++ web/WEB-INF/relay-search.jsp | 3 ++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index 512e25f..fe7e62b 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -52,6 +52,8 @@ public class RelaySearchServlet extends HttpServlet { private SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + private long minValidAfterMillis; + private DataSource ds; private Logger logger; @@ -74,6 +76,27 @@ public class RelaySearchServlet extends HttpServlet { } catch (NamingException e) { this.logger.log(Level.WARNING, "Could not look up data source", e); } + + /* Look up first consensus in the database. */ + try { + long requestedConnection = System.currentTimeMillis(); + Connection conn = this.ds.getConnection(); + String query = "SELECT MIN(validafter) AS first FROM consensus"; + Statement statement = conn.createStatement(); + ResultSet rs = statement.executeQuery(query); + if (rs.next()) { + this.minValidAfterMillis = rs.getTimestamp(1).getTime(); + } + rs.close(); + statement.close(); + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + this.logger.log(Level.WARNING, "Could not look up first consensus " + + "valid-after time in the database.", e); + } } public void doGet(HttpServletRequest request, @@ -304,6 +327,12 @@ public class RelaySearchServlet extends HttpServlet { boolean addOr = false; timeIntervalBuilder.append("AND ("); for (long searchTimestamp : searchDayTimestamps) { + if (searchTimestamp < this.minValidAfterMillis) { + request.setAttribute("outsideInterval", "Returned search " + + "results may be incomplete, as our data only dates back " + + "to " + dateTimeFormat.format(this.minValidAfterMillis) + + ". Older archives are not available."); + } timeIntervalBuilder.append((addOr ? "OR " : "") + "(validafter >= '" + dateTimeFormat.format(searchTimestamp) + "' AND " @@ -312,6 +341,12 @@ public class RelaySearchServlet extends HttpServlet { addOr = true; } for (long searchTimestamp : searchMonthTimestamps) { + if (searchTimestamp < this.minValidAfterMillis) { + request.setAttribute("outsideInterval", "Returned search " + + "results may be incomplete, as our data only dates back " + + "to " + dateTimeFormat.format(this.minValidAfterMillis) + + ". Older archives are not available."); + } Calendar firstOfNextMonth = Calendar.getInstance( TimeZone.getTimeZone("UTC")); firstOfNextMonth.setTimeInMillis(searchTimestamp); diff --git a/web/WEB-INF/relay-search.jsp b/web/WEB-INF/relay-search.jsp index 260b7dc..b90938a 100644 --- a/web/WEB-INF/relay-search.jsp +++ b/web/WEB-INF/relay-search.jsp @@ -39,6 +39,9 @@ (e.g., "80.190"). You can also provide at most three months or days in ISO 8601 format (e.g., "2010-09" or "2010-09-17"). </c:if> + <c:if test="${not empty outsideInterval}"> + ${outsideInterval} + </c:if> <c:if test="${not empty searchNotice}"> ${searchNotice} </c:if>

1 0

r25306: {website} update android orbot version. (website/trunk/include)
by Andrew Lewman 13 Jan '12

13 Jan '12

Author: phobos Date: 2012-01-13 00:30:29 +0000 (Fri, 13 Jan 2012) New Revision: 25306 Modified: website/trunk/include/versions.wmi Log: update android orbot version. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-01-12 16:23:59 UTC (rev 25305) +++ website/trunk/include/versions.wmi 2012-01-13 00:30:29 UTC (rev 25306) @@ -54,11 +54,11 @@ <define-tag version-vidalia-stable whitespace=delete>0.2.15</define-tag> -<define-tag version-androidbundle-tor whitespace=delete>0.2.3.7-alpha</define-tag> -<define-tag version-androidbundle-orbot whitespace=delete>1.0.6</define-tag> +<define-tag version-androidbundle-tor whitespace=delete>0.2.3.10-alpha</define-tag> +<define-tag version-androidbundle-orbot whitespace=delete>1.0.7-RC1</define-tag> <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag> <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> -<define-tag package-androidbundle-alpha whitespace=delete>dist/android/Orbot-<version-androidbundle-orbot>-Tor-<version-androidbundle-tor>-FINAL.apk</define-tag> +<define-tag package-androidbundle-alpha whitespace=delete>dist/android/Orbot-<version-androidbundle-orbot>-Tor-<version-androidbundle-tor>.apk</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag>

1 0

[orbot/master] updated core project files and build numbers
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 8b6133ff264e0a1c1315c189453aabd4cc80cf7a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:22:35 2012 -0500 updated core project files and build numbers --- .classpath | 2 +- AndroidManifest.xml | 2 +- default.properties | 14 -------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.classpath b/.classpath index 1182977..9a448b2 100644 --- a/.classpath +++ b/.classpath @@ -5,5 +5,5 @@ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="lib" path="libs/jtorctrl.jar"/> <classpathentry kind="lib" path="libs/whispercore.jar"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 051c847..c6ce88e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.7-ALPHA" android:versionCode="21"> + package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-ALPHA" android:versionCode="22"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> diff --git a/default.properties b/default.properties deleted file mode 100644 index 08ad68f..0000000 --- a/default.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your -# project structure. - -# Indicates whether an apk should be generated for each density. -split.density=false -# Project target. -target=android-4 -apk-configurations=

1 0

[orbot/master] small changes to naming of iptables methods
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 2b1969fea075de5a3441c5394d1b6d0b61a60be3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:23:54 2012 -0500 small changes to naming of iptables methods --- .../android/service/TorBinaryInstaller.java | 18 ++++++++++++++++-- src/org/torproject/android/service/TorService.java | 8 ++++---- .../android/service/TorServiceUtils.java | 4 ++-- .../torproject/android/service/TorTransProxy.java | 9 ++++----- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index a3b1995..ff1e720 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -10,6 +10,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -65,7 +66,20 @@ public class TorBinaryInstaller implements TorServiceConstants { return true; } - + private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException + { + + DataOutputStream out = new DataOutputStream(new FileOutputStream(file)); + InputStream is = new GZIPInputStream(ctx.getAssets().open(asset)); + + byte buf[] = new byte[8172]; + int len; + while ((len = is.read(buf)) > 0) { + out.write(buf, 0, len); + } + out.close(); + is.close(); + } /* * Write the inputstream contents to the file */ @@ -97,7 +111,7 @@ public class TorBinaryInstaller implements TorServiceConstants { } stmOut.close(); - + stm.close(); return true; diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 25d415b..df2990d 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -275,7 +275,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); sendCallbackStatusMessage(getString(R.string.status_disabled)); - clearTransparentProxy(); + disableTransparentProxy(); } catch (Exception e) { @@ -597,7 +597,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst * * the idea is that if Tor is off then transproxy is off */ - private boolean clearTransparentProxy () throws Exception + private boolean disableTransparentProxy () throws Exception { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -609,7 +609,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst TorService.logMessage ("Clearing TransProxy rules"); - TorTransProxy.purgeIptables(this); + TorTransProxy.flushIptables(this); showAlert(getString(R.string.status), getString(R.string.transproxy_rules_cleared)); @@ -1095,7 +1095,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - clearTransparentProxy(); + disableTransparentProxy(); enableTransparentProxy(); } catch (Exception e) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 51d6378..fa27c58 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -24,13 +24,13 @@ public class TorServiceUtils implements TorServiceConstants { try { // Check if Superuser.apk exists - File file = new File("/system/app/Superuser.apk"); + //File file = new File("/system/app/Superuser.apk"); //Check for 'su' binary String[] cmd = {"which su"}; int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); - if (file.exists() && exitCode == 0) { + if (exitCode == 0) { TorService.logMessage("Can acquire root permissions"); return true; diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 73dac7c..bf5fee2 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -13,7 +13,7 @@ public class TorTransProxy implements TorServiceConstants { private final static String TAG = TorConstants.TAG; - public static int purgeIptables(Context context) throws Exception { + public static int flushIptables(Context context) throws Exception { String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); @@ -21,7 +21,6 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - script.append(ipTablesPath); script.append(" -t nat"); @@ -177,7 +176,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); //build up array of shell cmds to execute under one root context for (int i = 0; i < apps.length; i++) @@ -276,7 +275,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); //TCP //iptables -t nat -A PREROUTING -i eth0 -p tcp --dport $srcPortNumber -j REDIRECT --to-port $dstPortNumbe @@ -375,7 +374,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - purgeIptables(context); + flushIptables(context); int torUid = context.getApplicationInfo().uid;

1 0

[orbot/master] removed tor and geoip binary
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit de440d398ea35b8f48db94c289bd691e9f23cbd2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:21:11 2012 -0500 removed tor and geoip binary --- res/raw/geoip.zip | Bin 966562 -> 0 bytes res/raw/tor.zip | Bin 1553272 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/geoip.zip b/res/raw/geoip.zip deleted file mode 100644 index e3f1d8f..0000000 Binary files a/res/raw/geoip.zip and /dev/null differ diff --git a/res/raw/tor.zip b/res/raw/tor.zip deleted file mode 100644 index 6ad8f33..0000000 Binary files a/res/raw/tor.zip and /dev/null differ

1 0

[orbot/master] updating project files
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit ce5a1c7d7f612ee5e432f30ed52602d543c9202a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:56:25 2012 -0500 updating project files --- AndroidManifest.xml | 2 -- project.properties | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c6ce88e..c8f2801 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -60,6 +60,4 @@ <uses-sdk android:minSdkVersion="4"/> - - </manifest> diff --git a/project.properties b/project.properties new file mode 100644 index 0000000..1960895 --- /dev/null +++ b/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Indicates whether an apk should be generated for each density. +split.density=false +# Project target. +target=android-4 +apk-configurations=

1 0

[orbot/master] removing build files to see if that fixes CI
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 70d805d177ec76b93fd1460356e0b85f2d0852af Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 01:04:34 2012 -0500 removing build files to see if that fixes CI --- build.xml | 85 ---------------------------------------------------- project.properties | 14 -------- 2 files changed, 0 insertions(+), 99 deletions(-) diff --git a/build.xml b/build.xml deleted file mode 100644 index 8a95dfb..0000000 --- a/build.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="Orbot" default="help"> - -  - <loadproperties srcFile="local.properties" /> - -  - <property file="ant.properties" /> - -  - <loadproperties srcFile="project.properties" /> - -  - <fail - message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'" - unless="sdk.dir" - /> - - - - - -  -  - <import file="${sdk.dir}/tools/ant/build.xml" /> - -</project> diff --git a/project.properties b/project.properties deleted file mode 100644 index 1960895..0000000 --- a/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Indicates whether an apk should be generated for each density. -split.density=false -# Project target. -target=android-4 -apk-configurations=

1 0