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

[orbot/master] improves in start/stop logic for background service
by n8fr8＠torproject.org 21 Nov '14

21 Nov '14

commit cf218090520fd8ebb362c78814592b75b9857015 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 17 23:28:33 2014 -0500 improves in start/stop logic for background service --- src/org/torproject/android/Orbot.java | 31 +++-- src/org/torproject/android/service/TorService.java | 120 ++++++++++---------- .../android/service/TorServiceConstants.java | 11 ++ .../android/service/TorServiceUtils.java | 2 +- 4 files changed, 92 insertions(+), 72 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index d8e1f6b..d1c111a 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -106,7 +106,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic LocalBroadcastManager.getInstance(this).registerReceiver(mMessageReceiver, new IntentFilter("log")); - startService("init"); + startService(TorServiceConstants.CMD_INIT); } // Our handler for received Intents. This will be called whenever an Intent @@ -154,7 +154,14 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic torService.setAction(action); startService(torService); - + } + + private void stopService () + { + + Intent torService = new Intent(this, TorService.class); + stopService(torService); + } private void doLayout () @@ -412,7 +419,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_start); + stopTor(); + stopService (); } @@ -472,7 +481,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic //not something to tackle in your first iteration, but i thin we can talk about fixing //terminology but also making sure there are clear distinctions in control stopTor(); - + stopService (); //onDestroy(); @@ -855,7 +864,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } else if (request == REQUEST_VPN && response == RESULT_OK) { - startService("vpn"); + startService(TorServiceConstants.CMD_VPN); } } @@ -871,21 +880,21 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } else { - startService("vpn"); + startService(TorServiceConstants.CMD_VPN); } } private boolean flushTransProxy () { - startService("flush"); + startService(TorServiceConstants.CMD_FLUSH); return true; } private boolean updateSettings () { //todo send service command - startService("update"); + startService(TorServiceConstants.CMD_UPDATE); return true; } @@ -1022,7 +1031,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { - startService ("start"); + startService (TorServiceConstants.CMD_START); torStatus = TorServiceConstants.STATUS_CONNECTING; mTxtOrbotLog.setText(""); @@ -1050,7 +1059,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void stopTor () throws RemoteException { - startService ("stop"); + startService (TorServiceConstants.CMD_STOP); torStatus = TorServiceConstants.STATUS_OFF; // mService.setProfile(TorServiceConstants.STATUS_OFF); @@ -1058,6 +1067,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mHandler.sendMessage(msg); + } /* @@ -1080,6 +1090,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { stopTor(); + stopService (); } @@ -1303,7 +1314,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic public void spinOrbot (float direction) { - startService ("newnym"); + startService (TorServiceConstants.CMD_NEWNYM); //mService.newIdentity(); //request a new identity //TODO trigger newnym diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index aeca556..adb6fcf 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -377,31 +377,31 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (action!=null) { - if(action.equals(Intent.ACTION_BOOT_COMPLETED)||action.equals("start")) + if(action.equals(Intent.ACTION_BOOT_COMPLETED)||action.equals(CMD_START)) { setTorProfile(STATUS_ON); } - else if (action.equals("stop")) + else if (action.equals(CMD_STOP)) { setTorProfile(STATUS_OFF); } - else if (action.equals("init")) + else if (action.equals(CMD_INIT)) { sendCallbackStatus(mCurrentStatus); } - else if (action.equals("newnym")) + else if (action.equals(CMD_NEWNYM)) { newIdentity(); } - else if (action.equals("flush")) + else if (action.equals(CMD_FLUSH)) { flushTransparentProxyRules(); } - else if (action.equals("update")) + else if (action.equals(CMD_UPDATE)) { processSettings(); } - else if (action.equals("vpn")) + else if (action.equals(CMD_VPN)) { startVpnService(); } @@ -774,7 +774,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public void startTor () throws Exception + private void startTor () throws Exception { mCurrentStatus = STATUS_CONNECTING; @@ -1074,6 +1074,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst int attempt = 0; + + logNotice( "Waiting for control port..."); + while (conn == null && attempt++ < maxTries) { try @@ -1098,13 +1101,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception ce) { conn = null; - logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); + // logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce); } try { - logNotice("waiting..."); + // logNotice("waiting..."); Thread.sleep(1000); } catch (Exception e){} @@ -1264,7 +1267,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if (fileControlPort.exists()) { - logNotice("Reading control port config file: " + fileControlPort.getCanonicalPath()); + debug("Reading control port config file: " + fileControlPort.getCanonicalPath()); BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControlPort)); String line = bufferedReader.readLine(); @@ -1284,7 +1287,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - logNotice("Control Port config file does not yet exist (waiting for tor): " + fileControlPort.getCanonicalPath()); + debug("Control Port config file does not yet exist (waiting for tor): " + fileControlPort.getCanonicalPath()); } @@ -1292,11 +1295,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (FileNotFoundException e) { - logNotice("unable to get control port; file not found"); + debug("unable to get control port; file not found"); } catch (Exception e) { - logNotice("unable to read control port config file"); + debug("unable to read control port config file"); } return result; @@ -1376,37 +1379,53 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public void setTorProfile(int profile) { + public void setTorProfile(int newState) { - if (profile == STATUS_ON && mCurrentStatus != STATUS_ON) + if (newState == STATUS_ON) { - sendCallbackLogMessage (getString(R.string.status_starting_up)); - - try - { - startTor(); - - } - catch (Exception e) - { - - logException("Unable to start Tor: " + e.toString(),e); - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); - - showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - stopTor(); - } + if (mCurrentStatus == STATUS_OFF) + { + sendCallbackLogMessage (getString(R.string.status_starting_up)); + + + try + { + + boolean found = findExistingProc (); + + if (!found) + { + killProcess(fileTor); + killProcess(filePolipo); + + startTor(); + } + } + catch (Exception e) + { + + logException("Unable to start Tor: " + e.toString(),e); + mCurrentStatus = STATUS_OFF; + sendCallbackStatus(mCurrentStatus); + + showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + stopTor(); + } + + } } - else if (profile == STATUS_OFF && mCurrentStatus != STATUS_OFF) + else if (newState == STATUS_OFF) { - sendCallbackLogMessage (getString(R.string.status_shutting_down)); - - stopTor(); - - mCurrentStatus = STATUS_OFF; - sendCallbackStatus(mCurrentStatus); + if (mCurrentStatus == STATUS_ON) + { + sendCallbackLogMessage (getString(R.string.status_shutting_down)); + + stopTor(); + + mCurrentStatus = STATUS_OFF; + sendCallbackStatus(mCurrentStatus); + } } } @@ -1733,27 +1752,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - - public boolean checkAndInitImpl () - { - if (fileTor != null) - { - try { - if (TorServiceUtils.findProcessId(fileTor.getCanonicalPath()) != -1) - { - initialize(); - return true; - } - } catch (IOException e) { - logException("error init Tor", e); - } - - } - - return false; - } - - public void processSettings () { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 0b64856..d979ac4 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,6 +76,17 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; + public static final String CMD_START = "start"; + public static final String CMD_STOP = "stop"; + public static final String CMD_FLUSH = "flush"; + public static final String CMD_NEWNYM = "newnym"; + public static final String CMD_INIT = "init"; + public static final String CMD_VPN = "vpn"; + public static final String CMD_UPDATE = "update"; + + + + public static final String BINARY_TOR_VERSION = "0.2.5.10-openssl1.0.1i-nonPIE-polipofix"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 0038a5c..a22b328 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -108,7 +108,7 @@ public class TorServiceUtils implements TorServiceConstants { } } - procPs.destroy(); + try { procPs.destroy(); } catch (Exception e) {} // try to destroy just to make sure we clean it up return procId;

