continue merging the changes from master

CMakeLists.txt

@@ -417,7 +417,7 @@ if(UA_BUILD_EXAMPLECLIENT)
         target_link_libraries(client_static urcu-cds urcu urcu-common pthread)
         target_link_libraries(client urcu-cds urcu urcu-common pthread)
     endif()
-    if(EXTENSION_STATELESS AND NOT ENABLE_AMALGAMATION)
+    if(UA_ENABLE_NONSTANDARD_STATELESS AND NOT UA_ENABLE_AMALGAMATION)
         add_executable(client_stateless examples/client_stateless.c ${client_source})
         if(UA_ENABLE_MULTITHREADING)
             target_link_libraries(client_stateless urcu-cds urcu urcu-common pthread)

examples/client_stateless.c

@@ -14,8 +14,7 @@
 #include "ua_types_generated_encoding_binary.h"
 
 
-int main(int argc , char *argv[])
-{
+int main(int argc , char *argv[]) {
 	int sock;
 	struct sockaddr_in server;
 	UA_ByteString message;
@@ -26,13 +25,12 @@ int main(int argc , char *argv[])
 	unsigned int messagepos = 0;
 
 	//Create socket
-#ifdef EXTENSION_UDP
+#ifdef UA_ENABLE_NONSTANDARD_UDP
 	sock = socket(AF_INET , SOCK_DGRAM , 0);
 #else
 	sock = socket(AF_INET , SOCK_STREAM , 0);
 #endif
-	if (sock == -1)
-	{
+	if(sock == -1) {
 		printf("Could not create socket");
 	}
 	server.sin_addr.s_addr = inet_addr("127.0.0.1");
@@ -40,13 +38,11 @@ int main(int argc , char *argv[])
 	server.sin_port = htons( 16664 );
 
 	//Connect to remote server
-	if (connect(sock , (struct sockaddr *)&server , sizeof(server)) < 0)
-	{
+	if(connect(sock, (struct sockaddr *)&server, sizeof(server)) < 0) {
 		perror("connect failed. Error");
 		return 1;
 	}
 
-
 	UA_TcpMessageHeader reqTcpHeader;
 	UA_UInt32 reqSecureChannelId = 0;
 	UA_UInt32 reqTokenId = 0;
@@ -61,7 +57,6 @@ int main(int argc , char *argv[])
 	reqRequestType.identifierType = UA_NODEIDTYPE_NUMERIC;
 	reqRequestType.identifier.numeric = 631; //read request
 
-
 	UA_SequenceHeader_init(&reqSequenceHeader);
 	reqSequenceHeader.sequenceNumber = 42;
 
@@ -83,7 +78,6 @@ int main(int argc , char *argv[])
 	req.nodesToRead[0].nodeId.identifier.numeric = 2255;
 	UA_QualifiedName_init(&(req.nodesToRead[0].dataEncoding));
 
-
 	/**messageEncodedLength = UA_TcpMessageHeader_calcSizeBinary(&reqTcpHeader) +
 			UA_UInt32_calcSizeBinary(&reqSecureChannelId)+
 			UA_UInt32_calcSizeBinary(&reqTokenId)+
@@ -110,24 +104,21 @@ int main(int argc , char *argv[])
     UA_NodeId_encodeBinary(&reqRequestType, &message, &messagepos);
     UA_ReadRequest_encodeBinary(&req, &message, &messagepos);
 
-
 	//Send some data
-	if( send(sock , message.data, messagepos , 0) < 0)
-	{
+	if(send(sock , message.data, messagepos , 0) < 0) {
 		puts("Send failed");
 		return 1;
 	}
 
 	//Receive a reply from the server
 	int received = recv(sock , server_reply , 2000 , 0);
-	if(received < 0)
-	{
+	if(received < 0) {
 		puts("recv failed");
 		return 1;
 	}
 
 
-	for(int i=0;i<received;i++){
+	for(int i=0;i<received;i++) {
 		  //show only printable ascii
 		  if(server_reply[i] >= 32 && server_reply[i]<= 126)
 			  printf("%c",server_reply[i]);

include/ua_server.h

@@ -520,7 +520,7 @@ UA_BrowseResult UA_Server_browseNext(UA_Server *server, UA_Boolean releaseContin
 /* Call Method */
 /***************/
 
-#ifdef ENABLE_METHODCALLS
+#ifdef UA_ENABLE_METHODCALLS
 UA_CallMethodResult UA_EXPORT UA_Server_call(UA_Server *server, const UA_CallMethodRequest *request);
 #endif
 

src/server/ua_server.c

@@ -106,8 +106,8 @@ UA_UInt16 UA_Server_addNamespace(UA_Server *server, const char* name) {
     return (UA_UInt16)server->namespacesSize - 1;
 }
 
-UA_StatusCode UA_Server_deleteNode(UA_Server *server, const UA_NodeId nodeId,
-                                   UA_Boolean deleteReferences) {
+UA_StatusCode
+UA_Server_deleteNode(UA_Server *server, const UA_NodeId nodeId, UA_Boolean deleteReferences) {
     UA_RCU_LOCK();
     UA_StatusCode retval = Service_DeleteNodes_single(server, &adminSession, &nodeId, deleteReferences);
     UA_RCU_UNLOCK();
@@ -1210,8 +1210,8 @@ __UA_Server_write(UA_Server *server, const UA_NodeId *nodeId,
     return retval;
 }
 
-static UA_StatusCode setValueCallback(UA_Server *server, UA_Session *session, UA_VariableNode *node,
-                                      UA_ValueCallback *callback) {
+static UA_StatusCode
+setValueCallback(UA_Server *server, UA_Session *session, UA_VariableNode *node, UA_ValueCallback *callback) {
     if(node->nodeClass != UA_NODECLASS_VARIABLE)
         return UA_STATUSCODE_BADNODECLASSINVALID;
     node->value.variant.callback = *callback;
@@ -1261,8 +1261,7 @@ UA_Server_setObjectTypeNode_instanceLifecycleManagement(UA_Server *server, UA_No
 }
 
 UA_StatusCode
-__UA_Server_read(UA_Server *server, const UA_NodeId *nodeId,
-                 const UA_AttributeId attributeId, void *v) {
+__UA_Server_read(UA_Server *server, const UA_NodeId *nodeId, const UA_AttributeId attributeId, void *v) {
     UA_ReadValueId item;
     UA_ReadValueId_init(&item);
     item.nodeId = *nodeId;
@@ -1310,7 +1309,7 @@ UA_Server_browseNext(UA_Server *server, UA_Boolean releaseContinuationPoint,
     return result;
 }
 
-#ifdef ENABLE_METHODCALLS
+#ifdef UA_ENABLE_METHODCALLS
 UA_CallMethodResult UA_Server_call(UA_Server *server, const UA_CallMethodRequest *request) {
     UA_CallMethodResult result;
     UA_CallMethodResult_init(&result);

src/server/ua_server_binary.c

@@ -408,7 +408,7 @@ processMSG(UA_Connection *connection, UA_Server *server, const UA_ByteString *ms
 
     UA_Session_updateLifetime(session);
 
-#ifdef ENABLE_SUBSCRIPTIONS
+#ifdef UA_ENABLE_SUBSCRIPTIONS
     /* The publish request is answered with a delay */
     if(requestTypeId.identifier.numeric - UA_ENCODINGOFFSET_BINARY == UA_NS0ID_PUBLISHREQUEST) {
         Service_Publish(server, session, request, sequenceHeader.requestId);

src/server/ua_services_attribute.c

@@ -382,7 +382,7 @@ void Service_Read(UA_Server *server, UA_Session *session, const UA_ReadRequest *
                                 &request->nodesToRead[i], &response->results[i]);
     }
 
-#ifdef EXTENSION_STATELESS
+#ifdef UA_ENABLE_NONSTANDARD_STATELESS
     /* Add an expiry header for caching */
     if(session==&anonymousSession){
 		UA_ExtensionObject additionalHeader;