STUN: use a private header

4 files changed, 159 insertions, 114 deletions

diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp
index ec31442e..30fa1786 100644
--- a/src/base/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
@@ -30,7 +30,7 @@
 #include <QUdpSocket>
 #include <QTimer>
 
-#include "QXmppStun.h"
+#include "QXmppStun_p.h"
 #include "QXmppUtils.h"
 
 #define STUN_ID_SIZE 12
diff --git a/src/base/QXmppStun.h b/src/base/QXmppStun.h
index e86ae183..cdc237c5 100644
--- a/src/base/QXmppStun.h
+++ b/src/base/QXmppStun.h
@@ -156,118 +156,6 @@ private:
     QString m_username;
 };
 
-/// \internal
-///
-/// The QXmppStunTransaction class represents a STUN transaction.
-///
-
-class QXMPP_EXPORT QXmppStunTransaction : public QXmppLoggable
-{
-    Q_OBJECT
-
-public:
-    QXmppStunTransaction(const QXmppStunMessage &request, QObject *parent);
-    QXmppStunMessage request() const;
-    QXmppStunMessage response() const;
-
-signals:
-    void finished();
-    void writeStun(const QXmppStunMessage &request);
-
-public slots:
-    void readStun(const QXmppStunMessage &response);
-
-private slots:
-    void retry();
-
-private:
-    QXmppStunMessage m_request;
-    QXmppStunMessage m_response;
-    QTimer *m_retryTimer;
-    int m_tries;
-};
-
-/// \internal
-///
-/// The QXmppTurnAllocation class represents a TURN allocation as defined
-/// by RFC 5766 Traversal Using Relays around NAT (TURN).
-///
-
-class QXMPP_EXPORT QXmppTurnAllocation : public QXmppLoggable
-{
-    Q_OBJECT
-
-public:
-    enum AllocationState
-    {
-        UnconnectedState,
-        ConnectingState,
-        ConnectedState,
-        ClosingState
-    };
-
-    QXmppTurnAllocation(QObject *parent = 0);
-    ~QXmppTurnAllocation();
-
-    QHostAddress relayedHost() const;
-    quint16 relayedPort() const;
-    AllocationState state() const;
-
-    void setServer(const QHostAddress &host, quint16 port = 3478);
-    void setUser(const QString &user);
-    void setPassword(const QString &password);
-
-    qint64 writeDatagram(const QByteArray &data, const QHostAddress &host, quint16 port);
-
-signals:
-    /// \brief This signal is emitted once TURN allocation succeeds.
-    void connected();
-
-    /// \brief This signal is emitted when a data packet is received.
-    void datagramReceived(const QByteArray &data, const QHostAddress &host, quint16 port);
-
-    /// \brief This signal is emitted when TURN allocation fails.
-    void disconnected();
-
-public slots:
-    void connectToHost();
-    void disconnectFromHost();
-
-private slots:
-    void readyRead();
-    void refresh();
-    void refreshChannels();
-    void transactionFinished();
-    void writeStun(const QXmppStunMessage &message);
-
-private:
-    void handleDatagram(const QByteArray &datagram, const QHostAddress &host, quint16 port);
-    void setState(AllocationState state);
-
-    QUdpSocket *socket;
-    QTimer *m_timer;
-    QTimer *m_channelTimer;
-    QString m_password;
-    QString m_username;
-    QHostAddress m_relayedHost;
-    quint16 m_relayedPort;
-    QHostAddress m_turnHost;
-    quint16 m_turnPort;
-
-    // channels
-    typedef QPair<QHostAddress, quint16> Address;
-    quint16 m_channelNumber;
-    QMap<quint16, Address> m_channels;
-
-    // state
-    quint32 m_lifetime;
-    QByteArray m_key;
-    QString m_realm;
-    QByteArray m_nonce;
-    AllocationState m_state;
-    QList<QXmppStunTransaction*> m_transactions;
-};
-
 /// \brief The QXmppIceComponent class represents a piece of a media stream
 /// requiring a single transport address, as defined by RFC 5245
 /// (Interactive Connectivity Establishment).
