To support VSOCK, stop limiting port to 16 bits. (#517)

awslabs · Jan 2, 2024 · 6fa0c53 · 6fa0c53
1 parent dd49808
commit 6fa0c53
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/crt/aws-c-auth b/crt/aws-c-auth
diff --git a/crt/aws-c-cal b/crt/aws-c-cal
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils
diff --git a/crt/aws-lc b/crt/aws-lc
diff --git a/crt/s2n b/crt/s2n
diff --git a/source/event_stream.c b/source/event_stream.c
@@ -83,7 +83,7 @@ struct aws_event_stream_client_connection_binding {
      * Const post-creation.
      */
     struct aws_string *host;
-    uint16_t port;
+    uint32_t port;
     struct aws_socket_options socket_options;
     struct aws_tls_connection_options tls_connection_options;
     bool using_tls;
@@ -897,7 +897,7 @@ static int s_init_event_stream_connection_configuration_from_js_connection_confi
         return aws_raise_error(AWS_ERROR_INVALID_ARGUMENT);
     }
 
-    if (aws_napi_get_named_property_as_uint16(
+    if (aws_napi_get_named_property_as_uint32(
             env, node_connection_options, AWS_EVENT_STREAM_PROPERTY_NAME_PORT, &binding->port) !=
         AWS_NGNPR_VALID_VALUE) {
         return aws_raise_error(AWS_ERROR_INVALID_ARGUMENT);

diff --git a/source/http_connection.c b/source/http_connection.c
@@ -69,7 +69,7 @@ napi_value aws_napi_http_proxy_options_new(napi_env env, napi_callback_info info
         napi_throw_type_error(env, NULL, "port must be a number");
         goto cleanup;
     });
-    binding->native.port = (uint16_t)port;
+    binding->native.port = port;
 
     napi_value node_auth_method = *arg++;
     if (!aws_napi_is_null_or_undefined(env, node_auth_method)) {
@@ -352,7 +352,7 @@ napi_value aws_napi_http_connection_new(napi_env env, napi_callback_info info) {
         napi_throw_type_error(env, NULL, "port must be a Number");
         goto argument_error;
     });
-    options.port = (uint16_t)port;
+    options.port = port;
 
     napi_value node_socket_options = *arg++;
     AWS_NAPI_CALL(env, napi_get_value_external(env, node_socket_options, (void **)&options.socket_options), {

diff --git a/source/http_connection_manager.c b/source/http_connection_manager.c
@@ -102,11 +102,11 @@ napi_value aws_napi_http_connection_manager_new(napi_env env, napi_callback_info
 
     napi_value node_port = *arg++;
     uint32_t port = 0;
-    if (napi_get_value_uint32(env, node_port, &port) || port > UINT16_MAX) {
-        napi_throw_type_error(env, NULL, "port must be a number between 0 and 65535");
+    if (napi_get_value_uint32(env, node_port, &port)) {
+        napi_throw_type_error(env, NULL, "port must be a number between 0 and 4294967296");
         goto cleanup;
     }
-    options.port = (uint16_t)port;
+    options.port = port;
 
     napi_value node_max_conns = *arg++;
     uint32_t max_connections = 0;

diff --git a/source/mqtt5_client.c b/source/mqtt5_client.c
@@ -1911,7 +1911,7 @@ static int s_init_client_configuration_from_js_client_configuration(
     PARSE_REQUIRED_NAPI_PROPERTY(
         AWS_NAPI_KEY_PORT,
         "s_init_client_configuration_from_js_client_configuration",
-        aws_napi_get_named_property_as_uint16(env, node_client_config, AWS_NAPI_KEY_PORT, &client_options->port),
+        aws_napi_get_named_property_as_uint32(env, node_client_config, AWS_NAPI_KEY_PORT, &client_options->port),
         {});
 
     /* optional config parameters */

diff --git a/source/mqtt_client_connection.c b/source/mqtt_client_connection.c
@@ -1013,7 +1013,7 @@ napi_value aws_napi_mqtt_client_connection_connect(napi_env env, napi_callback_i
     options.on_connection_complete = s_on_connected;
     options.ping_timeout_ms = ping_timeout;
     options.protocol_operation_timeout_ms = protocol_operation_timeout;
-    options.port = (uint16_t)port_number;
+    options.port = port_number;
 
     options.socket_options = socket_options;
     options.tls_options = binding->use_tls_options ? &binding->tls_options : NULL;