Adds GetConnectionObjectTransportClassTriggerTransportClass

Signed-off-by: Martin Melik Merkumians <melik-merkumians@acin.tuwien.ac.at>

source/src/cip/cipconnectionobject.c

@@ -18,9 +18,19 @@
 #define CIP_CONNECTION_OBJECT_INSTANCE_TYPE_IO 1
 #define CIP_CONNECTION_OBJECT_INSTANCE_TYPE_CIP_BRIDGED 2
 
-#define CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_CYCLIC (0 << 4)
-#define CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_CHANGE_OF_STATE (1 << 4)
-#define CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_APPLICATION_OBJECT (2 << 4)
+#define CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_CYCLIC ( \
+    0 << 4)
+#define \
+  CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_CHANGE_OF_STATE ( \
+    1 << 4)
+#define \
+  CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_APPLICATION_OBJECT ( \
+    2 << 4)
+
+#define CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_TRANSPORT_CLASS_0 0
+#define CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_TRANSPORT_CLASS_1 1
+#define CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_TRANSPORT_CLASS_2 2
+#define CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_TRANSPORT_CLASS_3 3
 
 ConnectionObjectState GetConnectionObjectState(
   const CipConnectionObject *const connection_object) {
@@ -45,12 +55,15 @@ ConnectionObjectState GetConnectionObjectState(
 
 ConnectionObjectInstanceType GetConnectionObjectInstanceType(
   const CipConnectionObject *const connection_object) {
-	switch(connection_object->instance_type) {
-	case CIP_CONNECTION_OBJECT_INSTANCE_TYPE_EXPLICIT_MESSAGING: return kConnectionObjectInstanceTypeExplicitMessaging; break;
-	case CIP_CONNECTION_OBJECT_INSTANCE_TYPE_IO: return kConnectionObjectInstanceTypeIO; break;
-	case CIP_CONNECTION_OBJECT_INSTANCE_TYPE_CIP_BRIDGED: return kConnectionObjectInstanceTypeCipBridged; break;
-	default: return kConnectionObjectInstanceTypeInvalid;
-	}
+  switch(connection_object->instance_type) {
+    case CIP_CONNECTION_OBJECT_INSTANCE_TYPE_EXPLICIT_MESSAGING: return
+        kConnectionObjectInstanceTypeExplicitMessaging; break;
+    case CIP_CONNECTION_OBJECT_INSTANCE_TYPE_IO: return
+        kConnectionObjectInstanceTypeIO; break;
+    case CIP_CONNECTION_OBJECT_INSTANCE_TYPE_CIP_BRIDGED: return
+        kConnectionObjectInstanceTypeCipBridged; break;
+    default: return kConnectionObjectInstanceTypeInvalid;
+  }
 }
 
 ConnectionObjectTransportClassTriggerDirection
@@ -64,12 +77,45 @@ GetConnectionObjectTransportClassTriggerDirection(
          : kConnectionObjectTransportClassTriggerDirectionClient;
 }
 
-ConnectionObjectTransportClassTriggerProductionTrigger GetConnectionObjectTransportClassTriggerProductionTrigger(const CipConnectionObject *const connection_object) {
-const CipByte kTransportClassTriggerProductionTriggerMask = 0x70;
-switch( (connection_object->transport_class_trigger) & kTransportClassTriggerProductionTriggerMask) {
-case CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_CYCLIC: return kConnectionObjectTransportClassTriggerProductionTriggerCyclic; break;
-case CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_CHANGE_OF_STATE: return kConnectionObjectTransportClassTriggerProductionTriggerChangeOfState; break;
-case CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_APPLICATION_OBJECT: return kConnectionObjectTransportClassTriggerProductionTriggerApplicationObject; break;
-default: return kConnectionObjectTransportClassTriggerProductionTriggerInvalid;
+ConnectionObjectTransportClassTriggerProductionTrigger
+GetConnectionObjectTransportClassTriggerProductionTrigger(
+  const CipConnectionObject *const connection_object) {
+  const CipByte kTransportClassTriggerProductionTriggerMask = 0x70;
+  switch( (connection_object->transport_class_trigger) &
+          kTransportClassTriggerProductionTriggerMask ) {
+    case
+      CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_CYCLIC:
+      return kConnectionObjectTransportClassTriggerProductionTriggerCyclic;
+      break;
+    case
+      CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_CHANGE_OF_STATE
+      : return
+        kConnectionObjectTransportClassTriggerProductionTriggerChangeOfState;
+      break;
+    case
+      CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_PRODUCTION_TRIGGER_APPLICATION_OBJECT
+      : return
+        kConnectionObjectTransportClassTriggerProductionTriggerApplicationObject;
+      break;
+    default: return
+        kConnectionObjectTransportClassTriggerProductionTriggerInvalid;
+  }
 }
+
+ConnectionObjectTransportClassTriggerTransportClass
+GetConnectionObjectTransportClassTriggerTransportClass(
+  const CipConnectionObject *const connection_object) {
+  const CipByte kTransportClassTriggerTransportClassMask = 0x0F;
+  switch( (connection_object->transport_class_trigger) &
+          kTransportClassTriggerTransportClassMask ) {
+    case CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_TRANSPORT_CLASS_0:
+      return kConnectionObjectTransportClassTriggerTransportClass0; break;
+    case CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_TRANSPORT_CLASS_1:
+      return kConnectionObjectTransportClassTriggerTransportClass1; break;
+    case CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_TRANSPORT_CLASS_2:
+      return kConnectionObjectTransportClassTriggerTransportClass2; break;
+    case CIP_CONNECTION_OBJECT_TRANSPORT_CLASS_TRIGGER_TRANSPORT_CLASS_3:
+      return kConnectionObjectTransportClassTriggerTransportClass3; break;
+    default: return kConnectionObjectTransportClassTriggerTransportClassInvalid;
+  }
 }

source/src/cip/cipconnectionobject.h

@@ -81,6 +81,12 @@ ConnectionObjectTransportClassTriggerDirection
 GetConnectionObjectTransportClassTriggerDirection(
   const CipConnectionObject *const connection_object);
 
-ConnectionObjectTransportClassTriggerProductionTrigger GetConnectionObjectTransportClassTriggerProductionTrigger(const CipConnectionObject *const connection_object);
+ConnectionObjectTransportClassTriggerProductionTrigger
+GetConnectionObjectTransportClassTriggerProductionTrigger(
+  const CipConnectionObject *const connection_object);
+
+ConnectionObjectTransportClassTriggerTransportClass
+GetConnectionObjectTransportClassTriggerTransportClass(
+  const CipConnectionObject *const connection_object);
 
 #endif /* SRC_CIP_CIPCONNECTIONOBJECT_H_ */

source/tests/cip/cipconnectionobjecttest.cpp

@@ -19,127 +19,194 @@ TEST_GROUP(CipConnectionObject) {
 };
 
 TEST(CipConnectionObject, StateNonExistent) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.state = 0;
-	ConnectionObjectState state = GetConnectionObjectState(&connection_object);
-	CHECK_EQUAL(kConnectionObjectStateNonExistent, state);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.state = 0;
+  ConnectionObjectState state = GetConnectionObjectState(&connection_object);
+  CHECK_EQUAL(kConnectionObjectStateNonExistent, state);
 }
 
 TEST(CipConnectionObject, StateConfiguring) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.state = 1;
-	ConnectionObjectState state = GetConnectionObjectState(&connection_object);
-	CHECK_EQUAL(kConnectionObjectStateConfiguring, state);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.state = 1;
+  ConnectionObjectState state = GetConnectionObjectState(&connection_object);
+  CHECK_EQUAL(kConnectionObjectStateConfiguring, state);
 }
 
 TEST(CipConnectionObject, StateWaitingForConnectionID) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.state = 2;
-	ConnectionObjectState state = GetConnectionObjectState(&connection_object);
-	CHECK_EQUAL(kConnectionObjectStateWaitingForConnectionID, state);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.state = 2;
+  ConnectionObjectState state = GetConnectionObjectState(&connection_object);
+  CHECK_EQUAL(kConnectionObjectStateWaitingForConnectionID, state);
 }
 
 TEST(CipConnectionObject, StateEstablished) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.state = 3;
-	ConnectionObjectState state = GetConnectionObjectState(&connection_object);
-	CHECK_EQUAL(kConnectionObjectStateEstablished, state);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.state = 3;
+  ConnectionObjectState state = GetConnectionObjectState(&connection_object);
+  CHECK_EQUAL(kConnectionObjectStateEstablished, state);
 }
 
 TEST(CipConnectionObject, StateTimedOut) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.state = 4;