1 0

[tor-browser-bundle/master] Fix typo in gmp library name
by gk＠torproject.org 21 Nov '14

21 Nov '14

commit 3f486db138dbf8d8361ca7a86ebecce00a55aa8c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 21 16:26:29 2014 +0000 Fix typo in gmp library name --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 02a5c5f..e79e8af 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -74,8 +74,8 @@ script: | unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip - # FTE only needs libgmp.10.so and no libgmpxx anymore. - cp $INSTDIR/gmp/lib/libgmp.10.so $INSTDIR/Tor + # FTE only needs libgmp.so.10 and no libgmpxx anymore. + cp $INSTDIR/gmp/lib/libgmp.so.10 $INSTDIR/Tor # Building go # http://golang.org/doc/install/source#environment

1 0

[torsocks/master] Fix: syscall mmap for NetBSD
by dgoulet＠torproject.org 21 Nov '14

21 Nov '14

commit ab81544478eb9a0db821fd33684cc2f6aac88c7c Author: Thomas Klausner <wiz(a)NetBSD.org> Date: Fri Nov 21 08:19:54 2014 -0500 Fix: syscall mmap for NetBSD Signed-off-by: Thomas Klausner <wiz(a)NetBSD.org> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 7b8d45a..96016bb 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -84,7 +84,7 @@ static LIBC_ACCEPT_RET_TYPE handle_accept(va_list args) return tsocks_accept(sockfd, addr, &addrlen); } -#if (defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__))) +#if (defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__)) || defined(__NetBSD__)) /* * Handle mmap(2) syscall. */ @@ -104,7 +104,7 @@ static LIBC_SYSCALL_RET_TYPE handle_mmap(va_list args) return (LIBC_SYSCALL_RET_TYPE) mmap(addr, len, prot, flags, fd, offset); } -#endif /* __linux__, __darwin__ */ +#endif /* __linux__, __darwin__, __FreeBSD_kernel__, __i386__, __NetBSD__ */ /* * Handle munmap(2) syscall.

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 21 Nov '14

