http: server callback API simplified

This simplified API lets callbacks obtain the response from the
connection objection directly, and does not require the aio to carry
it as a parameter.  Further, the request and response are both
stored inline in the connection, reducing allocations.

This is at present only for the server; the client will get a similar
set of changes.

1 files changed, 5 insertions, 7 deletions

diff --git a/src/supplemental/http/http_public.c b/src/supplemental/http/http_public.c
index 8a81404e..dd35151a 100644
--- a/src/supplemental/http/http_public.c
+++ b/src/supplemental/http/http_public.c
@@ -482,25 +482,23 @@ nng_http_conn_write_req(nng_http_conn *conn, nng_http_req *req, nng_aio *aio)
 }
 
 void
-nng_http_conn_write_res(nng_http_conn *conn, nng_http_res *res, nng_aio *aio)
+nng_http_conn_write_res(nng_http_conn *conn, nng_aio *aio)
 {
 #ifdef NNG_SUPP_HTTP
-	nni_http_write_res(conn, res, aio);
+	nni_http_write_res(conn, aio);
 #else
 	NNI_ARG_UNUSED(conn);
-	NNI_ARG_UNUSED(res);
 	nni_aio_finish_error(aio, NNG_ENOTSUP);
 #endif
 }
 
 void
-nng_http_conn_read_req(nng_http_conn *conn, nng_http_req *req, nng_aio *aio)
+nng_http_conn_read_req(nng_http_conn *conn, nng_aio *aio)
 {
 #ifdef NNG_SUPP_HTTP
-	nni_http_read_req(conn, req, aio);
+	nni_http_read_req(conn, aio);
 #else
 	NNI_ARG_UNUSED(conn);
-	NNI_ARG_UNUSED(req);
 	nni_aio_finish_error(aio, NNG_ENOTSUP);
 #endif
 }
@@ -519,7 +517,7 @@ nng_http_conn_read_res(nng_http_conn *conn, nng_http_res *res, nng_aio *aio)
 
 int
 nng_http_handler_alloc(
-    nng_http_handler **hp, const char *uri, void (*cb)(nng_aio *))
+    nng_http_handler **hp, const char *uri, nng_http_handler_func cb)
 {
 #ifdef NNG_SUPP_HTTP
 	return (nni_http_handler_init(hp, uri, cb));