making client more conformant, relates to #420

src/client/ua_client.c

@@ -29,6 +29,7 @@ struct UA_Client {
     UA_UserTokenPolicy token;
     UA_NodeId sessionId;
     UA_NodeId authenticationToken;
+    UA_UInt32 requestHandle;
     
 #ifdef ENABLE_SUBSCRIPTIONS
     UA_Int32 monitoredItemHandles;
@@ -71,6 +72,7 @@ void UA_Client_init(UA_Client* client, UA_ClientConfig config, UA_Logger logger)
     client->requestId = 0;
 
     UA_NodeId_init(&client->authenticationToken);
+    client->requestHandle = 0;
 
     client->logger = logger;
     client->config = config;
@@ -280,13 +282,21 @@ static void synchronousRequest(UA_Client *client, void *request, const UA_DataTy
         return;
     }
 
-    /* Copy authenticationToken token to request header */
+    /* HANDLING REQUEST HEADER PARAMETERS */
     typedef struct {
         UA_RequestHeader requestHeader;
     } headerOnlyRequest;
     /* The cast is valid, since all requests start with a requestHeader */
+
+    /* Copy authenticationToken token to request header */
     UA_NodeId_copy(&client->authenticationToken, &((headerOnlyRequest*)request)->requestHeader.authenticationToken);
 
+    ((headerOnlyRequest*)request)->requestHeader.timestamp = UA_DateTime_now();
+
+    ((headerOnlyRequest*)request)->requestHeader.requestHandle = ++client->requestHandle;
+
+    /*/HANDLING REQUEST HEADER PARAMETERS */
+
     /* Send the request */
     UA_UInt32 requestId = ++client->requestId;
     retval = UA_SecureChannel_sendBinaryMessage(&client->channel, requestId,

tools/amalgamate.py

@@ -24,7 +24,7 @@ includes = []
 print ("Starting amalgamating file "+ args.outfile)
 
 file = io.open(args.outfile, 'w')
-file.write(u'''/* THIS IS A SINGLE-FILE DISTRIBUTION CONCATENATED FROM THE OPEN62541 SOURCES 
+file.write(u"""/* THIS IS A SINGLE-FILE DISTRIBUTION CONCATENATED FROM THE OPEN62541 SOURCES 
  * visit http://open62541.org/ for information about this software
  * Git-Revision: %s
  */
@@ -42,7 +42,8 @@ file.write(u'''/* THIS IS A SINGLE-FILE DISTRIBUTION CONCATENATED FROM THE OPEN6
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
  * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
- */\n\n''' % args.version)
+ */\n\n
+ """ % args.version)
 
 if not is_c:
     file.write(u'''#ifndef %s