Add EIPSecurityObject PreResetCallback

CipSecurityObject/cipsecurity.c

@@ -82,44 +82,22 @@ EipStatus CipSecurityObjectPreResetCallback(
     CipMessageRouterRequest *const message_router_request,
     CipMessageRouterResponse *const message_router_response) {
 
-  CipAttributeStruct *attribute =
-      GetCipAttribute(instance, 1);  // attribute 1: state
+  if (message_router_request->request_data_size > 0) {
+    message_router_response->general_status = kCipErrorTooMuchData;
+  } else {
+    g_security.state = kCipSecurityObjectStateValueFactoryDefaultConfiguration;
+    OPENER_TRACE_INFO("Reset attribute 1 (state) of instance %d\n", instance->instance_number);
 
-  if (NULL != attribute) {
-    if (message_router_request->request_data_size > 0) {
-      message_router_response->general_status = kCipErrorTooMuchData;
-    } else {
-      g_security.state =
-          kCipSecurityObjectStateValueFactoryDefaultConfiguration;
-      message_router_response->general_status = kCipErrorSuccess;
-      OPENER_TRACE_INFO("Reset attribute 1 (state) of instance %d\n",
-                        instance->instance_number);
-
-      /*perform a reset on each Ethernet/IP Security Object instances present*/
-      CipInstance *eip_security_object_instance =
-          GetCipInstance(GetCipClass(kEIPSecurityObjectClassCode), 1);
-
-      if (NULL != eip_security_object_instance) {
-        for (CipInstance *ins =
-                 eip_security_object_instance->cip_class->instances;
-             ins; ins = ins->next) /* follow the list*/
-        {
-          attribute =
-              GetCipAttribute(ins, 13);  // attribute #13 pull model enable
-          *(CipBool *)attribute->data = true;
-
-          attribute =
-              GetCipAttribute(ins, 14);  // attribute #14 pull model status
-          *(CipUint *)attribute->data = 0x0000;
-
-          attribute = GetCipAttribute(ins, 1);  // attribute #1 state
-          *(CipUsint *)attribute->data =
-              kCipSecurityObjectStateValueFactoryDefaultConfiguration;
-
-          EIPSecurityObjectResetSettableAttributes(ins);  // reset settable attributes of ins
-        }
-      }
+    /*perform a reset on each Ethernet/IP Security Object instances present*/
+    CipInstance *eip_security_instance = GetCipClass(kEIPSecurityObjectClassCode)->instances;
+
+    while (NULL != eip_security_instance) {
+      EIPSecurityObjectPreResetCallback(eip_security_instance,
+                                        message_router_request,
+                                        message_router_response);
+      eip_security_instance = eip_security_instance->next;
     }
+    message_router_response->general_status = kCipErrorSuccess;
   }
   return kEipStatusOk;
 }

EtherNetIPSecurityObject/ethernetipsecurity.c

@@ -159,35 +159,30 @@ EipStatus EIPSecurityObjectPreResetCallback(
     CipInstance *RESTRICT const instance,
     CipMessageRouterRequest *const message_router_request,
     CipMessageRouterResponse *const message_router_response) {
+  CipAttributeStruct *attribute = GetCipAttribute(instance, 1);
+  CipUint *state = attribute->data;
+
+  if (*state == kEIPSecurityObjectStateValueConfigured) {
+    CipBool sent_over_TLS = false;  // TODO: check for valid TLS connection
+    if (!sent_over_TLS) {
+      message_router_response->general_status =
+          kCipErrorPrivilegeViolation;  // 0x0F Permission Denied
+      return kEipStatusOk;
+    }
+  }
 
-  message_router_response->general_status =
-      kCipErrorPrivilegeViolation;  // TODO: check error status
-  message_router_response->size_of_additional_status = 0;
-  InitializeENIPMessage(&message_router_response->message);
-  message_router_response->reply_service =
-      (0x80 | message_router_request->service);
-
-  // TODO: check for valid TLS connection
-
-  CipAttributeStruct *attribute = NULL;
-
-  CipBool enable_pull_model =
-      false; /* The default value if parameter was omitted. */
+  CipBool enable_pull_model = true; /* The default value if parameter was omitted. */
   CipUint pull_model_status = 0x0000;
-  CipUint state = 0;
 
   if (message_router_request->request_data_size == 1) {
     enable_pull_model = GetBoolFromMessage(&message_router_request->data);
+  }
 
-    if (enable_pull_model) {       // data: 01
-      pull_model_status = 0x0000;  // TODO: 0x0000 not allowed - check
-      state = kEIPSecurityObjectStateValueFactoryDefaultConfiguration;
-    } else {  // data: 00
-      pull_model_status = 0xFFFF;
-      state = kEIPSecurityObjectStateValuePullModelDisabled;
-    }
+  if (enable_pull_model) {
+    *state = kEIPSecurityObjectStateValueFactoryDefaultConfiguration;
   } else {
     pull_model_status = 0xFFFF;
+    *state = kEIPSecurityObjectStateValuePullModelDisabled;
   }
 
   attribute = GetCipAttribute(instance, 13);  // attribute #13 pull model enable
@@ -196,16 +191,9 @@ EipStatus EIPSecurityObjectPreResetCallback(
   attribute = GetCipAttribute(instance, 14);  // attribute #14 pull model status
   *(CipUint *)attribute->data = pull_model_status;  // set value
 
-  attribute = GetCipAttribute(instance, 1);  // attribute #1 state
-  *(CipUsint *)attribute->data = state;      // set value
-
   /* Reset settable attributes of each existing EtherNet/IP Security Object to
    * factory default */
-  for (CipInstance *ins = instance->cip_class->instances; ins;
-       ins = ins->next) /* follow the list*/
-  {
-    EIPSecurityObjectResetSettableAttributes(ins);
-  }
+  EIPSecurityObjectResetSettableAttributes(instance);
 
   message_router_response->general_status = kCipErrorSuccess;
   return kEipStatusOk;

EtherNetIPSecurityObject/ethernetipsecurity.h

@@ -157,4 +157,17 @@ EipStatus EIPSecurityInit(void);
  */
 void EIPSecurityObjectResetSettableAttributes(CipInstance *instance);
 
+/** @brief EtherNet/IP Security Object PreResetCallback
+ *
+ *  Used for common Reset service
+ *
+ *  Return this EtherNet/IP Security Object Instance to the
+ *  Factory Default Configuration State.
+ *  @See Vol.8, Chapter 5-4.5.1
+ */
+EipStatus EIPSecurityObjectPreResetCallback(
+    CipInstance *instance,
+    CipMessageRouterRequest *message_router_request,
+    CipMessageRouterResponse *message_router_response);
+
 #endif  // OPENER_ETHERNETIPSECURITY_H