all tests passing again

Author: graebm

include/aws/http/http.h

@@ -68,8 +68,6 @@ enum aws_http_log_subject {
     AWS_LS_HTTP_CONNECTION_MANAGER,
     AWS_LS_HTTP_WEBSOCKET,
     AWS_LS_HTTP_WEBSOCKET_SETUP,
-
-    AWS_LS_HTTP_FRAMES,
 };
 
 enum aws_http_version {

include/aws/http/private/h2_frames.h

@@ -16,7 +16,6 @@
  * permissions and limitations under the License.
  */
 
-#include <aws/http/private/hpack.h>
 #include <aws/http/request_response.h>
 
 #include <aws/common/byte_buf.h>
@@ -81,6 +80,12 @@ enum aws_h2_settings {
 #define AWS_H2_WINDOW_UPDATE_MAX (0x7FFFFFFF)
 #define AWS_H2_STREAM_ID_MAX (0x7FFFFFFF)
 
+/* Legal min(inclusive) and max(inclusive) for each setting */
+extern const uint32_t aws_h2_settings_bounds[AWS_H2_SETTINGS_END_RANGE][2];
+
+/* Initial values for settings RFC-7540 6.5.2 */
+extern const uint32_t aws_h2_settings_initial[AWS_H2_SETTINGS_END_RANGE];
+
 /* This magic string must be the very first thing a client sends to the server.
  * See RFC-7540 3.5 - HTTP/2 Connection Preface */
 extern const struct aws_byte_cursor aws_h2_connection_preface_client_string;
@@ -101,23 +106,6 @@ struct aws_h2_frame_priority_settings {
     uint8_t weight;
 };
 
-struct aws_h2_frame_header_block {
-    const struct aws_http_headers *headers;
-
-    /* state */
-
-    enum {
-        AWS_H2_HEADER_BLOCK_STATE_INIT,
-        AWS_H2_HEADER_BLOCK_STATE_FIRST_FRAME,
-        AWS_H2_HEADER_BLOCK_STATE_CONTINUATION,
-        AWS_H2_HEADER_BLOCK_STATE_COMPLETE,
-        AWS_H2_HEADER_BLOCK_STATE_ERROR,
-    } state;
-
-    struct aws_byte_buf whole_encoded_block;     /* entire header block is encoded here */
-    struct aws_byte_cursor encoded_block_cursor; /* tracks progress sending encoded header-block in fragments */
-};
-
 /**
  * A frame to be encoded.
  * (in the case of HEADERS and PUSH_PROMISE, it might turn into multiple frames due to CONTINUATION)
@@ -130,19 +118,33 @@ struct aws_h2_frame {
     struct aws_linked_list_node node;
 };
 
-/* Represents a HEADERS header-block.
- * (HEADERS frame followed 0 or more CONTINUATION frames) */
+/* Represents a HEADERS or PUSH_PROMISE frame (followed by zero or more CONTINUATION frames) */
 struct aws_h2_frame_headers {
     struct aws_h2_frame base;
 
-    /* Flags */
+    /* Common data */
+    const struct aws_http_headers *headers;
+    uint8_t pad_length; /* Set to 0 to disable AWS_H2_FRAME_F_PADDED */
+
+    /* HEADERS-only data */
     bool end_stream;   /* AWS_H2_FRAME_F_END_STREAM */
     bool has_priority; /* AWS_H2_FRAME_F_PRIORITY */
-
-    /* Payload */
-    uint8_t pad_length; /* Set to 0 to disable AWS_H2_FRAME_F_PADDED */
     struct aws_h2_frame_priority_settings priority;
-    struct aws_h2_frame_header_block header_block;
+
+    /* PUSH_PROMISE-only data */
+    uint32_t promised_stream_id;
+
+    /* State */
+    enum {
+        AWS_H2_HEADERS_STATE_INIT,
+        AWS_H2_HEADERS_STATE_FIRST_FRAME,
+        AWS_H2_HEADERS_STATE_CONTINUATION,
+        AWS_H2_HEADERS_STATE_COMPLETE,
+        AWS_H2_HEADERS_STATE_ERROR,
+    } state;
+
+    struct aws_byte_buf whole_encoded_header_block;
+    struct aws_byte_cursor header_block_cursor; /* tracks progress sending encoded header-block in fragments */
 };
 
 /* Represents a PRIORITY frame */
@@ -179,17 +181,6 @@ struct aws_h2_frame_settings {
     size_t settings_count;
 };
 
-/* Represents a PUSH_PROMISE header-block.
- * (PUSH_PROMISE frame followed by 0 or more CONTINUATION frames) */
-struct aws_h2_frame_push_promise {
-    struct aws_h2_frame base;
-
-    /* Payload */
-    uint8_t pad_length; /* Set to 0 to disable AWS_H2_FRAME_F_PADDED */
-    uint32_t promised_stream_id;
-    struct aws_h2_frame_header_block header_block;
-};
-
 #define AWS_H2_PING_DATA_SIZE (8)
 
 /* Represents a PING frame */
@@ -223,12 +214,11 @@ struct aws_h2_frame_window_update {
 
 /* Used to encode a frame */
 struct aws_h2_frame_encoder {
-    /* Larger state */
     struct aws_allocator *allocator;
+    const void *logging_id;
     struct aws_hpack_context *hpack;
     struct aws_h2_frame *current_frame;
     bool has_errored;
-    enum aws_hpack_huffman_mode huffman_mode;
 };
 
 typedef void aws_h2_frame_destroy_fn(struct aws_h2_frame *frame_base);
@@ -258,7 +248,8 @@ int aws_h2_validate_stream_id(uint32_t stream_id);
  * 2. Encode the frame using aws_h2_frame_*_encode
  */
 AWS_HTTP_API
-int aws_h2_frame_encoder_init(struct aws_h2_frame_encoder *encoder, struct aws_allocator *allocator);
+int aws_h2_frame_encoder_init(struct aws_h2_frame_encoder *encoder, struct aws_allocator *allocator, void *logging_id);
+
 AWS_HTTP_API
 void aws_h2_frame_encoder_clean_up(struct aws_h2_frame_encoder *encoder);
 

include/aws/http/private/hpack.h

@@ -52,9 +52,9 @@ struct aws_hpack_decode_result {
  * This only controls how string values are encoded when they're not already in a table.
  */
 enum aws_hpack_huffman_mode {
+    AWS_HPACK_HUFFMAN_SMALLEST,
     AWS_HPACK_HUFFMAN_NEVER,
     AWS_HPACK_HUFFMAN_ALWAYS,
-    AWS_HPACK_HUFFMAN_SMALLEST,
 };
 
 AWS_EXTERN_C_BEGIN
@@ -90,24 +90,13 @@ int aws_hpack_decode(
     struct aws_hpack_decode_result *result);
 
 /**
- * Must be called at start of header-block.
- * If the table has been resized, then a Dynamic Table Size Update (RFC-7541 6.3) is encoded.
- * This behavior is described in RFC-7541 4.2.
+ * Encode header-block into the output.
+ * This function will mutate the hpack context, so an error means the context can no longer be used.
  * Note that output will be dynamically resized if it's too short.
  */
-AWS_HTTP_API
-int aws_hpack_encode_header_block_start(struct aws_hpack_context *context, struct aws_byte_buf *output);
-
-/**
- * Encode a header-field into the output.
- * This function will mutate the hpack context, so any error is unrecoverable.
- * Note that output will be dynamically resized if it's too short.
- */
-AWS_HTTP_API
-int aws_hpack_encode_header(
+int aws_hpack_encode_header_block(
     struct aws_hpack_context *context,
-    const struct aws_http_header *header,
-    enum aws_hpack_huffman_mode huffman_mode,
+    const struct aws_http_headers *headers,
     struct aws_byte_buf *output);
 
 /* Returns the hpack size of a header (name.len + value.len + 32) [4.1] */
@@ -132,6 +121,9 @@ int aws_hpack_insert_header(struct aws_hpack_context *context, const struct aws_
 AWS_HTTP_API
 int aws_hpack_resize_dynamic_table(struct aws_hpack_context *context, size_t new_max_size);
 
+AWS_HTTP_API
+void aws_hpack_set_huffman_mode(struct aws_hpack_context *context, enum aws_hpack_huffman_mode mode);
+
 /* Public for testing purposes.
  * Output will be dynamically resized if it's too short */
 AWS_HTTP_API
@@ -152,7 +144,6 @@ AWS_HTTP_API
 int aws_hpack_encode_string(
     struct aws_hpack_context *context,
     struct aws_byte_cursor to_encode,
-    enum aws_hpack_huffman_mode huffman_mode,
     struct aws_byte_buf *output);
 
 /* Public for testing purposes */

include/aws/http/request_response.h

@@ -362,6 +362,13 @@ void aws_http_headers_release(struct aws_http_headers *headers);
  * The underlying strings are copied.
  */
 AWS_HTTP_API
+int aws_http_headers_add_v2(struct aws_http_headers *headers, const struct aws_http_header *header);
+
+/**
+ * Add a header with default compression settings.
+ * The underlying strings are copied.
+ */
+AWS_HTTP_API
 int aws_http_headers_add(struct aws_http_headers *headers, struct aws_byte_cursor name, struct aws_byte_cursor value);
 
 /**

source/h2_connection.c

@@ -219,7 +219,7 @@ static struct aws_h2_connection *s_connection_new(
         goto error;
     }
 
-    if (aws_h2_frame_encoder_init(&connection->thread_data.encoder, alloc)) {
+    if (aws_h2_frame_encoder_init(&connection->thread_data.encoder, alloc, &connection->base)) {
         CONNECTION_LOGF(
             ERROR, connection, "Encoder init error %d (%s)", aws_last_error(), aws_error_name(aws_last_error()));
         goto error;

source/h2_decoder.c

@@ -244,7 +244,8 @@ int aws_h2_decode(struct aws_h2_decoder *decoder, struct aws_byte_cursor *data)
     /* Run decoder state machine until we're no longer changing states.
      * We don't simply loop `while(data->len)` because some states consume no data,
      * and these states should run even when there is no data left. */
-    for (decoder->state_changed = false; decoder->state_changed; decoder->state_changed = false) {
+    do {
+        decoder->state_changed = false;
 
         const uint32_t bytes_required = decoder->state->bytes_required;
         AWS_ASSERT(bytes_required <= decoder->scratch.capacity);
@@ -302,7 +303,7 @@ int aws_h2_decode(struct aws_h2_decoder *decoder, struct aws_byte_cursor *data)
                     decoder->scratch.len);
             }
         }
-    }
+    } while (decoder->state_changed);
 
     return AWS_OP_SUCCESS;