21 Nov '14

commit e00dfb936fbf549ac7873fd8a4acdedb501b1186 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 21 10:15:46 2014 +0000 Update translations for torbutton-torbuttondtd --- zh_TW/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torbutton.dtd b/zh_TW/torbutton.dtd index 95588d5..08fda00 100644 --- a/zh_TW/torbutton.dtd +++ b/zh_TW/torbutton.dtd @@ -75,7 +75,7 @@ <!ENTITY torbutton.prefs.spoof_english "假冒美國英文瀏覽器"> <!ENTITY torbutton.prefs.refererspoofing "參照頁假冒"> <!ENTITY torbutton.prefs.spoofblank "Tor 使用期間偽造空白參照頁(可能會中斷某些網站)"> -<!ENTITY torbutton.prefs.smartspoof "Tor 使用期間智能參照頁假冒(假冒跨網域參照頁)"> +<!ENTITY torbutton.prefs.smartspoof "referer spoof during Tor usage"> <!ENTITY torbutton.prefs.nospoof "Tor 使用期間無參照頁假冒(正常發送參照頁)"> <!ENTITY torbutton.prefs.disable_domstorage "Tor 使用期間停用 DOM 存放(重要)"> <!ENTITY torbutton.prefs.forms "表單">

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 21 Nov '14

21 Nov '14

commit 14c9491ba7d3d1e690304a410330327dfb57279c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 21 07:15:42 2014 +0000 Update translations for tails-misc --- id.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/id.po b/id.po index 9e3791c..00a9393 100644 --- a/id.po +++ b/id.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-10 13:00+0200\n" -"PO-Revision-Date: 2014-10-15 17:12+0000\n" +"POT-Creation-Date: 2014-10-15 17:57+0200\n" +"PO-Revision-Date: 2014-11-21 07:01+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" @@ -300,12 +300,12 @@ msgid "" msgstr "MAC spoofing gagal untuk kartu jaringan ${nic_name} (${nic}). Pemulihan kesalahan juga gagal, jadi semua jaringan dilumpuhkan.\nAnda mungkin memilih untuk mengulang Tails dan mematikan MAC spoofing. Lihat <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentasi</a>." #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 msgid "error:" msgstr "kesalahan:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:63 msgid "Error" msgstr "Kesalahan" @@ -355,63 +355,63 @@ msgstr "Mulai peramban Tor" msgid "Cancel" msgstr "Batal" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Apakah Anda benar-benar ingin menjalankan Unsafe Browser?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 msgid "" "Network activity within the Unsafe Browser is not anonymous. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "Aktivitas jaringan di Unsafe Browser tidak diset anonim. Hanya gunakan Unsafe Browser jika diperlukan, misalnya jika Anda harus masuk atau mendaftar untuk mengaktifkan koneksi internet Anda." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Launch" msgstr "_Jalankan" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "_Exit" msgstr "_Keluar" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 msgid "Starting the Unsafe Browser..." msgstr "Memulai Unsafe Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88 msgid "This may take a while, so please be patient." msgstr "Mungkin ini memakan waktu lama, mohon bersabar." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106 msgid "Failed to setup chroot." msgstr "Gagal mengkonfigurasi chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:180 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Unsafe Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:240 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 msgid "Shutting down the Unsafe Browser..." msgstr "Mematikan Unsafe Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:241 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Mungkin ini akan memakan waktu, dan Anda tidak boleh memulai ulang Unsafe Browser sampai ia dimatikan secara layak." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:253 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 msgid "Failed to restart Tor." msgstr "Gagal memulai ulang Tor." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:261 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:257 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Peramban tak aman lain sedang berjalan, atau sedang dibersihkan. Silakan coba lagi nanti." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:274 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:270 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 21 Nov '14

