Reg

OneM2M_Functions.ttcn

@@ -33,6 +33,7 @@ module OneM2M_Functions {
     			
 			// Map
 			map(self:mcaPort, system:mcaPort);
+			map(self:mccPort, system:mccPort);
 			map(self:acPort, system:acPort);
 			activate(a_default());
     			
@@ -113,13 +114,13 @@ module OneM2M_Functions {
 			var M2MResponsePrimitive v_response;
 			var integer v_cseBaseAuxIndex := -1;
 			var integer v_acpAuxIndex := -1;
-			var ServiceSubscribedAppRule v_serviceSubscribedAppRule;
+			var ServiceSubscribedAppRule_optional v_serviceSubscribedAppRule;
 
 			v_serviceSubscribedAppRule.applicableCredIDs := {"None"};
 			v_serviceSubscribedAppRule.allowedApp_IDs := {PX_APP_ID};
 			v_serviceSubscribedAppRule.allowedAEs := valueof(p_allowedAEs);
 			
-			mcaPort.send(m_request(m_createCSEBase(v_serviceSubscribedAppRule)));
+			mcaPort.send(m_request(m_createServiceSubscribedAppRule(v_serviceSubscribedAppRule)));
 		
 			tc_ac.start;
 			alt {
@@ -197,7 +198,8 @@ module OneM2M_Functions {
 			
 		function f_postamble_default() runs on M2M {
 	
-			unmap(self:mcaPort, system:mcaPort); 
+			unmap(self:mcaPort, system:mcaPort);
+			unmap(self:mccPort, system:mccPort);
 			unmap(self:acPort, system:acPort);
 			//stop;
 		}