setAttributeSingle test (Assembly)

source/src/cip/cipassembly.c

@@ -61,10 +61,17 @@ CipClass *CreateAssemblyClass(void) {
                   kGetAttributeSingle,
                   &GetAttributeSingle,
                   "GetAttributeSingle");
-    InsertService(assembly_class,
-                  kSetAttributeSingle,
-                  &SetAssemblyAttributeSingle,
-                  "SetAssemblyAttributeSingle");
+
+//    InsertService(assembly_class,
+//                  kSetAttributeSingle,
+//                  &SetAssemblyAttributeSingle,
+//                  "SetAssemblyAttributeSingle");
+
+    InsertService(assembly_class,						//TODO: used for testing, remove
+                      kSetAttributeSingle,
+                      &SetAttributeSingle,
+                      "SetAttributeSingle");
+
     InsertGetSetCallback(assembly_class, AssemblyPreGetCallback, kPreGetFunc);
     InsertGetSetCallback(assembly_class, AssemblyPostSetCallback, kPostSetFunc);
   }
@@ -117,19 +124,33 @@ CipInstance *CreateAssemblyObject(const EipUint32 instance_id,
 
   assembly_byte_array->length = data_length;
   assembly_byte_array->data = data;
-  InsertAttribute(instance,
-                  3,
-                  kCipByteArray,
-                  EncodeCipByteArray,
-                  assembly_byte_array,
-                  kSetAndGetAble | kPreGetFunc | kPostSetFunc);
+//  InsertAttribute(instance,
+//                  3,
+//                  kCipByteArray,
+//                  EncodeCipByteArray,
+//                  assembly_byte_array,
+//                  kSetAndGetAble | kPreGetFunc | kPostSetFunc);
+  InsertAttribute2(instance,
+                   3,
+                   kCipByteArray,
+                   EncodeCipByteArray,
+				   DecodeCipByteArray,
+                   assembly_byte_array,
+                   kSetAndGetAble | kPreGetFunc | kPostSetFunc);
   /* Attribute 4 Number of bytes in Attribute 3 */
-  InsertAttribute(instance,
-                  4,
-                  kCipUint,
-                  EncodeCipUint,
-                  &(assembly_byte_array->length),
-                  kGetableSingle);
+//  InsertAttribute(instance,
+//                  4,
+//                  kCipUint,
+//                  EncodeCipUint,
+//                  &(assembly_byte_array->length),
+//                  kGetableSingle);
+  InsertAttribute2(instance,
+                    4,
+                    kCipUint,
+                    EncodeCipUint,
+					DecodeCipUint,
+                    &(assembly_byte_array->length),
+                    kGetableSingle);
 
   return instance;
 }

source/src/cip/cipcommon.c

