Add support for binding to IPv6 addresses.

Change-Id: Iaf88955e20a8797c0f20924ef343626a435af91f
Reviewed-on: http://gerrit.dmdirc.com/2970
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/parser/common/BaseParser.java

@@ -61,6 +61,9 @@ public abstract class BaseParser extends ThreadedParser {
     /** The IP that this parser should bind to. */
     private String bindIp;
 
+    /** The IPv6 IP that this parser should bind to. */
+    private String bindIpv6;
+
     /** The URI of the proxy to use when connecting, if any. */
     private URI proxy;
 
@@ -228,4 +231,16 @@ public abstract class BaseParser extends ThreadedParser {
     public void setBindIP(final String ip) {
         this.bindIp = ip;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getBindIPv6() {
+        return bindIpv6;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setBindIPv6(final String ip) {
+        this.bindIpv6 = ip;
+    }
 }

src/com/dmdirc/parser/interfaces/Parser.java

@@ -116,6 +116,20 @@ public interface Parser {
      */
     void setBindIP(String ip);
 
+    /**
+     * Get the IPv6 address that this parser will bind to.
+     *
+     * @return IPv6 that this parser is bound to ("" for default IP)
+     */
+    String getBindIPv6();
+
+    /**
+     * Set the IPv6 address that this parser will bind to.
+     *
+     * @param ip IPv6 IP to bind to
+     */
+    void setBindIPv6(String ip);
+
     /**
      * Gets the proxy URI that this parser will use.
      *

src/com/dmdirc/parser/irc/IRCParser.java

@@ -775,6 +775,15 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
         disconnectOnFatal = newValue;
     }
 
+    /**
+     * Create a new Socket object for the given target, using the given proxy
+     * if appropriate.
+     *
+     * @param target Target URI to connect to.
+     * @param proxy Proxy URI to use
+     * @return Socket, with IP Binding or Proxy as appropriate,
+     * @throws IOException If there was an issue creating the socket.
+     */
     private Socket newSocket(final URI target, final URI proxy) throws IOException {
         if (target.getPort() > 65535 || target.getPort() <= 0) {
             throw new IOException("Server port (" + target.getPort() + ") is invalid.");
@@ -785,20 +794,33 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
             callDebugInfo(DEBUG_SOCKET, "Not using Proxy");
             mySocket = new Socket();
 
-            if (getBindIP() != null && !getBindIP().isEmpty()) {
-                callDebugInfo(DEBUG_SOCKET, "Binding to IP: " + getBindIP());
-                try {
-                    mySocket.bind(new InetSocketAddress(InetAddress.getByName(getBindIP()), 0));
-                } catch (IOException e) {
-                    callDebugInfo(DEBUG_SOCKET, "Binding failed: " + e.getMessage());
+            final InetSocketAddress sockAddr = new InetSocketAddress(target.getHost(), target.getPort());
+
+            if (sockAddr.getAddress() instanceof Inet6Address) {
+                if (getBindIPv6() != null && !getBindIPv6().isEmpty()) {
+                    callDebugInfo(DEBUG_SOCKET, "Binding to IPv6: " + getBindIP());
+                    try {
+                        mySocket.bind(new InetSocketAddress(InetAddress.getByName(getBindIPv6()), 0));
+                    } catch (IOException e) {
+                        callDebugInfo(DEBUG_SOCKET, "Binding failed: " + e.getMessage());
+                    }
+                }
+            } else {
+                if (getBindIP() != null && !getBindIP().isEmpty()) {
+                    callDebugInfo(DEBUG_SOCKET, "Binding to IPv4: " + getBindIP());
+                    try {
+                        mySocket.bind(new InetSocketAddress(InetAddress.getByName(getBindIP()), 0));
+                    } catch (IOException e) {
+                        callDebugInfo(DEBUG_SOCKET, "Binding failed: " + e.getMessage());
+                    }
                 }
             }
 
-            mySocket.connect(new InetSocketAddress(target.getHost(), target.getPort()), connectTimeout);
+            mySocket.connect(sockAddr, connectTimeout);
         } else {
             callDebugInfo(DEBUG_SOCKET, "Using Proxy");
 
-            if (getBindIP() != null && !getBindIP().isEmpty()) {
+            if ((getBindIP() != null && !getBindIP().isEmpty()) || (getBindIPv6() != null && !getBindIPv6().isEmpty())) {
                 callDebugInfo(DEBUG_SOCKET, "IP Binding is not possible when using a proxy.");
             }