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

WS::ClientSet: HTTP persistence refactor

Browse Source 
HTTP persistence across transaction sets can now be
simplified using assign_http_state()

Signed-off-by: James Yonan <james@openvpn.net>
This commit is contained in:
James Yonan 2018-09-21 16:39:53 -06:00 committed by Lev Stipakov
parent 72e5cb6b52
commit 8bfc822183
No known key found for this signature in database
GPG Key ID: 88670BE258B9C258
1 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
openvpn/ws/httpcliset.hpp
View File

@ -55,34 +55,46 @@ namespace openvpn {
class HTTPStateContainer
{
public:
void create_container()
{
if (!c)
c.reset(new Container);
}
void stop()
{
if (http)
http->stop();
if (c && c->http)
c->http->stop();
}
void reset()
{
http.reset();
if (c)
c->http.reset();
}
void abort(const std::string& message)
{
if (http)
http->abort(message);
if (c && c->http)
c->http->abort(message);
}
bool alive() const
{
return http && http->is_alive();
return c && c->http && c->http->is_alive();
}
bool alive(const std::string& host) const
{
return alive() && c->http->host_match(host);
}
#ifdef ASIO_HAS_LOCAL_SOCKETS
int unix_fd()
{
if (!http)
if (!c || !c->http)
return -1;
AsioPolySock::Unix* us = dynamic_cast<AsioPolySock::Unix*>(http->get_socket());
AsioPolySock::Unix* us = dynamic_cast<AsioPolySock::Unix*>(c->http->get_socket());
if (!us)
return -1;
return us->socket.native_handle();
@ -92,16 +104,22 @@ namespace openvpn {
private:
friend Client;
struct Container : public RC<thread_unsafe_refcount>
{
typedef RCPtr<Container> Ptr;
HTTPDelegate::Ptr http;
};
void attach(Client* parent)
{
http->attach(parent);
c->http->attach(parent);
}
void close(const bool keepalive)
{
if (http)
if (c && c->http)
{
http->detach(keepalive);
c->http->detach(keepalive);
if (!keepalive)
stop();
}
@ -110,15 +128,17 @@ namespace openvpn {
void construct(openvpn_io::io_context& io_context,
const WS::Client::Config::Ptr config)
{
http.reset(new HTTPDelegate(io_context, std::move(config), nullptr));
create_container();
close(false);
c->http.reset(new HTTPDelegate(io_context, std::move(config), nullptr));
}
void start_request()
{
http->start_request();
c->http->start_request();
}
HTTPDelegate::Ptr http;
Container::Ptr c;
};
class TransactionSet;
@ -307,10 +327,16 @@ namespace openvpn {
// such as the hostname.
ErrorRecovery::Ptr error_recovery;
void reset_push_back(std::unique_ptr<Transaction>&& t)
void assign_http_state(HTTPStateContainer& http_state)
{
transactions.clear();
transactions.push_back(std::move(t));
http_state.create_container();
hsc = http_state;
preserve_http_state = true;
}
bool alive() const
{
return hsc.alive(host.host);
}
WS::ClientSet::Transaction& first_transaction()
@ -337,15 +363,6 @@ namespace openvpn {
return true;
}
void reset_host(const std::string& new_host)
{
if (new_host != host.host)
{
hsc.stop();
host.host = new_host;
}
}
void reset_callbacks()
{
completion.reset();
@ -658,9 +675,7 @@ namespace openvpn {
{
if (check_if_done())
return;
if (!ts->hsc.alive())
ts->hsc.construct(parent->io_context, ts->http_config);
ts->hsc.attach(this);
retry_duration = ts->retry_duration;
// get current transaction
@ -676,6 +691,11 @@ namespace openvpn {
if (error_retry && ts->error_recovery)
ts->error_recovery->retry(*ts, t);
// init and attach HTTPStateContainer
if (!ts->alive())
ts->hsc.construct(parent->io_context, ts->http_config);
ts->hsc.attach(this);
ts->hsc.start_request();
}