Update OpenVPN 2 and 3

This changes the OpenVPN version number to 2.7 since we branched off
2.6 from master.

main/src/main/cpp/openvpn-config/config.h

@@ -21,27 +21,15 @@
 /* Use dmalloc memory debugging library */
 /* #undef DMALLOC */
 
-/* Dimension to use for empty array declaration */
-#define EMPTY_ARRAY_SIZE 0
-
-/* Enable client capability only */
-#define ENABLE_CLIENT_ONLY 1
-
 /* Enable debugging support */
 #define ENABLE_DEBUG 1
 
 /* Enable internal fragmentation support */
 #define ENABLE_FRAGMENT 1
 
-/* Enable HTTP proxy support */
-#define ENABLE_HTTP_PROXY 1
-
 /* Enable management server capability */
 #define ENABLE_MANAGEMENT 1
 
-/* Enable multi-homed UDP server capability */
-#define ENABLE_MULTIHOME 0
-
 /* Allow --askpass and --auth-user-pass passwords to be read from a file */
 #define ENABLE_PASSWORD_SAVE 1
 
@@ -450,13 +438,13 @@
 #define PACKAGE_NAME "OpenVPN"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenVPN 2.6-icsopenvpn"
+#define PACKAGE_STRING "OpenVPN 2.7-icsopenvpn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openvpn"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6_master"
+#define PACKAGE_VERSION "2.7_master"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */

main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java

@@ -189,12 +189,14 @@ private boolean setConfig(String vpnconfig) {
         config.setExternalPkiAlias("extpki");
         config.setCompressionMode("asym");
 
+
         config.setHwAddrOverride(NetworkUtils.getFakeMacAddrFromSAAID(mService));
         config.setInfo(true);
         config.setAllowLocalLanAccess(mVp.mAllowLocalLAN);
         boolean retryOnAuthFailed = mVp.mAuthRetry == AUTH_RETRY_NOINTERACT;
         config.setRetryOnAuthFailed(retryOnAuthFailed);
         config.setEnableLegacyAlgorithms(mVp.mUseLegacyProvider);
+        /* We want the same app internal route emulation for OpenVPN 2 and OpenVPN 3 */
         config.setEnableRouteEmulation(false);
         if (mVp.mCompatMode > 0 && mVp.mCompatMode < 20500)
             config.setEnableNonPreferredDCAlgorithms(true);