From cd14cc5a19951b7d7275fdb5519e52df7cae90c4 Mon Sep 17 00:00:00 2001 From: Jacob Appelbaum Date: Sat, 6 Mar 2010 01:23:36 +0000 Subject: [PATCH] Add an option for Relay support to Orbot! svn:r21823 --- src/org/torproject/android/Orbot.java | 32 ++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 34be7c79..fda0426b 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -457,7 +457,9 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On boolean useBridges = prefs.getBoolean(PREF_BRIDGES_ENABLED, false); boolean autoUpdateBridges = prefs.getBoolean(PREF_BRIDGES_UPDATED, false); - + + boolean becomeRelay = prefs.getBoolean(PREF_OR, false); + enableTransparentProxy = prefs.getBoolean(PREF_TRANSPARENT, false); if (hasRoot) @@ -509,7 +511,31 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On { torrcText.append("UseBridges 0"); } - + + try + { + if (becomeRelay && !useBridges) + { + int ORPort = Integer.parseInt(prefs.getString(PREF_OR_PORT, "9001")); + String nickname = prefs.getString(PREF_OR_NICKNAME, "Orbot"); + + torrcText.append("ORPort "); + torrcText.append(ORPort); + torrcText.append('\n'); + + torrcText.append("Nickname "); + torrcText.append(nickname); + torrcText.append('\n'); + + torrcText.append("ExitPolicy reject *:*"); + torrcText.append('\n'); + } + } + catch (Exception e) + { + Toast.makeText(this, "Your relay settings caused an exception!", Toast.LENGTH_LONG).show(); + } + Utils.saveTextFile(TorServiceConstants.TORRC_INSTALL_PATH, torrcText.toString()); } @@ -826,4 +852,4 @@ public class Orbot extends Activity implements OnClickListener, TorConstants, On } } -} \ No newline at end of file +}