Forráskód Böngészése

import preparatory changes from the mdns feature branch

Julius Pfrommer 8 éve
szülő
commit
0c22408278

+ 1 - 0
src/server/ua_services_call.c

@@ -208,3 +208,4 @@ void Service_Call(UA_Server *server, UA_Session *session,
 }
 
 #endif /* UA_ENABLE_METHODCALLS */
+

+ 1 - 0
src/server/ua_services_nodemanagement.c

@@ -1419,3 +1419,4 @@ UA_Server_setMethodNode_callback(UA_Server *server, const UA_NodeId methodNodeId
 }
 
 #endif
+

+ 1 - 0
src/server/ua_services_view.c

@@ -614,3 +614,4 @@ void Service_UnregisterNodes(UA_Server *server, UA_Session *session, const UA_Un
     if(request->nodesToUnregisterSize==0)
         response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTHINGTODO;
 }
+

+ 5 - 2
tests/check_types_memory.c

@@ -99,6 +99,8 @@ START_TEST(encodeShallYieldDecode) {
 END_TEST
 
 START_TEST(decodeShallFailWithTruncatedBufferButSurvive) {
+    if (_i == UA_TYPES_DISCOVERYCONFIGURATION)
+        return;
     // given
     UA_ByteString msg1;
     void *obj1 = UA_new(&UA_TYPES[_i]);
@@ -191,10 +193,11 @@ START_TEST(decodeComplexTypeFromRandomBufferShallSurvive) {
 END_TEST
 
 START_TEST(calcSizeBinaryShallBeCorrect) {
-    /* Empty variants (with no type defined) cannot be encoded. This is intentional. */
+    /* Empty variants (with no type defined) cannot be encoded. This is intentional. Discovery configuration is just a base class and void * */
     if(_i == UA_TYPES_VARIANT ||
        _i == UA_TYPES_VARIABLEATTRIBUTES ||
-       _i == UA_TYPES_VARIABLETYPEATTRIBUTES)
+       _i == UA_TYPES_VARIABLETYPEATTRIBUTES ||
+       _i == UA_TYPES_DISCOVERYCONFIGURATION)
         return;
     void *obj = UA_new(&UA_TYPES[_i]);
     size_t predicted_size = UA_calcSizeBinary(obj, &UA_TYPES[_i]);

+ 7 - 0
tools/schema/datatypes_minimal.txt

@@ -161,6 +161,13 @@ SetMonitoringModeResponse
 RegisteredServer
 RegisterServerRequest
 RegisterServerResponse
+DiscoveryConfiguration
+MdnsDiscoveryConfiguration
+RegisterServer2Request
+RegisterServer2Response
+ServerOnNetwork
+FindServersOnNetworkRequest
+FindServersOnNetworkResponse
 DataChangeTrigger
 DeadbandType
 DataChangeFilter