H2B: More incremental progres

include/aws/http/http.h

@@ -22,7 +22,6 @@
 
 enum aws_http_errors {
     AWS_ERROR_HTTP_UNKNOWN = 0x0800,
-    AWS_ERROR_HTTP_PARSE,
     AWS_ERROR_HTTP_INVALID_HEADER_FIELD,
     AWS_ERROR_HTTP_INVALID_HEADER_NAME,
     AWS_ERROR_HTTP_INVALID_HEADER_VALUE,
@@ -47,6 +46,8 @@ enum aws_http_errors {
     AWS_ERROR_HTTP_SERVER_CLOSED,
     AWS_ERROR_HTTP_PROXY_TLS_CONNECT_FAILED,
     AWS_ERROR_HTTP_CONNECTION_MANAGER_SHUTTING_DOWN,
+    AWS_ERROR_HTTP_PROTOCOL_ERROR,
+    AWS_ERROR_HTTP_STREAM_CLOSED,
 
     AWS_ERROR_HTTP_END_RANGE = 0x0C00,
 };

include/aws/http/private/connection_impl.h

@@ -123,16 +123,6 @@ struct aws_http_client_bootstrap {
 
 AWS_EXTERN_C_BEGIN
 
-AWS_HTTP_API
-struct aws_http_connection *aws_http_connection_new_http1_1_server(
-    struct aws_allocator *allocator,
-    size_t initial_window_size);
-
-AWS_HTTP_API
-struct aws_http_connection *aws_http_connection_new_http1_1_client(
-    struct aws_allocator *allocator,
-    size_t initial_window_size);
-
 AWS_HTTP_API
 void aws_http_connection_set_system_vtable(const struct aws_http_connection_system_vtable *system_vtable);
 

include/aws/http/private/h1_connection.h

@@ -0,0 +1,35 @@
+#ifndef AWS_HTTP_H1_CONNECTION_H
+#define AWS_HTTP_H1_CONNECTION_H
+
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <aws/http/private/connection_impl.h>
+
+AWS_EXTERN_C_BEGIN
+
+AWS_HTTP_API
+struct aws_http_connection *aws_http_connection_new_http1_1_server(
+    struct aws_allocator *allocator,
+    size_t initial_window_size);
+
+AWS_HTTP_API
+struct aws_http_connection *aws_http_connection_new_http1_1_client(
+    struct aws_allocator *allocator,
+    size_t initial_window_size);
+
+AWS_EXTERN_C_END
+
+#endif /* AWS_HTTP_H1_CONNECTION_H */

include/aws/http/private/h2_connection.h

@@ -0,0 +1,58 @@
+#ifndef AWS_HTTP_H2_CONNECTION_H
+#define AWS_HTTP_H2_CONNECTION_H
+
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <aws/common/atomics.h>
+#include <aws/common/mutex.h>
+
+#include <aws/http/private/connection_impl.h>
+
+struct aws_h2_connection {
+    struct aws_http_connection base;
+
+    /* Only the event-loop thread may touch this data */
+    struct {
+        struct aws_h2_decoder *decoder;
+    } thread_data;
+
+    /* Any thread may touch this data, but the lock must be held */
+    struct {
+        struct aws_mutex lock;
+
+        /* Refers to the next stream id to vend */
+        uint32_t next_stream_id;
+    } synced_data;
+};
+
+AWS_EXTERN_C_BEGIN
+
+AWS_HTTP_API
+struct aws_http_connection *aws_http_connection_new_http2_server(
+    struct aws_allocator *allocator,
+    size_t initial_window_size);
+
+AWS_HTTP_API
+struct aws_http_connection *aws_http_connection_new_http2_client(
+    struct aws_allocator *allocator,
+    size_t initial_window_size);
+
+AWS_HTTP_API
+uint32_t aws_h2_connection_get_next_stream_id(struct aws_h2_connection *connection);
+
+AWS_EXTERN_C_END
+
+#endif /* AWS_HTTP_H2_CONNECTION_H */

include/aws/http/private/h2_decoder.h

@@ -0,0 +1,42 @@
+#ifndef AWS_HTTP_H2_DECODER_H
+#define AWS_HTTP_H2_DECODER_H
+
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <aws/http/private/http_impl.h>
+
+/**
+ * Structure used to initialize an `aws_h2_decoder`.
+ */
+struct aws_h2_decoder_params {
+    struct aws_allocator *alloc;
+    void *user_data;
+    struct aws_http_decoder_vtable vtable;
+};
+
+struct aws_h2_decoder;
+
+AWS_EXTERN_C_BEGIN
+
+AWS_HTTP_API struct aws_h2_decoder *aws_h2_decoder_new(struct aws_h2_decoder_params *params);
+AWS_HTTP_API void aws_h2_decoder_destroy(struct aws_h2_decoder *decoder);
+AWS_HTTP_API int aws_h2_decode(struct aws_h2_decoder *decoder, struct aws_byte_cursor *data);
+
+AWS_HTTP_API void aws_h2_decoder_set_logging_id(struct aws_h2_decoder *decoder, void *id);
+
+AWS_EXTERN_C_END
+
+#endif /* AWS_HTTP_H2_DECODER_H */

include/aws/http/private/h2_frames.h

@@ -252,6 +252,9 @@ struct aws_h2_frame_decoder {
 
 AWS_EXTERN_C_BEGIN
 
+AWS_HTTP_API
+const char *aws_h2_frame_type_to_str(enum aws_h2_frame_type type);
+
 /* Internal methods exposed for testing purposes only */
 AWS_HTTP_API
 int aws_h2_frame_header_block_init(struct aws_h2_frame_header_block *header_block, struct aws_allocator *allocator);

include/aws/http/private/h2_stream.h

@@ -0,0 +1,72 @@
+#ifndef AWS_HTTP_H2_STREAM_H
+#define AWS_HTTP_H2_STREAM_H
+
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <aws/http/private/h2_frames.h>
+#include <aws/http/private/request_response_impl.h>
+
+#include <aws/common/mutex.h>
+
+enum aws_h2_stream_state {
+    AWS_H2_STREAM_STATE_IDLE,
+    AWS_H2_STREAM_STATE_RESERVED_LOCAL,
+    AWS_H2_STREAM_STATE_RESERVED_REMOTE,
+    AWS_H2_STREAM_STATE_OPEN,
+    AWS_H2_STREAM_STATE_HALF_CLOSED_LOCAL,
+    AWS_H2_STREAM_STATE_HALF_CLOSED_REMOTE,
+    AWS_H2_STREAM_STATE_CLOSED,
+
+    AWS_H2_STREAM_STATE_COUNT,
+};
+
+struct aws_h2_stream {
+    struct aws_http_stream base;
+
+    const uint32_t id;
+
+    /* Only the event-loop thread may touch this data */
+    struct {
+        bool expects_continuation;
+        enum aws_h2_stream_state state;
+        uint64_t window_size; /* #TODO try to figure out how this actually works, and then implement it */
+    } thread_data;
+
+    /* Any thread may touch this data, but the lock must be held */
+    struct {
+        struct aws_mutex lock;
+
+    } synced_data;
+};
+
+struct aws_h2_stream;
+
+AWS_EXTERN_C_BEGIN
+
+AWS_HTTP_API
+const char *aws_h2_stream_state_to_str(enum aws_h2_stream_state state);
+
+AWS_HTTP_API
+struct aws_h2_stream *aws_h1_stream_new_request(
+    struct aws_http_connection *client_connection,
+    const struct aws_http_make_request_options *options);
+
+AWS_HTTP_API
+int aws_h2_stream_handle_frame(struct aws_h2_stream *stream, struct aws_h2_frame_decoder *decoder);
+
+AWS_EXTERN_C_END
+
+#endif /* AWS_HTTP_H2_STREAM_H */

source/connection.c

@@ -13,7 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#include <aws/http/private/connection_impl.h>
+#include <aws/http/private/h1_connection.h>
+#include <aws/http/private/h2_connection.h>
 #include <aws/http/private/proxy_impl.h>
 
 #include <aws/common/hash_table.h>
@@ -147,6 +148,14 @@ static struct aws_http_connection *s_connection_new(
                 connection = aws_http_connection_new_http1_1_client(alloc, initial_window_size);
             }
             break;
+        case AWS_HTTP_VERSION_2:
+            AWS_FATAL_ASSERT(false && "H2 is not currently supported"); /* lol nice try */
+            if (is_server) {
+                connection = aws_http_connection_new_http2_server(alloc, initial_window_size);
+            } else {
+                connection = aws_http_connection_new_http2_client(alloc, initial_window_size);
+            }
+            break;
         default:
             AWS_LOGF_ERROR(
                 AWS_LS_HTTP_CONNECTION,