From 239b2b15c3cfd9e4d7cc085ed31645d6ae6942ee Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Mon, 26 Oct 2009 17:01:09 +0000 Subject: Fix for Issue 23: QXmppBind compilation error on macosx starting from r23 Issue 26: examples fail to link on macosx and linux Issue 24: all text files should have the svn property eol-style set Contributed by: Marco Molteni --- source/QXmppBind.cpp | 152 +-- source/QXmppBind.h | 96 +- source/QXmppClient.cpp | 678 +++++------ source/QXmppClient.h | 320 ++--- source/QXmppConfiguration.cpp | 434 +++---- source/QXmppConfiguration.h | 274 ++--- source/QXmppConstants.cpp | 78 +- source/QXmppConstants.h | 84 +- source/QXmppInformationRequestResult.cpp | 40 +- source/QXmppInformationRequestResult.h | 26 +- source/QXmppIq.cpp | 252 ++-- source/QXmppIq.h | 121 +- source/QXmppLogger.cpp | 192 +-- source/QXmppLogger.h | 112 +- source/QXmppMessage.cpp | 312 ++--- source/QXmppMessage.h | 136 +-- source/QXmppNonSASLAuth.cpp | 140 +-- source/QXmppNonSASLAuth.h | 70 +- source/QXmppPacket.cpp | 80 +- source/QXmppPacket.h | 93 +- source/QXmppPresence.cpp | 596 +++++----- source/QXmppPresence.h | 200 ++-- source/QXmppReconnectionManager.cpp | 172 +-- source/QXmppReconnectionManager.h | 120 +- source/QXmppRoster.cpp | 406 +++---- source/QXmppRoster.h | 216 ++-- source/QXmppRosterIq.cpp | 344 +++--- source/QXmppRosterIq.h | 168 +-- source/QXmppSession.cpp | 100 +- source/QXmppSession.h | 84 +- source/QXmppStanza.cpp | 644 +++++------ source/QXmppStanza.h | 248 ++-- source/QXmppStream.cpp | 1862 +++++++++++++++--------------- source/QXmppStream.h | 282 ++--- source/QXmppUtils.cpp | 272 ++--- source/QXmppUtils.h | 113 +- source/QXmppVCard.cpp | 216 ++-- source/QXmppVCard.h | 116 +- source/QXmppVCardManager.cpp | 86 +- source/QXmppVCardManager.h | 102 +- source/source.pro | 109 +- 41 files changed, 5086 insertions(+), 5060 deletions(-) (limited to 'source') diff --git a/source/QXmppBind.cpp b/source/QXmppBind.cpp index 1d37e025..a1c5bd25 100644 --- a/source/QXmppBind.cpp +++ b/source/QXmppBind.cpp @@ -1,76 +1,76 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppBind.h" -#include "QXmppUtils.h" -#include "QXmppConstants.h" - -#include -#include - -QXmppBind::QXmppBind(QXmppIq::Type type) - : QXmppIq(type) -{ -} -QXmppBind::QXmppBind(const QString& type) - : QXmppIq(type) -{ -} - -QXmppBind::~QXmppBind() -{ -} - -QString QXmppBind::getJid() const -{ - return m_jid; -} - -QString QXmppBind::getResource() const -{ - return m_resource; -} - -void QXmppBind::setJid(const QString& str) -{ - m_jid = str; -} - -void QXmppBind::setResource(const QString& str) -{ - m_resource = str; -} - -void QXmppBind::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - QString data; - QTextStream stream(&data); - - writer->writeStartElement("bind"); - helperToXmlAddAttribute(writer, "xmlns", ns_bind); - helperToXmlAddTextElement(writer, "jid", getJid() ); - helperToXmlAddTextElement(writer, "resource", getResource()); - writer->writeEndElement(); -} - +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppBind.h" +#include "QXmppUtils.h" +#include "QXmppConstants.h" + +#include +#include + +QXmppBind::QXmppBind(QXmppIq::Type type) + : QXmppIq(type) +{ +} +QXmppBind::QXmppBind(const QString& type) + : QXmppIq(type) +{ +} + +QXmppBind::~QXmppBind() +{ +} + +QString QXmppBind::getJid() const +{ + return m_jid; +} + +QString QXmppBind::getResource() const +{ + return m_resource; +} + +void QXmppBind::setJid(const QString& str) +{ + m_jid = str; +} + +void QXmppBind::setResource(const QString& str) +{ + m_resource = str; +} + +void QXmppBind::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + QString data; + QTextStream stream(&data); + + writer->writeStartElement("bind"); + helperToXmlAddAttribute(writer, "xmlns", ns_bind); + helperToXmlAddTextElement(writer, "jid", getJid() ); + helperToXmlAddTextElement(writer, "resource", getResource()); + writer->writeEndElement(); +} + diff --git a/source/QXmppBind.h b/source/QXmppBind.h index 46baf91f..4e8472d1 100644 --- a/source/QXmppBind.h +++ b/source/QXmppBind.h @@ -1,48 +1,48 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPBIND_H -#define QXMPPBIND_H - -#include "QXmppIq.h" - -class QXmppBind : public QXmppIq -{ -public: - QXmppBind(QXmppIq::Type type); - QXmppBind(const QString& type); - ~QXmppBind(); - - QString getJid() const; - QString getResource() const; - void setJid(const QString&); - void setResource(const QString&); - -private: - QString m_jid; - QString m_resource; - void toXmlElementFromChild(QXmlStreamWriter *writer) const; -}; - -#endif // QXMPPBIND_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPBIND_H +#define QXMPPBIND_H + +#include "QXmppIq.h" + +class QXmppBind : public QXmppIq +{ +public: + QXmppBind(QXmppIq::Type type); + QXmppBind(const QString& type); + ~QXmppBind(); + + QString getJid() const; + QString getResource() const; + void setJid(const QString&); + void setResource(const QString&); + +private: + QString m_jid; + QString m_resource; + void toXmlElementFromChild(QXmlStreamWriter *writer) const; +}; + +#endif // QXMPPBIND_H diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp index 4618da55..0538224f 100644 --- a/source/QXmppClient.cpp +++ b/source/QXmppClient.cpp @@ -1,339 +1,339 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppClient.h" -#include "QXmppStream.h" -#include "QXmppRoster.h" -#include "QXmppMessage.h" -#include "QXmppReconnectionManager.h" - -/// Creates a QXmppClient object. -/// \param parent is passed to the QObject's contructor. -/// The default value is 0. - -QXmppClient::QXmppClient(QObject *parent) - : QObject(parent), m_stream(0), m_clientPrecence(QXmppPresence::Available), - m_reconnectionManager(0) -{ - m_stream = new QXmppStream(this); - - bool check = connect(m_stream, SIGNAL(messageReceived(const QXmppMessage&)), - this, SIGNAL(messageReceived(const QXmppMessage&))); - Q_ASSERT(check); - - check = connect(m_stream, SIGNAL(presenceReceived(const QXmppPresence&)), - this, SIGNAL(presenceReceived(const QXmppPresence&))); - Q_ASSERT(check); - - check = connect(m_stream, SIGNAL(iqReceived(const QXmppIq&)), this, - SIGNAL(iqReceived(const QXmppIq&))); - - check = connect(m_stream, SIGNAL(disconnected()), this, - SIGNAL(disconnected())); - Q_ASSERT(check); - - check = connect(m_stream, SIGNAL(xmppConnected()), this, - SIGNAL(connected())); - Q_ASSERT(check); - - check = connect(m_stream, SIGNAL(error(QXmppClient::Error)), this, - SIGNAL(error(QXmppClient::Error))); - Q_ASSERT(check); - - check = setReconnectionManager(new QXmppReconnectionManager(this)); - Q_ASSERT(check); -} - -/// Destroys the QXmppClient object. -/// - -QXmppClient::~QXmppClient() -{ -} - -/// Returns a modifiable reference to the current configuration of QXmppClient. -/// \return Reference to the QXmppClient's configuration for the connection. - -QXmppConfiguration& QXmppClient::getConfiguration() -{ - return m_config; -} - -/// Overloaded function. It returns a const reference to the current configuration -/// of QXmppClient. -/// \return Constant reference to the QXmppClient's configuration for the connection. - -const QXmppConfiguration& QXmppClient::getConfiguration() const -{ - return m_config; -} - -/// Attempts to connect to the XMPP server. Server deatils and other configurations -/// are specified using the config parameter. Use signals connected(), error(QXmppClient::Error) -/// and disconnected() to know the status of the connection. -/// \param config Specifies the configuration object for connecting the XMPP server. -/// This contains the host name, user, passwd etc. See QXmppConfiguration for details. -/// \param initialPresence The initial presence which will be set for this user -/// after establishing the session. The default value is QXmppPresence::Available - -void QXmppClient::connectToServer(const QXmppConfiguration& config, - const QXmppPresence& initialPresence) -{ - m_config = config; - - if(!m_config.getAutoReconnectionEnabled()) - { - delete m_reconnectionManager; - m_reconnectionManager = 0; - } - - m_clientPrecence = initialPresence; - - m_stream->connect(); -} - -/// Overloaded function. -/// \param host host name of the XMPP server where connection has to be made -/// (e.g. "jabber.org" and "talk.google.com"). It can also be an IP address in -/// the form of a string (e.g. "192.168.1.25"). -/// \param user Username of the account at the specified XMPP server. It should -/// be the name without the domain name. E.g. "qxmpp.test1" and not -/// "qxmpp.test1@gmail.com" -/// \param passwd Password for the specified username -/// \param domain Domain name e.g. "gmail.com" and "jabber.org". -/// \param port Port number at which the XMPP server is listening. The default -/// value is 5222. -/// \param initialPresence The initial presence which will be set for this user -/// after establishing the session. The default value is QXmppPresence::Available - -void QXmppClient::connectToServer(const QString& host, const QString& user, - const QString& passwd, const QString& domain, - int port, - const QXmppPresence& initialPresence) -{ - m_config.setHost(host); - m_config.setUser(user); - m_config.setPasswd(passwd); - m_config.setDomain(domain); - m_config.setPort(port); - - m_clientPrecence = initialPresence; - - m_stream->connect(); -} - -/// After successfully connecting to the server use this function to send -/// stanzas to the server. This function can solely be used to send various kind -/// of stanzas to the server. QXmppPacket is a parent class of all the stanzas -/// QXmppMessage, QXmppPresence, QXmppIq, QXmppBind, QXmppRosterIq, QXmppSession -/// and QXmppVCard. -/// -/// Following code snippet illustrates how to send a message using this function: -/// \code -/// QXmppMessage message(from, to, message); -/// client.sendPacket(message); -/// \endcode -/// -/// \param packet A valid XMPP stanza. It can an iq, a message or a presence stanza. -/// - -void QXmppClient::sendPacket(const QXmppPacket& packet) -{ - if(m_stream) - { - m_stream->sendPacket(packet); - } -} - -/// Disconnects the client and the current presence of client changes to -/// QXmppPresence::Unavailable and statatus text changes to "Logged out". -/// -/// \note Make sure that the clientPresence is changed to -/// QXmppPresence::Available, if you are again calling connectToServer() after -/// calling the disconnect() function. -/// - -void QXmppClient::disconnect() -{ - m_clientPrecence.setType(QXmppPresence::Unavailable); - m_clientPrecence.getStatus().setType(QXmppPresence::Status::Online); - m_clientPrecence.getStatus().setStatusText("Logged out"); - sendPacket(m_clientPrecence); - if(m_stream) - m_stream->disconnect(); -} - -/// Returns the reference to QXmppRoster object of the client. -/// \return Reference to the roster object of the connected client. Use this to -/// get the list of friends in the roster and there presence information. -/// - -QXmppRoster& QXmppClient::getRoster() -{ - return m_stream->getRoster(); -} - -/// Utility function to send message to all the resources associated with the -/// specified bareJid. -/// -/// \param bareJid bareJid of the receiving entity -/// \param message Message string to be sent. - -void QXmppClient::sendMessage(const QString& bareJid, const QString& message) -{ - QStringList resources = getRoster().getResources(bareJid); - for(int i = 0; i < resources.size(); ++i) - { - sendPacket(QXmppMessage("", bareJid + "/" + resources.at(i), message)); - } -} - -/// Changes the presence of the connected client. -/// -/// \param presence QXmppPresence object -/// - -void QXmppClient::setClientPresence(const QXmppPresence& presence) -{ - m_clientPrecence = presence; - sendPacket(m_clientPrecence); -} - -/// Overloaded function. -/// -/// It only changes the status text. -/// -/// \param statusText New status message string -/// - -void QXmppClient::setClientPresence(const QString& statusText) -{ - m_clientPrecence.getStatus().setStatusText(statusText); - sendPacket(m_clientPrecence); -} - -/// Overloaded function. -/// -/// It only changes the QXmppPresence::Type. -/// -/// \param presenceType New QXmppPresence::Type -/// - -void QXmppClient::setClientPresence(QXmppPresence::Type presenceType) -{ - if(presenceType == QXmppPresence::Unavailable) - { - disconnect(); - } - else - { - m_clientPrecence.setType(presenceType); - sendPacket(m_clientPrecence); - } -} - -/// Overloaded function. -/// -/// It only changes the QXmppPresence::Status::Type. -/// -/// \param statusType New QXmppPresence::Status::Type -/// - -void QXmppClient::setClientPresence(QXmppPresence::Status::Type statusType) -{ - m_clientPrecence.getStatus().setType(statusType); - sendPacket(m_clientPrecence); -} - -/// Function to get the client's current presence. -/// -/// \return Constant reference to the client's presence object -/// - -const QXmppPresence& QXmppClient::getClientPresence() const -{ - return m_clientPrecence; -} - -/// Function to get reconnection manager. By default there exists a reconnection -/// manager. See QXmppReconnectionManager for more details of the reconnection -/// mechanism. -/// -/// \return Pointer to QXmppReconnectionManager -/// - -QXmppReconnectionManager* QXmppClient::getReconnectionManager() -{ - return m_reconnectionManager; -} - -/// Sets the user defined reconnection manager. -/// -/// \return true if all the signal-slot connections are made correctly. -/// - -bool QXmppClient::setReconnectionManager(QXmppReconnectionManager* - reconnectionManager) -{ - if(!reconnectionManager) - return false; - - if(m_reconnectionManager) - delete m_reconnectionManager; - - m_reconnectionManager = reconnectionManager; - - bool check = connect(this, SIGNAL(connected()), m_reconnectionManager, - SLOT(connected())); - Q_ASSERT(check); - if(!check) - return false; - - check = connect(this, SIGNAL(error(QXmppClient::Error)), - m_reconnectionManager, SLOT(error(QXmppClient::Error))); - Q_ASSERT(check); - if(!check) - return false; - - return true; -} - -/// Returns the socket error if QXmppClient::Error is QXmppClient::SocketError. -/// -/// \return QAbstractSocket::SocketError -/// - -QAbstractSocket::SocketError QXmppClient::getSocketError() -{ - return m_stream->getSocketError(); -} - -/// Returns the reference to QXmppVCardManager, implimentation of XEP-0054. -/// http://xmpp.org/extensions/xep-0054.html -/// - -QXmppVCardManager& QXmppClient::getVCardManager() -{ - return m_stream->getVCardManager(); -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppClient.h" +#include "QXmppStream.h" +#include "QXmppRoster.h" +#include "QXmppMessage.h" +#include "QXmppReconnectionManager.h" + +/// Creates a QXmppClient object. +/// \param parent is passed to the QObject's contructor. +/// The default value is 0. + +QXmppClient::QXmppClient(QObject *parent) + : QObject(parent), m_stream(0), m_clientPrecence(QXmppPresence::Available), + m_reconnectionManager(0) +{ + m_stream = new QXmppStream(this); + + bool check = connect(m_stream, SIGNAL(messageReceived(const QXmppMessage&)), + this, SIGNAL(messageReceived(const QXmppMessage&))); + Q_ASSERT(check); + + check = connect(m_stream, SIGNAL(presenceReceived(const QXmppPresence&)), + this, SIGNAL(presenceReceived(const QXmppPresence&))); + Q_ASSERT(check); + + check = connect(m_stream, SIGNAL(iqReceived(const QXmppIq&)), this, + SIGNAL(iqReceived(const QXmppIq&))); + + check = connect(m_stream, SIGNAL(disconnected()), this, + SIGNAL(disconnected())); + Q_ASSERT(check); + + check = connect(m_stream, SIGNAL(xmppConnected()), this, + SIGNAL(connected())); + Q_ASSERT(check); + + check = connect(m_stream, SIGNAL(error(QXmppClient::Error)), this, + SIGNAL(error(QXmppClient::Error))); + Q_ASSERT(check); + + check = setReconnectionManager(new QXmppReconnectionManager(this)); + Q_ASSERT(check); +} + +/// Destroys the QXmppClient object. +/// + +QXmppClient::~QXmppClient() +{ +} + +/// Returns a modifiable reference to the current configuration of QXmppClient. +/// \return Reference to the QXmppClient's configuration for the connection. + +QXmppConfiguration& QXmppClient::getConfiguration() +{ + return m_config; +} + +/// Overloaded function. It returns a const reference to the current configuration +/// of QXmppClient. +/// \return Constant reference to the QXmppClient's configuration for the connection. + +const QXmppConfiguration& QXmppClient::getConfiguration() const +{ + return m_config; +} + +/// Attempts to connect to the XMPP server. Server deatils and other configurations +/// are specified using the config parameter. Use signals connected(), error(QXmppClient::Error) +/// and disconnected() to know the status of the connection. +/// \param config Specifies the configuration object for connecting the XMPP server. +/// This contains the host name, user, passwd etc. See QXmppConfiguration for details. +/// \param initialPresence The initial presence which will be set for this user +/// after establishing the session. The default value is QXmppPresence::Available + +void QXmppClient::connectToServer(const QXmppConfiguration& config, + const QXmppPresence& initialPresence) +{ + m_config = config; + + if(!m_config.getAutoReconnectionEnabled()) + { + delete m_reconnectionManager; + m_reconnectionManager = 0; + } + + m_clientPrecence = initialPresence; + + m_stream->connect(); +} + +/// Overloaded function. +/// \param host host name of the XMPP server where connection has to be made +/// (e.g. "jabber.org" and "talk.google.com"). It can also be an IP address in +/// the form of a string (e.g. "192.168.1.25"). +/// \param user Username of the account at the specified XMPP server. It should +/// be the name without the domain name. E.g. "qxmpp.test1" and not +/// "qxmpp.test1@gmail.com" +/// \param passwd Password for the specified username +/// \param domain Domain name e.g. "gmail.com" and "jabber.org". +/// \param port Port number at which the XMPP server is listening. The default +/// value is 5222. +/// \param initialPresence The initial presence which will be set for this user +/// after establishing the session. The default value is QXmppPresence::Available + +void QXmppClient::connectToServer(const QString& host, const QString& user, + const QString& passwd, const QString& domain, + int port, + const QXmppPresence& initialPresence) +{ + m_config.setHost(host); + m_config.setUser(user); + m_config.setPasswd(passwd); + m_config.setDomain(domain); + m_config.setPort(port); + + m_clientPrecence = initialPresence; + + m_stream->connect(); +} + +/// After successfully connecting to the server use this function to send +/// stanzas to the server. This function can solely be used to send various kind +/// of stanzas to the server. QXmppPacket is a parent class of all the stanzas +/// QXmppMessage, QXmppPresence, QXmppIq, QXmppBind, QXmppRosterIq, QXmppSession +/// and QXmppVCard. +/// +/// Following code snippet illustrates how to send a message using this function: +/// \code +/// QXmppMessage message(from, to, message); +/// client.sendPacket(message); +/// \endcode +/// +/// \param packet A valid XMPP stanza. It can an iq, a message or a presence stanza. +/// + +void QXmppClient::sendPacket(const QXmppPacket& packet) +{ + if(m_stream) + { + m_stream->sendPacket(packet); + } +} + +/// Disconnects the client and the current presence of client changes to +/// QXmppPresence::Unavailable and statatus text changes to "Logged out". +/// +/// \note Make sure that the clientPresence is changed to +/// QXmppPresence::Available, if you are again calling connectToServer() after +/// calling the disconnect() function. +/// + +void QXmppClient::disconnect() +{ + m_clientPrecence.setType(QXmppPresence::Unavailable); + m_clientPrecence.getStatus().setType(QXmppPresence::Status::Online); + m_clientPrecence.getStatus().setStatusText("Logged out"); + sendPacket(m_clientPrecence); + if(m_stream) + m_stream->disconnect(); +} + +/// Returns the reference to QXmppRoster object of the client. +/// \return Reference to the roster object of the connected client. Use this to +/// get the list of friends in the roster and there presence information. +/// + +QXmppRoster& QXmppClient::getRoster() +{ + return m_stream->getRoster(); +} + +/// Utility function to send message to all the resources associated with the +/// specified bareJid. +/// +/// \param bareJid bareJid of the receiving entity +/// \param message Message string to be sent. + +void QXmppClient::sendMessage(const QString& bareJid, const QString& message) +{ + QStringList resources = getRoster().getResources(bareJid); + for(int i = 0; i < resources.size(); ++i) + { + sendPacket(QXmppMessage("", bareJid + "/" + resources.at(i), message)); + } +} + +/// Changes the presence of the connected client. +/// +/// \param presence QXmppPresence object +/// + +void QXmppClient::setClientPresence(const QXmppPresence& presence) +{ + m_clientPrecence = presence; + sendPacket(m_clientPrecence); +} + +/// Overloaded function. +/// +/// It only changes the status text. +/// +/// \param statusText New status message string +/// + +void QXmppClient::setClientPresence(const QString& statusText) +{ + m_clientPrecence.getStatus().setStatusText(statusText); + sendPacket(m_clientPrecence); +} + +/// Overloaded function. +/// +/// It only changes the QXmppPresence::Type. +/// +/// \param presenceType New QXmppPresence::Type +/// + +void QXmppClient::setClientPresence(QXmppPresence::Type presenceType) +{ + if(presenceType == QXmppPresence::Unavailable) + { + disconnect(); + } + else + { + m_clientPrecence.setType(presenceType); + sendPacket(m_clientPrecence); + } +} + +/// Overloaded function. +/// +/// It only changes the QXmppPresence::Status::Type. +/// +/// \param statusType New QXmppPresence::Status::Type +/// + +void QXmppClient::setClientPresence(QXmppPresence::Status::Type statusType) +{ + m_clientPrecence.getStatus().setType(statusType); + sendPacket(m_clientPrecence); +} + +/// Function to get the client's current presence. +/// +/// \return Constant reference to the client's presence object +/// + +const QXmppPresence& QXmppClient::getClientPresence() const +{ + return m_clientPrecence; +} + +/// Function to get reconnection manager. By default there exists a reconnection +/// manager. See QXmppReconnectionManager for more details of the reconnection +/// mechanism. +/// +/// \return Pointer to QXmppReconnectionManager +/// + +QXmppReconnectionManager* QXmppClient::getReconnectionManager() +{ + return m_reconnectionManager; +} + +/// Sets the user defined reconnection manager. +/// +/// \return true if all the signal-slot connections are made correctly. +/// + +bool QXmppClient::setReconnectionManager(QXmppReconnectionManager* + reconnectionManager) +{ + if(!reconnectionManager) + return false; + + if(m_reconnectionManager) + delete m_reconnectionManager; + + m_reconnectionManager = reconnectionManager; + + bool check = connect(this, SIGNAL(connected()), m_reconnectionManager, + SLOT(connected())); + Q_ASSERT(check); + if(!check) + return false; + + check = connect(this, SIGNAL(error(QXmppClient::Error)), + m_reconnectionManager, SLOT(error(QXmppClient::Error))); + Q_ASSERT(check); + if(!check) + return false; + + return true; +} + +/// Returns the socket error if QXmppClient::Error is QXmppClient::SocketError. +/// +/// \return QAbstractSocket::SocketError +/// + +QAbstractSocket::SocketError QXmppClient::getSocketError() +{ + return m_stream->getSocketError(); +} + +/// Returns the reference to QXmppVCardManager, implimentation of XEP-0054. +/// http://xmpp.org/extensions/xep-0054.html +/// + +QXmppVCardManager& QXmppClient::getVCardManager() +{ + return m_stream->getVCardManager(); +} diff --git a/source/QXmppClient.h b/source/QXmppClient.h index 04fbd196..5e5f3099 100644 --- a/source/QXmppClient.h +++ b/source/QXmppClient.h @@ -1,160 +1,160 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - -/// \class QXmppClient -/// \brief The QXmppClient is the main class for using QXmpp. -/// -/// It provides the user all the required functionality to connect to the server -/// and perform operations afterwards. -/// -/// This class will provide the handle/reference to QXmppRoster (roster management), -/// QXmppVCardManager (vCard manager) and QXmppReconnectionManager (reconnection -/// mechanism). -/// -/// By default, a reconnection mechanism exists, which makes sure of reconnecting -/// to the server on dissconnections due to an error. User can have a custom -/// reconnection mechanism as well. -/// - -#ifndef QXMPPCLIENT_H -#define QXMPPCLIENT_H - -#include -#include -#include "QXmppConfiguration.h" -#include "QXmppPresence.h" - -class QXmppStream; -class QXmppPresence; -class QXmppMessage; -class QXmppPacket; -class QXmppIq; -class QXmppRoster; -class QXmppReconnectionManager; -class QXmppVCardManager; - -class QXmppClient : public QObject -{ - Q_OBJECT - -public: - /// An enumeration for type of error. - /// Error could come due a TCP socket or XML stream or due to various stanzas. - enum Error - { - SocketError, ///< Error due to TCP socket - XmppStreamError, ///< Error due to XML stream - XmppStanzaError ///< Error due to stanza - }; - - QXmppClient(QObject *parent = 0); - ~QXmppClient(); - void connectToServer(const QString& host, - const QString& user, - const QString& passwd, - const QString& domain, - int port = 5222, - const QXmppPresence& initialPresence = - QXmppPresence()); - void connectToServer(const QXmppConfiguration&, - const QXmppPresence& initialPresence = - QXmppPresence()); - void disconnect(); - QXmppRoster& getRoster(); - QXmppConfiguration& getConfiguration(); - const QXmppConfiguration& getConfiguration() const; - QXmppReconnectionManager* getReconnectionManager(); - bool setReconnectionManager(QXmppReconnectionManager*); - const QXmppPresence& getClientPresence() const; - QXmppVCardManager& getVCardManager(); - -signals: - - /// This signal is emitted when the client connects sucessfully to the XMPP - /// server i.e. when a successful XMPP connection is established. - /// XMPP Connection involves following sequential steps: - /// - TCP socket connection - /// - Client sends start stream - /// - Server sends start stream - /// - TLS negotiation (encryption) - /// - Authentication - /// - Resource binding - /// - Session establishment - /// - /// After all these steps a successful XMPP connection is established and - /// connected() signal is emitted. - /// - void connected(); - - /// This signal is emitted when the XMPP connection disconnects. - /// - void disconnected(); - - /// This signal is emitted when the XMPP connection encounters any error. - /// The QXmppClient::Error parameter specifies the type of error occured. - /// It could be due to TCP socket or the xml stream or the stanza. - /// Depending upon the type of error occured use the respective get function to - /// know the error. - void error(QXmppClient::Error); - - /// Notifies that an XMPP message stanza is received. The QXmppMessage - /// parameter contains the details of the message sent to this client. - /// In other words whenever someone sends you a message this signal is - /// emitted. - void messageReceived(const QXmppMessage&); - - /// Notifies that an XMPP presence stanza is received. The QXmppPresence - /// parameter contains the details of the presence sent to this client. - /// This signal is emitted when someone login/logout or when someone's status - /// changes Busy, Idle, Invisible etc. - void presenceReceived(const QXmppPresence&); - - /// Notifies that an XMPP iq stanza is received. The QXmppIq - /// parameter contains the details of the iq sent to this client. - /// IQ stanzas provide a structured request-response mechanism. Roster - /// management, setting-getting vCards etc is done using iq stanzas. - void iqReceived(const QXmppIq&); - -public: - QAbstractSocket::SocketError getSocketError(); -// QXmppStanza::Error getXmppStreamError(); - -public slots: - void sendPacket(const QXmppPacket&); - void sendMessage(const QString& bareJid, const QString& message); - - void setClientPresence(const QXmppPresence&); - void setClientPresence(const QString& statusText); - void setClientPresence(QXmppPresence::Type presenceType); - void setClientPresence(QXmppPresence::Status::Type statusType); - -private: - QXmppStream* m_stream; ///< Pointer to QXmppStream object a wrapper over - ///< TCP socket and XMPP protocol - QXmppConfiguration m_config; ///< This object provides the configuration - ///< required for connecting to the XMPP server. - QXmppPresence m_clientPrecence; ///< Stores the current presence of connected client - QXmppReconnectionManager* m_reconnectionManager; ///< Pointer to the reconnection manager -}; - -#endif // QXMPPCLIENT_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +/// \class QXmppClient +/// \brief The QXmppClient is the main class for using QXmpp. +/// +/// It provides the user all the required functionality to connect to the server +/// and perform operations afterwards. +/// +/// This class will provide the handle/reference to QXmppRoster (roster management), +/// QXmppVCardManager (vCard manager) and QXmppReconnectionManager (reconnection +/// mechanism). +/// +/// By default, a reconnection mechanism exists, which makes sure of reconnecting +/// to the server on dissconnections due to an error. User can have a custom +/// reconnection mechanism as well. +/// + +#ifndef QXMPPCLIENT_H +#define QXMPPCLIENT_H + +#include +#include +#include "QXmppConfiguration.h" +#include "QXmppPresence.h" + +class QXmppStream; +class QXmppPresence; +class QXmppMessage; +class QXmppPacket; +class QXmppIq; +class QXmppRoster; +class QXmppReconnectionManager; +class QXmppVCardManager; + +class QXmppClient : public QObject +{ + Q_OBJECT + +public: + /// An enumeration for type of error. + /// Error could come due a TCP socket or XML stream or due to various stanzas. + enum Error + { + SocketError, ///< Error due to TCP socket + XmppStreamError, ///< Error due to XML stream + XmppStanzaError ///< Error due to stanza + }; + + QXmppClient(QObject *parent = 0); + ~QXmppClient(); + void connectToServer(const QString& host, + const QString& user, + const QString& passwd, + const QString& domain, + int port = 5222, + const QXmppPresence& initialPresence = + QXmppPresence()); + void connectToServer(const QXmppConfiguration&, + const QXmppPresence& initialPresence = + QXmppPresence()); + void disconnect(); + QXmppRoster& getRoster(); + QXmppConfiguration& getConfiguration(); + const QXmppConfiguration& getConfiguration() const; + QXmppReconnectionManager* getReconnectionManager(); + bool setReconnectionManager(QXmppReconnectionManager*); + const QXmppPresence& getClientPresence() const; + QXmppVCardManager& getVCardManager(); + +signals: + + /// This signal is emitted when the client connects sucessfully to the XMPP + /// server i.e. when a successful XMPP connection is established. + /// XMPP Connection involves following sequential steps: + /// - TCP socket connection + /// - Client sends start stream + /// - Server sends start stream + /// - TLS negotiation (encryption) + /// - Authentication + /// - Resource binding + /// - Session establishment + /// + /// After all these steps a successful XMPP connection is established and + /// connected() signal is emitted. + /// + void connected(); + + /// This signal is emitted when the XMPP connection disconnects. + /// + void disconnected(); + + /// This signal is emitted when the XMPP connection encounters any error. + /// The QXmppClient::Error parameter specifies the type of error occured. + /// It could be due to TCP socket or the xml stream or the stanza. + /// Depending upon the type of error occured use the respective get function to + /// know the error. + void error(QXmppClient::Error); + + /// Notifies that an XMPP message stanza is received. The QXmppMessage + /// parameter contains the details of the message sent to this client. + /// In other words whenever someone sends you a message this signal is + /// emitted. + void messageReceived(const QXmppMessage&); + + /// Notifies that an XMPP presence stanza is received. The QXmppPresence + /// parameter contains the details of the presence sent to this client. + /// This signal is emitted when someone login/logout or when someone's status + /// changes Busy, Idle, Invisible etc. + void presenceReceived(const QXmppPresence&); + + /// Notifies that an XMPP iq stanza is received. The QXmppIq + /// parameter contains the details of the iq sent to this client. + /// IQ stanzas provide a structured request-response mechanism. Roster + /// management, setting-getting vCards etc is done using iq stanzas. + void iqReceived(const QXmppIq&); + +public: + QAbstractSocket::SocketError getSocketError(); +// QXmppStanza::Error getXmppStreamError(); + +public slots: + void sendPacket(const QXmppPacket&); + void sendMessage(const QString& bareJid, const QString& message); + + void setClientPresence(const QXmppPresence&); + void setClientPresence(const QString& statusText); + void setClientPresence(QXmppPresence::Type presenceType); + void setClientPresence(QXmppPresence::Status::Type statusType); + +private: + QXmppStream* m_stream; ///< Pointer to QXmppStream object a wrapper over + ///< TCP socket and XMPP protocol + QXmppConfiguration m_config; ///< This object provides the configuration + ///< required for connecting to the XMPP server. + QXmppPresence m_clientPrecence; ///< Stores the current presence of connected client + QXmppReconnectionManager* m_reconnectionManager; ///< Pointer to the reconnection manager +}; + +#endif // QXMPPCLIENT_H diff --git a/source/QXmppConfiguration.cpp b/source/QXmppConfiguration.cpp index 7943c5fd..279cbe65 100644 --- a/source/QXmppConfiguration.cpp +++ b/source/QXmppConfiguration.cpp @@ -1,217 +1,217 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppConfiguration.h" - -QXmppConfiguration::QXmppConfiguration() : m_port(5222), - m_resource("QXmpp"), - m_autoAcceptSubscriptions(true), - m_sendIntialPresence(true), - m_sendRosterRequest(true), - m_keepAlivePingsInterval(100), - m_autoReconnectionEnabled(true), - m_useSASLAuthentication(true), - m_streamSecurityMode(QXmppConfiguration::TLSEnabled), - m_nonSASLAuthMechanism(QXmppConfiguration::NonSASLDigest), - m_SASLAuthMechanism(QXmppConfiguration::SASLDigestMD5) -{ - -} - -QXmppConfiguration::~QXmppConfiguration() -{ - -} - -void QXmppConfiguration::setHost(const QString& str) -{ - m_host = str; -} - -void QXmppConfiguration::setDomain(const QString& str) -{ - m_domain = str; -} - -void QXmppConfiguration::setPort(int port) -{ - m_port = port; -} - -void QXmppConfiguration::setUser(const QString& str) -{ - m_user = str; -} - -void QXmppConfiguration::setPasswd(const QString& str) -{ - m_passwd = str; -} - -void QXmppConfiguration::setResource(const QString& str) -{ - m_resource = str; -} - -QString QXmppConfiguration::getHost() const -{ - return m_host; -} - -QString QXmppConfiguration::getDomain() const -{ - return m_domain; -} - -int QXmppConfiguration::getPort() const -{ - return m_port; -} - -QString QXmppConfiguration::getUser() const -{ - return m_user; -} -QString QXmppConfiguration::getPasswd() const -{ - return m_passwd; -} - -QString QXmppConfiguration::getResource() const -{ - return m_resource; -} - -QString QXmppConfiguration::getJid() const -{ - return getJidBare() + "/" + m_resource; -} - -QString QXmppConfiguration::getJidBare() const -{ - return m_user+"@"+m_domain; -} - -bool QXmppConfiguration::getAutoAcceptSubscriptions() const -{ - return m_autoAcceptSubscriptions; -} - -void QXmppConfiguration::setAutoAcceptSubscriptions(bool check) -{ - m_autoAcceptSubscriptions = check; -} - -bool QXmppConfiguration::getAutoReconnectionEnabled() const -{ - return m_autoReconnectionEnabled; -} - -void QXmppConfiguration::setAutoReconnectionEnabled(bool value) -{ - m_autoReconnectionEnabled = value; -} - -/// Returns the type of authentication system specified by the user. -/// \return true if SASL was specified else false. If the specified -/// system is not available QXmpp will resort to the other one. - -bool QXmppConfiguration::getUseSASLAuthentication() const -{ - return m_useSASLAuthentication; -} - -/// Returns the type of authentication system specified by the user. -/// \param useSASL to hint to use SASL authentication system if available. -/// false will specify to use NonSASL XEP-0078: Non-SASL Authentication -/// If the specified one is not availbe, library will use the othe one - -void QXmppConfiguration::setUseSASLAuthentication(bool useSASL) -{ - m_useSASLAuthentication = useSASL; -} - -/// Returns the specified security mode for the stream. The default value is -/// QXmppConfiguration::TLSEnabled. -/// \return StreamSecurityMode - -QXmppConfiguration::StreamSecurityMode QXmppConfiguration::getStreamSecurityMode() const -{ - return m_streamSecurityMode; -} - -/// Specifies the specified security mode for the stream. The default value is -/// QXmppConfiguration::TLSEnabled. -/// \param mode StreamSecurityMode - -void QXmppConfiguration::setStreamSecurityMode( - QXmppConfiguration::StreamSecurityMode mode) -{ - m_streamSecurityMode = mode; -} - -QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::getNonSASLAuthMechanism() const -{ - return m_nonSASLAuthMechanism; -} - -void QXmppConfiguration::setNonSASLAuthMechanism( - QXmppConfiguration::NonSASLAuthMechanism mech) -{ - m_nonSASLAuthMechanism = mech; -} - -QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::getSASLAuthMechanism() const -{ - return m_SASLAuthMechanism; -} - -void QXmppConfiguration::setSASLAuthMechanism( - QXmppConfiguration::SASLAuthMechanism mech) -{ - m_SASLAuthMechanism = mech; -} - -/// Specifies the network proxy used for the connection made by QXmppClient. -/// The default value is QNetworkProxy::DefaultProxy that is the proxy is -/// determined based on the application proxy set using -/// QNetworkProxy::setApplicationProxy(). -/// \param proxy QNetworkProxy - -void QXmppConfiguration::setNetworkProxy(const QNetworkProxy& proxy) -{ - m_networkProxy = proxy; -} - -/// Returns the specified network proxy. -/// The default value is QNetworkProxy::DefaultProxy that is the proxy is -/// determined based on the application proxy set using -/// QNetworkProxy::setApplicationProxy(). -/// \return QNetworkProxy - -QNetworkProxy QXmppConfiguration::getNetworkProxy() const -{ - return m_networkProxy; -} - +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppConfiguration.h" + +QXmppConfiguration::QXmppConfiguration() : m_port(5222), + m_resource("QXmpp"), + m_autoAcceptSubscriptions(true), + m_sendIntialPresence(true), + m_sendRosterRequest(true), + m_keepAlivePingsInterval(100), + m_autoReconnectionEnabled(true), + m_useSASLAuthentication(true), + m_streamSecurityMode(QXmppConfiguration::TLSEnabled), + m_nonSASLAuthMechanism(QXmppConfiguration::NonSASLDigest), + m_SASLAuthMechanism(QXmppConfiguration::SASLDigestMD5) +{ + +} + +QXmppConfiguration::~QXmppConfiguration() +{ + +} + +void QXmppConfiguration::setHost(const QString& str) +{ + m_host = str; +} + +void QXmppConfiguration::setDomain(const QString& str) +{ + m_domain = str; +} + +void QXmppConfiguration::setPort(int port) +{ + m_port = port; +} + +void QXmppConfiguration::setUser(const QString& str) +{ + m_user = str; +} + +void QXmppConfiguration::setPasswd(const QString& str) +{ + m_passwd = str; +} + +void QXmppConfiguration::setResource(const QString& str) +{ + m_resource = str; +} + +QString QXmppConfiguration::getHost() const +{ + return m_host; +} + +QString QXmppConfiguration::getDomain() const +{ + return m_domain; +} + +int QXmppConfiguration::getPort() const +{ + return m_port; +} + +QString QXmppConfiguration::getUser() const +{ + return m_user; +} +QString QXmppConfiguration::getPasswd() const +{ + return m_passwd; +} + +QString QXmppConfiguration::getResource() const +{ + return m_resource; +} + +QString QXmppConfiguration::getJid() const +{ + return getJidBare() + "/" + m_resource; +} + +QString QXmppConfiguration::getJidBare() const +{ + return m_user+"@"+m_domain; +} + +bool QXmppConfiguration::getAutoAcceptSubscriptions() const +{ + return m_autoAcceptSubscriptions; +} + +void QXmppConfiguration::setAutoAcceptSubscriptions(bool check) +{ + m_autoAcceptSubscriptions = check; +} + +bool QXmppConfiguration::getAutoReconnectionEnabled() const +{ + return m_autoReconnectionEnabled; +} + +void QXmppConfiguration::setAutoReconnectionEnabled(bool value) +{ + m_autoReconnectionEnabled = value; +} + +/// Returns the type of authentication system specified by the user. +/// \return true if SASL was specified else false. If the specified +/// system is not available QXmpp will resort to the other one. + +bool QXmppConfiguration::getUseSASLAuthentication() const +{ + return m_useSASLAuthentication; +} + +/// Returns the type of authentication system specified by the user. +/// \param useSASL to hint to use SASL authentication system if available. +/// false will specify to use NonSASL XEP-0078: Non-SASL Authentication +/// If the specified one is not availbe, library will use the othe one + +void QXmppConfiguration::setUseSASLAuthentication(bool useSASL) +{ + m_useSASLAuthentication = useSASL; +} + +/// Returns the specified security mode for the stream. The default value is +/// QXmppConfiguration::TLSEnabled. +/// \return StreamSecurityMode + +QXmppConfiguration::StreamSecurityMode QXmppConfiguration::getStreamSecurityMode() const +{ + return m_streamSecurityMode; +} + +/// Specifies the specified security mode for the stream. The default value is +/// QXmppConfiguration::TLSEnabled. +/// \param mode StreamSecurityMode + +void QXmppConfiguration::setStreamSecurityMode( + QXmppConfiguration::StreamSecurityMode mode) +{ + m_streamSecurityMode = mode; +} + +QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::getNonSASLAuthMechanism() const +{ + return m_nonSASLAuthMechanism; +} + +void QXmppConfiguration::setNonSASLAuthMechanism( + QXmppConfiguration::NonSASLAuthMechanism mech) +{ + m_nonSASLAuthMechanism = mech; +} + +QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::getSASLAuthMechanism() const +{ + return m_SASLAuthMechanism; +} + +void QXmppConfiguration::setSASLAuthMechanism( + QXmppConfiguration::SASLAuthMechanism mech) +{ + m_SASLAuthMechanism = mech; +} + +/// Specifies the network proxy used for the connection made by QXmppClient. +/// The default value is QNetworkProxy::DefaultProxy that is the proxy is +/// determined based on the application proxy set using +/// QNetworkProxy::setApplicationProxy(). +/// \param proxy QNetworkProxy + +void QXmppConfiguration::setNetworkProxy(const QNetworkProxy& proxy) +{ + m_networkProxy = proxy; +} + +/// Returns the specified network proxy. +/// The default value is QNetworkProxy::DefaultProxy that is the proxy is +/// determined based on the application proxy set using +/// QNetworkProxy::setApplicationProxy(). +/// \return QNetworkProxy + +QNetworkProxy QXmppConfiguration::getNetworkProxy() const +{ + return m_networkProxy; +} + diff --git a/source/QXmppConfiguration.h b/source/QXmppConfiguration.h index baabf1bd..953fe932 100644 --- a/source/QXmppConfiguration.h +++ b/source/QXmppConfiguration.h @@ -1,137 +1,137 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPCONFIGURATION_H -#define QXMPPCONFIGURATION_H - -#include -#include - -class QXmppConfiguration -{ -public: - /// An enumeration for type of the Security Mode that is stream is encrypted or not. - /// The server may or may not have TLS feature. Server may force the encryption. - /// Depending upon all this user can specify following options. - enum StreamSecurityMode - { - TLSEnabled = 0, ///< Default, encryption is used if available - TLSDisabled, ///< No encryption is server allows - TLSRequired ///< Encryption is a must otherwise connection would not - ///< be established - }; - - /// An enumeration for various Non-SASL authentication mechanisms available. - /// The server may or may not allow QXmppConfiguration::Plain mechanism. So - /// specifying the mechanism is just a hint to the library. - enum NonSASLAuthMechanism - { - NonSASLPlain = 0,///< Plain - NonSASLDigest ///< Default, - }; - - /// An enumeration for various SASL authentication mechanisms available. - /// The server may or may not allow any particular mechanism. So depending - /// upon the availability of mechanisms on the server the library will choose - /// a mechanism. - enum SASLAuthMechanism - { - SASLPlain = 0, - SASLDigestMD5 ///< Default - }; - - QXmppConfiguration(); - ~QXmppConfiguration(); - - void setHost(const QString&); - void setDomain(const QString&); - void setPort(int); - void setUser(const QString&); - void setPasswd(const QString&); - void setResource(const QString&); - - QString getHost() const; - QString getDomain() const; - int getPort() const; - QString getUser() const; - QString getPasswd() const; - QString getStatus() const; - QString getResource() const; - QString getJid() const; - QString getJidBare() const; - - bool getAutoAcceptSubscriptions() const; - void setAutoAcceptSubscriptions(bool); - - bool getAutoReconnectionEnabled() const; - void setAutoReconnectionEnabled(bool); - - bool getUseSASLAuthentication() const; - void setUseSASLAuthentication(bool); - - QXmppConfiguration::StreamSecurityMode getStreamSecurityMode() const; - void setStreamSecurityMode(QXmppConfiguration::StreamSecurityMode mode); - - QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration:: - getNonSASLAuthMechanism() const; - void setNonSASLAuthMechanism(QXmppConfiguration::NonSASLAuthMechanism); - - QXmppConfiguration::SASLAuthMechanism QXmppConfiguration:: - getSASLAuthMechanism() const; - void setSASLAuthMechanism(QXmppConfiguration::SASLAuthMechanism); - - void setNetworkProxy(const QNetworkProxy& proxy); - QNetworkProxy getNetworkProxy() const; - -private: - QString m_host; - int m_port; - QString m_user; - QString m_passwd; - QString m_domain; - QString m_resource; - - // default is true - bool m_autoAcceptSubscriptions; - // default is true - bool m_sendIntialPresence; - // default is true - bool m_sendRosterRequest; - // interval in seconds, if negative it won't ping - int m_keepAlivePingsInterval; - // will keep reconnecting if disconnected, default is true - bool m_autoReconnectionEnabled; - bool m_useSASLAuthentication; ///< flag to specify what authentication system - ///< to be used - ///< defualt is true and use SASL - ///< false would use NonSASL if available - - StreamSecurityMode m_streamSecurityMode; - NonSASLAuthMechanism m_nonSASLAuthMechanism; - SASLAuthMechanism m_SASLAuthMechanism; - - QNetworkProxy m_networkProxy; -}; - -#endif // QXMPPCONFIGURATION_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPCONFIGURATION_H +#define QXMPPCONFIGURATION_H + +#include +#include + +class QXmppConfiguration +{ +public: + /// An enumeration for type of the Security Mode that is stream is encrypted or not. + /// The server may or may not have TLS feature. Server may force the encryption. + /// Depending upon all this user can specify following options. + enum StreamSecurityMode + { + TLSEnabled = 0, ///< Default, encryption is used if available + TLSDisabled, ///< No encryption is server allows + TLSRequired ///< Encryption is a must otherwise connection would not + ///< be established + }; + + /// An enumeration for various Non-SASL authentication mechanisms available. + /// The server may or may not allow QXmppConfiguration::Plain mechanism. So + /// specifying the mechanism is just a hint to the library. + enum NonSASLAuthMechanism + { + NonSASLPlain = 0,///< Plain + NonSASLDigest ///< Default, + }; + + /// An enumeration for various SASL authentication mechanisms available. + /// The server may or may not allow any particular mechanism. So depending + /// upon the availability of mechanisms on the server the library will choose + /// a mechanism. + enum SASLAuthMechanism + { + SASLPlain = 0, + SASLDigestMD5 ///< Default + }; + + QXmppConfiguration(); + ~QXmppConfiguration(); + + void setHost(const QString&); + void setDomain(const QString&); + void setPort(int); + void setUser(const QString&); + void setPasswd(const QString&); + void setResource(const QString&); + + QString getHost() const; + QString getDomain() const; + int getPort() const; + QString getUser() const; + QString getPasswd() const; + QString getStatus() const; + QString getResource() const; + QString getJid() const; + QString getJidBare() const; + + bool getAutoAcceptSubscriptions() const; + void setAutoAcceptSubscriptions(bool); + + bool getAutoReconnectionEnabled() const; + void setAutoReconnectionEnabled(bool); + + bool getUseSASLAuthentication() const; + void setUseSASLAuthentication(bool); + + QXmppConfiguration::StreamSecurityMode getStreamSecurityMode() const; + void setStreamSecurityMode(QXmppConfiguration::StreamSecurityMode mode); + + QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration:: + getNonSASLAuthMechanism() const; + void setNonSASLAuthMechanism(QXmppConfiguration::NonSASLAuthMechanism); + + QXmppConfiguration::SASLAuthMechanism QXmppConfiguration:: + getSASLAuthMechanism() const; + void setSASLAuthMechanism(QXmppConfiguration::SASLAuthMechanism); + + void setNetworkProxy(const QNetworkProxy& proxy); + QNetworkProxy getNetworkProxy() const; + +private: + QString m_host; + int m_port; + QString m_user; + QString m_passwd; + QString m_domain; + QString m_resource; + + // default is true + bool m_autoAcceptSubscriptions; + // default is true + bool m_sendIntialPresence; + // default is true + bool m_sendRosterRequest; + // interval in seconds, if negative it won't ping + int m_keepAlivePingsInterval; + // will keep reconnecting if disconnected, default is true + bool m_autoReconnectionEnabled; + bool m_useSASLAuthentication; ///< flag to specify what authentication system + ///< to be used + ///< defualt is true and use SASL + ///< false would use NonSASL if available + + StreamSecurityMode m_streamSecurityMode; + NonSASLAuthMechanism m_nonSASLAuthMechanism; + SASLAuthMechanism m_SASLAuthMechanism; + + QNetworkProxy m_networkProxy; +}; + +#endif // QXMPPCONFIGURATION_H diff --git a/source/QXmppConstants.cpp b/source/QXmppConstants.cpp index bd73494f..7fd2ead4 100644 --- a/source/QXmppConstants.cpp +++ b/source/QXmppConstants.cpp @@ -1,39 +1,39 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppConstants.h" - -const char* ns_stream = "http://etherx.jabber.org/streams"; -const char* ns_client = "jabber:client"; -const char* ns_roster = "jabber:iq:roster"; -const char* ns_tls = "urn:ietf:params:xml:ns:xmpp-tls"; -const char* ns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl"; -const char* ns_bind = "urn:ietf:params:xml:ns:xmpp-bind"; -const char* ns_session = "urn:ietf:params:xml:ns:xmpp-session"; -const char* ns_stanza = "urn:ietf:params:xml:ns:xmpp-stanzas"; -const char* ns_vcard = "vcard-temp"; -const char* ns_auth = "jabber:iq:auth"; -const char* ns_authFeature = "http://jabber.org/features/iq-auth"; -const char* ns_disco_info = "http://jabber.org/protocol/disco#info"; -const char* ns_ibb = "http://jabber.org/protocol/ibb"; +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppConstants.h" + +const char* ns_stream = "http://etherx.jabber.org/streams"; +const char* ns_client = "jabber:client"; +const char* ns_roster = "jabber:iq:roster"; +const char* ns_tls = "urn:ietf:params:xml:ns:xmpp-tls"; +const char* ns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl"; +const char* ns_bind = "urn:ietf:params:xml:ns:xmpp-bind"; +const char* ns_session = "urn:ietf:params:xml:ns:xmpp-session"; +const char* ns_stanza = "urn:ietf:params:xml:ns:xmpp-stanzas"; +const char* ns_vcard = "vcard-temp"; +const char* ns_auth = "jabber:iq:auth"; +const char* ns_authFeature = "http://jabber.org/features/iq-auth"; +const char* ns_disco_info = "http://jabber.org/protocol/disco#info"; +const char* ns_ibb = "http://jabber.org/protocol/ibb"; diff --git a/source/QXmppConstants.h b/source/QXmppConstants.h index ee92560a..0e2553e9 100644 --- a/source/QXmppConstants.h +++ b/source/QXmppConstants.h @@ -1,42 +1,42 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPCONSTANTS_H -#define QXMPPCONSTANTS_H - -extern const char* ns_stream; -extern const char* ns_client; -extern const char* ns_roster; -extern const char* ns_tls; -extern const char* ns_sasl; -extern const char* ns_bind; -extern const char* ns_session; -extern const char* ns_stanza; -extern const char* ns_vcard; -extern const char* ns_auth; -extern const char* ns_authFeature; -extern const char* ns_disco_info; -extern const char* ns_ibb; - -#endif // QXMPPCONSTANTS_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPCONSTANTS_H +#define QXMPPCONSTANTS_H + +extern const char* ns_stream; +extern const char* ns_client; +extern const char* ns_roster; +extern const char* ns_tls; +extern const char* ns_sasl; +extern const char* ns_bind; +extern const char* ns_session; +extern const char* ns_stanza; +extern const char* ns_vcard; +extern const char* ns_auth; +extern const char* ns_authFeature; +extern const char* ns_disco_info; +extern const char* ns_ibb; + +#endif // QXMPPCONSTANTS_H diff --git a/source/QXmppInformationRequestResult.cpp b/source/QXmppInformationRequestResult.cpp index 058612f1..e882a6f2 100644 --- a/source/QXmppInformationRequestResult.cpp +++ b/source/QXmppInformationRequestResult.cpp @@ -1,20 +1,20 @@ -#include "QXmppInformationRequestResult.h" -#include "QXmppConstants.h" -#include - -QXmppInformationRequestResult::QXmppInformationRequestResult() : QXmppIq(QXmppIq::Result) -{ -} - -void QXmppInformationRequestResult::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("query"); - writer->writeAttribute("xmlns", ns_disco_info ); - writer->writeStartElement("feature"); - writer->writeAttribute("var", ns_disco_info ); - writer->writeEndElement(); - writer->writeStartElement("feature"); - writer->writeAttribute("var", ns_ibb ); - writer->writeEndElement(); - writer->writeEndElement(); -} +#include "QXmppInformationRequestResult.h" +#include "QXmppConstants.h" +#include + +QXmppInformationRequestResult::QXmppInformationRequestResult() : QXmppIq(QXmppIq::Result) +{ +} + +void QXmppInformationRequestResult::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("query"); + writer->writeAttribute("xmlns", ns_disco_info ); + writer->writeStartElement("feature"); + writer->writeAttribute("var", ns_disco_info ); + writer->writeEndElement(); + writer->writeStartElement("feature"); + writer->writeAttribute("var", ns_ibb ); + writer->writeEndElement(); + writer->writeEndElement(); +} diff --git a/source/QXmppInformationRequestResult.h b/source/QXmppInformationRequestResult.h index 44f128ae..56a22b83 100644 --- a/source/QXmppInformationRequestResult.h +++ b/source/QXmppInformationRequestResult.h @@ -1,13 +1,13 @@ -#ifndef QXMPPINFORMATIONREQUESTRESULT_H -#define QXMPPINFORMATIONREQUESTRESULT_H - -#include "QXmppIq.h" - -class QXmppInformationRequestResult : public QXmppIq -{ -public: - QXmppInformationRequestResult(); - virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const; -}; - -#endif // QXMPPINFORMATIONREQUESTRESULT_H +#ifndef QXMPPINFORMATIONREQUESTRESULT_H +#define QXMPPINFORMATIONREQUESTRESULT_H + +#include "QXmppIq.h" + +class QXmppInformationRequestResult : public QXmppIq +{ +public: + QXmppInformationRequestResult(); + virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const; +}; + +#endif // QXMPPINFORMATIONREQUESTRESULT_H diff --git a/source/QXmppIq.cpp b/source/QXmppIq.cpp index 3eeef4af..5c1ceea2 100644 --- a/source/QXmppIq.cpp +++ b/source/QXmppIq.cpp @@ -1,126 +1,126 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppUtils.h" -#include "QXmppIq.h" - -#include - -QXmppIq::QXmppIq(QXmppIq::Type type) - : QXmppStanza(), m_type(type) -{ - generateAndSetNextId(); -} - -QXmppIq::QXmppIq(const QString& type) - : QXmppStanza() -{ - generateAndSetNextId(); - setTypeFromStr(type); -} - -QXmppIq::~QXmppIq() -{ - -} - -QXmppIq::Type QXmppIq::getType() const -{ - return m_type; -} - -void QXmppIq::setType(QXmppIq::Type type) -{ - m_type = type; -} - -void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const -{ - xmlWriter->writeStartElement("iq"); - - helperToXmlAddAttribute(xmlWriter, "id", getId()); - helperToXmlAddAttribute(xmlWriter, "to", getTo()); - helperToXmlAddAttribute(xmlWriter, "from", getFrom()); - if(getTypeStr().isEmpty()) - helperToXmlAddAttribute(xmlWriter, "type", "get"); - else - helperToXmlAddAttribute(xmlWriter, "type", getTypeStr()); - toXmlElementFromChild(xmlWriter); - getError().toXml(xmlWriter); - xmlWriter->writeEndElement(); -} - -void QXmppIq::toXmlElementFromChild( QXmlStreamWriter *writer ) const -{ - Q_UNUSED(writer); -} - -QString QXmppIq::getTypeStr() const -{ - switch(getType()) - { - case QXmppIq::Error: - return "error"; - case QXmppIq::Get: - return "get"; - case QXmppIq::Set: - return "set"; - case QXmppIq::Result: - return "result"; - default: - qWarning("QXmppIq::getTypeStr() invalid type %d", (int)getType()); - return ""; - } -} - -void QXmppIq::setTypeFromStr(const QString& str) -{ - if(str == "error") - { - setType(QXmppIq::Error); - return; - } - else if(str == "get") - { - setType(QXmppIq::Get); - return; - } - else if(str == "set") - { - setType(QXmppIq::Set); - return; - } - else if(str == "result") - { - setType(QXmppIq::Result); - return; - } - else - { - setType(static_cast(-1)); - qWarning("QXmppIq::setTypeFromStr() invalid input string type: %s", - qPrintable(str)); - return; - } -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppUtils.h" +#include "QXmppIq.h" + +#include + +QXmppIq::QXmppIq(QXmppIq::Type type) + : QXmppStanza(), m_type(type) +{ + generateAndSetNextId(); +} + +QXmppIq::QXmppIq(const QString& type) + : QXmppStanza() +{ + generateAndSetNextId(); + setTypeFromStr(type); +} + +QXmppIq::~QXmppIq() +{ + +} + +QXmppIq::Type QXmppIq::getType() const +{ + return m_type; +} + +void QXmppIq::setType(QXmppIq::Type type) +{ + m_type = type; +} + +void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const +{ + xmlWriter->writeStartElement("iq"); + + helperToXmlAddAttribute(xmlWriter, "id", getId()); + helperToXmlAddAttribute(xmlWriter, "to", getTo()); + helperToXmlAddAttribute(xmlWriter, "from", getFrom()); + if(getTypeStr().isEmpty()) + helperToXmlAddAttribute(xmlWriter, "type", "get"); + else + helperToXmlAddAttribute(xmlWriter, "type", getTypeStr()); + toXmlElementFromChild(xmlWriter); + getError().toXml(xmlWriter); + xmlWriter->writeEndElement(); +} + +void QXmppIq::toXmlElementFromChild( QXmlStreamWriter *writer ) const +{ + Q_UNUSED(writer); +} + +QString QXmppIq::getTypeStr() const +{ + switch(getType()) + { + case QXmppIq::Error: + return "error"; + case QXmppIq::Get: + return "get"; + case QXmppIq::Set: + return "set"; + case QXmppIq::Result: + return "result"; + default: + qWarning("QXmppIq::getTypeStr() invalid type %d", (int)getType()); + return ""; + } +} + +void QXmppIq::setTypeFromStr(const QString& str) +{ + if(str == "error") + { + setType(QXmppIq::Error); + return; + } + else if(str == "get") + { + setType(QXmppIq::Get); + return; + } + else if(str == "set") + { + setType(QXmppIq::Set); + return; + } + else if(str == "result") + { + setType(QXmppIq::Result); + return; + } + else + { + setType(static_cast(-1)); + qWarning("QXmppIq::setTypeFromStr() invalid input string type: %s", + qPrintable(str)); + return; + } +} diff --git a/source/QXmppIq.h b/source/QXmppIq.h index 54903d15..f0cc778d 100644 --- a/source/QXmppIq.h +++ b/source/QXmppIq.h @@ -1,58 +1,63 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPIQ_H -#define QXMPPIQ_H - -#include "QXmppStanza.h" -class QXmlStreamWriter; - -class QXmppIq : public QXmppStanza -{ -public: - enum Type - { - Error = 0, - Get, - Set, - Result - }; - - QXmppIq(QXmppIq::Type type = QXmppIq::Get); - QXmppIq(const QString& type); - ~QXmppIq(); - - QXmppIq::Type getType() const; - QString getTypeStr() const; - void setType(QXmppIq::Type); - void setTypeFromStr(const QString& str); - - void toXml( QXmlStreamWriter *writer ) const; - virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const; - -private: - Type m_type; -}; - -#endif // QXMPPIQ_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPIQ_H +#define QXMPPIQ_H + +#include "QXmppStanza.h" + +// forward declarations of QXmlStream* classes will not work on Mac, we need to +// include the whole header. +// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html +// for an explanation. +#include + +class QXmppIq : public QXmppStanza +{ +public: + enum Type + { + Error = 0, + Get, + Set, + Result + }; + + QXmppIq(QXmppIq::Type type = QXmppIq::Get); + QXmppIq(const QString& type); + ~QXmppIq(); + + QXmppIq::Type getType() const; + QString getTypeStr() const; + void setType(QXmppIq::Type); + void setTypeFromStr(const QString& str); + + void toXml( QXmlStreamWriter *writer ) const; + virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const; + +private: + Type m_type; +}; + +#endif // QXMPPIQ_H diff --git a/source/QXmppLogger.cpp b/source/QXmppLogger.cpp index b6c7638d..522b5ff1 100644 --- a/source/QXmppLogger.cpp +++ b/source/QXmppLogger.cpp @@ -1,96 +1,96 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppLogger.h" -#include -#include - -QXmppLogger* QXmppLogger::m_logger = 0; -QXmppLogger::LoggingType QXmppLogger::m_loggingType = QXmppLogger::FILE; -QFile QXmppLogger::m_file("QXmppClientLog.log"); -QTextStream QXmppLogger::m_stream; - -QXmppLogger::QXmppLogger() -{ -} - -QXmppLogger* QXmppLogger::getLogger() -{ - if(!m_logger) - m_logger = new QXmppLogger(); - - return m_logger; -} - -void QXmppLogger::setLoggingType(QXmppLogger::LoggingType log) -{ - m_loggingType = log; -} - -QXmppLogger::LoggingType QXmppLogger::getLoggingType() -{ - return m_loggingType; -} - -void QXmppLogger::log(const QString& str) -{ - switch(m_loggingType) - { - case QXmppLogger::FILE: - m_file.open(QIODevice::Append); - m_stream.setDevice(&m_file); - m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<< - str << "\n\n"; - m_file.close(); - break; - case QXmppLogger::STDOUT: - std::cout< +#include + +QXmppLogger* QXmppLogger::m_logger = 0; +QXmppLogger::LoggingType QXmppLogger::m_loggingType = QXmppLogger::FILE; +QFile QXmppLogger::m_file("QXmppClientLog.log"); +QTextStream QXmppLogger::m_stream; + +QXmppLogger::QXmppLogger() +{ +} + +QXmppLogger* QXmppLogger::getLogger() +{ + if(!m_logger) + m_logger = new QXmppLogger(); + + return m_logger; +} + +void QXmppLogger::setLoggingType(QXmppLogger::LoggingType log) +{ + m_loggingType = log; +} + +QXmppLogger::LoggingType QXmppLogger::getLoggingType() +{ + return m_loggingType; +} + +void QXmppLogger::log(const QString& str) +{ + switch(m_loggingType) + { + case QXmppLogger::FILE: + m_file.open(QIODevice::Append); + m_stream.setDevice(&m_file); + m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<< + str << "\n\n"; + m_file.close(); + break; + case QXmppLogger::STDOUT: + std::cout< -#include - -/// Singelton class -class QXmppLogger -{ -public: - enum LoggingType - { - NONE = 0, - FILE, - STDOUT - }; - - static QXmppLogger* getLogger(); - QXmppLogger::LoggingType getLoggingType(); - void setLoggingType(QXmppLogger::LoggingType); - void log(const QString& str); - void log(const QByteArray& str); - -private: - QXmppLogger(); - static QXmppLogger* m_logger; - static QXmppLogger::LoggingType m_loggingType; - static QFile m_file; - static QTextStream m_stream; -}; - -#endif // QXMPPLOGGER_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPLOGGER_H +#define QXMPPLOGGER_H + +#include +#include + +/// Singelton class +class QXmppLogger +{ +public: + enum LoggingType + { + NONE = 0, + FILE, + STDOUT + }; + + static QXmppLogger* getLogger(); + QXmppLogger::LoggingType getLoggingType(); + void setLoggingType(QXmppLogger::LoggingType); + void log(const QString& str); + void log(const QByteArray& str); + +private: + QXmppLogger(); + static QXmppLogger* m_logger; + static QXmppLogger::LoggingType m_loggingType; + static QFile m_file; + static QTextStream m_stream; +}; + +#endif // QXMPPLOGGER_H diff --git a/source/QXmppMessage.cpp b/source/QXmppMessage.cpp index 54836729..ad079d70 100644 --- a/source/QXmppMessage.cpp +++ b/source/QXmppMessage.cpp @@ -1,156 +1,156 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppMessage.h" -#include "QXmppUtils.h" -#include - -QXmppMessage::QXmppMessage(const QString& from, const QString& to, const - QString& body, const QString& thread) - : QXmppStanza(from, to), m_type(Chat), m_body(body), m_thread(thread) -{ -} - -QXmppMessage::~QXmppMessage() -{ - -} - -QXmppMessage::Type QXmppMessage::getType() const -{ - return m_type; -} - -QString QXmppMessage::getTypeStr() const -{ - switch(getType()) - { - case QXmppMessage::Error: - return "error"; - case QXmppMessage::Normal: - return "normal"; - case QXmppMessage::Chat: - return "chat"; - case QXmppMessage::GroupChat: - return "groupchat"; - case QXmppMessage::Headline: - return "headline"; - default: - qWarning("QXmppMessage::getTypeStr() invalid type %d", (int)getType()); - return ""; - } -} - -void QXmppMessage::setType(QXmppMessage::Type type) -{ - m_type = type; -} - -void QXmppMessage::setTypeFromStr(const QString& str) -{ - if(str == "error") - { - setType(QXmppMessage::Error); - return; - } - else if(str == "") // if no type is specified - { - setType(QXmppMessage::Normal); - return; - } - else if(str == "normal") - { - setType(QXmppMessage::Normal); - return; - } - else if(str == "chat") - { - setType(QXmppMessage::Chat); - return; - } - else if(str == "groupchat") - { - setType(QXmppMessage::GroupChat); - return; - } - else if(str == "headline") - { - setType(QXmppMessage::Headline); - return; - } - else - { - setType(static_cast(-1)); - qWarning("QXmppMessage::setTypeFromStr() invalid input string type: %s", - qPrintable(str)); - return; - } -} - -void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const -{ - - xmlWriter->writeStartElement("message"); - helperToXmlAddAttribute(xmlWriter, "xml:lang", getLang()); - helperToXmlAddAttribute(xmlWriter, "id", getId()); - helperToXmlAddAttribute(xmlWriter, "to", getTo()); - helperToXmlAddAttribute(xmlWriter, "from", getFrom()); - helperToXmlAddAttribute(xmlWriter, "type", getTypeStr()); - helperToXmlAddTextElement(xmlWriter, "subject", getSubject()); - helperToXmlAddTextElement(xmlWriter,"body", getBody()); - helperToXmlAddTextElement(xmlWriter,"thread", getThread()); - getError().toXml(xmlWriter); - xmlWriter->writeEndElement(); -} - -QString QXmppMessage::getBody() const -{ - return m_body; -} - -void QXmppMessage::setBody(const QString& body) -{ - m_body = body; -} - -QString QXmppMessage::getSubject() const -{ - return m_subject; -} - -void QXmppMessage::setSubject(const QString& sub) -{ - m_subject = sub; -} - -QString QXmppMessage::getThread() const -{ - return m_thread; -} - -void QXmppMessage::setThread(const QString& thread) -{ - m_thread = thread; -} - +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppMessage.h" +#include "QXmppUtils.h" +#include + +QXmppMessage::QXmppMessage(const QString& from, const QString& to, const + QString& body, const QString& thread) + : QXmppStanza(from, to), m_type(Chat), m_body(body), m_thread(thread) +{ +} + +QXmppMessage::~QXmppMessage() +{ + +} + +QXmppMessage::Type QXmppMessage::getType() const +{ + return m_type; +} + +QString QXmppMessage::getTypeStr() const +{ + switch(getType()) + { + case QXmppMessage::Error: + return "error"; + case QXmppMessage::Normal: + return "normal"; + case QXmppMessage::Chat: + return "chat"; + case QXmppMessage::GroupChat: + return "groupchat"; + case QXmppMessage::Headline: + return "headline"; + default: + qWarning("QXmppMessage::getTypeStr() invalid type %d", (int)getType()); + return ""; + } +} + +void QXmppMessage::setType(QXmppMessage::Type type) +{ + m_type = type; +} + +void QXmppMessage::setTypeFromStr(const QString& str) +{ + if(str == "error") + { + setType(QXmppMessage::Error); + return; + } + else if(str == "") // if no type is specified + { + setType(QXmppMessage::Normal); + return; + } + else if(str == "normal") + { + setType(QXmppMessage::Normal); + return; + } + else if(str == "chat") + { + setType(QXmppMessage::Chat); + return; + } + else if(str == "groupchat") + { + setType(QXmppMessage::GroupChat); + return; + } + else if(str == "headline") + { + setType(QXmppMessage::Headline); + return; + } + else + { + setType(static_cast(-1)); + qWarning("QXmppMessage::setTypeFromStr() invalid input string type: %s", + qPrintable(str)); + return; + } +} + +void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const +{ + + xmlWriter->writeStartElement("message"); + helperToXmlAddAttribute(xmlWriter, "xml:lang", getLang()); + helperToXmlAddAttribute(xmlWriter, "id", getId()); + helperToXmlAddAttribute(xmlWriter, "to", getTo()); + helperToXmlAddAttribute(xmlWriter, "from", getFrom()); + helperToXmlAddAttribute(xmlWriter, "type", getTypeStr()); + helperToXmlAddTextElement(xmlWriter, "subject", getSubject()); + helperToXmlAddTextElement(xmlWriter,"body", getBody()); + helperToXmlAddTextElement(xmlWriter,"thread", getThread()); + getError().toXml(xmlWriter); + xmlWriter->writeEndElement(); +} + +QString QXmppMessage::getBody() const +{ + return m_body; +} + +void QXmppMessage::setBody(const QString& body) +{ + m_body = body; +} + +QString QXmppMessage::getSubject() const +{ + return m_subject; +} + +void QXmppMessage::setSubject(const QString& sub) +{ + m_subject = sub; +} + +QString QXmppMessage::getThread() const +{ + return m_thread; +} + +void QXmppMessage::setThread(const QString& thread) +{ + m_thread = thread; +} + diff --git a/source/QXmppMessage.h b/source/QXmppMessage.h index 252d2ba1..6ea1bcd5 100644 --- a/source/QXmppMessage.h +++ b/source/QXmppMessage.h @@ -1,68 +1,68 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPMESSAGE_H -#define QXMPPMESSAGE_H - -#include "QXmppStanza.h" - -class QXmppMessage : public QXmppStanza -{ -public: - enum Type - { - Error = 0, - Normal, - Chat, - GroupChat, - Headline - }; - - QXmppMessage(const QString& from = "", const QString& to = "", - const QString& body = "", const QString& thread = ""); - ~QXmppMessage(); - - QXmppMessage::Type getType() const; - QString getTypeStr() const; - void setType(QXmppMessage::Type); - void setTypeFromStr(const QString&); - - QString getBody() const; - void setBody(const QString&); - QString getSubject() const; - void setSubject(const QString&); - QString getThread() const; - void setThread(const QString&); - - void toXml(QXmlStreamWriter *writer) const; - -private: - Type m_type; - - QString m_body; - QString m_subject; - QString m_thread; -}; - -#endif // QXMPPMESSAGE_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPMESSAGE_H +#define QXMPPMESSAGE_H + +#include "QXmppStanza.h" + +class QXmppMessage : public QXmppStanza +{ +public: + enum Type + { + Error = 0, + Normal, + Chat, + GroupChat, + Headline + }; + + QXmppMessage(const QString& from = "", const QString& to = "", + const QString& body = "", const QString& thread = ""); + ~QXmppMessage(); + + QXmppMessage::Type getType() const; + QString getTypeStr() const; + void setType(QXmppMessage::Type); + void setTypeFromStr(const QString&); + + QString getBody() const; + void setBody(const QString&); + QString getSubject() const; + void setSubject(const QString&); + QString getThread() const; + void setThread(const QString&); + + void toXml(QXmlStreamWriter *writer) const; + +private: + Type m_type; + + QString m_body; + QString m_subject; + QString m_thread; +}; + +#endif // QXMPPMESSAGE_H diff --git a/source/QXmppNonSASLAuth.cpp b/source/QXmppNonSASLAuth.cpp index 7f9c9791..7a039147 100644 --- a/source/QXmppNonSASLAuth.cpp +++ b/source/QXmppNonSASLAuth.cpp @@ -1,70 +1,70 @@ -#include "QXmppNonSASLAuth.h" -#include "QXmppUtils.h" -#include -#include - -QXmppNonSASLAuthTypesRequestIq::QXmppNonSASLAuthTypesRequestIq() : QXmppIq(QXmppIq::Get) -{ - -} - -void QXmppNonSASLAuthTypesRequestIq::setUsername( const QString &username ) -{ - m_username = username; -} - -void QXmppNonSASLAuthTypesRequestIq::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("query"); - writer->writeAttribute( "xmlns","jabber:iq:auth"); - writer->writeTextElement("username", m_username ); - writer->writeEndElement(); -} - -QXmppNonSASLAuthIq::QXmppNonSASLAuthIq() : QXmppIq(QXmppIq::Set), m_useplaintext(false) -{ - -} - -void QXmppNonSASLAuthIq::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("query"); - writer->writeAttribute( "xmlns","jabber:iq:auth"); - writer->writeTextElement("username", m_username ); - if ( m_useplaintext ) - writer->writeTextElement("password", m_password ); - else - {//SHA1(concat(sid, password)). - QByteArray textSid = m_sid.toUtf8(); - QByteArray encodedPassword = m_password.toUtf8(); - QByteArray digest = QCryptographicHash::hash(textSid + encodedPassword, QCryptographicHash::Sha1 ).toHex(); - writer->writeTextElement("digest", digest ); - } - writer->writeTextElement("resource", m_resource ); - writer->writeEndElement(); -} - -void QXmppNonSASLAuthIq::setUsername( const QString &username ) -{ - m_username = username; -} - -void QXmppNonSASLAuthIq::setPassword( const QString &password ) -{ - m_password = password; -} - -void QXmppNonSASLAuthIq::setResource( const QString &resource ) -{ - m_resource = resource; -} - -void QXmppNonSASLAuthIq::setStreamId( const QString &sid ) -{ - m_sid = sid; -} - -void QXmppNonSASLAuthIq::setUsePlainText( bool use ) -{ - m_useplaintext = use; -} +#include "QXmppNonSASLAuth.h" +#include "QXmppUtils.h" +#include +#include + +QXmppNonSASLAuthTypesRequestIq::QXmppNonSASLAuthTypesRequestIq() : QXmppIq(QXmppIq::Get) +{ + +} + +void QXmppNonSASLAuthTypesRequestIq::setUsername( const QString &username ) +{ + m_username = username; +} + +void QXmppNonSASLAuthTypesRequestIq::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("query"); + writer->writeAttribute( "xmlns","jabber:iq:auth"); + writer->writeTextElement("username", m_username ); + writer->writeEndElement(); +} + +QXmppNonSASLAuthIq::QXmppNonSASLAuthIq() : QXmppIq(QXmppIq::Set), m_useplaintext(false) +{ + +} + +void QXmppNonSASLAuthIq::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("query"); + writer->writeAttribute( "xmlns","jabber:iq:auth"); + writer->writeTextElement("username", m_username ); + if ( m_useplaintext ) + writer->writeTextElement("password", m_password ); + else + {//SHA1(concat(sid, password)). + QByteArray textSid = m_sid.toUtf8(); + QByteArray encodedPassword = m_password.toUtf8(); + QByteArray digest = QCryptographicHash::hash(textSid + encodedPassword, QCryptographicHash::Sha1 ).toHex(); + writer->writeTextElement("digest", digest ); + } + writer->writeTextElement("resource", m_resource ); + writer->writeEndElement(); +} + +void QXmppNonSASLAuthIq::setUsername( const QString &username ) +{ + m_username = username; +} + +void QXmppNonSASLAuthIq::setPassword( const QString &password ) +{ + m_password = password; +} + +void QXmppNonSASLAuthIq::setResource( const QString &resource ) +{ + m_resource = resource; +} + +void QXmppNonSASLAuthIq::setStreamId( const QString &sid ) +{ + m_sid = sid; +} + +void QXmppNonSASLAuthIq::setUsePlainText( bool use ) +{ + m_useplaintext = use; +} diff --git a/source/QXmppNonSASLAuth.h b/source/QXmppNonSASLAuth.h index 6de1063f..79cb8227 100644 --- a/source/QXmppNonSASLAuth.h +++ b/source/QXmppNonSASLAuth.h @@ -1,35 +1,35 @@ -#ifndef QXmppNonSASLAuth_H -#define QXmppNonSASLAuth_H - -#include "QXmppIq.h" - -class QXmppNonSASLAuthTypesRequestIq : public QXmppIq -{ -public: - QXmppNonSASLAuthTypesRequestIq(); - void setUsername( const QString &username ); - virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const; -private: - QString m_username; -}; - -class QXmppNonSASLAuthIq : public QXmppIq -{ -public: - QXmppNonSASLAuthIq(); - virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const; - void setUsername( const QString &username ); - void setPassword( const QString &password ); - void setResource( const QString &resource ); - void setStreamId( const QString &sid ); - void setUsePlainText( bool useplaintext ); - -private: - QString m_username; - QString m_password; - QString m_resource; - QString m_sid; - bool m_useplaintext; -}; - -#endif // QXmppNonSASLAuth_H +#ifndef QXmppNonSASLAuth_H +#define QXmppNonSASLAuth_H + +#include "QXmppIq.h" + +class QXmppNonSASLAuthTypesRequestIq : public QXmppIq +{ +public: + QXmppNonSASLAuthTypesRequestIq(); + void setUsername( const QString &username ); + virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const; +private: + QString m_username; +}; + +class QXmppNonSASLAuthIq : public QXmppIq +{ +public: + QXmppNonSASLAuthIq(); + virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const; + void setUsername( const QString &username ); + void setPassword( const QString &password ); + void setResource( const QString &resource ); + void setStreamId( const QString &sid ); + void setUsePlainText( bool useplaintext ); + +private: + QString m_username; + QString m_password; + QString m_resource; + QString m_sid; + bool m_useplaintext; +}; + +#endif // QXmppNonSASLAuth_H diff --git a/source/QXmppPacket.cpp b/source/QXmppPacket.cpp index 532d7afd..65b0dafb 100644 --- a/source/QXmppPacket.cpp +++ b/source/QXmppPacket.cpp @@ -1,40 +1,40 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppPacket.h" - -QXmppPacket::QXmppPacket() -{ - -} - -QXmppPacket::~QXmppPacket() -{ - -} - -QByteArray QXmppPacket::getXmlReceived() const -{ - return m_xmlReceived; -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppPacket.h" + +QXmppPacket::QXmppPacket() +{ + +} + +QXmppPacket::~QXmppPacket() +{ + +} + +QByteArray QXmppPacket::getXmlReceived() const +{ + return m_xmlReceived; +} diff --git a/source/QXmppPacket.h b/source/QXmppPacket.h index c123899f..f7a7cce4 100644 --- a/source/QXmppPacket.h +++ b/source/QXmppPacket.h @@ -1,44 +1,49 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPPACKET_H -#define QXMPPPACKET_H - -#include - -class QXmlStreamWriter; -class QXmppPacket -{ -public: - QXmppPacket(); - virtual ~QXmppPacket(); - - QByteArray getXmlReceived() const; - virtual void toXml( QXmlStreamWriter *writer ) const = 0; - -private: - QByteArray m_xmlReceived; -}; - -#endif // QXMPPPACKET_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPPACKET_H +#define QXMPPPACKET_H + +#include + +// forward declarations of QXmlStream* classes will not work on Mac, we need to +// include the whole header. +// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html +// for an explanation. +#include + +class QXmppPacket +{ +public: + QXmppPacket(); + virtual ~QXmppPacket(); + + QByteArray getXmlReceived() const; + virtual void toXml( QXmlStreamWriter *writer ) const = 0; + +private: + QByteArray m_xmlReceived; +}; + +#endif // QXMPPPACKET_H diff --git a/source/QXmppPresence.cpp b/source/QXmppPresence.cpp index ea347af6..077c0a7c 100644 --- a/source/QXmppPresence.cpp +++ b/source/QXmppPresence.cpp @@ -1,298 +1,298 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppPresence.h" -#include "QXmppUtils.h" -#include -#include - -QXmppPresence::QXmppPresence(QXmppPresence::Type type, - const QXmppPresence::Status& status) - : QXmppStanza(), m_type(type), m_status(status) -{ - -} - -QXmppPresence::~QXmppPresence() -{ - -} - -QXmppPresence::Type QXmppPresence::getType() const -{ - return m_type; -} - -void QXmppPresence::setType(QXmppPresence::Type type) -{ - m_type = type; -} - -const QXmppPresence::Status& QXmppPresence::getStatus() const -{ - return m_status; -} - -QXmppPresence::Status& QXmppPresence::getStatus() -{ - return m_status; -} - -void QXmppPresence::setStatus(const QXmppPresence::Status& status) -{ - m_status = status; -} - -void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter ) const -{ - - xmlWriter->writeStartElement("presence"); - helperToXmlAddAttribute(xmlWriter,"xml:lang", getLang()); - helperToXmlAddAttribute(xmlWriter,"id", getId()); - helperToXmlAddAttribute(xmlWriter,"to", getTo()); - helperToXmlAddAttribute(xmlWriter,"from", getFrom()); - helperToXmlAddAttribute(xmlWriter,"type", getTypeStr()); - - helperToXmlAddTextElement(xmlWriter,"status", getStatus().getStatusText()); - if(getStatus().getPriority() != 0) - helperToXmlAddNumberElement(xmlWriter,"priority", getStatus().getPriority()); - helperToXmlAddTextElement(xmlWriter,"show", getStatus().getTypeStr()); - - getError().toXml(xmlWriter); - - xmlWriter->writeEndElement(); - -} - -QString QXmppPresence::getTypeStr() const -{ - QString text; - switch(getType()) - { - case QXmppPresence::Error: - text = "error"; - break; - case QXmppPresence::Available: - // no type-attribute if available - text = ""; - break; - case QXmppPresence::Unavailable: - text = "unavailable"; - break; - case QXmppPresence::Subscribe: - text = "subscribe"; - break; - case QXmppPresence::Subscribed: - text = "subscribed"; - break; - case QXmppPresence::Unsubscribe: - text = "unsubscribe"; - break; - case QXmppPresence::Unsubscribed: - text = "unsubscribed"; - break; - case QXmppPresence::Probe: - text = "probe"; - break; - default: - qWarning("QXmppPresence::getTypeStr() invalid type %d", (int)getType()); - break; - } - return text; -} - -void QXmppPresence::setTypeFromStr(const QString& str) -{ - QXmppPresence::Type type; - if(str == "error") - { - type = QXmppPresence::Error; - setType(type); - return; - } - else if(str == "unavailable") - { - type = QXmppPresence::Unavailable; - setType(type); - return; - } - else if(str == "subscribe") - { - type = QXmppPresence::Subscribe; - setType(type); - return; - } - else if(str == "subscribed") - { - type = QXmppPresence::Subscribed; - setType(type); - return; - } - else if(str == "unsubscribe") - { - type = QXmppPresence::Unsubscribe; - setType(type); - return; - } - else if(str == "unsubscribed") - { - type = QXmppPresence::Unsubscribed; - setType(type); - return; - } - else if(str == "probe") - { - type = QXmppPresence::Probe; - setType(type); - return; - } - else if(str == "") - { - type = QXmppPresence::Available; - setType(type); - return; - } - else - { - type = static_cast(-1); - qWarning("QXmppPresence::setTypeFromStr() invalid input string type: %s", - qPrintable(str)); - setType(type); - return; - } -} - -QXmppPresence::Status::Status(QXmppPresence::Status::Type type, - const QString statusText, int priority) : - m_type(type), - m_statusText(statusText), m_priority(priority) -{ -} - -QXmppPresence::Status::Type QXmppPresence::Status::getType() const -{ - return m_type; -} - -void QXmppPresence::Status::setType(QXmppPresence::Status::Type type) -{ - m_type = type; -} - -void QXmppPresence::Status::setTypeFromStr(const QString& str) -{ - // there is no keyword for Offline - - QXmppPresence::Status::Type type; - if(str == "") // not type-attribute means online - { - type = QXmppPresence::Status::Online; - setType(type); - return; - } - else if(str == "away") - { - type = QXmppPresence::Status::Away; - setType(type); - return; - } - else if(str == "xa") - { - type = QXmppPresence::Status::XA; - setType(type); - return; - } - else if(str == "dnd") - { - type = QXmppPresence::Status::DND; - setType(type); - return; - } - else if(str == "chat") - { - type = QXmppPresence::Status::Chat; - setType(type); - return; - } - else - { - type = static_cast(-1); - qWarning("QXmppPresence::Status::setTypeFromStr() invalid input string type %s", - qPrintable(str)); - setType(type); - } -} - -QString QXmppPresence::Status::getTypeStr() const -{ - QString text; - switch(getType()) - { - case QXmppPresence::Status::Online: - // no type-attribute if available - text = ""; - break; - case QXmppPresence::Status::Offline: - text = ""; - break; - case QXmppPresence::Status::Away: - text = "away"; - break; - case QXmppPresence::Status::XA: - text = "xa"; - break; - case QXmppPresence::Status::DND: - text = "dnd"; - break; - case QXmppPresence::Status::Chat: - text = "chat"; - break; - default: - qWarning("QXmppPresence::Status::getTypeStr() invalid type %d", - (int)getType()); - break; - } - return text; -} - -QString QXmppPresence::Status::getStatusText() const -{ - return m_statusText; -} - -void QXmppPresence::Status::setStatusText(const QString& str) -{ - m_statusText = str; -} - -int QXmppPresence::Status::getPriority() const -{ - return m_priority; -} - -void QXmppPresence::Status::setPriority(int priority) -{ - m_priority = priority; -} - +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppPresence.h" +#include "QXmppUtils.h" +#include +#include + +QXmppPresence::QXmppPresence(QXmppPresence::Type type, + const QXmppPresence::Status& status) + : QXmppStanza(), m_type(type), m_status(status) +{ + +} + +QXmppPresence::~QXmppPresence() +{ + +} + +QXmppPresence::Type QXmppPresence::getType() const +{ + return m_type; +} + +void QXmppPresence::setType(QXmppPresence::Type type) +{ + m_type = type; +} + +const QXmppPresence::Status& QXmppPresence::getStatus() const +{ + return m_status; +} + +QXmppPresence::Status& QXmppPresence::getStatus() +{ + return m_status; +} + +void QXmppPresence::setStatus(const QXmppPresence::Status& status) +{ + m_status = status; +} + +void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter ) const +{ + + xmlWriter->writeStartElement("presence"); + helperToXmlAddAttribute(xmlWriter,"xml:lang", getLang()); + helperToXmlAddAttribute(xmlWriter,"id", getId()); + helperToXmlAddAttribute(xmlWriter,"to", getTo()); + helperToXmlAddAttribute(xmlWriter,"from", getFrom()); + helperToXmlAddAttribute(xmlWriter,"type", getTypeStr()); + + helperToXmlAddTextElement(xmlWriter,"status", getStatus().getStatusText()); + if(getStatus().getPriority() != 0) + helperToXmlAddNumberElement(xmlWriter,"priority", getStatus().getPriority()); + helperToXmlAddTextElement(xmlWriter,"show", getStatus().getTypeStr()); + + getError().toXml(xmlWriter); + + xmlWriter->writeEndElement(); + +} + +QString QXmppPresence::getTypeStr() const +{ + QString text; + switch(getType()) + { + case QXmppPresence::Error: + text = "error"; + break; + case QXmppPresence::Available: + // no type-attribute if available + text = ""; + break; + case QXmppPresence::Unavailable: + text = "unavailable"; + break; + case QXmppPresence::Subscribe: + text = "subscribe"; + break; + case QXmppPresence::Subscribed: + text = "subscribed"; + break; + case QXmppPresence::Unsubscribe: + text = "unsubscribe"; + break; + case QXmppPresence::Unsubscribed: + text = "unsubscribed"; + break; + case QXmppPresence::Probe: + text = "probe"; + break; + default: + qWarning("QXmppPresence::getTypeStr() invalid type %d", (int)getType()); + break; + } + return text; +} + +void QXmppPresence::setTypeFromStr(const QString& str) +{ + QXmppPresence::Type type; + if(str == "error") + { + type = QXmppPresence::Error; + setType(type); + return; + } + else if(str == "unavailable") + { + type = QXmppPresence::Unavailable; + setType(type); + return; + } + else if(str == "subscribe") + { + type = QXmppPresence::Subscribe; + setType(type); + return; + } + else if(str == "subscribed") + { + type = QXmppPresence::Subscribed; + setType(type); + return; + } + else if(str == "unsubscribe") + { + type = QXmppPresence::Unsubscribe; + setType(type); + return; + } + else if(str == "unsubscribed") + { + type = QXmppPresence::Unsubscribed; + setType(type); + return; + } + else if(str == "probe") + { + type = QXmppPresence::Probe; + setType(type); + return; + } + else if(str == "") + { + type = QXmppPresence::Available; + setType(type); + return; + } + else + { + type = static_cast(-1); + qWarning("QXmppPresence::setTypeFromStr() invalid input string type: %s", + qPrintable(str)); + setType(type); + return; + } +} + +QXmppPresence::Status::Status(QXmppPresence::Status::Type type, + const QString statusText, int priority) : + m_type(type), + m_statusText(statusText), m_priority(priority) +{ +} + +QXmppPresence::Status::Type QXmppPresence::Status::getType() const +{ + return m_type; +} + +void QXmppPresence::Status::setType(QXmppPresence::Status::Type type) +{ + m_type = type; +} + +void QXmppPresence::Status::setTypeFromStr(const QString& str) +{ + // there is no keyword for Offline + + QXmppPresence::Status::Type type; + if(str == "") // not type-attribute means online + { + type = QXmppPresence::Status::Online; + setType(type); + return; + } + else if(str == "away") + { + type = QXmppPresence::Status::Away; + setType(type); + return; + } + else if(str == "xa") + { + type = QXmppPresence::Status::XA; + setType(type); + return; + } + else if(str == "dnd") + { + type = QXmppPresence::Status::DND; + setType(type); + return; + } + else if(str == "chat") + { + type = QXmppPresence::Status::Chat; + setType(type); + return; + } + else + { + type = static_cast(-1); + qWarning("QXmppPresence::Status::setTypeFromStr() invalid input string type %s", + qPrintable(str)); + setType(type); + } +} + +QString QXmppPresence::Status::getTypeStr() const +{ + QString text; + switch(getType()) + { + case QXmppPresence::Status::Online: + // no type-attribute if available + text = ""; + break; + case QXmppPresence::Status::Offline: + text = ""; + break; + case QXmppPresence::Status::Away: + text = "away"; + break; + case QXmppPresence::Status::XA: + text = "xa"; + break; + case QXmppPresence::Status::DND: + text = "dnd"; + break; + case QXmppPresence::Status::Chat: + text = "chat"; + break; + default: + qWarning("QXmppPresence::Status::getTypeStr() invalid type %d", + (int)getType()); + break; + } + return text; +} + +QString QXmppPresence::Status::getStatusText() const +{ + return m_statusText; +} + +void QXmppPresence::Status::setStatusText(const QString& str) +{ + m_statusText = str; +} + +int QXmppPresence::Status::getPriority() const +{ + return m_priority; +} + +void QXmppPresence::Status::setPriority(int priority) +{ + m_priority = priority; +} + diff --git a/source/QXmppPresence.h b/source/QXmppPresence.h index 23c570a7..b6652ae3 100644 --- a/source/QXmppPresence.h +++ b/source/QXmppPresence.h @@ -1,100 +1,100 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPPRESENCE_H -#define QXMPPPRESENCE_H - -#include "QXmppStanza.h" - -class QXmppPresence : public QXmppStanza -{ -public: - enum Type - { - Error = 0, - Available, - Unavailable, - Subscribe, - Subscribed, - Unsubscribe, - Unsubscribed, - Probe - }; - - class Status - { - public: - enum Type - { - Offline = 0, - Online, - Away, - XA, - DND, - Chat, - Invisible - }; - - Status(QXmppPresence::Status::Type type = QXmppPresence::Status::Online, - const QString statusText = "", int priority = 0); - - QXmppPresence::Status::Type getType() const; - void setType(QXmppPresence::Status::Type); - void setTypeFromStr(const QString&); - QString getTypeStr() const; - - QString getStatusText() const; - void setStatusText(const QString&); - - int getPriority() const; - void setPriority(int); - - private: - QXmppPresence::Status::Type m_type; - QString m_statusText; - int m_priority; - }; - - QXmppPresence(QXmppPresence::Type type = QXmppPresence::Available, - const QXmppPresence::Status& status = QXmppPresence::Status()); - ~QXmppPresence(); - - QXmppPresence::Type getType() const; - void setType(QXmppPresence::Type); - void setTypeFromStr(const QString&); - - QXmppPresence::Status& getStatus(); - const QXmppPresence::Status& getStatus() const; - void setStatus(const QXmppPresence::Status&); - void toXml( QXmlStreamWriter *writer ) const; - -private: - Type m_type; - QXmppPresence::Status m_status; - - QString getTypeStr() const; - QByteArray getExtensionsXML() const; -}; - -#endif // QXMPPPRESENCE_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPPRESENCE_H +#define QXMPPPRESENCE_H + +#include "QXmppStanza.h" + +class QXmppPresence : public QXmppStanza +{ +public: + enum Type + { + Error = 0, + Available, + Unavailable, + Subscribe, + Subscribed, + Unsubscribe, + Unsubscribed, + Probe + }; + + class Status + { + public: + enum Type + { + Offline = 0, + Online, + Away, + XA, + DND, + Chat, + Invisible + }; + + Status(QXmppPresence::Status::Type type = QXmppPresence::Status::Online, + const QString statusText = "", int priority = 0); + + QXmppPresence::Status::Type getType() const; + void setType(QXmppPresence::Status::Type); + void setTypeFromStr(const QString&); + QString getTypeStr() const; + + QString getStatusText() const; + void setStatusText(const QString&); + + int getPriority() const; + void setPriority(int); + + private: + QXmppPresence::Status::Type m_type; + QString m_statusText; + int m_priority; + }; + + QXmppPresence(QXmppPresence::Type type = QXmppPresence::Available, + const QXmppPresence::Status& status = QXmppPresence::Status()); + ~QXmppPresence(); + + QXmppPresence::Type getType() const; + void setType(QXmppPresence::Type); + void setTypeFromStr(const QString&); + + QXmppPresence::Status& getStatus(); + const QXmppPresence::Status& getStatus() const; + void setStatus(const QXmppPresence::Status&); + void toXml( QXmlStreamWriter *writer ) const; + +private: + Type m_type; + QXmppPresence::Status m_status; + + QString getTypeStr() const; + QByteArray getExtensionsXML() const; +}; + +#endif // QXMPPPRESENCE_H diff --git a/source/QXmppReconnectionManager.cpp b/source/QXmppReconnectionManager.cpp index 32edf41c..c135860b 100644 --- a/source/QXmppReconnectionManager.cpp +++ b/source/QXmppReconnectionManager.cpp @@ -1,86 +1,86 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppReconnectionManager.h" -#include "QXmppClient.h" -#include "QXmppUtils.h" - -QXmppReconnectionManager::QXmppReconnectionManager(QXmppClient* client) : - QObject(client), - m_reconnectionTries(0), - m_timer(this), - m_client(client) -{ - m_timer.setSingleShot(true); - bool check = connect(&m_timer, SIGNAL(timeout()), SLOT(reconnect())); - Q_ASSERT(check); -} - -void QXmppReconnectionManager::connected() -{ - m_reconnectionTries = 0; -} - -void QXmppReconnectionManager::error(QXmppClient::Error error) -{ - if(m_client && error == QXmppClient::SocketError) - { - int time = getNextReconnectingInTime(); - - // time is in sec - m_timer.start(time*1000); - emit reconnectingIn(time); - } -} - -int QXmppReconnectionManager::getNextReconnectingInTime() -{ - int reconnectingIn; - if(m_reconnectionTries < 5) - reconnectingIn = 10; - else if(m_reconnectionTries < 10) - reconnectingIn = 20; - else if(m_reconnectionTries < 15) - reconnectingIn = 40; - else - reconnectingIn = 60; - - return reconnectingIn; -} - -void QXmppReconnectionManager::reconnect() -{ - if(m_client) - { - log(QString("QXmppReconnectionManager::reconnect()")); - emit reconnectingNow(); - m_client->connectToServer(m_client->getConfiguration()); - } -} - -void QXmppReconnectionManager::cancelReconnection() -{ - m_timer.stop(); - m_reconnectionTries = 0; -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppReconnectionManager.h" +#include "QXmppClient.h" +#include "QXmppUtils.h" + +QXmppReconnectionManager::QXmppReconnectionManager(QXmppClient* client) : + QObject(client), + m_reconnectionTries(0), + m_timer(this), + m_client(client) +{ + m_timer.setSingleShot(true); + bool check = connect(&m_timer, SIGNAL(timeout()), SLOT(reconnect())); + Q_ASSERT(check); +} + +void QXmppReconnectionManager::connected() +{ + m_reconnectionTries = 0; +} + +void QXmppReconnectionManager::error(QXmppClient::Error error) +{ + if(m_client && error == QXmppClient::SocketError) + { + int time = getNextReconnectingInTime(); + + // time is in sec + m_timer.start(time*1000); + emit reconnectingIn(time); + } +} + +int QXmppReconnectionManager::getNextReconnectingInTime() +{ + int reconnectingIn; + if(m_reconnectionTries < 5) + reconnectingIn = 10; + else if(m_reconnectionTries < 10) + reconnectingIn = 20; + else if(m_reconnectionTries < 15) + reconnectingIn = 40; + else + reconnectingIn = 60; + + return reconnectingIn; +} + +void QXmppReconnectionManager::reconnect() +{ + if(m_client) + { + log(QString("QXmppReconnectionManager::reconnect()")); + emit reconnectingNow(); + m_client->connectToServer(m_client->getConfiguration()); + } +} + +void QXmppReconnectionManager::cancelReconnection() +{ + m_timer.stop(); + m_reconnectionTries = 0; +} diff --git a/source/QXmppReconnectionManager.h b/source/QXmppReconnectionManager.h index 7dc0ac23..eac7bfc0 100644 --- a/source/QXmppReconnectionManager.h +++ b/source/QXmppReconnectionManager.h @@ -1,60 +1,60 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPRECONNECTIONMANAGER_H -#define QXMPPRECONNECTIONMANAGER_H - -#include -#include -#include "QXmppClient.h" - -class QXmppReconnectionManager : public QObject -{ - Q_OBJECT - -public: - QXmppReconnectionManager(QXmppClient* client); - -signals: - void reconnectingIn(int); - void reconnectingNow(); - -public slots: - void cancelReconnection(); - -private slots: - void connected(); - void error(QXmppClient::Error); - void reconnect(); - -private: - int getNextReconnectingInTime(); - int m_reconnectionTries; - QTimer m_timer; - - // reference to to client object (no ownership) - QXmppClient* m_client; -}; - -#endif // QXMPPRECONNECTIONMANAGER_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPRECONNECTIONMANAGER_H +#define QXMPPRECONNECTIONMANAGER_H + +#include +#include +#include "QXmppClient.h" + +class QXmppReconnectionManager : public QObject +{ + Q_OBJECT + +public: + QXmppReconnectionManager(QXmppClient* client); + +signals: + void reconnectingIn(int); + void reconnectingNow(); + +public slots: + void cancelReconnection(); + +private slots: + void connected(); + void error(QXmppClient::Error); + void reconnect(); + +private: + int getNextReconnectingInTime(); + int m_reconnectionTries; + QTimer m_timer; + + // reference to to client object (no ownership) + QXmppClient* m_client; +}; + +#endif // QXMPPRECONNECTIONMANAGER_H diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp index eb5fc737..13f5c8cd 100644 --- a/source/QXmppRoster.cpp +++ b/source/QXmppRoster.cpp @@ -1,203 +1,203 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppRoster.h" -#include "QXmppUtils.h" -#include "QXmppRosterIq.h" -#include "QXmppPresence.h" -#include "QXmppStream.h" - -QXmppRoster::QXmppRoster(QXmppStream* stream) : m_stream(stream) -{ -} - -QXmppRoster::~QXmppRoster() -{ - -} - -void QXmppRoster::presenceReceived(const QXmppPresence& presence) -{ - QString jid = presence.getFrom(); - QString bareJid = jidToBareJid(jid); - QString resource = jidToResource(jid); - - m_presences[bareJid][resource] = presence; - - emit presenceChanged(bareJid, resource); -} - -void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq) -{ - switch(rosterIq.getType()) - { - case QXmppIq::Set: - case QXmppIq::Result: - { - QList items = rosterIq.getItems(); - for(int i = 0; i < items.count(); ++i) - { - QString bareJid = items.at(i).getBareJid(); - m_entries[bareJid].setBareJid(bareJid); - m_entries[bareJid].setName(items.at(i).getName()); - m_entries[bareJid].setSubscriptionType( - static_cast( - items.at(i).getSubscriptionType())); - m_entries[bareJid].setSubscriptionStatus( - items.at(i).getSubscriptionStatus()); - m_entries[bareJid].setGroups(items.at(i).getGroups()); - emit rosterChanged(bareJid); - } - if(rosterIq.getType() == QXmppIq::Set) // send result iq - { - QXmppIq returnIq(QXmppIq::Result); - returnIq.setId(rosterIq.getId()); - m_stream->sendPacket(returnIq); - } - break; - } - default: - break; - } -} - -QString QXmppRoster::QXmppRosterEntry::getBareJid() const -{ - return m_bareJid; -} - -QString QXmppRoster::QXmppRosterEntry::getName() const -{ - return m_name; -} - -QXmppRoster::QXmppRosterEntry::SubscriptionType - QXmppRoster::QXmppRosterEntry::getSubscriptionType() const -{ - return m_type; -} - -QString QXmppRoster::QXmppRosterEntry::getSubscriptionStatus() const -{ - return m_subscriptionStatus; -} - -QSet QXmppRoster::QXmppRosterEntry::getGroups() const -{ - return m_groups; -} - -void QXmppRoster::QXmppRosterEntry::setBareJid(const QString& str) -{ - m_bareJid = str; -} - -void QXmppRoster::QXmppRosterEntry::setName(const QString& str) -{ - m_name = str; -} - -void QXmppRoster::QXmppRosterEntry::setSubscriptionType( - QXmppRosterEntry::SubscriptionType type) -{ - m_type = type; -} - -void QXmppRoster::QXmppRosterEntry::setSubscriptionStatus(const QString& str) -{ - m_subscriptionStatus = str; -} - -void QXmppRoster::QXmppRosterEntry::addGroupEntry(const QString& str) -{ - m_groups << str; -} - -void QXmppRoster::QXmppRosterEntry::setGroups(const QSet& groups) -{ - m_groups = groups; -} - -QStringList QXmppRoster::getRosterBareJids() const -{ - return m_entries.keys(); -} - -QXmppRoster::QXmppRosterEntry QXmppRoster::getRosterEntry( - const QString& bareJid) const -{ - // will return blank entry if bareJid does'nt exist - if(m_entries.contains(bareJid)) - return m_entries.value(bareJid); - else - { - qWarning("QXmppRoster::getRosterEntry(): bareJid doesn't exist in roster db"); - return QXmppRoster::QXmppRosterEntry(); - } -} - -QMap - QXmppRoster::getRosterEntries() const -{ - return m_entries; -} - -QStringList QXmppRoster::getResources(const QString& bareJid) const -{ - if(m_presences.contains(bareJid)) - { - return m_presences[bareJid].keys(); - } - else - return QStringList(); -} - -QMap QXmppRoster::getAllPresencesForBareJid( - const QString& bareJid) const -{ - if(m_presences.contains(bareJid)) - return m_presences[bareJid]; - else - { - qWarning("QXmppRoster::getAllPresences(): invalid bareJid"); - return QMap(); - } -} - -QXmppPresence QXmppRoster::getPresence(const QString& bareJid, - const QString& resource) const -{ - if(m_presences.contains(bareJid) && m_presences[bareJid].contains(resource)) - return m_presences[bareJid][resource]; - else - { - qWarning("QXmppRoster::getPresence(): invalid bareJid"); - return QXmppPresence(); - } -} - -QMap > QXmppRoster::getAllPresences() const -{ - return m_presences; -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppRoster.h" +#include "QXmppUtils.h" +#include "QXmppRosterIq.h" +#include "QXmppPresence.h" +#include "QXmppStream.h" + +QXmppRoster::QXmppRoster(QXmppStream* stream) : m_stream(stream) +{ +} + +QXmppRoster::~QXmppRoster() +{ + +} + +void QXmppRoster::presenceReceived(const QXmppPresence& presence) +{ + QString jid = presence.getFrom(); + QString bareJid = jidToBareJid(jid); + QString resource = jidToResource(jid); + + m_presences[bareJid][resource] = presence; + + emit presenceChanged(bareJid, resource); +} + +void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq) +{ + switch(rosterIq.getType()) + { + case QXmppIq::Set: + case QXmppIq::Result: + { + QList items = rosterIq.getItems(); + for(int i = 0; i < items.count(); ++i) + { + QString bareJid = items.at(i).getBareJid(); + m_entries[bareJid].setBareJid(bareJid); + m_entries[bareJid].setName(items.at(i).getName()); + m_entries[bareJid].setSubscriptionType( + static_cast( + items.at(i).getSubscriptionType())); + m_entries[bareJid].setSubscriptionStatus( + items.at(i).getSubscriptionStatus()); + m_entries[bareJid].setGroups(items.at(i).getGroups()); + emit rosterChanged(bareJid); + } + if(rosterIq.getType() == QXmppIq::Set) // send result iq + { + QXmppIq returnIq(QXmppIq::Result); + returnIq.setId(rosterIq.getId()); + m_stream->sendPacket(returnIq); + } + break; + } + default: + break; + } +} + +QString QXmppRoster::QXmppRosterEntry::getBareJid() const +{ + return m_bareJid; +} + +QString QXmppRoster::QXmppRosterEntry::getName() const +{ + return m_name; +} + +QXmppRoster::QXmppRosterEntry::SubscriptionType + QXmppRoster::QXmppRosterEntry::getSubscriptionType() const +{ + return m_type; +} + +QString QXmppRoster::QXmppRosterEntry::getSubscriptionStatus() const +{ + return m_subscriptionStatus; +} + +QSet QXmppRoster::QXmppRosterEntry::getGroups() const +{ + return m_groups; +} + +void QXmppRoster::QXmppRosterEntry::setBareJid(const QString& str) +{ + m_bareJid = str; +} + +void QXmppRoster::QXmppRosterEntry::setName(const QString& str) +{ + m_name = str; +} + +void QXmppRoster::QXmppRosterEntry::setSubscriptionType( + QXmppRosterEntry::SubscriptionType type) +{ + m_type = type; +} + +void QXmppRoster::QXmppRosterEntry::setSubscriptionStatus(const QString& str) +{ + m_subscriptionStatus = str; +} + +void QXmppRoster::QXmppRosterEntry::addGroupEntry(const QString& str) +{ + m_groups << str; +} + +void QXmppRoster::QXmppRosterEntry::setGroups(const QSet& groups) +{ + m_groups = groups; +} + +QStringList QXmppRoster::getRosterBareJids() const +{ + return m_entries.keys(); +} + +QXmppRoster::QXmppRosterEntry QXmppRoster::getRosterEntry( + const QString& bareJid) const +{ + // will return blank entry if bareJid does'nt exist + if(m_entries.contains(bareJid)) + return m_entries.value(bareJid); + else + { + qWarning("QXmppRoster::getRosterEntry(): bareJid doesn't exist in roster db"); + return QXmppRoster::QXmppRosterEntry(); + } +} + +QMap + QXmppRoster::getRosterEntries() const +{ + return m_entries; +} + +QStringList QXmppRoster::getResources(const QString& bareJid) const +{ + if(m_presences.contains(bareJid)) + { + return m_presences[bareJid].keys(); + } + else + return QStringList(); +} + +QMap QXmppRoster::getAllPresencesForBareJid( + const QString& bareJid) const +{ + if(m_presences.contains(bareJid)) + return m_presences[bareJid]; + else + { + qWarning("QXmppRoster::getAllPresences(): invalid bareJid"); + return QMap(); + } +} + +QXmppPresence QXmppRoster::getPresence(const QString& bareJid, + const QString& resource) const +{ + if(m_presences.contains(bareJid) && m_presences[bareJid].contains(resource)) + return m_presences[bareJid][resource]; + else + { + qWarning("QXmppRoster::getPresence(): invalid bareJid"); + return QXmppPresence(); + } +} + +QMap > QXmppRoster::getAllPresences() const +{ + return m_presences; +} diff --git a/source/QXmppRoster.h b/source/QXmppRoster.h index f9982083..ef1b40d4 100644 --- a/source/QXmppRoster.h +++ b/source/QXmppRoster.h @@ -1,108 +1,108 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPROSTER_H -#define QXMPPROSTER_H - -#include -#include -#include -#include - -#include "QXmppClient.h" - -class QXmppRosterIq; -class QXmppPresence; - -class QXmppRoster : public QObject -{ - Q_OBJECT - -public: - class QXmppRosterEntry - { - public: - enum SubscriptionType - { - None = 0, - Both, - From, - To, - Remove - }; - - QString getBareJid() const; - QString getName() const; - QXmppRosterEntry::SubscriptionType getSubscriptionType() const; - QString getSubscriptionStatus() const; - QSet getGroups() const; - - void setBareJid(const QString&); - void setName(const QString&); - void setSubscriptionType(QXmppRosterEntry::SubscriptionType); - void setSubscriptionStatus(const QString&); - void setGroups(const QSet&); - void addGroupEntry(const QString&); - - private: - QString m_bareJid; - SubscriptionType m_type; - QString m_name; - // can be subscribe/unsubscribe (attribute "ask") - QString m_subscriptionStatus; - QSet m_groups; - }; - - QXmppRoster(QXmppStream* stream); - ~QXmppRoster(); - - QStringList getRosterBareJids() const; - QXmppRoster::QXmppRosterEntry getRosterEntry(const QString& bareJid) const; - QMap getRosterEntries() const; - - QStringList getResources(const QString& bareJid) const; - QMap > getAllPresences() const; - QMap getAllPresencesForBareJid( - const QString& bareJid) const; - QXmppPresence getPresence(const QString& bareJid, - const QString& resource) const; - -signals: - void presenceChanged(const QString& bareJid, const QString& resource); - void rosterChanged(const QString& bareJid); - -private: - //reverse pointer to stream - QXmppStream* m_stream; - //map of bareJid and its rosterEntry - QMap m_entries; - // map of resources of the jid and map of resouces and presences - QMap > m_presences; - -private slots: - void presenceReceived(const QXmppPresence&); - void rosterIqReceived(const QXmppRosterIq&); -}; - -#endif // QXMPPROSTER_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPROSTER_H +#define QXMPPROSTER_H + +#include +#include +#include +#include + +#include "QXmppClient.h" + +class QXmppRosterIq; +class QXmppPresence; + +class QXmppRoster : public QObject +{ + Q_OBJECT + +public: + class QXmppRosterEntry + { + public: + enum SubscriptionType + { + None = 0, + Both, + From, + To, + Remove + }; + + QString getBareJid() const; + QString getName() const; + QXmppRosterEntry::SubscriptionType getSubscriptionType() const; + QString getSubscriptionStatus() const; + QSet getGroups() const; + + void setBareJid(const QString&); + void setName(const QString&); + void setSubscriptionType(QXmppRosterEntry::SubscriptionType); + void setSubscriptionStatus(const QString&); + void setGroups(const QSet&); + void addGroupEntry(const QString&); + + private: + QString m_bareJid; + SubscriptionType m_type; + QString m_name; + // can be subscribe/unsubscribe (attribute "ask") + QString m_subscriptionStatus; + QSet m_groups; + }; + + QXmppRoster(QXmppStream* stream); + ~QXmppRoster(); + + QStringList getRosterBareJids() const; + QXmppRoster::QXmppRosterEntry getRosterEntry(const QString& bareJid) const; + QMap getRosterEntries() const; + + QStringList getResources(const QString& bareJid) const; + QMap > getAllPresences() const; + QMap getAllPresencesForBareJid( + const QString& bareJid) const; + QXmppPresence getPresence(const QString& bareJid, + const QString& resource) const; + +signals: + void presenceChanged(const QString& bareJid, const QString& resource); + void rosterChanged(const QString& bareJid); + +private: + //reverse pointer to stream + QXmppStream* m_stream; + //map of bareJid and its rosterEntry + QMap m_entries; + // map of resources of the jid and map of resouces and presences + QMap > m_presences; + +private slots: + void presenceReceived(const QXmppPresence&); + void rosterIqReceived(const QXmppRosterIq&); +}; + +#endif // QXMPPROSTER_H diff --git a/source/QXmppRosterIq.cpp b/source/QXmppRosterIq.cpp index bcc675ce..52686563 100644 --- a/source/QXmppRosterIq.cpp +++ b/source/QXmppRosterIq.cpp @@ -1,172 +1,172 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppRosterIq.h" -#include "QXmppConstants.h" -#include "QXmppUtils.h" -#include - -QXmppRosterIq::QXmppRosterIq(QXmppIq::Type type) - : QXmppIq(type) -{ - -} - -QXmppRosterIq::QXmppRosterIq(const QString& type) - : QXmppIq(type) -{ -} - -QXmppRosterIq::~QXmppRosterIq() -{ - -} - -void QXmppRosterIq::addItem(const Item& item) -{ - m_items.append(item); -} - -QList QXmppRosterIq::getItems() const -{ - return m_items; -} - -void QXmppRosterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("query"); - writer->writeAttribute( "xmlns", ns_roster); - - for(int i = 0; i < m_items.count(); ++i) - m_items.at(i).toXml(writer); - writer->writeEndElement(); -} - -QXmppRosterIq::Item::SubscriptionType - QXmppRosterIq::Item::getSubscriptionType() const -{ - return m_type; -} - -QString QXmppRosterIq::Item::getName() const -{ - return m_name; -} - -QString QXmppRosterIq::Item::getSubscriptionStatus() const -{ - return m_subscriptionStatus; -} - -QString QXmppRosterIq::Item::getBareJid() const -{ - return m_bareJid; -} - -QSet QXmppRosterIq::Item::getGroups() const -{ - return m_groups; -} - -void QXmppRosterIq::Item::setName(const QString& str) -{ - m_name = str; -} - -void QXmppRosterIq::Item::setSubscriptionStatus(const QString& str) -{ - m_subscriptionStatus = str; -} - -void QXmppRosterIq::Item::addGroup(const QString& str) -{ - m_groups << str; -} - -void QXmppRosterIq::Item::setBareJid(const QString& str) -{ - m_bareJid = str; -} - -QString QXmppRosterIq::Item::getSubscriptionTypeStr() const -{ - switch(m_type) - { - case NotSet: - return ""; - case None: - return "none"; - case Both: - return "both"; - case From: - return "from"; - case To: - return "to"; - case Remove: - return "remove"; - default: - { - qWarning("QXmppRosterIq::Item::getTypeStr(): invalid type"); - return ""; - } - } -} - -void QXmppRosterIq::Item::setSubscriptionType(SubscriptionType type) -{ - m_type = type; -} - -void QXmppRosterIq::Item::setSubscriptionTypeFromStr(const QString& type) -{ - if(type == "none") - setSubscriptionType(None); - else if(type == "both") - setSubscriptionType(Both); - else if(type == "from") - setSubscriptionType(From); - else if(type == "to") - setSubscriptionType(To); - else if(type == "remove") - setSubscriptionType(Remove); - else - qWarning("QXmppRosterIq::Item::setTypeFromStr(): invalid type"); -} - -void QXmppRosterIq::Item::toXml(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("item"); - helperToXmlAddAttribute(writer,"jid", m_bareJid); - helperToXmlAddAttribute(writer,"name", m_name); - helperToXmlAddAttribute(writer,"subscription", getSubscriptionTypeStr()); - helperToXmlAddAttribute(writer, "ask", getSubscriptionStatus()); - - QSet::const_iterator i = m_groups.constBegin(); - while(i != m_groups.constEnd()) - { - helperToXmlAddTextElement(writer,"group", *i); - ++i; - } - writer->writeEndElement(); -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppRosterIq.h" +#include "QXmppConstants.h" +#include "QXmppUtils.h" +#include + +QXmppRosterIq::QXmppRosterIq(QXmppIq::Type type) + : QXmppIq(type) +{ + +} + +QXmppRosterIq::QXmppRosterIq(const QString& type) + : QXmppIq(type) +{ +} + +QXmppRosterIq::~QXmppRosterIq() +{ + +} + +void QXmppRosterIq::addItem(const Item& item) +{ + m_items.append(item); +} + +QList QXmppRosterIq::getItems() const +{ + return m_items; +} + +void QXmppRosterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("query"); + writer->writeAttribute( "xmlns", ns_roster); + + for(int i = 0; i < m_items.count(); ++i) + m_items.at(i).toXml(writer); + writer->writeEndElement(); +} + +QXmppRosterIq::Item::SubscriptionType + QXmppRosterIq::Item::getSubscriptionType() const +{ + return m_type; +} + +QString QXmppRosterIq::Item::getName() const +{ + return m_name; +} + +QString QXmppRosterIq::Item::getSubscriptionStatus() const +{ + return m_subscriptionStatus; +} + +QString QXmppRosterIq::Item::getBareJid() const +{ + return m_bareJid; +} + +QSet QXmppRosterIq::Item::getGroups() const +{ + return m_groups; +} + +void QXmppRosterIq::Item::setName(const QString& str) +{ + m_name = str; +} + +void QXmppRosterIq::Item::setSubscriptionStatus(const QString& str) +{ + m_subscriptionStatus = str; +} + +void QXmppRosterIq::Item::addGroup(const QString& str) +{ + m_groups << str; +} + +void QXmppRosterIq::Item::setBareJid(const QString& str) +{ + m_bareJid = str; +} + +QString QXmppRosterIq::Item::getSubscriptionTypeStr() const +{ + switch(m_type) + { + case NotSet: + return ""; + case None: + return "none"; + case Both: + return "both"; + case From: + return "from"; + case To: + return "to"; + case Remove: + return "remove"; + default: + { + qWarning("QXmppRosterIq::Item::getTypeStr(): invalid type"); + return ""; + } + } +} + +void QXmppRosterIq::Item::setSubscriptionType(SubscriptionType type) +{ + m_type = type; +} + +void QXmppRosterIq::Item::setSubscriptionTypeFromStr(const QString& type) +{ + if(type == "none") + setSubscriptionType(None); + else if(type == "both") + setSubscriptionType(Both); + else if(type == "from") + setSubscriptionType(From); + else if(type == "to") + setSubscriptionType(To); + else if(type == "remove") + setSubscriptionType(Remove); + else + qWarning("QXmppRosterIq::Item::setTypeFromStr(): invalid type"); +} + +void QXmppRosterIq::Item::toXml(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("item"); + helperToXmlAddAttribute(writer,"jid", m_bareJid); + helperToXmlAddAttribute(writer,"name", m_name); + helperToXmlAddAttribute(writer,"subscription", getSubscriptionTypeStr()); + helperToXmlAddAttribute(writer, "ask", getSubscriptionStatus()); + + QSet::const_iterator i = m_groups.constBegin(); + while(i != m_groups.constEnd()) + { + helperToXmlAddTextElement(writer,"group", *i); + ++i; + } + writer->writeEndElement(); +} diff --git a/source/QXmppRosterIq.h b/source/QXmppRosterIq.h index c750946e..409f4d55 100644 --- a/source/QXmppRosterIq.h +++ b/source/QXmppRosterIq.h @@ -1,84 +1,84 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPROSTERIQ_H -#define QXMPPROSTERIQ_H - -#include "QXmppIq.h" -#include -#include - -class QXmppRosterIq : public QXmppIq -{ -public: - - class Item - { - public: - enum SubscriptionType - { - NotSet = 0, - None, - Both, - From, - To, - Remove - }; - - SubscriptionType getSubscriptionType() const; - QString getName() const; - QString getSubscriptionStatus() const; - QString getBareJid() const; - QSet getGroups() const; - void setName(const QString&); - void setSubscriptionStatus(const QString&); - void addGroup(const QString&); - void setBareJid(const QString&); - void setSubscriptionType(SubscriptionType); - QString getSubscriptionTypeStr() const; - void setSubscriptionTypeFromStr(const QString&); - void toXml(QXmlStreamWriter *writer) const; - - private: - QString m_bareJid; - SubscriptionType m_type; - QString m_name; - // can be subscribe/unsubscribe (attribute "ask") - QString m_subscriptionStatus; - QSet m_groups; - }; - - QXmppRosterIq(QXmppIq::Type type); - QXmppRosterIq(const QString& type); - ~QXmppRosterIq(); - - void addItem(const Item&); - QList getItems() const; - void toXmlElementFromChild(QXmlStreamWriter *writer) const; - -private: - QList m_items; -}; - -#endif // QXMPPROSTERIQ_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPROSTERIQ_H +#define QXMPPROSTERIQ_H + +#include "QXmppIq.h" +#include +#include + +class QXmppRosterIq : public QXmppIq +{ +public: + + class Item + { + public: + enum SubscriptionType + { + NotSet = 0, + None, + Both, + From, + To, + Remove + }; + + SubscriptionType getSubscriptionType() const; + QString getName() const; + QString getSubscriptionStatus() const; + QString getBareJid() const; + QSet getGroups() const; + void setName(const QString&); + void setSubscriptionStatus(const QString&); + void addGroup(const QString&); + void setBareJid(const QString&); + void setSubscriptionType(SubscriptionType); + QString getSubscriptionTypeStr() const; + void setSubscriptionTypeFromStr(const QString&); + void toXml(QXmlStreamWriter *writer) const; + + private: + QString m_bareJid; + SubscriptionType m_type; + QString m_name; + // can be subscribe/unsubscribe (attribute "ask") + QString m_subscriptionStatus; + QSet m_groups; + }; + + QXmppRosterIq(QXmppIq::Type type); + QXmppRosterIq(const QString& type); + ~QXmppRosterIq(); + + void addItem(const Item&); + QList getItems() const; + void toXmlElementFromChild(QXmlStreamWriter *writer) const; + +private: + QList m_items; +}; + +#endif // QXMPPROSTERIQ_H diff --git a/source/QXmppSession.cpp b/source/QXmppSession.cpp index abd1dadc..7821f16f 100644 --- a/source/QXmppSession.cpp +++ b/source/QXmppSession.cpp @@ -1,50 +1,50 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppSession.h" -#include "QXmppConstants.h" -#include "QXmppUtils.h" -#include - -QXmppSession::QXmppSession(QXmppIq::Type type) - : QXmppIq(type) -{ -} - -QXmppSession::QXmppSession(const QString& type) - : QXmppIq(type) -{ -} - -QXmppSession::~QXmppSession() -{ -} - -void QXmppSession::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("session");; - writer->writeAttribute( "xmlns", ns_session); - writer->writeEndElement(); -} - +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppSession.h" +#include "QXmppConstants.h" +#include "QXmppUtils.h" +#include + +QXmppSession::QXmppSession(QXmppIq::Type type) + : QXmppIq(type) +{ +} + +QXmppSession::QXmppSession(const QString& type) + : QXmppIq(type) +{ +} + +QXmppSession::~QXmppSession() +{ +} + +void QXmppSession::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("session");; + writer->writeAttribute( "xmlns", ns_session); + writer->writeEndElement(); +} + diff --git a/source/QXmppSession.h b/source/QXmppSession.h index 1845bf6d..95b1048c 100644 --- a/source/QXmppSession.h +++ b/source/QXmppSession.h @@ -1,42 +1,42 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPSESSION_H -#define QXMPPSESSION_H - -#include "QXmppIq.h" - -class QXmppSession : public QXmppIq -{ -public: - QXmppSession(QXmppIq::Type type); - QXmppSession(const QString& type); - ~QXmppSession(); - -private: - void toXmlElementFromChild( QXmlStreamWriter *writer) const; - -}; - -#endif // QXMPPSESSION_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPSESSION_H +#define QXMPPSESSION_H + +#include "QXmppIq.h" + +class QXmppSession : public QXmppIq +{ +public: + QXmppSession(QXmppIq::Type type); + QXmppSession(const QString& type); + ~QXmppSession(); + +private: + void toXmlElementFromChild( QXmlStreamWriter *writer) const; + +}; + +#endif // QXMPPSESSION_H diff --git a/source/QXmppStanza.cpp b/source/QXmppStanza.cpp index c83bfaa8..1cfacfb9 100644 --- a/source/QXmppStanza.cpp +++ b/source/QXmppStanza.cpp @@ -1,322 +1,322 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppStanza.h" -#include "QXmppUtils.h" -#include "QXmppConstants.h" - -#include - -int QXmppStanza::s_uniqeIdNo = 0; - -QXmppStanza::Error::Error(): m_type(static_cast(-1)), - m_condition(static_cast(-1)), - m_text("") -{ -} - -QXmppStanza::Error::Error(Type type, Condition cond, const QString& text): - m_type(type), m_condition(cond), m_text(text) -{ -} - -QXmppStanza::Error::Error(const QString& type, const QString& cond, - const QString& text): - m_text(text) -{ - setTypeFromStr(type); - setConditionFromStr(cond); -} - -void QXmppStanza::Error::setText(const QString& text) -{ - m_text = text; -} - -void QXmppStanza::Error::setCondition(QXmppStanza::Error::Condition cond) -{ - m_condition = cond; -} - -void QXmppStanza::Error::setType(QXmppStanza::Error::Type type) -{ - m_type = type; -} - -QString QXmppStanza::Error::getText() const -{ - return m_text; -} - -QXmppStanza::Error::Condition QXmppStanza::Error::getCondition() const -{ - return m_condition; -} - -QXmppStanza::Error::Type QXmppStanza::Error::getType() const -{ - return m_type; -} - -QString QXmppStanza::Error::getTypeStr() const -{ - switch(getType()) - { - case Cancel: - return "cancel"; - case Continue: - return "continue"; - case Modify: - return "modify"; - case Auth: - return "auth"; - case Wait: - return "wait"; - default: - return ""; - } -} - -QString QXmppStanza::Error::getConditionStr() const -{ - switch(getCondition()) - { - case BadRequest: - return "bad-request"; - case Conflict: - return "conflict"; - case FeatureNotImplemented: - return "feature-not-implemented"; - case Forbidden: - return "forbidden"; - case Gone: - return "gone"; - case InternalServerError: - return "internal-server-error"; - case ItemNotFound: - return "item-not-found"; - case JidMalformed: - return "jid-malformed"; - case NotAcceptable: - return "not-acceptable"; - case NotAllowed: - return "not-allowed"; - case NotAuthorized: - return "not-authorized"; - case PaymentRequired: - return "payment-required"; - case RecipientUnavailable: - return "recipient-unavailable"; - case Redirect: - return "redirect"; - case RegistrationRequired: - return "registration-required"; - case RemoteServerNotFound: - return "remote-server-not-found"; - case RemoteServerTimeout: - return "remote-server-timeout"; - case ResourceConstraint: - return "resource-constraint"; - case ServiceUnavailable: - return "service-unavailable"; - case SubscriptionRequired: - return "subscription-required"; - case UndefinedCondition: - return "undefined-condition"; - case UnexpectedRequest: - return "unexpected-request"; - default: - return ""; - } -} - -void QXmppStanza::Error::setTypeFromStr(const QString& type) -{ - if(type == "cancel") - setType(Cancel); - else if(type == "continue") - setType(Continue); - else if(type == "modify") - setType(Modify); - else if(type == "auth") - setType(Auth); - else if(type == "wait") - setType(Wait); - else - setType(static_cast(-1)); -} - -void QXmppStanza::Error::setConditionFromStr(const QString& type) -{ - if(type == "bad-request") - setCondition(BadRequest); - else if(type == "conflict") - setCondition(Conflict); - else if(type == "feature-not-implemented") - setCondition(FeatureNotImplemented); - else if(type == "forbidden") - setCondition(Forbidden); - else if(type == "gone") - setCondition(Gone); - else if(type == "internal-server-error") - setCondition(InternalServerError); - else if(type == "item-not-found") - setCondition(ItemNotFound); - else if(type == "jid-malformed") - setCondition(JidMalformed); - else if(type == "not-acceptable") - setCondition(NotAcceptable); - else if(type == "not-allowed") - setCondition(NotAllowed); - else if(type == "not-authorized") - setCondition(NotAuthorized); - else if(type == "payment-required") - setCondition(PaymentRequired); - else if(type == "recipient-unavailable") - setCondition(RecipientUnavailable); - else if(type == "redirect") - setCondition(Redirect); - else if(type == "registration-required") - setCondition(RegistrationRequired); - else if(type == "remote-server-not-found") - setCondition(RemoteServerNotFound); - else if(type == "remote-server-timeout") - setCondition(RemoteServerTimeout); - else if(type == "resource-constraint") - setCondition(ResourceConstraint); - else if(type == "service-unavailable") - setCondition(ServiceUnavailable); - else if(type == "subscription-required") - setCondition(SubscriptionRequired); - else if(type == "undefined-condition") - setCondition(UndefinedCondition); - else if(type == "unexpected-request") - setCondition(UnexpectedRequest); - else - setCondition(static_cast(-1)); -} - -void QXmppStanza::Error::toXml( QXmlStreamWriter *writer ) const -{ - QString cond = getConditionStr(); - QString type = getTypeStr(); - - if(cond.isEmpty() && type.isEmpty()) - return; - - writer->writeStartElement("error"); - helperToXmlAddAttribute(writer,"type", type); - - if(!cond.isEmpty()) - { - writer->writeStartElement(cond); - helperToXmlAddAttribute(writer,"xmlns", ns_stanza); - writer->writeEndElement(); - } - if(!m_text.isEmpty()) - { - writer->writeStartElement("text"); - helperToXmlAddAttribute(writer,"xml:lang", "en"); - helperToXmlAddAttribute(writer,"xmlns", ns_stanza); - writer->writeCharacters(m_text); - writer->writeEndElement(); - } - - writer->writeEndElement(); -} - - -QXmppStanza::QXmppStanza(const QString& from, const QString& to) : QXmppPacket(), -m_to(to), m_from(from) -{ -} - -QXmppStanza::~QXmppStanza() -{ - -} - -QString QXmppStanza::getTo() const -{ - return m_to; -} - -QString QXmppStanza::getFrom() const -{ - return m_from; -} - -QString QXmppStanza::getId() const -{ - return m_id; -} - -QString QXmppStanza::getLang() const -{ - return m_lang; -} - - -void QXmppStanza::setTo(const QString& to) -{ - m_to = to; -} - -void QXmppStanza::setFrom(const QString& from) -{ - m_from = from; -} - -void QXmppStanza::setId(const QString& id) -{ - m_id = id; -} - -void QXmppStanza::setLang(const QString& lang) -{ - m_lang = lang; -} - -void QXmppStanza::generateAndSetNextId() -{ - // get back - ++s_uniqeIdNo; - m_id = "qxmpp" + QString::number(s_uniqeIdNo); -} - -QXmppStanza::Error QXmppStanza::getError() const -{ - return m_error; -} - -void QXmppStanza::setError(QXmppStanza::Error& error) -{ - m_error = error; -} - -bool QXmppStanza::isErrorStanza() -{ - return !(m_error.getTypeStr().isEmpty() && - m_error.getConditionStr().isEmpty()); -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppStanza.h" +#include "QXmppUtils.h" +#include "QXmppConstants.h" + +#include + +int QXmppStanza::s_uniqeIdNo = 0; + +QXmppStanza::Error::Error(): m_type(static_cast(-1)), + m_condition(static_cast(-1)), + m_text("") +{ +} + +QXmppStanza::Error::Error(Type type, Condition cond, const QString& text): + m_type(type), m_condition(cond), m_text(text) +{ +} + +QXmppStanza::Error::Error(const QString& type, const QString& cond, + const QString& text): + m_text(text) +{ + setTypeFromStr(type); + setConditionFromStr(cond); +} + +void QXmppStanza::Error::setText(const QString& text) +{ + m_text = text; +} + +void QXmppStanza::Error::setCondition(QXmppStanza::Error::Condition cond) +{ + m_condition = cond; +} + +void QXmppStanza::Error::setType(QXmppStanza::Error::Type type) +{ + m_type = type; +} + +QString QXmppStanza::Error::getText() const +{ + return m_text; +} + +QXmppStanza::Error::Condition QXmppStanza::Error::getCondition() const +{ + return m_condition; +} + +QXmppStanza::Error::Type QXmppStanza::Error::getType() const +{ + return m_type; +} + +QString QXmppStanza::Error::getTypeStr() const +{ + switch(getType()) + { + case Cancel: + return "cancel"; + case Continue: + return "continue"; + case Modify: + return "modify"; + case Auth: + return "auth"; + case Wait: + return "wait"; + default: + return ""; + } +} + +QString QXmppStanza::Error::getConditionStr() const +{ + switch(getCondition()) + { + case BadRequest: + return "bad-request"; + case Conflict: + return "conflict"; + case FeatureNotImplemented: + return "feature-not-implemented"; + case Forbidden: + return "forbidden"; + case Gone: + return "gone"; + case InternalServerError: + return "internal-server-error"; + case ItemNotFound: + return "item-not-found"; + case JidMalformed: + return "jid-malformed"; + case NotAcceptable: + return "not-acceptable"; + case NotAllowed: + return "not-allowed"; + case NotAuthorized: + return "not-authorized"; + case PaymentRequired: + return "payment-required"; + case RecipientUnavailable: + return "recipient-unavailable"; + case Redirect: + return "redirect"; + case RegistrationRequired: + return "registration-required"; + case RemoteServerNotFound: + return "remote-server-not-found"; + case RemoteServerTimeout: + return "remote-server-timeout"; + case ResourceConstraint: + return "resource-constraint"; + case ServiceUnavailable: + return "service-unavailable"; + case SubscriptionRequired: + return "subscription-required"; + case UndefinedCondition: + return "undefined-condition"; + case UnexpectedRequest: + return "unexpected-request"; + default: + return ""; + } +} + +void QXmppStanza::Error::setTypeFromStr(const QString& type) +{ + if(type == "cancel") + setType(Cancel); + else if(type == "continue") + setType(Continue); + else if(type == "modify") + setType(Modify); + else if(type == "auth") + setType(Auth); + else if(type == "wait") + setType(Wait); + else + setType(static_cast(-1)); +} + +void QXmppStanza::Error::setConditionFromStr(const QString& type) +{ + if(type == "bad-request") + setCondition(BadRequest); + else if(type == "conflict") + setCondition(Conflict); + else if(type == "feature-not-implemented") + setCondition(FeatureNotImplemented); + else if(type == "forbidden") + setCondition(Forbidden); + else if(type == "gone") + setCondition(Gone); + else if(type == "internal-server-error") + setCondition(InternalServerError); + else if(type == "item-not-found") + setCondition(ItemNotFound); + else if(type == "jid-malformed") + setCondition(JidMalformed); + else if(type == "not-acceptable") + setCondition(NotAcceptable); + else if(type == "not-allowed") + setCondition(NotAllowed); + else if(type == "not-authorized") + setCondition(NotAuthorized); + else if(type == "payment-required") + setCondition(PaymentRequired); + else if(type == "recipient-unavailable") + setCondition(RecipientUnavailable); + else if(type == "redirect") + setCondition(Redirect); + else if(type == "registration-required") + setCondition(RegistrationRequired); + else if(type == "remote-server-not-found") + setCondition(RemoteServerNotFound); + else if(type == "remote-server-timeout") + setCondition(RemoteServerTimeout); + else if(type == "resource-constraint") + setCondition(ResourceConstraint); + else if(type == "service-unavailable") + setCondition(ServiceUnavailable); + else if(type == "subscription-required") + setCondition(SubscriptionRequired); + else if(type == "undefined-condition") + setCondition(UndefinedCondition); + else if(type == "unexpected-request") + setCondition(UnexpectedRequest); + else + setCondition(static_cast(-1)); +} + +void QXmppStanza::Error::toXml( QXmlStreamWriter *writer ) const +{ + QString cond = getConditionStr(); + QString type = getTypeStr(); + + if(cond.isEmpty() && type.isEmpty()) + return; + + writer->writeStartElement("error"); + helperToXmlAddAttribute(writer,"type", type); + + if(!cond.isEmpty()) + { + writer->writeStartElement(cond); + helperToXmlAddAttribute(writer,"xmlns", ns_stanza); + writer->writeEndElement(); + } + if(!m_text.isEmpty()) + { + writer->writeStartElement("text"); + helperToXmlAddAttribute(writer,"xml:lang", "en"); + helperToXmlAddAttribute(writer,"xmlns", ns_stanza); + writer->writeCharacters(m_text); + writer->writeEndElement(); + } + + writer->writeEndElement(); +} + + +QXmppStanza::QXmppStanza(const QString& from, const QString& to) : QXmppPacket(), +m_to(to), m_from(from) +{ +} + +QXmppStanza::~QXmppStanza() +{ + +} + +QString QXmppStanza::getTo() const +{ + return m_to; +} + +QString QXmppStanza::getFrom() const +{ + return m_from; +} + +QString QXmppStanza::getId() const +{ + return m_id; +} + +QString QXmppStanza::getLang() const +{ + return m_lang; +} + + +void QXmppStanza::setTo(const QString& to) +{ + m_to = to; +} + +void QXmppStanza::setFrom(const QString& from) +{ + m_from = from; +} + +void QXmppStanza::setId(const QString& id) +{ + m_id = id; +} + +void QXmppStanza::setLang(const QString& lang) +{ + m_lang = lang; +} + +void QXmppStanza::generateAndSetNextId() +{ + // get back + ++s_uniqeIdNo; + m_id = "qxmpp" + QString::number(s_uniqeIdNo); +} + +QXmppStanza::Error QXmppStanza::getError() const +{ + return m_error; +} + +void QXmppStanza::setError(QXmppStanza::Error& error) +{ + m_error = error; +} + +bool QXmppStanza::isErrorStanza() +{ + return !(m_error.getTypeStr().isEmpty() && + m_error.getConditionStr().isEmpty()); +} diff --git a/source/QXmppStanza.h b/source/QXmppStanza.h index 58aedb57..c5b6cd85 100644 --- a/source/QXmppStanza.h +++ b/source/QXmppStanza.h @@ -1,122 +1,126 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPSTANZA_H -#define QXMPPSTANZA_H - -#include "QXmppPacket.h" -#include - -class QXmlStreamWriter; - -class QXmppStanza : public QXmppPacket -{ -public: - class Error - { - public: - enum Type - { - Cancel, - Continue, - Modify, - Auth, - Wait - }; - - enum Condition - { - BadRequest, - Conflict, - FeatureNotImplemented, - Forbidden, - Gone, - InternalServerError, - ItemNotFound, - JidMalformed, - NotAcceptable, - NotAllowed, - NotAuthorized, - PaymentRequired, - RecipientUnavailable, - Redirect, - RegistrationRequired, - RemoteServerNotFound, - RemoteServerTimeout, - ResourceConstraint, - ServiceUnavailable, - SubscriptionRequired, - UndefinedCondition, - UnexpectedRequest - }; - - Error(); - Error(Type type, Condition cond, const QString& text=""); - Error(const QString& type, const QString& cond, const QString& text=""); - - void setText(const QString& text); - void setCondition(Condition cond); - void setConditionFromStr(const QString& cond); - void setType(Type type); - void setTypeFromStr(const QString& type); - QString getText() const; - Condition getCondition() const; - Type getType() const; - void toXml( QXmlStreamWriter *writer ) const; - QString getConditionStr() const; - QString getTypeStr() const; - - private: - Type m_type; - Condition m_condition; - QString m_text; - }; - - QXmppStanza(const QString& from = "", const QString& to = ""); - ~QXmppStanza(); - - QString getTo() const; - QString getFrom() const; - QString getId() const; - QString getLang() const; - QXmppStanza::Error getError() const; - - void setTo(const QString&); - void setFrom(const QString&); - void setId(const QString&); - void generateAndSetNextId(); - void setLang(const QString&); - void setError(QXmppStanza::Error& error); - bool isErrorStanza(); - -private: - static int s_uniqeIdNo; - QString m_to; - QString m_from; - QString m_id; - QString m_lang; - QXmppStanza::Error m_error; -}; - -#endif // QXMPPSTANZA_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPSTANZA_H +#define QXMPPSTANZA_H + +#include "QXmppPacket.h" +#include + +// forward declarations of QXmlStream* classes will not work on Mac, we need to +// include the whole header. +// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html +// for an explanation. +#include + +class QXmppStanza : public QXmppPacket +{ +public: + class Error + { + public: + enum Type + { + Cancel, + Continue, + Modify, + Auth, + Wait + }; + + enum Condition + { + BadRequest, + Conflict, + FeatureNotImplemented, + Forbidden, + Gone, + InternalServerError, + ItemNotFound, + JidMalformed, + NotAcceptable, + NotAllowed, + NotAuthorized, + PaymentRequired, + RecipientUnavailable, + Redirect, + RegistrationRequired, + RemoteServerNotFound, + RemoteServerTimeout, + ResourceConstraint, + ServiceUnavailable, + SubscriptionRequired, + UndefinedCondition, + UnexpectedRequest + }; + + Error(); + Error(Type type, Condition cond, const QString& text=""); + Error(const QString& type, const QString& cond, const QString& text=""); + + void setText(const QString& text); + void setCondition(Condition cond); + void setConditionFromStr(const QString& cond); + void setType(Type type); + void setTypeFromStr(const QString& type); + QString getText() const; + Condition getCondition() const; + Type getType() const; + void toXml( QXmlStreamWriter *writer ) const; + QString getConditionStr() const; + QString getTypeStr() const; + + private: + Type m_type; + Condition m_condition; + QString m_text; + }; + + QXmppStanza(const QString& from = "", const QString& to = ""); + ~QXmppStanza(); + + QString getTo() const; + QString getFrom() const; + QString getId() const; + QString getLang() const; + QXmppStanza::Error getError() const; + + void setTo(const QString&); + void setFrom(const QString&); + void setId(const QString&); + void generateAndSetNextId(); + void setLang(const QString&); + void setError(QXmppStanza::Error& error); + bool isErrorStanza(); + +private: + static int s_uniqeIdNo; + QString m_to; + QString m_from; + QString m_id; + QString m_lang; + QXmppStanza::Error m_error; +}; + +#endif // QXMPPSTANZA_H diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp index 70e9a4e8..44d8c5f2 100644 --- a/source/QXmppStream.cpp +++ b/source/QXmppStream.cpp @@ -1,931 +1,931 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppStream.h" -#include "QXmppPacket.h" -#include "QXmppUtils.h" -#include "QXmppClient.h" -#include "QXmppRoster.h" -#include "QXmppPresence.h" -#include "QXmppIq.h" -#include "QXmppBind.h" -#include "QXmppSession.h" -#include "QXmppRosterIq.h" -#include "QXmppMessage.h" -#include "QXmppConstants.h" -#include "QXmppVCard.h" -#include "QXmppNonSASLAuth.h" -#include "QXmppInformationRequestResult.h" -#include "QXmppLogger.h" - -#include -#include -#include -#include -#include - -static const QByteArray streamRootElementStart = "\n"; -static const QByteArray streamRootElementEnd = ""; - -QXmppStream::QXmppStream(QXmppClient* client) - : QObject(client), m_client(client), m_roster(this), - m_sessionAvaliable(false), m_vCardManager(m_client) -{ - bool check = QObject::connect(&m_socket, SIGNAL(hostFound()), - this, SLOT(socketHostFound())); - Q_ASSERT(check); - check = QObject::connect(&m_socket, SIGNAL(connected()), - this, SLOT(socketConnected())); - Q_ASSERT(check); - check = QObject::connect(&m_socket, SIGNAL(disconnected()), - this, SLOT(socketDisconnected())); - Q_ASSERT(check); - check = QObject::connect(&m_socket, SIGNAL(readyRead()), - this, SLOT(socketReadReady())); - Q_ASSERT(check); - check = QObject::connect(&m_socket, SIGNAL(encrypted()), - this, SLOT(socketEncrypted())); - Q_ASSERT(check); - check = QObject::connect(&m_socket, - SIGNAL(sslErrors(const QList&)), this, - SLOT(socketSslErrors(const QList&))); - Q_ASSERT(check); - check = QObject::connect(&m_socket, - SIGNAL(error(QAbstractSocket::SocketError)), this, - SLOT(socketError(QAbstractSocket::SocketError))); - Q_ASSERT(check); - - check = QObject::connect(this, - SIGNAL(presenceReceived(const QXmppPresence&)), - &m_roster, - SLOT(presenceReceived(const QXmppPresence&))); - Q_ASSERT(check); - - check = QObject::connect(this, SIGNAL(rosterIqReceived(const QXmppRosterIq&)), - &m_roster, SLOT(rosterIqReceived(const QXmppRosterIq&))); - Q_ASSERT(check); - - check = QObject::connect(this, SIGNAL(vCardIqReceived(const QXmppVCard&)), - &m_vCardManager, SLOT(vCardIqReceived(const QXmppVCard&))); - Q_ASSERT(check); -} - -QXmppStream::~QXmppStream() -{ - -} - -QXmppConfiguration& QXmppStream::getConfiguration() -{ - return m_client->getConfiguration(); -} - -void QXmppStream::connect() -{ - log(QString("Connecting to: %1:%2").arg(getConfiguration(). - getHost()).arg(getConfiguration().getPort())); - - m_socket.setProxy(getConfiguration().getNetworkProxy()); - m_socket.connectToHost(getConfiguration(). - getHost(), getConfiguration().getPort()); -} - -void QXmppStream::socketSslErrors(const QList & error) -{ - log(QString("SSL errors")); - m_socket.ignoreSslErrors(); - for(int i = 0; i< error.count(); ++i) - log(error.at(i).errorString()); -} - -void QXmppStream::socketHostFound() -{ - log(QString("Host found")); - emit hostFound(); -} - -void QXmppStream::socketConnected() -{ - flushDataBuffer(); - log(QString("Connected")); - emit connected(); - sendStartStream(); -} - -void QXmppStream::socketDisconnected() -{ - flushDataBuffer(); - log(QString("Disconnected")); - emit disconnected(); -} - -void QXmppStream::socketEncrypted() -{ - log(QString("Encrypted")); - sendStartStream(); -} - -void QXmppStream::socketError(QAbstractSocket::SocketError ee) -{ - m_socketError = ee; - emit error(QXmppClient::SocketError); - log(QString("Socket error: " + m_socket.errorString())); -} - -void QXmppStream::socketReadReady() -{ - QByteArray data = m_socket.readAll(); - log("SERVER [COULD BE PARTIAL DATA]:" + data.left(20)); - parser(data); -} - -void QXmppStream::sendNonSASLAuthQuery( const QString &to ) -{ - QXmppNonSASLAuthTypesRequestIq authQuery; - authQuery.setTo(to); - authQuery.setUsername(getConfiguration().getUser()); - - sendPacket(authQuery); -} - -void QXmppStream::parser(const QByteArray& data) -{ - QDomDocument doc; - QByteArray completeXml; - - m_dataBuffer = m_dataBuffer + data; - - if(hasStartStreamElement(m_dataBuffer)) - { - completeXml = m_dataBuffer + streamRootElementEnd; - } - else if(hasEndStreamElement(data)) - { - completeXml = streamRootElementStart + m_dataBuffer; - } - else - { - completeXml = streamRootElementStart + m_dataBuffer + streamRootElementEnd; - } - - if(doc.setContent(completeXml, true)) - { - log("SERVER:" + m_dataBuffer); - flushDataBuffer(); - - QDomElement nodeRecv = doc.documentElement().firstChildElement(); - - if(nodeRecv.isNull()) - { - QDomElement streamElement = doc.documentElement(); - if(m_streamId.isEmpty()) - m_streamId = streamElement.attribute("id"); - if(m_XMPPVersion.isEmpty()) - { - m_XMPPVersion = streamElement.attribute("version"); - if(m_XMPPVersion.isEmpty()) - { - // no version specified, signals XMPP Version < 1.0. - // switch to old auth mechanism - sendNonSASLAuthQuery(doc.documentElement().attribute("from")); - } - } - } - else - { - //TODO: Make a login error here. - } - - while(!nodeRecv.isNull()) - { - QString ns = nodeRecv.namespaceURI(); - if(ns == ns_stream && nodeRecv.tagName() == "features") - { - bool nonSaslAvailable = nodeRecv.firstChildElement("auth"). - namespaceURI() == ns_authFeature; - bool saslAvailable = nodeRecv.firstChildElement("mechanisms"). - namespaceURI() == ns_sasl; - bool useSasl = getConfiguration().getUseSASLAuthentication(); - - if(nodeRecv.firstChildElement("starttls").namespaceURI() - == ns_tls && !m_socket.isEncrypted()) - { - if(nodeRecv.firstChildElement("starttls"). - firstChildElement().tagName() == "required") - { - // TLS is must from the server side - sendStartTls(); - return; - } - else - { - // TLS is optional from the server side - switch(getConfiguration().getStreamSecurityMode()) - { - case QXmppConfiguration::TLSEnabled: - case QXmppConfiguration::TLSRequired: - sendStartTls(); - return; - case QXmppConfiguration::TLSDisabled: - break; - } - } - } - else if(!m_socket.isEncrypted()) // TLS not supported by server - { - if(getConfiguration().getStreamSecurityMode() == - QXmppConfiguration::TLSRequired) - { - // disconnect as the for client TLS is compulsory but - // not available on the server - // - log(QString("Disconnecting as TLS not available at the server")); - disconnect(); - return; - } - } - - if((saslAvailable && nonSaslAvailable && !useSasl) || - (!saslAvailable && nonSaslAvailable)) - { - sendNonSASLAuthQuery(doc.documentElement().attribute("from")); - } - else if(saslAvailable) - { - // SASL Authentication - QDomElement element = nodeRecv.firstChildElement("mechanisms"); - log(QString("Mechanisms:")); - QDomElement subElement = element.firstChildElement(); - QStringList mechanisms; - while(!subElement.isNull()) - { - if(subElement.tagName() == "mechanism") - { - log(subElement.text()); - mechanisms << subElement.text(); - } - subElement = subElement.nextSiblingElement(); - } - - switch(getConfiguration().getSASLAuthMechanism()) - { - case QXmppConfiguration::SASLPlain: - if(mechanisms.contains("PLAIN")) - { - sendAuthPlain(); - break; - } - case QXmppConfiguration::SASLDigestMD5: - if(mechanisms.contains("DIGEST-MD5")) - { - sendAuthDigestMD5(); - break; - } - default: - log(QString("Desired SASL Auth mechanism not available trying the available ones")); - if(mechanisms.contains("DIGEST-MD5")) - sendAuthDigestMD5(); - else if(mechanisms.contains("PLAIN")) - sendAuthPlain(); - else - { - log(QString("SASL Auth mechanism not available")); - disconnect(); - return; - } - break; - } - } - - if(nodeRecv.firstChildElement("bind"). - namespaceURI() == ns_bind) - { - sendBindIQ(); - } - - if(nodeRecv.firstChildElement("session"). - namespaceURI() == ns_session) - { - m_sessionAvaliable = true; - } - } - else if(ns == ns_tls) - { - if(nodeRecv.tagName() == "proceed") - { - log(QString("Starting encryption")); - m_socket.startClientEncryption(); - return; - } - } - else if(ns == ns_sasl) - { - if(nodeRecv.tagName() == "success") - { - log(QString("Authenticated")); - sendStartStream(); - } - else if(nodeRecv.tagName() == "challenge") - { - sendAuthDigestMD5Response(nodeRecv.text()); - } - } - else if(ns == ns_client) - { - - if(nodeRecv.tagName() == "iq") - { - QDomElement element = nodeRecv.firstChildElement(); - QString id = nodeRecv.attribute("id"); - QString to = nodeRecv.attribute("to"); - QString from = nodeRecv.attribute("from"); - QString type = nodeRecv.attribute("type"); - if(type.isEmpty()) - qWarning("QXmppStream: iq type can't be empty"); - QXmppIq iqPacket; // to emit - - - QDomElement elemen = nodeRecv.firstChildElement("error"); - QXmppStanza::Error error = parseStanzaError(elemen); - - - if(id == m_sessionId) - { - // get back add configuration whether to send - // roster and intial presence in beginning - // process SessionIq - - // xmpp connection made - emit xmppConnected(); - - sendRosterRequest(); - sendInitialPresence(); - - QXmppBind session(type); - session.setId(id); - session.setTo(to); - session.setFrom(from); - iqPacket = session; - } - else if(id == m_bindId) - { - QXmppBind bind(type); - QString jid = nodeRecv.firstChildElement("bind"). - firstChildElement("jid").text(); - bind.setResource(jidToResource(jid)); - bind.setJid(jidToBareJid(jid)); - bind.setId(id); - bind.setTo(to); - bind.setFrom(from); - processBindIq(bind); - iqPacket = bind; - } - else if(nodeRecv.firstChildElement("query"). - namespaceURI() == ns_roster) - { - QDomElement itemElement = nodeRecv. - firstChildElement("query"). - firstChildElement("item"); - QXmppRosterIq rosterIq(nodeRecv.attribute("type")); - rosterIq.setId(id); - rosterIq.setTo(to); - rosterIq.setFrom(from); - while(!itemElement.isNull()) - { - QXmppRosterIq::Item item; - item.setName(itemElement.attribute("name")); - item.setBareJid(itemElement.attribute("jid")); - item.setSubscriptionTypeFromStr( - itemElement.attribute("subscription")); - item.setSubscriptionStatus( - itemElement.attribute("ask")); - item.addGroup( - itemElement.firstChildElement("group").firstChildElement().text()); - rosterIq.addItem(item); - itemElement = itemElement.nextSiblingElement(); - } - processRosterIq(rosterIq); - iqPacket = rosterIq; - } - // extensions - // vCard - XEP-0054 - // http://xmpp.org/extensions/xep-0054.html - else if(nodeRecv.firstChildElement("vCard"). - namespaceURI() == ns_vcard) - { - QXmppVCard vcardIq; - vcardIq.parse(nodeRecv); - emit vCardIqReceived(vcardIq); - iqPacket = vcardIq; - } - // XEP-0030 info query - else if(nodeRecv.firstChildElement("query"). - namespaceURI() == ns_disco_info && - type == "get") - { - QXmppInformationRequestResult qxmppFeatures; - qxmppFeatures.setId(id); - qxmppFeatures.setTo(from); - qxmppFeatures.setFrom(to); - sendPacket(qxmppFeatures); - } - else if(id == m_nonSASLAuthId && type == "result") - { - // successful Non-SASL Authentication - log(QString("Authenticated (Non-SASL)")); - - emit xmppConnected(); - - sendRosterRequest(); - sendInitialPresence(); - } - else if(nodeRecv.firstChildElement("query"). - namespaceURI() == ns_auth) - { - if(type == "result") - { - bool digest = !nodeRecv.firstChildElement("query"). - firstChildElement("digest").isNull(); - bool plain = !nodeRecv.firstChildElement("query"). - firstChildElement("password").isNull(); - bool plainText = false; - - if(plain && digest) - { - if(getConfiguration().getNonSASLAuthMechanism() == - QXmppConfiguration::NonSASLDigest) - plainText = false; - else - plainText = true; - } - else if(plain) - plainText = true; - else if(digest) - plainText = false; - else - { - //TODO Login error - return; - } - sendNonSASLAuth(plainText); - } - } - else // didn't understant the iq...reply with error - { - if(type != "result") // but not incase of result iqs - { - QXmppIq iq(QXmppIq::Error); - iq.setId(id); - iq.setTo(from); - iq.setFrom(to); - QXmppStanza::Error error(QXmppStanza::Error::Cancel, - QXmppStanza::Error::FeatureNotImplemented); - iq.setError(error); - sendPacket(iq); - } - } - - iqPacket.setError(error); - processIq(iqPacket); - } - else if(nodeRecv.tagName() == "presence") - { - QXmppPresence presence; - presence.setTypeFromStr(nodeRecv.attribute("type")); - presence.setFrom(nodeRecv.attribute("from")); - presence.setTo(nodeRecv.attribute("to")); - - QString statusText = nodeRecv. - firstChildElement("status").text(); - QString show = nodeRecv. - firstChildElement("show").text(); - int priority = nodeRecv. - firstChildElement("priority").text().toInt(); - QXmppPresence::Status status; - status.setTypeFromStr(show); - status.setStatusText(statusText); - status.setPriority(priority); - presence.setStatus(status); - - QDomElement errorElement = nodeRecv. - firstChildElement("error"); - if(!errorElement.isNull()) - { - QXmppStanza::Error error = - parseStanzaError(errorElement); - presence.setError(error); - } - - processPresence(presence); - } - else if(nodeRecv.tagName() == "message") - { - QString from = nodeRecv.attribute("from"); - QString to = nodeRecv.attribute("to"); - QString type = nodeRecv.attribute("type"); - QString body = unescapeString( - nodeRecv.firstChildElement("body").text()); - QString sub = unescapeString( - nodeRecv.firstChildElement("subject").text()); - QString thread = nodeRecv.firstChildElement("thread").text(); - QXmppMessage message(from, to, body, thread); - message.setSubject(sub); - message.setTypeFromStr(type); - - QDomElement errorElement = nodeRecv. - firstChildElement("error"); - if(!errorElement.isNull()) - { - QXmppStanza::Error error = parseStanzaError(errorElement); - message.setError(error); - } - processMessage(message); - } - } - nodeRecv = nodeRecv.nextSiblingElement(); - } - } - else - { - //wait for complete packet - } -} - - -void QXmppStream::sendStartStream() -{ - QByteArray data = ""); - sendToServer(data); -} - -void QXmppStream::sendToServer(const QByteArray& packet) -{ - log("CLIENT: " + packet); - m_socket.write( packet ); -} - -bool QXmppStream::hasStartStreamElement(const QByteArray& data) -{ - QString str(data); - QRegExp regex("(<\\?xml.*\\?>)?\\s*"); - regex.setMinimal(true); - if(str.contains(regex)) - return true; - else - return false; -} - -bool QXmppStream::hasEndStreamElement(const QByteArray& data) -{ - QString str(data); - QRegExp regex(""); - regex.setMinimal(true); - if(str.contains(regex)) - return true; - else - return false; -} - -void QXmppStream::sendStartTls() -{ - sendToServer(""); -} - -void QXmppStream::sendNonSASLAuth(bool plainText) -{ - QXmppNonSASLAuthIq authQuery; - authQuery.setUsername(getConfiguration().getUser()); - authQuery.setPassword(getConfiguration().getPasswd()); - authQuery.setResource(getConfiguration().getResource()); - authQuery.setStreamId(m_streamId); - authQuery.setUsePlainText(plainText); - m_nonSASLAuthId = authQuery.getId(); - sendPacket(authQuery); -} - -void QXmppStream::sendAuthPlain() -{ - QByteArray data = ""; - QString userPass('\0' + getConfiguration().getUser() + - '\0' + getConfiguration().getPasswd()); - data += userPass.toUtf8().toBase64(); - data += ""; - sendToServer(data); -} - -void QXmppStream::sendAuthDigestMD5() -{ - QByteArray packet = ""; - sendToServer(packet); -} - -// challenge is BASE64 encoded string -void QXmppStream::sendAuthDigestMD5Response(const QString& challenge) -{ - QByteArray ba = QByteArray::fromBase64(challenge.toUtf8()); - - //log(ba); - - ba.replace('"', QString("")); - QList list = ba.split(','); - - QMap map; - - QList list2; - for(int i = 0; i < list.count(); ++i) - { - list2 = list.at(i).split('='); - if(list2.count() == 2) - map[list2.at(0).trimmed()] = list2.at(1).trimmed(); - else - log(QString("Invalid challenge send")); - } - - QByteArray user = getConfiguration().getUser().toUtf8(); - QByteArray passwd = getConfiguration().getPasswd().toUtf8(); - QByteArray domain = getConfiguration().getDomain().toUtf8(); - QByteArray realm; - if(map.contains("realm")) - realm = map["realm"]; - - QByteArray response; - - // First challenge - if(map.contains("nonce")) - { - QByteArray cnonce(32, 'm'); - for(int n = 0; n < cnonce.size(); ++n) - cnonce[n] = (char)(256.0*qrand()/(RAND_MAX+1.0)); - - QByteArray nc = "00000001"; - QByteArray digest_uri = "xmpp/" + domain; - - QByteArray a1 = user + ':' + realm + ':' + passwd; - QByteArray ha1 = QCryptographicHash::hash(a1, QCryptographicHash::Md5); - ha1 += ':' + map["nonce"] + ':' + cnonce; - - if(map.contains("authzid")) - ha1 += ':' + map["authzid"]; - - QByteArray A1(ha1); - QByteArray A2 = "AUTHENTICATE:" + digest_uri; - QByteArray HA1 = QCryptographicHash::hash(A1, QCryptographicHash::Md5).toHex(); - QByteArray HA2 = QCryptographicHash::hash(A2, QCryptographicHash::Md5).toHex(); - QByteArray KD = HA1 + ':' + map["nonce"] + ':' + nc + ':' + cnonce + ':' - + "auth" + ':' + HA2; - QByteArray Z = QCryptographicHash::hash(KD, QCryptographicHash::Md5).toHex(); - - response += "username=\"" + user + "\","; - - if(!realm.isEmpty()) - response += "realm=\"" + realm + "\","; - - response += "nonce=\"" + map["nonce"] + "\","; - response += "cnonce=\"" + cnonce + "\","; - response += "nc=" + nc + ","; - response += "qop=auth,"; - response += "digest-uri=\"" + digest_uri + "\","; - response += "response=" + Z + ","; - if(map.contains("authzid")) - response += "authzid=\"" + map["authzid"] + "\","; - response += "charset=utf-8"; - - log(response); - QByteArray packet = "" - + response.toBase64() + ""; - sendToServer(packet); - } - else if(map.contains("rspauth")) - { - sendToServer(""); - } - else - { - disconnect(); - log(QString("sendAuthDigestMD5Response: Invalid input")); - } -} - -void QXmppStream::sendBindIQ() -{ - QXmppBind bind(QXmppIq::Set); - bind.setResource(getConfiguration().getResource()); - m_bindId = bind.getId(); - sendPacket(bind); -} - -void QXmppStream::sendSessionIQ() -{ - QXmppSession session(QXmppIq::Set); - session.setTo(getConfiguration().getDomain()); - m_sessionId = session.getId(); - sendPacket(session); -} - -void QXmppStream::sendInitialPresence() -{ - if(m_client) - sendPacket(m_client->getClientPresence()); -} - -void QXmppStream::acceptSubscriptionRequest(const QString& from, bool accept) -{ - QXmppPresence presence; - presence.setTo(from); - if(accept) - presence.setType(QXmppPresence::Subscribed); - else - presence.setType(QXmppPresence::Unsubscribed); - - sendPacket(presence); -} - -void QXmppStream::sendSubscriptionRequest(const QString& to) -{ - if(to.isEmpty()) - return; - - QXmppPresence presence; - presence.setTo(to); - presence.setType(QXmppPresence::Subscribe); - sendPacket(presence); -} - -void QXmppStream::sendRosterRequest() -{ - QXmppRosterIq roster(QXmppIq::Get); - roster.setFrom(getConfiguration().getJid()); - m_rosterReqId = roster.getId(); - sendPacket(roster); -} - -void QXmppStream::disconnect() -{ - sendEndStream(); - m_socket.disconnectFromHost(); -} - -QXmppRoster& QXmppStream::getRoster() -{ - return m_roster; -} - -void QXmppStream::sendPacket(const QXmppPacket& packet) -{ - if(QXmppLogger::getLogger()->getLoggingType() != QXmppLogger::NONE) - { - QByteArray logPacket; - QXmlStreamWriter xmlStreamLog(&logPacket); - packet.toXml(&xmlStreamLog); - log("CLIENT: "+ logPacket); - } - - QXmlStreamWriter xmlStream(&m_socket); - packet.toXml(&xmlStream); -} - -void QXmppStream::processPresence(const QXmppPresence& presence) -{ - switch(presence.getType()) - { - case QXmppPresence::Error: - break; - case QXmppPresence::Available: - break; - case QXmppPresence::Unavailable: - break; - case QXmppPresence::Subscribe: - if(!presence.getFrom().isEmpty()) - { - if(getConfiguration().getAutoAcceptSubscriptions()) - acceptSubscriptionRequest(presence.getFrom()); - emit subscriptionRequestReceived(presence.getFrom()); - } - break; - case QXmppPresence::Unsubscribe: - break; - case QXmppPresence::Unsubscribed: - break; - case QXmppPresence::Probe: - break; - default: - break; - } - emit presenceReceived(presence); -} - -void QXmppStream::processMessage(const QXmppMessage& message) -{ - emit messageReceived(message); -} - -void QXmppStream::processIq(const QXmppIq& iq) -{ - emit iqReceived(iq); -} - -void QXmppStream::sendEndStream() -{ - sendToServer(streamRootElementEnd); -} - -void QXmppStream::processBindIq(const QXmppBind& bind) -{ - switch(bind.getType()) - { - case QXmppIq::Result: - if(!bind.getResource().isEmpty()) - getConfiguration().setResource(bind.getResource()); - if(m_sessionAvaliable) - sendSessionIQ(); - break; - default: - break; - } -} - -void QXmppStream::processRosterIq(const QXmppRosterIq& rosterIq) -{ - emit rosterIqReceived(rosterIq); - switch(rosterIq.getType()) - { - case QXmppIq::Set: - // when contact subscribes user...user sends 'subscribed' presence - // then after recieving following iq user requests contact for subscription - - // check thet "from" is newly added in the roster...and remove this ask thing...and do this for all items - if(rosterIq.getItems().at(0).getSubscriptionType() == - QXmppRosterIq::Item::From && rosterIq.getItems().at(0). - getSubscriptionStatus().isEmpty()) - sendSubscriptionRequest(rosterIq.getItems().at(0).getBareJid()); - break; - default: - break; - } -} - -QXmppStanza::Error QXmppStream::parseStanzaError(QDomElement & errorElement) -{ - QXmppStanza::Error error; - - if(errorElement.isNull()) - return error; - - QString type = errorElement.attribute("type"); - QString text; - QString cond; - QDomElement element = errorElement.firstChildElement(); - while(!element.isNull()) - { - if(element.tagName() == "text") - text = element.text(); - else if(element.namespaceURI() == ns_stanza) - { - cond = element.tagName(); - } - element = element.nextSiblingElement(); - } - - error.setConditionFromStr(cond); - error.setTypeFromStr(type); - error.setText(text); - return error; -} - -QAbstractSocket::SocketError QXmppStream::getSocketError() -{ - return m_socketError; -} - -QXmppVCardManager& QXmppStream::getVCardManager() -{ - return m_vCardManager; -} - -void QXmppStream::flushDataBuffer() -{ - m_dataBuffer.clear(); -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppStream.h" +#include "QXmppPacket.h" +#include "QXmppUtils.h" +#include "QXmppClient.h" +#include "QXmppRoster.h" +#include "QXmppPresence.h" +#include "QXmppIq.h" +#include "QXmppBind.h" +#include "QXmppSession.h" +#include "QXmppRosterIq.h" +#include "QXmppMessage.h" +#include "QXmppConstants.h" +#include "QXmppVCard.h" +#include "QXmppNonSASLAuth.h" +#include "QXmppInformationRequestResult.h" +#include "QXmppLogger.h" + +#include +#include +#include +#include +#include + +static const QByteArray streamRootElementStart = "\n"; +static const QByteArray streamRootElementEnd = ""; + +QXmppStream::QXmppStream(QXmppClient* client) + : QObject(client), m_client(client), m_roster(this), + m_sessionAvaliable(false), m_vCardManager(m_client) +{ + bool check = QObject::connect(&m_socket, SIGNAL(hostFound()), + this, SLOT(socketHostFound())); + Q_ASSERT(check); + check = QObject::connect(&m_socket, SIGNAL(connected()), + this, SLOT(socketConnected())); + Q_ASSERT(check); + check = QObject::connect(&m_socket, SIGNAL(disconnected()), + this, SLOT(socketDisconnected())); + Q_ASSERT(check); + check = QObject::connect(&m_socket, SIGNAL(readyRead()), + this, SLOT(socketReadReady())); + Q_ASSERT(check); + check = QObject::connect(&m_socket, SIGNAL(encrypted()), + this, SLOT(socketEncrypted())); + Q_ASSERT(check); + check = QObject::connect(&m_socket, + SIGNAL(sslErrors(const QList&)), this, + SLOT(socketSslErrors(const QList&))); + Q_ASSERT(check); + check = QObject::connect(&m_socket, + SIGNAL(error(QAbstractSocket::SocketError)), this, + SLOT(socketError(QAbstractSocket::SocketError))); + Q_ASSERT(check); + + check = QObject::connect(this, + SIGNAL(presenceReceived(const QXmppPresence&)), + &m_roster, + SLOT(presenceReceived(const QXmppPresence&))); + Q_ASSERT(check); + + check = QObject::connect(this, SIGNAL(rosterIqReceived(const QXmppRosterIq&)), + &m_roster, SLOT(rosterIqReceived(const QXmppRosterIq&))); + Q_ASSERT(check); + + check = QObject::connect(this, SIGNAL(vCardIqReceived(const QXmppVCard&)), + &m_vCardManager, SLOT(vCardIqReceived(const QXmppVCard&))); + Q_ASSERT(check); +} + +QXmppStream::~QXmppStream() +{ + +} + +QXmppConfiguration& QXmppStream::getConfiguration() +{ + return m_client->getConfiguration(); +} + +void QXmppStream::connect() +{ + log(QString("Connecting to: %1:%2").arg(getConfiguration(). + getHost()).arg(getConfiguration().getPort())); + + m_socket.setProxy(getConfiguration().getNetworkProxy()); + m_socket.connectToHost(getConfiguration(). + getHost(), getConfiguration().getPort()); +} + +void QXmppStream::socketSslErrors(const QList & error) +{ + log(QString("SSL errors")); + m_socket.ignoreSslErrors(); + for(int i = 0; i< error.count(); ++i) + log(error.at(i).errorString()); +} + +void QXmppStream::socketHostFound() +{ + log(QString("Host found")); + emit hostFound(); +} + +void QXmppStream::socketConnected() +{ + flushDataBuffer(); + log(QString("Connected")); + emit connected(); + sendStartStream(); +} + +void QXmppStream::socketDisconnected() +{ + flushDataBuffer(); + log(QString("Disconnected")); + emit disconnected(); +} + +void QXmppStream::socketEncrypted() +{ + log(QString("Encrypted")); + sendStartStream(); +} + +void QXmppStream::socketError(QAbstractSocket::SocketError ee) +{ + m_socketError = ee; + emit error(QXmppClient::SocketError); + log(QString("Socket error: " + m_socket.errorString())); +} + +void QXmppStream::socketReadReady() +{ + QByteArray data = m_socket.readAll(); + log("SERVER [COULD BE PARTIAL DATA]:" + data.left(20)); + parser(data); +} + +void QXmppStream::sendNonSASLAuthQuery( const QString &to ) +{ + QXmppNonSASLAuthTypesRequestIq authQuery; + authQuery.setTo(to); + authQuery.setUsername(getConfiguration().getUser()); + + sendPacket(authQuery); +} + +void QXmppStream::parser(const QByteArray& data) +{ + QDomDocument doc; + QByteArray completeXml; + + m_dataBuffer = m_dataBuffer + data; + + if(hasStartStreamElement(m_dataBuffer)) + { + completeXml = m_dataBuffer + streamRootElementEnd; + } + else if(hasEndStreamElement(data)) + { + completeXml = streamRootElementStart + m_dataBuffer; + } + else + { + completeXml = streamRootElementStart + m_dataBuffer + streamRootElementEnd; + } + + if(doc.setContent(completeXml, true)) + { + log("SERVER:" + m_dataBuffer); + flushDataBuffer(); + + QDomElement nodeRecv = doc.documentElement().firstChildElement(); + + if(nodeRecv.isNull()) + { + QDomElement streamElement = doc.documentElement(); + if(m_streamId.isEmpty()) + m_streamId = streamElement.attribute("id"); + if(m_XMPPVersion.isEmpty()) + { + m_XMPPVersion = streamElement.attribute("version"); + if(m_XMPPVersion.isEmpty()) + { + // no version specified, signals XMPP Version < 1.0. + // switch to old auth mechanism + sendNonSASLAuthQuery(doc.documentElement().attribute("from")); + } + } + } + else + { + //TODO: Make a login error here. + } + + while(!nodeRecv.isNull()) + { + QString ns = nodeRecv.namespaceURI(); + if(ns == ns_stream && nodeRecv.tagName() == "features") + { + bool nonSaslAvailable = nodeRecv.firstChildElement("auth"). + namespaceURI() == ns_authFeature; + bool saslAvailable = nodeRecv.firstChildElement("mechanisms"). + namespaceURI() == ns_sasl; + bool useSasl = getConfiguration().getUseSASLAuthentication(); + + if(nodeRecv.firstChildElement("starttls").namespaceURI() + == ns_tls && !m_socket.isEncrypted()) + { + if(nodeRecv.firstChildElement("starttls"). + firstChildElement().tagName() == "required") + { + // TLS is must from the server side + sendStartTls(); + return; + } + else + { + // TLS is optional from the server side + switch(getConfiguration().getStreamSecurityMode()) + { + case QXmppConfiguration::TLSEnabled: + case QXmppConfiguration::TLSRequired: + sendStartTls(); + return; + case QXmppConfiguration::TLSDisabled: + break; + } + } + } + else if(!m_socket.isEncrypted()) // TLS not supported by server + { + if(getConfiguration().getStreamSecurityMode() == + QXmppConfiguration::TLSRequired) + { + // disconnect as the for client TLS is compulsory but + // not available on the server + // + log(QString("Disconnecting as TLS not available at the server")); + disconnect(); + return; + } + } + + if((saslAvailable && nonSaslAvailable && !useSasl) || + (!saslAvailable && nonSaslAvailable)) + { + sendNonSASLAuthQuery(doc.documentElement().attribute("from")); + } + else if(saslAvailable) + { + // SASL Authentication + QDomElement element = nodeRecv.firstChildElement("mechanisms"); + log(QString("Mechanisms:")); + QDomElement subElement = element.firstChildElement(); + QStringList mechanisms; + while(!subElement.isNull()) + { + if(subElement.tagName() == "mechanism") + { + log(subElement.text()); + mechanisms << subElement.text(); + } + subElement = subElement.nextSiblingElement(); + } + + switch(getConfiguration().getSASLAuthMechanism()) + { + case QXmppConfiguration::SASLPlain: + if(mechanisms.contains("PLAIN")) + { + sendAuthPlain(); + break; + } + case QXmppConfiguration::SASLDigestMD5: + if(mechanisms.contains("DIGEST-MD5")) + { + sendAuthDigestMD5(); + break; + } + default: + log(QString("Desired SASL Auth mechanism not available trying the available ones")); + if(mechanisms.contains("DIGEST-MD5")) + sendAuthDigestMD5(); + else if(mechanisms.contains("PLAIN")) + sendAuthPlain(); + else + { + log(QString("SASL Auth mechanism not available")); + disconnect(); + return; + } + break; + } + } + + if(nodeRecv.firstChildElement("bind"). + namespaceURI() == ns_bind) + { + sendBindIQ(); + } + + if(nodeRecv.firstChildElement("session"). + namespaceURI() == ns_session) + { + m_sessionAvaliable = true; + } + } + else if(ns == ns_tls) + { + if(nodeRecv.tagName() == "proceed") + { + log(QString("Starting encryption")); + m_socket.startClientEncryption(); + return; + } + } + else if(ns == ns_sasl) + { + if(nodeRecv.tagName() == "success") + { + log(QString("Authenticated")); + sendStartStream(); + } + else if(nodeRecv.tagName() == "challenge") + { + sendAuthDigestMD5Response(nodeRecv.text()); + } + } + else if(ns == ns_client) + { + + if(nodeRecv.tagName() == "iq") + { + QDomElement element = nodeRecv.firstChildElement(); + QString id = nodeRecv.attribute("id"); + QString to = nodeRecv.attribute("to"); + QString from = nodeRecv.attribute("from"); + QString type = nodeRecv.attribute("type"); + if(type.isEmpty()) + qWarning("QXmppStream: iq type can't be empty"); + QXmppIq iqPacket; // to emit + + + QDomElement elemen = nodeRecv.firstChildElement("error"); + QXmppStanza::Error error = parseStanzaError(elemen); + + + if(id == m_sessionId) + { + // get back add configuration whether to send + // roster and intial presence in beginning + // process SessionIq + + // xmpp connection made + emit xmppConnected(); + + sendRosterRequest(); + sendInitialPresence(); + + QXmppBind session(type); + session.setId(id); + session.setTo(to); + session.setFrom(from); + iqPacket = session; + } + else if(id == m_bindId) + { + QXmppBind bind(type); + QString jid = nodeRecv.firstChildElement("bind"). + firstChildElement("jid").text(); + bind.setResource(jidToResource(jid)); + bind.setJid(jidToBareJid(jid)); + bind.setId(id); + bind.setTo(to); + bind.setFrom(from); + processBindIq(bind); + iqPacket = bind; + } + else if(nodeRecv.firstChildElement("query"). + namespaceURI() == ns_roster) + { + QDomElement itemElement = nodeRecv. + firstChildElement("query"). + firstChildElement("item"); + QXmppRosterIq rosterIq(nodeRecv.attribute("type")); + rosterIq.setId(id); + rosterIq.setTo(to); + rosterIq.setFrom(from); + while(!itemElement.isNull()) + { + QXmppRosterIq::Item item; + item.setName(itemElement.attribute("name")); + item.setBareJid(itemElement.attribute("jid")); + item.setSubscriptionTypeFromStr( + itemElement.attribute("subscription")); + item.setSubscriptionStatus( + itemElement.attribute("ask")); + item.addGroup( + itemElement.firstChildElement("group").firstChildElement().text()); + rosterIq.addItem(item); + itemElement = itemElement.nextSiblingElement(); + } + processRosterIq(rosterIq); + iqPacket = rosterIq; + } + // extensions + // vCard - XEP-0054 + // http://xmpp.org/extensions/xep-0054.html + else if(nodeRecv.firstChildElement("vCard"). + namespaceURI() == ns_vcard) + { + QXmppVCard vcardIq; + vcardIq.parse(nodeRecv); + emit vCardIqReceived(vcardIq); + iqPacket = vcardIq; + } + // XEP-0030 info query + else if(nodeRecv.firstChildElement("query"). + namespaceURI() == ns_disco_info && + type == "get") + { + QXmppInformationRequestResult qxmppFeatures; + qxmppFeatures.setId(id); + qxmppFeatures.setTo(from); + qxmppFeatures.setFrom(to); + sendPacket(qxmppFeatures); + } + else if(id == m_nonSASLAuthId && type == "result") + { + // successful Non-SASL Authentication + log(QString("Authenticated (Non-SASL)")); + + emit xmppConnected(); + + sendRosterRequest(); + sendInitialPresence(); + } + else if(nodeRecv.firstChildElement("query"). + namespaceURI() == ns_auth) + { + if(type == "result") + { + bool digest = !nodeRecv.firstChildElement("query"). + firstChildElement("digest").isNull(); + bool plain = !nodeRecv.firstChildElement("query"). + firstChildElement("password").isNull(); + bool plainText = false; + + if(plain && digest) + { + if(getConfiguration().getNonSASLAuthMechanism() == + QXmppConfiguration::NonSASLDigest) + plainText = false; + else + plainText = true; + } + else if(plain) + plainText = true; + else if(digest) + plainText = false; + else + { + //TODO Login error + return; + } + sendNonSASLAuth(plainText); + } + } + else // didn't understant the iq...reply with error + { + if(type != "result") // but not incase of result iqs + { + QXmppIq iq(QXmppIq::Error); + iq.setId(id); + iq.setTo(from); + iq.setFrom(to); + QXmppStanza::Error error(QXmppStanza::Error::Cancel, + QXmppStanza::Error::FeatureNotImplemented); + iq.setError(error); + sendPacket(iq); + } + } + + iqPacket.setError(error); + processIq(iqPacket); + } + else if(nodeRecv.tagName() == "presence") + { + QXmppPresence presence; + presence.setTypeFromStr(nodeRecv.attribute("type")); + presence.setFrom(nodeRecv.attribute("from")); + presence.setTo(nodeRecv.attribute("to")); + + QString statusText = nodeRecv. + firstChildElement("status").text(); + QString show = nodeRecv. + firstChildElement("show").text(); + int priority = nodeRecv. + firstChildElement("priority").text().toInt(); + QXmppPresence::Status status; + status.setTypeFromStr(show); + status.setStatusText(statusText); + status.setPriority(priority); + presence.setStatus(status); + + QDomElement errorElement = nodeRecv. + firstChildElement("error"); + if(!errorElement.isNull()) + { + QXmppStanza::Error error = + parseStanzaError(errorElement); + presence.setError(error); + } + + processPresence(presence); + } + else if(nodeRecv.tagName() == "message") + { + QString from = nodeRecv.attribute("from"); + QString to = nodeRecv.attribute("to"); + QString type = nodeRecv.attribute("type"); + QString body = unescapeString( + nodeRecv.firstChildElement("body").text()); + QString sub = unescapeString( + nodeRecv.firstChildElement("subject").text()); + QString thread = nodeRecv.firstChildElement("thread").text(); + QXmppMessage message(from, to, body, thread); + message.setSubject(sub); + message.setTypeFromStr(type); + + QDomElement errorElement = nodeRecv. + firstChildElement("error"); + if(!errorElement.isNull()) + { + QXmppStanza::Error error = parseStanzaError(errorElement); + message.setError(error); + } + processMessage(message); + } + } + nodeRecv = nodeRecv.nextSiblingElement(); + } + } + else + { + //wait for complete packet + } +} + + +void QXmppStream::sendStartStream() +{ + QByteArray data = ""); + sendToServer(data); +} + +void QXmppStream::sendToServer(const QByteArray& packet) +{ + log("CLIENT: " + packet); + m_socket.write( packet ); +} + +bool QXmppStream::hasStartStreamElement(const QByteArray& data) +{ + QString str(data); + QRegExp regex("(<\\?xml.*\\?>)?\\s*"); + regex.setMinimal(true); + if(str.contains(regex)) + return true; + else + return false; +} + +bool QXmppStream::hasEndStreamElement(const QByteArray& data) +{ + QString str(data); + QRegExp regex(""); + regex.setMinimal(true); + if(str.contains(regex)) + return true; + else + return false; +} + +void QXmppStream::sendStartTls() +{ + sendToServer(""); +} + +void QXmppStream::sendNonSASLAuth(bool plainText) +{ + QXmppNonSASLAuthIq authQuery; + authQuery.setUsername(getConfiguration().getUser()); + authQuery.setPassword(getConfiguration().getPasswd()); + authQuery.setResource(getConfiguration().getResource()); + authQuery.setStreamId(m_streamId); + authQuery.setUsePlainText(plainText); + m_nonSASLAuthId = authQuery.getId(); + sendPacket(authQuery); +} + +void QXmppStream::sendAuthPlain() +{ + QByteArray data = ""; + QString userPass('\0' + getConfiguration().getUser() + + '\0' + getConfiguration().getPasswd()); + data += userPass.toUtf8().toBase64(); + data += ""; + sendToServer(data); +} + +void QXmppStream::sendAuthDigestMD5() +{ + QByteArray packet = ""; + sendToServer(packet); +} + +// challenge is BASE64 encoded string +void QXmppStream::sendAuthDigestMD5Response(const QString& challenge) +{ + QByteArray ba = QByteArray::fromBase64(challenge.toUtf8()); + + //log(ba); + + ba.replace('"', QString("")); + QList list = ba.split(','); + + QMap map; + + QList list2; + for(int i = 0; i < list.count(); ++i) + { + list2 = list.at(i).split('='); + if(list2.count() == 2) + map[list2.at(0).trimmed()] = list2.at(1).trimmed(); + else + log(QString("Invalid challenge send")); + } + + QByteArray user = getConfiguration().getUser().toUtf8(); + QByteArray passwd = getConfiguration().getPasswd().toUtf8(); + QByteArray domain = getConfiguration().getDomain().toUtf8(); + QByteArray realm; + if(map.contains("realm")) + realm = map["realm"]; + + QByteArray response; + + // First challenge + if(map.contains("nonce")) + { + QByteArray cnonce(32, 'm'); + for(int n = 0; n < cnonce.size(); ++n) + cnonce[n] = (char)(256.0*qrand()/(RAND_MAX+1.0)); + + QByteArray nc = "00000001"; + QByteArray digest_uri = "xmpp/" + domain; + + QByteArray a1 = user + ':' + realm + ':' + passwd; + QByteArray ha1 = QCryptographicHash::hash(a1, QCryptographicHash::Md5); + ha1 += ':' + map["nonce"] + ':' + cnonce; + + if(map.contains("authzid")) + ha1 += ':' + map["authzid"]; + + QByteArray A1(ha1); + QByteArray A2 = "AUTHENTICATE:" + digest_uri; + QByteArray HA1 = QCryptographicHash::hash(A1, QCryptographicHash::Md5).toHex(); + QByteArray HA2 = QCryptographicHash::hash(A2, QCryptographicHash::Md5).toHex(); + QByteArray KD = HA1 + ':' + map["nonce"] + ':' + nc + ':' + cnonce + ':' + + "auth" + ':' + HA2; + QByteArray Z = QCryptographicHash::hash(KD, QCryptographicHash::Md5).toHex(); + + response += "username=\"" + user + "\","; + + if(!realm.isEmpty()) + response += "realm=\"" + realm + "\","; + + response += "nonce=\"" + map["nonce"] + "\","; + response += "cnonce=\"" + cnonce + "\","; + response += "nc=" + nc + ","; + response += "qop=auth,"; + response += "digest-uri=\"" + digest_uri + "\","; + response += "response=" + Z + ","; + if(map.contains("authzid")) + response += "authzid=\"" + map["authzid"] + "\","; + response += "charset=utf-8"; + + log(response); + QByteArray packet = "" + + response.toBase64() + ""; + sendToServer(packet); + } + else if(map.contains("rspauth")) + { + sendToServer(""); + } + else + { + disconnect(); + log(QString("sendAuthDigestMD5Response: Invalid input")); + } +} + +void QXmppStream::sendBindIQ() +{ + QXmppBind bind(QXmppIq::Set); + bind.setResource(getConfiguration().getResource()); + m_bindId = bind.getId(); + sendPacket(bind); +} + +void QXmppStream::sendSessionIQ() +{ + QXmppSession session(QXmppIq::Set); + session.setTo(getConfiguration().getDomain()); + m_sessionId = session.getId(); + sendPacket(session); +} + +void QXmppStream::sendInitialPresence() +{ + if(m_client) + sendPacket(m_client->getClientPresence()); +} + +void QXmppStream::acceptSubscriptionRequest(const QString& from, bool accept) +{ + QXmppPresence presence; + presence.setTo(from); + if(accept) + presence.setType(QXmppPresence::Subscribed); + else + presence.setType(QXmppPresence::Unsubscribed); + + sendPacket(presence); +} + +void QXmppStream::sendSubscriptionRequest(const QString& to) +{ + if(to.isEmpty()) + return; + + QXmppPresence presence; + presence.setTo(to); + presence.setType(QXmppPresence::Subscribe); + sendPacket(presence); +} + +void QXmppStream::sendRosterRequest() +{ + QXmppRosterIq roster(QXmppIq::Get); + roster.setFrom(getConfiguration().getJid()); + m_rosterReqId = roster.getId(); + sendPacket(roster); +} + +void QXmppStream::disconnect() +{ + sendEndStream(); + m_socket.disconnectFromHost(); +} + +QXmppRoster& QXmppStream::getRoster() +{ + return m_roster; +} + +void QXmppStream::sendPacket(const QXmppPacket& packet) +{ + if(QXmppLogger::getLogger()->getLoggingType() != QXmppLogger::NONE) + { + QByteArray logPacket; + QXmlStreamWriter xmlStreamLog(&logPacket); + packet.toXml(&xmlStreamLog); + log("CLIENT: "+ logPacket); + } + + QXmlStreamWriter xmlStream(&m_socket); + packet.toXml(&xmlStream); +} + +void QXmppStream::processPresence(const QXmppPresence& presence) +{ + switch(presence.getType()) + { + case QXmppPresence::Error: + break; + case QXmppPresence::Available: + break; + case QXmppPresence::Unavailable: + break; + case QXmppPresence::Subscribe: + if(!presence.getFrom().isEmpty()) + { + if(getConfiguration().getAutoAcceptSubscriptions()) + acceptSubscriptionRequest(presence.getFrom()); + emit subscriptionRequestReceived(presence.getFrom()); + } + break; + case QXmppPresence::Unsubscribe: + break; + case QXmppPresence::Unsubscribed: + break; + case QXmppPresence::Probe: + break; + default: + break; + } + emit presenceReceived(presence); +} + +void QXmppStream::processMessage(const QXmppMessage& message) +{ + emit messageReceived(message); +} + +void QXmppStream::processIq(const QXmppIq& iq) +{ + emit iqReceived(iq); +} + +void QXmppStream::sendEndStream() +{ + sendToServer(streamRootElementEnd); +} + +void QXmppStream::processBindIq(const QXmppBind& bind) +{ + switch(bind.getType()) + { + case QXmppIq::Result: + if(!bind.getResource().isEmpty()) + getConfiguration().setResource(bind.getResource()); + if(m_sessionAvaliable) + sendSessionIQ(); + break; + default: + break; + } +} + +void QXmppStream::processRosterIq(const QXmppRosterIq& rosterIq) +{ + emit rosterIqReceived(rosterIq); + switch(rosterIq.getType()) + { + case QXmppIq::Set: + // when contact subscribes user...user sends 'subscribed' presence + // then after recieving following iq user requests contact for subscription + + // check thet "from" is newly added in the roster...and remove this ask thing...and do this for all items + if(rosterIq.getItems().at(0).getSubscriptionType() == + QXmppRosterIq::Item::From && rosterIq.getItems().at(0). + getSubscriptionStatus().isEmpty()) + sendSubscriptionRequest(rosterIq.getItems().at(0).getBareJid()); + break; + default: + break; + } +} + +QXmppStanza::Error QXmppStream::parseStanzaError(QDomElement & errorElement) +{ + QXmppStanza::Error error; + + if(errorElement.isNull()) + return error; + + QString type = errorElement.attribute("type"); + QString text; + QString cond; + QDomElement element = errorElement.firstChildElement(); + while(!element.isNull()) + { + if(element.tagName() == "text") + text = element.text(); + else if(element.namespaceURI() == ns_stanza) + { + cond = element.tagName(); + } + element = element.nextSiblingElement(); + } + + error.setConditionFromStr(cond); + error.setTypeFromStr(type); + error.setText(text); + return error; +} + +QAbstractSocket::SocketError QXmppStream::getSocketError() +{ + return m_socketError; +} + +QXmppVCardManager& QXmppStream::getVCardManager() +{ + return m_vCardManager; +} + +void QXmppStream::flushDataBuffer() +{ + m_dataBuffer.clear(); +} diff --git a/source/QXmppStream.h b/source/QXmppStream.h index b85f1204..05d18f80 100644 --- a/source/QXmppStream.h +++ b/source/QXmppStream.h @@ -1,141 +1,141 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPSTREAM_H -#define QXMPPSTREAM_H - -#include -#include -#include "QXmppConfiguration.h" -#include "QXmppRoster.h" -#include "QXmppStanza.h" -#include "QXmppVCardManager.h" - -class QDomElement; - -class QXmppRoster; -class QXmppClient; -class QXmppPacket; -class QXmppPresence; -class QXmppIq; -class QXmppBind; -class QXmppRosterIq; -class QXmppVCard; -class QXmppMessage; - -class QXmppStream : public QObject -{ - Q_OBJECT - -public: - QXmppStream(QXmppClient* client); - ~QXmppStream(); - void connect(); - void acceptSubscriptionRequest(const QString& from, bool accept = true); - void sendSubscriptionRequest(const QString& to); - void disconnect(); - QXmppRoster& getRoster(); - QXmppVCardManager& getVCardManager(); - void sendPacket(const QXmppPacket&); - - QAbstractSocket::SocketError getSocketError(); - -signals: - // socket host found - void hostFound(); - - // socket connected - void connected(); - - // socket disconnected - void disconnected(); - - // xmpp connected - void xmppConnected(); - - void error(QXmppClient::Error); - void subscriptionRequestReceived(const QString& from); - void presenceReceived(const QXmppPresence&); - void messageReceived(const QXmppMessage&); - void iqReceived(const QXmppIq&); - void rosterIqReceived(const QXmppRosterIq&); - void vCardIqReceived(const QXmppVCard&); - -private slots: - void socketHostFound(); - void socketReadReady(); - void socketEncrypted(); - void socketConnected(); - void socketDisconnected(); - void socketError(QAbstractSocket::SocketError); - void socketSslErrors(const QList&); - -private: - QXmppClient* m_client; // reverse pointer - QXmppRoster m_roster; - QString m_sessionId; - QString m_bindId; - QString m_rosterReqId; - QByteArray m_dataBuffer; - QSslSocket m_socket; - bool m_sessionAvaliable; - QAbstractSocket::SocketError m_socketError; - QString m_streamId; - QString m_nonSASLAuthId; - QString m_XMPPVersion; -// m_xmppStreamError; -// m_xmppStanzaError; - - - QXmppVCardManager m_vCardManager; - - QXmppConfiguration& getConfiguration(); - void parser(const QByteArray&); - void sendStartStream(); - void sendEndStream(); - void sendStartTls(); - void sendNonSASLAuth(bool); - void sendNonSASLAuthQuery( const QString &to ); - void sendAuthPlain(); - void sendAuthDigestMD5(); - void sendAuthDigestMD5Response(const QString& challenge); - void sendBindIQ(); - void sendSessionIQ(); - void sendInitialPresence(); - void sendRosterRequest(); - void sendToServer(const QByteArray&); - bool hasStartStreamElement(const QByteArray&); - bool hasEndStreamElement(const QByteArray&); - QXmppStanza::Error parseStanzaError(QDomElement & errorElement); - - void processPresence(const QXmppPresence&); - void processMessage(const QXmppMessage&); - void processIq(const QXmppIq&); - void processBindIq(const QXmppBind&); - void processRosterIq(const QXmppRosterIq&); - - void flushDataBuffer(); -}; - -#endif // QXMPPSTREAM_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPSTREAM_H +#define QXMPPSTREAM_H + +#include +#include +#include "QXmppConfiguration.h" +#include "QXmppRoster.h" +#include "QXmppStanza.h" +#include "QXmppVCardManager.h" + +class QDomElement; + +class QXmppRoster; +class QXmppClient; +class QXmppPacket; +class QXmppPresence; +class QXmppIq; +class QXmppBind; +class QXmppRosterIq; +class QXmppVCard; +class QXmppMessage; + +class QXmppStream : public QObject +{ + Q_OBJECT + +public: + QXmppStream(QXmppClient* client); + ~QXmppStream(); + void connect(); + void acceptSubscriptionRequest(const QString& from, bool accept = true); + void sendSubscriptionRequest(const QString& to); + void disconnect(); + QXmppRoster& getRoster(); + QXmppVCardManager& getVCardManager(); + void sendPacket(const QXmppPacket&); + + QAbstractSocket::SocketError getSocketError(); + +signals: + // socket host found + void hostFound(); + + // socket connected + void connected(); + + // socket disconnected + void disconnected(); + + // xmpp connected + void xmppConnected(); + + void error(QXmppClient::Error); + void subscriptionRequestReceived(const QString& from); + void presenceReceived(const QXmppPresence&); + void messageReceived(const QXmppMessage&); + void iqReceived(const QXmppIq&); + void rosterIqReceived(const QXmppRosterIq&); + void vCardIqReceived(const QXmppVCard&); + +private slots: + void socketHostFound(); + void socketReadReady(); + void socketEncrypted(); + void socketConnected(); + void socketDisconnected(); + void socketError(QAbstractSocket::SocketError); + void socketSslErrors(const QList&); + +private: + QXmppClient* m_client; // reverse pointer + QXmppRoster m_roster; + QString m_sessionId; + QString m_bindId; + QString m_rosterReqId; + QByteArray m_dataBuffer; + QSslSocket m_socket; + bool m_sessionAvaliable; + QAbstractSocket::SocketError m_socketError; + QString m_streamId; + QString m_nonSASLAuthId; + QString m_XMPPVersion; +// m_xmppStreamError; +// m_xmppStanzaError; + + + QXmppVCardManager m_vCardManager; + + QXmppConfiguration& getConfiguration(); + void parser(const QByteArray&); + void sendStartStream(); + void sendEndStream(); + void sendStartTls(); + void sendNonSASLAuth(bool); + void sendNonSASLAuthQuery( const QString &to ); + void sendAuthPlain(); + void sendAuthDigestMD5(); + void sendAuthDigestMD5Response(const QString& challenge); + void sendBindIQ(); + void sendSessionIQ(); + void sendInitialPresence(); + void sendRosterRequest(); + void sendToServer(const QByteArray&); + bool hasStartStreamElement(const QByteArray&); + bool hasEndStreamElement(const QByteArray&); + QXmppStanza::Error parseStanzaError(QDomElement & errorElement); + + void processPresence(const QXmppPresence&); + void processMessage(const QXmppMessage&); + void processIq(const QXmppIq&); + void processBindIq(const QXmppBind&); + void processRosterIq(const QXmppRosterIq&); + + void flushDataBuffer(); +}; + +#endif // QXMPPSTREAM_H diff --git a/source/QXmppUtils.cpp b/source/QXmppUtils.cpp index c4b50fe0..08c1543a 100644 --- a/source/QXmppUtils.cpp +++ b/source/QXmppUtils.cpp @@ -1,136 +1,136 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppUtils.h" -#include "QXmppLogger.h" -#include -#include -#include -#include -#include -#include - -QString jidToResource(const QString& jid) -{ - return jid.mid(jid.indexOf(QChar('/'))+1); -} - -QString jidToBareJid(const QString& jid) -{ - return jid.left(jid.indexOf(QChar('/'))); -} - -void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name, - const QString& value) -{ - if(!value.isEmpty()) - stream->writeAttribute(name,value); -} - -void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name, int value) -{ - stream->writeTextElement( name, QString::number(value)); -} - -void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name, - const QString& value) -{ - if(!value.isEmpty()) - stream->writeTextElement( name, value); - else - stream->writeEmptyElement(name); -} - -void log(const QString& str) -{ - QXmppLogger::getLogger()->log(str); -} - -void log(const QByteArray& str) -{ - QXmppLogger::getLogger()->log(str); -} - -QString escapeString(const QString& str) -{ - QString strOut = str; - strOut.replace(QChar('&'), "&"); - strOut.replace(QChar('<'), "<"); - strOut.replace(QChar('>'), ">"); - strOut.replace(QChar('"'), """); - return strOut; -} - -QString unescapeString(const QString& str) -{ - QString strOut = str; - strOut.replace("<", QChar('<')); - strOut.replace(">", QChar('>')); - strOut.replace(""", QChar('"')); - strOut.replace("&", QChar('&')); - return strOut; -} - -QString getImageType(const QByteArray& image) -{ - QBuffer buffer; - buffer.setData(image); - buffer.open(QIODevice::ReadOnly); - QString format = QImageReader::imageFormat(&buffer); - - if(format.toUpper() == "PNG") - return "image/png"; - else if(format.toUpper() == "MNG") - return "video/x-mng"; - else if(format.toUpper() == "GIF") - return "image/gif"; - else if(format.toUpper() == "BMP") - return "image/bmp"; - else if(format.toUpper() == "XPM") - return "image/x-xpm"; - else if(format.toUpper() == "SVG") - return "image/svg+xml"; - else if(format.toUpper() == "JPEG") - return "image/jpeg"; - - return "image/unknown"; -} - -QString getImageHash(const QByteArray& image) -{ - if(image.isEmpty()) - return ""; - else - return QString(QCryptographicHash::hash(image, - QCryptographicHash::Sha1).toHex()); -} - -QImage getImageFromByteArray(const QByteArray& image) -{ - QBuffer buffer; - buffer.setData(image); - buffer.open(QIODevice::ReadOnly); - QImageReader imageReader(&buffer); - return imageReader.read(); -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppUtils.h" +#include "QXmppLogger.h" +#include +#include +#include +#include +#include +#include + +QString jidToResource(const QString& jid) +{ + return jid.mid(jid.indexOf(QChar('/'))+1); +} + +QString jidToBareJid(const QString& jid) +{ + return jid.left(jid.indexOf(QChar('/'))); +} + +void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name, + const QString& value) +{ + if(!value.isEmpty()) + stream->writeAttribute(name,value); +} + +void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name, int value) +{ + stream->writeTextElement( name, QString::number(value)); +} + +void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name, + const QString& value) +{ + if(!value.isEmpty()) + stream->writeTextElement( name, value); + else + stream->writeEmptyElement(name); +} + +void log(const QString& str) +{ + QXmppLogger::getLogger()->log(str); +} + +void log(const QByteArray& str) +{ + QXmppLogger::getLogger()->log(str); +} + +QString escapeString(const QString& str) +{ + QString strOut = str; + strOut.replace(QChar('&'), "&"); + strOut.replace(QChar('<'), "<"); + strOut.replace(QChar('>'), ">"); + strOut.replace(QChar('"'), """); + return strOut; +} + +QString unescapeString(const QString& str) +{ + QString strOut = str; + strOut.replace("<", QChar('<')); + strOut.replace(">", QChar('>')); + strOut.replace(""", QChar('"')); + strOut.replace("&", QChar('&')); + return strOut; +} + +QString getImageType(const QByteArray& image) +{ + QBuffer buffer; + buffer.setData(image); + buffer.open(QIODevice::ReadOnly); + QString format = QImageReader::imageFormat(&buffer); + + if(format.toUpper() == "PNG") + return "image/png"; + else if(format.toUpper() == "MNG") + return "video/x-mng"; + else if(format.toUpper() == "GIF") + return "image/gif"; + else if(format.toUpper() == "BMP") + return "image/bmp"; + else if(format.toUpper() == "XPM") + return "image/x-xpm"; + else if(format.toUpper() == "SVG") + return "image/svg+xml"; + else if(format.toUpper() == "JPEG") + return "image/jpeg"; + + return "image/unknown"; +} + +QString getImageHash(const QByteArray& image) +{ + if(image.isEmpty()) + return ""; + else + return QString(QCryptographicHash::hash(image, + QCryptographicHash::Sha1).toHex()); +} + +QImage getImageFromByteArray(const QByteArray& image) +{ + QBuffer buffer; + buffer.setData(image); + buffer.open(QIODevice::ReadOnly); + QImageReader imageReader(&buffer); + return imageReader.read(); +} diff --git a/source/QXmppUtils.h b/source/QXmppUtils.h index 146057c7..f9a7cdfd 100644 --- a/source/QXmppUtils.h +++ b/source/QXmppUtils.h @@ -1,54 +1,59 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPUTILS_H -#define QXMPPUTILS_H - - -class QXmlStreamWriter; -class QByteArray; -class QString; -class QImage; - -QString jidToResource(const QString& jid); -QString jidToBareJid(const QString& jid); - -void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name, - const QString& value); -void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name, - const QString& value); -void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name, - int value); - -void log(const QString& str); -void log(const QByteArray& str); - -QString escapeString(const QString& str); -QString unescapeString(const QString& str); - -QString getImageType(const QByteArray& image); -QString getImageHash(const QByteArray& image); -QImage getImageFromByteArray(const QByteArray& image); - -#endif // QXMPPUTILS_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPUTILS_H +#define QXMPPUTILS_H + + +// forward declarations of QXmlStream* classes will not work on Mac, we need to +// include the whole header. +// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html +// for an explanation. +#include + +class QByteArray; +class QString; +class QImage; + +QString jidToResource(const QString& jid); +QString jidToBareJid(const QString& jid); + +void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name, + const QString& value); +void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name, + const QString& value); +void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name, + int value); + +void log(const QString& str); +void log(const QByteArray& str); + +QString escapeString(const QString& str); +QString unescapeString(const QString& str); + +QString getImageType(const QByteArray& image); +QString getImageHash(const QByteArray& image); +QImage getImageFromByteArray(const QByteArray& image); + +#endif // QXMPPUTILS_H diff --git a/source/QXmppVCard.cpp b/source/QXmppVCard.cpp index 8a5f4b0f..d3c71df1 100644 --- a/source/QXmppVCard.cpp +++ b/source/QXmppVCard.cpp @@ -1,108 +1,108 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppVCard.h" -#include "QXmppUtils.h" -#include "QXmppConstants.h" - -#include -#include -#include - -QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get) -{ - // for self jid should be empty - setTo(jid); -} - -QString QXmppVCard::getFullName() const -{ - return m_fullName; -} - -void QXmppVCard::setFullName(const QString& str) -{ - m_fullName = str; -} - -const QByteArray& QXmppVCard::getPhoto() const -{ - return m_photo; -} - -void QXmppVCard::setPhoto(const QByteArray& photo) -{ - m_photo = photo; -} - -void QXmppVCard::setPhoto(const QImage& image) -{ - QByteArray ba; - QBuffer buffer(&ba); - buffer.open(QIODevice::WriteOnly); - image.save(&buffer, "PNG"); - m_photo = ba; -} - -void QXmppVCard::parse(const QDomElement& nodeRecv) -{ - QString id = nodeRecv.attribute("id"); - QString to = nodeRecv.attribute("to"); - QString from = nodeRecv.attribute("from"); - QString type = nodeRecv.attribute("type"); - setTypeFromStr(type); - setId(id); - setTo(to); - setFrom(from); - - // vCard - setFullName(nodeRecv.firstChildElement("vCard"). - firstChildElement("FN").text()); - QByteArray base64data = nodeRecv.firstChildElement("vCard"). - firstChildElement("PHOTO"). - firstChildElement("BINVAL").text().toAscii(); - setPhoto(QByteArray::fromBase64(base64data)); -} - -void QXmppVCard::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("vCard"); - helperToXmlAddAttribute(writer,"xmlns", ns_vcard); - helperToXmlAddTextElement(writer, "FN", getFullName()); - - if(!getPhoto().isEmpty()) - { - writer->writeStartElement("PHOTO"); - helperToXmlAddTextElement(writer, "TYPE", getImageType(getPhoto())); - helperToXmlAddTextElement(writer, "BINVAL", getPhoto().toBase64()); - writer->writeEndElement(); - } - - writer->writeEndElement(); -} - -QImage QXmppVCard::getPhotoAsImage() const -{ - return getImageFromByteArray(getPhoto()); -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppVCard.h" +#include "QXmppUtils.h" +#include "QXmppConstants.h" + +#include +#include +#include + +QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get) +{ + // for self jid should be empty + setTo(jid); +} + +QString QXmppVCard::getFullName() const +{ + return m_fullName; +} + +void QXmppVCard::setFullName(const QString& str) +{ + m_fullName = str; +} + +const QByteArray& QXmppVCard::getPhoto() const +{ + return m_photo; +} + +void QXmppVCard::setPhoto(const QByteArray& photo) +{ + m_photo = photo; +} + +void QXmppVCard::setPhoto(const QImage& image) +{ + QByteArray ba; + QBuffer buffer(&ba); + buffer.open(QIODevice::WriteOnly); + image.save(&buffer, "PNG"); + m_photo = ba; +} + +void QXmppVCard::parse(const QDomElement& nodeRecv) +{ + QString id = nodeRecv.attribute("id"); + QString to = nodeRecv.attribute("to"); + QString from = nodeRecv.attribute("from"); + QString type = nodeRecv.attribute("type"); + setTypeFromStr(type); + setId(id); + setTo(to); + setFrom(from); + + // vCard + setFullName(nodeRecv.firstChildElement("vCard"). + firstChildElement("FN").text()); + QByteArray base64data = nodeRecv.firstChildElement("vCard"). + firstChildElement("PHOTO"). + firstChildElement("BINVAL").text().toAscii(); + setPhoto(QByteArray::fromBase64(base64data)); +} + +void QXmppVCard::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("vCard"); + helperToXmlAddAttribute(writer,"xmlns", ns_vcard); + helperToXmlAddTextElement(writer, "FN", getFullName()); + + if(!getPhoto().isEmpty()) + { + writer->writeStartElement("PHOTO"); + helperToXmlAddTextElement(writer, "TYPE", getImageType(getPhoto())); + helperToXmlAddTextElement(writer, "BINVAL", getPhoto().toBase64()); + writer->writeEndElement(); + } + + writer->writeEndElement(); +} + +QImage QXmppVCard::getPhotoAsImage() const +{ + return getImageFromByteArray(getPhoto()); +} diff --git a/source/QXmppVCard.h b/source/QXmppVCard.h index 20a26fcb..bef9d5a9 100644 --- a/source/QXmppVCard.h +++ b/source/QXmppVCard.h @@ -1,58 +1,58 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPVCARD_H -#define QXMPPVCARD_H - -#include "QXmppIq.h" -#include -#include - -class QImage; - -class QXmppVCard : public QXmppIq -{ -public: - QXmppVCard(const QString& bareJid = ""); - - QString getFullName() const; - void setFullName(const QString&); - - QImage getPhotoAsImage() const; - const QByteArray& getPhoto() const; - void setPhoto(const QByteArray&); - void setPhoto(const QImage&); - - void parse(const QDomElement&); - -private: - void toXmlElementFromChild(QXmlStreamWriter *writer) const; - - QString m_fullName; - - // not as 64 base - QByteArray m_photo; -}; - -#endif // QXMPPVCARD_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPVCARD_H +#define QXMPPVCARD_H + +#include "QXmppIq.h" +#include +#include + +class QImage; + +class QXmppVCard : public QXmppIq +{ +public: + QXmppVCard(const QString& bareJid = ""); + + QString getFullName() const; + void setFullName(const QString&); + + QImage getPhotoAsImage() const; + const QByteArray& getPhoto() const; + void setPhoto(const QByteArray&); + void setPhoto(const QImage&); + + void parse(const QDomElement&); + +private: + void toXmlElementFromChild(QXmlStreamWriter *writer) const; + + QString m_fullName; + + // not as 64 base + QByteArray m_photo; +}; + +#endif // QXMPPVCARD_H diff --git a/source/QXmppVCardManager.cpp b/source/QXmppVCardManager.cpp index 0240f094..845959f7 100644 --- a/source/QXmppVCardManager.cpp +++ b/source/QXmppVCardManager.cpp @@ -1,43 +1,43 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppVCardManager.h" -#include "QXmppUtils.h" - -QXmppVCardManager::QXmppVCardManager(QXmppClient* client) : - QObject(client), m_client(client) -{ -} - -void QXmppVCardManager::requestVCard(const QString& jid) -{ - QXmppVCard vcardIq(jid); - m_client->sendPacket(vcardIq); -} - -void QXmppVCardManager::vCardIqReceived(const QXmppVCard& vcard) -{ - emit vCardReceived(vcard); -} - +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppVCardManager.h" +#include "QXmppUtils.h" + +QXmppVCardManager::QXmppVCardManager(QXmppClient* client) : + QObject(client), m_client(client) +{ +} + +void QXmppVCardManager::requestVCard(const QString& jid) +{ + QXmppVCard vcardIq(jid); + m_client->sendPacket(vcardIq); +} + +void QXmppVCardManager::vCardIqReceived(const QXmppVCard& vcard) +{ + emit vCardReceived(vcard); +} + diff --git a/source/QXmppVCardManager.h b/source/QXmppVCardManager.h index ac078fc7..f2a84658 100644 --- a/source/QXmppVCardManager.h +++ b/source/QXmppVCardManager.h @@ -1,51 +1,51 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPVCARDMANAGER_H -#define QXMPPVCARDMANAGER_H - -#include -#include "QXmppClient.h" -#include "QXmppVCard.h" - -class QXmppVCardManager : public QObject -{ - Q_OBJECT - -public: - QXmppVCardManager(QXmppClient* client); - void requestVCard(const QString& bareJid = ""); - -signals: - void vCardReceived(const QXmppVCard&); - -private slots: - void vCardIqReceived(const QXmppVCard&); - -private: - // reference to to client object (no ownership) - QXmppClient* m_client; -}; - -#endif // QXMPPVCARDMANAGER_H +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPVCARDMANAGER_H +#define QXMPPVCARDMANAGER_H + +#include +#include "QXmppClient.h" +#include "QXmppVCard.h" + +class QXmppVCardManager : public QObject +{ + Q_OBJECT + +public: + QXmppVCardManager(QXmppClient* client); + void requestVCard(const QString& bareJid = ""); + +signals: + void vCardReceived(const QXmppVCard&); + +private slots: + void vCardIqReceived(const QXmppVCard&); + +private: + // reference to to client object (no ownership) + QXmppClient* m_client; +}; + +#endif // QXMPPVCARDMANAGER_H diff --git a/source/source.pro b/source/source.pro index cbc98332..f6623546 100644 --- a/source/source.pro +++ b/source/source.pro @@ -1,51 +1,58 @@ -TEMPLATE = lib -QT += network \ - xml -CONFIG += staticlib \ - debug_and_release -CONFIG(debug, debug|release):TARGET = QXmppClient_d -else:TARGET = QXmppClient - -# Header files -HEADERS += QXmppUtils.h \ - QXmppBind.h \ - QXmppClient.h \ - QXmppConfiguration.h \ - QXmppConstants.h \ - QXmppIq.h \ - QXmppMessage.h \ - QXmppPacket.h \ - QXmppPresence.h \ - QXmppRoster.h \ - QXmppRosterIq.h \ - QXmppSession.h \ - QXmppStanza.h \ - QXmppStream.h \ - QXmppLogger.h \ - QXmppReconnectionManager.h \ - QXmppVCardManager.h \ - QXmppVCard.h \ - QXmppNonSASLAuth.h \ - QXmppInformationRequestResult.h - -# Source files -SOURCES += QXmppUtils.cpp \ - QXmppBind.cpp \ - QXmppClient.cpp \ - QXmppConfiguration.cpp \ - QXmppConstants.cpp \ - QXmppIq.cpp \ - QXmppMessage.cpp \ - QXmppPacket.cpp \ - QXmppPresence.cpp \ - QXmppRoster.cpp \ - QXmppRosterIq.cpp \ - QXmppSession.cpp \ - QXmppStanza.cpp \ - QXmppStream.cpp \ - QXmppLogger.cpp \ - QXmppReconnectionManager.cpp \ - QXmppVCardManager.cpp \ - QXmppVCard.cpp \ - QXmppNonSASLAuth.cpp \ - QXmppInformationRequestResult.cpp +TEMPLATE = lib +QT += network \ + xml + +CONFIG += staticlib \ + debug_and_release + +CONFIG(debug, debug|release){ + win32:TARGET = QXmppClient_d + !win32:TARGET = debug\QXmppClient_d +}else{ + win32:TARGET = QXmppClient + !win32:TARGET = release\QXmppClient +} + +# Header files +HEADERS += QXmppUtils.h \ + QXmppBind.h \ + QXmppClient.h \ + QXmppConfiguration.h \ + QXmppConstants.h \ + QXmppIq.h \ + QXmppMessage.h \ + QXmppPacket.h \ + QXmppPresence.h \ + QXmppRoster.h \ + QXmppRosterIq.h \ + QXmppSession.h \ + QXmppStanza.h \ + QXmppStream.h \ + QXmppLogger.h \ + QXmppReconnectionManager.h \ + QXmppVCardManager.h \ + QXmppVCard.h \ + QXmppNonSASLAuth.h \ + QXmppInformationRequestResult.h + +# Source files +SOURCES += QXmppUtils.cpp \ + QXmppBind.cpp \ + QXmppClient.cpp \ + QXmppConfiguration.cpp \ + QXmppConstants.cpp \ + QXmppIq.cpp \ + QXmppMessage.cpp \ + QXmppPacket.cpp \ + QXmppPresence.cpp \ + QXmppRoster.cpp \ + QXmppRosterIq.cpp \ + QXmppSession.cpp \ + QXmppStanza.cpp \ + QXmppStream.cpp \ + QXmppLogger.cpp \ + QXmppReconnectionManager.cpp \ + QXmppVCardManager.cpp \ + QXmppVCard.cpp \ + QXmppNonSASLAuth.cpp \ + QXmppInformationRequestResult.cpp -- cgit v1.2.3