-	ConnectionObjectState state = GetConnectionObjectState(&connection_object);
-	CHECK_EQUAL(kConnectionObjectStateTimedOut, state);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.state = 4;
+  ConnectionObjectState state = GetConnectionObjectState(&connection_object);
+  CHECK_EQUAL(kConnectionObjectStateTimedOut, state);
 }
 
 TEST(CipConnectionObject, StateDeferredDelete) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.state = 5;
-	ConnectionObjectState state = GetConnectionObjectState(&connection_object);
-	CHECK_EQUAL(kConnectionObjectStateDeferredDelete, state);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.state = 5;
+  ConnectionObjectState state = GetConnectionObjectState(&connection_object);
+  CHECK_EQUAL(kConnectionObjectStateDeferredDelete, state);
 }
 
 TEST(CipConnectionObject, StateClosing) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.state = 6;
-	ConnectionObjectState state = GetConnectionObjectState(&connection_object);
-	CHECK_EQUAL(kConnectionObjectStateClosing, state);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.state = 6;
+  ConnectionObjectState state = GetConnectionObjectState(&connection_object);
+  CHECK_EQUAL(kConnectionObjectStateClosing, state);
 }
 
 TEST(CipConnectionObject, StateInvalid) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.state = 7;
-	ConnectionObjectState state = GetConnectionObjectState(&connection_object);
-	CHECK_EQUAL(kConnectionObjectStateInvalid, state);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.state = 7;
+  ConnectionObjectState state = GetConnectionObjectState(&connection_object);
+  CHECK_EQUAL(kConnectionObjectStateInvalid, state);
 }
 
 TEST(CipConnectionObject, InstanceTypeInvalid) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.instance_type = 4;
