Merge branch 'develop_dadashi' of https://github.com/mahdidadashi65/open-ocpp into develop_dadashi

Author: mahdidadashi65

CMakeLists.txt

@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 project(OpenOCPP DESCRIPTION "Open Source C++ implementation of the OCPP 1.6 protocol"
-                 VERSION 1.3.0
+                 VERSION 1.4.0
 )
 
 # Definitions for Version.h file

examples/common/DefaultCentralSystemEventsHandler.cpp

@@ -66,6 +66,12 @@ bool DefaultCentralSystemEventsHandler::acceptConnection(const char* ip_address)
     return true;
 }
 
+/** @copydoc void ICentralSystemEventsHandler::clientFailedToConnect(const char*) */
+void DefaultCentralSystemEventsHandler::clientFailedToConnect(const char* ip_address)
+{
+    cout << "Client [" << ip_address << "] failed to connect" << endl;
+}
+
 /** @copydoc bool ICentralSystemEventsHandler::checkCredentials(const std::string&, const std::string&) */
 bool DefaultCentralSystemEventsHandler::checkCredentials(const std::string& chargepoint_id, const std::string& password)
 {

examples/common/DefaultCentralSystemEventsHandler.h

@@ -48,6 +48,9 @@ class DefaultCentralSystemEventsHandler : public ocpp::centralsystem::ICentralSy
     /** @copydoc bool ICentralSystemEventsHandler::acceptConnection(const char*) */
     bool acceptConnection(const char* ip_address) override;
 
+    /** @copydoc void ICentralSystemEventsHandler::clientFailedToConnect(const char*) */
+    void clientFailedToConnect(const char* ip_address) override;
+
     /** @copydoc bool ICentralSystemEventsHandler::checkCredentials(const std::string&, const std::string&) */
     bool checkCredentials(const std::string& chargepoint_id, const std::string& password) override;
 

examples/common/DefaultChargePointEventsHandler.cpp

@@ -683,9 +683,13 @@ ocpp::types::UpdateFirmwareStatusEnumType DefaultChargePointEventsHandler::check
     if (!ca_certificates.empty())
     {
         // Check signing certificate
-        if (signing_certificate.verify(ca_certificates))
+        for (const auto& cer : ca_certificates)
         {
-            ret = UpdateFirmwareStatusEnumType::Accepted;
+            if (signing_certificate.verify(cer.certificateChain()))
+            {
+                ret = UpdateFirmwareStatusEnumType::Accepted;
+                break;
+            }
         }
     }
     else

examples/common/DefaultLocalControllerEventsHandler.cpp

@@ -48,6 +48,12 @@ bool DefaultLocalControllerEventsHandler::acceptConnection(const char* ip_addres
     return true;
 }
 
+/** @copydoc void ILocalControllerEventsHandler::clientFailedToConnect(const char*) */
+void DefaultLocalControllerEventsHandler::clientFailedToConnect(const char* ip_address)
+{
+    cout << "Client [" << ip_address << "] failed to connect" << endl;
+}
+
 /** @copydoc bool ILocalControllerEventsHandler::checkCredentials(const std::string&, const std::string&) */
 bool DefaultLocalControllerEventsHandler::checkCredentials(const std::string& chargepoint_id, const std::string& password)
 {

examples/common/DefaultLocalControllerEventsHandler.h

@@ -46,6 +46,9 @@ class DefaultLocalControllerEventsHandler : public ocpp::localcontroller::ILocal
     /** @copydoc bool ILocalControllerEventsHandler::acceptConnection(const char*) */
     bool acceptConnection(const char* ip_address) override;
 
+    /** @copydoc void ILocalControllerEventsHandler::clientFailedToConnect(const char*) */
+    void clientFailedToConnect(const char* ip_address) override;
+
     /** @copydoc bool ILocalControllerEventsHandler::checkCredentials(const std::string&, const std::string&) */
     bool checkCredentials(const std::string& chargepoint_id, const std::string& password) override;
 

examples/common/config/OcppConfig.cpp

@@ -197,13 +197,15 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
     {
         if ((it->second & PARAM_WRITE) != 0)
         {
-             if (key.find("Interval") != std::string::npos)
-             {
-                 if (value.find("-") != std::string::npos)
-                 {
-                     ret = ConfigurationStatus::Rejected;
-                 }
-             }
+            std::size_t key_is_interval = key.find("Interval");
+            if (key_is_interval != std::string::npos)
+            {
+                std::size_t value_is_negative = value.find("-");
+                if (value_is_negative != std::string::npos)
+                {
+                    ret = ConfigurationStatus::Rejected;
+                }
+            }
 
              if (ret != ConfigurationStatus::Rejected)
              {

src/centralsystem/CentralSystem.cpp

@@ -300,6 +300,14 @@ void CentralSystem::rpcClientConnected(const std::string& chargepoint_id, std::s
     m_events_handler.chargePointConnected(chargepoint);
 }
 
+/** @copydoc void RpcServer::IListener::rpcClientFailedToConnect(const char*) */
+void CentralSystem::rpcClientFailedToConnect(const char* ip_address)
+{
+    // Notify failure => no additional processing is done here
+    // to keep this callback has fast as possible
+    return m_events_handler.clientFailedToConnect(ip_address);
+}
+
 /** @copydoc void RpcServer::IListener::rpcServerError() */
 void CentralSystem::rpcServerError()
 {

src/centralsystem/CentralSystem.h

@@ -78,6 +78,9 @@ class CentralSystem : public ICentralSystem, public ocpp::rpc::RpcServer::IListe
     /** @copydoc void RpcServer::IListener::rpcClientConnected(const std::string&, std::shared_ptr<Client>) */
     void rpcClientConnected(const std::string& chargepoint_id, std::shared_ptr<ocpp::rpc::RpcServer::Client> client) override;
 
+    /** @copydoc void RpcServer::IListener::rpcClientFailedToConnect(const char*) */
+    void rpcClientFailedToConnect(const char* ip_address) override;
+
     /** @copydoc void RpcServer::IListener::rpcServerError() */
     void rpcServerError() override;
 

src/centralsystem/interface/ICentralSystemEventsHandler.h

@@ -40,6 +40,12 @@ class ICentralSystemEventsHandler
      */
     virtual bool acceptConnection(const char* ip_address) = 0;
 
+    /**
+     * @brief Called when connection fails to established
+     * @param ip_address IP address of the client
+     */
+    virtual void clientFailedToConnect(const char* ip_address) = 0;
+
     /**
      * @brief Called to check the charge point credentials for HTTP basic authentication
      * @param chargepoint_id Charge Point identifier