From e4c9336b2319aba7cc254b84b76e957e92b301e6 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sat, 14 Dec 2019 23:44:51 +0100
Subject: server: Replace manual checks and hard-coded XML by
 QXmppStartTlsPacket

---
 src/server/QXmppIncomingServer.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/server/QXmppIncomingServer.cpp')

diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index f121e479..bc76738d 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -30,6 +30,7 @@
 #include "QXmppDialback.h"
 #include "QXmppIncomingServer.h"
 #include "QXmppOutgoingServer.h"
+#include "QXmppStartTlsPacket.h"
 #include "QXmppStreamFeatures.h"
 #include "QXmppUtils.h"
 
@@ -129,15 +130,12 @@ void QXmppIncomingServer::handleStanza(const QDomElement &stanza)
 {
     const QString ns = stanza.namespaceURI();
 
-    if (ns == ns_tls && stanza.tagName() == QLatin1String("starttls"))
-    {
-        sendData("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+    if (QXmppStartTlsPacket::isStartTlsPacket(stanza, QXmppStartTlsPacket::StartTls)) {
+        sendPacket(QXmppStartTlsPacket(QXmppStartTlsPacket::Proceed));
         socket()->flush();
         socket()->startServerEncryption();
         return;
-    }
-    else if (QXmppDialback::isDialback(stanza))
-    {
+    } else if (QXmppDialback::isDialback(stanza)) {
         QXmppDialback request;
         request.parse(stanza);
         // check the request is valid
-- 
cgit v1.2.3