Deprecate UA_TRUE/UA_FALSE for internal use

arch/ua_architecture_definitions.h

@@ -136,6 +136,25 @@
 # define UA_DEPRECATED
 #endif
 
+/**
+ * Internal Attributes
+ * -------------------
+ * These attributes are only defined if the macro UA_INTERNAL is defined. That
+ * way public methods can be annotated (e.g. to warn for unused results) but
+ * warnings are only triggered for internal code. */
+
+#if defined(UA_INTERNAL) && (defined(__GNUC__) || defined(__clang__))
+# define UA_INTERNAL_DEPRECATED _Pragma ("GCC warning \"Macro is deprecated for internal use\"")
+#else
+# define UA_INTERNAL_DEPRECATED
+#endif
+
+#if defined(UA_INTERNAL) && (defined(__GNUC__) || defined(__clang__))
+# define UA_INTERNAL_FUNC_ATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#else
+# define UA_INTERNAL_FUNC_ATTR_WARN_UNUSED_RESULT
+#endif
+
 /**
  * Detect Endianness and IEEE 754 floating point
  * ---------------------------------------------

arch/ua_network_tcp.c

@@ -8,6 +8,7 @@
  *    Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
  */
 
+#define UA_INTERNAL
 #include "ua_network_tcp.h"
 #include "ua_log_stdout.h"
 #include "../deps/queue.h"
@@ -850,7 +851,7 @@ UA_ClientConnectionTCP(UA_ConnectionConfig config,
         return connection;
     }
 
-    UA_Boolean connected = UA_FALSE;
+    UA_Boolean connected = false;
     UA_DateTime dtTimeout = timeout * UA_DATETIME_MSEC;
     UA_DateTime connStart = UA_DateTime_nowMonotonic();
     UA_SOCKET clientsockfd;

include/ua_types.h

@@ -47,8 +47,8 @@ _UA_BEGIN_DECLS
  * ^^^^^^^
  * A two-state logical value (true or false). */
 typedef bool UA_Boolean;
-#define UA_TRUE true
-#define UA_FALSE false
+#define UA_TRUE true UA_INTERNAL_DEPRECATED
+#define UA_FALSE false UA_INTERNAL_DEPRECATED
 
 /**
  * SByte

src/client/ua_client.c

@@ -17,7 +17,6 @@
  *    Copyright 2018 (c) Kalycito Infotech Private Limited
  */
 
-#include "ua_client.h"
 #include "ua_client_internal.h"
 #include "ua_connection_internal.h"
 #include "ua_types_encoding_binary.h"
@@ -434,7 +433,7 @@ finish:
 static UA_StatusCode
 client_processChunk(void *application, UA_Connection *connection, UA_ByteString *chunk) {
     SyncResponseDescription *rd = (SyncResponseDescription*)application;
-    UA_StatusCode retval = UA_SecureChannel_decryptAddChunk(&rd->client->channel, chunk, UA_TRUE);
+    UA_StatusCode retval = UA_SecureChannel_decryptAddChunk(&rd->client->channel, chunk, true);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
     return UA_SecureChannel_persistIncompleteMessages(&rd->client->channel);

src/client/ua_client_connect.c

@@ -9,7 +9,6 @@
  *    Copyright 2018 (c) Kalycito Infotech Private Limited
  */
 
-#include "ua_client.h"
 #include "ua_client_internal.h"
 #include "ua_transport_generated.h"
 #include "ua_transport_generated_handling.h"
@@ -677,12 +676,12 @@ cleanup:
 
 UA_StatusCode
 UA_Client_connect(UA_Client *client, const char *endpointUrl) {
-    return UA_Client_connectInternal(client, endpointUrl, UA_TRUE, UA_TRUE);
+    return UA_Client_connectInternal(client, endpointUrl, true, true);
 }
 
 UA_StatusCode
 UA_Client_connect_noSession(UA_Client *client, const char *endpointUrl) {
-    return UA_Client_connectInternal(client, endpointUrl, UA_TRUE, UA_FALSE);
+    return UA_Client_connectInternal(client, endpointUrl, true, false);
 }
 
 UA_StatusCode

src/client/ua_client_connect_async.c

@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "ua_client.h"
 #include "ua_client_internal.h"
 #include "ua_transport_generated.h"
 #include "ua_transport_generated_handling.h"
@@ -202,7 +201,7 @@ UA_StatusCode
 processOPNResponseAsync(void *application, UA_Connection *connection,
                         UA_ByteString *chunk) {
     UA_Client *client = (UA_Client*) application;
-    UA_StatusCode retval = UA_SecureChannel_decryptAddChunk(&client->channel, chunk, UA_TRUE);
+    UA_StatusCode retval = UA_SecureChannel_decryptAddChunk(&client->channel, chunk, true);
     client->connectStatus = retval;
     if(retval != UA_STATUSCODE_GOOD)
         goto error;

src/client/ua_client_discovery.c

@@ -7,7 +7,6 @@
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  */
 
-#include "ua_client.h"
 #include "ua_client_internal.h"
 
 UA_StatusCode
@@ -23,7 +22,7 @@ UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
 
     UA_StatusCode retval;
     if(!connected) {
-        retval = UA_Client_connectInternal(client, serverUrl, UA_FALSE, UA_FALSE);
+        retval = UA_Client_connectInternal(client, serverUrl, false, false);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
     }
@@ -48,7 +47,7 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
     }
 
     if(!connected) {
-        UA_StatusCode retval = UA_Client_connectInternal(client, serverUrl, UA_TRUE, UA_FALSE);
+        UA_StatusCode retval = UA_Client_connectInternal(client, serverUrl, true, false);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
     }
@@ -100,7 +99,7 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
     }
 
     if(!connected) {
-        UA_StatusCode retval = UA_Client_connectInternal(client, serverUrl, UA_TRUE, UA_FALSE);
+        UA_StatusCode retval = UA_Client_connectInternal(client, serverUrl, true, false);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
     }

