Merge commit '9b95600d069b5477fb0a091ffb9a51500c73c87d' into feature/update-dependencies

OpenVPN Adapter/Vendors/openvpn/client/ovpncli.hpp

@@ -29,6 +29,7 @@
 #include <utility>
 
 #include <openvpn/tun/builder/base.hpp>
+#include <openvpn/tun/extern/fw.hpp>
 #include <openvpn/pki/epkibase.hpp>
 
 namespace openvpn {
@@ -269,6 +270,11 @@ namespace openvpn {
       // pass through control channel INFO notifications via "INFO" event
       bool info = false;
 
+      // Periodic convenience clock tick in milliseconds.
+      // Will call clock_tick() at a frequency defined by this parameter.
+      // Set to 0 to disable.
+      unsigned int clockTickMS = 0;
+
       // Gremlin configuration (requires that the core is built with OPENVPN_GREMLIN)
       std::string gremlinConfig;
     };
@@ -403,7 +409,11 @@ namespace openvpn {
     };
 
     // Top-level OpenVPN client class.
-    class OpenVPNClient : public TunBuilderBase, public LogReceiver, private ExternalPKIBase {
+    class OpenVPNClient : public TunBuilderBase,            // expose tun builder virtual methods
+			  public LogReceiver,               // log message notification
+			  public ExternalTun::Factory,      // low-level tun override
+			  private ExternalPKIBase
+    {
     public:
       OpenVPNClient();
       virtual ~OpenVPNClient();
@@ -523,6 +533,9 @@ namespace openvpn {
       virtual bool remote_override_enabled();
       virtual void remote_override(RemoteOverride&);
 
+      // Periodic convenience clock tick, controlled by Config::clock_tick_ms
+      virtual void clock_tick();
+
       // Do a crypto library self test
       static std::string crypto_self_test();
 
@@ -561,6 +574,9 @@ namespace openvpn {
       void check_app_expired();
       static MergeConfig build_merge_config(const ProfileMerge&);
 
+      friend class MyClientEvents;
+      void on_disconnect();
+
       // from ExternalPKIBase
       virtual bool sign(const std::string& data, std::string& sig);