diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-03-02 16:38:49 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-03-02 17:15:47 -0800 |
| commit | 6ea6b8659ffc2bdff325a3d71c67cc1cfb854c51 (patch) | |
| tree | ef6f6fc35e71f2279b118e6b9cbfecd275b696cf /src/supplemental/http | |
| parent | 48a1033794eb423c3f216bba02abd61240306e0d (diff) | |
| download | nng-6ea6b8659ffc2bdff325a3d71c67cc1cfb854c51.tar.gz nng-6ea6b8659ffc2bdff325a3d71c67cc1cfb854c51.tar.bz2 nng-6ea6b8659ffc2bdff325a3d71c67cc1cfb854c51.zip | |
Isolate TLS functions into separate tls.h header file.
Diffstat (limited to 'src/supplemental/http')
| -rw-r--r-- | src/supplemental/http/http_api.h | 4 | ||||
| -rw-r--r-- | src/supplemental/http/http_client.c | 1 | ||||
| -rw-r--r-- | src/supplemental/http/http_conn.c | 3 | ||||
| -rw-r--r-- | src/supplemental/http/http_public.c | 1 | ||||
| -rw-r--r-- | src/supplemental/http/http_server.c | 1 |
5 files changed, 8 insertions, 2 deletions
diff --git a/src/supplemental/http/http_api.h b/src/supplemental/http/http_api.h index 31c54146..8de859b4 100644 --- a/src/supplemental/http/http_api.h +++ b/src/supplemental/http/http_api.h @@ -12,6 +12,8 @@ #define NNG_SUPPLEMENTAL_HTTP_HTTP_API_H #include "core/nng_impl.h" +#include "supplemental/tls/tls.h" + #include "supplemental/http/http.h" // This represents the "internal" HTTP API. It should not be used @@ -115,7 +117,7 @@ extern void nni_http_write_full(nni_http_conn *, nni_aio *); extern int nni_http_sock_addr(nni_http_conn *, nni_sockaddr *); extern int nni_http_peer_addr(nni_http_conn *, nni_sockaddr *); -// nni_tls_http_verified returns true if the peer has been verified using TLS. +// nni_http_tls_verified returns true if the peer has been verified using TLS. extern bool nni_http_tls_verified(nni_http_conn *); // nni_http_server will look for an existing server with the same diff --git a/src/supplemental/http/http_client.c b/src/supplemental/http/http_client.c index 484a2e72..c62a3c56 100644 --- a/src/supplemental/http/http_client.c +++ b/src/supplemental/http/http_client.c @@ -15,6 +15,7 @@ #include "core/nng_impl.h" #include "supplemental/tls/tls.h" +#include "supplemental/tls/tls_api.h" #include "http_api.h" diff --git a/src/supplemental/http/http_conn.c b/src/supplemental/http/http_conn.c index cdfdbaa9..d37c9a2f 100644 --- a/src/supplemental/http/http_conn.c +++ b/src/supplemental/http/http_conn.c @@ -13,6 +13,7 @@ #include "core/nng_impl.h" #include "supplemental/tls/tls.h" +#include "supplemental/tls/tls_api.h" #include "http_api.h" @@ -760,4 +761,4 @@ nni_http_conn_init_tls(nni_http_conn **connp, nng_tls_config *cfg, void *tcp) nni_plat_tcp_pipe_fini(tcp); return (NNG_ENOTSUP); } -#endif // NNG_SUPP_TLS
\ No newline at end of file +#endif // NNG_SUPP_TLS diff --git a/src/supplemental/http/http_public.c b/src/supplemental/http/http_public.c index b2007469..2d879807 100644 --- a/src/supplemental/http/http_public.c +++ b/src/supplemental/http/http_public.c @@ -9,6 +9,7 @@ // #include "core/nng_impl.h" +#include "supplemental/tls/tls.h" #include "http.h" #include "http_api.h" diff --git a/src/supplemental/http/http_server.c b/src/supplemental/http/http_server.c index f8b8c64b..503ab1dd 100644 --- a/src/supplemental/http/http_server.c +++ b/src/supplemental/http/http_server.c @@ -15,6 +15,7 @@ #include "core/nng_impl.h" #include "supplemental/tls/tls.h" +#include "supplemental/tls/tls_api.h" #include "http_api.h" |