Remove RSVs from public API

These are only used by extensions, which are not currently supported. So just remove them. Keeping them here will only prevent us from supporting extensions in the future.

Author: graebm

include/aws/http/websocket.h

@@ -82,7 +82,6 @@ struct aws_websocket_incoming_frame {
     uint64_t payload_length;
     uint8_t opcode;
     bool fin;
-    bool rsv[3];
 };
 
 /**
@@ -309,7 +308,7 @@ typedef void(
 /**
  * Options for sending a websocket frame.
  * This structure is copied immediately by aws_websocket_send().
- * For descriptions of opcode, fin, rsv, and payload_length see in RFC-6455 Section 5.2.
+ * For descriptions of opcode, fin, and payload_length see in RFC-6455 Section 5.2.
  */
 struct aws_websocket_send_frame_options {
     /**
@@ -346,11 +345,6 @@ struct aws_websocket_send_frame_options {
      * Indicates that this is the final fragment in a message. The first fragment MAY also be the final fragment.
      */
     bool fin;
-
-    /**
-     * MUST be 0 unless an extension is negotiated that defines meanings for non-zero values.
-     */
-    bool rsv[3];
 };
 
 AWS_EXTERN_C_BEGIN

source/websocket.c

@@ -1291,9 +1291,6 @@ static int s_decoder_on_frame(const struct aws_websocket_frame *frame, void *use
     websocket->thread_data.current_incoming_frame->payload_length = frame->payload_length;
     websocket->thread_data.current_incoming_frame->opcode = frame->opcode;
     websocket->thread_data.current_incoming_frame->fin = frame->fin;
-    websocket->thread_data.current_incoming_frame->rsv[0] = frame->rsv[0];
-    websocket->thread_data.current_incoming_frame->rsv[1] = frame->rsv[1];
-    websocket->thread_data.current_incoming_frame->rsv[2] = frame->rsv[2];
 
     /* If CONTINUATION frames are expected, remember which type of data is being continued.
      * RFC-6455 Section 5.4 Fragmentation */

tests/test_websocket_handler.c

@@ -377,9 +377,6 @@ static int s_readpush_check(struct tester *tester, size_t frame_i, int expected_
     ASSERT_UINT_EQUALS(pushed->def.payload_length, received->def.payload_length);
     ASSERT_UINT_EQUALS(pushed->def.opcode, received->def.opcode);
     ASSERT_INT_EQUALS(pushed->def.fin, received->def.fin);
-    ASSERT_INT_EQUALS(pushed->def.rsv[0], received->def.rsv[0]);
-    ASSERT_INT_EQUALS(pushed->def.rsv[1], received->def.rsv[1]);
-    ASSERT_INT_EQUALS(pushed->def.rsv[2], received->def.rsv[2]);
 
     if (received->on_complete_error_code == AWS_ERROR_SUCCESS) {
         ASSERT_UINT_EQUALS(received->def.payload_length, received->payload.len);
@@ -621,9 +618,6 @@ static int s_check_written_message(struct send_tester *send, size_t expected_ord
     ASSERT_UINT_EQUALS(send->def.opcode, written->def.opcode);
     ASSERT_UINT_EQUALS(send->def.payload_length, written->def.payload_length);
     ASSERT_INT_EQUALS(send->def.fin, written->def.fin);
-    for (int i = 0; i < 3; i++) {
-        ASSERT_INT_EQUALS(send->def.rsv[i], written->def.rsv[i]);
-    }
 
     /* All payloads sent from client should have been masked (assuming client is being tested here) */
     ASSERT_TRUE(written->def.masked);