make it possible to read and write to SOCKS5 client/server

2 files changed, 54 insertions, 11 deletions

diff --git a/source/QXmppSocks.cpp b/source/QXmppSocks.cpp
index 5ba9b593..c11c6584 100644
--- a/source/QXmppSocks.cpp
+++ b/source/QXmppSocks.cpp
@@ -214,10 +214,14 @@ void QXmppSocksClient::slotReadyRead()
         }
         // FIXME : what do we do with the resulting name / port?
 
+        // from now on, forward signals
+        connect(m_socket, SIGNAL(bytesWritten(qint64)), this, SIGNAL(bytesWritten(qint64)));
+        disconnect(m_socket, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
+        connect(m_socket, SIGNAL(readyRead()), this, SIGNAL(readyRead()));
+
+        // notify of connection
         emit connected();
 
-    } else {
-        emit readyRead();
     }
 }
 
@@ -235,6 +239,11 @@ bool QXmppSocksClient::waitForConnected(int msecs)
         return false;
 }
 
+qint64 QXmppSocksClient::write(const QByteArray &data)
+{
+    return m_socket->write(data);
+}
+
 QXmppSocksServer::QXmppSocksServer(QObject *parent)
     : QObject(parent),
     m_hostPort(0),
@@ -257,6 +266,11 @@ bool QXmppSocksServer::listen(const QHostAddress &address, quint16 port)
     return m_server->listen(address, port);
 }
 
+QByteArray QXmppSocksServer::readAll()
+{
+    return m_socket->readAll();
+}
+
 QHostAddress QXmppSocksServer::serverAddress() const
 {
     return m_server->serverAddress();
@@ -289,14 +303,30 @@ void QXmppSocksServer::slotReadyRead()
         QByteArray buffer = m_socket->readAll();
         if (buffer.size() < 3 ||
             buffer.at(0) != SocksVersion ||
-            buffer.at(1) != 0x01 ||
-            buffer.at(2) != NoAuthentication)
+            buffer.at(1) + 2 != buffer.size())
         {
             qWarning("QXmppSocksServer received invalid handshake");
             m_socket->close();
             return;
         }
 
+        // check authentication method
+        bool foundMethod = false;
+        for (int i = 2; i < buffer.size(); i++)
+        {
+            if (buffer.at(i) == NoAuthentication)
+            {
+                foundMethod = true;
+                break;
+            }
+        }
+        if (!foundMethod)
+        {
+            qWarning("QXmppSocksServer received bad authentication method");
+            m_socket->close();
+            return;
+        }
+
         // send connect to server response
         buffer.resize(2);
         buffer[0] = SocksVersion;
@@ -342,12 +372,17 @@ void QXmppSocksServer::slotReadyRead()
         buffer[2] = 0x00;
         buffer.append(encodeHostAndPort(
             DomainName,
-            m_server->serverAddress().toString().toAscii(),
-            m_server->serverPort()));
+            m_hostName.toAscii(),
+            m_hostPort));
         m_socket->write(buffer);
 
-        // connect signals
+        // from now on, forward signals
         connect(m_socket, SIGNAL(bytesWritten(qint64)), this, SIGNAL(bytesWritten(qint64)));
+        disconnect(m_socket, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
+        connect(m_socket, SIGNAL(readyRead()), this, SIGNAL(readyRead()));
+
+        // notify of connection
+        emit connected();
     }
 }
 
@@ -361,9 +396,11 @@ void QXmppSocksServer::setHostPort(quint16 hostPort)
     m_hostPort = hostPort;
 }
 
-void QXmppSocksServer::write(const QByteArray &data)
+qint64 QXmppSocksServer::write(const QByteArray &data)
 {
     if (m_socket)
-        m_socket->write(data);
+        return m_socket->write(data);
+    else
+        return -1;
 }
 
diff --git a/source/QXmppSocks.h b/source/QXmppSocks.h
index 2b50ba42..a28e73c0 100644
--- a/source/QXmppSocks.h
+++ b/source/QXmppSocks.h
@@ -41,8 +41,10 @@ public:
     QString errorString() const;
     QByteArray readAll();
     bool waitForConnected(int msecs = 30000);
+    qint64 write(const QByteArray &data);
 
 signals:
+    void bytesWritten(qint64);
     void connected();
     void disconnected();
     void readyRead();
@@ -67,16 +69,20 @@ class QXmppSocksServer : public QObject
 public:
     QXmppSocksServer(QObject *parent=0);
     void close();
-    bool listen(const QHostAddress &address, quint16 port = 0);
+    bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0);
+    QByteArray readAll();
+    qint64 write(const QByteArray &data);
+
     QHostAddress serverAddress() const;
     quint16 serverPort() const;
     void setHostName(const QString &hostName);
     void setHostPort(quint16 hostPort);
-    void write(const QByteArray &data);
 
 signals:
     void bytesWritten(qint64);
+    void connected();
     void disconnected();
+    void readyRead();
 
 private slots:
     void slotNewConnection();