When disabling VPN manually, there was no trigger for ipsec-tools to
send “delete message” to VPN server. Therefore, connection information
is left in VPN server and next connection fails.
Fix this issue as below:
- Add “delete message” sending via flush in ipsec-tools when racoon
daemon stops
- Keep daemon alive when VPN.java exit() to let it finish sending to
VPN server
- Move close(socket) and stop(daemon) in VPN.java execute()
and monitorDaemons() to run() to gather cleaning block.
(cherry picked from commit 047454c759)
Change-Id: Ibfbd389b17de5b5a5d23cba59c8d1e05fbe12c15
Bug: 28279646
Bug: 33467086
2b465d889c