Change port from uint16_t to uint32_t, to support VSOCK (#394)

awslabs · Dec 30, 2023 · 1dd55be · 1dd55be
1 parent 7dd72a9
commit 1dd55be
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/aws/s3/private/s3_client_impl.h b/include/aws/s3/private/s3_client_impl.h
@@ -59,7 +59,7 @@ struct aws_s3_endpoint_options {
     uint32_t max_connections;
 
     /* HTTP port override. If zero, determine port based on TLS context */
-    uint16_t port;
+    uint32_t port;
 
     /**
      * Optional.

diff --git a/source/s3_client.c b/source/s3_client.c
@@ -944,7 +944,7 @@ struct aws_s3_meta_request *aws_s3_client_make_meta_request(
     AWS_FATAL_ASSERT(aws_http_headers_get(message_headers, g_host_header_name, &host_header_value) == AWS_OP_SUCCESS);
 
     bool is_https = true;
-    uint16_t port = 0;
+    uint32_t port = 0;
 
     if (options->endpoint != NULL) {
         struct aws_byte_cursor https_scheme = aws_byte_cursor_from_c_str("https");

diff --git a/source/s3_endpoint.c b/source/s3_endpoint.c
@@ -23,8 +23,8 @@
 #include <inttypes.h>
 
 static const uint32_t s_connection_timeout_ms = 3000;
-static const uint16_t s_http_port = 80;
-static const uint16_t s_https_port = 443;
+static const uint32_t s_http_port = 80;
+static const uint32_t s_https_port = 443;
 
 static void s_s3_endpoint_on_host_resolver_address_resolved(
     struct aws_host_resolver *resolver,
@@ -39,7 +39,7 @@ static struct aws_http_connection_manager *s_s3_endpoint_create_http_connection_
     struct aws_client_bootstrap *client_bootstrap,
     const struct aws_tls_connection_options *tls_connection_options,
     uint32_t max_connections,
-    uint16_t port,
+    uint32_t port,
     const struct aws_http_proxy_config *proxy_config,
     const struct proxy_env_var_settings *proxy_ev_settings,
     uint32_t connect_timeout_ms,
@@ -136,7 +136,7 @@ static struct aws_http_connection_manager *s_s3_endpoint_create_http_connection_
     struct aws_client_bootstrap *client_bootstrap,
     const struct aws_tls_connection_options *tls_connection_options,
     uint32_t max_connections,
-    uint16_t port,
+    uint32_t port,
     const struct aws_http_proxy_config *proxy_config,
     const struct proxy_env_var_settings *proxy_ev_settings,
     uint32_t connect_timeout_ms,