Merge pull request #781 from zeroSteiner/fix/met/java-socket-channel-tests

Java: Send the channel address info back to Metasploit

Author: jheysel-r7

java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_channel_open.java

@@ -80,6 +80,8 @@ private int executeUdpClient(Meterpreter meterpreter, TLVPacket request, TLVPack
         }
         Channel channel = new DatagramSocketChannel(meterpreter, ds);
         response.add(TLVType.TLV_TYPE_CHANNEL_ID, channel.getID());
+        response.add(TLVType.TLV_TYPE_LOCAL_HOST, ds.getLocalAddress().getHostAddress());
+        response.add(TLVType.TLV_TYPE_LOCAL_PORT, ds.getLocalPort());
         return ERROR_SUCCESS;
     }
 
@@ -89,14 +91,15 @@ private int executeTcpServer(Meterpreter meterpreter, TLVPacket request, TLVPack
         ServerSocket ss = getSocket(localHost, localPort);
         Channel channel = new ServerSocketChannel(meterpreter, ss);
         response.add(TLVType.TLV_TYPE_CHANNEL_ID, channel.getID());
+        response.add(TLVType.TLV_TYPE_LOCAL_HOST, ss.getInetAddress().getHostAddress());
+        response.add(TLVType.TLV_TYPE_LOCAL_PORT, ss.getLocalPort());
         return ERROR_SUCCESS;
     }
 
     protected ServerSocket getSocket(String localHost, int localPort) throws UnknownHostException, IOException {
         return new ServerSocket(localPort, 50, InetAddress.getByName(localHost));
     }
 
-
     private int executeTcpClient(Meterpreter meterpreter, TLVPacket request, TLVPacket response) throws Exception {
         String peerHost = request.getStringValue(TLVType.TLV_TYPE_PEER_HOST);
         int peerPort = request.getIntValue(TLVType.TLV_TYPE_PEER_PORT);
@@ -124,6 +127,8 @@ private int executeTcpClient(Meterpreter meterpreter, TLVPacket request, TLVPack
         Channel channel = new SocketChannel(meterpreter, socket);
         channel.startInteract();
         response.add(TLVType.TLV_TYPE_CHANNEL_ID, channel.getID());
+        response.add(TLVType.TLV_TYPE_LOCAL_HOST, socket.getLocalAddress().getHostAddress());
+        response.add(TLVType.TLV_TYPE_LOCAL_PORT, socket.getLocalPort());
         return ERROR_SUCCESS;
     }
 }