Merge pull request #580 from RUB-NDS/nimrod_SNI

Fixes for SNI from nimia
tls-attacker · Aug 15, 2019 · 924460e · 924460e
2 parents bb2b5a5 + 36887c2
commit 924460e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,5 @@ Utils/.settings/org.eclipse.core.resources.prefs
 Utils/.settings/org.eclipse.jdt.core.prefs
 .project
 test.sh
+.settings/
+.classpath
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/connection/OutboundConnection.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/connection/OutboundConnection.java
@@ -40,6 +40,7 @@ public OutboundConnection(String alias, Integer port, String hostname) {
     public OutboundConnection(OutboundConnection other) {
         this.alias = other.alias;
         this.hostname = other.hostname;
+        this.ip = other.ip;
         this.port = other.port;
         this.proxyDataHostname = other.proxyDataHostname;
         this.proxyDataPort = other.proxyDataPort;

diff --git a/Transport/src/main/java/de/rub/nds/tlsattacker/transport/tcp/ClientTcpTransportHandler.java b/Transport/src/main/java/de/rub/nds/tlsattacker/transport/tcp/ClientTcpTransportHandler.java
@@ -34,6 +34,11 @@ public ClientTcpTransportHandler(Connection connection) {
         this.connectionTimeout = 60000;
     }
 
+    public ClientTcpTransportHandler(Connection connection, long timeout) {
+        this(connection);
+        this.connectionTimeout = timeout;
+    }
+
     public ClientTcpTransportHandler(long timeout, String hostname, int port) {
         super(timeout, ConnectionEndType.CLIENT);
         this.hostname = hostname;