InsertAttribute param update (decode added to attribute struct)

source/src/cip/cipassembly.c

@@ -62,25 +62,18 @@ CipClass *CreateAssemblyClass(void) {
                                             "assembly", /* name */
                                             2, /* Revision, according to the CIP spec currently this has to be 2 */
                                             NULL); /* # function pointer for initialization*/
-  if(NULL != assembly_class) {
-    InsertService(assembly_class,
-                  kGetAttributeSingle,
-                  &GetAttributeSingle,
-                  "GetAttributeSingle");
-
-//    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);
-  }
+	if (NULL != assembly_class) {
+		InsertService(assembly_class, kGetAttributeSingle, &GetAttributeSingle,
+				"GetAttributeSingle");
+
+		InsertService(assembly_class, kSetAttributeSingle, &SetAttributeSingle,
+				"SetAttributeSingle");
+
+		InsertGetSetCallback(assembly_class, AssemblyPreGetCallback,
+				kPreGetFunc);
+		InsertGetSetCallback(assembly_class, AssemblyPostSetCallback,
+				kPostSetFunc);
+	}
 
   return assembly_class;
 }
@@ -130,13 +123,8 @@ 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);
-  InsertAttribute2(instance,
+
+  InsertAttribute(instance,
                    3,
                    kCipByteArray,
                    EncodeCipByteArray,
@@ -144,17 +132,12 @@ CipInstance *CreateAssemblyObject(const EipUint32 instance_id,
                    assembly_byte_array,
                    kSetAndGetAble | kPreGetFunc | kPostSetFunc);
   /* Attribute 4 Number of bytes in Attribute 3 */
-//  InsertAttribute(instance,
-//                  4,
-//                  kCipUint,
-//                  EncodeCipUint,
-//                  &(assembly_byte_array->length),
-//                  kGetableSingle);
-  InsertAttribute2(instance,
+
+  InsertAttribute(instance,
                     4,
                     kCipUint,
                     EncodeCipUint,
-					DecodeCipUint,
+					NULL,
                     &(assembly_byte_array->length),
                     kGetableSingle);
 

source/src/cip/cipcommon.c

@@ -285,24 +285,24 @@ CipClass *CreateCipClass(const CipUdint class_code,
   AllocateAttributeMasks(cip_class); /* Allocation of bitmasks for Instance Attributes */
 
   if(NULL == initializer) {
-    InsertAttribute( (CipInstance *) cip_class, 1, kCipUint, EncodeCipUint,
-                     (void *) &cip_class->revision, kGetableSingleAndAll );                                                /* revision */
-    InsertAttribute( (CipInstance *) cip_class, 2, kCipUint, EncodeCipUint,
-                     (void *) &cip_class->number_of_instances,
-                     kGetableSingleAndAll );                                                                                          /* #2 Max instance no. */
-    InsertAttribute( (CipInstance *) cip_class, 3, kCipUint, EncodeCipUint,
-                     (void *) &cip_class->number_of_instances,
-                     kGetableSingleAndAll );                                                                                          /* number of instances currently existing*/
-    InsertAttribute( (CipInstance *) cip_class, 4, kCipUint, EncodeCipUint,
-                     (void *) &kCipUintZero, kGetableAllDummy );                                                /* optional attribute list - default = 0 */
-    InsertAttribute( (CipInstance *) cip_class, 5, kCipUint, EncodeCipUint,
-                     (void *) &kCipUintZero, kNotSetOrGetable );                                                /* optional service list - default = 0 */
-    InsertAttribute( (CipInstance *) cip_class, 6, kCipUint, EncodeCipUint,
-                     (void *) &meta_class->highest_attribute_number,
-                     kGetableSingle );                                                                                                /* max class attribute number*/
-    InsertAttribute( (CipInstance *) cip_class, 7, kCipUint, EncodeCipUint,
-                     (void *) &cip_class->highest_attribute_number,
-                     kGetableSingle );                                                                                               /* max instance attribute number*/
+	InsertAttribute((CipInstance*) cip_class, 1, kCipUint, EncodeCipUint,
+			NULL, (void*) &cip_class->revision, kGetableSingleAndAll); 			/* revision */
+	InsertAttribute((CipInstance*) cip_class, 2, kCipUint, EncodeCipUint,
+			NULL, (void*) &cip_class->number_of_instances,
+			kGetableSingleAndAll); 												/* #2 Max instance no. */
+	InsertAttribute((CipInstance*) cip_class, 3, kCipUint, EncodeCipUint,
+			NULL, (void*) &cip_class->number_of_instances,
+			kGetableSingleAndAll); 												/* number of instances currently existing*/
+	InsertAttribute((CipInstance*) cip_class, 4, kCipUint, EncodeCipUint,
+			NULL, (void*) &kCipUintZero, kGetableAllDummy); 					/* optional attribute list - default = 0 */
+	InsertAttribute((CipInstance*) cip_class, 5, kCipUint, EncodeCipUint,
+			NULL, (void*) &kCipUintZero, kNotSetOrGetable); 					/* optional service list - default = 0 */
+	InsertAttribute((CipInstance*) cip_class, 6, kCipUint, EncodeCipUint,
+			NULL, (void*) &meta_class->highest_attribute_number,
+			kGetableSingle); 													/* max class attribute number*/
+	InsertAttribute((CipInstance*) cip_class, 7, kCipUint, EncodeCipUint,
+			NULL, (void*) &cip_class->highest_attribute_number,
+			kGetableSingle);                                                     /* max instance attribute number*/
     if(number_of_class_services > 0) {
       if(number_of_class_services > 1) { /*only if the mask has values add the get_attribute_all service */
         InsertService(meta_class,
@@ -324,53 +324,6 @@ CipClass *CreateCipClass(const CipUdint class_code,
 }
 
 void InsertAttribute(CipInstance *const instance,
-                     const EipUint16 attribute_number,
-                     const EipUint8 cip_type,
-                     CipAttributeEncodeInMessage encode_function,
-					 //CipAttributeDecodeInMessage decode_function, //TODO: add decode
-                     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->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 InsertAttribute2(CipInstance *const instance,     //TODO: used for testing, remove
                      const EipUint16 attribute_number,
                      const EipUint8 cip_type,
                      CipAttributeEncodeInMessage encode_function,

source/src/cip/cipconnectionmanager.c

@@ -181,20 +181,20 @@ void InitializeConnectionManager(CipClass *class) {
 
   CipClass *meta_class = class->class_instance.cip_class;
 
-  InsertAttribute( (CipInstance *) class, 1, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 1, kCipUint, EncodeCipUint, NULL,
                    (void *) &class->revision, kGetableSingleAndAll );                                                /* revision */
-  InsertAttribute( (CipInstance *) class, 2, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 2, kCipUint, EncodeCipUint, NULL,
                    (void *) &class->number_of_instances, kGetableSingleAndAll );                                                /*  largest instance number */
-  InsertAttribute( (CipInstance *) class, 3, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 3, kCipUint, EncodeCipUint, NULL,
                    (void *) &class->number_of_instances, kGetableSingle );                                                /* number of instances currently existing*/
-  InsertAttribute( (CipInstance *) class, 4, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 4, kCipUint, EncodeCipUint, NULL,
                    (void *) &kCipUintZero, kNotSetOrGetable );                                                /* optional attribute list - default = 0 */
-  InsertAttribute( (CipInstance *) class, 5, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 5, kCipUint, EncodeCipUint, NULL,
                    (void *) &kCipUintZero, kNotSetOrGetable );                                                /* optional service list - default = 0 */
-  InsertAttribute( (CipInstance *) class, 6, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 6, kCipUint, EncodeCipUint, NULL,
                    (void *) &meta_class->highest_attribute_number,
                    kGetableSingleAndAll );                                                                                                /* max class attribute number*/
-  InsertAttribute( (CipInstance *) class, 7, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 7, kCipUint, EncodeCipUint, NULL,
                    (void *) &class->highest_attribute_number,
                    kGetableSingleAndAll );                                                                                           /* max instance attribute number*/
 

source/src/cip/cipdlr.c

@@ -143,45 +143,56 @@ EipStatus CipDlrInit(void) {
                   1,
                   kCipUsint,
                   EncodeCipUsint,
+				  NULL,
                   &g_dlr.network_topology,
                   kGetableSingleAndAll);
   InsertAttribute(dlr_instance,
                   2,
                   kCipUsint,
                   EncodeCipUsint,
+				  NULL,
                   &g_dlr.network_status,
                   kGetableSingleAndAll);
   InsertAttribute(dlr_instance,
                   3,
                   kCipUsint,
                   EncodeCipUsint,
+				  NULL,
                   (void *)&s_0xFF_default,
                   kGetableAll);
-  InsertAttribute(dlr_instance,  4, kCipAny, EncodeCipRingSupervisorConfig,
+  InsertAttribute(dlr_instance,
+		  	  	  4,
+				  kCipAny,
+				  EncodeCipRingSupervisorConfig,
+				  NULL,
                   (void *)&s_0x00000000_default,
                   kGetableAllDummy);
   InsertAttribute(dlr_instance,
                   5,
                   kCipUint,
                   EncodeCipUint,
+				  NULL,
                   (void *)&s_0x0000_default,
                   kGetableAll);
   InsertAttribute(dlr_instance,
                   6,
                   kCipAny,
                   EncodeCipNodeAddress,
+				  NULL,
                   (void *)&s_zero_node,
                   kGetableAll);
   InsertAttribute(dlr_instance,
                   7,
                   kCipAny,
                   EncodeCipNodeAddress,
+				  NULL,
                   (void *)&s_zero_node,
                   kGetableAll);
   InsertAttribute(dlr_instance,
                   8,
                   kCipUint,
                   EncodeCipUint,
+				  NULL,
                   (void *)&s_0xFFFF_default,
                   kGetableAll);
   /* Attribute #9 is not implemented and also NOT part of the GetAttributesAll
@@ -190,18 +201,21 @@ EipStatus CipDlrInit(void) {
                   10,
                   kCipAny,
                   EncodeCipNodeAddress,
+				  NULL,
                   &g_dlr.active_supervisor_address,
                   kGetableSingleAndAll);
   InsertAttribute(dlr_instance,
                   11,
                   kCipUsint,
                   EncodeCipUsint,
+				  NULL,
                   (void *)&s_0x00_default,
                   kGetableAll);
   InsertAttribute(dlr_instance,
                   12,
                   kCipDword,
                   EncodeCipDword,
+				  NULL,
                   &g_dlr.capability_flags,
                   kGetableSingleAndAll);
 

source/src/cip/cipethernetlink.c

@@ -273,18 +273,21 @@ EipStatus CipEthernetLinkInit(void) {
                       1,
                       kCipUdint,
                       EncodeCipUdint,
+					  NULL,
                       &g_ethernet_link[idx].interface_speed,
                       kGetableSingleAndAll);
       InsertAttribute(ethernet_link_instance,
                       2,
                       kCipDword,
                       EncodeCipDword,
+					  NULL,
                       &g_ethernet_link[idx].interface_flags,
                       kGetableSingleAndAll);
       InsertAttribute(ethernet_link_instance,
                       3,
                       kCip6Usint,
                       EncodeCipEthernetLinkPhyisicalAddress,
+					  NULL,
                       &g_ethernet_link[idx].physical_address,
                       kGetableSingleAndAll);
 #if defined(OPENER_ETHLINK_CNTRS_ENABLE) && 0 != OPENER_ETHLINK_CNTRS_ENABLE
@@ -292,6 +295,7 @@ EipStatus CipEthernetLinkInit(void) {
                       4,
                       kCipUsint,
                       EncodeCipUsint,
+					  NULL,
                       &g_ethernet_link[idx].interface_cntrs,
                       kGetableSingleAndAll);
       InsertAttribute(ethernet_link_instance, 5, kCipUsint, EncodeCipUsint,
@@ -301,12 +305,14 @@ EipStatus CipEthernetLinkInit(void) {
                       4,
                       kCipAny,
                       EncodeCipEthernetLinkInterfaceCounters,
+					  NULL,
                       &dummy_attribute_udint,
                       kGetableAllDummy);
       InsertAttribute(ethernet_link_instance,
                       5,
                       kCipAny,
                       EncodeCipEthernetLinkMediaCounters,
+					  NULL,
                       &dummy_attribute_udint,
                       kGetableAllDummy);
 #endif  /* ... && 0 != OPENER_ETHLINK_CNTRS_ENABLE */
@@ -333,26 +339,29 @@ EipStatus CipEthernetLinkInit(void) {
                       6,
                       kCipAny,
                       EncodeCipEthernetLinkInterfaceControl,
+					  NULL,
                       &s_interface_control,
                       kGetableAll);
 #endif
-      InsertAttribute(ethernet_link_instance, 7, kCipUsint, EncodeCipUsint,
+      InsertAttribute(ethernet_link_instance, 7, kCipUsint, EncodeCipUsint, NULL,
                       &g_ethernet_link[idx].interface_type,
                       kGetableSingleAndAll);
-      InsertAttribute(ethernet_link_instance, 8, kCipUsint, EncodeCipUsint,
+      InsertAttribute(ethernet_link_instance, 8, kCipUsint, EncodeCipUsint, NULL,
                       &dummy_attribute_usint, kGetableAllDummy);
-      InsertAttribute(ethernet_link_instance, 9, kCipUsint, EncodeCipUsint,
+      InsertAttribute(ethernet_link_instance, 9, kCipUsint, EncodeCipUsint, NULL,
                       &dummy_attribute_usint, kGetableAllDummy);
       InsertAttribute(ethernet_link_instance,
                       10,
                       kCipShortString,
                       EncodeCipShortString,
+					  NULL,
                       &g_ethernet_link[idx].interface_label,
                       IFACE_LABEL_ACCESS_MODE);
       InsertAttribute(ethernet_link_instance,
                       11,
                       kCipAny,
                       EncodeCipEthernetLinkInterfaceCaps,
+					  NULL,
                       &g_ethernet_link[idx].interface_caps,
                       kGetableSingleAndAll);
     }

source/src/cip/cipidentity.c

@@ -189,25 +189,25 @@ void InitializeCipIdentity(CipClass *class) {
   CipClass *meta_class = class->class_instance.cip_class;
 
   InsertAttribute( (CipInstance *) class, 1, kCipUint,
-                   EncodeCipUint,
+                   EncodeCipUint, NULL,
                    (void *) &class->revision,
                    kGetableSingleAndAll );                 /* revision */
   InsertAttribute( (CipInstance *) class, 2, kCipUint,
-                   EncodeCipUint,
+                   EncodeCipUint, NULL,
                    (void *) &class->number_of_instances, kGetableSingleAndAll ); /*  largest instance number */
   InsertAttribute( (CipInstance *) class, 3, kCipUint,
-                   EncodeCipUint,
+                   EncodeCipUint, NULL,
                    (void *) &class->number_of_instances, kGetableSingle ); /* number of instances currently existing*/
-  InsertAttribute( (CipInstance *) class, 4, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 4, kCipUint, EncodeCipUint, NULL,
                    (void *) &kCipUintZero,
                    kNotSetOrGetable ); /* optional attribute list - default = 0 */
-  InsertAttribute( (CipInstance *) class, 5, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 5, kCipUint, EncodeCipUint, NULL,
                    (void *) &kCipUintZero,
                    kNotSetOrGetable ); /* optional service list - default = 0 */
-  InsertAttribute( (CipInstance *) class, 6, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 6, kCipUint, EncodeCipUint, NULL,
                    (void *) &meta_class->highest_attribute_number,
                    kGetableSingleAndAll );                 /* max class attribute number*/
-  InsertAttribute( (CipInstance *) class, 7, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) class, 7, kCipUint, EncodeCipUint, NULL,
                    (void *) &class->highest_attribute_number,
                    kGetableSingleAndAll );                 /* max instance attribute number*/
 
@@ -248,42 +248,49 @@ EipStatus CipIdentityInit() {
                   1,
                   kCipUint,
                   EncodeCipUint,
+				  NULL,
                   &g_identity.vendor_id,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   2,
                   kCipUint,
                   EncodeCipUint,
+				  NULL,
                   &g_identity.device_type,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   3,
                   kCipUint,
                   EncodeCipUint,
+				  NULL,
                   &g_identity.product_code,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   4,
                   kCipUsintUsint,
                   EncodeRevision,
+				  NULL,
                   &g_identity.revision,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   5,
                   kCipWord,
                   EncodeCipWord,
+				  NULL,
                   &g_identity.status,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   6,
                   kCipUdint,
                   EncodeCipUdint,
+				  NULL,
                   &g_identity.serial_number,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   7,
                   kCipShortString,
                   EncodeCipShortString,
+				  NULL,
                   &g_identity.product_name,
                   kGetableSingleAndAll);
 

source/src/cip/cipmessagerouter.c

@@ -54,24 +54,24 @@ void InitializeCipMessageRouterClass(CipClass *cip_class) {
 
   CipClass *meta_class = cip_class->class_instance.cip_class;
 
-  InsertAttribute( (CipInstance *) cip_class, 1, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) cip_class, 1, kCipUint, EncodeCipUint, NULL,
                    (void *) &cip_class->revision, kGetableSingleAndAll );   /* revision */
-  InsertAttribute( (CipInstance *) cip_class, 2, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) cip_class, 2, kCipUint, EncodeCipUint, NULL,
                    (void *) &cip_class->number_of_instances,
                    kGetableSingle );                                       /*  largest instance number */
-  InsertAttribute( (CipInstance *) cip_class, 3, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) cip_class, 3, kCipUint, EncodeCipUint, NULL,
                    (void *) &cip_class->number_of_instances,
                    kGetableSingle );                                                           /* number of instances currently existing*/
-  InsertAttribute( (CipInstance *) cip_class, 4, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) cip_class, 4, kCipUint, EncodeCipUint, NULL,
                    (void *) &kCipUintZero,
                    kGetableAll );   /* optional attribute list - default = 0 */
-  InsertAttribute( (CipInstance *) cip_class, 5, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) cip_class, 5, kCipUint, EncodeCipUint, NULL,
                    (void *) &kCipUintZero,
                    kGetableAll ); /* optional service list - default = 0 */
-  InsertAttribute( (CipInstance *) cip_class, 6, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) cip_class, 6, kCipUint, EncodeCipUint, NULL,
                    (void *) &meta_class->highest_attribute_number,
                    kGetableSingleAndAll );                       /* max class attribute number*/
-  InsertAttribute( (CipInstance *) cip_class, 7, kCipUint, EncodeCipUint,
+  InsertAttribute( (CipInstance *) cip_class, 7, kCipUint, EncodeCipUint, NULL,
                    (void *) &cip_class->highest_attribute_number,
                    kGetableSingleAndAll );                       /* max instance attribute number*/
 

source/src/cip/cipqos.c

@@ -168,48 +168,56 @@ EipStatus CipQoSInit() {
                   1,
                   kCipUsint,
                   EncodeCipUsint,
+				  NULL,
                   (void *) &g_qos.q_frames_enable,
                   kNotSetOrGetable);
   InsertAttribute(instance,
                   2,
                   kCipUsint,
                   EncodeCipUsint,
+				  NULL,
                   (void *) &g_qos.dscp.event,
                   kNotSetOrGetable);
   InsertAttribute(instance,
                   3,
                   kCipUsint,
                   EncodeCipUsint,
+				  NULL,
                   (void *) &g_qos.dscp.general,
                   kNotSetOrGetable);
   InsertAttribute(instance,
                   4,
                   kCipUsint,
                   EncodeCipUsint,
+				  DecodeCipUsint,
                   (void *) &g_qos.dscp.urgent,
                   kGetableSingle | kSetable | kNvDataFunc);
   InsertAttribute(instance,
                   5,
                   kCipUsint,
                   EncodeCipUsint,
+				  DecodeCipUsint,
                   (void *) &g_qos.dscp.scheduled,
                   kGetableSingle | kSetable | kNvDataFunc);
   InsertAttribute(instance,
                   6,
                   kCipUsint,
                   EncodeCipUsint,
+				  DecodeCipUsint,
                   (void *) &g_qos.dscp.high,
                   kGetableSingle | kSetable | kNvDataFunc);
   InsertAttribute(instance,
                   7,
                   kCipUsint,
                   EncodeCipUsint,
+				  DecodeCipUsint,
                   (void *) &g_qos.dscp.low,
                   kGetableSingle | kSetable | kNvDataFunc);
   InsertAttribute(instance,
                   8,
                   kCipUsint,
                   EncodeCipUsint,
+				  DecodeCipUsint,
                   (void *) &g_qos.dscp.explicit_msg,
                   kGetableSingle | kSetable | kNvDataFunc);
 

source/src/cip/ciptcpipinterface.c

@@ -589,66 +589,90 @@ EipStatus CipTcpIpInterfaceInit() {
 
   CipInstance *instance = GetCipInstance(tcp_ip_class, 1); /* bind attributes to the instance #1 that was created above */
 
-  InsertAttribute(instance, 1, kCipDword, EncodeCipDword, &g_tcpip.status,
+  InsertAttribute(instance,
+		  	  	  1,
+				  kCipDword,
+				  EncodeCipDword,
+				  NULL,
+				  &g_tcpip.status,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   2,
                   kCipDword,
                   EncodeCipDword,
+				  NULL,
                   &g_tcpip.config_capability,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   3,
                   kCipDword,
                   EncodeCipDword,
+				  DecodeCipWord,
                   &g_tcpip.config_control,
                   kSetAndGetAble | kNvDataFunc | IFACE_CFG_SET_MODE );
   InsertAttribute(instance,
                   4,
                   kCipEpath,
                   EncodeCipEPath,
+				  NULL,
                   &g_tcpip.physical_link_object,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   5,
                   kCipUdintUdintUdintUdintUdintString,
                   EncoodeCipTcpIpInterfaceConfiguration,
+				  NULL,
                   &g_tcpip.interface_configuration,
                   kGetableSingleAndAll | kNvDataFunc | IFACE_CFG_SET_MODE);
-  InsertAttribute(instance, 6, kCipString, EncodeCipString, &g_tcpip.hostname,
+  InsertAttribute(instance,
+		  	  	  6,
+				  kCipString,
+				  EncodeCipString,
+				  NULL,
+				  &g_tcpip.hostname,
                   kGetableSingleAndAll | kNvDataFunc | IFACE_CFG_SET_MODE);
   InsertAttribute(instance,
                   7,
                   kCipAny,
                   EncodeSafetyNetworkNumber,
+				  NULL,
                   &dummy_data_field,
                   kGetableAllDummy);
   InsertAttribute(instance,
                   8,
                   kCipUsint,
                   EncodeCipUsint,
+				  NULL,
                   &g_tcpip.mcast_ttl_value,
                   kGetableSingleAndAll);
   InsertAttribute(instance,
                   9,
                   kCipAny,
                   EncodeCipTcpIpMulticastConfiguration,
+				  NULL,
                   &g_tcpip.mcast_config,
                   kGetableSingleAndAll);
-  InsertAttribute(instance, 10, kCipBool, EncodeCipBool, &g_tcpip.select_acd,
+  InsertAttribute(instance,
+		  	  	  10,
+				  kCipBool,
+				  EncodeCipBool,
+				  NULL,
+				  &g_tcpip.select_acd,
                   kGetableAllDummy);
   InsertAttribute(instance,
                   11,
                   kCipBool,
                   EncodeCipLastConflictDetected,
+				  NULL,
                   &dummy_data_field,
                   kGetableAllDummy);
-  InsertAttribute(instance, 12, kCipBool, EncodeCipBool, &dummy_data_field,
-                  kGetableAllDummy);
+  InsertAttribute(instance, 12, kCipBool, EncodeCipBool, NULL,
+		  	  	  &dummy_data_field, kGetableAllDummy);
   InsertAttribute(instance,
                   13,
                   kCipUint,
                   EncodeCipUint,
+				  DecodeCipUint,
                   &g_tcpip.encapsulation_inactivity_timeout,
                   kSetAndGetAble | kNvDataFunc);
 

source/src/opener_api.h

@@ -232,7 +232,7 @@ void InsertAttribute(CipInstance *const instance,
                      const EipUint16 attribute_number,
                      const EipUint8 cip_type,
                      CipAttributeEncodeInMessage encode_function,
-					 //CipAttributeDecodeInMessage decode_function, //TODO: add decode
+					 CipAttributeDecodeInMessage decode_function,
                      void *const data,
                      const EipByte cip_flags);