denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Request and install an IPv6 DNS server

Browse Source
This commit is contained in:
Tobias Brunner
2013-03-20 15:24:26 +01:00
parent ee66565d43
commit 8249f288f2
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/libandroidbridge/backend/android_attr.c
+16 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2012 Tobias Brunner * Copyright (C) 2012-2013 Tobias Brunner
* Copyright (C) 2012 Giuliano Grassi * Copyright (C) 2012 Giuliano Grassi
* Copyright (C) 2012 Ralf Sager * Copyright (C) 2012 Ralf Sager
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
@@ -47,6 +47,9 @@ METHOD(attribute_handler_t, handle, bool,
case INTERNAL_IP4_DNS: case INTERNAL_IP4_DNS:
dns = host_create_from_chunk(AF_INET, data, 0); dns = host_create_from_chunk(AF_INET, data, 0);
break; break;
case INTERNAL_IP6_DNS:
dns = host_create_from_chunk(AF_INET6, data, 0);
break;
default: default:
return FALSE; return FALSE;
} }
@@ -70,12 +73,21 @@ METHOD(attribute_handler_t, release, void,
/* DNS servers cannot be removed from an existing TUN device */ /* DNS servers cannot be removed from an existing TUN device */
} }
METHOD(enumerator_t, enumerate_dns, bool, METHOD(enumerator_t, enumerate_dns6, bool,
enumerator_t *this, configuration_attribute_type_t *type, chunk_t *data)
{
*type = INTERNAL_IP6_DNS;
*data = chunk_empty;
this->enumerate = (void*)return_false;
return TRUE;
}
METHOD(enumerator_t, enumerate_dns4, bool,
enumerator_t *this, configuration_attribute_type_t *type, chunk_t *data) enumerator_t *this, configuration_attribute_type_t *type, chunk_t *data)
{ {
*type = INTERNAL_IP4_DNS; *type = INTERNAL_IP4_DNS;
*data = chunk_empty; *data = chunk_empty;
this->enumerate = (void*)return_false; this->enumerate = (void*)_enumerate_dns6;
return TRUE; return TRUE;
} }
@@ -85,7 +97,7 @@ METHOD(attribute_handler_t, create_attribute_enumerator, enumerator_t*,
enumerator_t *enumerator; enumerator_t *enumerator;
INIT(enumerator, INIT(enumerator,
.enumerate = (void*)_enumerate_dns, .enumerate = (void*)_enumerate_dns4,
.destroy = (void*)free, .destroy = (void*)free,
); );
return enumerator; return enumerator;
src/frontends/android/jni/libandroidbridge/vpnservice_builder.c
+1 -5
View File
@@ -161,16 +161,12 @@ METHOD(vpnservice_builder_t, add_dns, bool,
JNIEnv *env; JNIEnv *env;
jmethodID method_id; jmethodID method_id;
jstring str; jstring str;
char buf[INET_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
androidjni_attach_thread(&env); androidjni_attach_thread(&env);
DBG2(DBG_LIB, "builder: adding DNS server %H", dns); DBG2(DBG_LIB, "builder: adding DNS server %H", dns);
if (dns->get_family(dns) != AF_INET)
{
goto failed;
}
if (snprintf(buf, sizeof(buf), "%H", dns) >= sizeof(buf)) if (snprintf(buf, sizeof(buf), "%H", dns) >= sizeof(buf))
{ {
goto failed; goto failed;