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
6 changed files with 30 additions and 4 deletions

No files matched your search

+2
View File
@@ -16,6 +16,8 @@ tests/gen
# Android Studio
.idea
*.iml
.externalNativeBuild
# ant
out
+13 -1
View File
@@ -87,7 +87,8 @@ JNIEXPORT jint JNICALL Java_org_xapek_andiodine_IodineClient_getDnsFd(
JNIEXPORT jint JNICALL Java_org_xapek_andiodine_IodineClient_connect(
JNIEnv *env, jclass klass, jstring j_nameserv_addr, jstring j_topdomain, jboolean j_raw_mode, jboolean j_lazy_mode,
jstring j_password, jint j_request_hostname_size, jint j_response_fragment_size) {
jstring j_password, jint j_request_hostname_size, jint j_response_fragment_size,
jstring j_request_type) {
// XXX strdup leaks
const char *__p_nameserv_addr = (*env)->GetStringUTFChars(env,
@@ -105,12 +106,22 @@ JNIEXPORT jint JNICALL Java_org_xapek_andiodine_IodineClient_connect(
(*env)->ReleaseStringUTFChars(env, j_topdomain, __p_topdomain);
__android_log_print(ANDROID_LOG_ERROR, "iodine", "Topdomain from vm: %s", p_topdomain);
// extract password parameter
const char *p_password = (*env)->GetStringUTFChars(env, j_password, NULL);
char passwordField[33];
memset(passwordField, 0, 33);
strncpy(passwordField, p_password, 32);
(*env)->ReleaseStringUTFChars(env, j_password, p_password);
// extract request type parameter
const char *p_requestType = (*env)->GetStringUTFChars(env, j_request_type, NULL);
char requestTypeField[8];
memset(requestTypeField, 0, 8);
strncpy(requestTypeField, p_requestType, 7);
(*env)->ReleaseStringUTFChars(env, j_request_type, p_requestType);
__android_log_print(ANDROID_LOG_ERROR, "iodine", "Request Type from vm: %s", requestTypeField);
tun_config_android.request_disconnect = 0;
int selecttimeout = 2; // original: 4
@@ -140,6 +151,7 @@ JNIEXPORT jint JNICALL Java_org_xapek_andiodine_IodineClient_connect(
client_set_topdomain(p_topdomain);
client_set_hostname_maxlen(hostname_maxlen);
client_set_password(passwordField);
client_set_qtype(requestTypeField);
if ((dns_fd = open_dns_from_host(NULL, 0, AF_INET, AI_PASSIVE)) == -1) {
printf("Could not open dns socket: %s", strerror(errno));
+3
View File
@@ -187,6 +187,9 @@ client_set_qtype(char *qtype)
do_qtype = T_SRV;
else if (!strcasecmp(qtype, "TXT"))
do_qtype = T_TXT;
// Added for Andiodine:
else
do_qtype = T_UNSET;
return (do_qtype == T_UNSET);
}
@@ -9,7 +9,8 @@ public class IodineClient {
public static native int getDnsFd();
public static native int connect(String nameserv_addr, String topdomain, boolean raw_mode, boolean lazy_mode,
String password, int request_hostname_size, int response_fragment_size);
String password, int request_hostname_size, int response_fragment_size,
String request_type);
public static native String getIp();
@@ -275,7 +275,7 @@ public class IodineVpnService extends VpnService implements Runnable {
int ret = IodineClient.connect(tunnelNameserver, mConfiguration.getTopDomain(), mConfiguration.getRawMode(),
mConfiguration.getLazyMode(), password, mConfiguration.getRequestHostnameSize(),
mConfiguration.getResponseFragmentSize());
mConfiguration.getResponseFragmentSize(), mConfiguration.getRequestType().getIodineName());
String errorMessage = "";
switch (ret) {
@@ -11,7 +11,15 @@ public class IodineConfiguration {
}
public static enum RequestType {
AUTODETECT, NULL, TXT, SRV, MX, CNAME, A
AUTODETECT, NULL, TXT, SRV, MX, CNAME, A;
public String getIodineName() {
if (this == AUTODETECT) {
return "";
} else {
return name();
}
}
}
private final ContentValues v;