jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed private to protected in Server/Client<HTTP/HTTPS> classes, and some cleanup

Browse source
This commit is contained in:
eidheim 2016-08-21 10:59:24 +02:00
commit 1268c5b6de
4 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client_https.hpp
View file

@ -13,30 +13,30 @@ namespace SimpleWeb {
Client(const std::string& server_port_path, bool verify_certificate=true,
const std::string& cert_file=std::string(), const std::string& private_key_file=std::string(),
const std::string& verify_file=std::string()) :
ClientBase<HTTPS>::ClientBase(server_port_path, 443), asio_context(boost::asio::ssl::context::sslv23) {
ClientBase<HTTPS>::ClientBase(server_port_path, 443), context(boost::asio::ssl::context::sslv23) {
if(verify_certificate)
asio_context.set_verify_mode(boost::asio::ssl::verify_peer);
context.set_verify_mode(boost::asio::ssl::verify_peer);
else
asio_context.set_verify_mode(boost::asio::ssl::verify_none);
context.set_verify_mode(boost::asio::ssl::verify_none);
if(cert_file.size()>0 && private_key_file.size()>0) {
asio_context.use_certificate_chain_file(cert_file);
asio_context.use_private_key_file(private_key_file, boost::asio::ssl::context::pem);
context.use_certificate_chain_file(cert_file);
context.use_private_key_file(private_key_file, boost::asio::ssl::context::pem);
}
if(verify_file.size()>0)
asio_context.load_verify_file(verify_file);
context.load_verify_file(verify_file);
socket=std::make_shared<HTTPS>(asio_io_service, asio_context);
socket=std::make_shared<HTTPS>(io_service, context);
}
private:
boost::asio::ssl::context asio_context;
protected:
boost::asio::ssl::context context;
void connect() {
if(socket_error || !socket->lowest_layer().is_open()) {
boost::asio::ip::tcp::resolver::query query(host, std::to_string(port));
boost::asio::connect(socket->lowest_layer(), asio_resolver.resolve(query));
boost::asio::connect(socket->lowest_layer(), resolver.resolve(query));
boost::asio::ip::tcp::no_delay option(true);
socket->lowest_layer().set_option(option);