espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-29 10:17:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

asio: make the example code conform to Espressif C++ standards

Browse Source 
* Original commit: espressif/esp-idf@b2150f86a5
This commit is contained in:
David Čermák
2020-06-18 16:16:41 +08:00
committed by gabsuren
parent c05558ba28
commit f00c3be139
1 changed files with 73 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
examples/protocols/asio/ssl_client_server/main/asio_ssl_main.cpp
View File

@ -27,20 +27,20 @@ extern const unsigned char cacert_pem_end[] asm("_binary_ca_crt_end");
extern const unsigned char prvtkey_pem_start[] asm("_binary_server_key_start"); extern const unsigned char prvtkey_pem_start[] asm("_binary_server_key_start");
extern const unsigned char prvtkey_pem_end[] asm("_binary_server_key_end"); extern const unsigned char prvtkey_pem_end[] asm("_binary_server_key_end");
const asio::const_buffer cert_chain(cacert_pem_start, cacert_pem_end - cacert_pem_start); static const asio::const_buffer cert_chain(cacert_pem_start, cacert_pem_end - cacert_pem_start);
const asio::const_buffer privkey(prvtkey_pem_start, prvtkey_pem_end - prvtkey_pem_start); static const asio::const_buffer privkey(prvtkey_pem_start, prvtkey_pem_end - prvtkey_pem_start);
const asio::const_buffer server_cert(server_pem_start, server_pem_end - server_pem_start); static const asio::const_buffer server_cert(server_pem_start, server_pem_end - server_pem_start);
using asio::ip::tcp; using asio::ip::tcp;
enum { max_length = 1024 }; static const std::size_t max_length = 1024;
class Client { class Client {
public: public:
Client(asio::io_context& io_context, Client(asio::io_context &io_context,
asio::ssl::context& context, asio::ssl::context &context,
const tcp::resolver::results_type& endpoints) const tcp::resolver::results_type &endpoints)
: socket_(io_context, context) : socket_(io_context, context)
{ {
#if CONFIG_EXAMPLE_CLIENT_VERIFY_PEER #if CONFIG_EXAMPLE_CLIENT_VERIFY_PEER
@ -53,37 +53,29 @@ public:
} }
private: private:
void connect(const tcp::resolver::results_type& endpoints) void connect(const tcp::resolver::results_type &endpoints)
{ {
asio::async_connect(socket_.lowest_layer(), endpoints, asio::async_connect(socket_.lowest_layer(), endpoints,
[this](const std::error_code& error, [this](const std::error_code & error,
const tcp::endpoint& /*endpoint*/) const tcp::endpoint & /*endpoint*/) {
{ if (!error) {
if (!error) handshake();
{ } else {
handshake(); std::cout << "Connect failed: " << error.message() << "\n";
} }
else });
{
std::cout << "Connect failed: " << error.message() << "\n";
}
});
} }
void handshake() void handshake()
{ {
socket_.async_handshake(asio::ssl::stream_base::client, socket_.async_handshake(asio::ssl::stream_base::client,
[this](const std::error_code& error) [this](const std::error_code & error) {
{ if (!error) {
if (!error) send_request();
{ } else {
send_request(); std::cout << "Handshake failed: " << error.message() << "\n";
} }
else });
{
std::cout << "Handshake failed: " << error.message() << "\n";
}
});
} }
void send_request() void send_request()
@ -92,37 +84,28 @@ private:
asio::async_write(socket_, asio::async_write(socket_,
asio::buffer(request_, request_length), asio::buffer(request_, request_length),
[this](const std::error_code& error, std::size_t length) [this](const std::error_code & error, std::size_t length) {
{ if (!error) {
if (!error) receive_response(length);
{ } else {
receive_response(length); std::cout << "Write failed: " << error.message() << "\n";
} }
else });
{
std::cout << "Write failed: " << error.message() << "\n";
}
});
} }
void receive_response(std::size_t length) void receive_response(std::size_t length)
{ {
asio::async_read(socket_, asio::async_read(socket_,
asio::buffer(reply_, length), asio::buffer(reply_, length),
[this](const std::error_code& error, std::size_t length) [this](const std::error_code & error, std::size_t length) {
{ if (!error) {
if (!error) std::cout << "Reply: ";
{ std::cout.write(reply_, length);
std::cout << "Reply: "; std::cout << "\n";
std::cout.write(reply_, length); } else {
std::cout << "\n"; std::cout << "Read failed: " << error.message() << "\n";
} }
else });
{
std::cout << "Read failed: " << error.message() << "\n";
}
});
} }
asio::ssl::stream<tcp::socket> socket_; asio::ssl::stream<tcp::socket> socket_;
@ -132,8 +115,8 @@ private:
class Session : public std::enable_shared_from_this<Session> { class Session : public std::enable_shared_from_this<Session> {
public: public:
Session(tcp::socket socket, asio::ssl::context& context) Session(tcp::socket socket, asio::ssl::context &context)
: socket_(std::move(socket), context) : socket_(std::move(socket), context)
{ {
} }
@ -147,42 +130,37 @@ private:
{ {
auto self(shared_from_this()); auto self(shared_from_this());
socket_.async_handshake(asio::ssl::stream_base::server, socket_.async_handshake(asio::ssl::stream_base::server,
[this, self](const std::error_code& error) [this, self](const std::error_code & error) {
{ if (!error) {
if (!error) do_read();
{ }
do_read(); });
}
});
} }
void do_read() void do_read()
{ {
auto self(shared_from_this()); auto self(shared_from_this());
socket_.async_read_some(asio::buffer(data_), socket_.async_read_some(asio::buffer(data_),
[this, self](const std::error_code& ec, std::size_t length) [this, self](const std::error_code & ec, std::size_t length) {
{ if (!ec) {
if (!ec) std::cout << "Server received: ";
{ std::cout.write(data_, length);
data_[length] = 0; std::cout << std::endl;
std::cout << "Server received: " << data_ << std::endl; do_write(length);
do_write(length); }
} });
});
} }
void do_write(std::size_t length) void do_write(std::size_t length)
{ {
auto self(shared_from_this()); auto self(shared_from_this());
asio::async_write(socket_, asio::buffer(data_, length), asio::async_write(socket_, asio::buffer(data_, length),
[this, self](const std::error_code& ec, [this, self](const std::error_code & ec,
std::size_t /*length*/) std::size_t /*length*/) {
{ if (!ec) {
if (!ec) do_read();
{ }
do_read(); });
}
});
} }
asio::ssl::stream<tcp::socket> socket_; asio::ssl::stream<tcp::socket> socket_;
@ -191,13 +169,13 @@ private:
class Server { class Server {
public: public:
Server(asio::io_context& io_context, unsigned short port) Server(asio::io_context &io_context, unsigned short port)
: acceptor_(io_context, tcp::endpoint(tcp::v4(), port)), : acceptor_(io_context, tcp::endpoint(tcp::v4(), port)),
context_(asio::ssl::context::tls_server) context_(asio::ssl::context::tls_server)
{ {
context_.set_options( context_.set_options(
asio::ssl::context::default_workarounds asio::ssl::context::default_workarounds
| asio::ssl::context::no_sslv2); | asio::ssl::context::no_sslv2);
context_.use_certificate_chain(server_cert); context_.use_certificate_chain(server_cert);
context_.use_private_key(privkey, asio::ssl::context::pem); context_.use_private_key(privkey, asio::ssl::context::pem);
@ -208,15 +186,13 @@ private:
void do_accept() void do_accept()
{ {
acceptor_.async_accept( acceptor_.async_accept(
[this](const std::error_code& error, tcp::socket socket) [this](const std::error_code & error, tcp::socket socket) {
{ if (!error) {
if (!error) std::make_shared<Session>(std::move(socket), context_)->start();
{ }
std::make_shared<Session>(std::move(socket), context_)->start();
}
do_accept(); do_accept();
}); });
} }
tcp::acceptor acceptor_; tcp::acceptor acceptor_;
@ -289,7 +265,7 @@ extern "C" void app_main(void)
work_threads.emplace_back(ssl_client_thread); work_threads.emplace_back(ssl_client_thread);
#endif // CONFIG_EXAMPLE_CLIENT #endif // CONFIG_EXAMPLE_CLIENT
for (auto & t : work_threads) { for (auto &t : work_threads) {
t.join(); t.join();
} }