narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lactide-srv_fix

Browse source
This commit is contained in:
iNPUTmice 2014-10-19 20:17:12 +02:00
parent 713cd6ef89 c725da954c
commit f824193c56
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -161,10 +161,23 @@ public class XmppConnection implements Runnable {
+ "[" + srvIpServer + "]:" + srvRecordPort); + "[" + srvIpServer + "]:" + srvRecordPort);
socket = new Socket(srvIpServer, srvRecordPort); socket = new Socket(srvIpServer, srvRecordPort);
} else { } else {
Log.d(Config.LOGTAG, account.getJid() boolean socketError = true;
+ ": using values from dns " + srvRecordServer int srvIndex = 0;
+ ":" + srvRecordPort); while (socketError && namePort.containsKey("name" + srvIndex)){
socket = new Socket(srvRecordServer, srvRecordPort); try {
srvRecordServer = namePort.getString("name" + srvIndex);
srvRecordPort = namePort.getInt("port" + srvIndex);
Log.d(Config.LOGTAG, account.getJid()
+ ": using values from dns " + srvRecordServer
+ ":" + srvRecordPort);
socket = new Socket(srvRecordServer, srvRecordPort);
socketError = false;
} catch (UnknownHostException e) {
srvIndex++;
} catch (IOException e) {
srvIndex++;
}
}
} }
} else if (namePort.containsKey("error") } else if (namePort.containsKey("error")
&& "nosrv".equals(namePort.getString("error", null))) { && "nosrv".equals(namePort.getString("error", null))) {