Skip to content

Commit bf8912a

Browse files
graebmgraebm
authored
To support VSOCK, stop limiting port to 16 bits. (#526)
1 parent 00aba38 commit bf8912a

File tree

27 files changed

+27
-30
lines changed

27 files changed

+27
-30
lines changed

‎android/iotdevicesdk/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ repositories {
9292
}
9393

9494
dependencies {
95-
api 'software.amazon.awssdk.crt:aws-crt-android:0.29.3'
95+
api 'software.amazon.awssdk.crt:aws-crt-android:0.29.5'
9696
implementation 'org.slf4j:slf4j-api:1.7.30'
9797
implementation 'com.google.code.gson:gson:2.9.0'
9898
implementation 'androidx.appcompat:appcompat:1.1.0'

‎deviceadvisor/tests/JobExecution/src/main/java/jobExecution/JobExecution.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
public class JobExecution {
4141
static String clientId = "test-" + UUID.randomUUID().toString();
42-
static short port = 8883;
42+
static int port = 8883;
4343

4444
static MqttClientConnection connection;
4545
static IotJobsClient jobs;

‎deviceadvisor/tests/MQTTConnect/src/main/java/MQTTConnect/MQTTConnect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static void main(String[] args) {
4949
try(AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(DATestUtils.certificatePath, DATestUtils.keyPath)) {
5050
builder.withClientId(clientId)
5151
.withEndpoint(DATestUtils.endpoint)
52-
.withPort((short)port)
52+
.withPort(port)
5353
.withCleanSession(true)
5454
.withPingTimeoutMs(60000)
5555
.withProtocolOperationTimeoutMs(60000);

‎deviceadvisor/tests/MQTTPublish/src/main/java/MQTTPublish/MQTTPublish.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static void main(String[] args) {
5252

5353
builder.withClientId(clientId)
5454
.withEndpoint(DATestUtils.endpoint)
55-
.withPort((short)port)
55+
.withPort(port)
5656
.withCleanSession(true)
5757
.withPingTimeoutMs(60000)
5858
.withProtocolOperationTimeoutMs(60000);

‎deviceadvisor/tests/MQTTSubscribe/src/main/java/MQTTSubscribe/MQTTSubscribe.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static void main(String[] args) {
5050

5151
builder.withClientId(clientId)
5252
.withEndpoint(DATestUtils.endpoint)
53-
.withPort((short)port)
53+
.withPort(port)
5454
.withCleanSession(true)
5555
.withPingTimeoutMs(60000)
5656
.withProtocolOperationTimeoutMs(60000);

‎deviceadvisor/tests/ShadowUpdate/src/main/java/shadowUpdate/ShadowUpdate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static void main(String[] args) {
8181
try(AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(DATestUtils.certificatePath, DATestUtils.keyPath)) {
8282
builder.withClientId(clientId)
8383
.withEndpoint(DATestUtils.endpoint)
84-
.withPort((short)port)
84+
.withPort(port)
8585
.withCleanSession(true)
8686
.withProtocolOperationTimeoutMs(60000);
8787

‎samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void onConnectionResumed(boolean sessionPresent) {
7575
builder.withConnectionEventCallbacks(callbacks)
7676
.withClientId(cmdData.input_clientId)
7777
.withEndpoint(cmdData.input_endpoint)
78-
.withPort((short)cmdData.input_port)
78+
.withPort(cmdData.input_port)
7979
.withCleanSession(true)
8080
.withProtocolOperationTimeoutMs(60000);
8181
if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {

‎samples/BasicPubSub/src/main/java/pubsub/PubSub.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void onConnectionResumed(boolean sessionPresent) {
7979
builder.withConnectionEventCallbacks(callbacks)
8080
.withClientId(cmdData.input_clientId)
8181
.withEndpoint(cmdData.input_endpoint)
82-
.withPort((short)cmdData.input_port)
82+
.withPort(cmdData.input_port)
8383
.withCleanSession(true)
8484
.withProtocolOperationTimeoutMs(60000);
8585
if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {

‎samples/CustomKeyOpsConnect/src/main/java/customkeyopsconnect/CustomKeyOpsConnect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public void onConnectionResumed(boolean sessionPresent) {
181181
builder.withConnectionEventCallbacks(callbacks)
182182
.withClientId(cmdData.input_clientId)
183183
.withEndpoint(cmdData.input_endpoint)
184-
.withPort((short)cmdData.input_port)
184+
.withPort(cmdData.input_port)
185185
.withCleanSession(true)
186186
.withProtocolOperationTimeoutMs(60000);
187187
if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {

‎samples/FleetProvisioning/src/main/java/fleetprovisioning/FleetProvisioningSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void onConnectionResumed(boolean sessionPresent) {
174174
builder.withConnectionEventCallbacks(callbacks)
175175
.withClientId(cmdData.input_clientId)
176176
.withEndpoint(cmdData.input_endpoint)
177-
.withPort((short)cmdData.input_port)
177+
.withPort(cmdData.input_port)
178178
.withCleanSession(true)
179179
.withProtocolOperationTimeoutMs(60000);
180180
connection = builder.build();

‎samples/FleetProvisioning/src/main/java/fleetprovisioning/Mqtt5FleetProvisioningSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void onConnectionResumed(boolean sessionPresent) {
182182
builder.withConnectionEventCallbacks(callbacks)
183183
.withClientId(cmdData.input_clientId)
184184
.withEndpoint(cmdData.input_endpoint)
185-
.withPort((short) cmdData.input_port)
185+
.withPort(cmdData.input_port)
186186
.withCleanSession(true)
187187
.withProtocolOperationTimeoutMs(60000);
188188
connection = builder.build();

‎samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private static MqttClientConnection getClientFromDiscovery(final DiscoveryClient
171171

172172
final AwsIotMqttConnectionBuilder connectionBuilder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(input_certPath, input_keyPath)
173173
.withClientId(input_thingName)
174-
.withPort(port.shortValue())
174+
.withPort(port)
175175
.withEndpoint(dnsOrIp)
176176
.withConnectionEventCallbacks(new MqttClientConnectionEvents() {
177177
@Override

‎samples/JavaKeystoreConnect/src/main/java/javakeystoreconnect/JavaKeystoreConnect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void onConnectionResumed(boolean sessionPresent) {
9191
builder.withConnectionEventCallbacks(callbacks)
9292
.withClientId(cmdData.input_clientId)
9393
.withEndpoint(cmdData.input_endpoint)
94-
.withPort((short)cmdData.input_port)
94+
.withPort(cmdData.input_port)
9595
.withCleanSession(true)
9696
.withProtocolOperationTimeoutMs(60000);
9797
if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {

‎samples/Jobs/src/main/java/jobs/JobsSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void onConnectionResumed(boolean sessionPresent) {
121121
builder.withConnectionEventCallbacks(callbacks)
122122
.withClientId(cmdData.input_clientId)
123123
.withEndpoint(cmdData.input_endpoint)
124-
.withPort((short)cmdData.input_port)
124+
.withPort(cmdData.input_port)
125125
.withCleanSession(true)
126126
.withProtocolOperationTimeoutMs(60000);
127127
MqttClientConnection connection = builder.build();

‎samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void onConnectionResumed(boolean sessionPresent) {
9696
builder.withConnectionEventCallbacks(callbacks)
9797
.withClientId(cmdData.input_clientId)
9898
.withEndpoint(cmdData.input_endpoint)
99-
.withPort((short) cmdData.input_port)
99+
.withPort(cmdData.input_port)
100100
.withCleanSession(true)
101101
.withProtocolOperationTimeoutMs(60000);
102102

‎samples/Pkcs12Connect/src/main/java/pkcs12connect/Pkcs12Connect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void onConnectionResumed(boolean sessionPresent) {
7474
builder.withConnectionEventCallbacks(callbacks)
7575
.withClientId(cmdData.input_clientId)
7676
.withEndpoint(cmdData.input_endpoint)
77-
.withPort((short)cmdData.input_port)
77+
.withPort(cmdData.input_port)
7878
.withCleanSession(true)
7979
.withProtocolOperationTimeoutMs(60000);
8080
MqttClientConnection connection = builder.build();

‎samples/Shadow/src/main/java/shadow/ShadowSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void onConnectionResumed(boolean sessionPresent) {
220220
builder.withConnectionEventCallbacks(callbacks)
221221
.withClientId(cmdData.input_clientId)
222222
.withEndpoint(cmdData.input_endpoint)
223-
.withPort((short)cmdData.input_port)
223+
.withPort(cmdData.input_port)
224224
.withCleanSession(true)
225225
.withProtocolOperationTimeoutMs(60000);
226226
MqttClientConnection connection = builder.build();

‎samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void onConnectionResumed(boolean sessionPresent) {
7474
builder.withConnectionEventCallbacks(callbacks)
7575
.withClientId(cmdData.input_clientId)
7676
.withEndpoint(cmdData.input_endpoint)
77-
.withPort((short)cmdData.input_port)
77+
.withPort(cmdData.input_port)
7878
.withCleanSession(true)
7979
.withProtocolOperationTimeoutMs(60000);
8080
if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {

‎samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void onConnectionResumed(boolean sessionPresent) {
6969
builder.withConnectionEventCallbacks(callbacks)
7070
.withClientId(cmdData.input_clientId)
7171
.withEndpoint(cmdData.input_endpoint)
72-
.withPort((short)cmdData.input_port)
72+
.withPort(cmdData.input_port)
7373
.withCleanSession(true)
7474
.withProtocolOperationTimeoutMs(60000);
7575
MqttClientConnection connection = builder.build();

‎samples/X509CredentialsProviderConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void onConnectionResumed(boolean sessionPresent) {
7878
builder.withConnectionEventCallbacks(callbacks)
7979
.withClientId(cmdData.input_clientId)
8080
.withEndpoint(cmdData.input_endpoint)
81-
.withPort((short)cmdData.input_port)
81+
.withPort(cmdData.input_port)
8282
.withCleanSession(true)
8383
.withProtocolOperationTimeoutMs(60000);
8484
HttpProxyOptions proxyOptions = null;

‎sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public CompletableFuture<Void> connect(final LifecycleHandler lifecycleHandler)
8989
}
9090
final CompletableFuture<Void> initialConnectFuture = new CompletableFuture<>();
9191

92-
ClientConnection.connect(config.getHost(), (short) config.getPort(), config.getSocketOptions(),
92+
ClientConnection.connect(config.getHost(), config.getPort(), config.getSocketOptions(),
9393
config.getTlsContext(), config.getClientBootstrap(), new ClientConnectionHandler() {
9494
@Override
9595
protected void onConnectionSetup(final ClientConnection clientConnection, int errorCode) {

‎sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ public EventStreamRPCConnectionConfig(ClientBootstrap clientBootstrap, EventLoop
5252
this.port = port;
5353
this.connectMessageAmender = connectMessageAmender;
5454

55-
//perform cast to throw exception here if port value is out of short value range
56-
final short shortPort = (short)port;
57-
5855
//bit of C++ RAII here, validate what we can
5956
if (clientBootstrap == null || eventLoopGroup == null || socketOptions == null ||
60-
host == null || host.isEmpty() || port < 0) {
57+
host == null || host.isEmpty()) {
6158
throw new IllegalArgumentException("EventStreamRPCConnectionConfig values are invalid!");
6259
}
6360
}

‎sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void runServer() {
6666
}
6767
serverBootstrap = new ServerBootstrap(eventLoopGroup);
6868
tlsContext = tlsContextOptions != null ? new ServerTlsContext(tlsContextOptions) : null;
69-
listener = new ServerListener(hostname, (short) port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() {
69+
listener = new ServerListener(hostname, port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() {
7070
@Override
7171
public ServerConnectionHandler onNewConnection(ServerConnection serverConnection, int errorCode) {
7272
try {

‎sdk/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>software.amazon.awssdk.crt</groupId>
4444
<artifactId>aws-crt</artifactId>
45-
<version>0.29.3</version>
45+
<version>0.29.5</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.slf4j</groupId>

‎sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public AwsIotMqttConnectionBuilder withEndpoint(String endpoint) {
272272
* MQTT, or 443 for websockets
273273
* @return {@link AwsIotMqttConnectionBuilder}
274274
*/
275-
public AwsIotMqttConnectionBuilder withPort(short port) {
275+
public AwsIotMqttConnectionBuilder withPort(int port) {
276276
this.config.setPort(port);
277277
return this;
278278
}

‎servicetests/tests/Utils/MqttClientConnectionWrapper/utils/mqttclientconnectionwrapper/MqttClientConnectionWrapperCreator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static MqttClientConnectionWrapper createMqtt3Connection(
2929
try (AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(cert, key)) {
3030
builder.withClientId(clientId)
3131
.withEndpoint(endpoint)
32-
.withPort((short)port)
32+
.withPort(port)
3333
.withCleanSession(true);
3434
return new Mqtt3ClientConnectionWrapper(builder);
3535
} catch (Exception ex) {

‎update-crt.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
## 5. `Python update-crt.py --check_consistency`
2020
## Make sure crt and sdk version specified in the files are consistent. The script will not update any file with this option.
2121

22-
VERSION_PATTERN = '\d+\.\d+\.\d+'
22+
VERSION_PATTERN = r'\d+\.\d+\.\d+'
2323

2424
parser = argparse.ArgumentParser(
2525
description="Update files containing hard-coded aws-crt-java version numbers.")

0 commit comments

Comments
 (0)