Added possibility to QXmppServer to route a stanza to a specific reso…

…urce without the need to add the resource to the stanza's JID. Closes qxmpp-project#7
servonic · Sep 22, 2015 · 0ebce1f · 0ebce1f · jlaine · Sep 22, 2015
1 parent 90b681f
commit 0ebce1f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
@@ -635,8 +635,9 @@ bool QXmppServer::listenForServers(const QHostAddress &address, quint16 port)
 /// Route an XMPP stanza.
 ///
 /// \param element
+/// \param recipient
 
-bool QXmppServer::sendElement(const QDomElement &element)
+bool QXmppServer::sendElement(const QDomElement &element, const QString& resource)
 {
     // serialize data
     QByteArray data;
@@ -645,22 +646,33 @@ bool QXmppServer::sendElement(const QDomElement &element)
     helperToXmlAddDomElement(&xmlStream, element, omitNamespaces);
 
     // route data
-    return d->routeData(element.attribute("to"), data);
+    if (!resource.isEmpty()) {
+        // ... to explicitly specified resource. Override original resource from "to" (if any)
+        return d->routeData(QXmppUtils::jidToBareJid(element.attribute("to")) + "/" + resource, data);
+    } else {
+        return d->routeData(element.attribute("to"), data);
+    }
 }
 
 /// Route an XMPP packet.
 ///
 /// \param packet
+/// \param recipient
 
-bool QXmppServer::sendPacket(const QXmppStanza &packet)
+bool QXmppServer::sendPacket(const QXmppStanza &packet, const QString& resource)
 {
     // serialize data
     QByteArray data;
     QXmlStreamWriter xmlStream(&data);
     packet.toXml(&xmlStream);
 
     // route data
-    return d->routeData(packet.to(), data);
+    if (!resource.isEmpty()) {
+        // ... to explicitly specified resource. Override original resource from "to" (if any)
+        return d->routeData(QXmppUtils::jidToBareJid(packet.to()) + "/" + resource, data);
+    } else {
+        return d->routeData(packet.to(), data);
+    }
 }
 
 /// Add a new incoming client \a stream.

diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h
@@ -89,8 +89,8 @@ class QXMPP_EXPORT QXmppServer : public QXmppLoggable
     bool listenForClients(const QHostAddress &address = QHostAddress::Any, quint16 port = 5222);
     bool listenForServers(const QHostAddress &address = QHostAddress::Any, quint16 port = 5269);
 
-    bool sendElement(const QDomElement &element);
-    bool sendPacket(const QXmppStanza &stanza);
+    bool sendElement(const QDomElement &element, const QString& resource = QString());
+    bool sendPacket(const QXmppStanza &stanza, const QString& resource = QString());
 
     void addIncomingClient(QXmppIncomingClient *stream);