Remove workaround for Android 4.4
PATCH 1/1 Remove workaround for Android 4.4
Android 4.4 is now 9 years old and the main user of this API (OpenVPN for Android) does not support this OS anymore. This workaround is now safe to remove.
--- src/openvpn/manage.c | 6 +----- src/openvpn/manage.h | 3 +-- src/openvpn/tun.c | 9 +-------- 3 files changed, 3 insertions(+), 15 deletions(-)
src/openvpn/manage.c +1 -5
@@ -2140,10 +2140,6 @@ managment_android_persisttun_action(struct management *man) {return ANDROID_KEEP_OLD_TUN ; } - else if (!strcmp("OPEN_AFTER_CLOSE", up.password)) - { -return ANDROID_OPEN_AFTER_CLOSE ; - } else if (!strcmp("OPEN_BEFORE_CLOSE", up.password)) {return ANDROID_OPEN_BEFORE_CLOSE ;
@@ -2154,7 +2150,7 @@ managment_android_persisttun_action(struct management *man) }ASSERT (0 ); -return ANDROID_OPEN_AFTER_CLOSE ; +return ANDROID_OPEN_BEFORE_CLOSE ; }
src/openvpn/manage.h +1 -2
@@ -383,8 +383,7 @@ bool management_query_user_pass(struct management *man,bool management_android_control (struct management *man,const char *command,const char *msg);#define ANDROID_KEEP_OLD_TUN 1 -#define ANDROID_OPEN_AFTER_CLOSE 2 -#define ANDROID_OPEN_BEFORE_CLOSE 3 +#define ANDROID_OPEN_BEFORE_CLOSE 2int managment_android_persisttun_action (struct management *man);#endif
src/openvpn/tun.c +1 -8
@@ -1879,13 +1879,6 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tunint android_method =managment_android_persisttun_action (management); -/* Android 4.4 workaround */ -if (oldtunfd >=0 && android_method ==ANDROID_OPEN_AFTER_CLOSE ) - { -close (oldtunfd); -management_sleep (2 ); - } -if (oldtunfd >=0 && android_method ==ANDROID_KEEP_OLD_TUN ) {/* keep the old fd */
@@ -1900,7 +1893,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun management->connection.lastfdreceived =-1 ; } -if (oldtunfd>=0 && android_method ==ANDROID_OPEN_BEFORE_CLOSE ) +if (oldtunfd >=0 && android_method ==ANDROID_OPEN_BEFORE_CLOSE ) {close (oldtunfd); }
Signature · 1 line
2.32.0 (Apple Git-132)
I have not actually investigated this in more detail - but this is something the Android GUI controls, so if you say "it will never send this message anymore" we can remove the code from openvpn core.
I did wonder (on IRC) if we can get rid of ANDROID_OPEN_BEFORE_CLOSE at the same time - but looking more close, I see that we still have two variants, ANDROID_KEEP_OLD_TUN and ANDROID_OPEN_BEFORE_CLOSE. So, yes, as long as the GUI can send both, we need both in the core...
Your patch has been applied to the master branch.
commit 44517fd7694012502318975173b1d0c05045d388
Author: Arne Schwabe Date: Wed May 4 13:18:02 2022 +0200
Remove workaround for Android 4.4
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg24276.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Re: Remove workaround for Android 4.4
Quoted 39 lines · On Thu, 5 May 2022, 21:11 Gert Doering, <[email protected]...> wrote:
Acked-by Gert Doering <[email protected]...>I have not actually investigated this in more detail - but this is something the Android GUI controls, so if you say "it will never send this message anymore" we can remove the code from openvpn core.
I did wonder (on IRC) if we can get rid of
ANDROID_OPEN_BEFORE_CLOSEat the same time - but looking more close, I see that we still have two variants,ANDROID_KEEP_OLD_TUNandANDROID_OPEN_BEFORE_CLOSE. So, yes, as long as the GUI can send both, we need both in the core...Your patch has been applied to the master branch.
commit
44517fd7694012502318975173b1d0c05045d388Author: Arne Schwabe Date: Wed May 4 13:18:02 2022 +0200Remove workaround for Android 4.4 Signed-off-by: Arne Schwabe <[email protected]...> Acked-by: Gert Doering <[email protected]...> Message-Id: <[email protected]...> URL: https://www.mail-archive.com/[email protected]/msg24276.html Signed-off-by: Gert Doering <[email protected]...>--
kind regards,Gert Doering
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel