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

In OpenVPNClientThread, make wait_thread() void, and get status

Browse Source 
instead from connect_status().
This commit is contained in:
James Yonan 2012-02-15 19:39:51 +00:00
parent 17ba45b487
commit db2a195dff
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
javacli/Client.java
View File

@ -45,9 +45,10 @@ public class Client implements OpenVPNClientThread.EventReceiver {
client_thread.connect(this);
// wait for worker thread to exit
Status status = client_thread.wait_thread();
client_thread.wait_thread();
// show connect status
Status status = client_thread.connect_status();
System.out.format("END Status: err=%b msg='%s'%n", status.getError(), status.getMessage());
}

17
javacli/OpenVPNClientThread.java
View File

@ -1,7 +1,7 @@
public class OpenVPNClientThread extends OpenVPNClientBase implements Runnable {
private EventReceiver parent;
private Thread thread;
private Status connect_status;
private Status connect_status_;
public interface EventReceiver {
void event(Event event);
@ -11,7 +11,7 @@ public class OpenVPNClientThread extends OpenVPNClientBase implements Runnable {
public OpenVPNClientThread() {
parent = null;
thread = null;
connect_status = null;
connect_status_ = null;
}
// start connect session in worker thread
@ -20,7 +20,7 @@ public class OpenVPNClientThread extends OpenVPNClientBase implements Runnable {
parent = parent_arg;
// clear status
connect_status = null;
connect_status_ = null;
// execute client in a worker thread
thread = new Thread(this, "OpenVPNClientThread");
@ -28,8 +28,8 @@ public class OpenVPNClientThread extends OpenVPNClientBase implements Runnable {
}
// wait for worker thread to complete; to stop thread,
// first call super stop() method then wait_thread().
public Status wait_thread() {
// first call super stop() method then wait_thread()
public void wait_thread() {
if (thread != null) {
boolean interrupted;
do {
@ -47,7 +47,10 @@ public class OpenVPNClientThread extends OpenVPNClientBase implements Runnable {
parent = null;
thread = null;
}
return connect_status;
}
public Status connect_status() {
return connect_status_;
}
@Override
@ -64,6 +67,6 @@ public class OpenVPNClientThread extends OpenVPNClientBase implements Runnable {
@Override
public void run() {
connect_status = super.connect();
connect_status_ = super.connect();
}
}