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

awslabs · Jan 2, 2024 · 2981db9 · 2981db9
1 parent f4a52c8
commit 2981db9
Show file tree

Hide file tree

Showing 13 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-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-s3 b/crt/aws-c-s3
diff --git a/source/event_stream_rpc_client_connection.c b/source/event_stream_rpc_client_connection.c
@@ -46,13 +46,13 @@ PyObject *aws_py_event_stream_rpc_client_connection_connect(PyObject *self, PyOb
     struct aws_allocator *alloc = aws_py_get_allocator();
 
     const char *host_name;
-    uint16_t port;
+    uint32_t port;
     PyObject *bootstrap_py;
     PyObject *socket_options_py;
     PyObject *tls_options_py;
     PyObject *connection_py;
     if (!PyArg_ParseTuple(
-            args, "sHOOOO", &host_name, &port, &bootstrap_py, &socket_options_py, &tls_options_py, &connection_py)) {
+            args, "sIOOOO", &host_name, &port, &bootstrap_py, &socket_options_py, &tls_options_py, &connection_py)) {
         return NULL;
     }
 

diff --git a/source/http_connection.c b/source/http_connection.c
@@ -163,14 +163,14 @@ PyObject *aws_py_http_client_connection_new(PyObject *self, PyObject *args) {
     PyObject *on_shutdown_py;
     const char *host_name;
     Py_ssize_t host_name_len;
-    uint16_t port_number;
+    uint32_t port_number;
     PyObject *socket_options_py;
     PyObject *tls_options_py;
     PyObject *proxy_options_py;
 
     if (!PyArg_ParseTuple(
             args,
-            "OOOs#HOOO",
+            "OOOs#IOOO",
             &bootstrap_py,
             &on_connection_setup_py,
             &on_shutdown_py,

diff --git a/source/http_proxy.c b/source/http_proxy.c
@@ -27,7 +27,7 @@ bool aws_py_http_proxy_options_init(struct aws_http_proxy_options *proxy_options
         goto done;
     }
 
-    proxy_options->port = PyObject_GetAttrAsUint16(py_proxy_options, "HttpProxyOptions", "port");
+    proxy_options->port = PyObject_GetAttrAsUint32(py_proxy_options, "HttpProxyOptions", "port");
     if (PyErr_Occurred()) {
         goto done;
     }

diff --git a/source/mqtt5_client.c b/source/mqtt5_client.c
@@ -811,7 +811,7 @@ PyObject *aws_py_mqtt5_client_new(PyObject *self, PyObject *args) {
     PyObject *socket_options_py;
     PyObject *tls_ctx_py;
     PyObject *proxy_options_py;
-    uint16_t port;
+    uint32_t port;
 
     /* Connect Options */
     struct aws_byte_cursor client_id;          /* optional */
@@ -856,11 +856,11 @@ PyObject *aws_py_mqtt5_client_new(PyObject *self, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "Os#HOOOOz#Oz#z#OOOOOOOOOz*Oz#OOOz#z*z#OOOOOOOOOOOOO",
+            "Os#IOOOOz#Oz#z#OOOOOOOOOz*Oz#OOOz#z*z#OOOOOOOOOOOOO",
             /* O */ &self_py,
             /* s */ &host_name.ptr,
             /* # */ &host_name.len,
-            /* H */ &port,
+            /* I */ &port,
             /* O */ &bootstrap_py,
             /* O */ &socket_options_py,
             /* O */ &tls_ctx_py,

diff --git a/source/mqtt_client_connection.c b/source/mqtt_client_connection.c
@@ -645,7 +645,7 @@ PyObject *aws_py_mqtt_client_connection_connect(PyObject *self, PyObject *args)
     Py_ssize_t client_id_len;
     const char *server_name;
     Py_ssize_t server_name_len;
-    uint16_t port_number;
+    uint32_t port_number;
     PyObject *socket_options_py;
     PyObject *tls_ctx_py;
     uint64_t reconnect_min_timeout_secs;
@@ -663,7 +663,7 @@ PyObject *aws_py_mqtt_client_connection_connect(PyObject *self, PyObject *args)
     PyObject *proxy_options_py;
     if (!PyArg_ParseTuple(
             args,
-            "Os#s#HOOKKHIIOz#z#OOO",
+            "Os#s#IOOKKHIIOz#z#OOO",
             &impl_capsule,
             &client_id,
             &client_id_len,

diff --git a/source/websocket.c b/source/websocket.c
@@ -52,7 +52,7 @@ PyObject *aws_py_websocket_client_connect(PyObject *self, PyObject *args) {
     (void)self;
 
     struct aws_byte_cursor host;    /* s# */
-    uint16_t port;                  /* H */
+    uint32_t port;                  /* I */
     PyObject *handshake_request_py; /* O */
     PyObject *bootstrap_py;         /* O */
     PyObject *socket_options_py;    /* O */
@@ -64,7 +64,7 @@ PyObject *aws_py_websocket_client_connect(PyObject *self, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "s#HOOOOOpnO",
+            "s#IOOOOOpnO",
             &host.ptr,
             &host.len,
             &port,
+1 −1		include/aws/auth/credentials.h
+1 −1		tests/credentials_provider_ecs_tests.c
+44 −14		tests/credentials_provider_sso_tests.c
+27 −0		tests/credentials_provider_utils.c
+5 −0		tests/credentials_provider_utils.h
+25 −8		tests/token_provider_sso_tests.c
+3 −3		include/aws/common/uri.h
+18 −24		source/uri.c
+1 −1		tests/uri_test.c
+18 −0		.github/workflows/handle-stale-discussions.yml
+1 −1		include/aws/event-stream/event_stream_rpc_client.h
+2 −2		include/aws/event-stream/event_stream_rpc_server.h
+4 −2		source/event_stream.c
+1 −1		source/event_stream_rpc_server.c
+1 −1		tests/event_stream_rpc_server_connection_test.c
+1 −1		bin/elasticurl/main.c
+1 −1		include/aws/http/connection.h
+1 −1		include/aws/http/connection_manager.h
+1 −1		include/aws/http/http2_stream_manager.h
+2 −2		include/aws/http/private/proxy_impl.h
+1 −1		include/aws/http/proxy.h
+4 −3		include/aws/http/request_response.h
+1 −1		include/aws/http/websocket.h
+6 −6		source/connection.c
+1 −1		source/connection_manager.c
+1 −1		source/h2_connection.c
+1 −1		source/proxy_connection.c
+1 −1		source/websocket_bootstrap.c
+3 −3		tests/proxy_test_helper.c
+4 −4		tests/proxy_test_helper.h
+2 −2		tests/test_connection_manager.c
+22 −6		tests/test_h1_client.c
+29 −4		tests/test_h2_client.c
+2 −2		tests/test_proxy.c
+1 −1		tests/test_stream_manager.c
+2 −2		include/aws/io/channel_bootstrap.h
+17 −1		include/aws/io/socket.h
+6 −6		source/channel_bootstrap.c
+25 −28		source/posix/socket.c
+75 −0		source/socket_shared.c
+43 −33		source/windows/iocp/socket.c
+1 −0		tests/CMakeLists.txt
+53 −0		tests/socket_test.c
+4 −4		tests/tls_handler_test.c
+1 −1		bin/elastipubsub/main.c
+1 −1		bin/elastipubsub5/main.c
+2 −2		bin/mqtt5canary/main.c
+1 −1		include/aws/mqtt/client.h
+1 −1		include/aws/mqtt/private/client_impl.h
+1 −1		include/aws/mqtt/private/v5/mqtt5_options_storage.h
+1 −1		include/aws/mqtt/v5/mqtt5_client.h
+10 −4		source/v5/mqtt5_options_storage.c
+1 −1		source/v5/mqtt5_to_mqtt3_adapter.c
+1 −0		tests/CMakeLists.txt
+7 −0		tests/v5/mqtt5_operation_validation_failure_tests.c
+1 −1		include/aws/s3/private/s3_client_impl.h
+1 −1		source/s3_client.c
+4 −4		source/s3_endpoint.c