From 5a48afdd4d44b5865831df470a2c5d00e9cc9599 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 19 Jun 2015 16:25:08 +0200
Subject: don't perform dns lookups on domain parts that obviously look like ip
 addresses

---
 .../siacs/conversations/xmpp/XmppConnection.java   | 96 ++++++++++++----------
 1 file changed, 53 insertions(+), 43 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/xmpp')

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index f6e0bfdc..8a438906 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -26,6 +26,7 @@ import java.net.IDN;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.SocketAddress;
 import java.net.UnknownHostException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -155,53 +156,62 @@ public class XmppConnection implements Runnable {
 			tagWriter = new TagWriter();
 			packetCallbacks.clear();
 			this.changeStatus(Account.State.CONNECTING);
-			final Bundle result = DNSHelper.getSRVRecord(account.getServer());
-			final ArrayList<Parcelable> values = result.getParcelableArrayList("values");
-			if ("timeout".equals(result.getString("error"))) {
-				throw new IOException("timeout in dns");
-			} else if (values != null) {
-				int i = 0;
-				boolean socketError = true;
-				while (socketError && values.size() > i) {
-					final Bundle namePort = (Bundle) values.get(i);
-					try {
-						String srvRecordServer;
+			if (DNSHelper.isIp(account.getServer().toString())) {
+				socket = new Socket();
+				try {
+					socket.connect(new InetSocketAddress(account.getServer().toString(), 5222), Config.SOCKET_TIMEOUT * 1000);
+				} catch (IOException e) {
+					throw new UnknownHostException();
+				}
+			} else {
+				final Bundle result = DNSHelper.getSRVRecord(account.getServer());
+				final ArrayList<Parcelable> values = result.getParcelableArrayList("values");
+				if ("timeout".equals(result.getString("error"))) {
+					throw new IOException("timeout in dns");
+				} else if (values != null) {
+					int i = 0;
+					boolean socketError = true;
+					while (socketError && values.size() > i) {
+						final Bundle namePort = (Bundle) values.get(i);
 						try {
-							srvRecordServer = IDN.toASCII(namePort.getString("name"));
-						} catch (final IllegalArgumentException e) {
-							// TODO: Handle me?`
-							srvRecordServer = "";
-						}
-						final int srvRecordPort = namePort.getInt("port");
-						final String srvIpServer = namePort.getString("ip");
-						final InetSocketAddress addr;
-						if (srvIpServer != null) {
-							addr = new InetSocketAddress(srvIpServer, srvRecordPort);
-							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
-									+ ": using values from dns " + srvRecordServer
-									+ "[" + srvIpServer + "]:" + srvRecordPort);
-						} else {
-							addr = new InetSocketAddress(srvRecordServer, srvRecordPort);
-							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
-									+ ": using values from dns "
-									+ srvRecordServer + ":" + srvRecordPort);
+							String srvRecordServer;
+							try {
+								srvRecordServer = IDN.toASCII(namePort.getString("name"));
+							} catch (final IllegalArgumentException e) {
+								// TODO: Handle me?`
+								srvRecordServer = "";
+							}
+							final int srvRecordPort = namePort.getInt("port");
+							final String srvIpServer = namePort.getString("ip");
+							final InetSocketAddress addr;
+							if (srvIpServer != null) {
+								addr = new InetSocketAddress(srvIpServer, srvRecordPort);
+								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+										+ ": using values from dns " + srvRecordServer
+										+ "[" + srvIpServer + "]:" + srvRecordPort);
+							} else {
+								addr = new InetSocketAddress(srvRecordServer, srvRecordPort);
+								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+										+ ": using values from dns "
+										+ srvRecordServer + ":" + srvRecordPort);
+							}
+							socket = new Socket();
+							socket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
+							socketError = false;
+						} catch (final UnknownHostException e) {
+							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
+							i++;
+						} catch (final IOException e) {
+							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
+							i++;
 						}
-						socket = new Socket();
-						socket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
-						socketError = false;
-					} catch (final UnknownHostException e) {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
-						i++;
-					} catch (final IOException e) {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
-						i++;
 					}
+					if (socketError) {
+						throw new UnknownHostException();
+					}
+				} else {
+					throw new IOException("unhandled exception in DNS resolver");
 				}
-				if (socketError) {
-					throw new UnknownHostException();
-				}
-			} else {
-				throw new IOException("unhandled exception in DNS resolver");
 			}
 			final OutputStream out = socket.getOutputStream();
 			tagWriter.setOutputStream(out);
-- 
cgit v1.2.3