feat: initial h2 support code

Signed-off-by: Ar Rakin <rakinar2@onesoftnet.eu.org>

Author: virtual-designer

build-aux/valgrind

@@ -12,12 +12,12 @@
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # OSN freehttpd is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with OSN freehttpd.  If not, see <https://www.gnu.org/licenses/>.
 

src/core/conn.c

@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <unistd.h>
 
 #define FH_LOG_MODULE_NAME "conn"
@@ -30,6 +31,8 @@
 #include "http/http1_response.h"
 #include "http/protocol.h"
 #include "log/log.h"
+#include "compat.h"
+#include "macros.h"
 
 #ifdef HAVE_RESOURCES
 	#include "resources.h"
@@ -61,6 +64,7 @@ fh_conn_create (fd_t client_sockfd, const struct sockaddr_in *client_addr,
 	conn->server_addr = server_addr;
 	conn->io_ctx.h1.req_ctx = NULL;
 	conn->io_ctx.h1.res_ctx = NULL;
+	conn->io_ctx.proto_det_buf.off = 0;
 	conn->requests = (struct fh_requests *) (conn->stream + 1);
 	conn->extra = (struct fh_conn_extra *) (conn->requests + 1);
 
@@ -166,3 +170,46 @@ fh_conn_send_err_response (struct fh_conn *conn, enum fh_status code)
 
 	return rc >= 0;
 }
+
+int
+fh_conn_detect_protocol (struct fh_conn *conn)
+{
+	fd_t sockfd = conn->client_sockfd;
+
+	if (conn->io_ctx.proto_det_buf.off == 0)
+	{
+		conn->io_ctx.proto_det_buf.buf = fh_pool_alloc (conn->pool, H2_PREFACE_SIZE);
+
+		if (!conn->io_ctx.proto_det_buf.buf)
+			return -1;
+	}
+
+	if (conn->io_ctx.proto_det_buf.off >= H2_PREFACE_SIZE - 1)
+		return 1;
+
+	ssize_t bytes_read = recv (
+		sockfd, conn->io_ctx.proto_det_buf.buf + conn->io_ctx.proto_det_buf.off,
+		H2_PREFACE_SIZE - conn->io_ctx.proto_det_buf.off, 0);
+
+	if (bytes_read <= 0)
+	{
+		if (would_block ())
+			return 0;
+
+		return -1;
+	}
+
+	conn->io_ctx.proto_det_buf.off += (size_t) bytes_read;
+
+	if (conn->io_ctx.proto_det_buf.off >= H2_PREFACE_SIZE - 1)
+	{
+		if (memcmp (conn->io_ctx.proto_det_buf.buf, H2_PREFACE, H2_PREFACE_SIZE) == 0)
+			conn->protocol = FH_PROTOCOL_H2;
+		else
+			conn->protocol = FH_PROTOCOL_HTTP_1_1;
+
+		return 1;
+	}
+
+	return 0;
+}

src/core/conn.h

@@ -1,18 +1,18 @@
 /*
  * This file is part of OSN freehttpd.
- * 
+ *
  * Copyright (C) 2025  OSN Developers.
  *
  * OSN freehttpd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * OSN freehttpd is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with OSN freehttpd.  If not, see <https://www.gnu.org/licenses/>.
  */
