Переглянути джерело

ajusted local client config, improved logging, relates #617

Stasik0 9 роки тому
батько
коміт
0262159477
3 змінених файлів з 7 додано та 6 видалено
  1. 3 3
      plugins/ua_config_standard.c
  2. 3 2
      src/client/ua_client.c
  3. 1 1
      src/ua_connection.c

+ 3 - 3
plugins/ua_config_standard.c

@@ -72,9 +72,9 @@ const UA_EXPORT UA_ClientConfig UA_ClientConfig_standard = {
     .logger = Logger_Stdout,
     .localConnectionConfig = {
         .protocolVersion = 0,
-        .sendBufferSize = 65536,
-        .recvBufferSize  = 65536,
-        .maxMessageSize = 65536,
+        .sendBufferSize = 65535,
+        .recvBufferSize  = 65535,
+        .maxMessageSize = 65535,
         .maxChunkCount = 1 },
     .connectionFunc = UA_ClientConnectionTCP
 };

+ 3 - 2
src/client/ua_client.c

@@ -165,6 +165,7 @@ static UA_StatusCode HelAckHandshake(UA_Client *client) {
     }
     UA_LOG_DEBUG(client->config.logger, UA_LOGCATEGORY_NETWORK, "Received ACK message");
 
+    /* TODO: verify that remote and local configurations match, adjust local configuration in the other case */
     conn->remoteConf.maxChunkCount = ackMessage.maxChunkCount;
     conn->remoteConf.maxMessageSize = ackMessage.maxMessageSize;
     conn->remoteConf.protocolVersion = ackMessage.protocolVersion;
@@ -353,7 +354,7 @@ static UA_StatusCode ActivateSession(UA_Client *client) {
 
     if(response.responseHeader.serviceResult) {
         UA_LOG_ERROR(client->config.logger, UA_LOGCATEGORY_CLIENT,
-                     "ActivateSession failed with statuscode %i", response.responseHeader.serviceResult);
+                     "ActivateSession failed with statuscode 0x%08x", response.responseHeader.serviceResult);
     }
 
     UA_ActivateSessionRequest_deleteMembers(&request);
@@ -381,7 +382,7 @@ GetEndpoints(UA_Client *client, size_t* endpointDescriptionsSize, UA_EndpointDes
 
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(client->config.logger, UA_LOGCATEGORY_CLIENT,
-                     "GetEndpointRequest failed with statuscode %i", response.responseHeader.serviceResult);
+                     "GetEndpointRequest failed with statuscode 0x%08x", response.responseHeader.serviceResult);
         UA_GetEndpointsResponse_deleteMembers(&response);
         return response.responseHeader.serviceResult;
     }

+ 1 - 1
src/ua_connection.c

@@ -6,7 +6,7 @@
 
 // max message size is 64k
 const UA_ConnectionConfig UA_ConnectionConfig_standard =
-    {.protocolVersion = 0, .sendBufferSize = 65536, .recvBufferSize = 65536,
+    {.protocolVersion = 0, .sendBufferSize = 65535, .recvBufferSize = 65535,
      .maxMessageSize = 1048576, .maxChunkCount = 16};
 
 void UA_Connection_init(UA_Connection *connection) {