2 Commits
Author SHA1 Message Date
Yves Fischer 4b387f09f4 Pass the request-type (qtype) to iodine
Closes #18
2016-11-29 22:54:00 +01:00
Yves Fischer 0095b9ff16 Extend .gitignore to ignore gradle/studio files 2016-11-29 22:53:35 +01:00
12 changed files with 59 additions and 179 deletions

No files matched your search

+2 -2
View File
@@ -5,8 +5,8 @@ jdk:
android:
components:
- build-tools-25.0.3
- android-21
- build-tools-21.1.2
- android-15
before_install:
- git clone --depth 1 https://github.com/urho3d/android-ndk.git $HOME/android-ndk-root
+10 -18
View File
@@ -1,31 +1,23 @@
![Logo](src/main/res/drawable/logo.png)
This is a port of iodine (http://code.kryo.se/iodine/) to the Android VPN Framework.
It doesn't require "root" on the phone.
Downloads are available on [F-droid](https://f-droid.org/packages/org.xapek.andiodine/).
Dies ist eine Portierung von iodine (http://code.kryo.se/iodine/)
auf Android
# Documentation
The following two documents exist in German language only:
- [Anwenderdokumentation](doc/anwenderdoku.pdf)
- [Entwicklerdokumentation](doc/entwicklerdoku.pdf)
- (german)[Anwenderdokumentation](doc/anwenderdoku.html) [(PDF)](doc/anwenderdoku.pdf)
- (german)[Entwicklerdokumentation](doc/entwicklerdoku.html) [(PDF)](doc/entwicklerdoku.pdf)
# Building
Requires the Android SDK and NDK to be installed.
``` bash
(cd jni && ndk-build)
gradle build
```
bash
./gradlew build
```
Then find the APK files in folder `build/outputs/apk/`
# Authors and License
Android Iodine Copyright (c) 2016 Yves Fischer <yvesf+andiodine@xapek.org> and contributors.
Android Iodine Copyright (c) 2013 Yves Fischer <yvesf+andiodine@xapek.org>
Same license as iodine.
Iodine Copyright (c) 2006-2009 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
Iodine Copyright (c) 2006-2009 Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
Also major contributions by Anne Bezemer.
Permission to use, copy, modify, and distribute this software for any purpose
@@ -41,5 +33,5 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
MD5 implementation by L. Peter Deutsch (license and source in jni/iodine/src/md5.[ch])
MD5 implementation by L. Peter Deutsch (license and source in src/md5.[ch])
Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
+3 -8
View File
@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:2.2.2'
}
}
@@ -12,7 +12,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion '25.0.3'
buildToolsVersion "21.1.2"
sourceSets.main {
jniLibs.srcDir 'libs'
@@ -26,12 +26,7 @@ android {
}
x86 {
ndk {
abiFilters "x86"
}
}
fat {
ndk {
abiFilters "x86", "armeabi"
abiFilter "x86"
}
}
}
+2 -2
View File
@@ -1,6 +1,6 @@
#Fri Oct 13 18:56:29 CEST 2017
#Mon Nov 21 21:42:02 GMT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+1 -4
View File
@@ -1,8 +1,6 @@
#ifndef __FIX_ANDROID_H__
#define __FIX_ANDROID_H__
#include <arpa/nameser.h>
#ifndef _ARPA_NAMESER_COMPAT_
typedef struct {
unsigned id :16;
@@ -38,5 +36,4 @@ typedef struct {
#define T_TXT 16
#define T_SRV 33
#endif //_ARPA_NAMESER_COMPAT_
#endif //__FIX_ANDROID_H__
#endif
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.xapek.andiodine"
android:versionCode="6"
android:versionName="1.6">
android:versionCode="3"
android:versionName="1.3">
<uses-sdk
android:minSdkVersion="14"
@@ -18,8 +18,6 @@ import android.widget.Button;
import android.widget.ScrollView;
import android.widget.TextView;
import java.util.Locale;
public class FragmentStatus extends Fragment {
public static final String TAG = "FRAGMENT_STATUS";
@@ -33,27 +31,26 @@ public class FragmentStatus extends Fragment {
public void onReceive(Context context, Intent intent) {
Log.d(TAG, "Got intent: " + intent);
if (IodineVpnService.ACTION_STATUS_ERROR.equals(intent.getAction())) {
final TextView message = new TextView(context);
final String stringMessage = intent.getStringExtra(IodineVpnService.EXTRA_ERROR_MESSAGE);
final SpannableString s = new SpannableString(stringMessage);
Linkify.addLinks(s, Linkify.WEB_URLS);
message.setText(s);
message.setMovementMethod(LinkMovementMethod.getInstance());
new AlertDialog.Builder(FragmentStatus.this.getActivity())//
.setIcon(R.drawable.error) //
.setTitle(R.string.error) //
.setView(message)
.create() //
.show();
final TextView message = new TextView(context);
final String stringMessage = intent.getStringExtra(IodineVpnService.EXTRA_ERROR_MESSAGE);
final SpannableString s = new SpannableString(stringMessage);
Linkify.addLinks(s, Linkify.WEB_URLS);
message.setText(s);
message.setMovementMethod(LinkMovementMethod.getInstance());
new AlertDialog.Builder(FragmentStatus.this.getActivity())//
.setIcon(R.drawable.error) //
.setTitle("Error") //
.setView(message)
.create() //
.show();
} else if (IodineVpnService.ACTION_STATUS_CONNECT.equals(intent.getAction())) {
mStatus.setText(R.string.connect);
mStatus.setText("Connect");
} else if (IodineVpnService.ACTION_STATUS_CONNECTED.equals(intent.getAction())) {
mStatus.setText(String.format(Locale.getDefault(), getString(R.string.vpnservice_connected_with_info),
IodineClient.getIp(),
IodineClient.getNetbits(),
IodineClient.getMtu()));
mStatus.setText("Connected: " + IodineClient.getIp() + '/'
+ IodineClient.getNetbits() + " MTU: "
+ IodineClient.getMtu() + '\n');
} else if (IodineVpnService.ACTION_STATUS_DISCONNECT.equals(intent.getAction())) {
mStatus.setText(R.string.disconnect);
mStatus.setText("Disconnect");
}
}
};
@@ -62,10 +59,10 @@ public class FragmentStatus extends Fragment {
@Override
public void onReceive(Context context, Intent intent) {
if (IodineClient.ACTION_LOG_MESSAGE.equals(intent.getAction())) {
final String newLogEntry = intent.getStringExtra(IodineClient.EXTRA_MESSAGE);
final String newLogEntry = intent.getStringExtra(IodineClient.EXTRA_MESSAGE);
if (!".".equals(newLogEntry)) // Suppress newline for progress indicator'.'
mLogmessages.append("\n");
mLogmessages.append(newLogEntry);
mLogmessages.append("\n");
mLogmessages.append(newLogEntry);
mScrollview.fullScroll(View.FOCUS_DOWN);
}
}
@@ -42,42 +42,42 @@ public class IodinePref extends org.xapek.andiodine.preferences.PreferenceActivi
setContentValues(mIodineConfiguration.getContentValues());
// Name
addPreference(ConfigDatabase.COLUMN_CONF_NAME, getString(R.string.pref_text_name_label_short), R.string.pref_help_name, "New Connection");
addPreference(ConfigDatabase.COLUMN_CONF_NAME, "Name", R.string.pref_help_name, "New Connection");
// Topdomain
addPreference(ConfigDatabase.COLUMN_CONF_TOP_DOMAIN, getString(R.string.pref_text_topdomain_label), R.string.pref_help_topdomain,
addPreference(ConfigDatabase.COLUMN_CONF_TOP_DOMAIN, "Tunnel Topdomain", R.string.pref_help_topdomain,
"tun.example.com");
// Password
addPreference(ConfigDatabase.COLUMN_CONF_PASSWORD, getString(R.string.pref_text_password_label), R.string.pref_help_password, "");
addPreference(ConfigDatabase.COLUMN_CONF_PASSWORD, "Password", R.string.pref_help_password, "");
// Tunnel Nameserver
addPreference(ConfigDatabase.COLUMN_CONF_TUNNEL_NAMESERVER, getString(R.string.pref_text_tunnel_nameserver_label_or_empty),
addPreference(ConfigDatabase.COLUMN_CONF_TUNNEL_NAMESERVER, "Tunnel Nameserver (or empty)",
R.string.pref_help_tunnel_nameserver, "");
// Nameserver Mode
String[] nameserverModes = new String[NameserverMode.values().length];
for (int i = 0; i < NameserverMode.values().length; i++) {
nameserverModes[i] = NameserverMode.values()[i].name();
}
addPreference(ConfigDatabase.COLUMN_CONF_NAMESERVER_MODE, getString(R.string.pref_text_nameserver_mode_label),
addPreference(ConfigDatabase.COLUMN_CONF_NAMESERVER_MODE, "Nameserver Mode",
R.string.pref_help_nameserver_mode, nameserverModes, NameserverMode.LEAVE_DEFAULT.name());
// Nameserver
addPreference(ConfigDatabase.COLUMN_CONF_NAMESERVER, getString(R.string.pref_text_nameserver_label), R.string.pref_help_nameserver, "");
addPreference(ConfigDatabase.COLUMN_CONF_NAMESERVER, "Nameserver", R.string.pref_help_nameserver, "");
// Request Type
String[] requestTypes = new String[RequestType.values().length];
for (int i = 0; i < RequestType.values().length; i++) {
requestTypes[i] = RequestType.values()[i].name();
}
addPreference(ConfigDatabase.COLUMN_CONF_REQUEST_TYPE, getString(R.string.pref_text_request_type_label), R.string.pref_help_request_type,
addPreference(ConfigDatabase.COLUMN_CONF_REQUEST_TYPE, "Request Type", R.string.pref_help_request_type,
requestTypes, RequestType.AUTODETECT.name());
// Lazy Mode
addPreference(ConfigDatabase.COLUMN_CONF_LAZY_MODE, getString(R.string.pref_text_lazy_mode_label), R.string.pref_help_lazy, true);
addPreference(ConfigDatabase.COLUMN_CONF_LAZY_MODE, "Lazy mode", R.string.pref_help_lazy, true);
// Raw Mode
addPreference(ConfigDatabase.COLUMN_CONF_RAW_MODE, getString(R.string.pref_text_raw_mode_label), R.string.pref_help_raw, false);
addPreference(ConfigDatabase.COLUMN_CONF_RAW_MODE, "Raw Mode", R.string.pref_help_raw, false);
// Default Route
addPreference(ConfigDatabase.COLUMN_CONF_DEFAULT_ROUTE, getString(R.string.pref_text_default_route_label), R.string.pref_help_default_route, true);
addPreference(ConfigDatabase.COLUMN_CONF_DEFAULT_ROUTE, "Default Route", R.string.pref_help_default_route, true);
addPreference(ConfigDatabase.COLUMN_CONF_REQUEST_HOSTNAME_SIZE,
getString(R.string.pref_text_request_hostname_size_label), R.string.pref_request_hostname_size, "255");
"Request Hostname Size", R.string.pref_request_hostname_size, "255");
addPreference(ConfigDatabase.COLUMN_CONF_RESPONSE_FRAGMENT_SIZE,
getString(R.string.pref_text_response_fragment_size_label), R.string.pref_response_fragment_size, "0");
"Response Fragment Size", R.string.pref_response_fragment_size, "0");
}
@Override
+1 -1
View File
@@ -37,7 +37,7 @@
<Button
android:drawableLeft="@drawable/cancel"
android:text="@string/configitem_description_close"
android:text="Close"
android:id="@+id/status_cancel"
android:layout_width="match_parent"
android:layout_height="50dp"
+1 -13
View File
@@ -21,7 +21,7 @@
<string name="main_description_add_account">Konto hinzufügen</string>
<string name="pref_description_cancel">Abbrechen</string>
<string name="configitem_description_close">Tunnel schließen</string>
<string name="configitem_description_close">Tunnel schliessen</string>
<string name="pref_text_password_label">Passwort</string>
<string name="pref_text_topdomain_label">Tunnel Toplevel Domain</string>
<string name="pref_text_tunnel_nameserver_label">Tunnel Nameserver</string>
@@ -61,17 +61,5 @@
<string name="fragment_list_add">Neues Konto</string>
<string name="main_about">Über</string>
<string name="pref_delete">Löschen</string>
<string name="close">Schließen</string>
<string name="connect">Verbinden...</string>
<string name="disconnect">Ausschalten...</string>
<string name="pref_text_response_fragment_size_label">Maximale Größe des Antwortfragments</string>
<string name="pref_text_name_label_short">Name</string>
<string name="pref_text_nameserver_label">Nameserver</string>
<string name="pref_text_tunnel_nameserver_label_or_empty">Tunnel Nameserver (oder leer)</string>
<string name="pref_text_request_type_label">Typ der DNS Abfragen</string>
<string name="pref_text_request_hostname_size_label">Maximale Größe des Upstream-Hostnamen</string>
<string name="pref_text_lazy_mode_label">Lazy mode</string>
<string name="pref_text_default_route_label">Standardroute</string>
<string name="vpnservice_connected_with_info">Verbindung: %1$s/%2$d MTU: %3$d</string>
</resources>
-76
View File
@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">AndIodine</string>
<string name="app_about">Over</string>
<string-array name="pref_entries_dnstype">
<item>automatisch</item>
<item>NULL</item>
<item>TXT</item>
<item>SRV</item>
<item>MX</item>
<item>CNAME</item>
<item>A</item>
</string-array>
<string-array name="pref_entries_nameserver_mode">
<item>Standaard netwerk</item>
<item>Aangepast</item>
<item>Tunneluitgang</item>
</string-array>
<string name="configitem_description_close">Sluit tunnel</string>
<string name="configitem_description_manage">Configureer dit verbindingsprofiel</string>
<string name="enable">Activeer</string>
<string name="error">Fout</string>
<string name="fragment_list_add">Nieuwe Account</string>
<string name="main_about">Over</string>
<string name="main_create_tunnel">Maak een DNS-Tunnel van configuratie %s</string>
<string name="main_description_add_account">Voeg een account toe</string>
<string name="pref_delete">Verwijder</string>
<string name="pref_description_cancel">Annuleer</string>
<string name="pref_help_default_route">Leidt al het dataverkeer om door de tunnel.</string>
<string name="pref_help_lazy">Gebruik de luie modus voor hoger snelheid en mindere vertraging. Een klein gedeelte van de DNS relays lijkt verkeer dat op de luie modus verzonden is niet te kunnen verwerken, wat er toe kan leiden dat er (bijna) dataverkeer aankomt.</string>
<string name="pref_help_name">De naam van de configuratie.</string>
<string name="pref_help_nameserver">Een aangepaste adres van een Naamserver als de naamserver als de naamservermodus op \"aangepast\" staat.</string>
<string name="idle">Inactief</string>
<string name="pref_help_password">Het is niet verplicht om dit in the vullen. Alleen de eerste 32 letters zullen worden gebruikt.</string>
<string name="pref_help_raw">Indien aangevinkt zal Iodine proberen het publieke IP-adres van de Iodined server direct proberen te bereiken. Indien dat het geval is zal het dataverkeer direct naar de server worden verzonden i.p.v. de DNS relay.</string>
<string name="vpnservice_error_dns_detect_failed">Er zijn geen geldige IPv4 servers gedetecteerd.</string>
<string name="close">Sluit</string>
<string name="pref_help_request_type">Aangepast DNS request type. Normaal probeert Iodine automatisch het DNS request type met de hoogste bandbreedte te vinden en te gebruiken. Echter blijkt de DNS relay in sommige gevallen limieten op te leggen, waardoor andere DNS types onverwacht meer bandbreedte kunnen dragen. Als dat het geval is kunt u deze optie gebruiken om een ander type te selecteren. Van de meeste bandbreedte naar de minste zijn dit de ondersteunde DNS types: NULL, TXT, SRV, MX, CNAME en A.</string>
<string name="pref_help_topdomain">Het DNS verkeer zal als aanvragen van de subdomeinen onder _topdomain_ worden verzonden. Normaal gesproken is dit uw eigen domein. Gebruik een korte domeinnaam voor een hogere bandbreedte. Indien de gekozen nameserver die van Iodine is, kan elk tomdomein gekozen worden zolang hetzelfde domein op de server en de cliënt gekozen wordt.</string>
<string name="pref_help_tunnel_nameserver">De naamserver die gebruikt moet worden om het DNS verkeer door te sturen. Dit kan in principe elke naamserver zijn of de Iodined draaiende server indien die zonder omwegen bereikbaar is. Er kan zowel een IP adres als een hostname worden ingevuld. Het is niet verplicht dit in te vullen en indien dit niet wordt ingevuld, zal de standaard naamserver worden gebruikt.</string>
<string name="pref_request_hostname_size">De maximale lengte van de opgevraagde (upstream) hostnamen. Vul een waarde van 100 to 255 in. De standaardinstelling is 255. Verminder A.U.B. deze waarde indien de DNS relay\'s onbetrouwbaar antwoord geven op volledige aanvragen, omdat de automatische detectie van de Antwoord Grootte anders niet betrouwbaar werkt.</string>
<string name="pref_response_fragment_size">De grootte van de antwoorden. Wordt automatisch gedetecteerd wanneer 0 is ingevuld, wat normaal gesproken het geval is.</string>
<string name="pref_text_password_label">Wachtwoord</string>
<string name="pref_text_name_label">Configuatieprofiel Naam</string>
<string name="pref_text_nameserver_address_label">Naamserver Adres</string>
<string name="pref_text_nameserver_mode_label">Naamserver Modus</string>
<string name="pref_text_topdomain_label">Tunnel Toplevel Domein</string>
<string name="pref_text_tunnel_nameserver_label">Tunnel Naamserver</string>
<string name="pref_text_use_default_nameserver">Gebruik de standaard naamserver voor de tunnel</string>
<string name="pref_title">Verbindingsinstellingen</string>
<string name="vpnservice_error_already_running">Het starten van de VPN-service is mislukt omdat er al een VPN thread actief is.</string>
<string name="vpnservice_error_cant_open_dnssocket">Het open van de DNS poort is mislukt</string>
<string name="vpnservice_error_configuration_incomplete">De instellingen zijn incompleet</string>
<string name="vpnservice_error_create_interface_string">Het creëren van een virtueel tunnel netwerk apparaat is mislukt</string>
<string name="vpnservice_error_handshake_failed">Het begroeten van de server is mislukt</string>
<string name="vpnservice_error_no_active_network">Er is geen actieve netwerk verbinding</string>
<string name="vpnservice_error_thread_exited">De VPN thread is onverwacht beëindigd</string>
<string name="vpnservice_error_unknown_error_code">Onbekende fout. Code %d</string>
<string name="vpnservice_error_unknown_error_string">Onbekende fout. Reden: %s</string>
<string name="warning">Waarschuwing</string>
<string name="connect">Verbinden...</string>
<string name="disconnect">Verbinding verbreken...</string>
<string name="pref_help_nameserver_mode">De Naamserver die moet worden gebruikt voor het opvragen van domeinnamen als de tunnel actief is.</string>
<string name="pref_text_lazy_mode_label">Luie modus</string>
<string name="pref_text_name_label_short">Naam</string>
<string name="pref_text_nameserver_label">Naamserver</string>
<string name="pref_text_request_hostname_size_label">Opgevraagde Hostnaam Grootte</string>
<string name="pref_text_request_type_label">DNS opvraagtype</string>
<string name="pref_text_response_fragment_size_label">Antwoord Grootte</string>
<string name="pref_text_tunnel_nameserver_label_or_empty">Tunnel Naamserver (optioneel)</string>
<string name="pref_text_default_route_label">Standaard Route</string>
<string name="vpnservice_connected_with_info">Verbonden: %1$s/%2$d MTE: %3$d</string>
</resources>
+5 -18
View File
@@ -23,20 +23,11 @@
<string name="pref_description_cancel">Cancel</string>
<string name="configitem_description_close">Close Tunnel</string>
<string name="pref_text_password_label">Password</string>
<string name="pref_text_topdomain_label">Tunnel Top Domain</string>
<string name="pref_text_nameserver_label">Nameserver</string>
<string name="pref_text_topdomain_label">Tunnel Toplevel Domain</string>
<string name="pref_text_tunnel_nameserver_label">Tunnel Nameserver</string>
<string name="pref_text_tunnel_nameserver_label_or_empty">Tunnel Nameserver (or empty)</string>
<string name="pref_text_nameserver_mode_label">Nameserver Mode</string>
<string name="pref_text_nameserver_address_label">Nameserver Address</string>
<string name="pref_text_name_label">Configuration Profile Name</string>
<string name="pref_text_name_label_short">Name</string>
<string name="pref_text_request_type_label">Request Type</string>
<string name="pref_text_lazy_mode_label">Lazy mode</string>
<string name="pref_text_raw_mode_label" translatable="false">Raw Mode</string>
<string name="pref_text_default_route_label">Default Route</string>
<string name="pref_text_request_hostname_size_label">Request Hostname Size</string>
<string name="pref_text_response_fragment_size_label">Response Fragment Size</string>
<string name="pref_text_use_default_nameserver">Use default Nameserver for tunneling</string>
<string name="pref_help_name">Name for this configuration.</string>
<string name="pref_help_topdomain">The dns traffic will be sent as queries for subdomains under _topdomain_. This is
@@ -57,8 +48,8 @@
hostname. This argument is optional, and if not specified the default system Nameserver will be used.
</string>
<string name="pref_help_password">This field is optional. Only the first 32 characters will be used</string>
<string name="pref_help_nameserver_mode">Source of the Nameserver to use for name resolution while the tunnel is
active.
<string name="pref_help_nameserver_mode">Source of the Nameserver to use for name resolution while tunnel is
active
</string>
<string name="pref_help_nameserver">Custom Nameserver IP-Address to set if Nameserver-mode is "Custom"</string>
<string name="pref_help_request_type">DNS request type override. By default, autodetection will probe for working
@@ -77,7 +68,7 @@
</string>
<string name="enable">Enable</string>
<string name="vpnservice_error_configuration_incomplete">Configuration is incomplete</string>
<string name="vpnservice_error_already_running">Can\'t start VPN Service, VPN-Thread is already running</string>
<string name="vpnservice_error_already_running">Cannot start VPN Service, VPN-Thread is already running</string>
<string name="vpnservice_error_thread_exited">VPN Thread exited unexpected</string>
<string name="vpnservice_error_cant_open_dnssocket">Can\'t open DNS Socket</string>
<string name="vpnservice_error_handshake_failed">Handshake failed</string>
@@ -91,15 +82,11 @@
<string name="error">Error</string>
<string name="configitem_description_manage">Configure this Connection Profile</string>
<string name="pref_title">Connection Configuration</string>
<string name="pref_help_default_route">Set default Route for the tunnel device. \nThis means that all the Internet traffic on your device will be redirected through the tunnel.</string>
<string name="pref_help_default_route">Set default Route for the tunnel device</string>
<string name="main_create_tunnel">Create DNS Tunnel from Configuration named %s</string>
<string name="fragment_list_add">New Account</string>
<string name="main_about">About</string>
<string name="pref_delete">Delete</string>
<string name="close">Close</string>
<string name="connect">Connecting...</string>
<string name="disconnect">Disconnecting...</string>
<string name="vpnservice_connected_with_info">Connected: %1$s/%2$d MTU: %3$d</string>
</resources>