Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Conversations
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sum7
Conversations
Commits
e140ab71
Unverified
Commit
e140ab71
authored
Nov 10, 2018
by
Martin/Geno
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Networkstack - let OS decide IPv4 or IPv6
parent
db12bae1
Pipeline
#176
passed with stage
in 2 minutes and 29 seconds
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
115 deletions
+20
-115
DatabaseBackend.java
...a/eu/siacs/conversations/persistance/DatabaseBackend.java
+0
-1
Resolver.java
src/main/java/eu/siacs/conversations/utils/Resolver.java
+16
-102
XmppConnection.java
...main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+4
-12
No files found.
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View file @
e140ab71
...
...
@@ -156,7 +156,6 @@ public class DatabaseBackend extends SQLiteOpenHelper {
private
static
String
CREATE_RESOLVER_RESULTS_TABLE
=
"create table "
+
RESOLVER_RESULTS_TABLENAME
+
"("
+
Resolver
.
Result
.
DOMAIN
+
" TEXT,"
+
Resolver
.
Result
.
HOSTNAME
+
" TEXT,"
+
Resolver
.
Result
.
IP
+
" BLOB,"
+
Resolver
.
Result
.
PRIORITY
+
" NUMBER,"
+
Resolver
.
Result
.
DIRECT_TLS
+
" NUMBER,"
+
Resolver
.
Result
.
AUTHENTICATED
+
" NUMBER,"
...
...
src/main/java/eu/siacs/conversations/utils/Resolver.java
View file @
e140ab71
This diff is collapsed.
Click to expand it.
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file @
e140ab71
...
...
@@ -314,18 +314,10 @@ public class XmppConnection implements Runnable {
features
.
encryptionEnabled
=
result
.
isDirectTls
();
verifiedHostname
=
result
.
isAuthenticated
()
?
result
.
getHostname
().
toString
()
:
null
;
Log
.
d
(
Config
.
LOGTAG
,
"verified hostname "
+
verifiedHostname
);
final
InetSocketAddress
addr
;
if
(
result
.
getIp
()
!=
null
)
{
addr
=
new
InetSocketAddress
(
result
.
getIp
(),
result
.
getPort
());
Log
.
d
(
Config
.
LOGTAG
,
account
.
getJid
().
asBareJid
().
toString
()
+
": using values from resolver "
+
(
result
.
getHostname
()
==
null
?
""
:
result
.
getHostname
().
toString
()
+
"/"
)
+
result
.
getIp
().
getHostAddress
()
+
":"
+
result
.
getPort
()
+
" tls: "
+
features
.
encryptionEnabled
);
}
else
{
addr
=
new
InetSocketAddress
(
IDN
.
toASCII
(
result
.
getHostname
().
toString
()),
result
.
getPort
());
Log
.
d
(
Config
.
LOGTAG
,
account
.
getJid
().
asBareJid
().
toString
()
+
": using values from resolver "
+
result
.
getHostname
().
toString
()
+
":"
+
result
.
getPort
()
+
" tls: "
+
features
.
encryptionEnabled
);
}
final
InetSocketAddress
addr
=
new
InetSocketAddress
(
IDN
.
toASCII
(
result
.
getHostname
().
toString
()),
result
.
getPort
());
Log
.
d
(
Config
.
LOGTAG
,
account
.
getJid
().
asBareJid
().
toString
()
+
": using values from resolver "
+
result
.
getHostname
().
toString
()
+
":"
+
result
.
getPort
()
+
" tls: "
+
features
.
encryptionEnabled
);
if
(!
features
.
encryptionEnabled
)
{
localSocket
=
new
Socket
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment