untabify master

examples/discovery/server_register.c

@@ -130,9 +130,9 @@ int main(int argc, char** argv) {
     UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "the.answer");
     UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "the answer");
     UA_DataSource dateDataSource;
-	dateDataSource.handle = &myInteger;
-	dateDataSource.read = readInteger;
-	dateDataSource.write = writeInteger;
+    dateDataSource.handle = &myInteger;
+    dateDataSource.read = readInteger;
+    dateDataSource.write = writeInteger;
     UA_VariableAttributes attr;
     UA_VariableAttributes_init(&attr);
     attr.description = UA_LOCALIZEDTEXT("en_US","the answer");

examples/server.c

@@ -135,9 +135,9 @@ int main(int argc, char** argv) {
 
     /* add a variable with the datetime data source */
     UA_DataSource dateDataSource;
-	dateDataSource.handle = NULL;
-	dateDataSource.read = readTimeData;
-	dateDataSource.write = NULL;
+    dateDataSource.handle = NULL;
+    dateDataSource.read = readTimeData;
+    dateDataSource.write = NULL;
     UA_VariableAttributes v_attr;
     UA_VariableAttributes_init(&v_attr);
     v_attr.description = UA_LOCALIZEDTEXT("en_US","current time");

examples/server_datasource.c

@@ -53,9 +53,9 @@ int main(int argc, char** argv) {
     UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "the.answer");
     UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "the answer");
     UA_DataSource dataSource;
-	dataSource.handle = &myInteger;
-	dataSource.read = readInteger;
-	dataSource.write = NULL;
+    dataSource.handle = &myInteger;
+    dataSource.read = readInteger;
+    dataSource.write = NULL;
     UA_VariableAttributes attr;
     UA_VariableAttributes_init(&attr);
     attr.description = UA_LOCALIZEDTEXT("en_US","the answer");

examples/server_nodeset.c

@@ -28,13 +28,13 @@ int main(int argc, char** argv) {
 
     /* create nodes from nodeset */
     if (nodeset(server) != UA_STATUSCODE_GOOD) {
-		UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Namespace index for generated "
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Namespace index for generated "
                      "nodeset does not match. The call to the generated method has to be "
                      "before any other namespace add calls.");
-		UA_Server_delete(server);
-		nl.deleteMembers(&nl);
-		return (int)UA_STATUSCODE_BADUNEXPECTEDERROR;
-	}
+        UA_Server_delete(server);
+        nl.deleteMembers(&nl);
+        return (int)UA_STATUSCODE_BADUNEXPECTEDERROR;
+    }
 
     /* start server */
     UA_StatusCode retval = UA_Server_run(server, &running);

examples/server_udp.c

