Merge pull request #105 from c-jimenez/dev/localcontroller

[localcontroller] Triggers a request timeout when a request cannot be forwarded to the Central System or to the Charge Point

Author: c-jimenez

.vscode/launch.json

@@ -22,6 +22,15 @@
             "arguments": "-r",
             "valuesFormatting": "parseText"
         },
+        {
+            "type": "gdb",
+            "request": "launch",
+            "name": "x86 LC debug",
+            "target": "${workspaceRoot}/bin/gcc_native/quick_start_localcontroller",
+            "cwd": "${workspaceRoot}/bin/gcc_native/",
+            "arguments": "-r",
+            "valuesFormatting": "parseText"
+        },
         {
             "type": "gdb",
             "request": "launch",

.vscode/tasks.json

@@ -4,11 +4,11 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "build GCC native",
+            "label": "build GCC",
             "type": "shell",
             "command": "make",
             "args": [
-                "gcc-native",
+                "gcc",
                 "BUILD_TYPE=Debug"
             ],
             "problemMatcher": "$gcc",
@@ -18,20 +18,20 @@
             }
         },
         {
-            "label": "tests GCC native",
+            "label": "tests GCC",
             "type": "shell",
             "command": "make",
             "args": [
-                "tests-gcc-native"
+                "tests-gcc"
             ],
             "group": "build"
         },
         {
-            "label": "clean GCC native",
+            "label": "clean GCC",
             "type": "shell",
             "command": "make",
             "args": [
-                "clean-gcc-native",
+                "clean-gcc",
                 "BUILD_TYPE=Debug"
             ],
             "group": "build"

src/localcontroller/centralsystem/CentralSystemHandler.h

@@ -415,7 +415,6 @@ class CentralSystemHandler
                 if (cs_error.empty())
                 {
                     LOG_WARNING << "[" << m_identifier << "] - Unable to forward [" << action << "] request";
-                    error = ocpp::rpc::IRpc::RPC_ERROR_INTERNAL;
                 }
                 else
                 {
@@ -428,7 +427,6 @@ class CentralSystemHandler
         else
         {
             LOG_WARNING << "[" << m_identifier << "] - Unable to forward [" << action << "] request";
-            error = ocpp::rpc::IRpc::RPC_ERROR_INTERNAL;
         }
 
         return ret;

src/localcontroller/centralsystem/CentralSystemProxy.cpp

@@ -563,7 +563,7 @@ void CentralSystemProxy::rcpMessageReceived(const std::string& msg)
 /** @copydoc void IRpc::ISpy::rcpMessageSent(const std::string& msg) */
 void CentralSystemProxy::rcpMessageSent(const std::string& msg)
 {
-    LOG_COM << "[" << m_identifier << "] - RX : " << msg;
+    LOG_COM << "[" << m_identifier << "] - TX : " << msg;
 }
 
 // RpcClient::IListener interface

src/localcontroller/chargepoint/ChargePointHandler.h

@@ -266,7 +266,6 @@ class ChargePointHandler
             if (cs_error.empty())
             {
                 LOG_WARNING << "[" << m_identifier << "] - Unable to forward [" << action << "] request";
-                error = ocpp::rpc::IRpc::RPC_ERROR_INTERNAL;
             }
             else
             {

src/messages/SendLocalList.cpp

@@ -46,7 +46,7 @@ bool SendLocalListReqConverter::fromJson(const rapidjson::Value& json,
 {
     bool ret = true;
     extract(json, "listVersion", data.listVersion);
-    if (json.HasMember(""))
+    if (json.HasMember("localAuthorizationList"))
     {
         AuthorizationDataConverter      authorization_data_converter;
         std::vector<AuthorizationData>& local_authorization_list = data.localAuthorizationList;

src/rpc/RpcBase.cpp

@@ -415,11 +415,10 @@ void RpcBase::rxThread()
         else
         {
             // Error
-            if (error_code.empty())
+            if (!error_code.empty())
             {
-                error_code = RPC_ERROR_GENERIC;
+                sendCallError(rpc_message->unique_id, error_code.c_str(), error);
             }
-            sendCallError(rpc_message->unique_id, error_code.c_str(), error);
         }
 
         // Free resources