Merge branch '0.2'

plugins/ua_config_standard.c

@@ -5,6 +5,22 @@
 #include "ua_log_stdout.h"
 #include "ua_network_tcp.h"
 
+/*******************************/
+/* Default Connection Settings */
+/*******************************/
+
+const UA_EXPORT UA_ConnectionConfig UA_ConnectionConfig_standard = {
+    .protocolVersion = 0,
+    .sendBufferSize = 65535, /* 64k per chunk */
+    .recvBufferSize = 65535, /* 64k per chunk */
+    .maxMessageSize = 0, /* 0 -> unlimited */
+    .maxChunkCount = 0 /* 0 -> unlimited */
+};
+
+/***************************/
+/* Default Server Settings */
+/***************************/
+
 #define MANUFACTURER_NAME "open62541"
 #define PRODUCT_NAME "open62541 OPC UA Server"
 #define PRODUCT_URI "http://open62541.org"
@@ -18,7 +34,7 @@ UA_UsernamePasswordLogin usernamePasswords[2] = {
     { UA_STRING_STATIC("user1"), UA_STRING_STATIC("password") },
     { UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1") } };
 
-const UA_ServerConfig UA_ServerConfig_standard = {
+const UA_EXPORT UA_ServerConfig UA_ServerConfig_standard = {
     .nThreads = 1,
     .logger = UA_Log_Stdout,
 
@@ -75,15 +91,20 @@ const UA_ServerConfig UA_ServerConfig_standard = {
 #endif
 };
 
+/***************************/
+/* Default Client Settings */
+/***************************/
+
 const UA_EXPORT UA_ClientConfig UA_ClientConfig_standard = {
-    .timeout = 5000,
-    .secureChannelLifeTime = 600000,
+    .timeout = 5000, /* 5 seconds */
+    .secureChannelLifeTime = 10 * 60 * 1000, /* 10 minutes */
     .logger = UA_Log_Stdout,
     .localConnectionConfig = {
         .protocolVersion = 0,
-        .sendBufferSize = 65535,
-        .recvBufferSize  = 65535,
-        .maxMessageSize = 65535,
-        .maxChunkCount = 1 },
+        .sendBufferSize = 65535, /* 64k per chunk */
+        .recvBufferSize  = 65535, /* 64k per chunk */
+        .maxMessageSize = 0, /* 0 -> unlimited */
+        .maxChunkCount = 0 /* 0 -> unlimited */
+    },
     .connectionFunc = UA_ClientConnectionTCP
 };

src/ua_connection.c

@@ -4,11 +4,6 @@
 #include "ua_types_generated_encoding_binary.h"
 #include "ua_securechannel.h"
 
-// max message size is 64k
-const UA_ConnectionConfig UA_ConnectionConfig_standard =
-    {.protocolVersion = 0, .sendBufferSize = 65535, .recvBufferSize = 65535,
-     .maxMessageSize = 1048576, .maxChunkCount = 16};
-
 void UA_Connection_init(UA_Connection *connection) {
     connection->state = UA_CONNECTION_CLOSED;
     connection->localConf = UA_ConnectionConfig_standard;