From 7e8e8f8d709318cce97f40adaee8a4abbdc2b960 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 8 Nov 2016 15:14:28 +0300
Subject: xmpp: allow s2s without tls

---
 juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java')

diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java b/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java
index d1d69dd0..5ac21fb6 100644
--- a/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/ConnectionIn.java
@@ -133,7 +133,7 @@ public class ConnectionIn extends Connection implements Runnable {
                         LOGGER.info("STREAM " + streamID + ": " + xml);
                         xmpp.getRouter().send(xml);
                     }
-                } else if (!isSecured() && tag.equals("starttls")) {
+                } else if (sc != null && !isSecured() && tag.equals("starttls")) {
                     LOGGER.info("STREAM " + streamID + " SECURING");
                     sendStanza("<proceed xmlns=\"" + NS_TLS + "\" />");
                     try {
@@ -182,7 +182,7 @@ public class ConnectionIn extends Connection implements Runnable {
                 xmpp.HOSTNAME + "' id='" + streamID + "' version='1.0'>";
         if (xmppversionnew) {
             openStream += "<stream:features>";
-            if (!isSecured() && !xmpp.brokenSSLhosts.contains(from)) {
+            if (sc != null && !isSecured() && !xmpp.brokenSSLhosts.contains(from)) {
                 openStream += "<starttls xmlns=\"" + NS_TLS + "\"><optional/></starttls>";
             }
             openStream += "</stream:features>";
-- 
cgit v1.2.3