diff --git a/src/base/QXmppStun_p.h b/src/base/QXmppStun_p.h
new file mode 100644
index 00000000..76801ade
--- /dev/null
+++ b/src/base/QXmppStun_p.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2008-2014 The QXmpp developers
+ *
+ * Author:
+ *  Jeremy Lainé
+ *
+ * Source:
+ *  https://github.com/qxmpp-project/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 QXMPPSTUN_P_H
+#define QXMPPSTUN_P_H
+
+#include "QXmppStun.h"
+
+class QUdpSocket;
+class QTimer;
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QXmpp API.
+//
+// This header file may change from version to version without notice,
+// or even be removed.
+//
+// We mean it.
+//
+
+/// \internal
+///
+/// The QXmppStunTransaction class represents a STUN transaction.
+///
+
+class QXMPP_EXPORT QXmppStunTransaction : public QXmppLoggable
+{
+    Q_OBJECT
+
+public:
+    QXmppStunTransaction(const QXmppStunMessage &request, QObject *parent);
+    QXmppStunMessage request() const;
+    QXmppStunMessage response() const;
+
+signals:
+    void finished();
+    void writeStun(const QXmppStunMessage &request);
+
+public slots:
+    void readStun(const QXmppStunMessage &response);
+
+private slots:
+    void retry();
+
+private:
+    QXmppStunMessage m_request;
+    QXmppStunMessage m_response;
+    QTimer *m_retryTimer;
+    int m_tries;
+};
+
+/// \internal
+///
+/// The QXmppTurnAllocation class represents a TURN allocation as defined
+/// by RFC 5766 Traversal Using Relays around NAT (TURN).
+///
+
+class QXMPP_EXPORT QXmppTurnAllocation : public QXmppLoggable
+{
+    Q_OBJECT
+
+public:
+    enum AllocationState
+    {
+        UnconnectedState,
+        ConnectingState,
+        ConnectedState,
+        ClosingState
+    };
+
+    QXmppTurnAllocation(QObject *parent = 0);
+    ~QXmppTurnAllocation();
+
+    QHostAddress relayedHost() const;
+    quint16 relayedPort() const;
+    AllocationState state() const;
+
+    void setServer(const QHostAddress &host, quint16 port = 3478);
+    void setUser(const QString &user);
+    void setPassword(const QString &password);
+
+    qint64 writeDatagram(const QByteArray &data, const QHostAddress &host, quint16 port);
+
+signals:
+    /// \brief This signal is emitted once TURN allocation succeeds.
+    void connected();
+
+    /// \brief This signal is emitted when a data packet is received.
+    void datagramReceived(const QByteArray &data, const QHostAddress &host, quint16 port);
+
+    /// \brief This signal is emitted when TURN allocation fails.
+    void disconnected();
+
+public slots:
+    void connectToHost();
+    void disconnectFromHost();
+
+private slots:
+    void readyRead();
+    void refresh();
+    void refreshChannels();
+    void transactionFinished();
+    void writeStun(const QXmppStunMessage &message);
+
+private:
+    void handleDatagram(const QByteArray &datagram, const QHostAddress &host, quint16 port);
+    void setState(AllocationState state);
+
+    QUdpSocket *socket;
+    QTimer *m_timer;
+    QTimer *m_channelTimer;
+    QString m_password;
+    QString m_username;
+    QHostAddress m_relayedHost;
+    quint16 m_relayedPort;
+    QHostAddress m_turnHost;
+    quint16 m_turnPort;
+
+    // channels
+    typedef QPair<QHostAddress, quint16> Address;
+    quint16 m_channelNumber;
+    QMap<quint16, Address> m_channels;
+
+    // state
+    quint32 m_lifetime;
+    QByteArray m_key;
+    QString m_realm;
+    QByteArray m_nonce;
+    AllocationState m_state;
+    QList<QXmppStunTransaction*> m_transactions;
+};
+
+#endif
diff --git a/src/base/base.pri b/src/base/base.pri
index 4bd31982..88bf918b 100644
--- a/src/base/base.pri
+++ b/src/base/base.pri
@@ -40,7 +40,8 @@ INSTALL_HEADERS += \
 HEADERS += \
     base/QXmppCodec_p.h \
     base/QXmppSasl_p.h \
-    base/QXmppStreamInitiationIq_p.h
+    base/QXmppStreamInitiationIq_p.h \
+    base/QXmppStun_p.h
 
 # Source files
 SOURCES += \