Ticket #6168: 0001-Add-syslog-ng-support.patch

src/system/boot/loader/stdio.cpp

@@ -6 +6 @@
 
 #include <boot/vfs.h>
 #include <boot/stdio.h>
+#include <boot/net/NetStack.h>
+#include <boot/net/UDP.h>
 #include <util/kernel_cpp.h>
 
 #include <errno.h>
@@ -21 +23 @@
 //extern FILE *stdin;
 
 
+//#define ENABLE_SYSLOG
+
+
 #undef errno
 int errno;
 
@@ -32 +37 @@
 }
 
 
+#ifdef ENABLE_SYSLOG
+
+static UDPSocket *sSyslogSocket = NULL;
+
+static void
+sendToSyslog(const char *message, int length)
+{
+    // Lazy-initialize the socket
+    if (sSyslogSocket == NULL) {
+        // Check if the network stack has been initialized yet
+        if (NetStack::Default() != NULL) {
+            sSyslogSocket = new(std::nothrow) UDPSocket;
+            sSyslogSocket->Bind(INADDR_ANY, 60514);
+        }
+    }
+
+    if (sSyslogSocket == NULL)
+        return;
+
+    // Strip trailing newlines
+    while (length > 0) {
+        if (message[length - 1] != '\n'
+            && message[length - 1] != '\r') {
+            break;
+        }
+        length--;
+    }
+    if (length <= 0)
+        return;
+
+    char buffer[1500];
+        // same comment as in vfprintf applies...
+    const int facility = 0; // kernel
+    int severity = 7; // debug
+    int offset = snprintf(buffer, sizeof(buffer), "<%d>1 - - Haiku - - - \xEF\xBB\xBF",
+        facility * 8 + severity);
+    length = std::min(length, (int)sizeof(buffer) - offset);
+    memcpy(buffer + offset, message, length);
+    sSyslogSocket->Send(INADDR_BROADCAST, 514, buffer, offset + length);
+}
+
+#endif
+
+
 int
 vfprintf(FILE *file, const char *format, va_list list)
 {
@@ -41 +90 @@
 
     int length = vsnprintf(buffer, sizeof(buffer), format, list);
     length = std::min(length, (int)sizeof(buffer) - 1);
-    if (length > 0)
+    if (length > 0) {
         node->Write(buffer, length);
+#ifdef ENABLE_SYSLOG
+        sendToSyslog(buffer, length);
+#endif
+    }
 
     return length;
 }
@@ -93 +146 @@
     // we only support direct console output right now...
     status = ((ConsoleNode *)file)->Write(&character, 1);
 
+#ifdef ENABLE_SYSLOG
+    sendToSyslog(&character, 1);
+#endif
+
     if (status > 0)
         return character;
 
@@ -109 +166 @@
     status_t status = ((ConsoleNode *)file)->Write(string, strlen(string));
     fputc('\n', file);
 
+#ifdef ENABLE_SYSLOG
+    sendToSyslog(string, strlen(string));
+#endif
+
     return status;
 }