21 Nov '14

commit a74204e9a74010d1f0538b4ef025ed093320a1c8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 21 07:15:28 2014 +0000 Update translations for tails-greeter_completed --- id/id.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/id.po b/id/id.po index 36b9e0e..62ccb6c 100644 --- a/id/id.po +++ b/id/id.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-20 18:36+0200\n" -"PO-Revision-Date: 2014-08-28 05:50+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2014-11-21 07:00+0000\n" "Last-Translator: km242saya <pencurimangga(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 21 Nov '14

21 Nov '14

commit 25ca62100ee8f7345e618ba87bfbfa97b800d9b6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 21 07:15:24 2014 +0000 Update translations for tails-greeter --- id/id.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/id.po b/id/id.po index 36b9e0e..62ccb6c 100644 --- a/id/id.po +++ b/id/id.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-20 18:36+0200\n" -"PO-Revision-Date: 2014-08-28 05:50+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2014-11-21 07:00+0000\n" "Last-Translator: km242saya <pencurimangga(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 21 Nov '14

21 Nov '14

commit 99f597d9fc61b6554abc07abb0a34329ea53b182 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 21 07:15:19 2014 +0000 Update translations for tails-persistence-setup --- id/id.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/id/id.po b/id/id.po index b4f3c13..a8cd5ed 100644 --- a/id/id.po +++ b/id/id.po @@ -5,13 +5,14 @@ # Translators: # hermawan <hermawanadhis(a)gmail.com>, 2014 # km242saya <pencurimangga(a)gmail.com>, 2014 +# Riza Fadholi Pasha <riza.pasha(a)mail.ugm.ac.id>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-10-11 08:50+0000\n" -"Last-Translator: hermawan <hermawanadhis(a)gmail.com>\n" +"PO-Revision-Date: 2014-11-21 07:01+0000\n" +"Last-Translator: Riza Fadholi Pasha <riza.pasha(a)mail.ugm.ac.id>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +46,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "Pidgin" +msgstr "Aplikasi Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" @@ -122,7 +123,7 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 msgid "Error" -msgstr "Kesalahan" +msgstr "Galat" #: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format @@ -217,7 +218,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "Ungkapan Katasandi:" +msgstr "Kata Kunci :" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" @@ -283,7 +284,7 @@ msgstr "Simpan" #: ../lib/Tails/Persistence/Step/Configure.pm:143 msgid "Saving..." -msgstr "Menyimpan" +msgstr "Sedang Menyimpan" #: ../lib/Tails/Persistence/Step/Configure.pm:146 msgid "Saving persistence configuration..." @@ -309,7 +310,7 @@ msgstr "Hapus" #: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." -msgstr "Menghapus..." +msgstr "Sedang Menghapus" #: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..."

1 0

[tor/master] Make can_complete_circuits a static variable.
by nickm＠torproject.org 20 Nov '14

20 Nov '14

commit 336c856e52d211aad6b40d29986264f3277a1327 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 20 12:03:46 2014 -0500 Make can_complete_circuits a static variable. --- changes/no_global_ccc | 3 +++ src/or/circuitbuild.c | 7 ++++--- src/or/config.c | 4 ++-- src/or/control.c | 2 +- src/or/main.c | 46 ++++++++++++++++++++++++++++++++++++---------- src/or/main.h | 4 +++- src/or/nodelist.c | 2 +- src/or/rendservice.c | 2 +- 8 files changed, 51 insertions(+), 19 deletions(-) diff --git a/changes/no_global_ccc b/changes/no_global_ccc new file mode 100644 index 0000000..614055a --- /dev/null +++ b/changes/no_global_ccc @@ -0,0 +1,3 @@ + o Code Simplification and Refactoring: + - Stop using can_complete_circuits as a global variable; access it with + a function instead. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 42c4870..34934dc 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -943,9 +943,9 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) circuit_rep_hist_note_result(circ); circuit_has_opened(circ); /* do other actions as necessary */ - if (!can_complete_circuit && !circ->build_state->onehop_tunnel) { + if (!have_completed_a_circuit() && !circ->build_state->onehop_tunnel) { const or_options_t *options = get_options(); - can_complete_circuit=1; + note_that_we_completed_a_circuit(); /* FFFF Log a count of known routers here */ log_notice(LD_GENERAL, "Tor has successfully opened a circuit. " @@ -1033,7 +1033,8 @@ circuit_note_clock_jumped(int seconds_elapsed) seconds_elapsed >=0 ? "forward" : "backward"); control_event_general_status(LOG_WARN, "CLOCK_JUMPED TIME=%d", seconds_elapsed); - can_complete_circuit=0; /* so it'll log when it works again */ + /* so we log when it works again */ + note_that_we_maybe_cant_complete_circuits(); control_event_client_status(severity, "CIRCUIT_NOT_ESTABLISHED REASON=%s", "CLOCK_JUMPED"); circuit_mark_all_unused_circs(); diff --git a/src/or/config.c b/src/or/config.c index 5b62c56..e08c09d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1072,7 +1072,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) "connections."); connection_mark_all_noncontrol_connections(); /* We can't complete circuits until the network is re-enabled. */ - can_complete_circuit = 0; + note_that_we_maybe_cant_complete_circuits(); } } @@ -1670,7 +1670,7 @@ options_act(const or_options_t *old_options) if (server_mode(options) && !server_mode(old_options)) { ip_address_changed(0); - if (can_complete_circuit || !any_predicted_circuits(time(NULL))) + if (have_completed_a_circuit() || !any_predicted_circuits(time(NULL))) inform_testing_reachability(); } cpuworkers_rotate(); diff --git a/src/or/control.c b/src/or/control.c index 54464cc..72c6227 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2015,7 +2015,7 @@ getinfo_helper_events(control_connection_t *control_conn, /* Note that status/ is not a catch-all for events; there's only supposed * to be a status GETINFO if there's a corresponding STATUS event. */ if (!strcmp(question, "status/circuit-established")) { - *answer = tor_strdup(can_complete_circuit ? "1" : "0"); + *answer = tor_strdup(have_completed_a_circuit() ? "1" : "0"); } else if (!strcmp(question, "status/enough-dir-info")) { *answer = tor_strdup(router_have_minimum_dir_info() ? "1" : "0"); } else if (!strcmp(question, "status/good-server-descriptor") || diff --git a/src/or/main.c b/src/or/main.c index 5a4e0a3..4571f68 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -150,7 +150,7 @@ static int called_loop_once = 0; * any longer (a big time jump happened, when we notice our directory is * heinously out-of-date, etc. */ -int can_complete_circuit=0; +static int can_complete_circuits = 0; /** How often do we check for router descriptors that we should download * when we have too little directory info? */ @@ -171,11 +171,11 @@ int quiet_level = 0; /********* END VARIABLES ************/ /**************************************************************************** -* -* This section contains accessors and other methods on the connection_array -* variables (which are global within this file and unavailable outside it). -* -****************************************************************************/ + * + * This section contains accessors and other methods on the connection_array + * variables (which are global within this file and unavailable outside it). + * + ****************************************************************************/ #if 0 && defined(USE_BUFFEREVENTS) static void @@ -223,6 +223,32 @@ set_buffer_lengths_to_zero(tor_socket_t s) } #endif + +/** Return 1 if we have successfully built a circuit, and nothing has changed + * to make us think that maybe we can't. + */ +int +have_completed_a_circuit(void) +{ + return can_complete_circuits; +} + +/** Note that we have successfully built a circuit, so that reachability + * testing and introduction points and so on may be attempted. */ +void +note_that_we_completed_a_circuit(void) +{ + can_complete_circuits = 1; +} + +/** Note that something has happened (like a clock jump, or DisableNetwork) to + * make us think that maybe we can't complete circuits. */ +void +note_that_we_maybe_cant_complete_circuits(void) +{ + can_complete_circuits = 0; +} + /** Add conn to the array of connections that we can poll on. The * connection's socket must be set; the connection starts out * non-reading and non-writing. @@ -999,7 +1025,7 @@ directory_info_has_arrived(time_t now, int from_cache) } if (server_mode(options) && !net_is_disabled() && !from_cache && - (can_complete_circuit || !any_predicted_circuits(now))) + (have_completed_a_circuit() || !any_predicted_circuits(now))) consider_testing_reachability(1, 1); } @@ -1436,7 +1462,7 @@ run_scheduled_events(time_t now) /* also, check religiously for reachability, if it's within the first * 20 minutes of our uptime. */ if (is_server && - (can_complete_circuit || !any_predicted_circuits(now)) && + (have_completed_a_circuit() || !any_predicted_circuits(now)) && !we_are_hibernating()) { if (stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { consider_testing_reachability(1, dirport_reachability_count==0); @@ -1549,7 +1575,7 @@ run_scheduled_events(time_t now) circuit_close_all_marked(); /* 7. And upload service descriptors if necessary. */ - if (can_complete_circuit && !net_is_disabled()) { + if (have_completed_a_circuit() && !net_is_disabled()) { rend_consider_services_upload(now); rend_consider_descriptor_republication(); } @@ -1680,7 +1706,7 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) if (server_mode(options) && !net_is_disabled() && seconds_elapsed > 0 && - can_complete_circuit && + have_completed_a_circuit() && stats_n_seconds_working / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT != (stats_n_seconds_working+seconds_elapsed) / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { diff --git a/src/or/main.h b/src/or/main.h index e918517..7d98983 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -12,7 +12,9 @@ #ifndef TOR_MAIN_H #define TOR_MAIN_H -extern int can_complete_circuit; +int have_completed_a_circuit(void); +void note_that_we_completed_a_circuit(void); +void note_that_we_maybe_cant_complete_circuits(void); int connection_add_impl(connection_t *conn, int is_connecting); #define connection_add(conn) connection_add_impl((conn), 0) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 53abc82..e0e01ec 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1562,7 +1562,7 @@ update_router_have_minimum_dir_info(void) * is back up and usable, and b) disable some activities that Tor * should only do while circuits are working, like reachability tests * and fetching bridge descriptors only over circuits. */ - can_complete_circuit = 0; + note_that_we_maybe_cant_complete_circuits(); control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); } diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 353c671..ead9f3f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3075,7 +3075,7 @@ rend_services_introduce(void) * an intro point to. */ smartlist_t *exclude_nodes = smartlist_new(); - if (!can_complete_circuit) + if (!have_completed_a_circuit()) return; now = time(NULL);

1 0

[tor/master] Don't build introduction circuits until we know we can build circuits
by nickm＠torproject.org 20 Nov '14

20 Nov '14

commit f15cd22bb7c8f4f7009417e50a827c5bcc656807 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 20 11:51:36 2014 -0500 Don't build introduction circuits until we know we can build circuits Patch from akwizgran. Ticket 13447. --- changes/bug13447 | 5 +++++ src/or/config.c | 2 ++ src/or/rendservice.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/changes/bug13447 b/changes/bug13447 new file mode 100644 index 0000000..90027e8 --- /dev/null +++ b/changes/bug13447 @@ -0,0 +1,5 @@ + o Minor feature: + - When re-enabling the network, don't try to build introduction circuits + until we have successfully built a circuit. This makes hidden services + come up faster when the network is re-enabled. Patch from + "akwizgran". Closes ticket 13447. diff --git a/src/or/config.c b/src/or/config.c index dc2fc13..5b62c56 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1071,6 +1071,8 @@ options_act_reversible(const or_options_t *old_options, char **msg) "non-control network connections. Shutting down all existing " "connections."); connection_mark_all_noncontrol_connections(); + /* We can't complete circuits until the network is re-enabled. */ + can_complete_circuit = 0; } } diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3fed540..353c671 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -16,6 +16,7 @@ #include "circuituse.h" #include "config.h" #include "directory.h" +#include "main.h" #include "networkstatus.h" #include "nodelist.h" #include "rendclient.h" @@ -3074,6 +3075,9 @@ rend_services_introduce(void) * an intro point to. */ smartlist_t *exclude_nodes = smartlist_new(); + if (!can_complete_circuit) + return; + now = time(NULL); for (i=0; i < smartlist_len(rend_service_list); ++i) {

1 0