@@ -48,6 +48,7 @@ struct fh_conn
 {
     object_id_t id;
     fd_t client_sockfd;
+	protocol_t protocol;
     struct sockaddr_in *client_addr;
     const struct sockaddr_in *server_addr;
     pool_t *pool;
@@ -57,6 +58,11 @@ struct fh_conn
     const struct fh_config_host *config;
 
     union {
+		struct {
+			char *buf;
+			size_t off;
+		} proto_det_buf;
+
         struct {
             struct fh_http1_req_ctx *req_ctx;
             struct fh_http1_res_ctx *res_ctx;
@@ -69,5 +75,6 @@ void fh_conn_destroy (struct fh_conn *conn);
 void fh_conn_push_request (struct fh_requests *requests, struct fh_request *request);
 struct fh_request *fh_conn_pop_request (struct fh_requests *requests);
 bool fh_conn_send_err_response (struct fh_conn *conn, enum fh_status code);
+int fh_conn_detect_protocol (struct fh_conn *conn);
 
 #endif /* FH_CORE_CONN_H */

src/core/stream.c

@@ -136,7 +136,8 @@ fh_stream_print (struct fh_stream *stream)
 		fh_pr_debug ("Start: %u", l->is_start);
 		fh_pr_debug ("EOS: %u", l->is_eos);
 		fh_pr_debug ("Readonly: %u", l->buf->attrs.mem.rd_only);
-		fh_pr_debug ("Data: |%.*s|", (int) l->buf->attrs.mem.len, l->buf->attrs.mem.data);
+		fh_pr_debug ("DATA:");
+		fh_pr_debug ("|%.*s|", (int) l->buf->attrs.mem.len, l->buf->attrs.mem.data);
 		fh_pr_debug ("=======");
 		l = l->next;
 	}

src/event/recv.c

@@ -31,20 +31,22 @@
 #include "log/log.h"
 #include "recv.h"
 
-bool
-event_recv (struct fh_server *server, const xevent_t *event)
+static bool
+event_recv_h2 (struct fh_server *server, struct fh_conn *conn,
+			   char *proto_det_buf, size_t proto_det_off)
 {
-	struct fh_conn *conn = itable_get (server->connections, event->data.fd);
+	(void) proto_det_buf;
+	(void) proto_det_off;
 
-	if (!conn)
-	{
-		fh_pr_err ("Socket %d does not have an associated connection object", event->data.fd);
-		xpoll_del (server->xpoll_fd, event->data.fd, XPOLLIN);
-		close (event->data.fd);
-		return false;
-	}
+	fh_pr_err ("Not implemented: h2");
+	fh_server_close_conn (server, conn);
+	return false;
+}
 
-	fh_pr_info ("connection %lu: recv called", conn->id);
+static bool
+event_recv_http1 (struct fh_server *server, struct fh_conn *conn,
+				  char *proto_det_buf, size_t proto_det_off)
+{
 	pool_t *child_pool = NULL;
 
 	if (!conn->io_ctx.h1.req_ctx)
@@ -59,24 +61,40 @@ event_recv (struct fh_server *server, const xevent_t *event)
 		}
 
 		fh_stream_init (conn->stream, child_pool);
+
+		if (fh_stream_add_buf_data (conn->stream, (uint8_t *) proto_det_buf,
+									proto_det_off, proto_det_off)
+			&& conn->stream->head)
+		{
+			conn->stream->head->buf->attrs.mem.rd_only = true;
+		}
 	}
 
-	struct fh_http1_req_ctx *ctx = conn->io_ctx.h1.req_ctx ? conn->io_ctx.h1.req_ctx : fh_http1_ctx_create (server, conn, conn->stream);
+	struct fh_http1_req_ctx *ctx
+		= conn->io_ctx.h1.req_ctx
+			  ? conn->io_ctx.h1.req_ctx
+			  : fh_http1_ctx_create (server, conn, conn->stream);
 
 	if (!conn->io_ctx.h1.req_ctx)
+	{
 		conn->io_ctx.h1.req_ctx = ctx;
+		ctx->cur.link = ctx->arg_cur.link = conn->stream->head;
+		ctx->cur.off = ctx->arg_cur.off = 0;
+		conn->stream->head->is_start = true;
+	}
 
 	if (!fh_http1_parse (ctx, conn))
 	{
 		if (ctx->state == H1_REQ_STATE_ERROR)
 		{
 			fh_pr_err ("HTTP/1.x parsing failed");
-			fh_conn_send_err_response (conn, ctx->suggested_code == 0 ? 500 : ctx->suggested_code);
+			fh_conn_send_err_response (
+				conn, ctx->suggested_code == 0 ? 500 : ctx->suggested_code);
 			fh_server_close_conn (server, conn);
 
 			if (child_pool)
 				fh_pool_destroy (child_pool);
-			
+
 			return true;
 		}
 
@@ -91,8 +109,10 @@ event_recv (struct fh_server *server, const xevent_t *event)
 		fh_conn_push_request (conn->requests, request);
 
 		fh_pr_info ("Method: |%s|", fh_method_to_string (ctx->request.method));
-		fh_pr_info ("URI: |%.*s|", (int) ctx->request.uri_len, ctx->request.uri);
-		fh_pr_info ("Protocol: %s", fh_protocol_to_string (ctx->request.protocol));
+		fh_pr_info ("URI: |%.*s|", (int) ctx->request.uri_len,
+					ctx->request.uri);
+		fh_pr_info ("Protocol: %s",
+					fh_protocol_to_string (ctx->request.protocol));
 
 		if (!xpoll_mod (server->xpoll_fd, conn->client_sockfd, XPOLLOUT))
 		{
@@ -107,3 +127,67 @@ event_recv (struct fh_server *server, const xevent_t *event)
 
 	return true;
 }
+
+bool
+event_recv (struct fh_server *server, const xevent_t *event)
+{
+	struct fh_conn *conn = itable_get (server->connections, event->data.fd);
+
+	if (!conn)
+	{
+		fh_pr_err ("Socket %d does not have an associated connection object",
+				   event->data.fd);
+		xpoll_del (server->xpoll_fd, event->data.fd, XPOLLIN);
+		close (event->data.fd);
+		return false;
+	}
+
+	fh_pr_info ("connection %lu: recv called", conn->id);
+
+	char *proto_det_buf = NULL;
+	size_t proto_det_off = 0;
+
+	if (conn->protocol == FH_PROTOCOL_UNKNOWN)
+	{
+		/* Detect the connection protocol */
+
+		int rc = fh_conn_detect_protocol (conn);
+
+		switch (rc)
+		{
+			case 0:
+				fh_pr_debug ("EAGAIN while detecting protocol");
+				return true;
+
+			case -1:
+				fh_pr_debug ("I/O error while detecting protocol");
+				fh_server_close_conn (server, conn);
+				return true;
+		}
+
+		proto_det_buf = conn->io_ctx.proto_det_buf.buf;
+		proto_det_off = conn->io_ctx.proto_det_buf.off;
+
+		conn->io_ctx.h1.req_ctx = NULL;
+		conn->io_ctx.h1.res_ctx = NULL;
+
+		fh_pr_debug ("Detected protocol: %s",
+					 fh_protocol_to_string (conn->protocol));
+	}
+
+	switch (conn->protocol)
+	{
+		case FH_PROTOCOL_HTTP_1_0:
+		case FH_PROTOCOL_HTTP_1_1:
+			return event_recv_http1 (server, conn, proto_det_buf,
+									 proto_det_off);
+
+		case FH_PROTOCOL_H2:
+			return event_recv_h2 (server, conn, proto_det_buf, proto_det_off);
+
+		default:
+			fh_pr_debug ("Unsupported protocol");
+			fh_server_close_conn (server, conn);
+			return true;
+	}
+}

src/http/h2.c

@@ -0,0 +1,20 @@
+/*
+ * This file is part of OSN freehttpd.
+ * 
+ * Copyright (C) 2025  OSN Developers.
+ *
+ * OSN freehttpd is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * OSN freehttpd is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OSN freehttpd.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "h2.h"