- fixed examples that have control handlers with old signature

muduteilvugekir · Apr 25, 2020 · a6bad96 · a6bad96
1 parent 0bc0145
commit a6bad96
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/demos/beaglebone/beagle_demo.c b/demos/beaglebone/beagle_demo.c
@@ -54,7 +54,7 @@ connectionIndicationHandler(IedServer server, ClientConnection connection, bool
 }
 
 static CheckHandlerResult
-performCheckHandler(void* parameter, MmsValue* ctlVal, bool test, bool interlockCheck, ClientConnection connection)
+performCheckHandler(ControlAction action, void* parameter, MmsValue* ctlVal, bool test, bool interlockCheck, ClientConnection connection)
 {
     if (controllingClient == NULL) {
         printf("Client takes control -> switch to remote control operation mode\n");
@@ -101,7 +101,7 @@ updateLED3stVal(bool newLedState, uint64_t timeStamp) {
 }
 
 static ControlHandlerResult
-controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test)
+controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test)
 {
     if (test)
         return CONTROL_RESULT_OK;
@@ -151,7 +151,7 @@ static int ledOffTimeMs = 1000;
 static int32_t opCnt = 0;
 
 static ControlHandlerResult
-controlHandlerForInt32Controls(void* parameter, MmsValue* value, bool test)
+controlHandlerForInt32Controls(ControlAction action, void* parameter, MmsValue* value, bool test)
 {
 	if (test)
 		return CONTROL_RESULT_OK;

diff --git a/examples/server_example_61400_25/server_example_61400_25.c b/examples/server_example_61400_25/server_example_61400_25.c
@@ -43,7 +43,7 @@ void sigint_handler(int signalId)
 
 
 bool
-controlHandlerForIntegerOutput(void* parameter, MmsValue* value, bool test)
+controlHandlerForIntegerOutput(ControlAction action, void* parameter, MmsValue* value, bool test)
 {
     if (MmsValue_getType(value) != MMS_INTEGER)
         return false;

diff --git a/examples/server_example_basic_io/server_example_basic_io.c b/examples/server_example_basic_io/server_example_basic_io.c
@@ -28,7 +28,7 @@ sigint_handler(int signalId)
 }
 
 static ControlHandlerResult
-controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test)
+controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test)
 {
     if (test)
         return CONTROL_RESULT_FAILED;

diff --git a/examples/server_example_goose/server_example_goose.c b/examples/server_example_goose/server_example_goose.c
@@ -26,7 +26,7 @@ void sigint_handler(int signalId)
 }
 
 void
-controlHandlerForBinaryOutput(void* parameter, MmsValue* value)
+controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value)
 {
     uint64_t timestamp = Hal_getTimeInMs();
 

diff --git a/examples/server_example_password_auth/server_example_password_auth.c b/examples/server_example_password_auth/server_example_password_auth.c
@@ -88,7 +88,7 @@ clientAuthenticator(void* parameter, AcseAuthenticationParameter authParameter,
 }
 
 static CheckHandlerResult
-performCheckHandler (void* parameter, MmsValue* ctlVal, bool test, bool interlockCheck, ClientConnection connection)
+performCheckHandler (ControlAction action, void* parameter, MmsValue* ctlVal, bool test, bool interlockCheck, ClientConnection connection)
 {
     void* securityToken = ClientConnection_getSecurityToken(connection);
 
@@ -99,7 +99,7 @@ performCheckHandler (void* parameter, MmsValue* ctlVal, bool test, bool interloc
 }
 
 static void
-controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test)
+controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test)
 {
     MmsValue* timeStamp = MmsValue_newUtcTimeByMsTime(Hal_getTimeInMs());
 

diff --git a/examples/server_example_threadless/server_example_threadless.c b/examples/server_example_threadless/server_example_threadless.c
@@ -26,7 +26,7 @@ sigint_handler(int signalId)
 }
 
 ControlHandlerResult
-controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test)
+controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test)
 {
 
     if (MmsValue_getType(value) == MMS_BOOLEAN) {

diff --git a/examples/tls_server_example/tls_server_example.c b/examples/tls_server_example/tls_server_example.c
@@ -26,7 +26,7 @@ sigint_handler(int signalId)
 }
 
 static ControlHandlerResult
-controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test)
+controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test)
 {
     if (test)
         return CONTROL_RESULT_FAILED;
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ void sigint_handler(int signalId) @@
     }
     void
-    controlHandlerForBinaryOutput(void* parameter, MmsValue* value)
+    controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value)
     {
         uint64_t timestamp = Hal_getTimeInMs();
@@ Expand Down @@