use logging instead of printf

include/ua_log.h

@@ -33,14 +33,12 @@ extern "C" {
  */
 
 typedef enum UA_LoggerCategory {
-    UA_LOGGERCATEGORY_CONNECTION,
-    UA_LOGGERCATEGORY_SESSION,
-    UA_LOGGERCATEGORY_SUBSCRIPTION,
+    UA_LOGGERCATEGORY_COMMUNICATION,
     UA_LOGGERCATEGORY_SERVER,
     UA_LOGGERCATEGORY_USERLAND
 } UA_LoggerCategory;
 
-extern UA_EXPORT const char *UA_LoggerCategoryNames[5];
+extern UA_EXPORT const char *UA_LoggerCategoryNames[3];
 
 typedef struct UA_Logger {
     void (*log_trace)(UA_LoggerCategory category, const char *msg);

src/server/ua_securechannel_manager.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-
 #include "ua_securechannel_manager.h"
 #include "ua_session.h"
 #include "ua_statuscodes.h"

src/server/ua_server.c

@@ -12,9 +12,8 @@
 #include "ua_nodeids.h"
 
 
-const char *UA_LoggerCategoryNames[5] =
-    {"connection", "session", "subscription", "server",
-     "userland"};
+const char *UA_LoggerCategoryNames[3] =
+    {"communication", "server", "userland"};
 
 /**********************/
 /* Namespace Handling */

src/server/ua_server_binary.c

@@ -307,10 +307,10 @@ static void processMSG(UA_Connection *connection, UA_Server *server, const UA_By
         break;
 
     default: {
-        char logmsg[512];
-        sprintf(logmsg, "SL_processMessage - unknown request, namespace=%d, request=%d\n",
+        char logmsg[60];
+        sprintf(logmsg, "Unknown request: NodeId(ns=%d, i=%d)",
                 requestType.namespaceIndex, requestType.identifier.numeric);
-        UA_LOG_INFO(server->logger, UA_LOGGERCATEGORY_CONNECTION, logmsg);
+        UA_LOG_INFO(server->logger, UA_LOGGERCATEGORY_COMMUNICATION, logmsg);
 
         UA_RequestHeader  p;
         UA_ResponseHeader r;
@@ -391,7 +391,7 @@ void UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection
     UA_TcpMessageHeader tcpMessageHeader;
     do {
         if(UA_TcpMessageHeader_decodeBinary(msg, &pos, &tcpMessageHeader) != UA_STATUSCODE_GOOD) {
-            printf("ERROR: decoding of header failed \n");
+            UA_LOG_INFO(server->logger, UA_LOGGERCATEGORY_COMMUNICATION, "Decoding of message header failed");
             connection->close(connection);
             break;
         }
@@ -426,7 +426,8 @@ void UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection
 
         UA_TcpMessageHeader_deleteMembers(&tcpMessageHeader);
         if(pos != targetpos) {
-            printf("The message size was not as announced or the message could not be processed, skipping to the end of the message.\n");
+            UA_LOG_INFO(server->logger, UA_LOGGERCATEGORY_COMMUNICATION,
+                        "The message was not entirely processed, skipping to the end");
             pos = targetpos;
         }
     } while(msg->length > (UA_Int32)pos);

src/server/ua_server_worker.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 #define __USE_POSIX
 #define _XOPEN_SOURCE 500
 #define __USE_POSIX199309

src/server/ua_services_attribute.c

@@ -4,7 +4,6 @@
 #include "ua_statuscodes.h"
 #include "ua_nodestore.h"
 #include "ua_util.h"
-#include "stdio.h"
 
 #define CHECK_NODECLASS(CLASS)                                  \
     if(!(node->nodeClass & (CLASS))) {                          \
@@ -236,11 +235,6 @@ static void readValue(UA_Server *server, const UA_ReadValueId *id, UA_DataValue
 
     UA_NodeStore_release(node);
 
-    if(v->hasVariant && v->value.type == UA_NULL) {
-        printf("%i", id->attributeId);
-        UA_assert(UA_FALSE);
-    }
-
     if(retval != UA_STATUSCODE_GOOD) {
         v->hasStatus = UA_TRUE;
         v->status = UA_STATUSCODE_BADNOTREADABLE;