@@ -15,15 +15,15 @@ static void stopHandler(int sign) {
 }
 
 int main(int argc, char** argv) {
-	signal(SIGINT,  stopHandler);
-	signal(SIGTERM, stopHandler);
+    signal(SIGINT,  stopHandler);
+    signal(SIGTERM, stopHandler);
 
-	UA_ServerConfig config = UA_ServerConfig_standard;
-	UA_ServerNetworkLayer nl;
-	nl = UA_ServerNetworkLayerUDP(UA_ConnectionConfig_standard, 16664);
-	config.networkLayers = &nl;
-	config.networkLayersSize = 1;
-	UA_Server *server = UA_Server_new(config);
+    UA_ServerConfig config = UA_ServerConfig_standard;
+    UA_ServerNetworkLayer nl;
+    nl = UA_ServerNetworkLayerUDP(UA_ConnectionConfig_standard, 16664);
+    config.networkLayers = &nl;
+    config.networkLayersSize = 1;
+    UA_Server *server = UA_Server_new(config);
 
     // add a variable node to the adresspace
     UA_VariableAttributes attr;

include/ua_types.h

@@ -147,9 +147,9 @@ typedef double UA_Double;
 typedef uint32_t UA_StatusCode;
 
 typedef struct {
-	UA_StatusCode code;      /* The numeric value of the StatusCode */
-	const char* name;        /* The symbolic name */
-	const char* explanation; /* Short message explaining the StatusCode */
+    UA_StatusCode code;      /* The numeric value of the StatusCode */
+    const char* name;        /* The symbolic name */
+    const char* explanation; /* Short message explaining the StatusCode */
 } UA_StatusCodeDescription;
 
 /* Returns the description of the StatusCode. Never returns NULL, but a generic

plugins/ua_config_standard.c

@@ -11,7 +11,7 @@
 /*******************************/
 
 const UA_EXPORT UA_ConnectionConfig UA_ConnectionConfig_standard = {
-	0, /* .protocolVersion */
+    0, /* .protocolVersion */
     65535, /* .sendBufferSize, 64k per chunk */
     65535, /* .recvBufferSize, 64k per chunk */
     0, /* .maxMessageSize, 0 -> unlimited */
@@ -48,7 +48,7 @@ UA_UsernamePasswordLogin UsernamePasswordLogin[2] = {
 const UA_UsernamePasswordLogin *usernamePasswords = UsernamePasswordLogin;
 
 const UA_EXPORT UA_ServerConfig UA_ServerConfig_standard = {
-	1, /* .nThreads */
+    1, /* .nThreads */
     UA_Log_Stdout, /* .logger */
 
     /* Server Description */
@@ -58,7 +58,7 @@ const UA_EXPORT UA_ServerConfig UA_ServerConfig_standard = {
      UA_STRING_STATIC(VERSION(UA_OPEN62541_VER_MAJOR, UA_OPEN62541_VER_MINOR,
                               UA_OPEN62541_VER_PATCH, UA_OPEN62541_VER_LABEL)),
      UA_STRING_STATIC(__DATE__ " " __TIME__), 0 }, /* .buildInfo */
-	 
+     
     {UA_STRING_STATIC(APPLICATION_URI),
      UA_STRING_STATIC(PRODUCT_URI),
      {UA_STRING_STATIC("en"),UA_STRING_STATIC(APPLICATION_NAME) },
@@ -68,10 +68,10 @@ const UA_EXPORT UA_ServerConfig UA_ServerConfig_standard = {
       0, NULL }, /* .applicationDescription */
     UA_STRING_STATIC_NULL, /* .serverCertificate */
 
-	/* Custom DataTypes */
-	0, /* .customDataTypesSize */
-	NULL, /* .customDataTypes */
-	
+    /* Custom DataTypes */
+    0, /* .customDataTypesSize */
+    NULL, /* .customDataTypes */
+    
     /* Networking */
     0, /* .networkLayersSize */
     NULL, /* .networkLayers */
@@ -104,7 +104,7 @@ const UA_EXPORT UA_ServerConfig UA_ServerConfig_standard = {
     {1,100} /* .queueSizeLimits */
 
 #ifdef UA_ENABLE_DISCOVERY
-	, 60*60 /* .discoveryCleanupTimeout */
+    , 60*60 /* .discoveryCleanupTimeout */
 #endif
 };
 

plugins/ua_network_udp.c

@@ -66,11 +66,11 @@ typedef struct {
 
 typedef struct {
     UA_ConnectionConfig conf;
-	UA_UInt16 port;
+    UA_UInt16 port;
     fd_set fdset;
     UA_Int32 serversockfd;
 
-	UA_Logger logger; // Set during start
+    UA_Logger logger; // Set during start
 } ServerNetworkLayerUDP;
 
 /** Accesses only the sockfd in the handle. Can be run from parallel threads. */
@@ -125,7 +125,7 @@ static void closeConnectionUDP(UA_Connection *handle) {
 }
 
 static UA_StatusCode ServerNetworkLayerUDP_start(UA_ServerNetworkLayer *nl, UA_Logger logger) {
-	ServerNetworkLayerUDP *layer = nl->handle;
+    ServerNetworkLayerUDP *layer = nl->handle;
     layer->logger = logger;
     layer->serversockfd = socket(PF_INET, SOCK_DGRAM, 0);
     if(layer->serversockfd < 0) {
@@ -155,7 +155,7 @@ static UA_StatusCode ServerNetworkLayerUDP_start(UA_ServerNetworkLayer *nl, UA_L
 }
 
 static size_t ServerNetworkLayerUDP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **jobs, UA_UInt16 timeout) {
-	ServerNetworkLayerUDP *layer = nl->handle;
+    ServerNetworkLayerUDP *layer = nl->handle;
     UA_Job *items = NULL;
     setFDSet(layer);
     struct timeval tmptv = {0, timeout};
@@ -166,7 +166,7 @@ static size_t ServerNetworkLayerUDP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **
     }
     items = malloc(sizeof(UA_Job)*(unsigned long)resultsize);
     // read from established sockets
-	size_t j = 0;
+    size_t j = 0;
     UA_ByteString buf = {0, NULL};
     if(!buf.data) {
         buf.data = malloc(sizeof(UA_Byte) * layer->conf.recvBufferSize);
@@ -213,23 +213,23 @@ static size_t ServerNetworkLayerUDP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **
 }
 
 static size_t ServerNetworkLayerUDP_stop(UA_ServerNetworkLayer *nl, UA_Job **jobs) {
-	ServerNetworkLayerUDP *layer = nl->handle;
-	UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-				"Shutting down the UDP network layer");
+    ServerNetworkLayerUDP *layer = nl->handle;
+    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
+                "Shutting down the UDP network layer");
     CLOSESOCKET(layer->serversockfd);
     return 0;
 }
 
 static void ServerNetworkLayerUDP_deleteMembers(UA_ServerNetworkLayer *nl) {
-	ServerNetworkLayerUDP *layer = nl->handle;
-	free(layer);
-	UA_String_deleteMembers(&nl->discoveryUrl);
+    ServerNetworkLayerUDP *layer = nl->handle;
+    free(layer);
+    UA_String_deleteMembers(&nl->discoveryUrl);
 }
 
 UA_ServerNetworkLayer
 UA_ServerNetworkLayerUDP(UA_ConnectionConfig conf, UA_UInt16 port) {
-	UA_ServerNetworkLayer nl;
-	memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
+    UA_ServerNetworkLayer nl;
+    memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
 
     ServerNetworkLayerUDP *layer = malloc(sizeof(ServerNetworkLayerUDP));
     if(!layer)
@@ -239,10 +239,10 @@ UA_ServerNetworkLayerUDP(UA_ConnectionConfig conf, UA_UInt16 port) {
     layer->conf = conf;
     layer->port = port;
 
-	nl.handle = layer;
-	nl.start = ServerNetworkLayerUDP_start;
-	nl.getJobs = ServerNetworkLayerUDP_getJobs;
-	nl.stop = ServerNetworkLayerUDP_stop;
-	nl.deleteMembers = ServerNetworkLayerUDP_deleteMembers;
-	return nl;
+    nl.handle = layer;
+    nl.start = ServerNetworkLayerUDP_start;
+    nl.getJobs = ServerNetworkLayerUDP_getJobs;
+    nl.stop = ServerNetworkLayerUDP_stop;
+    nl.deleteMembers = ServerNetworkLayerUDP_deleteMembers;
+    return nl;
 }

src/client/ua_client.c

@@ -688,7 +688,7 @@ static void
 processServiceResponse(struct ResponseDescription *rd, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message) {
-	const UA_NodeId expectedNodeId =
+    const UA_NodeId expectedNodeId =
         UA_NODEID_NUMERIC(0, rd->responseType->binaryEncodingId);
     const UA_NodeId serviceFaultNodeId =
         UA_NODEID_NUMERIC(0, UA_TYPES[UA_TYPES_SERVICEFAULT].binaryEncodingId);

src/server/ua_server_binary.c

@@ -415,8 +415,8 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
     /* CreateSession doesn't need a session */
     if(requestType == &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]) {
         Service_CreateSession(server, channel,
-			                  (const UA_CreateSessionRequest *)request,
-							  (UA_CreateSessionResponse *)response);
+                              (const UA_CreateSessionRequest *)request,
+                              (UA_CreateSessionResponse *)response);
         goto send_response;
     }
 
@@ -437,8 +437,8 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
             return;
         }
         Service_ActivateSession(server, channel, session,
-			                    (const UA_ActivateSessionRequest*)request,
-								(UA_ActivateSessionResponse*)response);
+                                (const UA_ActivateSessionRequest*)request,
+                                (UA_ActivateSessionResponse*)response);
         goto send_response;
     }
 
@@ -490,7 +490,7 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
     /* The publish request is not answered immediately */
     if(requestType == &UA_TYPES[UA_TYPES_PUBLISHREQUEST]) {
         Service_Publish(server, session,
-			            (const UA_PublishRequest*)request, requestId);
+                        (const UA_PublishRequest*)request, requestId);
         UA_deleteMembers(request, requestType);
         return;
     }
@@ -589,8 +589,8 @@ UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection,
             if(retval != UA_STATUSCODE_GOOD)
                 connection->close(connection);
             UA_ByteString offsetMessage;
-			offsetMessage.data = message->data + 12;
-			offsetMessage.length = message->length - 12;
+            offsetMessage.data = message->data + 12;
+            offsetMessage.length = message->length - 12;
             processOPN(server, connection, channelId, &offsetMessage);
             break; }
         case UA_MESSAGETYPE_MSG:

