|
|
@@ -69,26 +69,26 @@
|
|
|
*/
|
|
|
/**< definition of EtherNet/IP Security object instance 1 data */
|
|
|
|
|
|
-CipEpath CMO_Paths[1] = { //Certificate Management object paths
|
|
|
- {
|
|
|
- 2, /* PathSize in 16 Bit chunks */
|
|
|
- kCertificateManagementObjectClassCode, /* Class Code */
|
|
|
- 0x01, /* Instance # */
|
|
|
- }
|
|
|
+CipEpath CMO_Paths[1] = { // Certificate Management object paths
|
|
|
+ {
|
|
|
+ 2, /* PathSize in 16 Bit chunks */
|
|
|
+ kCertificateManagementObjectClassCode, /* Class Code */
|
|
|
+ 0x01, /* Instance # */
|
|
|
+ }};
|
|
|
+
|
|
|
+const EIPSecurityObjectPathList active_device_certificates = {
|
|
|
+ // at present, a maximum of 1 entry may be configured
|
|
|
+ 1,
|
|
|
+ CMO_Paths,
|
|
|
};
|
|
|
|
|
|
-EIPSecurityObjectPathList const active_device_certificates = { //at present, a maximum of 1 entry may be configured
|
|
|
- 1,
|
|
|
- CMO_Paths
|
|
|
- };
|
|
|
-
|
|
|
EIPSecurityObject g_eip_security = { //TODO: add object configuration
|
|
|
- .state = kEIPFactoryDefaultConfiguration, /** Attribute #1 */
|
|
|
- .active_device_certificates = active_device_certificates, /** Attribute #6 */
|
|
|
- .pre_shared_keys.number_of_pre_shared_keys = 0, /** Attribute #5 */
|
|
|
- .pull_model_enabled = true, //default: true /** Attribute #13 */
|
|
|
- .pull_model_status = 0x0000, /** Attribute #14 */
|
|
|
- .dtls_timeout = 0x0C //default: 12 seconds /** Attribute #15 */
|
|
|
+ .state = kEIPFactoryDefaultConfiguration, /** Attribute #1 */
|
|
|
+ .active_device_certificates = active_device_certificates, /** Attribute #6 */
|
|
|
+ .pre_shared_keys.number_of_pre_shared_keys = 0, /** Attribute #5 */
|
|
|
+ .pull_model_enabled = true, // default: true /** Attribute #13 */
|
|
|
+ .pull_model_status = 0x0000, /** Attribute #14 */
|
|
|
+ .dtls_timeout = 0x0C //default: 12 seconds /** Attribute #15 */
|
|
|
};
|
|
|
// .capability_flags =0, /** Attribute #2 */
|
|
|
// .available_cipher_suites = 0, /** Attribute #3 */
|
|
|
@@ -107,257 +107,247 @@ EIPSecurityObject g_eip_security = { //TODO: add object configuration
|
|
|
|
|
|
/** @brief EtherNet/IP Security Object Reset settable attributes
|
|
|
*
|
|
|
- * Return all settable instance attributes to the
|
|
|
- * Factory Default Configuration value
|
|
|
+ * Return all settable instance attributes to the
|
|
|
+ * Factory Default Configuration value
|
|
|
*/
|
|
|
-void EIPSecurityObjectResetSettableAttributes(CipInstance *instance){
|
|
|
- CipAttributeStruct *attribute = NULL;
|
|
|
+void EIPSecurityObjectResetSettableAttributes(CipInstance *instance) {
|
|
|
+ CipAttributeStruct *attribute = NULL;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 4);
|
|
|
- attribute->data = (void*) &g_eip_security.allowed_cipher_suites;
|
|
|
+ attribute = GetCipAttribute(instance, 4);
|
|
|
+ attribute->data = (void *)&g_eip_security.allowed_cipher_suites;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 5);
|
|
|
- attribute->data = (void*) &g_eip_security.pre_shared_keys;
|
|
|
+ attribute = GetCipAttribute(instance, 5);
|
|
|
+ attribute->data = (void *)&g_eip_security.pre_shared_keys;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 6);
|
|
|
- attribute->data = (void*) &g_eip_security.active_device_certificates;
|
|
|
+ attribute = GetCipAttribute(instance, 6);
|
|
|
+ attribute->data = (void *)&g_eip_security.active_device_certificates;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 7);
|
|
|
- attribute->data = (void*) &g_eip_security.trusted_authorities;
|
|
|
+ attribute = GetCipAttribute(instance, 7);
|
|
|
+ attribute->data = (void *)&g_eip_security.trusted_authorities;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 8);
|
|
|
- attribute->data = (void*) &g_eip_security.certificate_revocation_list;
|
|
|
+ attribute = GetCipAttribute(instance, 8);
|
|
|
+ attribute->data = (void *)&g_eip_security.certificate_revocation_list;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 9);
|
|
|
- attribute->data = (void*) &g_eip_security.verify_client_certificate;
|
|
|
+ attribute = GetCipAttribute(instance, 9);
|
|
|
+ attribute->data = (void *)&g_eip_security.verify_client_certificate;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 10);
|
|
|
- attribute->data = (void*) &g_eip_security.send_certificate_chain;
|
|
|
+ attribute = GetCipAttribute(instance, 10);
|
|
|
+ attribute->data = (void *)&g_eip_security.send_certificate_chain;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 11);
|
|
|
- attribute->data = (void*) &g_eip_security.check_expiration;
|
|
|
+ attribute = GetCipAttribute(instance, 11);
|
|
|
+ attribute->data = (void *)&g_eip_security.check_expiration;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 12);
|
|
|
- attribute->data = (void*) &g_eip_security.trusted_identities;
|
|
|
+ attribute = GetCipAttribute(instance, 12);
|
|
|
+ attribute->data = (void *)&g_eip_security.trusted_identities;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 15);
|
|
|
- attribute->data = (void*) &g_eip_security.dtls_timeout;
|
|
|
+ attribute = GetCipAttribute(instance, 15);
|
|
|
+ attribute->data = (void *)&g_eip_security.dtls_timeout;
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 16);
|
|
|
- attribute->data = (void*) &g_eip_security.udp_only_policy;
|
|
|
+ attribute = GetCipAttribute(instance, 16);
|
|
|
+ attribute->data = (void *)&g_eip_security.udp_only_policy;
|
|
|
}
|
|
|
|
|
|
/** @brief EtherNet/IP Security Object Reset service
|
|
|
*
|
|
|
- * Return this EtherNet/IP Security Object Instance to the
|
|
|
- * Factory Default Configuration State.
|
|
|
- * See Vol.8 Section 5-4.5.1
|
|
|
+ * Return this EtherNet/IP Security Object Instance to the
|
|
|
+ * Factory Default Configuration State.
|
|
|
+ * @See Vol.8, Chapter 5-4.5.1
|
|
|
*/
|
|
|
-EipStatus EIPSecurityObjectReset(CipInstance *RESTRICT const instance,
|
|
|
- CipMessageRouterRequest *const message_router_request,
|
|
|
- CipMessageRouterResponse *const message_router_response,
|
|
|
- const struct sockaddr *originator_address,
|
|
|
- const int encapsulation_session) {
|
|
|
-
|
|
|
- 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. */
|
|
|
- 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 = kEIPFactoryDefaultConfiguration;
|
|
|
- } else { // data: 00
|
|
|
- pull_model_status = 0xFFFF;
|
|
|
- state = kPullModelDisabled;
|
|
|
- }
|
|
|
- } else {
|
|
|
- pull_model_status = 0xFFFF;
|
|
|
- }
|
|
|
+EipStatus EIPSecurityObjectReset(
|
|
|
+ CipInstance *RESTRICT const instance,
|
|
|
+ CipMessageRouterRequest *const message_router_request,
|
|
|
+ CipMessageRouterResponse *const message_router_response,
|
|
|
+ const struct sockaddr *originator_address,
|
|
|
+ const int encapsulation_session) {
|
|
|
+ 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. */
|
|
|
+ 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 = kEIPFactoryDefaultConfiguration;
|
|
|
+ } else { // data: 00
|
|
|
+ pull_model_status = 0xFFFF;
|
|
|
+ state = kPullModelDisabled;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ pull_model_status = 0xFFFF;
|
|
|
+ }
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 13); //attribute #13 pull model enable
|
|
|
- *(CipBool*) attribute->data = enable_pull_model; //set value
|
|
|
+ attribute = GetCipAttribute(instance, 13); // attribute #13 pull model enable
|
|
|
+ *(CipBool *)attribute->data = enable_pull_model; // set value
|
|
|
|
|
|
- attribute = GetCipAttribute(instance, 14); //attribute #14 pull model status
|
|
|
- *(CipUint*) attribute->data = pull_model_status; //set value
|
|
|
+ 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
|
|
|
+ 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);
|
|
|
- }
|
|
|
+ /* 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);
|
|
|
+ }
|
|
|
|
|
|
- message_router_response->general_status = kCipErrorSuccess;
|
|
|
- return kEipStatusOk;
|
|
|
+ message_router_response->general_status = kCipErrorSuccess;
|
|
|
+ return kEipStatusOk;
|
|
|
}
|
|
|
|
|
|
/** @brief EtherNet/IP Security Object Begin_Config service
|
|
|
*
|
|
|
- * Causes the object to transition to the Configuration In Progress state.
|
|
|
- * See Vol.8 Section 5-4.7.1
|
|
|
+ * Causes the object to transition to the Configuration In Progress state.
|
|
|
+ * @See Vol.8, Chapter 5-4.7.1
|
|
|
*/
|
|
|
-EipStatus EIPSecurityObjectBeginConfig(CipInstance *RESTRICT const instance,
|
|
|
- CipMessageRouterRequest *const message_router_request,
|
|
|
- CipMessageRouterResponse *const message_router_response,
|
|
|
- const struct sockaddr *originator_address,
|
|
|
- const int encapsulation_session) {
|
|
|
-
|
|
|
- message_router_response->general_status = kCipErrorSuccess;
|
|
|
- message_router_response->size_of_additional_status = 0;
|
|
|
- InitializeENIPMessage(&message_router_response->message);
|
|
|
- message_router_response->reply_service = (0x80
|
|
|
- | message_router_request->service);
|
|
|
-
|
|
|
- CipAttributeStruct *attribute = GetCipAttribute(instance, 1); //attribute #1 state
|
|
|
- CipUsint state = *(CipUsint*)attribute->data;
|
|
|
-
|
|
|
- if (kEIPFactoryDefaultConfiguration != state) {
|
|
|
- message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
- } else {
|
|
|
-
|
|
|
- //TODO: save current instance config before starting new config
|
|
|
- *(CipUsint*) attribute->data = kEIPConfigurationInProgress; //set state
|
|
|
-
|
|
|
- //TODO: start configuration session timer
|
|
|
- }
|
|
|
+EipStatus EIPSecurityObjectBeginConfig(
|
|
|
+ CipInstance *RESTRICT const instance,
|
|
|
+ CipMessageRouterRequest *const message_router_request,
|
|
|
+ CipMessageRouterResponse *const message_router_response,
|
|
|
+ const struct sockaddr *originator_address,
|
|
|
+ const int encapsulation_session) {
|
|
|
+ message_router_response->general_status = kCipErrorSuccess;
|
|
|
+ message_router_response->size_of_additional_status = 0;
|
|
|
+ InitializeENIPMessage(&message_router_response->message);
|
|
|
+ message_router_response->reply_service = (0x80 | message_router_request->service);
|
|
|
+
|
|
|
+ CipAttributeStruct *attribute = GetCipAttribute(instance, 1); // attribute #1 state
|
|
|
+ CipUsint state = *(CipUsint *)attribute->data;
|
|
|
+
|
|
|
+ if (kEIPFactoryDefaultConfiguration != state) {
|
|
|
+ message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
+ } else {
|
|
|
+ // TODO: save current instance config before starting new config
|
|
|
+ *(CipUsint *)attribute->data = kEIPConfigurationInProgress; // set state
|
|
|
+
|
|
|
+ // TODO: start configuration session timer
|
|
|
+ }
|
|
|
|
|
|
- return kEipStatusOk;
|
|
|
+ return kEipStatusOk;
|
|
|
}
|
|
|
|
|
|
/** @brief EtherNet/IP Security Object Kick_Timer service
|
|
|
*
|
|
|
- * Causes the object to reset the configuration session timer.
|
|
|
- * See Vol.8 Section 5-4.7.2
|
|
|
+ * Causes the object to reset the configuration session timer.
|
|
|
+ * @See Vol.8, Chapter 5-4.7.2
|
|
|
*/
|
|
|
-EipStatus EIPSecurityObjectKickTimer(CipInstance *RESTRICT const instance,
|
|
|
- CipMessageRouterRequest *const message_router_request,
|
|
|
- CipMessageRouterResponse *const message_router_response,
|
|
|
- const struct sockaddr *originator_address,
|
|
|
- const int encapsulation_session) {
|
|
|
-
|
|
|
- message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
- message_router_response->size_of_additional_status = 0;
|
|
|
- InitializeENIPMessage(&message_router_response->message);
|
|
|
- message_router_response->reply_service = (0x80
|
|
|
- | message_router_request->service);
|
|
|
-
|
|
|
- CipAttributeStruct *attribute = GetCipAttribute(instance, 1); //attribute #1 state
|
|
|
- CipUsint state = *(CipUsint*)attribute->data;
|
|
|
-
|
|
|
- if (kEIPConfigurationInProgress == state) {
|
|
|
- //TODO: reset configuration session timer
|
|
|
- message_router_response->general_status = kCipErrorSuccess;
|
|
|
- }
|
|
|
+EipStatus EIPSecurityObjectKickTimer(
|
|
|
+ CipInstance *RESTRICT const instance,
|
|
|
+ CipMessageRouterRequest *const message_router_request,
|
|
|
+ CipMessageRouterResponse *const message_router_response,
|
|
|
+ const struct sockaddr *originator_address,
|
|
|
+ const int encapsulation_session) {
|
|
|
+ message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
+ message_router_response->size_of_additional_status = 0;
|
|
|
+ InitializeENIPMessage(&message_router_response->message);
|
|
|
+ message_router_response->reply_service = (0x80 | message_router_request->service);
|
|
|
+
|
|
|
+ CipAttributeStruct *attribute = GetCipAttribute(instance, 1); // attribute #1 state
|
|
|
+ CipUsint state = *(CipUsint *)attribute->data;
|
|
|
+
|
|
|
+ if (kEIPConfigurationInProgress == state) {
|
|
|
+ // TODO: reset configuration session timer
|
|
|
+ message_router_response->general_status = kCipErrorSuccess;
|
|
|
+ }
|
|
|
|
|
|
- return kEipStatusOk;
|
|
|
+ return kEipStatusOk;
|
|
|
}
|
|
|
|
|
|
/** @brief EtherNet/IP Security Object Apply_Config service
|
|
|
*
|
|
|
- * Applies the configuration and places the object in the Configured state.
|
|
|
- * See Vol.8 Section 5-4.7.3
|
|
|
+ * Applies the configuration and places the object in the Configured state.
|
|
|
+ * @See Vol.8, Chapter 5-4.7.3
|
|
|
*/
|
|
|
-EipStatus EIPSecurityObjectApplyConfig(CipInstance *RESTRICT const instance,
|
|
|
- CipMessageRouterRequest *const message_router_request,
|
|
|
- CipMessageRouterResponse *const message_router_response,
|
|
|
- const struct sockaddr *originator_address,
|
|
|
- const int encapsulation_session) {
|
|
|
-
|
|
|
- message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
- message_router_response->size_of_additional_status = 0;
|
|
|
- InitializeENIPMessage(&message_router_response->message);
|
|
|
- message_router_response->reply_service = (0x80
|
|
|
- | message_router_request->service);
|
|
|
-
|
|
|
- CipAttributeStruct *attribute = GetCipAttribute(instance, 1); //attribute #1 state
|
|
|
- CipUsint state = *(CipUsint*) attribute->data;
|
|
|
-
|
|
|
- if (kEIPConfigurationInProgress == state) {
|
|
|
-
|
|
|
- /* The default values if parameters were omitted. */
|
|
|
- CipWord apply_behavior_flags = 0;
|
|
|
- CipUint close_delay = 0;
|
|
|
-
|
|
|
- if (0 < message_router_request->request_data_size) {
|
|
|
- apply_behavior_flags = GetWordFromMessage(
|
|
|
- &(message_router_request->data));
|
|
|
- close_delay = GetUintFromMessage(
|
|
|
- &(message_router_request->data));
|
|
|
- }
|
|
|
+EipStatus EIPSecurityObjectApplyConfig(
|
|
|
+ CipInstance *RESTRICT const instance,
|
|
|
+ CipMessageRouterRequest *const message_router_request,
|
|
|
+ CipMessageRouterResponse *const message_router_response,
|
|
|
+ const struct sockaddr *originator_address,
|
|
|
+ const int encapsulation_session) {
|
|
|
+ message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
+ message_router_response->size_of_additional_status = 0;
|
|
|
+ InitializeENIPMessage(&message_router_response->message);
|
|
|
+ message_router_response->reply_service = (0x80 | message_router_request->service);
|
|
|
+
|
|
|
+ CipAttributeStruct *attribute = GetCipAttribute(instance, 1); // attribute #1 state
|
|
|
+ CipUsint state = *(CipUsint *)attribute->data;
|
|
|
+
|
|
|
+ if (kEIPConfigurationInProgress == state) {
|
|
|
+ /* The default values if parameters were omitted. */
|
|
|
+ CipWord apply_behavior_flags = 0;
|
|
|
+ CipUint close_delay = 0;
|
|
|
+
|
|
|
+ if (0 < message_router_request->request_data_size) {
|
|
|
+ apply_behavior_flags = GetWordFromMessage(&(message_router_request->data));
|
|
|
+ close_delay = GetUintFromMessage(&(message_router_request->data));
|
|
|
+ }
|
|
|
|
|
|
- //check apply behavior
|
|
|
- if (apply_behavior_flags & (1 << 0)){ //Bit 0 set
|
|
|
- //TODO: close existing connections once close_delay has elapsed
|
|
|
- }
|
|
|
- if (apply_behavior_flags & (1 << 1)){ //Bit 1 set
|
|
|
- //TODO: run Object_Cleanup service of the CIP Security Object after applying changes
|
|
|
- }
|
|
|
+ // check apply behavior
|
|
|
+ if (apply_behavior_flags & (1 << 0)) { // Bit 0 set
|
|
|
+ // TODO: close existing connections once close_delay has elapsed
|
|
|
+ }
|
|
|
+ if (apply_behavior_flags & (1 << 1)) { // Bit 1 set
|
|
|
+ // TODO: run Object_Cleanup service of the CIP Security Object after
|
|
|
+ // applying changes
|
|
|
+ }
|
|
|
|
|
|
- //TODO: Apply config
|
|
|
- /*device shall begin using the new attribute
|
|
|
- settings when establishing new (D)TLS sessions. */
|
|
|
+ // TODO: Apply config
|
|
|
+ /* device shall begin using the new attribute
|
|
|
+ * settings when establishing new (D)TLS sessions. */
|
|
|
|
|
|
- //TODO: change state to configured
|
|
|
- //*(CipUsint*) attribute->data = kEIPConfigured;
|
|
|
- message_router_response->general_status = kCipErrorSuccess;
|
|
|
- }
|
|
|
+ // TODO: change state to configured
|
|
|
+ //*(CipUsint*) attribute->data = kEIPConfigured;
|
|
|
+ message_router_response->general_status = kCipErrorSuccess;
|
|
|
+ }
|
|
|
|
|
|
- return kEipStatusOk;
|
|
|
+ return kEipStatusOk;
|
|
|
}
|
|
|
|
|
|
/** @brief EtherNet/IP Security Object Abort_Config service
|
|
|
*
|
|
|
- * Abort the current configuration and discard pending changes.
|
|
|
- * See Vol.8 Section 5-4.7.4
|
|
|
+ * Abort the current configuration and discard pending changes.
|
|
|
+ * @See Vol.8, Chapter 5-4.7.4
|
|
|
*/
|
|
|
-EipStatus EIPSecurityObjectAbortConfig(CipInstance *RESTRICT const instance,
|
|
|
- CipMessageRouterRequest *const message_router_request,
|
|
|
- CipMessageRouterResponse *const message_router_response,
|
|
|
- const struct sockaddr *originator_address,
|
|
|
- const int encapsulation_session) {
|
|
|
-
|
|
|
- message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
- message_router_response->size_of_additional_status = 0;
|
|
|
- InitializeENIPMessage(&message_router_response->message);
|
|
|
- message_router_response->reply_service = (0x80
|
|
|
- | message_router_request->service);
|
|
|
-
|
|
|
- CipAttributeStruct *attribute = GetCipAttribute(instance, 1); //attribute #1 state
|
|
|
- CipUsint state = *(CipUsint*) attribute->data;
|
|
|
-
|
|
|
- if (kEIPConfigurationInProgress == state){
|
|
|
-
|
|
|
- //TODO: implement service
|
|
|
-
|
|
|
- //TODO: change back to state before configuration in progress
|
|
|
- *(CipUsint*) attribute->data = kEIPConfigured; //TODO: remove
|
|
|
- message_router_response->general_status = kCipErrorSuccess;
|
|
|
- }
|
|
|
+EipStatus EIPSecurityObjectAbortConfig(
|
|
|
+ CipInstance *RESTRICT const instance,
|
|
|
+ CipMessageRouterRequest *const message_router_request,
|
|
|
+ CipMessageRouterResponse *const message_router_response,
|
|
|
+ const struct sockaddr *originator_address,
|
|
|
+ const int encapsulation_session) {
|
|
|
+ message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
+ message_router_response->size_of_additional_status = 0;
|
|
|
+ InitializeENIPMessage(&message_router_response->message);
|
|
|
+ message_router_response->reply_service = (0x80 | message_router_request->service);
|
|
|
+
|
|
|
+ CipAttributeStruct *attribute = GetCipAttribute(instance, 1); // attribute #1 state
|
|
|
+ CipUsint state = *(CipUsint *)attribute->data;
|
|
|
+
|
|
|
+ if (kEIPConfigurationInProgress == state) {
|
|
|
+ // TODO: implement service
|
|
|
+
|
|
|
+ // TODO: change back to state before configuration in progress
|
|
|
+ *(CipUsint *)attribute->data = kEIPConfigured; // TODO: remove
|
|
|
+ message_router_response->general_status = kCipErrorSuccess;
|
|
|
+ }
|
|
|
|
|
|
- return kEipStatusOk;
|
|
|
+ return kEipStatusOk;
|
|
|
}
|
|
|
|
|
|
void EncodeEIPSecurityObjectCipherSuiteId(const void *const data,
|
|
|
- ENIPMessage *const outgoing_message)
|
|
|
-{
|
|
|
+ ENIPMessage *const outgoing_message) {
|
|
|
EIPSecurityObjectCipherSuiteId *cipher_suite_id =
|
|
|
- (EIPSecurityObjectCipherSuiteId *) data;
|
|
|
+ (EIPSecurityObjectCipherSuiteId *)data;
|
|
|
|
|
|
EncodeCipUsint(&(cipher_suite_id->iana_first_byte), outgoing_message);
|
|
|
EncodeCipUsint(&(cipher_suite_id->iana_second_byte), outgoing_message);
|
|
|
@@ -447,125 +437,116 @@ int DecodeEIPSecurityObjectPathList(EIPSecurityObjectPathList *const path_list,
|
|
|
return number_of_decoded_bytes;
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * When accessed via Get_Attributes_All or Get_Attribute_Single, the Size of
|
|
|
- * PSK element shall be 0, and 0 bytes of PSK value shall be returned.
|
|
|
- * This ensures that the PSK value cannot be read out of the device,
|
|
|
- * as it is a confidential piece of information.
|
|
|
+/** @brief When accessed via Get_Attributes_All or Get_Attribute_Single, the
|
|
|
+ * Size of PSK element shall be 0, and 0 bytes of PSK value shall be returned.
|
|
|
+ * This ensures that the PSK value cannot be read out of the device,
|
|
|
+ * as it is a confidential piece of information.
|
|
|
*/
|
|
|
void EncodeEIPSecurityObjectPreSharedKeys(const void *const data,
|
|
|
- ENIPMessage *const outgoing_message) {
|
|
|
+ ENIPMessage *const outgoing_message) {
|
|
|
AddSintToMessage(0, outgoing_message);
|
|
|
}
|
|
|
|
|
|
int DecodeEIPSecurityObjectPreSharedKeys(
|
|
|
- EIPSecurityObjectPreSharedKeys *const pre_shared_keys,
|
|
|
- CipMessageRouterRequest *const message_router_request,
|
|
|
- CipMessageRouterResponse *const message_router_response) {
|
|
|
-
|
|
|
- int number_of_decoded_bytes = -1;
|
|
|
+ EIPSecurityObjectPreSharedKeys *const pre_shared_keys,
|
|
|
+ CipMessageRouterRequest *const message_router_request,
|
|
|
+ CipMessageRouterResponse *const message_router_response) {
|
|
|
+ int number_of_decoded_bytes = -1;
|
|
|
|
|
|
- CipUsint number_of_psk = GetUsintFromMessage(
|
|
|
- &(message_router_request->data));
|
|
|
+ CipUsint number_of_psk = GetUsintFromMessage(&(message_router_request->data));
|
|
|
|
|
|
- // At present, a maximum of 1 PSK may be configured
|
|
|
- if (number_of_psk > 1) {
|
|
|
- message_router_response->general_status =
|
|
|
- kCipErrorInvalidAttributeValue;
|
|
|
- return number_of_decoded_bytes;
|
|
|
- }
|
|
|
+ // At present, a maximum of 1 PSK may be configured
|
|
|
+ if (number_of_psk > 1) {
|
|
|
+ message_router_response->general_status = kCipErrorInvalidAttributeValue;
|
|
|
+ return number_of_decoded_bytes;
|
|
|
+ }
|
|
|
|
|
|
- if (number_of_psk == 1) {
|
|
|
- EIPSecurityObjectPreSharedKey *psk_structure = CipCalloc(number_of_psk,
|
|
|
- sizeof(EIPSecurityObjectPreSharedKey));
|
|
|
-
|
|
|
- psk_structure->psk_identity_size = GetUsintFromMessage(
|
|
|
- &(message_router_request->data));
|
|
|
-
|
|
|
- if (psk_structure->psk_identity_size <= SIZE_MAX_PSK_IDENTITY) {
|
|
|
- CipOctet *psk_identity = CipCalloc(psk_structure->psk_identity_size,
|
|
|
- sizeof(CipOctet));
|
|
|
-
|
|
|
- memcpy(psk_identity, message_router_request->data,
|
|
|
- psk_structure->psk_identity_size);
|
|
|
- message_router_request->data += psk_structure->psk_identity_size;
|
|
|
- // for (int i=0; i<psk_structure->psk_identity_size; i++) {
|
|
|
- // psk_identity[i] = GetByteFromMessage(&(message_router_request->data));
|
|
|
- // }
|
|
|
-
|
|
|
- psk_structure->psk_identity = psk_identity;
|
|
|
- psk_structure->psk_size = GetUsintFromMessage(
|
|
|
- &(message_router_request->data));
|
|
|
-
|
|
|
- if (psk_structure->psk_size <= SIZE_MAX_PSK) {
|
|
|
- CipOctet *psk = CipCalloc(psk_structure->psk_size,
|
|
|
- sizeof(CipOctet));
|
|
|
-
|
|
|
- memcpy(psk, message_router_request->data,
|
|
|
- psk_structure->psk_size);
|
|
|
- // for (int i=0; i<psk_structure->psk_size; i++) {
|
|
|
- // psk[i] = GetByteFromMessage(&(message_router_request->data));
|
|
|
- // }
|
|
|
-
|
|
|
- psk_structure->psk = psk;
|
|
|
- //TODO: Cleanup existing PSKs
|
|
|
- pre_shared_keys->pre_shared_keys = psk_structure;
|
|
|
- message_router_response->general_status = kCipErrorSuccess;
|
|
|
- } else {
|
|
|
- if (psk_identity != NULL) {
|
|
|
- CipFree(psk_identity);
|
|
|
- psk_structure->psk_identity = NULL;
|
|
|
- }
|
|
|
- if (psk_structure != NULL) {
|
|
|
- CipFree(psk_structure);
|
|
|
- }
|
|
|
- message_router_response->general_status =
|
|
|
- kCipErrorInvalidAttributeValue;
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (psk_structure != NULL) {
|
|
|
- CipFree(psk_structure);
|
|
|
- }
|
|
|
- message_router_response->general_status =
|
|
|
- kCipErrorInvalidAttributeValue;
|
|
|
- }
|
|
|
- } else {
|
|
|
- //TODO: Cleanup existing PSKs
|
|
|
- pre_shared_keys->number_of_pre_shared_keys = number_of_psk; //0
|
|
|
- pre_shared_keys->pre_shared_keys = NULL;
|
|
|
- message_router_response->general_status = kCipErrorSuccess;
|
|
|
- }
|
|
|
+ if (number_of_psk == 1) {
|
|
|
+ EIPSecurityObjectPreSharedKey *psk_structure =
|
|
|
+ CipCalloc(number_of_psk, sizeof(EIPSecurityObjectPreSharedKey));
|
|
|
+
|
|
|
+ psk_structure->psk_identity_size =
|
|
|
+ GetUsintFromMessage(&(message_router_request->data));
|
|
|
+
|
|
|
+ if (psk_structure->psk_identity_size <= SIZE_MAX_PSK_IDENTITY) {
|
|
|
+ CipOctet *psk_identity =
|
|
|
+ CipCalloc(psk_structure->psk_identity_size, sizeof(CipOctet));
|
|
|
+
|
|
|
+ memcpy(psk_identity, message_router_request->data, psk_structure->psk_identity_size);
|
|
|
+ message_router_request->data += psk_structure->psk_identity_size;
|
|
|
+ // for (int i=0; i<psk_structure->psk_identity_size; i++) {
|
|
|
+ // psk_identity[i] =
|
|
|
+ // GetByteFromMessage(&(message_router_request->data));
|
|
|
+ // }
|
|
|
+
|
|
|
+ psk_structure->psk_identity = psk_identity;
|
|
|
+ psk_structure->psk_size = GetUsintFromMessage(&(message_router_request->data));
|
|
|
+
|
|
|
+ if (psk_structure->psk_size <= SIZE_MAX_PSK) {
|
|
|
+ CipOctet *psk = CipCalloc(psk_structure->psk_size, sizeof(CipOctet));
|
|
|
+
|
|
|
+ memcpy(psk, message_router_request->data, psk_structure->psk_size);
|
|
|
+ // for (int i=0; i<psk_structure->psk_size; i++) {
|
|
|
+ // psk[i] =
|
|
|
+ // GetByteFromMessage(&(message_router_request->data));
|
|
|
+ // }
|
|
|
+
|
|
|
+ psk_structure->psk = psk;
|
|
|
+ // TODO: Cleanup existing PSKs
|
|
|
+ pre_shared_keys->pre_shared_keys = psk_structure;
|
|
|
+ message_router_response->general_status = kCipErrorSuccess;
|
|
|
+ } else {
|
|
|
+ if (psk_identity != NULL) {
|
|
|
+ CipFree(psk_identity);
|
|
|
+ psk_structure->psk_identity = NULL;
|
|
|
+ }
|
|
|
+ if (psk_structure != NULL) {
|
|
|
+ CipFree(psk_structure);
|
|
|
+ }
|
|
|
+ message_router_response->general_status =
|
|
|
+ kCipErrorInvalidAttributeValue;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (psk_structure != NULL) {
|
|
|
+ CipFree(psk_structure);
|
|
|
+ }
|
|
|
+ message_router_response->general_status = kCipErrorInvalidAttributeValue;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ // TODO: Cleanup existing PSKs
|
|
|
+ pre_shared_keys->number_of_pre_shared_keys = number_of_psk; // 0
|
|
|
+ pre_shared_keys->pre_shared_keys = NULL;
|
|
|
+ message_router_response->general_status = kCipErrorSuccess;
|
|
|
+ }
|
|
|
|
|
|
- return number_of_decoded_bytes;
|
|
|
+ return number_of_decoded_bytes;
|
|
|
}
|
|
|
|
|
|
-int DecodeDTLSTimeout(CipUint *const data,
|
|
|
- const CipMessageRouterRequest *const message_router_request,
|
|
|
- CipMessageRouterResponse *const message_router_response) {
|
|
|
-
|
|
|
- CipInstance *const instance = GetCipInstance(
|
|
|
- GetCipClass(message_router_request->request_path.class_id),
|
|
|
- message_router_request->request_path.instance_number);
|
|
|
+int DecodeDTLSTimeout(
|
|
|
+ CipUint *const data,
|
|
|
+ const CipMessageRouterRequest *const message_router_request,
|
|
|
+ CipMessageRouterResponse *const message_router_response) {
|
|
|
+ CipInstance *const instance =
|
|
|
+ GetCipInstance(GetCipClass(message_router_request->request_path.class_id),
|
|
|
+ message_router_request->request_path.instance_number);
|
|
|
|
|
|
- CipAttributeStruct *attribute = GetCipAttribute(instance, 1); //attribute #1 state
|
|
|
- CipUsint state = *(CipUsint*)attribute->data;
|
|
|
+ CipAttributeStruct *attribute = GetCipAttribute(instance, 1); // attribute #1 state
|
|
|
+ CipUsint state = *(CipUsint *)attribute->data;
|
|
|
|
|
|
- if (kEIPConfigurationInProgress == state){
|
|
|
+ if (kEIPConfigurationInProgress == state) {
|
|
|
+ CipUint dtls_timeout = GetUintFromMessage(&(message_router_request->data));
|
|
|
|
|
|
- CipUint dtls_timeout = GetUintFromMessage(&(message_router_request->data));
|
|
|
-
|
|
|
- if (0 <= dtls_timeout && 3600 >= dtls_timeout) {
|
|
|
- *data = dtls_timeout;
|
|
|
- message_router_response->general_status = kCipErrorSuccess;
|
|
|
- return 2;
|
|
|
- } else {
|
|
|
- message_router_response->general_status =
|
|
|
- kCipErrorInvalidAttributeValue;
|
|
|
- }
|
|
|
- } else {
|
|
|
- message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
- }
|
|
|
- return -1;
|
|
|
+ if (0 <= dtls_timeout && 3600 >= dtls_timeout) {
|
|
|
+ *data = dtls_timeout;
|
|
|
+ message_router_response->general_status = kCipErrorSuccess;
|
|
|
+ return 2;
|
|
|
+ } else {
|
|
|
+ message_router_response->general_status = kCipErrorInvalidAttributeValue;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ message_router_response->general_status = kCipErrorObjectStateConflict;
|
|
|
+ }
|
|
|
+ return -1;
|
|
|
}
|
|
|
|
|
|
void EIPSecurityObjectInitializeClassSettings(CipClass *class) {
|
Markus