Prechádzať zdrojové kódy

Merge branch 'master' into 0.2

Julius Pfrommer 8 rokov pred
rodič
commit
c7509d797d

+ 4 - 0
src/client/ua_client.c

@@ -172,6 +172,10 @@ static UA_StatusCode HelAckHandshake(UA_Client *client) {
     conn->remoteConf.recvBufferSize = ackMessage.receiveBufferSize;
     conn->remoteConf.sendBufferSize = ackMessage.sendBufferSize;
     conn->state = UA_CONNECTION_ESTABLISHED;
+    
+    if (conn->remoteConf.recvBufferSize < conn->localConf.sendBufferSize)
+      conn->localConf.sendBufferSize = conn->remoteConf.recvBufferSize;
+    
     return UA_STATUSCODE_GOOD;
 }
 

+ 1 - 0
tools/pyUANamespace/ua_builtin_types.py

@@ -20,6 +20,7 @@ import sys
 import xml.dom.minidom as dom
 from ua_constants import *
 from logger import *
+from time import strftime, strptime
 from open62541_MacroHelper import open62541_MacroHelper
 
 def getNextElementNode(xmlvalue):