Julius Pfrommer 10 年 前
コミット
466191a76a
共有4 個のファイルを変更した9 個の追加9 個の削除を含む
  1. 4 4
      src/server/ua_server_binary.c
  2. 1 1
      src/server/ua_services_attribute.c
  3. 3 3
      src/server/ua_services_nodemanagement.c
  4. 1 1
      src/server/ua_services_view.c

+ 4 - 4
src/server/ua_server_binary.c

@@ -170,13 +170,13 @@ static void processMSG(UA_Connection *connection, UA_Server *server, const UA_By
         UA_SecureChannel_init(&anonymousChannel);
         clientChannel = &anonymousChannel;
     }
+
+    UA_Session *clientSession = clientChannel->session;
 #ifdef EXTENSION_STATELESS
     if(secureChannelId == 0)
         clientSession = &anonymousSession;
 #endif
 
-    UA_Session *clientSession = clientChannel->session;
-
     // 2) Read the security header
     UA_UInt32 tokenId;
     UA_SequenceHeader sequenceHeader;
@@ -218,7 +218,7 @@ static void processMSG(UA_Connection *connection, UA_Server *server, const UA_By
         break;
     default:
         if(clientSession != &anonymousSession)
-            retval = UA_STATUSCODE_BADNOTCONNECTED
+            retval = UA_STATUSCODE_BADNOTCONNECTED;
     }
 #endif
 
@@ -410,7 +410,7 @@ void UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection
         case UA_MESSAGETYPEANDFINAL_MSGF & 0xffffff:
 #ifdef EXTENSION_STATELESS
             processMSG(connection, server, msg, &pos);
-            break
+            break;
 #endif
                 if(connection->state != UA_CONNECTION_ESTABLISHED) {
                 connection->close(connection);

+ 1 - 1
src/server/ua_services_attribute.c

@@ -265,7 +265,7 @@ void Service_Read(UA_Server *server, UA_Session *session, const UA_ReadRequest *
     UA_Boolean *isExternal = UA_alloca(sizeof(UA_Boolean) * size);
     UA_memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
     UA_UInt32 *indices = UA_alloca(sizeof(UA_UInt32) * size);
-    for(size_t j = 0;j<server->externalNamespacesSize;j++) {
+    for(UA_Int32 j = 0;j<server->externalNamespacesSize;j++) {
         size_t indexSize = 0;
         for(size_t i = 0;i < size;i++) {
             if(request->nodesToRead[i].nodeId.namespaceIndex != server->externalNamespaces[j].index)

+ 3 - 3
src/server/ua_services_nodemanagement.c

@@ -251,7 +251,7 @@ void Service_AddNodes(UA_Server *server, UA_Session *session, const UA_AddNodesR
     UA_Boolean *isExternal = UA_alloca(sizeof(UA_Boolean) * size);
     UA_memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
     UA_UInt32 *indices = UA_alloca(sizeof(UA_UInt32) * size);
-    for(size_t j = 0;j<server->externalNamespacesSize;j++) {
+    for(UA_Int32 j = 0;j<server->externalNamespacesSize;j++) {
         size_t indexSize = 0;
         for(size_t i = 0;i < size;i++) {
             if(request->nodesToAdd[i].requestedNewNodeId.nodeId.namespaceIndex != server->externalNamespaces[j].index)
@@ -294,7 +294,7 @@ void Service_AddReferences(UA_Server *server, UA_Session *session, const UA_AddR
 	UA_Boolean *isExternal = UA_alloca(sizeof(UA_Boolean) * size);
 	UA_memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
 	UA_UInt32 *indices = UA_alloca(sizeof(UA_UInt32) * size);
-	for(size_t j = 0; j < server->externalNamespacesSize; j++) {
+	for(UA_Int32 j = 0; j < server->externalNamespacesSize; j++) {
 		size_t indexSize = 0;
 		for(size_t i = 0;i < size;i++) {
 			if(request->referencesToAdd[i].sourceNodeId.namespaceIndex
@@ -314,7 +314,7 @@ void Service_AddReferences(UA_Server *server, UA_Session *session, const UA_AddR
 	}
 	/* ### End External Namespaces */
 	response->resultsSize = size;
-	for(size_t i = 0; i < response->resultsSize; i++) {
+	for(UA_Int32 i = 0; i < response->resultsSize; i++) {
 		if(!isExternal[i])
 			UA_Server_addReference(server, &request->referencesToAdd[i]);
 	}

+ 1 - 1
src/server/ua_services_view.c

@@ -240,7 +240,7 @@ void Service_Browse(UA_Server *server, UA_Session *session, const UA_BrowseReque
     UA_Boolean *isExternal = UA_alloca(sizeof(UA_Boolean) * size);
     UA_memset(isExternal, UA_FALSE, sizeof(UA_Boolean) * size);
     UA_UInt32 *indices = UA_alloca(sizeof(UA_UInt32) * size);
-    for(size_t j = 0;j<server->externalNamespacesSize;j++) {
+    for(UA_Int32 j = 0;j<server->externalNamespacesSize;j++) {
         size_t indexSize = 0;
         for(size_t i = 0;i < size;i++) {
             if(request->nodesToBrowse[i].nodeId.namespaceIndex != server->externalNamespaces[j].index)