Trying to get SNI to work.

Author: nimia

.gitignore

@@ -42,3 +42,5 @@ Utils/.settings/org.eclipse.core.resources.prefs
 Utils/.settings/org.eclipse.jdt.core.prefs
 .project
 test.sh
+.settings/
+.classpath

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/delegate/ClientDelegate.java

@@ -77,6 +77,7 @@ public void applyDelegate(Config config) {
             con.setPort(uri.getPort());
         }
         if (IPAddress.isValid(uri.getHost())) {
+            System.out.println("Setting IP: " + uri.getHost());
             con.setIp(uri.getHost());
             if (sniHostname != null) {
                 con.setHostname(sniHostname);

Transport/src/main/java/de/rub/nds/tlsattacker/transport/Connection.java

@@ -57,6 +57,8 @@ public String getIp() {
     }
 
     public void setIp(String ip) {
+        System.out.println("Setting IP: " + ip);
+        new Exception().printStackTrace(System.out);
         this.ip = ip;
     }
 

Transport/src/main/java/de/rub/nds/tlsattacker/transport/TransportHandlerFactory.java

@@ -28,15 +28,15 @@ public static TransportHandler createTransportHandler(Connection con) {
         switch (con.getTransportHandlerType()) {
             case TCP:
                 if (localConEndType == ConnectionEndType.CLIENT) {
-                    return new ClientTcpTransportHandler(timeout, con.getHostname(), con.getPort());
+                    return new ClientTcpTransportHandler(timeout, con.getIp(), con.getPort());
                 } else {
                     return new ServerTcpTransportHandler(timeout, con.getPort());
                 }
             case EAP_TLS:
                 throw new UnsupportedOperationException("EAP_TLS is currently not supported");
             case UDP:
                 if (localConEndType == ConnectionEndType.CLIENT) {
-                    return new ClientUdpTransportHandler(timeout, con.getHostname(), con.getPort());
+                    return new ClientUdpTransportHandler(timeout, con.getIp(), con.getPort());
                 } else {
                     return new ServerUdpTransportHandler(timeout, con.getPort());
                 }
@@ -50,26 +50,26 @@ public static TransportHandler createTransportHandler(Connection con) {
                 throw new UnsupportedOperationException("STREAM TransportHandler can only be created manually");
             case TCP_TIMING:
                 if (localConEndType == ConnectionEndType.CLIENT) {
-                    return new TimingClientTcpTransportHandler(timeout, con.getHostname(), con.getPort());
+                    return new TimingClientTcpTransportHandler(timeout, con.getIp(), con.getPort());
                 } else {
                     return new TimingServerTcpTransportHandler(timeout, con.getPort());
                 }
             case UDP_TIMING:
                 if (localConEndType == ConnectionEndType.CLIENT) {
-                    return new TimingClientUdpTransportHandler(timeout, con.getHostname(), con.getPort());
+                    return new TimingClientUdpTransportHandler(timeout, con.getIp(), con.getPort());
                 } else {
                     return new TimingServerUdpTransportHandler(timeout, con.getPort());
                 }
             case TCP_PROXY_TIMING:
                 if (localConEndType == ConnectionEndType.CLIENT) {
-                    return new TimingProxyClientTcpTransportHandler(timeout, con.getHostname(), con.getPort());
+                    return new TimingProxyClientTcpTransportHandler(timeout, con.getIp(), con.getPort());
                 } else {
                     throw new UnsupportedOperationException(
                             "TCP_PROXY_TIMING for server sockets is currently not supported");
                 }
             case TCP_NO_DELAY:
                 if (localConEndType == ConnectionEndType.CLIENT) {
-                    return new ClientTcpNoDelayTransportHandler(timeout, con.getHostname(), con.getPort());
+                    return new ClientTcpNoDelayTransportHandler(timeout, con.getIp(), con.getPort());
                 } else {
                     throw new UnsupportedOperationException(
                             "This transport handler type is only supported in client mode");

Transport/src/main/java/de/rub/nds/tlsattacker/transport/tcp/ClientTcpTransportHandler.java

@@ -29,21 +29,30 @@ public class ClientTcpTransportHandler extends TransportHandler {
 
     public ClientTcpTransportHandler(Connection connection) {
         super(connection.getTimeout(), ConnectionEndType.CLIENT);
-        this.hostname = connection.getHostname();
+        this.hostname = connection.getIp();
+        System.out.println("Ctor 1: Got hostname: " + this.hostname);
         this.port = connection.getPort();
         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;
+        System.out.println("Ctor 2: Got hostname: " + this.hostname);
+        new Exception().printStackTrace(System.out);
         this.port = port;
         this.connectionTimeout = timeout;
     }
 
     public ClientTcpTransportHandler(long connectionTimeout, long timeout, String hostname, int port) {
         super(timeout, ConnectionEndType.CLIENT);
         this.hostname = hostname;
+        System.out.println("Ctor 3: Got hostname: " + this.hostname);
         this.port = port;
         this.connectionTimeout = connectionTimeout;
     }
@@ -59,6 +68,7 @@ public void closeConnection() throws IOException {
     @Override
     public void initialize() throws IOException {
         socket = new Socket();
+        System.out.println("Connecting to " + hostname);
         socket.connect(new InetSocketAddress(hostname, port), (int) connectionTimeout);
         if (!socket.isConnected()) {
             throw new IOException("Could not connect to " + hostname + ":" + "port");