Make the SocketFrameHandler know about which hostname was provided in the first place, rather than doing a reverse DNS lookup and possibly breaking things.

Author: Simon MacMullen

src/com/rabbitmq/client/ConnectionFactory.java

@@ -360,13 +360,13 @@ protected FrameHandler createFrameHandler(Address addr)
         Socket socket = factory.createSocket();
         configureSocket(socket);
         socket.connect(new InetSocketAddress(hostName, portNumber), connectionTimeout);
-        return createFrameHandler(socket);
+        return createFrameHandler(socket, hostName);
     }
 
-    protected FrameHandler createFrameHandler(Socket sock)
+    protected FrameHandler createFrameHandler(Socket sock, String host)
         throws IOException
     {
-        return new SocketFrameHandler(sock);
+        return new SocketFrameHandler(sock, host);
     }
 
     /**

src/com/rabbitmq/client/impl/SocketFrameHandler.java

@@ -33,6 +33,9 @@
  */
 
 public class SocketFrameHandler implements FrameHandler {
+    /** Host we connect to */
+    public final String _host;
+
     /** The underlying socket */
     public final Socket _socket;
 
@@ -48,15 +51,16 @@ public class SocketFrameHandler implements FrameHandler {
     /**
      * @param socket the socket to use
      */
-    public SocketFrameHandler(Socket socket) throws IOException {
+    public SocketFrameHandler(Socket socket, String host) throws IOException {
         _socket = socket;
+        _host = host;
 
         _inputStream = new DataInputStream(new BufferedInputStream(_socket.getInputStream()));
         _outputStream = new DataOutputStream(new BufferedOutputStream(_socket.getOutputStream()));
     }
 
     public String getHost() {
-        return _socket.getInetAddress().getHostName();
+        return _host;
     }
 
     public int getPort() {

test/src/com/rabbitmq/client/test/CloseInMainLoop.java

@@ -36,7 +36,7 @@ public boolean hadValidShutdown(){
     public SpecialConnection() throws Exception{
       super(
           new ConnectionFactory(),
-          new SocketFrameHandler(SocketFactory.getDefault().createSocket("localhost", 5672)),
+          new SocketFrameHandler(SocketFactory.getDefault().createSocket("localhost", 5672), "localhost"),
           new DefaultExceptionHandler(){
             @Override public void handleConsumerException(Channel channel,
                                                            Throwable exception,

test/src/com/rabbitmq/client/test/functional/ConnectionOpen.java

@@ -36,7 +36,7 @@
 public class ConnectionOpen extends TestCase {
     public void testCorrectProtocolHeader() throws IOException {
         ConnectionFactory factory = new ConnectionFactory();
-        SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT));
+        SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT), "localhost");
         fh.sendHeader();
         AMQCommand.Assembler a = AMQCommand.newAssembler();
         AMQCommand command = null;
@@ -56,7 +56,7 @@ public void testCorrectProtocolHeader() throws IOException {
 
     public void testCrazyProtocolHeader() throws IOException {
         ConnectionFactory factory = new ConnectionFactory();
-        SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT));
+        SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT), "localhost");
         fh.sendHeader(100, 3); // major, minor
         DataInputStream in = fh._inputStream;
         // we should get a valid protocol header back

test/src/com/rabbitmq/client/test/functional/FrameMax.java

@@ -83,7 +83,7 @@ private static class MyFrameHandler extends SocketFrameHandler {
         public MyFrameHandler(Socket socket)
             throws IOException
         {
-            super(socket);
+            super(socket, "localhost");
         }
 
         public Frame readFrame() throws IOException {

test/src/com/rabbitmq/client/test/functional/UnexpectedFrames.java

@@ -38,8 +38,8 @@ private static class ConfusedFrameHandler extends SocketFrameHandler {
 
         private boolean confusedOnce = false;
 
-        public ConfusedFrameHandler(Socket socket) throws IOException {
-            super(socket);
+        public ConfusedFrameHandler(Socket socket, String host) throws IOException {
+            super(socket, host);
         }
 
         @Override
@@ -66,9 +66,9 @@ public Frame confuse(Frame frame) {
 
     private static class ConfusedConnectionFactory extends ConnectionFactory {
 
-        @Override protected FrameHandler createFrameHandler(Socket sock)
+        @Override protected FrameHandler createFrameHandler(Socket sock, String host)
             throws IOException {
-            return new ConfusedFrameHandler(sock);
+            return new ConfusedFrameHandler(sock, host);
         }
     }
 

test/src/com/rabbitmq/examples/TestMain.java

@@ -88,7 +88,7 @@ protected FrameHandler createFrameHandler(Address addr)
             String hostName = addr.getHost();
             int portNumber = addr.getPort();
             if (portNumber == -1) portNumber = AMQP.PROTOCOL.PORT;
-            return new SocketFrameHandler(getSocketFactory().createSocket(hostName, portNumber)) {
+            return new SocketFrameHandler(getSocketFactory().createSocket(hostName, portNumber), hostName) {
                     public void sendHeader() throws IOException {
                         sendHeader(protocolMajor, protocolMinor);
                     }