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

OMI : Windows seems to lose >FATAL: notifications that are transmitted immediately before OMI socket close. Work around the issue by adding a 250ms delay between the last write to the socket and the close.

Browse Source
This commit is contained in:
James Yonan 2016-03-30 00:17:10 -06:00 committed by Lev Stipakov
parent 26e99b1a37
commit 061daa8e3c
No known key found for this signature in database
GPG Key ID: 88670BE258B9C258
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openvpn/omi/omi.hpp
View File

@ -39,6 +39,7 @@
#include <openvpn/common/options.hpp>
#include <openvpn/buffer/bufstr.hpp>
#include <openvpn/time/timestr.hpp>
#include <openvpn/time/asiotimer.hpp>
// include acceptors for different protocols
#include <openvpn/acceptor/base.hpp>
@ -73,7 +74,7 @@ namespace openvpn {
// but if omi_stop() returns true, wait for content_out
// to be flushed to OMI socket before closing it.
if (!omi_stop() || content_out.empty())
stop_omi_client(false);
stop_omi_client(false, 250);
}
protected:
@ -206,7 +207,8 @@ namespace openvpn {
OMICore(asio::io_context& io_context_arg,
OptionList opt_arg)
: io_context(io_context_arg),
opt(std::move(opt_arg))
opt(std::move(opt_arg)),
stop_timer(io_context_arg)
{
}
@ -541,13 +543,24 @@ namespace openvpn {
void conditional_stop(const bool eof)
{
if (acceptor || stop_called)
stop_omi_client(eof);
stop_omi_client(eof, 250);
else
stop(); // if running in management-client mode, do a full stop
}
void stop_omi_client(const bool eof, const unsigned int milliseconds)
{
stop_timer.expires_at(Time::now() + Time::Duration::milliseconds(milliseconds));
stop_timer.async_wait([self=Ptr(this), eof](const asio::error_code& error)
{
if (!error)
self->stop_omi_client(eof);
});
}
void stop_omi_client(const bool eof)
{
stop_timer.cancel();
const bool is_open = is_sock_open();
if (is_open)
socket->close();
@ -863,6 +876,7 @@ namespace openvpn {
// stopping
bool stop_called = false;
AsioTimer stop_timer;
// hold
bool hold_wait = false;