mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 04:02:15 +02:00
Code

Updated Android client to build with latest core.

Browse Source
This commit is contained in:
James Yonan 2012-08-25 05:05:35 +00:00
parent a6b6d487ef
commit 2db1ead53f
2 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
javacli/OpenVPNClientThread.java
View File

@ -47,31 +47,20 @@ public class OpenVPNClientThread extends ClientAPI_OpenVPNClient implements Runn
}
public interface TunBuilder {
// Tun builder methods. All methods returning boolean use the return
// value to indicate success (true) or fail (false).
// Tun builder methods.
// Methods documented in openvpn/tun/builder/base.hpp
// Callback to to add network address to VPN interface
boolean tun_builder_add_address(String address, int prefix_length);
// Callback to add route to VPN interface
boolean tun_builder_add_route(String address, int prefix_length);
// Callback to add DNS server to VPN interface
boolean tun_builder_add_dns_server(String address);
// Callback to add search domain to DNS resolver
boolean tun_builder_add_search_domain(String domain);
// Callback to set MTU of the VPN interface
boolean tun_builder_set_remote_address(String address, boolean ipv6);
boolean tun_builder_add_address(String address, int prefix_length, boolean ipv6);
boolean tun_builder_reroute_gw(String server_address, boolean server_address_ipv6, boolean ipv6);
boolean tun_builder_add_route(String address, int prefix_length, boolean ipv6);
boolean tun_builder_exclude_route(String address, int prefix_length, boolean ipv6);
boolean tun_builder_add_dns_server(String address, boolean ipv6, boolean reroute_gw);
boolean tun_builder_add_search_domain(String domain, boolean reroute_gw);
boolean tun_builder_set_mtu(int mtu);
// Callback to set the session name
boolean tun_builder_set_session_name(String name);
// Callback to establish the VPN tunnel, returning a file descriptor
// to the tunnel, which the caller will henceforth own. Returns -1
// if the tunnel could not be established.
int tun_builder_establish();
void tun_builder_teardown();
}
public OpenVPNClientThread() {
@ -241,38 +230,65 @@ public class OpenVPNClientThread extends ClientAPI_OpenVPNClient implements Runn
}
@Override
public boolean tun_builder_add_address(String address, int prefix_length) {
public boolean tun_builder_set_remote_address(String address, boolean ipv6) {
TunBuilder tb = tun_builder;
if (tb != null)
return tb.tun_builder_add_address(address, prefix_length);
return tb.tun_builder_set_remote_address(address, ipv6);
else
return false;
}
@Override
public boolean tun_builder_add_route(String address, int prefix_length) {
public boolean tun_builder_add_address(String address, int prefix_length, boolean ipv6) {
TunBuilder tb = tun_builder;
if (tb != null)
return tb.tun_builder_add_route(address, prefix_length);
return tb.tun_builder_add_address(address, prefix_length, ipv6);
else
return false;
}
@Override
public boolean tun_builder_add_dns_server(String address) {
public boolean tun_builder_reroute_gw(String server_address, boolean server_address_ipv6, boolean ipv6) {
TunBuilder tb = tun_builder;
if (tb != null)
return tb.tun_builder_add_dns_server(address);
return tb.tun_builder_reroute_gw(server_address, server_address_ipv6, ipv6);
else
return false;
}
@Override
public boolean tun_builder_add_search_domain(String domain)
public boolean tun_builder_add_route(String address, int prefix_length, boolean ipv6) {
TunBuilder tb = tun_builder;
if (tb != null)
return tb.tun_builder_add_route(address, prefix_length, ipv6);
else
return false;
}
@Override
public boolean tun_builder_exclude_route(String address, int prefix_length, boolean ipv6) {
TunBuilder tb = tun_builder;
if (tb != null)
return tb.tun_builder_exclude_route(address, prefix_length, ipv6);
else
return false;
}
@Override
public boolean tun_builder_add_dns_server(String address, boolean ipv6, boolean reroute_gw) {
TunBuilder tb = tun_builder;
if (tb != null)
return tb.tun_builder_add_dns_server(address, ipv6, reroute_gw);
else
return false;
}
@Override
public boolean tun_builder_add_search_domain(String domain, boolean reroute_gw)
{
TunBuilder tb = tun_builder;
if (tb != null)
return tb.tun_builder_add_search_domain(domain);
return tb.tun_builder_add_search_domain(domain, reroute_gw);
else
return false;
}
@ -304,4 +320,11 @@ public class OpenVPNClientThread extends ClientAPI_OpenVPNClient implements Runn
else
return -1;
}
@Override
public void tun_builder_teardown() {
TunBuilder tb = tun_builder;
if (tb != null)
tb.tun_builder_teardown();
}
}

8
javacli/ovpncli.i
View File

@ -15,15 +15,19 @@
// modify exported C++ class names to incorporate their enclosing namespace
%rename(ClientAPI_OpenVPNClient) OpenVPNClient;
%rename(ClientAPI_TunBuilderBase) TunBuilderBase;
%rename(ClientAPI_ExternalPKIBase) ExternalPKIBase;
%rename(ClientAPI_ServerEntry) ServerEntry;
%rename(ClientAPI_EvalConfig) EvalConfig;
%rename(ClientAPI_DynamicChallenge) DynamicChallenge;
%rename(ClientAPI_ProvideCreds) ProvideCreds;
%rename(ClientAPI_SessionToken) SessionToken;
%rename(ClientAPI_DynamicChallenge) DynamicChallenge;
%rename(ClientAPI_Config) Config;
%rename(ClientAPI_Event) Event;
%rename(ClientAPI_ConnectionInfo) ConnectionInfo;
%rename(ClientAPI_Status) Status;
%rename(ClientAPI_LogInfo) LogInfo;
%rename(ClientAPI_ExternalPKIBase) ExternalPKIBase;
%rename(ClientAPI_InterfaceStats) InterfaceStats;
%rename(ClientAPI_TransportStats) TransportStats;
%rename(ClientAPI_ExternalPKIRequestBase) ExternalPKIRequestBase;
%rename(ClientAPI_ExternalPKICertRequest) ExternalPKICertRequest;
%rename(ClientAPI_ExternalPKISignRequest) ExternalPKISignRequest;