src/server/ua_services_attribute.c

@@ -181,7 +181,7 @@ typeCheckValue(UA_Server *server, const UA_NodeId *targetDataTypeId,
                const UA_NumericRange *range, UA_Variant *editableValue) {
     const UA_NodeId subtypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE);
    
-	/* Empty variant always matches... */
+    /* Empty variant always matches... */
     if(!value->type)
         return UA_STATUSCODE_GOOD;
 

src/server/ua_services_discovery.c

@@ -384,9 +384,9 @@ void UA_Discovery_cleanupTimedOut(UA_Server *server, UA_DateTime nowMonotonic) {
             filePath[current->registeredServer.semaphoreFilePath.length] = '\0';
 #ifdef UNDER_CE
            FILE *fp = fopen(filePath,"rb");
-		   semaphoreDeleted = (fp==NULL);
-		   if (fp)
-		     fclose(fp);
+           semaphoreDeleted = (fp==NULL);
+           if (fp)
+             fclose(fp);
 #else
             semaphoreDeleted = access( filePath, 0 ) == -1;
 #endif

src/server/ua_services_subscription.c

@@ -422,7 +422,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
     }
 
     UA_PublishResponseEntry *entry = (UA_PublishResponseEntry *)UA_malloc(sizeof(UA_PublishResponseEntry));