-	ConnectionObjectInstanceType type = GetConnectionObjectInstanceType(&connection_object);
-	CHECK_EQUAL(kConnectionObjectInstanceTypeInvalid, type);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.instance_type = 4;
+  ConnectionObjectInstanceType type = GetConnectionObjectInstanceType(
+    &connection_object);
+  CHECK_EQUAL(kConnectionObjectInstanceTypeInvalid, type);
 }
 
 TEST(CipConnectionObject, InstanceTypeIExplicitMessaging) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.instance_type = 0;
-	ConnectionObjectInstanceType type = GetConnectionObjectInstanceType(&connection_object);
-	CHECK_EQUAL(kConnectionObjectInstanceTypeExplicitMessaging, type);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.instance_type = 0;
+  ConnectionObjectInstanceType type = GetConnectionObjectInstanceType(
+    &connection_object);
+  CHECK_EQUAL(kConnectionObjectInstanceTypeExplicitMessaging, type);
 }
 
 TEST(CipConnectionObject, InstanceTypeIO) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.instance_type = 1;
-	ConnectionObjectInstanceType type = GetConnectionObjectInstanceType(&connection_object);
-	CHECK_EQUAL(kConnectionObjectInstanceTypeIO, type);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.instance_type = 1;
+  ConnectionObjectInstanceType type = GetConnectionObjectInstanceType(
+    &connection_object);
+  CHECK_EQUAL(kConnectionObjectInstanceTypeIO, type);
 }
 
 TEST(CipConnectionObject, InstanceTypeCipBridged) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.instance_type = 2;
-	ConnectionObjectInstanceType type = GetConnectionObjectInstanceType(&connection_object);
-	CHECK_EQUAL(kConnectionObjectInstanceTypeCipBridged, type);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.instance_type = 2;
+  ConnectionObjectInstanceType type = GetConnectionObjectInstanceType(
+    &connection_object);
+  CHECK_EQUAL(kConnectionObjectInstanceTypeCipBridged, type);
 }
 
 TEST(CipConnectionObject, TransportClassTriggerDirectionServer) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.transport_class_trigger = 0x80;
-	ConnectionObjectTransportClassTriggerDirection direction = GetConnectionObjectTransportClassTriggerDirection(&connection_object);
-	CHECK_EQUAL(kConnectionObjectTransportClassTriggerDirectionServer, direction);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 0x80;
+  ConnectionObjectTransportClassTriggerDirection direction =
+    GetConnectionObjectTransportClassTriggerDirection(&connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerDirectionServer, direction);
 }
 
 TEST(CipConnectionObject, TransportClassTriggerDirectionClient) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.transport_class_trigger = 0x00;
-	ConnectionObjectTransportClassTriggerDirection direction = GetConnectionObjectTransportClassTriggerDirection(&connection_object);
-	CHECK_EQUAL(kConnectionObjectTransportClassTriggerDirectionClient, direction);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 0x00;
+  ConnectionObjectTransportClassTriggerDirection direction =
+    GetConnectionObjectTransportClassTriggerDirection(&connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerDirectionClient, direction);
 }
 
 TEST(CipConnectionObject, TransportClassTriggerProductionTriggerInvalid) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.transport_class_trigger = 3 << 4;
