Skip to content

Add the possibility to extend session_impl #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add the possibility to extend session_impl #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9143c9d
Extend session
Bjoe Aug 8, 2023
b2d2789
Fix cmake install missing headers
Bjoe Aug 11, 2023
2f54b21
Only inject session_impl
Bjoe Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/allocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ALLOCATOR_H
#define ALLOCATOR_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#ifndef _WIN32
# include <sys/uio.h>
Expand All @@ -34,7 +34,7 @@
#include <cassert>
#include <utility>

#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {

Expand Down
4 changes: 2 additions & 2 deletions lib/asio_client_request.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_client.h>

#include "asio_client_request_impl.h"

#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {
namespace asio_http2 {
Expand Down
4 changes: 2 additions & 2 deletions lib/asio_client_request_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#include "asio_client_request_impl.h"

#include "asio_client_stream.h"
#include "asio_client_session_impl.h"
#include "template.h"
#include <nghttp2/asio_client_session_impl.h>
#include <nghttp2/template.h>

namespace nghttp2 {
namespace asio_http2 {
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_client_request_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_CLIENT_REQUEST_IMPL_H
#define ASIO_CLIENT_REQUEST_IMPL_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_client.h>

Expand Down
4 changes: 2 additions & 2 deletions lib/asio_client_response.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_client.h>

#include "asio_client_response_impl.h"

#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {
namespace asio_http2 {
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_client_response_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
#include "asio_client_response_impl.h"

#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {
namespace asio_http2 {
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_client_response_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_CLIENT_RESPONSE_IMPL_H
#define ASIO_CLIENT_RESPONSE_IMPL_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_client.h>

Expand Down
10 changes: 8 additions & 2 deletions lib/asio_client_session.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_client.h>

#include "asio_client_session_tcp_impl.h"
#include "asio_client_session_tls_impl.h"
#include "asio_common.h"
#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {
namespace asio_http2 {
Expand Down Expand Up @@ -87,6 +87,12 @@ session::session(boost::asio::io_service &io_service,
impl_->start_resolve(host, service);
}

session::session(std::shared_ptr<session_impl> impl)
: impl_{impl}
{
}


session::~session() {}

session::session(session &&other) noexcept : impl_(std::move(other.impl_)) {}
Expand Down
4 changes: 2 additions & 2 deletions lib/asio_client_session_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "asio_client_session_impl.h"
#include "nghttp2/asio_client_session_impl.h"

#include <iostream>

#include "asio_client_stream.h"
#include "asio_client_request_impl.h"
#include "asio_client_response_impl.h"
#include "asio_common.h"
#include "template.h"
#include <nghttp2/template.h>
#include "util.h"
#include "http2.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_client_session_tcp_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_CLIENT_SESSION_TCP_IMPL_H
#define ASIO_CLIENT_SESSION_TCP_IMPL_H

#include "asio_client_session_impl.h"
#include <nghttp2/asio_client_session_impl.h>

#include <nghttp2/asio_http2_client.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_client_session_tls_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_CLIENT_SESSION_TLS_IMPL_H
#define ASIO_CLIENT_SESSION_TLS_IMPL_H

#include "asio_client_session_impl.h"
#include <nghttp2/asio_client_session_impl.h>

#include <nghttp2/asio_http2_client.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_client_stream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "asio_client_request_impl.h"
#include "asio_client_response_impl.h"
#include "asio_client_session_impl.h"
#include <nghttp2/asio_client_session_impl.h>

namespace nghttp2 {
namespace asio_http2 {
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_client_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_CLIENT_STREAM_H
#define ASIO_CLIENT_STREAM_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_client.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_client_tls_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_CLIENT_TLS_CONTEXT_H
#define ASIO_CLIENT_TLS_CONTEXT_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_client.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <memory>

#include "util.h"
#include "template.h"
#include <nghttp2/template.h>
#include "http2.h"

namespace nghttp2 {
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_COMMON_H
#define ASIO_COMMON_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <string>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_io_service_pool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#ifndef ASIO_IO_SERVICE_POOL_H
#define ASIO_IO_SERVICE_POOL_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <vector>
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#ifndef ASIO_SERVER_H
#define ASIO_SERVER_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <string>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions lib/asio_server_connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#ifndef ASIO_SERVER_CONNECTION_H
#define ASIO_SERVER_CONNECTION_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <memory>

Expand All @@ -49,7 +49,7 @@
#include "asio_server_http2_handler.h"
#include "asio_server_serve_mux.h"
#include "util.h"
#include "template.h"
#include <nghttp2/template.h>

#if BOOST_VERSION >= 107000
# define GET_IO_SERVICE(s) \
Expand Down
4 changes: 2 additions & 2 deletions lib/asio_server_http2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

#include "asio_server_http2_impl.h"
#include "asio_server.h"
#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_http2_handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "asio_server_response_impl.h"
#include "http2.h"
#include "util.h"
#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_http2_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_SERVER_HTTP2_HANDLER_H
#define ASIO_SERVER_HTTP2_HANDLER_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <map>
#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_http2_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "asio_server.h"
#include "util.h"
#include "tls.h"
#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_http2_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_SERVER_HTTP2_IMPL_H
#define ASIO_SERVER_HTTP2_IMPL_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

Expand Down
4 changes: 2 additions & 2 deletions lib/asio_server_request.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

#include "asio_server_request_impl.h"

#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {
namespace asio_http2 {
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_request_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_SERVER_REQUEST_HANDLER_H
#define ASIO_SERVER_REQUEST_HANDLER_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_request_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_SERVER_REQUEST_IMPL_H
#define ASIO_SERVER_REQUEST_IMPL_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>
#include <boost/asio/ip/tcp.hpp>
Expand Down
4 changes: 2 additions & 2 deletions lib/asio_server_response.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

#include "asio_server_response_impl.h"

#include "template.h"
#include <nghttp2/template.h>

namespace nghttp2 {
namespace asio_http2 {
Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_response_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_SERVER_RESPONSE_IMPL_H
#define ASIO_SERVER_RESPONSE_IMPL_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_serve_mux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_SERVER_SERVE_MUX_H
#define ASIO_SERVER_SERVE_MUX_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_SERVER_STREAM_H
#define ASIO_SERVER_STREAM_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/asio_server_tls_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef ASIO_SERVER_TLS_CONTEXT_H
#define ASIO_SERVER_TLS_CONTEXT_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <nghttp2/asio_http2_server.h>

Expand Down
4 changes: 2 additions & 2 deletions lib/http2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef HTTP2_H
#define HTTP2_H

#include "nghttp2_config.h"
#include <nghttp2/nghttp2_config.h>

#include <cstdio>
#include <cstring>
Expand All @@ -38,7 +38,7 @@
#include "url-parser/url_parser.h"

#include "util.h"
#include "template.h"
#include <nghttp2/template.h>
#include "allocator.h"

namespace nghttp2 {
Expand Down
3 changes: 3 additions & 0 deletions lib/includes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ install(FILES
nghttp2/asio_http2.h
nghttp2/asio_http2_client.h
nghttp2/asio_http2_server.h
nghttp2/asio_client_session_impl.h
nghttp2/nghttp2_config.h
nghttp2/template.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/nghttp2")
Loading