only send SecurityEventNotification.req if the DisableSecurityEventNotifications configuration key is false (which is the default)

Signed-off-by: pietfried <pietgoempel@gmail.com>

Author: Pietfried

include/ocpp/common/message_queue.hpp

@@ -430,18 +430,25 @@ template <typename M> class MessageQueue {
         MessageQueue(send_callback, config, {}, databaseHandler) {
     }
 
-    void get_transaction_messages_from_db() {
+    void get_transaction_messages_from_db(bool ignore_security_event_notifications = false) {
         std::vector<ocpp::common::DBTransactionMessage> transaction_messages =
             database_handler->get_transaction_messages();
 
         if (!transaction_messages.empty()) {
             for (auto& transaction_message : transaction_messages) {
-                std::shared_ptr<ControlMessage<M>> message =
-                    std::make_shared<ControlMessage<M>>(transaction_message.json_message);
-                message->messageType = string_to_messagetype(transaction_message.message_type);
-                message->timestamp = transaction_message.timestamp;
-                message->message_attempts = transaction_message.message_attempts;
-                transaction_message_queue.push_back(message);
+
+                if (ignore_security_event_notifications &&
+                    transaction_message.message_type == "SecurityEventNotification") {
+                    // remove from database in case SecurityEventNotification.req should not be sent
+                    this->database_handler->remove_transaction_message(transaction_message.unique_id);
+                } else {
+                    std::shared_ptr<ControlMessage<M>> message =
+                        std::make_shared<ControlMessage<M>>(transaction_message.json_message);
+                    message->messageType = string_to_messagetype(transaction_message.message_type);
+                    message->timestamp = transaction_message.timestamp;
+                    message->message_attempts = transaction_message.message_attempts;
+                    transaction_message_queue.push_back(message);
+                }
             }
 
             this->new_message = true;

include/ocpp/v16/charge_point_configuration.hpp

@@ -335,7 +335,6 @@ class ChargePointConfiguration {
     void setDisableSecurityEventNotifications(bool disable_security_event_notifications);
     KeyValue getDisableSecurityEventNotificationsKeyValue();
 
-
     // Local Auth List Management Profile
     bool getLocalAuthListEnabled();
     void setLocalAuthListEnabled(bool local_auth_list_enabled);

lib/ocpp/v16/charge_point_impl.cpp

@@ -1185,7 +1185,9 @@ void ChargePointImpl::handleBootNotificationResponse(ocpp::CallResult<BootNotifi
                                       ocpp::DateTime());
         }
 
-        this->message_queue->get_transaction_messages_from_db();
+        // push transaction messages including SecurityEventNotification.req onto the message queue
+        this->message_queue->get_transaction_messages_from_db(
+            this->configuration->getDisableSecurityEventNotifications());
 
         if (this->is_pnc_enabled()) {
             this->ocsp_request_timer->timeout(INITIAL_CERTIFICATE_REQUESTS_DELAY);
@@ -2377,8 +2379,10 @@ void ChargePointImpl::securityEventNotification(const std::string& type, const s
 
     this->logging->security(json(req).dump());
 
-    ocpp::Call<SecurityEventNotificationRequest> call(req, this->message_queue->createMessageId());
-    this->send<SecurityEventNotificationRequest>(call);
+    if (!this->configuration->getDisableSecurityEventNotifications()) {
+        ocpp::Call<SecurityEventNotificationRequest> call(req, this->message_queue->createMessageId());
+        this->send<SecurityEventNotificationRequest>(call);
+    }
 
     if (triggered_internally and this->security_event_callback != nullptr) {
         this->security_event_callback(type, tech_info);