@@ -93,7 +93,7 @@ EipStatus NotifyClass(const CipClass *RESTRICT const cip_class,
     CipServiceStruct *service = instance->cip_class->services;         /* get pointer to array of services */
     if (NULL != service)             /* if services are defined */
     {
-      for (size_t i = 0; i < instance->cip_class->number_of_services; i++)                   /* seach the services list */
+      for (size_t i = 0; i < instance->cip_class->number_of_services; i++)                   /* search the services list */
       {
         if (message_router_request->service == service->service_number)                         /* if match is found */
         {
@@ -370,6 +370,54 @@ void InsertAttribute(CipInstance *const instance,
 /* trying to insert too many attributes*/
 }
 
+void InsertAttribute2(CipInstance *const instance,     //TODO: used for testing, remove
+                     const EipUint16 attribute_number,
+                     const EipUint8 cip_type,
+                     CipAttributeEncodeInMessage encode_function,
+					 CipAttributeDecodeInMessage decode_function,
+                     void *const data,
+                     const EipByte cip_flags) {
+
+  OPENER_ASSERT(NULL != data); /* Its not allowed to push a NULL pointer, as this marks an unused attribute struct */
+
+  CipAttributeStruct *attribute = instance->attributes;
+  CipClass *cip_class = instance->cip_class;
+
+  OPENER_ASSERT(NULL != attribute);
+/* adding a attribute to a class that was not declared to have any attributes is not allowed */
+  for(int i = 0; i < instance->cip_class->number_of_attributes; i++) {
+    if(attribute->data == NULL) { /* found non set attribute */
+      attribute->attribute_number = attribute_number;
+      attribute->type = cip_type;
+      attribute->encode = encode_function;
+      attribute->decode = decode_function;
+      attribute->attribute_flags = cip_flags;
+      attribute->data = data;
+
+      OPENER_ASSERT(attribute_number <= cip_class->highest_attribute_number);
+
+      size_t index = CalculateIndex(attribute_number);
+
+      cip_class->get_single_bit_mask[index] |=
+        (cip_flags & kGetableSingle) ? 1 << (attribute_number) % 8 : 0;
+      cip_class->get_all_bit_mask[index] |=
+        (cip_flags & (kGetableAll | kGetableAllDummy) ) ? 1 <<
+        (attribute_number) % 8 : 0;
+      cip_class->set_bit_mask[index] |= ( (cip_flags & kSetable) ? 1 : 0 ) <<
+                                        ( (attribute_number) % 8 );
+
+      return;
+    }
+    attribute++;
+  } OPENER_TRACE_ERR(
+    "Tried to insert too many attributes into class: %" PRIu32 " '%s', instance %" PRIu32 "\n",
+    cip_class->class_code,
+    cip_class->class_name,
+    instance->instance_number);
+  OPENER_ASSERT(false);
+/* trying to insert too many attributes*/
+}
+
 void InsertService(const CipClass *const cip_class,
                    const EipUint8 service_number,
                    const CipServiceFunction service_function,
@@ -477,8 +525,8 @@ EipStatus GetAttributeSingle(CipInstance *RESTRICT const instance,
                                             message_router_request->service);
       }
 
-      OPENER_ASSERT(NULL != attribute); attribute->encode(attribute->data,
-                                                          &message_router_response->message);
+      OPENER_ASSERT(NULL != attribute);
+      attribute->encode(attribute->data, &message_router_response->message);
       message_router_response->general_status = kCipErrorSuccess;
 
 /* Call the PostGetCallback if enabled for this attribute and the class provides one. */
@@ -682,7 +730,7 @@ void GenerateSetAttributeSingleHeader( //TODO: update
   InitializeENIPMessage(&message_router_response->message);
   message_router_response->reply_service =
     (0x80 | message_router_request->service);
-  message_router_response->general_status = kCipErrorAttributeNotSupported;
+  message_router_response->general_status = kCipErrorSuccess;//kCipErrorAttributeNotSupported;
   message_router_response->size_of_additional_status = 0;
 }
 
@@ -719,11 +767,31 @@ EipStatus SetAttributeSingle(CipInstance *RESTRICT const instance,
                                             attribute,
                                             message_router_request->service);
       }
+			//#################   //TODO: remove DEBUG
+
+			CipByteArray *attribute_test = (CipByteArray*) attribute->data;
+
+			OPENER_TRACE_INFO("DEBUG: attribute_data: "); //TODO: remove
+			for (int i = 0; i < attribute_test->length; i++) {
+				OPENER_TRACE_INFO("%x",*(attribute_test->data+i)); //TODO: remove
+			} OPENER_TRACE_INFO("\n"); //TODO: remove
+			//############################
 
       OPENER_ASSERT(NULL != attribute);
-      attribute->decode(attribute->data, &message_router_response->message);
+      attribute->decode(attribute->data, message_router_request->data);
+      //TODO: check status after writing data
       message_router_response->general_status = kCipErrorSuccess;
 
+			//#################   //TODO: remove DEBUG
+
+			attribute_test = (CipByteArray*) attribute->data;
+
+			OPENER_TRACE_INFO("DEBUG: attribute_data: "); //TODO: remove
+			for (int i = 0; i < attribute_test->length; i++) {
+				OPENER_TRACE_INFO("%x",*(attribute_test->data+i)); //TODO: remove
+			} OPENER_TRACE_INFO("\n"); //TODO: remove
+			//############################
+
       /* Call the PostSetCallback if enabled for this attribute and the class provides one. */
       if ( (attribute->attribute_flags & kPostSetFunc) &&
            NULL != instance->cip_class->PostSetCallback ) {
@@ -756,6 +824,38 @@ int DecodeCipByte(const CipByte *const data,
 		return number_of_decoded_bytes;
 }
 
+int DecodeCipByteArray(const CipByteArray *const data,
+		const EipUint8 **const cip_message) {
+
+	int number_of_decoded_bytes = -1;
+	OPENER_TRACE_INFO(" -> set attribute byte array\r\n");
+	CipByteArray *cip_byte_array = (CipByteArray*) data;
+
+	OPENER_TRACE_INFO("message_data_length: %d\n", cip_message); //TODO: error
+	OPENER_TRACE_INFO("attribute_data_length: %d\n", data->length);
+
+//	if (get cip_message < data->length) {  //if(message_router_request->request_path_size > data->length)
+//		OPENER_TRACE_INFO(
+//				"DecodeCipByteArray: not enough data received.\r\n");
+//		//message_router_response->general_status = kCipErrorNotEnoughData;
+//		return number_of_decoded_bytes;
+//	} else {
+//		if (message_data->length > data->length) {
+//			OPENER_TRACE_INFO(
+//					"DecodeCipByteArray: too much data received.\r\n");
+//			//message_router_response->general_status = kCipErrorTooMuchData;
+//			return number_of_decoded_bytes;
+//		}
+//	}
+
+	memcpy(cip_byte_array->data, cip_message, cip_byte_array->length);
+	*cip_message += cip_byte_array->length;
+
+	number_of_decoded_bytes = cip_byte_array->length;
+
+	return number_of_decoded_bytes;
+}
+
 int DecodeCipWord(const CipByte *const data,
 		const EipUint16 **const cip_message) {
 

source/src/cip/ciptypes.h

@@ -278,7 +278,7 @@ typedef void (*CipAttributeEncodeInMessage)(const void *const data,
 
 /** @brief self-describing data decoding for CIP types */
 typedef void (*CipAttributeDecodeInMessage)(const void *const data,
-                                            ENIPMessage *const incoming_message); //TODO: chek if correct
+											EipUint16 *const message_data); //TODO: chek if correct
 
 /** @brief Structure to describe a single CIP attribute of an object
  */

source/src/opener_api.h

@@ -236,6 +236,14 @@ void InsertAttribute(CipInstance *const instance,
                      void *const data,
                      const EipByte cip_flags);
 
+void InsertAttribute2(CipInstance *const instance, //TODO: used for testing, remove
+                     const EipUint16 attribute_number,
+                     const EipUint8 cip_type,
+                     CipAttributeEncodeInMessage encode_function,
+					 CipAttributeDecodeInMessage decode_function,
+                     void *const data,
+                     const EipByte cip_flags);
+
 /** @ingroup CIP_API
  * @brief Allocates Attribute bitmasks
  *
@@ -370,7 +378,7 @@ void EncodeCipEthernetLinkPhyisicalAddress(const void *const data,
                                            ENIPMessage *const outgoing_message);
 
 /** @ingroup CIP_API
- * @brief Retrieve the given data according to CIP encoding from the message
+ * @brief Retrieve the given data according to CIP encoding from the message     //TODO: update
  * buffer.
  *
  * This function may be used in in own services for handling data from the
@@ -391,6 +399,9 @@ int DecodeCipBool(const CipBool *const data,
 int DecodeCipByte(const CipByte *const data,
 			const EipUint8 **const cip_message);
 
+int DecodeCipByteArray(const CipByteArray *const data,
+			const EipUint8 **const cip_message);
+
 int DecodeCipWord(const CipByte *const data,
 		const EipUint16 **const cip_message);