use only UA_malloc internally, 2nd part

src/client/ua_client.c

@@ -47,7 +47,7 @@ static void UA_Client_deleteMembers(UA_Client* client) {
     UA_Client_NotificationsAckNumber *n, *tmp;
     LIST_FOREACH_SAFE(n, &client->pendingNotificationsAcks, listEntry, tmp) {
         LIST_REMOVE(n, listEntry);
-        free(n);
+        UA_free(n);
     }
     UA_Client_Subscription *sub, *tmps;
     LIST_FOREACH_SAFE(sub, &client->subscriptions, listEntry, tmps)

src/server/ua_mdns.c

@@ -129,7 +129,7 @@ mdns_record_remove(UA_Server *server, const char *record,
         prevEntry = hash_entry;
         hash_entry = hash_entry->next;
     }
-    free(hash_entry);
+    UA_free(hash_entry);
 
     if(server->serverOnNetworkCallback)
         server->serverOnNetworkCallback(&entry->serverOnNetwork, UA_FALSE,
@@ -139,7 +139,7 @@ mdns_record_remove(UA_Server *server, const char *record,
     LIST_REMOVE(entry, pointers);
     UA_ServerOnNetwork_deleteMembers(&entry->serverOnNetwork);
     if(entry->pathTmp)
-        free(entry->pathTmp);
+        UA_free(entry->pathTmp);
 
 #ifndef UA_ENABLE_MULTITHREADING
     server->serverOnNetworkSize--;
@@ -227,11 +227,11 @@ setSrv(UA_Server *server, const struct resource *r,
     UA_LOG_INFO(server->config.logger, UA_LOGCATEGORY_SERVER,
                 "Multicast DNS: found server: %s", newUrl);
     entry->serverOnNetwork.discoveryUrl = UA_String_fromChars(newUrl);
-    free(newUrl);
+    UA_free(newUrl);
 
     if(entry->pathTmp) {
         mdns_append_path_to_url(&entry->serverOnNetwork.discoveryUrl, entry->pathTmp);
-        free(entry->pathTmp);
+        UA_free(entry->pathTmp);
     }
 }
 
@@ -342,13 +342,13 @@ void mdns_create_txt(UA_Server *server, const char *fullServiceDomain, const cha
 
     int txtRecordLength;
     unsigned char *packet = sd2txt(h, &txtRecordLength);
-    if (allocPath)
-        free(allocPath);
-    if (caps)
-        free(caps);
+    if(allocPath)
+        UA_free(allocPath);
+    if(caps)
+        UA_free(caps);
     xht_free(h);
     mdnsd_set_raw(server->mdnsDaemon, r, (char *) packet, (unsigned short) txtRecordLength);
-    free(packet);
+    UA_free(packet);
 }
 
 mdns_record_t *
@@ -410,7 +410,7 @@ getInterfaces(UA_Server *server) {
             break;
         } else if (ERROR_BUFFER_OVERFLOW == error) {
             // Try again with the new size
-            free(adapter_addresses);
+            UA_free(adapter_addresses);
             adapter_addresses = NULL;
             continue;
         }
@@ -419,7 +419,7 @@ getInterfaces(UA_Server *server) {
         UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER,
                      "GetAdaptersAddresses returned an unexpected error. "
                      "Not setting mDNS A records.");
-        free(adapter_addresses);
+        UA_free(adapter_addresses);
         adapter_addresses = NULL;
         break;
     }
@@ -474,7 +474,7 @@ void mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
     }
 
     /* Cleanup */
-    free(adapter_addresses);
+    UA_free(adapter_addresses);
     adapter_addresses = NULL;
 }
 

src/server/ua_server.c

@@ -175,7 +175,7 @@ void UA_Server_delete(UA_Server *server) {
         LIST_REMOVE(son, pointers);
         UA_ServerOnNetwork_deleteMembers(&son->serverOnNetwork);
         if(son->pathTmp)
-            free(son->pathTmp);
+            UA_free(son->pathTmp);
         UA_free(son);
     }
 
@@ -183,7 +183,7 @@ void UA_Server_delete(UA_Server *server) {
         serverOnNetwork_hash_entry* currHash = server->serverOnNetworkHash[i];
         while(currHash) {
             serverOnNetwork_hash_entry* nextHash = currHash->next;
-            free(currHash);
+            UA_free(currHash);
             currHash = nextHash;
         }
     }

src/server/ua_server_worker.c

@@ -337,10 +337,10 @@ UA_Server_addMdnsRecordForNetworkLayer(UA_Server *server, const char* appName, c
                 UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_NETWORK, "Server url is invalid", uri);
             else if (retval == UA_STATUSCODE_BADATTRIBUTEIDINVALID)
                 UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_NETWORK, "Server url '%s' does not begin with opc.tcp://", uri);
-            free(uri);
+            UA_free(uri);
             return UA_STATUSCODE_BADINVALIDARGUMENT;
         }
