Changeset 9320 for trunk/src/kernel32/dbglog.cpp

Timestamp:

Oct 3, 2002, 2:49:50 PM (23 years ago)

Author:

sandervl

Message:

Added IP logging (define WIN32_IP_LOGGING in dbglog.cpp)

File:

• trunk/src/kernel32/dbglog.cpp (modified) (7 diffs)

trunk/src/kernel32/dbglog.cpp

@@ -1 @@
-/* $Id: dbglog.cpp,v 1.1 2002-07-26 10:46:14 sandervl Exp $ */
+/* $Id: dbglog.cpp,v 1.2 2002-10-03 12:49:50 sandervl Exp $ */
 
 /*
@@ -270 +270 @@
 //#define LOG_TIME
 //#define SHOW_FPU_CONTROLREG
+//#define WIN32_IP_LOGGING
+#define WIN32_IP_LOG_PORT       5001
+
+#ifdef WIN32_IP_LOGGING
+#include <types.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+
+static int logSocket = -1;
+static char *logserver = NULL;
+#endif
 
 int SYSTEM WriteLog(char *tekst, ...)
@@ -290 +301 @@
 #else
     if(!getenv("NOWIN32LOG")) {
+#endif
+
+#ifdef WIN32_IP_LOGGING
+        logserver = getenv("WIN32LOG_IPSERVER");
+        if(logserver) {
+             sock_init();
+
+             logSocket = socket(PF_INET, SOCK_DGRAM, 0);
+        }
 #endif
         char logname[CCHMAXPATH];
@@ -337 +357 @@
   {
     va_start(argptr, tekst);
+
+#ifdef WIN32_IP_LOGGING
+    if(logSocket == -1) {
+#endif
     if(teb) 
     {
@@ -393 +417 @@
     }
 #endif
+#ifdef WIN32_IP_LOGGING
+    }
+#endif
+
+#ifdef WIN32_IP_LOGGING
+    if(logSocket != -1) {
+        char logbuffer[1024];
+        int  prefixlen = 0;
+
+        if(teb) 
+        {
+            ULONG ulCallDepth;
+#ifdef DEBUG
+            ulCallDepth = teb->o.odin.dbgCallDepth;
+#else
+            ulCallDepth = 0;
+#endif
+            if(sel == 0x150b && !fIsOS2Image) 
+                sprintf(logbuffer, "t%02d (%3d): (FS=150B) ",
+                        LOWORD(teb->o.odin.threadId), ulCallDepth);
+            else 
+                sprintf(logbuffer, "t%02d (%3d): ",
+                        LOWORD(teb->o.odin.threadId), ulCallDepth);
+            prefixlen = strlen(logbuffer);
+        }
+
+        vsprintf(&logbuffer[prefixlen], tekst, argptr);
+
+        struct sockaddr_in servername;
+        int rc;
+
+        memset(&servername, 0, sizeof(servername));
+        servername.sin_family      = AF_INET;
+        servername.sin_addr.s_addr = inet_addr(logserver);
+        servername.sin_port        = WIN32_IP_LOG_PORT;
+        rc = sendto(logSocket, logbuffer, strlen(logbuffer)+1, 0, (struct sockaddr *)&servername, sizeof(servername));
+
+        if(teb) teb->o.odin.logfile = 0;
+        va_end(argptr);
+    }
+    else {
+        vfprintf(flog, tekst, argptr);
+        if(teb) teb->o.odin.logfile = 0;
+        va_end(argptr);
+
+        if(tekst[strlen(tekst)-1] != '\n')
+            fprintf(flog, "\n");
+
+        if(fFlushLines)
+            fflush(flog);
+    }
+#else
     vfprintf(flog, tekst, argptr);
     if(teb) teb->o.odin.logfile = 0;
@@ -402 +478 @@
     if(fFlushLines)
       fflush(flog);
+#endif
   }
   SetFS(sel);
@@ -573 +650 @@
   if(oldcrtmsghandle)
     _set_crt_msg_handle(oldcrtmsghandle);
+
+#ifdef WIN32_IP_LOGGING
+  if(logSocket != -1) {
+      soclose(logSocket);
+  }
+#endif
 
   if(flog) fclose(flog);