dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add prefs for relay and fascist firewalling 

Adds the following prefs:
    PREF_RELAY (default false)
    PREF_RELAY_PORT (default 9001)
    PREF_FASCIST_FIREWALL (default false)
    PREF_FASCIST_FIREWALL_PORTS (default 80,443)


svn:r21818
This commit is contained in:
Jacob Appelbaum 2010-03-06 00:44:56 +00:00
parent a15509f192
commit 66668bb9b8
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
res/xml/preferences.xml
View File

@ -23,20 +23,36 @@ android:title="Transparent Proxying"
android:summary="ROOTED DEVICES ONLY: Activate Tor for all web traffic and DNS" android:summary="ROOTED DEVICES ONLY: Activate Tor for all web traffic and DNS"
android:enabled="true"/> android:enabled="true"/>
<!-- <PreferenceCategory android:title="Relays">
<CheckBoxPreference android:key="pref_relay"
<EditTextPreference android:key="pref_relay" android:defaultValue="false"
android:title="Relaying" android:title="Relaying"
android:summary="Enable your device to be a relay" android:summary="Enable your device to be a relay"
android:dialogTitle="Enter Bridge Addresses" android:dialogTitle="Enter Bridge Addresses"
android:enabled="false" android:enabled="false"
/> />
<EditTextPreference android:key="pref_relay_port"
android:defaultValue="9001"
android:title="Relay Port"
android:summary="Listening port for your Tor relay"
android:dialogTitle="Enter OR port"
/>
</PreferenceCategory>
<PreferenceCategory android:title="FascistFirewalling">
<CheckBoxPreference android:defaultValue="false" <CheckBoxPreference android:defaultValue="false"
android:defaultValue="false"
android:title="Fascist Firewall" android:key="pref_fascist_firewall" android:title="Fascist Firewall" android:key="pref_fascist_firewall"
android:summary="Run as a client behind a firewall with restrictive policies" android:summary="Run as a client behind a firewall with restrictive policies"
android:enabled="false"></CheckBoxPreference> android:enabled="false"></CheckBoxPreference>
-->
<EditTextPreference android:key="pref_fascist_firewall_ports"
android:defaultValue="80,443"
android:title="Reachable ports"
android:summary="Ports reachable behind a restrictive firewall"
android:dialogTitle="Enter ports"
/>
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

4
src/org/torproject/android/TorConstants.java
View File

@ -34,6 +34,10 @@ public interface TorConstants {
public final static String PREF_BRIDGES_ENABLED = "pref_bridges_enabled"; public final static String PREF_BRIDGES_ENABLED = "pref_bridges_enabled";
public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled"; public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled";
public final static String PREF_BRIDGES_LIST = "pref_bridges_list"; public final static String PREF_BRIDGES_LIST = "pref_bridges_list";
public final static String PREF_RELAY = "pref_relay";
public final static String PREF_RELAY_PORT = "pref_relay_port";
public final static String PREF_FASCIST_FIREWALL = "pref_fascist_firewall";
public final static String PREF_FASCIST_FIREWALL_PORTS = "pref_fascist_firewall_ports";
public final static String PREF_TRANSPARENT = "pref_transparent"; public final static String PREF_TRANSPARENT = "pref_transparent";