src/client/ua_client_internal.h

@@ -13,8 +13,10 @@
 #ifndef UA_CLIENT_INTERNAL_H_
 #define UA_CLIENT_INTERNAL_H_
 
+#define UA_INTERNAL
 #include "ua_securechannel.h"
 #include "ua_workqueue.h"
+#include "ua_client.h"
 #include "ua_client_highlevel.h"
 #include "ua_client_subscriptions.h"
 #include "ua_timer.h"

src/pubsub/ua_pubsub.c

@@ -5,8 +5,8 @@
  * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include "ua_types_encoding_binary.h"
 #include "server/ua_server_internal.h"
+#include "ua_types_encoding_binary.h"
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
@@ -670,29 +670,29 @@ UA_DataSetField_deleteMembers(UA_DataSetField *field) {
 /**
  * Compare two variants. Internally used for value change detection.
  *
- * @return UA_TRUE if the value has changed
+ * @return true if the value has changed
  */
 #ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
 static UA_Boolean
 valueChangedVariant(UA_Variant *oldValue, UA_Variant *newValue){
     if(! (oldValue && newValue))
-        return UA_FALSE;
+        return false;
 
     UA_ByteString *oldValueEncoding = UA_ByteString_new(), *newValueEncoding = UA_ByteString_new();
     size_t oldValueEncodingSize, newValueEncodingSize;
     oldValueEncodingSize = UA_calcSizeBinary(oldValue, &UA_TYPES[UA_TYPES_VARIANT]);
     newValueEncodingSize = UA_calcSizeBinary(newValue, &UA_TYPES[UA_TYPES_VARIANT]);
     if((oldValueEncodingSize == 0) || (newValueEncodingSize == 0))
-        return UA_FALSE;
+        return false;
 
     if(oldValueEncodingSize != newValueEncodingSize)
-        return UA_TRUE;
+        return true;
 
     if(UA_ByteString_allocBuffer(oldValueEncoding, oldValueEncodingSize) != UA_STATUSCODE_GOOD)
-        return UA_FALSE;
+        return false;
 
     if(UA_ByteString_allocBuffer(newValueEncoding, newValueEncodingSize) != UA_STATUSCODE_GOOD)
-        return UA_FALSE;
+        return false;
 
     UA_Byte *bufPosOldValue = oldValueEncoding->data;
     const UA_Byte *bufEndOldValue = &oldValueEncoding->data[oldValueEncoding->length];
@@ -700,11 +700,11 @@ valueChangedVariant(UA_Variant *oldValue, UA_Variant *newValue){
     const UA_Byte *bufEndNewValue = &newValueEncoding->data[newValueEncoding->length];
     if(UA_encodeBinary(oldValue, &UA_TYPES[UA_TYPES_VARIANT],
                        &bufPosOldValue, &bufEndOldValue, NULL, NULL) != UA_STATUSCODE_GOOD){
-        return UA_FALSE;
+        return false;
     }
     if(UA_encodeBinary(newValue, &UA_TYPES[UA_TYPES_VARIANT],
                        &bufPosNewValue, &bufEndNewValue, NULL, NULL) != UA_STATUSCODE_GOOD){
-        return UA_FALSE;
+        return false;
     }
     oldValueEncoding->length = (uintptr_t)bufPosOldValue - (uintptr_t)oldValueEncoding->data;
     newValueEncoding->length = (uintptr_t)bufPosNewValue - (uintptr_t)newValueEncoding->data;
@@ -808,14 +808,14 @@ UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
         if(valueChangedVariant(&dataSetWriter->lastSamples[counter].value.value, &value.value)) {
             /* increase fieldCount for current delta message */
             dataSetMessage->data.deltaFrameData.fieldCount++;
-            dataSetWriter->lastSamples[counter].valueChanged = UA_TRUE;
+            dataSetWriter->lastSamples[counter].valueChanged = true;
 
             /* Update last stored sample */
             UA_DataValue_deleteMembers(&dataSetWriter->lastSamples[counter].value);
             dataSetWriter->lastSamples[counter].value = value;
         } else {
             UA_DataValue_deleteMembers(&value);
-            dataSetWriter->lastSamples[counter].valueChanged = UA_FALSE;
+            dataSetWriter->lastSamples[counter].valueChanged = false;
         }
 
         counter++;
@@ -841,17 +841,17 @@ UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
 
         /* Deactivate statuscode? */
         if((dataSetWriter->config.dataSetFieldContentMask & UA_DATASETFIELDCONTENTMASK_STATUSCODE) == 0)
-            dff->fieldValue.hasStatus = UA_FALSE;
+            dff->fieldValue.hasStatus = false;
 
         /* Deactivate timestamps? */
         if((dataSetWriter->config.dataSetFieldContentMask & UA_DATASETFIELDCONTENTMASK_SOURCETIMESTAMP) == 0)
-            dff->fieldValue.hasSourceTimestamp = UA_FALSE;
+            dff->fieldValue.hasSourceTimestamp = false;
         if((dataSetWriter->config.dataSetFieldContentMask & UA_DATASETFIELDCONTENTMASK_SOURCEPICOSECONDS) == 0)
-            dff->fieldValue.hasServerPicoseconds = UA_FALSE;
+            dff->fieldValue.hasServerPicoseconds = false;
         if((dataSetWriter->config.dataSetFieldContentMask & UA_DATASETFIELDCONTENTMASK_SERVERTIMESTAMP) == 0)
-            dff->fieldValue.hasServerTimestamp = UA_FALSE;
+            dff->fieldValue.hasServerTimestamp = false;
         if((dataSetWriter->config.dataSetFieldContentMask & UA_DATASETFIELDCONTENTMASK_SERVERPICOSECONDS) == 0)
-            dff->fieldValue.hasServerPicoseconds = UA_FALSE;
+            dff->fieldValue.hasServerPicoseconds = false;
 
         currentDeltaField++;
     }
@@ -920,34 +920,34 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server, UA_DataSetMessage *da
 
     /* Std: 'The DataSetMessageContentMask defines the flags for the content of the DataSetMessage header.' */
     if(dataSetWriterMessageDataType->dataSetMessageContentMask & UA_UADPDATASETMESSAGECONTENTMASK_MAJORVERSION){
-        dataSetMessage->header.configVersionMajorVersionEnabled = UA_TRUE;
+        dataSetMessage->header.configVersionMajorVersionEnabled = true;
         dataSetMessage->header.configVersionMajorVersion =
             currentDataSet->dataSetMetaData.configurationVersion.majorVersion;
     }
     if(dataSetWriterMessageDataType->dataSetMessageContentMask & UA_UADPDATASETMESSAGECONTENTMASK_MINORVERSION){
-        dataSetMessage->header.configVersionMinorVersionEnabled = UA_TRUE;
+        dataSetMessage->header.configVersionMinorVersionEnabled = true;
         dataSetMessage->header.configVersionMinorVersion =
             currentDataSet->dataSetMetaData.configurationVersion.minorVersion;
     }
 
     if(dataSetWriterMessageDataType->dataSetMessageContentMask & UA_UADPDATASETMESSAGECONTENTMASK_SEQUENCENUMBER) {
-        dataSetMessage->header.dataSetMessageSequenceNrEnabled = UA_TRUE;
+        dataSetMessage->header.dataSetMessageSequenceNrEnabled = true;
         dataSetMessage->header.dataSetMessageSequenceNr =
             dataSetWriter->actualDataSetMessageSequenceCount;
     }
 
     if(dataSetWriterMessageDataType->dataSetMessageContentMask & UA_UADPDATASETMESSAGECONTENTMASK_TIMESTAMP) {
-        dataSetMessage->header.timestampEnabled = UA_TRUE;
+        dataSetMessage->header.timestampEnabled = true;
         dataSetMessage->header.timestamp = UA_DateTime_now();
     }
     /* TODO: Picoseconds resolution not supported atm */
     if(dataSetWriterMessageDataType->dataSetMessageContentMask & UA_UADPDATASETMESSAGECONTENTMASK_PICOSECONDS) {
-        dataSetMessage->header.picoSecondsIncluded = UA_FALSE;
+        dataSetMessage->header.picoSecondsIncluded = false;
     }
 
     /* TODO: Statuscode not supported yet */
     if(dataSetWriterMessageDataType->dataSetMessageContentMask & UA_UADPDATASETMESSAGECONTENTMASK_STATUS){
-        dataSetMessage->header.statusEnabled = UA_FALSE;
+        dataSetMessage->header.statusEnabled = false;
     }
 
     /* Set the sequence count. Automatically rolls over to zero */
@@ -1095,7 +1095,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     for(UA_UInt32 i = 0; i < networkMessageCount; i++) {
         nmStore[i].version = 1;
         nmStore[i].networkMessageType = UA_NETWORKMESSAGE_DATASET;
-        nmStore[i].payloadHeaderEnabled = UA_TRUE;
+        nmStore[i].payloadHeaderEnabled = true;
         //create combined NetworkMessages
         if(i < (networkMessageCount-singleNetworkMessagesCount)){
             if(combinedNetworkMessageCount - (i * writerGroup->config.maxEncapsulatedDataSetMessageCount)){

src/server/ua_mdns.c

@@ -93,8 +93,8 @@ mdns_record_add_or_get(UA_Server *server, const char *record, const char *server
         UA_malloc(sizeof(struct serverOnNetwork_list_entry));
     listEntry->created = UA_DateTime_now();
     listEntry->pathTmp = NULL;
-    listEntry->txtSet = UA_FALSE;
-    listEntry->srvSet = UA_FALSE;
+    listEntry->txtSet = false;
+    listEntry->srvSet = false;
     UA_ServerOnNetwork_init(&listEntry->serverOnNetwork);
     listEntry->serverOnNetwork.recordId = server->serverOnNetworkRecordIdCounter;
     listEntry->serverOnNetwork.serverName.length = serverNameLen;
@@ -225,7 +225,7 @@ mdns_is_self_announce(UA_Server *server, struct serverOnNetwork_list_entry *entr
         UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
         if(UA_String_equal(&entry->serverOnNetwork.discoveryUrl,
                            &nl->discoveryUrl))
-            return UA_TRUE;
+            return true;
     }
 
     /* The discovery URL may also just contain the IP address, but in our
@@ -239,7 +239,7 @@ mdns_is_self_announce(UA_Server *server, struct serverOnNetwork_list_entry *entr
                             &hostnameRemote, &portRemote, &pathRemote);
     if(retval != UA_STATUSCODE_GOOD) {
         /* skip invalid url */
-        return UA_FALSE;
+        return false;
     }
 
 #ifdef _WIN32
@@ -247,19 +247,19 @@ mdns_is_self_announce(UA_Server *server, struct serverOnNetwork_list_entry *entr
     if(!adapter_addresses) {
         UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER,
                      "getifaddrs returned an unexpected error. Not setting mDNS A records.");
-        return UA_FALSE;
+        return false;
     }
 #else
     struct ifaddrs *ifaddr, *ifa;
     if(getifaddrs(&ifaddr) == -1) {
         UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER,
                      "getifaddrs returned an unexpected error. Not setting mDNS A records.");
-        return UA_FALSE;
+        return false;
     }
 #endif
 
 
-    UA_Boolean isSelf = UA_FALSE;
+    UA_Boolean isSelf = false;
 
     for (size_t i=0; i<server->config.networkLayersSize; i++) {
         UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
@@ -294,7 +294,7 @@ mdns_is_self_announce(UA_Server *server, struct serverOnNetwork_list_entry *entr
                     char *ipStr = inet_ntoa(ipv4->sin_addr);
                     if(strncmp((const char*)hostnameRemote.data, ipStr,
                                hostnameRemote.length) == 0) {
-                        isSelf = UA_TRUE;
+                        isSelf = true;
                         break;
                     }
                 } else if(AF_INET6 == family) {
@@ -324,7 +324,7 @@ mdns_is_self_announce(UA_Server *server, struct serverOnNetwork_list_entry *entr
                 char *ipStr = inet_ntoa(sa->sin_addr);
                 if(strncmp((const char*)hostnameRemote.data, ipStr,
                            hostnameRemote.length) == 0) {
-                    isSelf = UA_TRUE;
+                    isSelf = true;
                     break;
                 }
             }
@@ -372,7 +372,7 @@ mdns_record_remove(UA_Server *server, const char *record,
 
     if(server->serverOnNetworkCallback &&
        !mdns_is_self_announce(server, entry))
-        server->serverOnNetworkCallback(&entry->serverOnNetwork, UA_FALSE,
+        server->serverOnNetworkCallback(&entry->serverOnNetwork, false,
                                         entry->txtSet, server->serverOnNetworkCallbackData);
 
     /* remove from list */
@@ -405,7 +405,7 @@ mdns_append_path_to_url(UA_String *url, const char *path) {
 static void
 setTxt(const struct resource *r,
        struct serverOnNetwork_list_entry *entry) {
-    entry->txtSet = UA_TRUE;
+    entry->txtSet = true;
     xht_t *x = txt2sd(r->rdata, r->rdlength);
     char *path = (char *) xht_get(x, "path");
     char *caps = (char *) xht_get(x, "caps");
@@ -454,7 +454,7 @@ setTxt(const struct resource *r,
 static void
 setSrv(UA_Server *server, const struct resource *r,
        struct serverOnNetwork_list_entry *entry) {
-    entry->srvSet = UA_TRUE;
+    entry->srvSet = true;
 
 
     /* The specification Part 12 says: The hostname maps onto the SRV record
@@ -471,7 +471,7 @@ setSrv(UA_Server *server, const struct resource *r,
     struct in_addr tmp = {0};
 
     mdnsHostnameToIp_list_entry *hostnameEntry =
-        mdns_hostname_add_or_get(server, r->known.srv.name, tmp, UA_FALSE);
+        mdns_hostname_add_or_get(server, r->known.srv.name, tmp, false);
 
     char *newUrl;
     if (hostnameEntry) {
@@ -533,7 +533,7 @@ setAddress(UA_Server *server, const struct resource *r) {
     if (r->type != QTYPE_A)
         return;
 
-    if (!mdns_hostname_add_or_get(server, r->name, r->known.a.ip, UA_TRUE)) {
+    if (!mdns_hostname_add_or_get(server, r->name, r->known.a.ip, true)) {
         /* should we log an error? */
     }
 }
@@ -596,7 +596,7 @@ void mdns_record_received(const struct resource *r, void *data) {
     /* Call callback to announce a new server */
     if(entry->srvSet && server->serverOnNetworkCallback &&
        !mdns_is_self_announce(server, entry))
-        server->serverOnNetworkCallback(&entry->serverOnNetwork, UA_TRUE,
+        server->serverOnNetworkCallback(&entry->serverOnNetwork, true,
                                         entry->txtSet, server->serverOnNetworkCallbackData);
 }
 

src/server/ua_server.c

@@ -17,7 +17,6 @@
  *    Copyright 2018 (c) Hilscher Gesellschaft für Systemautomation mbH (Author: Martin Lang)
  */
 
-#include "ua_types.h"
 #include "ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
@@ -300,7 +299,7 @@ UA_Server_new(const UA_ServerConfig *config) {
 #if defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST)
     server->mdnsDaemon = NULL;
     server->mdnsSocket = UA_INVALID_SOCKET;
-    server->mdnsMainSrvAdded = UA_FALSE;
+    server->mdnsMainSrvAdded = false;
     if(server->config.applicationDescription.applicationType == UA_APPLICATIONTYPE_DISCOVERYSERVER)
         initMulticastDiscoveryServer(server);
 
@@ -509,7 +508,7 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
         // server->mdnsSocket (see example in mdnsd library) on higher level.
         UA_DateTime multicastNextRepeat = 0;
         UA_StatusCode hasNext =
-            iterateMulticastDiscoveryServer(server, &multicastNextRepeat, UA_TRUE);
+            iterateMulticastDiscoveryServer(server, &multicastNextRepeat, true);
         if(hasNext == UA_STATUSCODE_GOOD && multicastNextRepeat < nextRepeated)
             nextRepeated = multicastNextRepeat;
     }

src/server/ua_server_binary.c

@@ -14,7 +14,6 @@
  *    Copyright 2017 (c) Mark Giraud, Fraunhofer IOSB
  */
 
-#include "ua_util.h"
 #include "ua_server_internal.h"
 #include "ua_services.h"
 #include "ua_securechannel_manager.h"
@@ -722,7 +721,7 @@ processCompleteChunkWithoutChannel(UA_Server *server, UA_Connection *connection,
         if(retval != UA_STATUSCODE_GOOD)
             break;
 
-        retval = UA_SecureChannel_decryptAddChunk(connection->channel, message, UA_FALSE);
+        retval = UA_SecureChannel_decryptAddChunk(connection->channel, message, false);
         if(retval != UA_STATUSCODE_GOOD)
             break;
 
@@ -749,7 +748,7 @@ processCompleteChunk(void *const application, UA_Connection *connection,
 #endif
     if(!connection->channel)
         return processCompleteChunkWithoutChannel(server, connection, chunk);
-    return UA_SecureChannel_decryptAddChunk(connection->channel, chunk, UA_FALSE);
+    return UA_SecureChannel_decryptAddChunk(connection->channel, chunk, false);
 }
 
 void

src/server/ua_server_discovery.c

@@ -116,13 +116,13 @@ UA_StatusCode
 UA_Server_register_discovery(UA_Server *server, UA_Client *client,
                              const char* semaphoreFilePath) {
     return register_server_with_discovery_server(server, client,
-                                                 UA_FALSE, semaphoreFilePath);
+                                                 false, semaphoreFilePath);
 }
 
 UA_StatusCode
 UA_Server_unregister_discovery(UA_Server *server, UA_Client *client) {
     return register_server_with_discovery_server(server, client,
-                                                 UA_TRUE, NULL);
+                                                 true, NULL);
 }
 
 #endif /* UA_ENABLE_DISCOVERY */

src/server/ua_server_ns0.c

@@ -36,7 +36,7 @@ addNode_finish(UA_Server *server, UA_UInt32 nodeId,
     const UA_NodeId sourceId = UA_NODEID_NUMERIC(0, nodeId);
     const UA_NodeId refTypeId = UA_NODEID_NUMERIC(0, referenceTypeId);
     const UA_ExpandedNodeId targetId = UA_EXPANDEDNODEID_NUMERIC(0, parentNodeId);
-    UA_StatusCode retval = UA_Server_addReference(server, sourceId, refTypeId, targetId, UA_FALSE);
+    UA_StatusCode retval = UA_Server_addReference(server, sourceId, refTypeId, targetId, false);
     if (retval != UA_STATUSCODE_GOOD)
         return retval;
     return AddNode_finish(server, &server->adminSession, &sourceId);

src/server/ua_server_utils.c

@@ -64,10 +64,10 @@ isNodeInTreeNoCircular(UA_Nodestore *ns, const UA_NodeId *leafNode, const UA_Nod
              * reference types. */
             if(visitedRefs->depth % 5 == 4) {
                 struct ref_history *last = visitedRefs;
-                UA_Boolean skip = UA_FALSE;
+                UA_Boolean skip = false;
                 while(!skip && last) {
                     if(UA_NodeId_equal(last->id, &refs->targetIds[j].nodeId))
-                        skip = UA_TRUE;
+                        skip = true;
                     last = last->parent;
                 }
                 if(skip)

src/server/ua_services_discovery.c

@@ -34,7 +34,7 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
 
     // if the client requests a specific locale, select the corresponding server name
     if(request->localeIdsSize) {
-        UA_Boolean appNameFound = UA_FALSE;
+        UA_Boolean appNameFound = false;
         for(size_t i =0; i<request->localeIdsSize && !appNameFound; i++) {
             for(size_t j =0; j<registeredServer->serverNamesSize; j++) {
                 if(UA_String_equal(&request->localeIds[i], &registeredServer->serverNames[j].locale)) {
@@ -42,7 +42,7 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
                                                    &target->applicationName);
                     if(retval != UA_STATUSCODE_GOOD)
                         return retval;
-                    appNameFound = UA_TRUE;
+                    appNameFound = true;
                     break;
                 }
             }
@@ -494,7 +494,7 @@ void UA_Discovery_cleanupTimedOut(UA_Server *server, UA_DateTime nowMonotonic) {
 
     registeredServer_list_entry* current, *temp;
     LIST_FOREACH_SAFE(current, &server->registeredServers, pointers, temp) {
-        UA_Boolean semaphoreDeleted = UA_FALSE;
+        UA_Boolean semaphoreDeleted = false;
 
 #ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
         if(current->registeredServer.semaphoreFilePath.length) {
@@ -505,10 +505,11 @@ void UA_Discovery_cleanupTimedOut(UA_Server *server, UA_DateTime nowMonotonic) {
                 memcpy(filePath, current->registeredServer.semaphoreFilePath.data,
                        current->registeredServer.semaphoreFilePath.length );
                 filePath[current->registeredServer.semaphoreFilePath.length] = '\0';
-                semaphoreDeleted = UA_fileExists(filePath) == UA_FALSE;
+                semaphoreDeleted = UA_fileExists(filePath) == false;
                 UA_free(filePath);
             } else {
-                UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER, "Cannot check registration semaphore. Out of memory");
+                UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER,
+                             "Cannot check registration semaphore. Out of memory");
             }
         }
 #endif

src/server/ua_services_discovery_multicast.c

@@ -89,7 +89,7 @@ addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
         return retval;
     }
     UA_Discovery_addRecord(server, appName, &hostname, port,
-                           &path, UA_DISCOVERY_TCP, UA_TRUE,
+                           &path, UA_DISCOVERY_TCP, true,
                            server->config.serverCapabilities,
                            &server->config.serverCapabilitiesSize);
     return UA_STATUSCODE_GOOD;
@@ -113,7 +113,7 @@ void stopMulticastDiscoveryServer(UA_Server *server) {
     if(UA_gethostname(hostname, 255) == 0) {
         UA_String hnString = UA_STRING(hostname);
         UA_Discovery_removeRecord(server, &server->config.mdnsServerName,
-                                  &hnString, 4840, UA_TRUE);
+                                  &hnString, 4840, true);
     } else {
         UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER,
                      "Could not get hostname for multicast discovery.");
@@ -123,7 +123,7 @@ void stopMulticastDiscoveryServer(UA_Server *server) {
     multicastListenStop(server);
 # else
     // send out last package with TTL = 0
-    iterateMulticastDiscoveryServer(server, NULL, UA_FALSE);
+    iterateMulticastDiscoveryServer(server, NULL, false);
 # endif
 }
 
@@ -357,10 +357,10 @@ UA_Discovery_recordExists(UA_Server* server, const char* fullServiceDomain,
     while(r) {
         const mdns_answer_t *data = mdnsd_record_data(r);
         if(data->type == QTYPE_SRV && (port == 0 || data->srv.port == port))
-            return UA_TRUE;
+            return true;
         r = mdnsd_record_next(r);
     }
-    return UA_FALSE;
+    return false;
 }
 
 static int
@@ -375,7 +375,7 @@ discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
     /* Skip, if we already know about this server */
     UA_Boolean exists =
         UA_Discovery_recordExists(server, a->rdname, 0, UA_DISCOVERY_TCP);
-    if(exists == UA_TRUE)
+    if(exists == true)
         return 0;
 
     if(mdnsd_has_query(server->mdnsDaemon, a->rdname))
@@ -429,7 +429,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
             mdnsd_shared(server->mdnsDaemon, "_services._dns-sd._udp.local.",
                          QTYPE_PTR, 600);
         mdnsd_set_host(server->mdnsDaemon, r, "_opcua-tcp._tcp.local.");
-        server->mdnsMainSrvAdded = UA_TRUE;
+        server->mdnsMainSrvAdded = true;
     }
 
     // [servername]-[hostname]._opcua-tcp._tcp.local.
@@ -437,7 +437,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
 
     UA_Boolean exists = UA_Discovery_recordExists(server, fullServiceDomain, port, protocol);
-    if(exists == UA_TRUE)
+    if(exists == true)
         return UA_STATUSCODE_GOOD;
 
     UA_LOG_INFO(server->config.logger, UA_LOGCATEGORY_SERVER,

src/server/ua_services_nodemanagement.c

@@ -534,7 +534,7 @@ addChildren(UA_Server *server, UA_Session *session,
     UA_NodeId *hierarchy = NULL;
     size_t hierarchySize = 0;
     UA_StatusCode retval = getTypeHierarchy(&server->config.nodestore, &type->nodeId,
-                                            &hierarchy, &hierarchySize, UA_FALSE);
+                                            &hierarchy, &hierarchySize, false);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -682,7 +682,7 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
             goto cleanup;
         }
 
-        UA_Boolean typeOk = UA_FALSE;
+        UA_Boolean typeOk = false;
         switch(node->nodeClass) {
             case UA_NODECLASS_DATATYPE:
                 typeOk = type->nodeClass == UA_NODECLASS_DATATYPE;
@@ -709,7 +709,7 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
                 typeOk = type->nodeClass == UA_NODECLASS_VIEW;
                 break;
             default:
-                typeOk = UA_FALSE;
+                typeOk = false;
         }
         if(!typeOk) {
             UA_LOG_NODEID_WRAP(nodeId, UA_LOG_INFO_SESSION(server->config.logger, session,
@@ -727,7 +727,7 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
                 UA_NodeId *parentTypeHierachy = NULL;
                 size_t parentTypeHierachySize = 0;
                 getTypesHierarchy(&server->config.nodestore, parentReferences,UA_PARENT_REFERENCES_COUNT,
-                                  &parentTypeHierachy, &parentTypeHierachySize, UA_TRUE);
+                                  &parentTypeHierachy, &parentTypeHierachySize, true);
                 /* Abstract variable is allowed if parent is a children of a base data variable */
                 const UA_NodeId variableTypes = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE);
                 /* A variable may be of an object type which again is below BaseObjectType */
@@ -754,7 +754,7 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
                 UA_NodeId *parentTypeHierachy = NULL;
                 size_t parentTypeHierachySize = 0;
                 getTypesHierarchy(&server->config.nodestore, parentReferences,UA_PARENT_REFERENCES_COUNT,
-                                  &parentTypeHierachy, &parentTypeHierachySize, UA_TRUE);
+                                  &parentTypeHierachy, &parentTypeHierachySize, true);
                 /* Object node created of an abstract ObjectType. Only allowed
                  * if within BaseObjectType folder */
                 const UA_NodeId objectTypes = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE);
@@ -902,7 +902,7 @@ Operation_addNode_begin(UA_Server *server, UA_Session *session, void *nodeContex
     retval = AddNode_addRefs(server, session, outNewNodeId, parentNodeId,
                              referenceTypeId, &item->typeDefinition.nodeId);
     if(retval != UA_STATUSCODE_GOOD)
-        UA_Server_deleteNode(server, *outNewNodeId, UA_TRUE);
+        UA_Server_deleteNode(server, *outNewNodeId, true);
 
     if(outNewNodeId == &newId)
         UA_NodeId_deleteMembers(&newId);
@@ -1310,10 +1310,10 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
                                  (UA_EditNodeCallback)addOneWayReference,
                                  /* cast away const because callback uses const anyway */
                                  (UA_AddReferencesItem *)(uintptr_t)item);
-    UA_Boolean firstExisted = UA_FALSE;
+    UA_Boolean firstExisted = false;
     if(*retval == UA_STATUSCODE_BADDUPLICATEREFERENCENOTALLOWED) {
         *retval = UA_STATUSCODE_GOOD;
-        firstExisted = UA_TRUE;
+        firstExisted = true;
     } else if(*retval != UA_STATUSCODE_GOOD)
         return;
 
@@ -1329,10 +1329,10 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
                                  (UA_EditNodeCallback)addOneWayReference, &secondItem);
 
     /* remove reference if the second direction failed */
-    UA_Boolean secondExisted = UA_FALSE;
+    UA_Boolean secondExisted = false;
     if(*retval == UA_STATUSCODE_BADDUPLICATEREFERENCENOTALLOWED) {
         *retval = UA_STATUSCODE_GOOD;
-        secondExisted = UA_TRUE;
+        secondExisted = true;
     } else if(*retval != UA_STATUSCODE_GOOD && !firstExisted) {
         UA_DeleteReferencesItem deleteItem;
         deleteItem.sourceNodeId = item->sourceNodeId;

src/server/ua_subscription_events.c

@@ -189,14 +189,14 @@ isValidEvent(UA_Server *server, const UA_NodeId *validEventParent, const UA_Node
 /*                   UA_EventFieldList *efl, UA_Boolean *result) { */
 /*     /\* if the where clauses aren't specified leave everything as is *\/ */
 /*     if(whereClause.elementsSize == 0) { */
-/*         *result = UA_TRUE; */
+/*         *result = true; */
 /*         return UA_STATUSCODE_GOOD; */
 /*     } */
 
 /*     /\* where clauses were specified *\/ */
 /*     UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_USERLAND, */
 /*                    "Where clauses are not supported by the server."); */
-/*     *result = UA_TRUE; */
+/*     *result = true; */
 /*     return UA_STATUSCODE_BADNOTSUPPORTED; */
 /* } */
 
@@ -294,7 +294,7 @@ UA_Server_filterEvent(UA_Server *server, UA_Session *session,
                                       &filter->selectClauses[i],
                                       &notification->fields.eventFields[i]);
     }
-    /* UA_Boolean whereClauseResult = UA_TRUE; */
+    /* UA_Boolean whereClauseResult = true; */
     /* return whereClausesApply(server, filter->whereClause, &notification->fields, &whereClauseResult); */
     return UA_STATUSCODE_GOOD;
 }
@@ -436,7 +436,7 @@ UA_Server_triggerEvent(UA_Server *server, const UA_NodeId eventNodeId, const UA_
     UA_NodeId *parentTypeHierachy = NULL;
     size_t parentTypeHierachySize = 0;
     getTypesHierarchy(&server->config.nodestore, parentReferences_events, 2,
-                      &parentTypeHierachy, &parentTypeHierachySize, UA_TRUE);
+                      &parentTypeHierachy, &parentTypeHierachySize, true);
     UA_Boolean isInObjectsFolder = isNodeInTree(&server->config.nodestore, &origin, &objectsFolderId, parentTypeHierachy, parentTypeHierachySize);
     UA_Array_delete(parentTypeHierachy, parentTypeHierachySize, &UA_TYPES[UA_TYPES_NODEID]);
     if (!isInObjectsFolder) {
@@ -458,7 +458,7 @@ UA_Server_triggerEvent(UA_Server *server, const UA_NodeId eventNodeId, const UA_
     struct getNodesHandle parentHandle;
     parentHandle.server = server;
     LIST_INIT(&parentHandle.nodes);
-    retval = getParentsNodeIteratorCallback(origin, UA_TRUE, parentReferences_events[1], &parentHandle);
+    retval = getParentsNodeIteratorCallback(origin, true, parentReferences_events[1], &parentHandle);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Events: Could not create the list of nodes listening on the event with StatusCode %s",
@@ -489,7 +489,7 @@ UA_Server_triggerEvent(UA_Server *server, const UA_NodeId eventNodeId, const UA_
 
     /* Delete the node representation of the event */
     if(deleteEventNode) {
-        retval = UA_Server_deleteNode(server, eventNodeId, UA_TRUE);
+        retval = UA_Server_deleteNode(server, eventNodeId, true);
         if (retval != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_SERVER,
                            "Attempt to remove event using deleteNode failed. StatusCode %s",

src/ua_util_internal.h

@@ -14,6 +14,7 @@
 #ifndef UA_UTIL_H_
 #define UA_UTIL_H_
 
+#define UA_INTERNAL
 #include "ua_types.h"
 #include "../deps/queue.h"