From 7928a07468cf277ea5519a386728eca1b19c1eff Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Wed, 1 Sep 2010 12:57:59 +0000 Subject: change className --- src/QXmppOutgoingClient.cpp | 4 +- src/QXmppOutgoingServer.cpp | 4 +- src/QXmppServiceInfo.cpp | 208 -------------------------------------------- src/QXmppServiceInfo.h | 64 -------------- src/QXmppSrvLookup.cpp | 208 ++++++++++++++++++++++++++++++++++++++++++++ src/QXmppSrvLookup.h | 64 ++++++++++++++ src/src.pro | 4 +- 7 files changed, 278 insertions(+), 278 deletions(-) delete mode 100644 src/QXmppServiceInfo.cpp delete mode 100644 src/QXmppServiceInfo.h create mode 100644 src/QXmppSrvLookup.cpp create mode 100644 src/QXmppSrvLookup.h (limited to 'src') diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp index 6cf78d64..a62ef3c2 100644 --- a/src/QXmppOutgoingClient.cpp +++ b/src/QXmppOutgoingClient.cpp @@ -32,7 +32,7 @@ #include "QXmppPacket.h" #include "QXmppPresence.h" #include "QXmppOutgoingClient.h" -#include "QXmppServiceInfo.h" +#include "QXmppSrvLookup.h" #include "QXmppStreamFeatures.h" #include "QXmppNonSASLAuth.h" #include "QXmppSaslAuth.h" @@ -161,7 +161,7 @@ void QXmppOutgoingClient::connectToHost() if (host.isEmpty() || !port) { debug(QString("Looking up server for domain %1").arg(domain)); - QXmppServiceInfo serviceInfo = QXmppServiceInfo::fromName("_xmpp-client._tcp." + domain); + QXmppSrvLookup serviceInfo = QXmppSrvLookup::fromName("_xmpp-client._tcp." + domain); if (!serviceInfo.records().isEmpty()) { // take the first returned record diff --git a/src/QXmppOutgoingServer.cpp b/src/QXmppOutgoingServer.cpp index 41c52219..90fffcc3 100644 --- a/src/QXmppOutgoingServer.cpp +++ b/src/QXmppOutgoingServer.cpp @@ -28,7 +28,7 @@ #include "QXmppConstants.h" #include "QXmppDialback.h" #include "QXmppOutgoingServer.h" -#include "QXmppServiceInfo.h" +#include "QXmppSrvLookup.h" #include "QXmppStreamFeatures.h" #include "QXmppUtils.h" @@ -82,7 +82,7 @@ void QXmppOutgoingServer::connectToHost(const QString &domain) // lookup server for domain debug(QString("Looking up server for domain %1").arg(domain)); - QXmppServiceInfo serviceInfo = QXmppServiceInfo::fromName("_xmpp-server._tcp." + domain); + QXmppSrvLookup serviceInfo = QXmppSrvLookup::fromName("_xmpp-server._tcp." + domain); if (!serviceInfo.records().isEmpty()) { // take the first returned record diff --git a/src/QXmppServiceInfo.cpp b/src/QXmppServiceInfo.cpp deleted file mode 100644 index ab43dc1b..00000000 --- a/src/QXmppServiceInfo.cpp +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (C) 2008-2010 The QXmpp developers - * - * Author: - * Jeremy Lainé - * - * 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 - -#include "QXmppServiceInfo.h" - -#ifdef Q_OS_WIN -#include -#include -#else -#include -#include -#include -#include -#include -#include -#endif - -/// Constructs an empty service record object. -/// - -QXmppServiceInfo::SrvRecord::SrvRecord() - : host_port(0) -{ -} - -/// Returns host name for this service record. -/// - -QString QXmppServiceInfo::SrvRecord::hostName() const -{ - return host_name; -} - -/// Sets the host name for this service record. -/// -/// \param hostName - -void QXmppServiceInfo::SrvRecord::setHostName(const QString &hostName) -{ - host_name = hostName; -} - -/// Returns the port for this service record. -/// - -quint16 QXmppServiceInfo::SrvRecord::port() const -{ - return host_port; -} - -/// Sets the port for this service record. -/// -/// \param port - -void QXmppServiceInfo::SrvRecord::setPort(quint16 port) -{ - host_port = port; -} - -/// If the lookup failed, this function returns a human readable description of the error. -/// - -QString QXmppServiceInfo::errorString() const -{ - return m_errorString; -} - -/// Returns the list of records associated with this service. -/// -QList QXmppServiceInfo::records() const -{ - return m_records; -} - -/// Perform a DNS lookup for an SRV entry. -/// -/// Returns a QXmppServiceInfo object containing the found records. -/// -/// \param dname - -QXmppServiceInfo QXmppServiceInfo::fromName(const QString &dname) -{ - QXmppServiceInfo result; - -#ifdef Q_OS_WIN - PDNS_RECORD records, ptr; - - /* perform DNS query */ - if (DnsQuery_UTF8(dname.toUtf8(), DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &records, NULL) != ERROR_SUCCESS) - { - result.m_errorString = QLatin1String("DnsQuery_UTF8 failed"); - return result; - } - - /* extract results */ - for (ptr = records; ptr != NULL; ptr = ptr->pNext) - { - if ((ptr->wType == DNS_TYPE_SRV) && !strcmp((char*)ptr->pName, dname.toUtf8())) - { - QXmppServiceInfo::SrvRecord record; - record.setHostName(QString::fromUtf8((char*)ptr->Data.Srv.pNameTarget)); - record.setPort(ptr->Data.Srv.wPort); - result.m_records.append(record); - } - } - - DnsRecordListFree(records, DnsFreeRecordList); -#else - unsigned char response[PACKETSZ]; - int responseLength, answerCount, answerIndex; - - /* explicitly call res_init in case config changed */ - res_init(); - - /* perform DNS query */ - memset(response, 0, sizeof(response)); - responseLength = res_query(dname.toAscii(), C_IN, T_SRV, response, sizeof(response)); - if (responseLength < int(sizeof(HEADER))) - { - result.m_errorString = QString("res_query failed: %1").arg(hstrerror(h_errno)); - return result; - } - - /* check the response header */ - HEADER *header = (HEADER*)response; - if (header->rcode != NOERROR || !(answerCount = ntohs(header->ancount))) - { - result.m_errorString = QLatin1String("res_query returned an error"); - return result; - } - - /* skip the query */ - char host[PACKETSZ], answer[PACKETSZ]; - unsigned char *p = response + sizeof(HEADER); - int status = dn_expand(response, response + responseLength, p, host, sizeof(host)); - if (status < 0) - { - result.m_errorString = QLatin1String("dn_expand failed"); - return result; - } - p += status + 4; - - /* parse answers */ - answerIndex = 0; - while ((p < response + responseLength) && (answerIndex < answerCount)) - { - int type, klass, ttl, size; - status = dn_expand(response, response + responseLength, p, host, sizeof(host)); - if (status < 0) - { - result.m_errorString = QLatin1String("dn_expand failed"); - return result; - } - - p += status; - type = (p[0] << 8) | p[1]; - p += 2; - klass = (p[0] << 8) | p[1]; - p += 2; - ttl = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; - p += 4; - size = (p[0] << 8) | p[1]; - p += 2; - - if (type == T_SRV) - { - quint16 port = (p[4] << 8) | p[5]; - status = dn_expand(response, response + responseLength, p + 6, answer, sizeof(answer)); - if (status < 0) - { - result.m_errorString = QLatin1String("dn_expand failed"); - return result; - } - QXmppServiceInfo::SrvRecord record; - record.setHostName(answer); - record.setPort(port); - result.m_records.append(record); - } else { - qWarning("Unexpected DNS answer type"); - } - p += size; - answerIndex++; - } -#endif - return result; -} diff --git a/src/QXmppServiceInfo.h b/src/QXmppServiceInfo.h deleted file mode 100644 index 0b752371..00000000 --- a/src/QXmppServiceInfo.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2008-2010 The QXmpp developers - * - * Author: - * Jeremy Lainé - * - * 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 QXMPPSERVICEINFO_H -#define QXMPPSERVICEINFO_H - -#include -#include - -/// \brief The QXmppServiceInfo class provides static methods for DNS SRV lookups. -/// - -class QXmppServiceInfo -{ -public: - /// \brief Represents a DNS SRV record - /// - class SrvRecord - { - public: - SrvRecord(); - - QString hostName() const; - void setHostName(const QString &hostName); - - quint16 port() const; - void setPort(quint16 port); - - private: - QString host_name; - quint16 host_port; - }; - - QString errorString() const; - QList records() const; - - static QXmppServiceInfo fromName(const QString &dname); - -private: - QString m_errorString; - QList m_records; -}; - -#endif diff --git a/src/QXmppSrvLookup.cpp b/src/QXmppSrvLookup.cpp new file mode 100644 index 00000000..68b19595 --- /dev/null +++ b/src/QXmppSrvLookup.cpp @@ -0,0 +1,208 @@ +/* + * Copyright (C) 2008-2010 The QXmpp developers + * + * Author: + * Jeremy Lainé + * + * 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 + +#include "QXmppSrvLookup.h" + +#ifdef Q_OS_WIN +#include +#include +#else +#include +#include +#include +#include +#include +#include +#endif + +/// Constructs an empty service record object. +/// + +QXmppSrvLookup::SrvRecord::SrvRecord() + : host_port(0) +{ +} + +/// Returns host name for this service record. +/// + +QString QXmppSrvLookup::SrvRecord::hostName() const +{ + return host_name; +} + +/// Sets the host name for this service record. +/// +/// \param hostName + +void QXmppSrvLookup::SrvRecord::setHostName(const QString &hostName) +{ + host_name = hostName; +} + +/// Returns the port for this service record. +/// + +quint16 QXmppSrvLookup::SrvRecord::port() const +{ + return host_port; +} + +/// Sets the port for this service record. +/// +/// \param port + +void QXmppSrvLookup::SrvRecord::setPort(quint16 port) +{ + host_port = port; +} + +/// If the lookup failed, this function returns a human readable description of the error. +/// + +QString QXmppSrvLookup::errorString() const +{ + return m_errorString; +} + +/// Returns the list of records associated with this service. +/// +QList QXmppSrvLookup::records() const +{ + return m_records; +} + +/// Perform a DNS lookup for an SRV entry. +/// +/// Returns a QXmppSrvLookup object containing the found records. +/// +/// \param dname + +QXmppSrvLookup QXmppSrvLookup::fromName(const QString &dname) +{ + QXmppSrvLookup result; + +#ifdef Q_OS_WIN + PDNS_RECORD records, ptr; + + /* perform DNS query */ + if (DnsQuery_UTF8(dname.toUtf8(), DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &records, NULL) != ERROR_SUCCESS) + { + result.m_errorString = QLatin1String("DnsQuery_UTF8 failed"); + return result; + } + + /* extract results */ + for (ptr = records; ptr != NULL; ptr = ptr->pNext) + { + if ((ptr->wType == DNS_TYPE_SRV) && !strcmp((char*)ptr->pName, dname.toUtf8())) + { + QXmppSrvLookup::SrvRecord record; + record.setHostName(QString::fromUtf8((char*)ptr->Data.Srv.pNameTarget)); + record.setPort(ptr->Data.Srv.wPort); + result.m_records.append(record); + } + } + + DnsRecordListFree(records, DnsFreeRecordList); +#else + unsigned char response[PACKETSZ]; + int responseLength, answerCount, answerIndex; + + /* explicitly call res_init in case config changed */ + res_init(); + + /* perform DNS query */ + memset(response, 0, sizeof(response)); + responseLength = res_query(dname.toAscii(), C_IN, T_SRV, response, sizeof(response)); + if (responseLength < int(sizeof(HEADER))) + { + result.m_errorString = QString("res_query failed: %1").arg(hstrerror(h_errno)); + return result; + } + + /* check the response header */ + HEADER *header = (HEADER*)response; + if (header->rcode != NOERROR || !(answerCount = ntohs(header->ancount))) + { + result.m_errorString = QLatin1String("res_query returned an error"); + return result; + } + + /* skip the query */ + char host[PACKETSZ], answer[PACKETSZ]; + unsigned char *p = response + sizeof(HEADER); + int status = dn_expand(response, response + responseLength, p, host, sizeof(host)); + if (status < 0) + { + result.m_errorString = QLatin1String("dn_expand failed"); + return result; + } + p += status + 4; + + /* parse answers */ + answerIndex = 0; + while ((p < response + responseLength) && (answerIndex < answerCount)) + { + int type, klass, ttl, size; + status = dn_expand(response, response + responseLength, p, host, sizeof(host)); + if (status < 0) + { + result.m_errorString = QLatin1String("dn_expand failed"); + return result; + } + + p += status; + type = (p[0] << 8) | p[1]; + p += 2; + klass = (p[0] << 8) | p[1]; + p += 2; + ttl = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; + p += 4; + size = (p[0] << 8) | p[1]; + p += 2; + + if (type == T_SRV) + { + quint16 port = (p[4] << 8) | p[5]; + status = dn_expand(response, response + responseLength, p + 6, answer, sizeof(answer)); + if (status < 0) + { + result.m_errorString = QLatin1String("dn_expand failed"); + return result; + } + QXmppSrvLookup::SrvRecord record; + record.setHostName(answer); + record.setPort(port); + result.m_records.append(record); + } else { + qWarning("Unexpected DNS answer type"); + } + p += size; + answerIndex++; + } +#endif + return result; +} diff --git a/src/QXmppSrvLookup.h b/src/QXmppSrvLookup.h new file mode 100644 index 00000000..3e4d98d6 --- /dev/null +++ b/src/QXmppSrvLookup.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2008-2010 The QXmpp developers + * + * Author: + * Jeremy Lainé + * + * 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 QXMPPSRVLOOKUP_H +#define QXMPPSRVLOOKUP_H + +#include +#include + +/// \brief The QXmppSrvLookup class provides static methods for DNS SRV lookups. +/// + +class QXmppSrvLookup +{ +public: + /// \brief Represents a DNS SRV record + /// + class SrvRecord + { + public: + SrvRecord(); + + QString hostName() const; + void setHostName(const QString &hostName); + + quint16 port() const; + void setPort(quint16 port); + + private: + QString host_name; + quint16 host_port; + }; + + QString errorString() const; + QList records() const; + + static QXmppSrvLookup fromName(const QString &dname); + +private: + QString m_errorString; + QList m_records; +}; + +#endif diff --git a/src/src.pro b/src/src.pro index 388449ec..1a9d4b74 100644 --- a/src/src.pro +++ b/src/src.pro @@ -65,7 +65,7 @@ INSTALL_HEADERS = QXmppUtils.h \ QXmppServer.h \ QXmppServerExtension.h \ QXmppServerPlugin.h \ - QXmppServiceInfo.h \ + QXmppSrvLookup.h \ QXmppSessionIq.h \ QXmppSocks.h \ QXmppStanza.h \ @@ -118,7 +118,7 @@ SOURCES += QXmppUtils.cpp \ QXmppSaslAuth.cpp \ QXmppServer.cpp \ QXmppServerExtension.cpp \ - QXmppServiceInfo.cpp \ + QXmppSrvLookup.cpp \ QXmppSessionIq.cpp \ QXmppSocks.cpp \ QXmppStanza.cpp \ -- cgit v1.2.3