Merge pull request #59 from QuasarApp/task_58

Added new crc function

Author: EndrII

CMakeLists.txt

@@ -33,6 +33,7 @@ else()
 endif()
 # Use only for android debug builds with debugging from usb.
 option(HEART_STATIC_SSL "This option enable or disabled static link ssl libraryes" OFF)
+option(HEART_DEPRECATED_API "This option enable or disabled deprecated command api" OFF)
 option(CMAKE_SHARE "This option enable or disabled ssl functions of nodes" OFF)
 option(BUILD_SHARED_LIBS "Enable or disable shared libraryes" OFF)
 

HeartTests/units/bigdatatest.cpp

@@ -13,6 +13,7 @@
 
 class BigPackage: public QH::PKG::AbstractData {
     QH_PACKAGE(BigPackage, "BigPackage")
+
 public:
     BigPackage(){
         data = {};

src/CMakeLists.txt

@@ -17,6 +17,10 @@ set(CMAKE_AUTORCC ON)
 
 add_definitions(-DHEART_LIBRARY)
 
+if (HEART_DEPRECATED_API)
+    add_definitions(-DHEART_DEPRECATED_API)
+endif()
+
 set(SLL_DEFINE "WITHOUT_SSL")
 
 if (HEART_SSL)
@@ -35,9 +39,15 @@ file(GLOB SOURCE_CPP
     "private/*.cpp" "private/*.h" "private/*.qrc"
     "public/hcrypto/*.cpp" "public/hcrypto/*.h" "public/hcrypto/*.qrc"
     "public/hcryptoFeatures/*.cpp" "public/hcryptoFeatures/*.h" "public/hcryptoFeatures/*.qrc"
-
 )
 
+if (NOT HEART_DEPRECATED_API)
+    file(GLOB SOURCE_CPP_DEPRECATED
+        "private/*_old.cpp" "private/*_old.h"
+    )
+    list(REMOVE_ITEM SOURCE_CPP ${SOURCE_CPP_DEPRECATED})
+endif()
+
 set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/public")
 set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/public/packages")
@@ -74,6 +84,5 @@ if (HEART_SSL)
 
 endif()
 
-
 target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${PRIVATE_INCUDE_DIR})

src/private/abstractnodeparser.cpp

@@ -77,7 +77,7 @@ ParserResult AbstractNodeParser::parsePackage(const QSharedPointer<PKG::Abstract
 }
 
 int AbstractNodeParser::version() const {
-    return 0;
+    return 1;
 }
 
 QString AbstractNodeParser::parserId() const {

src/private/abstractnodeparser_old.cpp

@@ -0,0 +1,86 @@
+//#
+//# Copyright (C) 2022-2022 QuasarApp.
+//# Distributed under the lgplv3 software license, see the accompanying
+//# Everyone is permitted to copy and distribute verbatim copies
+//# of this license document, but changing it is not allowed.
+//#
+
+#include "abstractnodeparser_old.h"
+#include "params.h"
+#include "abstractnode.h"
+#include "qaglobalutils.h"
+
+#include <badrequest.h>
+#include <bigdatarequest.h>
+#include <closeconnection.h>
+#include <ping.h>
+
+namespace QH {
+
+AbstractNodeParserOld::AbstractNodeParserOld(AbstractNode* parentNode): iParser(parentNode) {
+    debug_assert(parentNode, "Node object can't be null!");
+
+    registerPackageTypeOld<PKG::Ping>();
+    registerPackageTypeOld<PKG::BadRequest>();
+    registerPackageTypeOld<PKG::CloseConnection>();
+}
+
+AbstractNodeParserOld::~AbstractNodeParserOld() {
+}
+
+ParserResult AbstractNodeParserOld::parsePackage(const QSharedPointer<PKG::AbstractData> &pkg,
+                                              const Header &pkgHeader,
+                                              AbstractNodeInfo *sender) {
+    auto nodePtr = node();
+    if (!nodePtr) {
+        return ParserResult::NotProcessed;
+    }
+
+    if (!(sender)) {
+        QuasarAppUtils::Params::log("sender socket is not valid!",
+                                    QuasarAppUtils::Error);
+        return ParserResult::Error;
+    }
+
+    if (!pkg->isValid()) {
+        QuasarAppUtils::Params::log("incomming package is not valid!",
+                                    QuasarAppUtils::Error);
+        nodePtr->changeTrust(sender->networkAddress(), CRITICAL_ERROOR);
+        return ParserResult::Error;
+    }
+
+    if (PKG::Ping::commandOld() == pkg->cmd()) {
+        auto cmd = pkg.staticCast<PKG::Ping>();
+        if (!cmd->ansver()) {
+            cmd->setAnsver(true);
+            nodePtr->sendData(cmd.data(), sender, &pkgHeader);
+        }
+
+        emit sigPingReceived(cmd);
+
+        return ParserResult::Processed;
+    } else if (PKG::BadRequest::commandOld() == pkg->cmd()) {
+        auto cmd = static_cast<PKG::BadRequest *>(pkg.data());
+
+        emit nodePtr->requestError(cmd->errCode(), cmd->err());
+
+        return ParserResult::Processed;
+
+    } else if (PKG::CloseConnection::commandOld() == pkg->cmd()) {
+        if (sender->isLocal()) {
+            nodePtr->removeNode(sender->networkAddress());
+        }
+        return ParserResult::Processed;
+    }
+
+    return ParserResult::NotProcessed;
+}
+
+int AbstractNodeParserOld::version() const {
+    return 0;
+}
+
+QString AbstractNodeParserOld::parserId() const {
+    return "HeartLibAbstractAPI";
+}
+}

src/private/abstractnodeparser_old.h

@@ -0,0 +1,53 @@
+//#
+//# Copyright (C) 2022-2022 QuasarApp.
+//# Distributed under the lgplv3 software license, see the accompanying
+//# Everyone is permitted to copy and distribute verbatim copies
+//# of this license document, but changing it is not allowed.
+//#
+
+#ifndef ABSTRACTNODEPARSER_OLD_H
+#define ABSTRACTNODEPARSER_OLD_H
+
+#include <iparser.h>
+#include <ping.h>
+
+namespace QH {
+
+/**
+ * @brief The AbstractNodeParserOld class is main parser of the abstract level of the hear lib.
+ * @note This class some as AbstractNodeParser
+ */
+class AbstractNodeParserOld: public iParser
+{
+    Q_OBJECT
+public:
+    template<class T>
+    /**
+     * @brief registerPackageTypeOld This method register package type T.
+     * This is need to prepare pacakge for parsing in the parsePackage method.
+     */
+    void registerPackageTypeOld() {
+        _registeredTypes[T::commandOld()] = [](){
+            return new T();
+        };
+    };
+
+    AbstractNodeParserOld(AbstractNode *parentNode);
+    ~AbstractNodeParserOld() override;
+    ParserResult parsePackage(const QSharedPointer<PKG::AbstractData> &pkg,
+                              const Header &pkgHeader,
+                              AbstractNodeInfo *sender) override;
+    int version() const override;
+    QString parserId() const override;
+
+signals:
+
+    /**
+     * @brief sigPingReceived This method emited
+     * @param ping this is received ping object.
+     */
+    void sigPingReceived(const QSharedPointer<QH::PKG::Ping> &ping);
+
+};
+}
+#endif

src/private/apiversion.cpp

@@ -34,5 +34,18 @@ void APIVersion::setVersion(const VersionData &newVersion) {
     _version = newVersion;
 }
 
+bool APIVersion::isValid() const {
+    if (_version.isEmpty())
+        return false;
+
+    for (const auto & version: _version) {
+        if (version.max() < version.min()) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 }
 }

src/private/apiversion.h

@@ -29,11 +29,16 @@ class APIVersion: public QH::PKG::AbstractData
     static unsigned short command(){return PROTOCKOL_VERSION_COMMAND;}
     static QString commandText(){return "PROTOCKOL_VERSION_COMMAND";}
     unsigned short cmd() const override {return APIVersion::command();}
+
+    unsigned short cmdOld() const override {return APIVersion::command();}
+
     QString cmdString() const override {return APIVersion::commandText();}
 
     const VersionData &version() const;
     void setVersion(const VersionData &newVersion);
 
+    bool isValid() const override;
+
 protected:
     unsigned int localCode() const override {return typeid(APIVersion).hash_code();}
     QDataStream &fromStream(QDataStream &stream) override;

src/private/bigdataparser.cpp

@@ -65,7 +65,7 @@ ParserResult BigDataParser::parsePackage(const QSharedPointer<PKG::AbstractData>
 }
 
 int BigDataParser::version() const {
-    return 0;
+    return 1;
 }
 
 QString BigDataParser::parserId() const {