From e1a8b5c6a5337cc8092823c4a27e3bba8d2e4f97 Mon Sep 17 00:00:00 2001 From: James Tomson Date: Fri, 27 May 2022 12:40:56 -0400 Subject: [PATCH] Add forgotten WebSocketSecureNetworkModule changes Signed-off-by: James Tomson --- .../internal/websocket/WebSocketSecureNetworkModule.java | 5 +++-- .../websocket/WebSocketSecureNetworkModuleFactory.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModule.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModule.java index 6dccff257..41f76b872 100644 --- a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModule.java +++ b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModule.java @@ -24,6 +24,7 @@ import java.util.Properties; import javax.net.ssl.SSLSocketFactory; +import org.eclipse.paho.client.mqttv3.IMqttDns; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.internal.SSLNetworkModule; import org.eclipse.paho.client.mqttv3.logging.Logger; @@ -49,8 +50,8 @@ public class WebSocketSecureNetworkModule extends SSLNetworkModule{ */ private ByteArrayOutputStream outputStream = new ExtendedByteArrayOutputStream(this); - public WebSocketSecureNetworkModule(SSLSocketFactory factory, String uri, String host, int port, String clientId, Properties customWebSocketHeaders) { - super(factory, host, port, clientId); + public WebSocketSecureNetworkModule(SSLSocketFactory factory, String uri, String host, int port, String clientId, IMqttDns dns, Properties customWebSocketHeaders) { + super(factory, host, port, clientId, dns); this.uri = uri; this.host = host; this.port = port; diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModuleFactory.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModuleFactory.java index bd364cf05..d0a0c6c57 100644 --- a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModuleFactory.java +++ b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModuleFactory.java @@ -64,7 +64,7 @@ public NetworkModule createNetworkModule(URI brokerUri, MqttConnectOptions optio // Create the network module... WebSocketSecureNetworkModule netModule = new WebSocketSecureNetworkModule((SSLSocketFactory) factory, - brokerUri.toString(), host, port, clientId, options.getCustomWebSocketHeaders()); + brokerUri.toString(), host, port, clientId, options.getDns(), options.getCustomWebSocketHeaders()); netModule.setSSLhandshakeTimeout(options.getConnectionTimeout()); netModule.setSSLHostnameVerifier(options.getSSLHostnameVerifier()); netModule.setHttpsHostnameVerificationEnabled(options.isHttpsHostnameVerificationEnabled());