-        free(uri);
+        UA_free(uri);
     }
     UA_Discovery_addRecord(server, appName, hostname, port, path != NULL && strlen(path) ? path : "", UA_DISCOVERY_TCP, UA_TRUE,
                            server->config.serverCapabilities, &server->config.serverCapabilitiesSize);
@@ -391,11 +391,11 @@ UA_StatusCode UA_Server_run_startup(UA_Server *server) {
             UA_StatusCode retVal = UA_Server_addMdnsRecordForNetworkLayer(
                     server, appName, &server->config.networkLayers[i]);
             if (UA_STATUSCODE_GOOD != retVal) {
-                free(appName);
+                UA_free(appName);
                 return retVal;
             }
         }
-        free(appName);
+        UA_free(appName);
 
         // find any other server on the net
         UA_Discovery_multicastQuery(server);
@@ -567,12 +567,12 @@ UA_StatusCode UA_Server_run_shutdown(UA_Server *server) {
             memcpy(appName, server->config.mdnsServerName.data, server->config.mdnsServerName.length);
             appName[server->config.mdnsServerName.length] = '\0';
             UA_Discovery_removeRecord(server,appName, hostname, 4840, UA_TRUE);
-            free(appName);
+            UA_free(appName);
         } else {
             UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER,
                          "Could not get hostname for multicast discovery.");
         }
-        free(hostname);
+        UA_free(hostname);
 
 # ifdef UA_ENABLE_MULTITHREADING
         UA_Discovery_multicastListenStop(server);

src/server/ua_services_discovery.c

@@ -381,10 +381,10 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
         filePath[requestServer->semaphoreFilePath.length] = '\0';
         if(access( filePath, 0 ) == -1) {
             responseHeader->serviceResult = UA_STATUSCODE_BADSEMPAHOREFILEMISSING;
-            free(filePath);
+            UA_free(filePath);
             return;
         }
-        free(filePath);
+        UA_free(filePath);
 #else
         UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Ignoring semaphore file path. open62541 not compiled "
@@ -407,7 +407,7 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
                                                     requestServer->discoveryUrls[i],
                                                     requestServer->isOnline, updateTxt);
         }
-        free(mdnsServer);
+        UA_free(mdnsServer);
     }
 #endif
 
@@ -521,7 +521,7 @@ void UA_Discovery_cleanupTimedOut(UA_Server *server, UA_DateTime nowMonotonic) {
 #else
            semaphoreDeleted = access( filePath, 0 ) == -1;
 #endif
-           free(filePath);
+           UA_free(filePath);
         }
 #endif
 

src/server/ua_services_discovery_multicast.c

@@ -110,7 +110,7 @@ UA_Discovery_update_MdnsForDiscoveryUrl(UA_Server *server, const char *serverNam
             UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_NETWORK,
                            "Server url does not begin with opc.tcp://");
     }
-    free(uri);
+    UA_free(uri);
 
     if(!isOnline) {
         UA_StatusCode removeRetval =
@@ -337,7 +337,7 @@ UA_Discovery_addRecord(UA_Server* server, const char* servername,
 
     UA_Boolean exists = UA_Discovery_recordExists(server, fullServiceDomain, port, protocol);
     if(exists == UA_TRUE) {
-        free(fullServiceDomain);
+        UA_free(fullServiceDomain);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -360,7 +360,7 @@ UA_Discovery_addRecord(UA_Server* server, const char* servername,
     size_t maxHostnameLen = hostnameLen < 63 ? hostnameLen : 63;
     char *localDomain = (char*)UA_malloc(maxHostnameLen+2);
     if(!localDomain) {
-        free(fullServiceDomain);
+        UA_free(fullServiceDomain);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
     sprintf(localDomain, "%.*s.",(int)(maxHostnameLen), hostname);
@@ -382,8 +382,8 @@ UA_Discovery_addRecord(UA_Server* server, const char* servername,
                         UA_Discovery_multicastConflict);
     }
 
-    free(fullServiceDomain);
-    free(localDomain);
+    UA_free(fullServiceDomain);
+    UA_free(localDomain);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -418,7 +418,7 @@ UA_Discovery_removeRecord(UA_Server* server, const char* servername, const char*
         UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Multicast DNS: could not remove record. "
                        "PTR Record not found for domain: %s", fullServiceDomain);
-        free(fullServiceDomain);
+        UA_free(fullServiceDomain);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     mdnsd_done(server->mdnsDaemon, r);
@@ -431,7 +431,7 @@ UA_Discovery_removeRecord(UA_Server* server, const char* servername, const char*
         UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Multicast DNS: could not remove record. Record not "
                        "found for domain: %s", fullServiceDomain);
-        free(fullServiceDomain);
+        UA_free(fullServiceDomain);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
@@ -446,7 +446,7 @@ UA_Discovery_removeRecord(UA_Server* server, const char* servername, const char*
         r2 = next;
     }
 
-    free(fullServiceDomain);
+    UA_free(fullServiceDomain);
     return UA_STATUSCODE_GOOD;
 }