-	ConnectionObjectTransportClassTriggerProductionTrigger production_trigger = GetConnectionObjectTransportClassTriggerProductionTrigger(&connection_object);
-	CHECK_EQUAL(kConnectionObjectTransportClassTriggerProductionTriggerInvalid, production_trigger);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 3 << 4;
+  ConnectionObjectTransportClassTriggerProductionTrigger production_trigger =
+    GetConnectionObjectTransportClassTriggerProductionTrigger(
+      &connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerProductionTriggerInvalid,
+              production_trigger);
 }
 
 TEST(CipConnectionObject, TransportClassTriggerProductionTriggerCyclic) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.transport_class_trigger = 0x00;
-	ConnectionObjectTransportClassTriggerProductionTrigger production_trigger = GetConnectionObjectTransportClassTriggerProductionTrigger(&connection_object);
-	CHECK_EQUAL(kConnectionObjectTransportClassTriggerProductionTriggerCyclic, production_trigger);
-}
-
-TEST(CipConnectionObject, TransportClassTriggerProductionTriggerChangeOfState) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.transport_class_trigger = 1 << 4;
-	ConnectionObjectTransportClassTriggerProductionTrigger production_trigger = GetConnectionObjectTransportClassTriggerProductionTrigger(&connection_object);
-	CHECK_EQUAL(kConnectionObjectTransportClassTriggerProductionTriggerChangeOfState, production_trigger);
-}
-
-TEST(CipConnectionObject, TransportClassTriggerProductionTriggerApplicationObject) {
-	CipConnectionObject connection_object = { 0 };
-	connection_object.transport_class_trigger = 2 << 4;
-	ConnectionObjectTransportClassTriggerProductionTrigger production_trigger = GetConnectionObjectTransportClassTriggerProductionTrigger(&connection_object);
-	CHECK_EQUAL(kConnectionObjectTransportClassTriggerProductionTriggerApplicationObject, production_trigger);
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 0x00;
+  ConnectionObjectTransportClassTriggerProductionTrigger production_trigger =
+    GetConnectionObjectTransportClassTriggerProductionTrigger(
+      &connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerProductionTriggerCyclic,
+              production_trigger);
+}
+
+TEST(CipConnectionObject,
+     TransportClassTriggerProductionTriggerChangeOfState) {
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 1 << 4;
+  ConnectionObjectTransportClassTriggerProductionTrigger production_trigger =
+    GetConnectionObjectTransportClassTriggerProductionTrigger(
+      &connection_object);
+  CHECK_EQUAL(
+    kConnectionObjectTransportClassTriggerProductionTriggerChangeOfState,
+    production_trigger);
+}
+
+TEST(CipConnectionObject,
+     TransportClassTriggerProductionTriggerApplicationObject) {
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 2 << 4;
+  ConnectionObjectTransportClassTriggerProductionTrigger production_trigger =
+    GetConnectionObjectTransportClassTriggerProductionTrigger(
+      &connection_object);
+  CHECK_EQUAL(
+    kConnectionObjectTransportClassTriggerProductionTriggerApplicationObject,
+    production_trigger);
+}
+
+TEST(CipConnectionObject, TransportClassTriggerClassInvalid) {
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 5;
+  ConnectionObjectTransportClassTriggerTransportClass transport_class =
+    GetConnectionObjectTransportClassTriggerTransportClass(&connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerTransportClassInvalid,
+              transport_class);
+}
+
+TEST(CipConnectionObject, TransportClassTriggerClass0) {
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 0;
+  ConnectionObjectTransportClassTriggerTransportClass transport_class =
+    GetConnectionObjectTransportClassTriggerTransportClass(&connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerTransportClass0,
+              transport_class);
+}
+
+TEST(CipConnectionObject, TransportClassTriggerClass1) {
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 1;
+  ConnectionObjectTransportClassTriggerTransportClass transport_class =
+    GetConnectionObjectTransportClassTriggerTransportClass(&connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerTransportClass1,
+              transport_class);
+}
+
+TEST(CipConnectionObject, TransportClassTriggerClass2) {
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 2;
+  ConnectionObjectTransportClassTriggerTransportClass transport_class =
+    GetConnectionObjectTransportClassTriggerTransportClass(&connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerTransportClass2,
+              transport_class);
+}
+
+TEST(CipConnectionObject, TransportClassTriggerClass3) {
+  CipConnectionObject connection_object = { 0 };
+  connection_object.transport_class_trigger = 3;
+  ConnectionObjectTransportClassTriggerTransportClass transport_class =
+    GetConnectionObjectTransportClassTriggerTransportClass(&connection_object);
+  CHECK_EQUAL(kConnectionObjectTransportClassTriggerTransportClass3,
+              transport_class);
 }