-	if(!entry) {
+    if(!entry) {
         subscriptionSendError(session->channel, requestId,
                               request->requestHeader.requestHandle, UA_STATUSCODE_BADOUTOFMEMORY);
         return;

src/ua_session.c

@@ -16,14 +16,14 @@ UA_Session adminSession = {
      {0, NULL},{0, NULL},
      0, NULL}, /* .clientDescription */
     {sizeof("Administrator Session")-1, (UA_Byte*)"Administrator Session"}, /* .sessionName */
-	false, /* .activated */
-	NULL, /* .sessionHandle */
+    false, /* .activated */
+    NULL, /* .sessionHandle */
     {0,UA_NODEIDTYPE_NUMERIC,{1}}, /* .authenticationToken */
     {0,UA_NODEIDTYPE_NUMERIC,{1}}, /* .sessionId */
     UA_UINT32_MAX, /* .maxRequestMessageSize */
-	UA_UINT32_MAX, /* .maxResponseMessageSize */
+    UA_UINT32_MAX, /* .maxResponseMessageSize */
     (UA_Double)UA_INT64_MAX, /* .timeout */
-	UA_INT64_MAX, /* .validTill */
+    UA_INT64_MAX, /* .validTill */
     NULL, /* .channel */
     0, /* .availableContinuationPoints */
     {NULL}, /* .continuationPoints */

src/ua_types_encoding_binary.c

@@ -1132,9 +1132,9 @@ DataValue_encodeBinary(UA_DataValue const *src, const UA_DataType *_) {
     UA_Byte encodingMask = (UA_Byte)
         ((UA_Byte)src->hasValue |
         ((UA_Byte)src->hasStatus << 1) |
-		((UA_Byte)src->hasSourceTimestamp << 2) |
+        ((UA_Byte)src->hasSourceTimestamp << 2) |
         ((UA_Byte)src->hasServerTimestamp << 3) |
-		((UA_Byte)src->hasSourcePicoseconds << 4) |
+        ((UA_Byte)src->hasSourcePicoseconds << 4) |
         ((UA_Byte)src->hasServerPicoseconds << 5));
 
     /* Encode the content */

tests/check_discovery.c

@@ -27,35 +27,35 @@ UA_ServerNetworkLayer nl_lds;
 pthread_t server_thread_lds;
 
 static void * serverloop_lds(void *_) {
-	while(*running_lds)
-		UA_Server_run_iterate(server_lds, true);
-	return NULL;
+    while(*running_lds)
+        UA_Server_run_iterate(server_lds, true);
+    return NULL;
 }
 
 static void setup_lds(void) {
-	// start LDS server
-	running_lds = UA_Boolean_new();
-	*running_lds = true;
-	UA_ServerConfig config_lds = UA_ServerConfig_standard;
-	config_lds.applicationDescription.applicationType = UA_APPLICATIONTYPE_DISCOVERYSERVER;
-	config_lds.applicationDescription.applicationUri = UA_String_fromChars("open62541.test.local_discovery_server");
-	config_lds.discoveryCleanupTimeout = registerTimeout;
-	nl_lds = UA_ServerNetworkLayerTCP(UA_ConnectionConfig_standard, 4840);
-	config_lds.networkLayers = &nl_lds;
-	config_lds.networkLayersSize = 1;
-	server_lds = UA_Server_new(config_lds);
-	UA_Server_run_startup(server_lds);
-	pthread_create(&server_thread_lds, NULL, serverloop_lds, NULL);
+    // start LDS server
+    running_lds = UA_Boolean_new();
+    *running_lds = true;
+    UA_ServerConfig config_lds = UA_ServerConfig_standard;
+    config_lds.applicationDescription.applicationType = UA_APPLICATIONTYPE_DISCOVERYSERVER;
+    config_lds.applicationDescription.applicationUri = UA_String_fromChars("open62541.test.local_discovery_server");
+    config_lds.discoveryCleanupTimeout = registerTimeout;
+    nl_lds = UA_ServerNetworkLayerTCP(UA_ConnectionConfig_standard, 4840);
+    config_lds.networkLayers = &nl_lds;
+    config_lds.networkLayersSize = 1;
+    server_lds = UA_Server_new(config_lds);
+    UA_Server_run_startup(server_lds);
+    pthread_create(&server_thread_lds, NULL, serverloop_lds, NULL);
 }
 
 static void teardown_lds(void) {
-	*running_lds = false;
-	pthread_join(server_thread_lds, NULL);
-	UA_Server_run_shutdown(server_lds);
-	UA_Boolean_delete(running_lds);
-	UA_String_deleteMembers(&server_lds->config.applicationDescription.applicationUri);
-	UA_Server_delete(server_lds);
-	nl_lds.deleteMembers(&nl_lds);
+    *running_lds = false;
+    pthread_join(server_thread_lds, NULL);
+    UA_Server_run_shutdown(server_lds);
+    UA_Boolean_delete(running_lds);
+    UA_String_deleteMembers(&server_lds->config.applicationDescription.applicationUri);
+    UA_Server_delete(server_lds);
+    nl_lds.deleteMembers(&nl_lds);
 }
 
 
@@ -65,211 +65,211 @@ UA_ServerNetworkLayer nl_register;
 pthread_t server_thread_register;
 
 static void * serverloop_register(void *_) {
-	while(*running_register)
-		UA_Server_run_iterate(server_register, true);
-	return NULL;
+    while(*running_register)
+        UA_Server_run_iterate(server_register, true);
+    return NULL;
 }
 
 static void setup_register(void) {
-	// start LDS server
-	running_register = UA_Boolean_new();
-	*running_register = true;
-	UA_ServerConfig config_register = UA_ServerConfig_standard;
-	config_register.applicationDescription.applicationUri = UA_String_fromChars("open62541.test.server_register");
-	nl_register = UA_ServerNetworkLayerTCP(UA_ConnectionConfig_standard, 16664);
-	config_register.networkLayers = &nl_register;
-	config_register.networkLayersSize = 1;
-	server_register = UA_Server_new(config_register);
-	UA_Server_run_startup(server_register);
-	pthread_create(&server_thread_register, NULL, serverloop_register, NULL);
+    // start LDS server
+    running_register = UA_Boolean_new();
+    *running_register = true;
+    UA_ServerConfig config_register = UA_ServerConfig_standard;
+    config_register.applicationDescription.applicationUri = UA_String_fromChars("open62541.test.server_register");
+    nl_register = UA_ServerNetworkLayerTCP(UA_ConnectionConfig_standard, 16664);
+    config_register.networkLayers = &nl_register;
+    config_register.networkLayersSize = 1;
+    server_register = UA_Server_new(config_register);
+    UA_Server_run_startup(server_register);
+    pthread_create(&server_thread_register, NULL, serverloop_register, NULL);
 }
 
 static void teardown_register(void) {
-	*running_register = false;
-	pthread_join(server_thread_register, NULL);
-	UA_Server_run_shutdown(server_register);
-	UA_Boolean_delete(running_register);
-	UA_String_deleteMembers(&server_register->config.applicationDescription.applicationUri);
-	UA_Server_delete(server_register);
-	nl_register.deleteMembers(&nl_register);
+    *running_register = false;
+    pthread_join(server_thread_register, NULL);
+    UA_Server_run_shutdown(server_register);
+    UA_Boolean_delete(running_register);
+    UA_String_deleteMembers(&server_register->config.applicationDescription.applicationUri);
+    UA_Server_delete(server_register);
+    nl_register.deleteMembers(&nl_register);
 }
 
 START_TEST(Server_register) {
-		UA_StatusCode retval = UA_Server_register_discovery(server_register, "opc.tcp://localhost:4840", NULL);
-		ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-	}
+        UA_StatusCode retval = UA_Server_register_discovery(server_register, "opc.tcp://localhost:4840", NULL);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    }
 END_TEST
 
 START_TEST(Server_unregister) {
-		UA_StatusCode retval = UA_Server_unregister_discovery(server_register, "opc.tcp://localhost:4840");
-		ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-	}
+        UA_StatusCode retval = UA_Server_unregister_discovery(server_register, "opc.tcp://localhost:4840");
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    }
 END_TEST
 
 
 static UA_StatusCode FindServers(const char* discoveryServerUrl, size_t* registeredServerSize, UA_ApplicationDescription** registeredServers, const char* filterUri, const char* filterLocale) {
-	UA_Client *client = UA_Client_new(UA_ClientConfig_standard);
-	UA_StatusCode retval = UA_Client_connect(client, discoveryServerUrl);
-	if(retval != UA_STATUSCODE_GOOD) {
-		UA_Client_delete(client);
-		return retval;
-	}
-
-
-	UA_FindServersRequest request;
-	UA_FindServersRequest_init(&request);
-
-	if (filterUri) {
-		request.serverUrisSize = 1;
-		request.serverUris = UA_malloc(sizeof(UA_String));
-		request.serverUris[0] = UA_String_fromChars(filterUri);
-	}
-
-	if (filterLocale) {
-		request.localeIdsSize = 1;
-		request.localeIds = UA_malloc(sizeof(UA_String));
-		request.localeIds[0] = UA_String_fromChars(filterLocale);
-	}
-
-	// now send the request
-	UA_FindServersResponse response;
-	UA_FindServersResponse_init(&response);
-	__UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST],
-						&response, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
-
-	if (filterUri) {
-		UA_Array_delete(request.serverUris, request.serverUrisSize, &UA_TYPES[UA_TYPES_STRING]);
-	}
-
-	if (filterLocale) {
-		UA_Array_delete(request.localeIds, request.localeIdsSize, &UA_TYPES[UA_TYPES_STRING]);
-	}
-
-	if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-		UA_FindServersResponse_deleteMembers(&response);
-		UA_Client_disconnect(client);
-		UA_Client_delete(client);
-		ck_abort_msg("FindServers failed with statuscode 0x%08x", response.responseHeader.serviceResult);
-	}
-
-	*registeredServerSize = response.serversSize;
-	*registeredServers = (UA_ApplicationDescription*)UA_Array_new(response.serversSize, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
-	for(size_t i=0;i<response.serversSize;i++)
-		UA_ApplicationDescription_copy(&response.servers[i], &(*registeredServers)[i]);
-	UA_FindServersResponse_deleteMembers(&response);
-
-	UA_Client_disconnect(client);
-	UA_Client_delete(client);
-	return (int) UA_STATUSCODE_GOOD;
+    UA_Client *client = UA_Client_new(UA_ClientConfig_standard);
+    UA_StatusCode retval = UA_Client_connect(client, discoveryServerUrl);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(client);
+        return retval;
+    }
+
+
+    UA_FindServersRequest request;
+    UA_FindServersRequest_init(&request);
+
+    if (filterUri) {
+        request.serverUrisSize = 1;
+        request.serverUris = UA_malloc(sizeof(UA_String));
+        request.serverUris[0] = UA_String_fromChars(filterUri);
+    }
+
+    if (filterLocale) {
+        request.localeIdsSize = 1;
+        request.localeIds = UA_malloc(sizeof(UA_String));
+        request.localeIds[0] = UA_String_fromChars(filterLocale);
+    }
+
+    // now send the request
+    UA_FindServersResponse response;
+    UA_FindServersResponse_init(&response);
+    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST],
+                        &response, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+
+    if (filterUri) {
+        UA_Array_delete(request.serverUris, request.serverUrisSize, &UA_TYPES[UA_TYPES_STRING]);
+    }
+
+    if (filterLocale) {
+        UA_Array_delete(request.localeIds, request.localeIdsSize, &UA_TYPES[UA_TYPES_STRING]);
+    }
+
+    if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+        UA_FindServersResponse_deleteMembers(&response);
+        UA_Client_disconnect(client);
+        UA_Client_delete(client);
+        ck_abort_msg("FindServers failed with statuscode 0x%08x", response.responseHeader.serviceResult);
+    }
+
+    *registeredServerSize = response.serversSize;
+    *registeredServers = (UA_ApplicationDescription*)UA_Array_new(response.serversSize, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+    for(size_t i=0;i<response.serversSize;i++)
+        UA_ApplicationDescription_copy(&response.servers[i], &(*registeredServers)[i]);
+    UA_FindServersResponse_deleteMembers(&response);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+    return (int) UA_STATUSCODE_GOOD;
 }
 
 static void FindAndCheck(const char* expectedUris[], size_t expectedUrisSize, const char *filterUri, const char *filterLocale) {
-	UA_Client *client = UA_Client_new(UA_ClientConfig_standard);
-	UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    UA_Client *client = UA_Client_new(UA_ClientConfig_standard);
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
 
-	ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-	UA_ApplicationDescription* applicationDescriptionArray = NULL;
-	size_t applicationDescriptionArraySize = 0;
+    UA_ApplicationDescription* applicationDescriptionArray = NULL;
+    size_t applicationDescriptionArraySize = 0;
 
-	retval = FindServers("opc.tcp://localhost:4840", &applicationDescriptionArraySize, &applicationDescriptionArray, filterUri, filterLocale);
-	ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    retval = FindServers("opc.tcp://localhost:4840", &applicationDescriptionArraySize, &applicationDescriptionArray, filterUri, filterLocale);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-	// only the discovery server is expected
-	ck_assert_uint_eq(applicationDescriptionArraySize, expectedUrisSize);
+    // only the discovery server is expected
+    ck_assert_uint_eq(applicationDescriptionArraySize, expectedUrisSize);
     assert(applicationDescriptionArray != NULL);
 
-	for(size_t i=0; i < expectedUrisSize; ++i) {
-		char* serverUri = malloc(sizeof(char)*applicationDescriptionArray[i].applicationUri.length+1);
-		memcpy(serverUri, applicationDescriptionArray[i].applicationUri.data, applicationDescriptionArray[i].applicationUri.length);
-		serverUri[applicationDescriptionArray[i].applicationUri.length] = '\0';
-		ck_assert_str_eq(serverUri, expectedUris[i]);
-		free(serverUri);
-	}
+    for(size_t i=0; i < expectedUrisSize; ++i) {
+        char* serverUri = malloc(sizeof(char)*applicationDescriptionArray[i].applicationUri.length+1);
+        memcpy(serverUri, applicationDescriptionArray[i].applicationUri.data, applicationDescriptionArray[i].applicationUri.length);
+        serverUri[applicationDescriptionArray[i].applicationUri.length] = '\0';
+        ck_assert_str_eq(serverUri, expectedUris[i]);
+        free(serverUri);
+    }
 
-	UA_Array_delete(applicationDescriptionArray, applicationDescriptionArraySize, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+    UA_Array_delete(applicationDescriptionArray, applicationDescriptionArraySize, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
 
-	UA_Client_disconnect(client);
-	UA_Client_delete(client);
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
 }
 
 // Test if discovery server lists himself as registered server, before any other registration.
 START_TEST(Client_find_discovery) {
-		const char* expectedUris[] ={"open62541.test.local_discovery_server"};
-		FindAndCheck(expectedUris, 1, NULL, NULL);
-	}
+        const char* expectedUris[] ={"open62541.test.local_discovery_server"};
+        FindAndCheck(expectedUris, 1, NULL, NULL);
+    }
 END_TEST
 
 // Test if discovery server lists himself as registered server if it is filtered by his uri
 START_TEST(Client_filter_discovery) {
-		const char* expectedUris[] ={"open62541.test.local_discovery_server"};
-		FindAndCheck(expectedUris, 1, "open62541.test.local_discovery_server", "en");
-	}
+        const char* expectedUris[] ={"open62541.test.local_discovery_server"};
+        FindAndCheck(expectedUris, 1, "open62541.test.local_discovery_server", "en");
+    }
 END_TEST
 
 // Test if registered server is returned from LDS
 START_TEST(Client_find_registered) {
 
-		const char* expectedUris[] ={"open62541.test.local_discovery_server", "open62541.test.server_register"};
-		FindAndCheck(expectedUris, 2, NULL, NULL);
-	}
+        const char* expectedUris[] ={"open62541.test.local_discovery_server", "open62541.test.server_register"};
+        FindAndCheck(expectedUris, 2, NULL, NULL);
+    }
 END_TEST
 
 // Test if filtering with uris works
 START_TEST(Client_find_filter) {
-		const char* expectedUris[] ={"open62541.test.server_register"};
-		FindAndCheck(expectedUris, 1, "open62541.test.server_register", NULL);
-	}
+        const char* expectedUris[] ={"open62541.test.server_register"};
+        FindAndCheck(expectedUris, 1, "open62541.test.server_register", NULL);
+    }
 END_TEST
 
 START_TEST(Util_wait_timeout) {
-		// wait until server is removed by timeout. Additionally wait a few seconds more to be sure.
-		sleep(checkWait);
-	}
+        // wait until server is removed by timeout. Additionally wait a few seconds more to be sure.
+        sleep(checkWait);
+    }
 END_TEST
 
 static Suite* testSuite_Client(void) {
-	Suite *s = suite_create("Register Server and Client");
-	TCase *tc_register = tcase_create("RegisterServer");
-	tcase_add_unchecked_fixture(tc_register, setup_lds, teardown_lds);
-	tcase_add_unchecked_fixture(tc_register, setup_register, teardown_register);
-	tcase_add_test(tc_register, Server_register);
-	// register two times
-	tcase_add_test(tc_register, Server_register);
-	tcase_add_test(tc_register, Server_unregister);
-	suite_add_tcase(s,tc_register);
-
-	TCase *tc_register_find = tcase_create("RegisterServer and FindServers");
-	tcase_add_unchecked_fixture(tc_register_find, setup_lds, teardown_lds);
-	tcase_add_unchecked_fixture(tc_register_find, setup_register, teardown_register);
-	tcase_add_test(tc_register_find, Client_find_discovery);
-	tcase_add_test(tc_register_find, Server_register);
-	tcase_add_test(tc_register_find, Client_find_registered);
-	tcase_add_test(tc_register_find, Client_find_filter);
-	tcase_add_test(tc_register_find, Server_unregister);
-	tcase_add_test(tc_register_find, Client_find_discovery);
-	tcase_add_test(tc_register_find, Client_filter_discovery);
-	suite_add_tcase(s,tc_register_find);
-
-	// register server again, then wait for timeout and auto unregister
-	TCase *tc_register_timeout = tcase_create("RegisterServer timeout");
-	tcase_add_unchecked_fixture(tc_register_timeout, setup_lds, teardown_lds);
-	tcase_add_unchecked_fixture(tc_register_timeout, setup_register, teardown_register);
-	tcase_set_timeout(tc_register_timeout, checkWait+2);
-	tcase_add_test(tc_register_timeout, Server_register);
-	tcase_add_test(tc_register_timeout, Client_find_registered);
-	tcase_add_test(tc_register_timeout, Util_wait_timeout);
-	tcase_add_test(tc_register_timeout, Client_find_discovery);
-	suite_add_tcase(s,tc_register_timeout);
-	return s;
+    Suite *s = suite_create("Register Server and Client");
+    TCase *tc_register = tcase_create("RegisterServer");
+    tcase_add_unchecked_fixture(tc_register, setup_lds, teardown_lds);
+    tcase_add_unchecked_fixture(tc_register, setup_register, teardown_register);
+    tcase_add_test(tc_register, Server_register);
+    // register two times
+    tcase_add_test(tc_register, Server_register);
+    tcase_add_test(tc_register, Server_unregister);
+    suite_add_tcase(s,tc_register);
+
+    TCase *tc_register_find = tcase_create("RegisterServer and FindServers");
+    tcase_add_unchecked_fixture(tc_register_find, setup_lds, teardown_lds);
+    tcase_add_unchecked_fixture(tc_register_find, setup_register, teardown_register);
+    tcase_add_test(tc_register_find, Client_find_discovery);
+    tcase_add_test(tc_register_find, Server_register);
+    tcase_add_test(tc_register_find, Client_find_registered);
+    tcase_add_test(tc_register_find, Client_find_filter);
+    tcase_add_test(tc_register_find, Server_unregister);
+    tcase_add_test(tc_register_find, Client_find_discovery);
+    tcase_add_test(tc_register_find, Client_filter_discovery);
+    suite_add_tcase(s,tc_register_find);
+
+    // register server again, then wait for timeout and auto unregister
+    TCase *tc_register_timeout = tcase_create("RegisterServer timeout");
+    tcase_add_unchecked_fixture(tc_register_timeout, setup_lds, teardown_lds);
+    tcase_add_unchecked_fixture(tc_register_timeout, setup_register, teardown_register);
+    tcase_set_timeout(tc_register_timeout, checkWait+2);
+    tcase_add_test(tc_register_timeout, Server_register);
+    tcase_add_test(tc_register_timeout, Client_find_registered);
+    tcase_add_test(tc_register_timeout, Util_wait_timeout);
+    tcase_add_test(tc_register_timeout, Client_find_discovery);
+    suite_add_tcase(s,tc_register_timeout);
+    return s;
 }
 
 int main(void) {
-	Suite *s = testSuite_Client();
-	SRunner *sr = srunner_create(s);
-	srunner_set_fork_status(sr, CK_NOFORK);
-	srunner_run_all(sr,CK_NORMAL);
-	int number_failed = srunner_ntests_failed(sr);
-	srunner_free(sr);
-	return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }

tests/check_server_userspace.c

@@ -22,7 +22,7 @@ START_TEST(Server_addNamespace_ShallWork)
     ck_assert_uint_eq(a,b);
     ck_assert_uint_ne(a,c);
 
-	UA_Server_delete(server);
+    UA_Server_delete(server);
 }
 END_TEST
 
@@ -56,7 +56,7 @@ START_TEST(Server_addNamespace_writeService)
     ck_assert_uint_eq(namespaces.arrayLength, nsSize);
 
     UA_Variant_deleteMembers(&namespaces);
-	UA_Server_delete(server);
+    UA_Server_delete(server);
 }
 END_TEST
 

tests/check_utils.c

@@ -121,11 +121,11 @@ START_TEST(StatusCode_msg) {
     ck_assert_str_eq(UA_StatusCode_msg(UA_STATUSCODE_GOOD), "StatusCode descriptions not available");
     return;
 #endif
-		// first element in table
+        // first element in table
     ck_assert_str_eq(UA_StatusCode_explanation(UA_STATUSCODE_GOOD), "Success / No error");
     ck_assert_str_eq(UA_StatusCode_name(UA_STATUSCODE_GOOD), "Good");
 
-		// just some randomly picked status codes
+        // just some randomly picked status codes
     ck_assert_str_eq(UA_StatusCode_explanation(UA_STATUSCODE_BADNOCOMMUNICATION),
                      "Communication with the data source is defined");
     ck_assert_str_eq(UA_StatusCode_name(UA_STATUSCODE_BADNOCOMMUNICATION),
@@ -135,15 +135,15 @@ START_TEST(StatusCode_msg) {
                      "No data exists for the requested time range or event filter.");
     ck_assert_str_eq(UA_StatusCode_name(UA_STATUSCODE_GOODNODATA), "GoodNoData");
 
-		// last element in table
+        // last element in table
     ck_assert_str_eq(UA_StatusCode_explanation(UA_STATUSCODE_BADMAXCONNECTIONSREACHED),
                      "The operation could not be finished because all available connections are in use.");
     ck_assert_str_eq(UA_StatusCode_name(UA_STATUSCODE_BADMAXCONNECTIONSREACHED),
                      "BadMaxConnectionsReached");
 
-		// an invalid status code
-	ck_assert_str_eq(UA_StatusCode_explanation(0x80123456), "Unknown StatusCode");
-	ck_assert_str_eq(UA_StatusCode_name(0x80123456), "Unknown");
+        // an invalid status code
+    ck_assert_str_eq(UA_StatusCode_explanation(0x80123456), "Unknown StatusCode");
+    ck_assert_str_eq(UA_StatusCode_name(0x80123456), "Unknown");
 }
 END_TEST