From 1eb69354e909fbf6fb467486e52939dce5336ded Mon Sep 17 00:00:00 2001
From: acetone <acetone@mail.i2p>
Date: Sat, 30 Oct 2021 20:29:40 +0300
Subject: [PATCH] code optimization / 0.1.1

---
 resolver.cpp | 32 ++++----------------------------
 resolver.h   |  5 -----
 version.h    |  2 +-
 3 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/resolver.cpp b/resolver.cpp
index 0f744e1..dc7712c 100644
--- a/resolver.cpp
+++ b/resolver.cpp
@@ -35,21 +35,6 @@ Resolver::Resolver(const QString& addr, quint16 port, QObject* parent) :
     connect(m_tcpServer, SIGNAL(newConnection()), this, SLOT(slotNewUser()));
 }
 
-void Resolver::closeSocketViaDescriptor(int id)
-{
-    if(m_sockets.contains(id)) {
-        m_sockets.value(id)->close();
-    }
-}
-
-QSharedPointer<QTcpSocket> Resolver::getSocketViaDescriptor(int id)
-{
-    if (!m_sockets.contains(id)) {
-        qInfo() << "Resolver::getSocketViaDescriptor: Requested socket not found";
-    }
-    return m_sockets.value(id);
-}
-
 void Resolver::disableAPI()
 {
     m_NoApi = true;
@@ -71,10 +56,8 @@ void Resolver::slotNewUser()
     if (!m_tcpServer->isListening()) return;
 
     QTcpSocket* clientSocket = m_tcpServer->nextPendingConnection();
-    int idUserSock = clientSocket->socketDescriptor();
-    m_sockets.insert(idUserSock, QSharedPointer<QTcpSocket>(clientSocket));
-    connect (m_sockets.value(idUserSock).data(), SIGNAL(readyRead()), this, SLOT(slotReadyClient()));
-    connect (m_sockets.value(idUserSock).data(), SIGNAL(disconnected()), this, SLOT(slotClientDisconnected()));
+    connect (clientSocket, SIGNAL(readyRead()), this, SLOT(slotReadyClient()));
+    connect (clientSocket, SIGNAL(disconnected()), this, SLOT(deleteLater()));
 }
 
 void Resolver::slotReadyClient()
@@ -130,13 +113,6 @@ void Resolver::slotReadyClient()
     }
 }
 
-void Resolver::slotClientDisconnected()
-{
-    QTcpSocket* clientSocket = static_cast<QTcpSocket*>(sender());
-    auto idUserSock = clientSocket->socketDescriptor();
-    m_sockets.remove(idUserSock);
-}
-
 void Resolver::convertStrToRaw(const QString &str, Address &array)
 {
     inet_pton(AF_INET6, str.toUtf8(), (void*)array.data());
@@ -153,9 +129,9 @@ QString Resolver::decodeMeshToIP(const QString &meshname)
     std::vector<uint8_t> raw;
     try {
         raw = cppcodec::base32_rfc4648::decode(mesh);
-    } catch (cppcodec::padding_error) {
+    } catch (cppcodec::padding_error const&) {
         return QString();
-    } catch (cppcodec::symbol_error) {
+    } catch (cppcodec::symbol_error const&) {
         return QString();
     }
 
diff --git a/resolver.h b/resolver.h
index 6ff24f8..dfe529c 100644
--- a/resolver.h
+++ b/resolver.h
@@ -14,8 +14,6 @@ class Resolver : public QObject
     Q_OBJECT
 public:
     explicit Resolver(const QString&, quint16, QObject* parent = nullptr);
-    void closeSocketViaDescriptor(int id);
-    QSharedPointer<QTcpSocket> getSocketViaDescriptor(int id);
 
     void disableAPI();
     void disableWebPage();
@@ -24,14 +22,11 @@ public:
 private slots:
     void slotNewUser();
     void slotReadyClient();
-    void slotClientDisconnected();
 
 private:
     QTcpServer* m_tcpServer;
     QHostAddress m_address;
     quint16 m_port;
-    QMap<int, QSharedPointer<QTcpSocket>> m_sockets;
-
 
     void convertStrToRaw(const QString& str, Address& array);
     QString getBase32(const Address& rawAddr);
diff --git a/version.h b/version.h
index 4eae4f1..a9744d9 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define VERSION_H
 #include <QString>
 
-const QString VERSION = "0.1.0";
+const QString VERSION = "0.1.1";
 const QString COPYRIGHT = "GPLv3 (c) 2021, acetone";
 
 #endif // VERSION_H